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

With hat:	portmgr
Sponsored by:	Absolight

2659 files changed, 8620 insertions, 8620 deletions

diff --git a/devel/ChipmunkPhysics/Makefile b/devel/ChipmunkPhysics/Makefile
index ce609de3d6db..4b60a744cb83 100644
--- a/devel/ChipmunkPhysics/Makefile
+++ b/devel/ChipmunkPhysics/Makefile
@@ -26,7 +26,7 @@ PORTEXAMPLES=	*.c *.h
 
 DEMOS_DESC=	Install the demo program (requires GLFW and GLEW)
 DEMOS_USE=		GL=glew
-DEMOS_LIB_DEPENDS=	libglfw.so:${PORTSDIR}/graphics/glfw2
+DEMOS_LIB_DEPENDS=	libglfw.so:graphics/glfw2
 DEMOS_CMAKE_OFF=	-DBUILD_DEMOS=OFF
 
 post-install-DOCS-on:
diff --git a/devel/R-cran-bit64/Makefile b/devel/R-cran-bit64/Makefile
index 0586ac91ba2c..02c403507f4d 100644
--- a/devel/R-cran-bit64/Makefile
+++ b/devel/R-cran-bit64/Makefile
@@ -11,7 +11,7 @@ COMMENT=	S3 Class for Vectors of 64bit Integers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-bit>=1.1.12:${PORTSDIR}/devel/R-cran-bit
+RUN_DEPENDS=	R-cran-bit>=1.1.12:devel/R-cran-bit
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-caTools/Makefile b/devel/R-cran-caTools/Makefile
index ea5fd6814507..efa4016855e3 100644
--- a/devel/R-cran-caTools/Makefile
+++ b/devel/R-cran-caTools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tools: moving window statistics, GIF, Base64, ROC AUC, etc
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-bitops>0:${PORTSDIR}/devel/R-cran-bitops
+RUN_DEPENDS=	R-cran-bitops>0:devel/R-cran-bitops
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-caret/Makefile b/devel/R-cran-caret/Makefile
index 84b2c4637c04..11aec86741a1 100644
--- a/devel/R-cran-caret/Makefile
+++ b/devel/R-cran-caret/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Classification and Regression Training
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-ggplot2>0:${PORTSDIR}/graphics/R-cran-ggplot2 \
-		R-cran-car>0:${PORTSDIR}/math/R-cran-car \
-		R-cran-foreach>0:${PORTSDIR}/devel/R-cran-foreach \
-		R-cran-plyr>0:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-reshape2>0:${PORTSDIR}/devel/R-cran-reshape2
+RUN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2 \
+		R-cran-car>0:math/R-cran-car \
+		R-cran-foreach>0:devel/R-cran-foreach \
+		R-cran-plyr>0:devel/R-cran-plyr \
+		R-cran-reshape2>0:devel/R-cran-reshape2
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-doParallel/Makefile b/devel/R-cran-doParallel/Makefile
index e38e85190787..03cbee92e502 100644
--- a/devel/R-cran-doParallel/Makefile
+++ b/devel/R-cran-doParallel/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Foreach parallel adaptor for the parallel package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-foreach>=1.2.0:${PORTSDIR}/devel/R-cran-foreach \
-		R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
+RUN_DEPENDS=	R-cran-foreach>=1.2.0:devel/R-cran-foreach \
+		R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-evaluate/Makefile b/devel/R-cran-evaluate/Makefile
index 19b4e6f1bd22..6f50f1e289d2 100644
--- a/devel/R-cran-evaluate/Makefile
+++ b/devel/R-cran-evaluate/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Parsing and Evaluation Tools
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-stringr>=0.6.2:${PORTSDIR}/textproc/R-cran-stringr
+RUN_DEPENDS=	R-cran-stringr>=0.6.2:textproc/R-cran-stringr
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-foreach/Makefile b/devel/R-cran-foreach/Makefile
index 2c62831ca393..d290c417b780 100644
--- a/devel/R-cran-foreach/Makefile
+++ b/devel/R-cran-foreach/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Foreach looping construct for R
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
+RUN_DEPENDS=	R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-gdata/Makefile b/devel/R-cran-gdata/Makefile
index 1fc980f4c934..fc94e520d860 100644
--- a/devel/R-cran-gdata/Makefile
+++ b/devel/R-cran-gdata/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Various R programming tools for data manipulation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-gtools>0:${PORTSDIR}/devel/R-cran-gtools
+RUN_DEPENDS=	R-cran-gtools>0:devel/R-cran-gtools
 
 USES=		cran:auto-plist perl5 shebangfix
 USE_PERL5=	run
diff --git a/devel/R-cran-gsubfn/Makefile b/devel/R-cran-gsubfn/Makefile
index 60a22a9473a9..0286ae02a93f 100644
--- a/devel/R-cran-gsubfn/Makefile
+++ b/devel/R-cran-gsubfn/Makefile
@@ -12,7 +12,7 @@ COMMENT=	R package used for string matching, substitution and parsing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-proto>=0.3.9.2_6:${PORTSDIR}/devel/R-cran-proto
+RUN_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-itertools/Makefile b/devel/R-cran-itertools/Makefile
index 1536fcc2a185..63856ce80ead 100644
--- a/devel/R-cran-itertools/Makefile
+++ b/devel/R-cran-itertools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Iterator Tools for R
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
+RUN_DEPENDS=	R-cran-iterators>=1.0.0:devel/R-cran-iterators
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-memoise/Makefile b/devel/R-cran-memoise/Makefile
index 6e90d9c13c94..261189ab410e 100644
--- a/devel/R-cran-memoise/Makefile
+++ b/devel/R-cran-memoise/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Memoise functions for R
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-digest>=0.6.3:${PORTSDIR}/security/R-cran-digest
+RUN_DEPENDS=	R-cran-digest>=0.6.3:security/R-cran-digest
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-microbenchmark/Makefile b/devel/R-cran-microbenchmark/Makefile
index 6f96f83076bb..3ea01703fafd 100644
--- a/devel/R-cran-microbenchmark/Makefile
+++ b/devel/R-cran-microbenchmark/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Infrastructure to measure the execution time of R expressions
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	R-cran-ggplot2>0:${PORTSDIR}/graphics/R-cran-ggplot2
+RUN_DEPENDS=	R-cran-ggplot2>0:graphics/R-cran-ggplot2
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-pkgmaker/Makefile b/devel/R-cran-pkgmaker/Makefile
index ffb9b17474d7..ede0eca421d3 100644
--- a/devel/R-cran-pkgmaker/Makefile
+++ b/devel/R-cran-pkgmaker/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Package development utilities
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-registry>0:${PORTSDIR}/devel/R-cran-registry \
-		R-cran-digest>0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-stringr>0:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-xtable>0:${PORTSDIR}/textproc/R-cran-xtable
+RUN_DEPENDS=	R-cran-registry>0:devel/R-cran-registry \
+		R-cran-digest>0:security/R-cran-digest \
+		R-cran-stringr>0:textproc/R-cran-stringr \
+		R-cran-xtable>0:textproc/R-cran-xtable
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-plyr/Makefile b/devel/R-cran-plyr/Makefile
index 1b59f00ee5a3..888341d52249 100644
--- a/devel/R-cran-plyr/Makefile
+++ b/devel/R-cran-plyr/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME_HW=	Hadley Wickham COPYRIGHT
 LICENSE_FILE_HW=	${WRKSRC}/LICENSE
 LICENSE_PERMS_HW=	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
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-randomForest/Makefile b/devel/R-cran-randomForest/Makefile
index c66d025f4174..90ad9c78740b 100644
--- a/devel/R-cran-randomForest/Makefile
+++ b/devel/R-cran-randomForest/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Classification based on a forest of trees using random inputs
 
-RUN_DEPENDS=	R-cran-RColorBrewer>=1.0.5_6:${PORTSDIR}/graphics/R-cran-RColorBrewer
+RUN_DEPENDS=	R-cran-RColorBrewer>=1.0.5_6:graphics/R-cran-RColorBrewer
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-reshape/Makefile b/devel/R-cran-reshape/Makefile
index bea57d862d1c..fe08ab473f0e 100644
--- a/devel/R-cran-reshape/Makefile
+++ b/devel/R-cran-reshape/Makefile
@@ -12,7 +12,7 @@ COMMENT=	R package for flexibly restructuring and aggregating data
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-plyr>0:${PORTSDIR}/devel/R-cran-plyr
+RUN_DEPENDS=	R-cran-plyr>0:devel/R-cran-plyr
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-reshape2/Makefile b/devel/R-cran-reshape2/Makefile
index fc7684dceb07..41510b670702 100644
--- a/devel/R-cran-reshape2/Makefile
+++ b/devel/R-cran-reshape2/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Flexibly reshape data: a reboot of the reshape package
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-plyr>=1.8.1:${PORTSDIR}/devel/R-cran-plyr \
-		R-cran-stringr>0:${PORTSDIR}/textproc/R-cran-stringr \
-		R-cran-Rcpp>0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-plyr>=1.8.1:devel/R-cran-plyr \
+		R-cran-stringr>0:textproc/R-cran-stringr \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-rngtools/Makefile b/devel/R-cran-rngtools/Makefile
index 4a5330e05554..5f1fb577398f 100644
--- a/devel/R-cran-rngtools/Makefile
+++ b/devel/R-cran-rngtools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utility functions for working with Random Number Generators
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-pkgmaker>=0.20:${PORTSDIR}/devel/R-cran-pkgmaker
+RUN_DEPENDS=	R-cran-pkgmaker>=0.20:devel/R-cran-pkgmaker
 
 USES=	cran:auto-plist
 
diff --git a/devel/R-cran-tidyr/Makefile b/devel/R-cran-tidyr/Makefile
index c43c74828028..4fe2ca912cbd 100644
--- a/devel/R-cran-tidyr/Makefile
+++ b/devel/R-cran-tidyr/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Easily tidy data with spread and gather functions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	R-cran-dplyr>=0.4:${PORTSDIR}/math/R-cran-dplyr \
-		R-cran-stringi>0:${PORTSDIR}/textproc/R-cran-stringi \
-		R-cran-lazyeval>0:${PORTSDIR}/math/R-cran-lazyeval \
-		R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr \
-		R-cran-Rcpp>0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-dplyr>=0.4:math/R-cran-dplyr \
+		R-cran-stringi>0:textproc/R-cran-stringi \
+		R-cran-lazyeval>0:math/R-cran-lazyeval \
+		R-cran-magrittr>0:devel/R-cran-magrittr \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/devel/abi-compliance-checker/Makefile b/devel/abi-compliance-checker/Makefile
index 3d3de371b651..d6971e2eb388 100644
--- a/devel/abi-compliance-checker/Makefile
+++ b/devel/abi-compliance-checker/Makefile
@@ -18,11 +18,11 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lvc
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS?=	exctags:${PORTSDIR}/devel/ctags
+BUILD_DEPENDS?=	exctags:devel/ctags
 .else
 USE_PERL5=	run
 .endif
-RUN_DEPENDS?=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS?=	exctags:devel/ctags
 USE_GCC=	any
 
 NO_BUILD=	yes
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index edf6dbc0c0be..847854e82740 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -42,7 +42,7 @@ OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=		yes
 
 FLTK_DESC=		FLTK GUI toolkit
-FLTK_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_MAKE_ENV=		fl=1
 QT4_USE=		QT4=corelib,gui,moc_build
 QT4_MAKE_ENV=		qt=1 qt4=1 QTDIR="${QT_PREFIX}"
@@ -53,7 +53,7 @@ SSL_MAKE_ENV=		ssl=1
 TK_USES=		tk
 TK_MAKE_ENV=		tk=1
 TRIO_DESC=		Trio portable string functions
-TRIO_BUILD_DEPENDS=	trio>=0:${PORTSDIR}/devel/trio
+TRIO_BUILD_DEPENDS=	trio>=0:devel/trio
 TRIO_MAKE_ENV=		trio=1
 X11_USE=		XORG=xt
 X11_MAKE_ENV=		xt=1
diff --git a/devel/ada-util/Makefile b/devel/ada-util/Makefile
index 912b2e1d378b..77ed8d055ba3 100644
--- a/devel/ada-util/Makefile
+++ b/devel/ada-util/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utility library for Ada 2005 applications
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		ada gmake
 USE_GITHUB=	yes
diff --git a/devel/adabooch/Makefile b/devel/adabooch/Makefile
index 41bc2541b50c..fb001ae6e345 100644
--- a/devel/adabooch/Makefile
+++ b/devel/adabooch/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ada 95 Booch Components
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/devel/adime/Makefile b/devel/adime/Makefile
index 42acf4ad5175..102819d41537 100644
--- a/devel/adime/Makefile
+++ b/devel/adime/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate Allegro dialogs in a simple way
 
-LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS=	liballeg.so:devel/allegro
 
 USES=	gmake
 
diff --git a/devel/aegis/Makefile b/devel/aegis/Makefile
index 682c12114712..ac2b980f4e0b 100644
--- a/devel/aegis/Makefile
+++ b/devel/aegis/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Transaction-based software configuration management system
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	tkdiff:textproc/tkdiff
 
 USES=		gettext ghostscript perl5 tk
 USE_GNOME=	libxml2
diff --git a/devel/afay/Makefile b/devel/afay/Makefile
index af27f2354f4c..e2e738beb8b1 100644
--- a/devel/afay/Makefile
+++ b/devel/afay/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	Arcadia-UC-Irvine
 LICENSE_FILE=	${WRKSRC}/afay/aflex/README
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USES=		ada tar:tgz
 NO_WRKSUBDIR=	yes
diff --git a/devel/ahven/Makefile b/devel/ahven/Makefile
index 1be62e1aa010..bb0e623edb37 100644
--- a/devel/ahven/Makefile
+++ b/devel/ahven/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ada unit test framework
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	adactl:${PORTSDIR}/lang/adacontrol
+BUILD_DEPENDS=	adactl:lang/adacontrol
 
 USES=		ada gmake
 MAKE_ENV=	OS_VERSION=unix
@@ -23,8 +23,8 @@ NO_OPTIONS_SORT=	yes
 TRACE_DESC=		Build with GNAT-specific symbolic tracing functionality
 
 DOCS_USES=		python:build
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:${PORTSDIR}/textproc/py-sphinxcontrib-adadomain
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:textproc/py-sphinxcontrib-adadomain
 TRACE_EXTRA_PATCHES=	${FILESDIR}/extra-src_ahven-framework.adb
 
 do-build:
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index 50606d2242e2..5ac9f9aca82e 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Machine learning system
 
 LICENSE=	LGPL21+
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir \
-		ocaml-cfg>0:${PORTSDIR}/devel/ocaml-cfg \
-		ocaml-pcre>0:${PORTSDIR}/devel/ocaml-pcre \
-		ocaml-res>0:${PORTSDIR}/devel/ocaml-res
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	menhir:devel/menhir \
+		ocaml-cfg>0:devel/ocaml-cfg \
+		ocaml-pcre>0:devel/ocaml-pcre \
+		ocaml-res>0:devel/ocaml-res
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
diff --git a/devel/allegro-devel/Makefile b/devel/allegro-devel/Makefile
index f4acb6073ddb..ee7336756ae2 100644
--- a/devel/allegro-devel/Makefile
+++ b/devel/allegro-devel/Makefile
@@ -17,11 +17,11 @@ COMMENT=	Cross-platform library for games and multimedia programming
 LICENSE=	ZLIB BSD3CLAUSE
 LICENSE_COMB=	dual
 
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS+=	libjack.so:audio/jack \
+		libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis \
+		libFLAC.so:audio/flac \
+		libphysfs.so:devel/physfs
 
 USES=		cmake gmake jpeg openal:soft pkgconfig
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
@@ -60,11 +60,11 @@ DOCSDIR2=	${DOCSDIR}/docs
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/pandoc:${PORTSDIR}/textproc/hs-pandoc
-ALSA_LIB_DEPENDS=	libasound.so.2:${PORTSDIR}/audio/alsa-lib
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/pandoc:textproc/hs-pandoc
+ALSA_LIB_DEPENDS=	libasound.so.2:audio/alsa-lib
 ALSA_CMAKE_ON=		-DWANT_ALSA=on
 ALSA_CMAKE_OFF=		-DWANT_ALSA=off
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO=on
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO=off
 
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index ceb70e406997..85773cb92f36 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -13,8 +13,8 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	koalative@gmail.com
 COMMENT=	Cross-platform library for games and multimedia programming
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libvorbis.so:audio/libvorbis
 
 USES=		cmake gmake makeinfo pkgconfig
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
@@ -49,13 +49,13 @@ OPTIONS_SUB=	yes
 
 EXAMPLES_CMAKE_ON=	-DWANT_EXAMPLES=on
 EXAMPLES_CMAKE_OFF=	-DWANT_EXAMPLES=off
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=		-DWANT_ALSA=on
 ALSA_CMAKE_OFF=		-DWANT_ALSA=off
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_ON=		-DWANT_JACK=on
 JACK_CMAKE_OFF=		-DWANT_JACK=off
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CMAKE_ON=		-DWANT_LOGG=on
 OGG_CMAKE_OFF=		-DWANT_LOGG=of
 
diff --git a/devel/alog/Makefile b/devel/alog/Makefile
index 3599cbc3db1b..b740feba12f3 100644
--- a/devel/alog/Makefile
+++ b/devel/alog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Stackable logging framework for Ada
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada tar:bzip2
 ALL_TARGET=	all
@@ -26,9 +26,9 @@ TEST_DESC=	Run unit test suite before installation
 NO_OPTIONS_SORT=yes
 
 DOCS_USES=		gmake
-DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			source-highlight:${PORTSDIR}/textproc/source-highlight
-TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			source-highlight:textproc/source-highlight
+TEST_BUILD_DEPENDS=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index 907248e748ca..1f6ef8e6f6be 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extra anjuta 3 plugins
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libanjuta-3.so:${PORTSDIR}/devel/anjuta
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libanjuta-3.so:devel/anjuta
 
 USES=		gettext gmake libtool pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 5dde9877b731..ce6f102ee95f 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -11,18 +11,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated Development Environment for C and C++
 
-BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
-		autogen:${PORTSDIR}/devel/autogen \
-		automake>=0:${PORTSDIR}/devel/automake \
-		autoconf>=0:${PORTSDIR}/devel/autoconf \
-		libtool>=2.4:${PORTSDIR}/devel/libtool \
-		gdb>=7.10:${PORTSDIR}/devel/gdb \
-		gmake:${PORTSDIR}/devel/gmake \
-		yelp>=3.0.0:${PORTSDIR}/x11/yelp
+BUILD_DEPENDS=	autogen:devel/autogen \
+		itstool:textproc/itstool
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libgdl-3.so:x11-toolkits/gdl
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
+		autogen:devel/autogen \
+		automake>=0:devel/automake \
+		autoconf>=0:devel/autoconf \
+		libtool>=2.4:devel/libtool \
+		gdb>=7.10:devel/gdb \
+		gmake:devel/gmake \
+		yelp>=3.0.0:x11/yelp
 
 PORTSCOUT=	limitw:1,even
 
@@ -84,24 +84,24 @@ VALA_DESC=	Vala support
 GLADE_DESC=	Build glade plugin
 TERMINAL_DESC=	Build build-in terminal
 
-GLADE_LIB_DEPENDS=	libgladeui-2.so:${PORTSDIR}/devel/glade
+GLADE_LIB_DEPENDS=	libgladeui-2.so:devel/glade
 GLADE_CONFIGURE_ENABLE=	plugin-glade
 
 TERMINAL_USE=	GNOME=vte3
 TERMINAL_CONFIGURE_ENABLE=	plugin-terminal
 
-SVN_BUILD_DEPENDS=	svn:${PORTSDIR}/devel/subversion
-SVN_LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libserf-1.so:${PORTSDIR}/www/serf
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+SVN_BUILD_DEPENDS=	svn:devel/subversion
+SVN_LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+			libserf-1.so:www/serf
+SVN_RUN_DEPENDS=	svn:devel/subversion
 SVN_CONFIGURE_ENABLE=	plugin-subversion
 
-DEVHELP_LIB_DEPENDS=	libdevhelp-3.so:${PORTSDIR}/devel/devhelp
+DEVHELP_LIB_DEPENDS=	libdevhelp-3.so:devel/devhelp
 DEVHELP_CONFIGURE_ENBABLE=	plugin-devhelp
 
 VALA_VER=		0.30
-VALA_BUILD_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:${PORTSDIR}/lang/vala
-VALA_RUN_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:${PORTSDIR}/lang/vala
+VALA_BUILD_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:lang/vala
+VALA_RUN_DEPENDS=	vala>=${VALA_VER}<${VALA_VER}.99:lang/vala
 VALA_CONFIGURE_ENABLE=	vala
 
 post-patch:
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index e6cf6094d6be..40d4d1976560 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Quickly generate sanity tests for the API of a C/C++ shared library
 LICENSE=	LGPL20 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:${PORTSDIR}/devel/abi-compliance-checker
+RUN_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:devel/abi-compliance-checker
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}.pl
@@ -20,7 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lvc
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:${PORTSDIR}/devel/abi-compliance-checker
+BUILD_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:devel/abi-compliance-checker
 .else
 USE_PERL5=	run
 .endif
diff --git a/devel/apiextractor/Makefile b/devel/apiextractor/Makefile
index 55ef029a73b8..20684ea037dc 100644
--- a/devel/apiextractor/Makefile
+++ b/devel/apiextractor/Makefile
@@ -11,7 +11,7 @@ COMMENT=	API Extractor library to build PySide
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PySide
diff --git a/devel/appstream-glib/Makefile b/devel/appstream-glib/Makefile
index 0e6da925c747..a137755a4e11 100644
--- a/devel/appstream-glib/Makefile
+++ b/devel/appstream-glib/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Library to help with AppStream metadata
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		gcab:${PORTSDIR}/archivers/gcab
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libyaml.so:${PORTSDIR}/textproc/libyaml \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-RUN_DEPENDS=	gcab:${PORTSDIR}/archivers/gcab
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc \
+		gcab:archivers/gcab
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libyaml.so:textproc/libyaml \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+RUN_DEPENDS=	gcab:archivers/gcab
 
 USES=		gettext gperf gmake gnome libarchive libtool pathfix \
 		pkgconfig sqlite tar:xz
@@ -40,8 +40,8 @@ OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 MANPAGES_CONFIGURE_ENABLE=	man
-MANPAGE_BUILD_DEPENDS=	docbook-xml>=0:${PORTSDIR}/textproc/docbook-xml \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+MANPAGE_BUILD_DEPENDS=	docbook-xml>=0:textproc/docbook-xml \
+		docbook-xsl>=0:textproc/docbook-xsl
 MANPAGES_USE=	GNOME=libxslt:build
 
 .include <bsd.port.options.mk>
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index b35d6f6bd5e3..93fb1b81aa6f 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Apache Portability Library
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		iconv pathfix libtool cpe
 USE_LDCONFIG=	yes
@@ -41,11 +41,11 @@ SSL_DESC=		OpenSSL crypto driver
 
 # APR-Util Options
 BDB_USE=		BDB=5+
-FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 LDAP_USE=		OPENLDAP=yes
 MYSQL_USE=		MYSQL=yes
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 PGSQL_USES=		pgsql
 SQLITE_USES=		sqlite
 SSL_USE=		OPENSSL=yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 100299c6c71d..2e6641c1cc96 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Apache Portability Library
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 NO_PACKAGE=	yes
 
@@ -51,7 +51,7 @@ DEVRANDOM_CONFIGURE_WITH=	devrandom
 # APR-Util Options
 BDB_USE=		BDB=48+
 GDBM_CONFIGURE_WITH=	gdbm=${LOCALBASE}
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 IPV6_CONFIGURE_ENABLE=	ipv6
 MYSQL_CFLAGS=		-I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
@@ -69,7 +69,7 @@ SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_WITH=	openssl=${OPENSSLBASE}
 SSL_CPPFLAGS=		-I${OPENSSLINC}
 SSL_LDFLAGS=		-L${OPENSSLLIB}
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 NSS_CPPFLAGS=		-I${LOCALBASE}/include/nss
 NSS_LDFLAGS=		-L${LOCALBASE}/lib/nss
 NSS_CONFIGURE_WITH=	nss=${LOCALBASE}
diff --git a/devel/arcanist/Makefile b/devel/arcanist/Makefile
index ed3dcb297d0b..4394ad7dbc62 100644
--- a/devel/arcanist/Makefile
+++ b/devel/arcanist/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CONFLICTS=	arc-*
 
 PHP_DESTDIR=	lib/php/arcanist
-RUN_DEPENDS=	php5-libphutil>0:${PORTSDIR}/devel/libphutil
+RUN_DEPENDS=	php5-libphutil>0:devel/libphutil
 USE_PHP=	curl dom json simplexml
 USE_GITHUB=	yes
 NO_BUILD=	yes
diff --git a/devel/arduino-glcd/Makefile b/devel/arduino-glcd/Makefile
index 3ae0d0dec8f0..f14cb0851d36 100644
--- a/devel/arduino-glcd/Makefile
+++ b/devel/arduino-glcd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GLCD Graphical LCD Library
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	arduino:${PORTSDIR}/devel/arduino
+RUN_DEPENDS=	arduino:devel/arduino
 
 WRKSRC=		${WRKDIR}/glcd
 USES=		zip dos2unix
diff --git a/devel/arduino-irremote/Makefile b/devel/arduino-irremote/Makefile
index 99adbeadb34a..c7605ceb535a 100644
--- a/devel/arduino-irremote/Makefile
+++ b/devel/arduino-irremote/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Multi-protocol infrared remote library for the Arduino
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	arduino:${PORTSDIR}/devel/arduino
+RUN_DEPENDS=	arduino:devel/arduino
 
 WRKSRC=		${WRKDIR}/IRremote
 USES=		zip dos2unix
diff --git a/devel/arduino-mk/Makefile b/devel/arduino-mk/Makefile
index f3ff981c4a8a..d87d1bb89e44 100644
--- a/devel/arduino-mk/Makefile
+++ b/devel/arduino-mk/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Build Arduino sketches from the command line
 LICENSE=	LGPL21
 
 # gmake is needed to use the port, not to build it
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		arduino:${PORTSDIR}/devel/arduino
-PATCH_DEPENDS=	${LOCALBASE}/arduino/lib/version.txt:${PORTSDIR}/devel/arduino
+RUN_DEPENDS=	gmake:devel/gmake \
+		p5-YAML>=0:textproc/p5-YAML \
+		arduino:devel/arduino
+PATCH_DEPENDS=	${LOCALBASE}/arduino/lib/version.txt:devel/arduino
 
 USES=		shebangfix
 SHEBANG_FILES=	bin/ard-parse-boards bin/ard-reset-arduino
diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile
index 8f1be4ef8e79..9141883af1de 100644
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-linux32
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	Open-source electronics prototyping platform
 
-RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:${PORTSDIR}/comms/rxtx \
-		${LOCALBASE}/bin/avrdude:${PORTSDIR}/devel/avrdude \
-		${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc
+RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar:comms/rxtx \
+		${LOCALBASE}/bin/avrdude:devel/avrdude \
+		${LOCALBASE}/avr/include/avr/io.h:devel/avr-libc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		dos2unix tar:tgz
diff --git a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile
index 56f62ef17d64..4454ee37a12c 100644
--- a/devel/arm-none-eabi-gcc492/Makefile
+++ b/devel/arm-none-eabi-gcc492/Makefile
@@ -14,11 +14,11 @@ COMMENT=	GNU Compiler Collection for bare metal arm cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
+RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
 
 USES=	compiler gmake iconv libtool makeinfo tar:bzip2
 PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
diff --git a/devel/arm-none-eabi-gdb/Makefile b/devel/arm-none-eabi-gdb/Makefile
index bcbdb0870522..f7d8bb657297 100644
--- a/devel/arm-none-eabi-gdb/Makefile
+++ b/devel/arm-none-eabi-gdb/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gdb-${PORTVERSION}
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	GNU GDB for the arm bare metal target
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake tar:xz iconv gmake libtool 
 
diff --git a/devel/art/Makefile b/devel/art/Makefile
index 3113c8cf8655..8ada2a30af37 100644
--- a/devel/art/Makefile
+++ b/devel/art/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Resource tracing, debugging, and profiling tool
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+LIB_DEPENDS=	libxml++-2.6.so:textproc/libxml++26
 
 USES=	gmake pkgconfig
 
diff --git a/devel/artifactory/Makefile b/devel/artifactory/Makefile
index ac51b896a9b6..b3b2445ba17d 100644
--- a/devel/artifactory/Makefile
+++ b/devel/artifactory/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSER
 LICENSE_FILE_APACHE20=	${WRKSRC}/tomcat/LICENSE
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-oss-${PORTVERSION}
 
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index cceaf4e0bb09..98dc9d8e39b7 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	i386
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake
 USE_GCC=	any
diff --git a/devel/atlassian-plugin-sdk/Makefile b/devel/atlassian-plugin-sdk/Makefile
index ffdfe3e91750..315ad9f79a53 100644
--- a/devel/atlassian-plugin-sdk/Makefile
+++ b/devel/atlassian-plugin-sdk/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	https://maven.atlassian.com/content/repositories/atlassian-public/
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Atlassian Plugin SDK
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index e692abd9e93e..09cb64088c84 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -10,10 +10,10 @@ DISTNAME=	autoconf-${PORTVERSION}
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		help2man:${PORTSDIR}/misc/help2man
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper
+BUILD_DEPENDS=	gm4:devel/m4 \
+		help2man:misc/help2man
+RUN_DEPENDS=	gm4:devel/m4 \
+		autoconf-wrapper:devel/autoconf-wrapper
 
 BUILD_VERSION=	2.69
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 8837d78b5905..47ccf8cea573 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -15,9 +15,9 @@ PKGNAMESUFFIX=	213
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Automatically configure source code on many Un*x platforms (legacy 2.13)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper
+BUILD_DEPENDS=	gm4:devel/m4
+RUN_DEPENDS=	gm4:devel/m4 \
+		autoconf-wrapper:devel/autoconf-wrapper
 
 BUILD_VERSION=	2.13
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
diff --git a/devel/autodia/Makefile b/devel/autodia/Makefile
index 2cd186270fd3..25b216dbb22a 100644
--- a/devel/autodia/Makefile
+++ b/devel/autodia/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Automatic Dia XML - from Source Code and Data
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-HTML-Mason>=0:${PORTSDIR}/www/p5-HTML-Mason
+BUILD_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-HTML-Mason>=0:www/p5-HTML-Mason
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
@@ -32,9 +32,9 @@ OPTIONS_DEFAULT=	GRAPHVIZ SPRINGGRAPH VCG
 SPRINGGRAPH_DESC=	SpringGraph support
 VCG_DESC=		VCG support
 
-GRAPHVIZ_RUN_DEPENDS=	p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
-SPRINGGRAPH_RUN_DEPENDS=	p5-SpringGraph>=0:${PORTSDIR}/graphics/p5-SpringGraph
-VCG_RUN_DEPENDS=	p5-VCG>=0:${PORTSDIR}/graphics/p5-VCG
+GRAPHVIZ_RUN_DEPENDS=	p5-GraphViz>=0:graphics/p5-GraphViz
+SPRINGGRAPH_RUN_DEPENDS=	p5-SpringGraph>=0:graphics/p5-SpringGraph
+VCG_RUN_DEPENDS=	p5-VCG>=0:graphics/p5-VCG
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 08526e3cdbae..628aaffd8557 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tool designed to simplify the creation and maintenance of programs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 
 USES=		gmake libtool pathfix perl5 pkgconfig shebangfix tar:xz
 USE_PERL5=	build
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 058a40c2ab75..637813c4ad96 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GNU
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	GNU Standards-compliant Makefile generator
 
-BUILD_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf
-RUN_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		automake-wrapper:${PORTSDIR}/devel/automake-wrapper
+BUILD_DEPENDS=	autoconf-2.69:devel/autoconf
+RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
+		automake-wrapper:devel/automake-wrapper
 
 BUILD_VERSION=	1.15
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile
index 984a0743f041..06af96a58e1d 100644
--- a/devel/autotools/Makefile
+++ b/devel/autotools/Makefile
@@ -13,10 +13,10 @@ DISTFILES=	# none
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Autotools meta-port
 
-RUN_DEPENDS=	libtoolize:${PORTSDIR}/devel/libtool \
-		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
-		autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		automake-1.15:${PORTSDIR}/devel/automake
+RUN_DEPENDS=	libtoolize:devel/libtool \
+		autoconf-2.13:devel/autoconf213 \
+		autoconf-2.69:devel/autoconf \
+		automake-1.15:devel/automake
 
 PLIST_FILES=	share/${PORTNAME}
 NO_BUILD=	yes
diff --git a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile
index 9865f68c521e..4b280da834b0 100644
--- a/devel/avr-gcc-devel/Makefile
+++ b/devel/avr-gcc-devel/Makefile
@@ -15,13 +15,13 @@ COMMENT=	FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libmpc.so:${PORTSDIR}/math/mpc
-RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
+BUILD_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libgmp.so:math/gmp \
+		libmpc.so:math/mpc
+RUN_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 8c0eb3d2f6b0..56bd04c3455d 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -13,13 +13,13 @@ COMMENT=	FSF GCC 4.x for Atmel AVR 8-bit RISC cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libmpc.so:${PORTSDIR}/math/mpc
-RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils
+BUILD_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
+LIB_DEPENDS=	libmpfr.so:math/mpfr \
+		libgmp.so:math/gmp \
+		libmpc.so:math/mpc
+RUN_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils
 
 # DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
 # of executables and directories once installed.  A PORTVERSION of
diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index e4517e06559b..bf78d1a2b113 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gdb-${PORTVERSION}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	GNU GDB for the AVR target
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake ncurses tar:bzip2
 
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 4a6178f508b4..80df5b9d4956 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -14,12 +14,12 @@ COMMENT=	C and math library for the Atmel AVR controller family
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils \
-		avr-gcc:${PORTSDIR}/devel/avr-gcc
-RUN_DEPENDS=	avr-as:${PORTSDIR}/devel/avr-binutils \
-		avr-ld:${PORTSDIR}/devel/avr-binutils \
-		avr-gcc:${PORTSDIR}/devel/avr-gcc
+BUILD_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils \
+		avr-gcc:devel/avr-gcc
+RUN_DEPENDS=	avr-as:devel/avr-binutils \
+		avr-ld:devel/avr-binutils \
+		avr-gcc:devel/avr-gcc
 
 OPTIONS_DEFINE=	DOXYGEN
 
@@ -31,10 +31,10 @@ OPTIONS_DEFINE=	DOXYGEN
 
 .if ${PORT_OPTIONS:MDOXYGEN}
 USE_TEX=	latex:build
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
-		fig2dev:${PORTSDIR}/print/transfig \
-		jpegtopnm:${PORTSDIR}/graphics/netpbm \
-		dvips:${PORTSDIR}/print/tex-dvipsk
+BUILD_DEPENDS+=	doxygen:devel/doxygen \
+		fig2dev:print/transfig \
+		jpegtopnm:graphics/netpbm \
+		dvips:print/tex-dvipsk
 .endif
 
 USES=		gettext-tools tar:bzip2 gmake
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index a09a3fa4bf49..fb0a25fd25a9 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -21,7 +21,7 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	FTDI
 OPTIONS_DEFAULT=	FTDI
 FTDI_DESC=	libftdi support
-FTDI_LIB_DEPENDS=	libftdi1.so:${PORTSDIR}/devel/libftdi1
+FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile
index b70c04455941..f70258c1700c 100644
--- a/devel/avro-cpp/Makefile
+++ b/devel/avro-cpp/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Data serialization system for C++
 
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 USES=		cmake python:build
 USE_LDCONFIG=	yes
diff --git a/devel/avro/Makefile b/devel/avro/Makefile
index d21ac6817882..172df723a0bf 100644
--- a/devel/avro/Makefile
+++ b/devel/avro/Makefile
@@ -19,8 +19,8 @@ PYTHON_DESC=	Install Python library
 
 OPTIONS_DEFAULT=C CPP PYTHON
 
-C_LIB_DEPENDS=		libavro.so:${PORTSDIR}/devel/avro-c
-CPP_LIB_DEPENDS=	libavrocpp.so:${PORTSDIR}/devel/avro-cpp
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}avro:${PORTSDIR}/devel/py-avro
+C_LIB_DEPENDS=		libavro.so:devel/avro-c
+CPP_LIB_DEPENDS=	libavrocpp.so:devel/avro-cpp
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}avro:devel/py-avro
 
 .include <bsd.port.mk>
diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 46ed617c4273..5a46764d9153 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Universal Command Line Interface for Amazon Web Services
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.4.5:${PORTSDIR}/devel/py-botocore \
-		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:${PORTSDIR}/devel/py-colorama \
-		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.0.1:${PORTSDIR}/net/py-s3transfer \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:${PORTSDIR}/security/py-rsa
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}botocore>=1.4.5:devel/py-botocore \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama \
+		${PYTHON_PKGNAMEPREFIX}s3transfer>=0.0.1:net/py-s3transfer \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
@@ -23,7 +23,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 2700
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bbfreeze/Makefile b/devel/bbfreeze/Makefile
index 60066ae76c0f..97e41a621b21 100644
--- a/devel/bbfreeze/Makefile
+++ b/devel/bbfreeze/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Module to create standalone executables from Python scripts
 
 LICENSE=	ZLIB
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:${PORTSDIR}/math/py-altgraph \
-		${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:${PORTSDIR}/devel/bbfreeze-loader
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph \
+		${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile
index e6f4a437ab6e..2d45f1f2ae30 100644
--- a/devel/beautifyphp/Makefile
+++ b/devel/beautifyphp/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	beautify_php_${PORTVERSION}
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP4
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/bennugd-modules/Makefile b/devel/bennugd-modules/Makefile
index 6ebd411309d7..fa94aa1d3b29 100644
--- a/devel/bennugd-modules/Makefile
+++ b/devel/bennugd-modules/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	bennugd-${PORTVERSION}
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	High level open source game development suite, modules
 
-LIB_DEPENDS=	libbgdrtm.so:${PORTSDIR}/devel/bennugd-core \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libbgdrtm.so:devel/bennugd-core \
+		libpng.so:graphics/png
 
 USES=		tar:bzip2 dos2unix pkgconfig libtool
 USE_SDL=	sdl mixer
diff --git a/devel/bicyclerepair/Makefile b/devel/bicyclerepair/Makefile
index 54f66509e454..40485a9b7628 100644
--- a/devel/bicyclerepair/Makefile
+++ b/devel/bicyclerepair/Makefile
@@ -16,7 +16,7 @@ USE_PYTHON=	distutils
 OPTIONS_DEFINE=	DOCS
 
 .if defined(EMACS_PORT_NAME)
-RUN_DEPENDS+=	${LOCALBASE}/bin/pymacs-services:${PORTSDIR}/devel/pymacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/pymacs-services:devel/pymacs
 .endif
 
 post-install:
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 6ab66c4fbff9..6781e6252100 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -14,8 +14,8 @@ COMMENT?=	GNU binary tools
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \
-		${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.so:math/gmp \
+		${LOCALBASE}/lib/libmpfr.so:math/mpfr
 
 CONFLICTS=	libbfd-[0-9]*
 
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index ee501c70b993..dfb8dea0579c 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Parser generator from FSF, (mostly) compatible with Yacc
 
-BUILD_DEPENDS=	m4>=1.4.16,1:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	m4>=1.4.16,1:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	m4>=1.4.16,1:devel/m4
+RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
 
 OPTIONS_DEFINE=	EXAMPLES NLS
 
diff --git a/devel/bisoncpp/Makefile b/devel/bisoncpp/Makefile
index a8bcec61bba5..f2546e404999 100644
--- a/devel/bisoncpp/Makefile
+++ b/devel/bisoncpp/Makefile
@@ -11,9 +11,9 @@ COMMENT=	LALR(1) parser generator that generates C++ classes
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
-		yodl>=3.0:${PORTSDIR}/textproc/yodl \
-		libbobcat>=3.18:${PORTSDIR}/devel/libbobcat
+BUILD_DEPENDS=	icmake:devel/icmake \
+		yodl>=3.0:textproc/yodl \
+		libbobcat>=3.18:devel/libbobcat
 
 DOCSDIR=	${PREFIX}/share/doc/bisonc++
 PORTDOCS=	*
diff --git a/devel/bncsutil-ghost++/Makefile b/devel/bncsutil-ghost++/Makefile
index ba2f1c701060..75ec002b5444 100644
--- a/devel/bncsutil-ghost++/Makefile
+++ b/devel/bncsutil-ghost++/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Utility library for Battle.net clients in C++
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 PROJECTHOST=	ghostplusplus
 PROJECTVERSION=	17.1
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 564493b1865f..b71452ad688d 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -19,7 +19,7 @@ LICENSE_NAME=	Boehm-Demers-Weiser Garbage Collector License
 LICENSE_TEXT=	License can be found at http://www.hboehm.info/gc/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 
 GNU_CONFIGURE=	yes
 USES=		cpe libtool pathfix pkgconfig
@@ -41,7 +41,7 @@ PLIST_FILES=	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
 		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
 		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \
 		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
-RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc
+RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:devel/boehm-gc
 . if ${GC_VARIANT} == "redirect"
 CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc
 . endif
diff --git a/devel/boost-all/Makefile b/devel/boost-all/Makefile
index cd7975a86955..20afde0070e5 100644
--- a/devel/boost-all/Makefile
+++ b/devel/boost-all/Makefile
@@ -15,9 +15,9 @@ PYTHON_DESC=	Boost.Python - interfacing Python and C++
 
 .include "common.mk"
 
-LIBRARIES_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:${PORTSDIR}/devel/boost-libs
-JAM_RUN_DEPENDS=	${LOCALBASE}/bin/bjam:${PORTSDIR}/devel/boost-jam
-PYTHON_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_python.so:${PORTSDIR}/devel/boost-python-libs
-DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/boost/doc/html/index.html:${PORTSDIR}/devel/boost-docs
+LIBRARIES_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs
+JAM_RUN_DEPENDS=	${LOCALBASE}/bin/bjam:devel/boost-jam
+PYTHON_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_python.so:devel/boost-python-libs
+DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/boost/doc/html/index.html:devel/boost-docs
 
 .include <bsd.port.mk>
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 11cbe43a0ac5..9263ed7c2b4f 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	10
 
 COMMENT=	Free portable C++ libraries (without Boost.Python)
 
-BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
+BUILD_DEPENDS+=	bjam:devel/boost-jam
 
 OPTIONS_DEFINE=		VERBOSE_BUILD DEBUG OPTIMIZED_CFLAGS
 OPTIONS_MULTI=		LOCALE
@@ -19,7 +19,7 @@ ICU_DESC=		Boost.Regex/Locale with ICU unicode support
 ICONV_USES=		iconv
 ICONV_VARS=		BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX}
 ICONV_VARS_OFF=		BJAM_ARGS+=boost.locale.iconv=off
-ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_VARS=		BJAM_ARGS+=-sICU_PATH=${LOCALBASE}
 ICU_VARS_OFF=		BJAM_ARGS+=boost.locale.icu=off
 
diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index e09d3c30a6b5..4985a8ccdb03 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -18,9 +18,9 @@ MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
 		PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
 
-LIB_DEPENDS+=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	libboost_thread.so:devel/boost-libs
 
-BUILD_DEPENDS+=	${BJAM}:${PORTSDIR}/devel/boost-jam
+BUILD_DEPENDS+=	${BJAM}:devel/boost-jam
 
 do-build:
 	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/v2/site-config.jam
diff --git a/devel/boost_build/Makefile b/devel/boost_build/Makefile
index 49cb6b9c02ae..3dd58ec08ff1 100644
--- a/devel/boost_build/Makefile
+++ b/devel/boost_build/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extensible cross-platform build tool suite
 
 LICENSE=	BSL
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bjam:${PORTSDIR}/devel/boost-jam
+RUN_DEPENDS=	${LOCALBASE}/bin/bjam:devel/boost-jam
 
 USES=		tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME:S/_/-/g}
diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index c34ca1477e52..24667c1d0332 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Fancy interface to the Python interpreter
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:${PORTSDIR}/devel/py-curtsies \
-		${PYTHON_PKGNAMEPREFIX}greenlet>=0:${PORTSDIR}/devel/py-greenlet \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies \
+		${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
 
 OPTIONS_DEFINE=	EXAMPLES NLS
 OPTIONS_SUB=	yes
diff --git a/devel/bsdowl/Makefile b/devel/bsdowl/Makefile
index 53b4f2a409f2..3b9bbfa823c8 100644
--- a/devel/bsdowl/Makefile
+++ b/devel/bsdowl/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME=	CeCILL B, Version 1.0
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick
-BUILD_DEPENDS=	gm:${PORTSDIR}/graphics/GraphicsMagick
+BUILD_DEPENDS=	gm:graphics/GraphicsMagick
+BUILD_DEPENDS=	gm:graphics/GraphicsMagick
 
 USES=		tar:xz uidfix
 
diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile
index e8b8cc390a2c..9bcfcea3eaa6 100644
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -12,18 +12,18 @@ LICENSE=	MPL
 
 # see Bugzilla/Install/Requirements.pm
 RUN_DEPENDS=	\
-		p5-CGI>=3.51:${PORTSDIR}/www/p5-CGI \
-		p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Send>=2.04:${PORTSDIR}/mail/p5-Email-Send \
-		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-List-MoreUtils>=0.32:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Math-Random-ISAAC>=1.001:${PORTSDIR}/math/p5-Math-Random-ISAAC \
-		p5-Template-Toolkit>=2.24:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-TimeDate>=2.23:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=1.55:${PORTSDIR}/net/p5-URI
+		p5-CGI>=3.51:www/p5-CGI \
+		p5-DBI>=1.614:databases/p5-DBI \
+		p5-DateTime-TimeZone>=1.64:devel/p5-DateTime-TimeZone \
+		p5-DateTime>=0.75:devel/p5-DateTime \
+		p5-Email-MIME>=1.904:mail/p5-Email-MIME \
+		p5-Email-Send>=2.04:mail/p5-Email-Send \
+		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \
+		p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \
+		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
+		p5-TimeDate>=2.23:devel/p5-TimeDate \
+		p5-URI>=1.55:net/p5-URI
 
 USES=		cpe perl5
 USE_PERL5=	run
@@ -44,9 +44,9 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} >= 501800
 # PR 194782: silence Module::Pluggable deprecated warnings
-RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 # PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv
-RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
@@ -55,113 +55,113 @@ USE_APACHE_RUN=	22+
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
-RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
-RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		sqlite3>=3:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		sqlite3>=3:databases/sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MGRAPH_REPORTS}
-RUN_DEPENDS+=	p5-GD>=1.20:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Template-GD>=0:${PORTSDIR}/www/p5-Template-GD
+RUN_DEPENDS+=	p5-GD>=1.20:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Template-GD>=0:www/p5-Template-GD
 .endif
 
 .if ${PORT_OPTIONS:MCHARTING_MODULES}
-RUN_DEPENDS+=	p5-Chart>=2.4.10:${PORTSDIR}/graphics/p5-Chart
+RUN_DEPENDS+=	p5-Chart>=2.4.10:graphics/p5-Chart
 .endif
 
 .if ${PORT_OPTIONS:MPATCH_VIEWER}
-RUN_DEPENDS+=	p5-PatchReader>=0.9.6:${PORTSDIR}/devel/p5-PatchReader \
-		interdiff:${PORTSDIR}/misc/patchutils
+RUN_DEPENDS+=	p5-PatchReader>=0.9.6:devel/p5-PatchReader \
+		interdiff:misc/patchutils
 .endif
 
 .if ${PORT_OPTIONS:MMORE_HTML}
-RUN_DEPENDS+=	p5-HTML-Parser>=3.67:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
+RUN_DEPENDS+=	p5-HTML-Parser>=3.67:www/p5-HTML-Parser \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 .endif
 
 .if ${PORT_OPTIONS:MINBOUND_EMAIL}
-RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:${PORTSDIR}/mail/p5-Email-MIME-Attachment-Stripper \
-		p5-Email-Reply>=0:${PORTSDIR}/mail/p5-Email-Reply \
-		p5-HTML-FormatText-WithLinks>=0.13:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
+RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \
+		p5-Email-Reply>=0:mail/p5-Email-Reply \
+		p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks
 .endif
 
 .if ${PORT_OPTIONS:MMAIL_QUEUEING}
-RUN_DEPENDS+=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Daemon-Generic>=0:${PORTSDIR}/net/p5-Daemon-Generic \
-		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp
+RUN_DEPENDS+=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+		p5-Daemon-Generic>=0:net/p5-Daemon-Generic \
+		p5-File-Slurp>=9999.13:devel/p5-File-Slurp
 .endif
 
 .if ${PORT_OPTIONS:MMOVE_BUGZ}
-RUN_DEPENDS+=	p5-MIME-Tools>=5.406:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MBMP2PNG}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
 .if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC}
-RUN_DEPENDS+=	p5-Test-Taint>=1.06:${PORTSDIR}/devel/p5-Test-Taint
+RUN_DEPENDS+=	p5-Test-Taint>=1.06:devel/p5-Test-Taint
 .endif
 
 .if ${PORT_OPTIONS:MXMLRPC}
-RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:${PORTSDIR}/net/p5-XMLRPC-Lite
+RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite
 # XXX SOAP::Lite can be removed if upstream officially depends on
 # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm
-RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite
 .endif
 
 .if ${PORT_OPTIONS:MJSONRPC}
-RUN_DEPENDS+=	p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC \
-		p5-JSON-XS>=2.0:${PORTSDIR}/converters/p5-JSON-XS
+RUN_DEPENDS+=	p5-JSON-RPC>=0:devel/p5-JSON-RPC \
+		p5-JSON-XS>=2.0:converters/p5-JSON-XS
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-Apache-DBI>=0:www/p5-Apache-DBI
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 .endif
 
 .if ${PORT_OPTIONS:MEXPORT_IMPORT}
-RUN_DEPENDS+=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 .if ${PORT_OPTIONS:MRADIUS}
-RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS+=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_AUTH}
-RUN_DEPENDS+=	p5-Authen-SASL>=2.16:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS+=	p5-Authen-SASL>=2.16:security/p5-Authen-SASL
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_SSL}
-RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:${PORTSDIR}/mail/p5-Net-SMTP-SSL
+RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:mail/p5-Net-SMTP-SSL
 .endif
 
 .if ${PORT_OPTIONS:MMIME_SNIFF}
-RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy
 .endif
 
 post-extract:
diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile
index afa28faa0b80..f210b10761f5 100644
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -13,20 +13,20 @@ LICENSE=	MPL
 
 # see Bugzilla/Install/Requirements.pm
 RUN_DEPENDS=	\
-		p5-CGI>=3.51:${PORTSDIR}/www/p5-CGI \
-		p5-DBI>=1.614:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime-TimeZone>=1.64:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime>=0.75:${PORTSDIR}/devel/p5-DateTime \
-		p5-Email-MIME>=1.904:${PORTSDIR}/mail/p5-Email-MIME \
-		p5-Email-Sender>=1.300011:${PORTSDIR}/mail/p5-Email-Sender \
-		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-JSON-XS>=2.01:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-List-MoreUtils>=0.32:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Math-Random-ISAAC>=1.001:${PORTSDIR}/math/p5-Math-Random-ISAAC \
-		p5-Template-Toolkit>=2.24:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-TimeDate>=2.23:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=1.55:${PORTSDIR}/net/p5-URI
+		p5-CGI>=3.51:www/p5-CGI \
+		p5-DBI>=1.614:databases/p5-DBI \
+		p5-DateTime-TimeZone>=1.64:devel/p5-DateTime-TimeZone \
+		p5-DateTime>=0.75:devel/p5-DateTime \
+		p5-Email-MIME>=1.904:mail/p5-Email-MIME \
+		p5-Email-Sender>=1.300011:mail/p5-Email-Sender \
+		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
+		p5-JSON-XS>=2.01:converters/p5-JSON-XS \
+		p5-List-MoreUtils>=0.32:lang/p5-List-MoreUtils \
+		p5-Math-Random-ISAAC>=1.001:math/p5-Math-Random-ISAAC \
+		p5-Template-Toolkit>=2.24:www/p5-Template-Toolkit \
+		p5-TimeDate>=2.23:devel/p5-TimeDate \
+		p5-URI>=1.55:net/p5-URI
 
 USES=		cpe perl5
 USE_PERL5=	run
@@ -47,9 +47,9 @@ EMPTY_DIRS_LIST=data graphs contrib lib t xt
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} >= 501800
 # PR 194782: silence Module::Pluggable deprecated warnings
-RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 # PR 196060,196100: explicitly depend on textproc/p5-Text-Tabv
-RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+RUN_DEPENDS+=	p5-Text-Tabs+Wrap>=2013.0523:textproc/p5-Text-Tabs+Wrap
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
@@ -58,115 +58,115 @@ USE_APACHE_RUN=	22+
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=4.0001:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql:91+
-RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=3.4.2:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
-RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		sqlite3>=3:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		sqlite3>=3:databases/sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MGRAPH_REPORTS}
-RUN_DEPENDS+=	p5-GD>=1.20:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil \
-		p5-Template-GD>=0:${PORTSDIR}/www/p5-Template-GD
+RUN_DEPENDS+=	p5-GD>=1.20:graphics/p5-GD \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil \
+		p5-Template-GD>=0:www/p5-Template-GD
 .endif
 
 .if ${PORT_OPTIONS:MCHARTING_MODULES}
-RUN_DEPENDS+=	p5-Chart>=2.4.10:${PORTSDIR}/graphics/p5-Chart
+RUN_DEPENDS+=	p5-Chart>=2.4.10:graphics/p5-Chart
 .endif
 
 .if ${PORT_OPTIONS:MPATCH_VIEWER}
-RUN_DEPENDS+=	p5-PatchReader>=0.9.6:${PORTSDIR}/devel/p5-PatchReader \
-		interdiff:${PORTSDIR}/misc/patchutils
+RUN_DEPENDS+=	p5-PatchReader>=0.9.6:devel/p5-PatchReader \
+		interdiff:misc/patchutils
 .endif
 
 .if ${PORT_OPTIONS:MMORE_HTML}
-RUN_DEPENDS+=	p5-HTML-Parser>=3.67:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
+RUN_DEPENDS+=	p5-HTML-Parser>=3.67:www/p5-HTML-Parser \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 .endif
 
 .if ${PORT_OPTIONS:MINBOUND_EMAIL}
-RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:${PORTSDIR}/mail/p5-Email-MIME-Attachment-Stripper \
-		p5-Email-Reply>=0:${PORTSDIR}/mail/p5-Email-Reply \
-		p5-HTML-FormatText-WithLinks>=0.13:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks
+RUN_DEPENDS+=	p5-Email-MIME-Attachment-Stripper>=0:mail/p5-Email-MIME-Attachment-Stripper \
+		p5-Email-Reply>=0:mail/p5-Email-Reply \
+		p5-HTML-FormatText-WithLinks>=0.13:textproc/p5-HTML-FormatText-WithLinks
 .endif
 
 .if ${PORT_OPTIONS:MMAIL_QUEUEING}
-RUN_DEPENDS+=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Daemon-Generic>=0:${PORTSDIR}/net/p5-Daemon-Generic
+RUN_DEPENDS+=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+		p5-Daemon-Generic>=0:net/p5-Daemon-Generic
 .endif
 
 .if ${PORT_OPTIONS:MMOVE_BUGZ}
-RUN_DEPENDS+=	p5-MIME-Tools>=5.406:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MBMP2PNG}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	convert:graphics/ImageMagick
 .endif
 
 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST
 # and will likely be removed in the Bugzilla 7.0 release.
 .if ${PORT_OPTIONS:MXMLRPC} || ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST}
-RUN_DEPENDS+=	p5-Test-Taint>=1.06:${PORTSDIR}/devel/p5-Test-Taint
+RUN_DEPENDS+=	p5-Test-Taint>=1.06:devel/p5-Test-Taint
 .endif
 
 .if ${PORT_OPTIONS:MXMLRPC}
-RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:${PORTSDIR}/net/p5-XMLRPC-Lite
+RUN_DEPENDS+=	p5-XMLRPC-Lite>=0.712:net/p5-XMLRPC-Lite
 # XXX SOAP::Lite can be removed if upstream officially depends on
 # XMLRPC::Lite>=0.717, see Bugzilla/Install/Requirements.pm
-RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS+=	p5-SOAP-Lite>=0.712:net/p5-SOAP-Lite
 .endif
 
 .if ${PORT_OPTIONS:MJSONRPC} || ${PORT_OPTIONS:MREST}
-RUN_DEPENDS+=	p5-JSON-RPC>=0:${PORTSDIR}/devel/p5-JSON-RPC
+RUN_DEPENDS+=	p5-JSON-RPC>=0:devel/p5-JSON-RPC
 .endif
 
 .if ${PORT_OPTIONS:MMODPERL}
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2 \
-		p5-Apache-DBI>=0:${PORTSDIR}/www/p5-Apache-DBI
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2 \
+		p5-Apache-DBI>=0:www/p5-Apache-DBI
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 .endif
 
 .if ${PORT_OPTIONS:MEXPORT_IMPORT}
-RUN_DEPENDS+=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS+=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
-RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 .if ${PORT_OPTIONS:MRADIUS}
-RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
+RUN_DEPENDS+=	p5-Authen-Radius>=0:security/p5-Authen-Radius
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_AUTH}
-RUN_DEPENDS+=	p5-Authen-SASL>=2.16:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS+=	p5-Authen-SASL>=2.16:security/p5-Authen-SASL
 .endif
 
 .if ${PORT_OPTIONS:MSMTP_SSL}
-RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:${PORTSDIR}/mail/p5-Net-SMTP-SSL
+RUN_DEPENDS+=	p5-Net-SMTP-SSL>=1.01:mail/p5-Net-SMTP-SSL
 .endif
 
 .if ${PORT_OPTIONS:MMIME_SNIFF}
-RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS+=	p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-RUN_DEPENDS+=	p5-Cache-Memcached>=1.30:${PORTSDIR}/databases/p5-Cache-Memcached
+RUN_DEPENDS+=	p5-Cache-Memcached>=1.30:databases/p5-Cache-Memcached
 .endif
 
 post-extract:
diff --git a/devel/build/Makefile b/devel/build/Makefile
index 465ae92f91e3..711be8c80f28 100644
--- a/devel/build/Makefile
+++ b/devel/build/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Massively-parallel build system implemented on top of GNU make
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake tar:bzip2
diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index 621d33769975..a7ae475f82b8 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Continuous Integration Framework (Slave)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=8.0.0:${PORTSDIR}/devel/py-twisted
-TEST_DEPENDS=	trial:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=8.0.0:devel/py-twisted
+TEST_DEPENDS=	trial:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index ff4331217d20..bf86972ad689 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Continuous Integration Framework (Master)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:${PORTSDIR}/databases/py-sqlalchemy-migrate \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-TEST_DEPENDS=	trial:${PORTSDIR}/devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}boto>0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}txrequests>0:${PORTSDIR}/www/py-txrequests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=11.0.0:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.6:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+TEST_DEPENDS=	trial:devel/py-twisted \
+		${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile
index 8d80f60eec4f..1cd124534029 100644
--- a/devel/buildtool-doc/Makefile
+++ b/devel/buildtool-doc/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/buildtool/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Buildtool User's and Developer's manuals
 
-BUILD_DEPENDS=	${BUILDTOOL}:${PORTSDIR}/devel/buildtool \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		xmlcatalog:${PORTSDIR}/textproc/libxml2 \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${DOCBOOK_XSL}:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${BUILDTOOL}:devel/buildtool \
+		xsltproc:textproc/libxslt \
+		xmlcatalog:textproc/libxml2 \
+		docbook-xml>0:textproc/docbook-xml \
+		${DOCBOOK_XSL}:textproc/docbook-xsl
 
 BUILDTOOL=	${LOCALBASE}/bin/buildtool
 CONFIGURE_ARGS=	--prefix=${STAGEDIR}${PREFIX} --dir-doc=${STAGEDIR}${DOCSDIR} \
diff --git a/devel/busybee/Makefile b/devel/busybee/Makefile
index 07c11f5cb184..53445bbe7286 100644
--- a/devel/busybee/Makefile
+++ b/devel/busybee/Makefile
@@ -11,8 +11,8 @@ COMMENT=	High-performance messaging layer
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libe.so:${PORTSDIR}/devel/libe
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:${PORTSDIR}/devel/libpo6
+LIB_DEPENDS=	libe.so:devel/libe
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:devel/libpo6
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/bzr-builder/Makefile b/devel/bzr-builder/Makefile
index 0f9ab86a4c23..f344fbcaa2a0 100644
--- a/devel/bzr-builder/Makefile
+++ b/devel/bzr-builder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Bzr plugin to construct a bzr branch based on a "recipe"
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-colo/Makefile b/devel/bzr-colo/Makefile
index e93d54942779..589434a8f8e9 100644
--- a/devel/bzr-colo/Makefile
+++ b/devel/bzr-colo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Plugin for bzr to support colocated branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index 4f3b7db42547..d50479faede2 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Desktop application for using bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:${PORTSDIR}/devel/qbzr \
-		bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr \
+		bzr:devel/bzr
 
 USES=		gettext python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/bzr-externals/Makefile b/devel/bzr-externals/Makefile
index 3895af8e85fd..1ec19fe34216 100644
--- a/devel/bzr-externals/Makefile
+++ b/devel/bzr-externals/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Support external branches like svn:externals
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/externals
 
diff --git a/devel/bzr-fastimport/Makefile b/devel/bzr-fastimport/Makefile
index b8940ced5214..6cbec84116ac 100644
--- a/devel/bzr-fastimport/Makefile
+++ b/devel/bzr-fastimport/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Provide fast loading of revision control data into bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_SITELIBDIR}/fastimport/__init__.py:${PORTSDIR}/devel/py-fastimport
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-git/Makefile b/devel/bzr-git/Makefile
index 8371d449c65b..87a40b2949c3 100644
--- a/devel/bzr-git/Makefile
+++ b/devel/bzr-git/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Plugin for bzr to work with git trees
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 7809be1059ab..11ed4347dd43 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GTK interface to Bazaar-NG VCS
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}cairo>=0:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo
 
 
 USES=		desktop-file-utils python
diff --git a/devel/bzr-loom/Makefile b/devel/bzr-loom/Makefile
index a734d5db51cc..54277ee22d61 100644
--- a/devel/bzr-loom/Makefile
+++ b/devel/bzr-loom/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Bazaar plugin to assist in developing focused patches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-pipeline/Makefile b/devel/bzr-pipeline/Makefile
index 3baa5ffb1a12..0689cf5776a4 100644
--- a/devel/bzr-pipeline/Makefile
+++ b/devel/bzr-pipeline/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Bzr tools for working with a sequence of branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/bzr-rewrite/Makefile b/devel/bzr-rewrite/Makefile
index 88c2d5b39d31..9f3dbc26738f 100644
--- a/devel/bzr-rewrite/Makefile
+++ b/devel/bzr-rewrite/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Bzr plugin that provides rewriting existing revisions
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/bzr-scmproj/Makefile b/devel/bzr-scmproj/Makefile
index c3714100aaed..e39fb794a351 100644
--- a/devel/bzr-scmproj/Makefile
+++ b/devel/bzr-scmproj/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Organise and manage a collection of bzr branches
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/bzr-stats/Makefile b/devel/bzr-stats/Makefile
index 5064dc09d1d8..8d3637164a21 100644
--- a/devel/bzr-stats/Makefile
+++ b/devel/bzr-stats/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://launchpadlibrarian.net/65203347/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple statistics plugin for bzr
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 LICENSE=	GPLv2
 
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index 4a2f28615540..5e308db668c8 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Plugin for bzr to work with svn
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/subvertpy/__init__.py:${PORTSDIR}/devel/py-subvertpy \
-		bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS+=	bzr:devel/bzr
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy \
+		bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index ac21eaf5f081..9adeec085f16 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bzr plugin to incrementally upload changes to a dumb server
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index da3c62043354..8a413f248300 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -11,15 +11,15 @@ MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	Distributed version control system by Canonical
 
 # Often not needed, but it's cheap insurance
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython:lang/cython
 
 OPTIONS_DEFINE=	SFTP CA_BUNDLE
 SFTP_DESC=	Paramiko for SFTP support
 CA_BUNDLE_DESC=	Include CA bundle for SSL cert validation
 OPTIONS_DEFAULT=	SFTP CA_BUNDLE
 
-SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+SFTP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	bzr
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index 772f203f0767..3d7204bdd518 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extensions to devel/bzr
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	bzr:devel/bzr
 
 OPTIONS_DEFINE=	GRAPHVIZ RSYNC
 GRAPHVIZ_DESC=	graphviz for graph-ancestry
@@ -23,7 +23,7 @@ USES=		python
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	BzrTools
 
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
-RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
+RSYNC_RUN_DEPENDS=	rsync:net/rsync
 
 .include <bsd.port.mk>
diff --git a/devel/c2mdoc/Makefile b/devel/c2mdoc/Makefile
index 58f5067504ec..e7efe7bf3bd4 100644
--- a/devel/c2mdoc/Makefile
+++ b/devel/c2mdoc/Makefile
@@ -11,7 +11,7 @@ DISTFILES=
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Script to generate mdoc(7) markup from C functions
 
-RUN_DEPENDS=	cproto:${PORTSDIR}/devel/cproto
+RUN_DEPENDS=	cproto:devel/cproto
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/caf/Makefile b/devel/caf/Makefile
index 38e95b13df01..2ba26ddcd1b9 100644
--- a/devel/caf/Makefile
+++ b/devel/caf/Makefile
@@ -56,8 +56,8 @@ regression-test: test
 
 .if ${OSVERSION} < 1001000
 # require clang & libc++
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 \
-		${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34 \
+		${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
 CXXFLAGS+=	-stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib
 .endif
 
diff --git a/devel/cargo/Makefile b/devel/cargo/Makefile
index 36ca63b98989..cb2fd5c867b5 100644
--- a/devel/cargo/Makefile
+++ b/devel/cargo/Makefile
@@ -56,11 +56,11 @@ CARGO_REGISTRY_CUR_HASH=	88ac128001ac3a9a
 
 # We don't USES=cmake here, because cmake is not Cargo's build system.
 # It's used by a bundled dependency (libgit2).
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake \
-		${RUST_PORT:T}>=1.5.0:${PORTSDIR}/${RUST_PORT}
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	rustc:${PORTSDIR}/${RUST_PORT}
+BUILD_DEPENDS=	cmake:devel/cmake \
+		${RUST_PORT:T}>=1.5.0:${RUST_PORT}
+LIB_DEPENDS=	libssh2.so:security/libssh2 \
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	rustc:${RUST_PORT}
 RUST_PORT?=	lang/rust
 
 USES=		gmake python:-2.7,build pkgconfig
diff --git a/devel/catch/Makefile b/devel/catch/Makefile
index d681a256a126..f203ca837943 100644
--- a/devel/catch/Makefile
+++ b/devel/catch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Header-only test framework for C++
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
-TEST_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+TEST_DEPENDS=	cmake:devel/cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	philsquared
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 1a8c9bb0856d..4d35f485bfd3 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical front end for cscope and cscope clones
 
-RUN_DEPENDS=	cscope:${PORTSDIR}/devel/cscope
+RUN_DEPENDS=	cscope:devel/cscope
 
 USES+=		tk:run
 NO_BUILD=	yes
diff --git a/devel/ccons/Makefile b/devel/ccons/Makefile
index 658e55a45178..62ae6672b7f5 100644
--- a/devel/ccons/Makefile
+++ b/devel/ccons/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Interactive Console for the C Programming Language
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	llvm-config33:${PORTSDIR}/devel/llvm33 \
-		clang++33:${PORTSDIR}/lang/clang33
-RUN_DEPENDS=	clang++33:${PORTSDIR}/lang/clang33
-LIB_DEPENDS=	libncurses.so:${PORTSDIR}/devel/ncurses
+BUILD_DEPENDS=	llvm-config33:devel/llvm33 \
+		clang++33:lang/clang33
+RUN_DEPENDS=	clang++33:lang/clang33
+LIB_DEPENDS=	libncurses.so:devel/ncurses
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		cmake libedit
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index 1e461773c9de..8c27fb17fbec 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Implementation of the real-time transport protocol
 
-LIB_DEPENDS=	libcommoncpp.so:${PORTSDIR}/devel/ucommon \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libcommoncpp.so:devel/ucommon \
+		libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USES=		gmake gettext libtool iconv pkgconfig
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 927a144829d9..45135de0eca6 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Curses-based interface to the GNU Debugger
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		makeinfo readline
 
diff --git a/devel/cgprof/Makefile b/devel/cgprof/Makefile
index ebc5d56122ef..8df1a5338620 100644
--- a/devel/cgprof/Makefile
+++ b/devel/cgprof/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://mvertes.free.fr/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates colored graphs for profiled executables using gcc and gprof
 
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		dotty:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	gawk:lang/gawk \
+		dotty:graphics/graphviz
 
 NO_BUILD=	yes
 MAKE_ENV=	prefix=${PREFIX}
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index aafa11ff6051..9ae6926f8d40 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java Windowing Toolkit for Text Terminals
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+BUILD_DEPENDS=	gmake:devel/gmake
+RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/cheritrace-devel/Makefile b/devel/cheritrace-devel/Makefile
index 5ef1f00998ef..010087c51aed 100644
--- a/devel/cheritrace-devel/Makefile
+++ b/devel/cheritrace-devel/Makefile
@@ -13,8 +13,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-CHERI
 GH_TAGNAME=	a7ddf11
 
-BUILD_DEPENDS+=	llvm-config-cheri:${PORTSDIR}/devel/llvm-cheri
-LIB_DEPENDS+=	libLLVMCore.so:${PORTSDIR}/devel/llvm-cheri
+BUILD_DEPENDS+=	llvm-config-cheri:devel/llvm-cheri
+LIB_DEPENDS+=	libLLVMCore.so:devel/llvm-cheri
 
 CMAKE_ARGS+=	-DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config-cheri
 
diff --git a/devel/cherivis-devel/Makefile b/devel/cherivis-devel/Makefile
index 1ca8b1d09b44..e94b74944b08 100644
--- a/devel/cherivis-devel/Makefile
+++ b/devel/cherivis-devel/Makefile
@@ -17,7 +17,7 @@ GH_ACCOUNT=	CTSRD-CHERI
 GH_PROJECT=	CheriVis
 GH_TAGNAME=	98c6c04
 
-LIB_DEPENDS+=	libcheritrace.so:${PORTSDIR}/devel/cheritrace-devel
+LIB_DEPENDS+=	libcheritrace.so:devel/cheritrace-devel
 
 USE_GNUSTEP=		back build
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
diff --git a/devel/chruby/Makefile b/devel/chruby/Makefile
index 1e6bc80a6913..b1c21808b575 100644
--- a/devel/chruby/Makefile
+++ b/devel/chruby/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Changes the current Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 PLIST_FILES=	bin/chruby-exec share/chruby/auto.sh share/chruby/chruby.sh
 
diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile
index 17a56e1a143a..11d380641212 100644
--- a/devel/cl-alexandria-sbcl/Makefile
+++ b/devel/cl-alexandria-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Collection of portable public domain utilities for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:${PORTSDIR}/devel/cl-alexandria
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:${PORTSDIR}/devel/cl-alexandria
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-asdf/bsd.cl-asdf.mk b/devel/cl-asdf/bsd.cl-asdf.mk
index 57370b4b32aa..2437cd690f45 100644
--- a/devel/cl-asdf/bsd.cl-asdf.mk
+++ b/devel/cl-asdf/bsd.cl-asdf.mk
@@ -50,19 +50,19 @@ USE_CLISP=	yes
 .endif # defined(FASL_TARGET)
 
 .if defined(USE_SBCL)
-BUILD_DEPENDS+=	sbcl:${PORTSDIR}/lang/sbcl
-RUN_DEPENDS+=	sbcl:${PORTSDIR}/lang/sbcl
+BUILD_DEPENDS+=	sbcl:lang/sbcl
+RUN_DEPENDS+=	sbcl:lang/sbcl
 .elif defined(USE_CLISP)
-BUILD_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
-RUN_DEPENDS+=	clisp:${PORTSDIR}/lang/clisp
+BUILD_DEPENDS+=	clisp:lang/clisp
+RUN_DEPENDS+=	clisp:lang/clisp
 .endif # defined(USE_CLISP)
 
 .if defined(USE_ASDF)
 # Even if the Common Lisp compiler already has a bundled ASDF framework,
 # we still need the asdf-init file.
 
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-asdf
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:devel/cl-asdf
 
 .endif # defined(USE_ASDF)
 
@@ -70,8 +70,8 @@ RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/asdf.asd:${PORTSDIR}/devel/cl-a
 .if defined(USE_SBCL)
 # SBCL already has a bundled ASDF framework
 .elif defined(USE_CLISP)
-BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp
-RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:${PORTSDIR}/devel/cl-asdf-clisp
+BUILD_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
+RUN_DEPENDS+=	${LOCALBASE}/${CL_LIBDIR_REL}/asdf/${FASL_DIR_REL}/asdf.fasl:devel/cl-asdf-clisp
 .endif # defined(USE_CLISP)
 .endif # defined(USE_ASDF_FASL)
 
diff --git a/devel/cl-cffi-sbcl/Makefile b/devel/cl-cffi-sbcl/Makefile
index 5e292affb2ca..cf98f39e1561 100644
--- a/devel/cl-cffi-sbcl/Makefile
+++ b/devel/cl-cffi-sbcl/Makefile
@@ -9,10 +9,10 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable foreign function interface for Common Lisp
 
-BUILD_DEPENDS=	cl-cffi>=0:${PORTSDIR}/devel/cl-cffi \
-		cl-alexandria-sbcl>=0:${PORTSDIR}/devel/cl-alexandria-sbcl \
-		cl-trivial-features-sbcl>=0:${PORTSDIR}/devel/cl-trivial-features-sbcl \
-		cl-babel-sbcl>=0:${PORTSDIR}/converters/cl-babel-sbcl
+BUILD_DEPENDS=	cl-cffi>=0:devel/cl-cffi \
+		cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \
+		cl-trivial-features-sbcl>=0:devel/cl-trivial-features-sbcl \
+		cl-babel-sbcl>=0:converters/cl-babel-sbcl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_ASDF_FASL=	yes
diff --git a/devel/cl-cffi/Makefile b/devel/cl-cffi/Makefile
index 1f5402f11666..48d848227a5b 100644
--- a/devel/cl-cffi/Makefile
+++ b/devel/cl-cffi/Makefile
@@ -20,9 +20,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable foreign function interface for Common Lisp
 
-BUILD_DEPENDS=	cl-alexandria>=0:${PORTSDIR}/devel/cl-alexandria \
-		cl-trivial-features>=0:${PORTSDIR}/devel/cl-trivial-features \
-		cl-babel>=0:${PORTSDIR}/converters/cl-babel
+BUILD_DEPENDS=	cl-alexandria>=0:devel/cl-alexandria \
+		cl-trivial-features>=0:devel/cl-trivial-features \
+		cl-babel>=0:converters/cl-babel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile
index 51578bd39c4b..d8e33072b228 100644
--- a/devel/cl-infix-sbcl/Makefile
+++ b/devel/cl-infix-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Lisp macro to read math statements in infix notation
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:${PORTSDIR}/devel/cl-infix
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:${PORTSDIR}/devel/cl-infix
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/infix/infix.asd:devel/cl-infix
 
 NO_CDROM=	No fees or compensation can be charged
 
diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile
index 84d429c0aed3..631799faa1f9 100644
--- a/devel/cl-port-sbcl/Makefile
+++ b/devel/cl-port-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Cross-Lisp portability package
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:${PORTSDIR}/devel/cl-port
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/port/port.asd:devel/cl-port
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile
index 70b4210a6b5a..3ae45da4295d 100644
--- a/devel/cl-split-sequence-sbcl/Makefile
+++ b/devel/cl-split-sequence-sbcl/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Partitioning Common Lisp sequences
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:${PORTSDIR}/devel/cl-split-sequence
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:devel/cl-split-sequence
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/split-sequence/split-sequence.asd:devel/cl-split-sequence
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile
index e949f3417761..b472016dcee3 100644
--- a/devel/cl-trivial-features-sbcl/Makefile
+++ b/devel/cl-trivial-features-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Ensures consistent *FEATURES* in Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:${PORTSDIR}/devel/cl-trivial-features
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:${PORTSDIR}/devel/cl-trivial-features
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile
index 382f5753e10d..c27a5b3bafa3 100644
--- a/devel/cl-trivial-gray-streams-sbcl/Makefile
+++ b/devel/cl-trivial-gray-streams-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Thin compatibility layer for Gray streams
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:${PORTSDIR}/devel/cl-trivial-gray-streams
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:${PORTSDIR}/devel/cl-trivial-gray-streams
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/cl-uffi-sbcl/Makefile b/devel/cl-uffi-sbcl/Makefile
index 130769d74e1f..17d9a29d76ca 100644
--- a/devel/cl-uffi-sbcl/Makefile
+++ b/devel/cl-uffi-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Universal Foreign Function Interface for Common Lisp (SBCL binaries)
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:${PORTSDIR}/devel/cl-uffi
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:${PORTSDIR}/devel/cl-uffi
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:devel/cl-uffi
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/uffi/uffi.asd:devel/cl-uffi
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index 5895e7099852..ccfb5aaa1ef8 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmikmod.so:audio/libmikmod \
+		libvorbis.so:audio/libvorbis \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpcre.so:devel/pcre
 
 USES=		execinfo gmake jpeg libtool pathfix pkgconfig sqlite tar:tgz
 USE_GCC=	yes
diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile
index 7c18e6050c76..093b008c5de4 100644
--- a/devel/clanlib1/Makefile
+++ b/devel/clanlib1/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmikmod.so:audio/libmikmod \
+		libvorbis.so:audio/libvorbis
 
 USES=		alias gmake jpeg libtool pathfix pkgconfig tar:tgz
 USE_XORG=	x11 xi
diff --git a/devel/clanlib22/Makefile b/devel/clanlib22/Makefile
index 048490115bb1..75f3e98ab763 100644
--- a/devel/clanlib22/Makefile
+++ b/devel/clanlib22/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Cross-platform game SDK
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libmikmod.so:${PORTSDIR}/audio/libmikmod \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libmikmod.so:audio/libmikmod \
+		libvorbis.so:audio/libvorbis \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpcre.so:devel/pcre
 
 USES=		gmake jpeg libtool pathfix pkgconfig sqlite tar:tgz
 USE_XORG=	x11
diff --git a/devel/clewn/Makefile b/devel/clewn/Makefile
index a661b7d3e468..5a20883c1e26 100644
--- a/devel/clewn/Makefile
+++ b/devel/clewn/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/OldFiles/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	giacomomariani@yahoo.it
 COMMENT=	Clewn provides Gdb support within Vim
 
-RUN_DEPENDS=	vim:${PORTSDIR}/editors/vim
+RUN_DEPENDS=	vim:editors/vim
 
 USES=		gmake ncurses readline
 GNU_CONFIGURE=	yes
diff --git a/devel/clinfo/Makefile b/devel/clinfo/Makefile
index 108983190ba3..e3468036ffe6 100644
--- a/devel/clinfo/Makefile
+++ b/devel/clinfo/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenCL info program like glxinfo is for libGL
 
-BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
+BUILD_DEPENDS=	${LOCALBASE}/include/CL/opencl.h:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Oblomov
diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile
index af66b7a2e99d..969d73afd746 100644
--- a/devel/clojure-cider/Makefile
+++ b/devel/clojure-cider/Makefile
@@ -19,10 +19,10 @@ USE_EMACS=	yes
 
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	clojure-mode.el>0:${PORTSDIR}/lang/clojure-mode.el \
-		dash.el>0:${PORTSDIR}/devel/dash.el \
-		epl.el>0:${PORTSDIR}/devel/epl.el \
-		pkg-info.el>0:${PORTSDIR}/devel/pkg-info.el
+RUN_DEPENDS+=	clojure-mode.el>0:lang/clojure-mode.el \
+		dash.el>0:devel/dash.el \
+		epl.el>0:devel/epl.el \
+		pkg-info.el>0:devel/pkg-info.el
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/cider-client.el \
diff --git a/devel/cloudabi-toolchain/Makefile b/devel/cloudabi-toolchain/Makefile
index 5d051a73bc8e..1b3d8b33cca3 100644
--- a/devel/cloudabi-toolchain/Makefile
+++ b/devel/cloudabi-toolchain/Makefile
@@ -12,10 +12,10 @@ COMMENT=	C and C++ toolchain for CloudABI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX} \
-		pkgconf:${PORTSDIR}/devel/pkgconf \
-		aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \
-		x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64
+RUN_DEPENDS=	clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} \
+		pkgconf:devel/pkgconf \
+		aarch64-unknown-cloudabi-ld:devel/cloudabi-binutils-aarch64 \
+		x86_64-unknown-cloudabi-ld:devel/cloudabi-binutils-x86_64
 
 LLVM_SUFFIX=	38
 
diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
index 83d67c708394..ab7f51e81125 100644
--- a/devel/cmake-doc/Makefile
+++ b/devel/cmake-doc/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
 DISTINFO_FILE=	${PORTSDIR}/devel/cmake/distinfo
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 NO_ARCH=	yes
 USES=		cmake:outsource
diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
index a1c7a90ba3bc..580242c8e6b0 100644
--- a/devel/cmake-gui/Makefile
+++ b/devel/cmake-gui/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Qt-based GUI for CMake
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2
 
 USE_QT5=	core gui widgets buildtools_build qmake_build
 USES=		cmake:run desktop-file-utils libarchive shared-mime-info
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 820aef1ca4d0..07617b92d0f4 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -29,12 +29,12 @@ OPTIONS_SUB=	yes
 USES+=		libarchive
 HAS_CONFIGURE=	yes
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp
-RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:${PORTSDIR}/devel/cmake-modules
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libjsoncpp.so:devel/jsoncpp
+RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:devel/cmake-modules
 
-MANPAGES_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_ON=	--sphinx-man
 .endif
 
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 67712b2f7e40..36073f5f7a80 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Program matching and transformation engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir \
-		ocaml-parmap>=0:${PORTSDIR}/devel/ocaml-parmap \
-		ocaml-pcre>=0:${PORTSDIR}/devel/ocaml-pcre
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	menhir:devel/menhir \
+		ocaml-parmap>=0:devel/ocaml-parmap \
+		ocaml-pcre>=0:devel/ocaml-pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_OCAML=	3.0+
 USE_OCAML_CAMLP4=yes
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 40dbac0af068..3640ad56ef55 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Open source, cross-platform, free C/C++ IDE
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		librsync.so:${PORTSDIR}/net/librsync
+BUILD_DEPENDS=	zip:archivers/zip
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libhunspell-1.3.so:textproc/hunspell \
+		librsync.so:net/librsync
 
 USES=		compiler desktop-file-utils fam:gamin libtool pathfix \
 		pkgconfig shared-mime-info
diff --git a/devel/colorgcc/Makefile b/devel/colorgcc/Makefile
index e1d964114aa7..5440babc9864 100644
--- a/devel/colorgcc/Makefile
+++ b/devel/colorgcc/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Perl script to colorize the terminal output of GCC
 
-RUN_DEPENDS=	p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+RUN_DEPENDS=	p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		shebangfix
diff --git a/devel/colormake/Makefile b/devel/colormake/Makefile
index 10e87c0455c4..dbb775c84d37 100644
--- a/devel/colormake/Makefile
+++ b/devel/colormake/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://bre.klaki.net/programs/colormake/
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Wrapper to color gmake output
 
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	gmake:devel/gmake \
+		bash:shells/bash
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/devel/commit-patch/Makefile b/devel/commit-patch/Makefile
index 0d02b243728c..cf9c75923f29 100644
--- a/devel/commit-patch/Makefile
+++ b/devel/commit-patch/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Commit patches or partial workspace changes to a VCS repository
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	interdiff:${PORTSDIR}/misc/patchutils \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	interdiff:misc/patchutils \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 
 USE_GITHUB=	yes
 USES=		gmake perl5 shebangfix
diff --git a/devel/compiler-rt-devel/Makefile b/devel/compiler-rt-devel/Makefile
index 53b661fbba86..0d9a3aea8c22 100644
--- a/devel/compiler-rt-devel/Makefile
+++ b/devel/compiler-rt-devel/Makefile
@@ -16,7 +16,7 @@ USES=		cmake:outsource compiler:c++11-lib ninja
 
 BROKEN=	relies on incompatible stdarg.h from clang
 
-BUILD_DEPENDS=	llvm-config${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+BUILD_DEPENDS=	llvm-config${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}/
 CMAKE_ARGS=	-DLLVM_CONFIG_PATH=${LOCALBASE}/bin/llvm-config${LLVM_SUFFIX}
diff --git a/devel/compiler-rt/Makefile b/devel/compiler-rt/Makefile
index d455ea8c2bd1..b9aa7756fdac 100644
--- a/devel/compiler-rt/Makefile
+++ b/devel/compiler-rt/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/brooks
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Compiler runtime library with Blocks support
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS=	cmake:devel/cmake
 
 CONFIGURE_WRKSRC=	${WRKDIR}/build
 BUILD_WRKSRC=		${WRKDIR}/build
@@ -50,7 +50,7 @@ SVN_REV!=	svn info ${LLVM_SVN}/ | ${GREP} Revision | cut -d' ' -f2
 .endif
 
 .if defined(BOOTSTRAP)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/devel/compiz-bcop/Makefile b/devel/compiz-bcop/Makefile
index eead2542c70d..098d310ce8c8 100644
--- a/devel/compiz-bcop/Makefile
+++ b/devel/compiz-bcop/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/ \
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Code generator for Compiz Fusion Plugins
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/bin/getopt:misc/getopt
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/configkit/Makefile b/devel/configkit/Makefile
index 8d419b6b6f96..0d8f0e4c3a77 100644
--- a/devel/configkit/Makefile
+++ b/devel/configkit/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Somewhat prototypical facility for generating CLI interfaces
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libphk.a:${PORTSDIR}/devel/libphk
+BUILD_DEPENDS=	${LOCALBASE}/lib/libphk.a:devel/libphk
 
 WRKSRC=		${WRKDIR}/ConfigKit
 USES=		uidfix
diff --git a/devel/cons-test/Makefile b/devel/cons-test/Makefile
index 50e5033e51c9..7305e283ab39 100644
--- a/devel/cons-test/Makefile
+++ b/devel/cons-test/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Test bed for `Cons' development
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/cons:${PORTSDIR}/devel/cons
+RUN_DEPENDS=	${LOCALBASE}/bin/cons:devel/cons
 
 USES=		perl5 tar:tgz
 WRKSRC=		${WRKDIR}/cons-${PORTVERSION}/test
diff --git a/devel/cpan-upload-http/Makefile b/devel/cpan-upload-http/Makefile
index 40e7f2aff2ba..10037eeb1bd1 100644
--- a/devel/cpan-upload-http/Makefile
+++ b/devel/cpan-upload-http/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl script to upload one or more files to CPAN, using PAUSE
 
 RUN_DEPENDS=	\
-	p5-AppConfig-Std>=1.05:${PORTSDIR}/devel/p5-AppConfig-Std \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+	p5-AppConfig-Std>=1.05:devel/p5-AppConfig-Std \
+	p5-libwww>0:www/p5-libwww \
+	p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/cpan-upload/Makefile b/devel/cpan-upload/Makefile
index 6729cc73957f..0ba0d7a58071 100644
--- a/devel/cpan-upload/Makefile
+++ b/devel/cpan-upload/Makefile
@@ -11,9 +11,9 @@ MASTER_SITE_SUBDIR=	CPAN:NEILB/scripts
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Script for uploading distributions to CPAN
 
-RUN_DEPENDS=	p5-AppConfig-Std>=1.05:${PORTSDIR}/devel/p5-AppConfig-Std \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-AppConfig-Std>=1.05:devel/p5-AppConfig-Std \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/cpp-netlib/Makefile b/devel/cpp-netlib/Makefile
index 0db18aa39969..04537640ff55 100644
--- a/devel/cpp-netlib/Makefile
+++ b/devel/cpp-netlib/Makefile
@@ -14,7 +14,7 @@ COMMENT=		Cross-platform, standards compliant networking library
 LICENSE=		BSL
 LICENSE_FILE=		${WRKSRC}/LICENSE_1_0.txt
 
-BUILD_DEPENDS=		boost-libs>0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=		boost-libs>0:devel/boost-libs
 
 USES=			cmake:outsource
 USE_LDCONFIG=		yes
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5d7827ce4ebb..5a1ca29bfa84 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Static analysis of C/C++ code
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2
+LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
 USES=		compiler:c++11-lib execinfo gmake tar:bzip2
 USE_CXXSTD=	c++11
@@ -32,15 +32,15 @@ MATCHCOMPILER_DESC=	Build-time optimizations via Python
 RULES_DESC=		User-defined rule support (requires PCRE)
 
 MANPAGES_ALL_TARGET=	man
-MANPAGES_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MANPAGES_MAKE_ENV=	DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl"
 MANPAGES_PLIST_FILES=	man/man1/cppcheck.1.gz
 
 MATCHCOMPILER_MAKE_ENV=	SRCDIR=build
 MATCHCOMPILER_USES=	python:2,build
 
-RULES_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+RULES_LIB_DEPENDS=	libpcre.so:devel/pcre
 RULES_MAKE_ENV=		HAVE_RULES=yes
 
 post-patch:
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index 348286a89cde..21f0bacd9444 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -12,8 +12,8 @@ LICENSE=	LGPL21
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	dot doxygen html-docs
 DOXYGEN_CONFIGURE_ON=	--htmldir="${DOCSDIR}/html"
 
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile
index 05f104adf9ef..a9d36efdb8f0 100644
--- a/devel/creduce/Makefile
+++ b/devel/creduce/Makefile
@@ -8,16 +8,16 @@ MASTER_SITES=	http://embed.cs.utah.edu/creduce/
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Produces small test cases
 
-BUILD_DEPENDS=	llvm-config37:${PORTSDIR}/devel/llvm37
-RUN_DEPENDS=	llvm-config37:${PORTSDIR}/devel/llvm37 \
-		topformflat:${PORTSDIR}/devel/delta \
-		astyle:${PORTSDIR}/devel/astyle \
-		p5-Benchmark-Timer>=0:${PORTSDIR}/devel/p5-Benchmark-Timer \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		devel/p5-Sys-Cpu>=0:${PORTSDIR}/devel/p5-Sys-Cpu \
-		p5-Getopt-Tabular>=0:${PORTSDIR}/devel/p5-Getopt-Tabular
+BUILD_DEPENDS=	llvm-config37:devel/llvm37
+RUN_DEPENDS=	llvm-config37:devel/llvm37 \
+		topformflat:devel/delta \
+		astyle:devel/astyle \
+		p5-Benchmark-Timer>=0:devel/p5-Benchmark-Timer \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		devel/p5-Sys-Cpu>=0:devel/p5-Sys-Cpu \
+		p5-Getopt-Tabular>=0:devel/p5-Getopt-Tabular
 
 GNU_CONFIGURE=	yes
 CONFIGURE_FLAGS=	--with-llvm=${LOCALBASE}
diff --git a/devel/critcl/Makefile b/devel/critcl/Makefile
index c85ff44f7511..40469972bdb4 100644
--- a/devel/critcl/Makefile
+++ b/devel/critcl/Makefile
@@ -13,8 +13,8 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${LOCALBASE}/lib/Trf/pkgIndex.tcl:${PORTSDIR}/devel/tcl-trf	\
-		${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:${PORTSDIR}/devel/tcllib
+RUN_DEPENDS=	${LOCALBASE}/lib/Trf/pkgIndex.tcl:devel/tcl-trf	\
+		${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:devel/tcllib
 
 USES+=		tcl:85+
 USE_GITHUB=	yes
diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index a396a5703332..0b23e57c078b 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	${DISTNAME}-neutral${EXTRACT_SUFX} \
 MAINTAINER=	dds@FreeBSD.org
 COMMENT=	Source code analyzer and refactoring browser for C program collections
 
-LIB_DEPENDS+=	libc.so.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS+=	libc.so.6:misc/compat6x
 
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
diff --git a/devel/ctypes.sh/Makefile b/devel/ctypes.sh/Makefile
index c0ba8d7b64ee..6451a0f932da 100644
--- a/devel/ctypes.sh/Makefile
+++ b/devel/ctypes.sh/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Foreign function interface for bash
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile
index c9846521a4ad..8ba9df27dceb 100644
--- a/devel/cutter/Makefile
+++ b/devel/cutter/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Unit Testing Framework for C and C++
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libpangocairo-1.0.so:x11-toolkits/pango
 
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--disable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
@@ -34,7 +34,7 @@ regression-test: build
 .if ${PORT_OPTIONS:MGOFFICE}
 CONFIGURE_ARGS+=--enable-goffice
 # the 0.8 is part of the library name don't remove it.
-LIB_DEPENDS+=	libgoffice-0.8.so:${PORTSDIR}/devel/goffice
+LIB_DEPENDS+=	libgoffice-0.8.so:devel/goffice
 PLIST_SUB+=	GOFFICE=""
 .else
 CONFIGURE_ARGS+=--disable-goffice
@@ -42,12 +42,12 @@ PLIST_SUB+=	GOFFICE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLCOV}
-RUN_DEPENDS+=	lcov:${PORTSDIR}/devel/lcov
+RUN_DEPENDS+=	lcov:devel/lcov
 .endif
 
 .if ${PORT_OPTIONS:MSOUP}
 CONFIGURE_ARGS+=--enable-libsoup
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 PLIST_SUB+=	SOUP=""
 .else
 CONFIGURE_ARGS+=--disable-libsoup
diff --git a/devel/cvs-syncmail/Makefile b/devel/cvs-syncmail/Makefile
index 6637938bf7a3..90fc0e019660 100644
--- a/devel/cvs-syncmail/Makefile
+++ b/devel/cvs-syncmail/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/${DISTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
-RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
+RUN_DEPENDS=	cvs:devel/cvs
 .endif
 
 do-extract:
diff --git a/devel/cvs2darcs/Makefile b/devel/cvs2darcs/Makefile
index e4e94dc544c1..24199e744921 100644
--- a/devel/cvs2darcs/Makefile
+++ b/devel/cvs2darcs/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Convert CVS module to darcs repository
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	cvs:${PORTSDIR}/devel/cvs \
-		darcs:${PORTSDIR}/devel/hs-darcs \
-		cvsps:${PORTSDIR}/devel/cvsps \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	cvs:devel/cvs \
+		darcs:devel/hs-darcs \
+		cvsps:devel/cvsps \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index dcf644f5a1df..c01c548693a7 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -26,7 +26,7 @@ SHEBANG_FILES=	${PORTNAME}
 
 .if ${OPSYS} == FreeBSD
 # DragonFly has CVS in base and devel/cvs doesn't build there
-RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
+RUN_DEPENDS=	cvs:devel/cvs
 .endif
 
 do-extract:
diff --git a/devel/cvschangelogbuilder/Makefile b/devel/cvschangelogbuilder/Makefile
index 2050a829b46f..3c3910fd5655 100644
--- a/devel/cvschangelogbuilder/Makefile
+++ b/devel/cvschangelogbuilder/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to generate changelogs and reports from a CVS repository
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.TXT
 
-RUN_DEPENDS=	p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+RUN_DEPENDS=	p5-GD-Graph>=0:graphics/p5-GD-Graph
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}.pl
diff --git a/devel/cvsd/Makefile b/devel/cvsd/Makefile
index ebbf293a16ef..ba1d10ad0c43 100644
--- a/devel/cvsd/Makefile
+++ b/devel/cvsd/Makefile
@@ -28,8 +28,8 @@ PORTDOCS=	FAQ NEWS README
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 1000000
-BUILD_DEPENDS+=	cvs:${PORTSDIR}/devel/cvs
-RUN_DEPENDS+=	cvs:${PORTSDIR}/devel/cvs
+BUILD_DEPENDS+=	cvs:devel/cvs
+RUN_DEPENDS+=	cvs:devel/cvs
 .endif
 
 do-install:
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 15507a6e4807..7cb450908903 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graph the life story of a file under CVS or RCS
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
index 2387ce05f845..db2df712daa3 100644
--- a/devel/cvsmonitor/Makefile
+++ b/devel/cvsmonitor/Makefile
@@ -10,32 +10,32 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Stable
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor activity on a CVS Repository
 
-BUILD_DEPENDS=	p5-Time-Duration>=0:${PORTSDIR}/devel/p5-Time-Duration \
-		p5-Class-Autouse>=0:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-Class-Default>=0:${PORTSDIR}/devel/p5-Class-Default \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Class-Handle>=0:${PORTSDIR}/devel/p5-Class-Handle \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-HTTP-BrowserDetect>=0:${PORTSDIR}/www/p5-HTTP-BrowserDetect \
-		p5-Validate-Net>=0:${PORTSDIR}/net/p5-Validate-Net \
-		p5-Chart-Math-Axis>=0:${PORTSDIR}/math/p5-Chart-Math-Axis \
-		p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
-		p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove \
-		p5-File-Flat>=0:${PORTSDIR}/devel/p5-File-Flat \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Array-Window>=0:${PORTSDIR}/devel/p5-Array-Window \
-		p5-Number-Compare>=0:${PORTSDIR}/math/p5-Number-Compare \
-		p5-Text-Glob>=0:${PORTSDIR}/textproc/p5-Text-Glob \
-		p5-XML-Generator>=0:${PORTSDIR}/textproc/p5-XML-Generator \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph
+BUILD_DEPENDS=	p5-Time-Duration>=0:devel/p5-Time-Duration \
+		p5-Class-Autouse>=0:devel/p5-Class-Autouse \
+		p5-Class-Default>=0:devel/p5-Class-Default \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Class-Handle>=0:devel/p5-Class-Handle \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions \
+		p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-HTTP-BrowserDetect>=0:www/p5-HTTP-BrowserDetect \
+		p5-Validate-Net>=0:net/p5-Validate-Net \
+		p5-Chart-Math-Axis>=0:math/p5-Chart-Math-Axis \
+		p5-File-NCopy>=0:devel/p5-File-NCopy \
+		p5-File-Remove>=0:devel/p5-File-Remove \
+		p5-File-Flat>=0:devel/p5-File-Flat \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-URI>=0:net/p5-URI \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-Array-Window>=0:devel/p5-Array-Window \
+		p5-Number-Compare>=0:math/p5-Number-Compare \
+		p5-Text-Glob>=0:textproc/p5-Text-Glob \
+		p5-XML-Generator>=0:textproc/p5-XML-Generator \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index 513fc3238f7a..83f3c5cabe83 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Perl script which analyses the history of a CVS-managed project
 
-RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		gnuplot:math/gnuplot
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/cvsplot
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index f9d6dae97296..d7e1b6b06909 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -13,18 +13,18 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	noackjr@alumni.rice.edu
 COMMENT=	WWW CGI script to browse CVS repository trees version 3
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-URI>=0:net/p5-URI
 
 # The following extra dependencies are optional, but CVSweb works the
 # best with them.
-RUN_DEPENDS+=	p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-String-Ediff>=0:${PORTSDIR}/devel/p5-String-Ediff \
-		cvsgraph:${PORTSDIR}/devel/cvsgraph
+RUN_DEPENDS+=	p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-String-Ediff>=0:devel/p5-String-Ediff \
+		cvsgraph:devel/cvsgraph
 
 # Use PAPERSIZE to avoid a stale dependency on Enscript.
 PAPERSIZE?=	letter
-RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-${PAPERSIZE}
+RUN_DEPENDS+=	enscript:print/enscript-${PAPERSIZE}
 
 CONFLICTS=	cvsweb-2.*
 
diff --git a/devel/d-feet/Makefile b/devel/d-feet/Makefile
index efae109140e3..3c41de306d1b 100644
--- a/devel/d-feet/Makefile
+++ b/devel/d-feet/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	thinker@codemud.net
 COMMENT=	D-Feet is a D-Bus debugger python introspection by John (J5) Palmieri
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 USES=		gettext gmake gnome perl5 pkgconfig python tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2:build libwnck3
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 85c6b802acae..e3abc9cdf974 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-glib/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib bindings for the D-BUS messaging system
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 GNU_CONFIGURE=	yes
 USES=		cpe gettext gmake libtool pathfix pkgconfig
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 3f0513c1795e..cb3ea9cb6f07 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt D-Bus inter-process communication module
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib xml
diff --git a/devel/dbus-qt5/Makefile b/devel/dbus-qt5/Makefile
index 505cadaee2c0..be289520ce81 100644
--- a/devel/dbus-qt5/Makefile
+++ b/devel/dbus-qt5/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt D-Bus inter-process communication module
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USE_QT5=	core qmake_build buildtools_build
 QT_DIST=	base
diff --git a/devel/dbus-sharp-glib/Makefile b/devel/dbus-sharp-glib/Makefile
index 6f1a6fd4c6f7..ab02401fc298 100644
--- a/devel/dbus-sharp-glib/Makefile
+++ b/devel/dbus-sharp-glib/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	GHC
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	D-Bus for .NET: GLib integration module
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:${PORTSDIR}/devel/dbus-sharp
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:devel/dbus-sharp
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-1.0.pc:devel/dbus-sharp
 
 USES=		gmake pathfix pkgconfig
 USE_GITHUB=	yes
diff --git a/devel/dbus-tcl/Makefile b/devel/dbus-tcl/Makefile
index 716011fae3f0..4115b8758d63 100644
--- a/devel/dbus-tcl/Makefile
+++ b/devel/dbus-tcl/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tcl interface to the D-Bus messaging system
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+BUILD_DEPENDS=	dtplite:devel/tcllib
 
 OPTIONS_DEFINE=	DOCS
 DOCSDIR=	${PREFIX}/share/doc/dbus
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index ea507149aff3..661846f9b8d5 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Message bus system for inter-application communication
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 PORTSCOUT=	limitw:1,even
 
@@ -43,7 +43,7 @@ OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 X11_DESC=	Support X11 Desktop Environments
 
-MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CONFIGURE_ENABLE=	xml-docs
 X11_USE=	xorg=ice,sm,x11
 X11_CONFIGURE_WITH=	x
diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile
index a5850b42ac29..49aafe82a006 100644
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNA
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit to work with DICOM objects
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
index 8880223168c7..b50395829166 100644
--- a/devel/dconf-editor/Makefile
+++ b/devel/dconf-editor/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Configuration database editor for GNOME
 
-BUILD_DEPENDS=	dconf>=0.23.2:${PORTSDIR}/devel/dconf \
-		vala>=0.18.1:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libdconf.so:${PORTSDIR}/devel/dconf
+BUILD_DEPENDS=	dconf>=0.23.2:devel/dconf \
+		vala>=0.18.1:lang/vala
+LIB_DEPENDS=	libdconf.so:devel/dconf
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 50a88338169f..0977416d9886 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Configuration database system for GNOME
 
-BUILD_DEPENDS=	vala>=0.18.1:${PORTSDIR}/lang/vala \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS=	vala>=0.18.1:lang/vala \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index f796d7b5117b..f964cfcf4e24 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Model to synchronize multiple instances over DBus
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libicutu.so:${PORTSDIR}/devel/icu
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libicutu.so:devel/icu
 
 USES=		gmake libtool pkgconfig pathfix python:2
 GNU_CONFIGURE=	yes
diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile
index b8da4bc8665d..f332adb3dad4 100644
--- a/devel/deforaos-libsystem/Makefile
+++ b/devel/deforaos-libsystem/Makefile
@@ -25,9 +25,9 @@ MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+	gtkdoc-check:textproc/gtk-doc
 
 BROKEN_FreeBSD_9=	This port works only on FreeBSD 10 and newer
 
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index f478838309fb..34a89945f19c 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 3
 
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/dfuife-curses/Makefile b/devel/dfuife-curses/Makefile
index 14513086972e..6b0e6e1ac159 100644
--- a/devel/dfuife-curses/Makefile
+++ b/devel/dfuife-curses/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://people.xmms2.org/~alex/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DFUI curses frontend
 
-LIB_DEPENDS=	libaura3.so:${PORTSDIR}/devel/libaura \
-		libdfui4.so:${PORTSDIR}/devel/libdfui
+LIB_DEPENDS=	libaura3.so:devel/libaura \
+		libdfui4.so:devel/libdfui
 
 USES=	tar:bzip2
 
diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile
index 1ad95b75f462..09e601031c44 100644
--- a/devel/directfb/Makefile
+++ b/devel/directfb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Graphic development lightweight API
 LICENSE=	LGPL21
 
 BROKEN=		Does not fetch
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	FREETYPE X11 SDL UNIQUE TEST DOCS
 UNIQUE_DESC=	Unique (WM Module)
@@ -49,8 +49,8 @@ CONFIGURE_ARGS=	--disable-osx --disable-extra-warnings --disable-profiling \
 		--with-inputdrivers=all --with-smooth-scaling \
 		--with-dither-rgb16=advanced
 
-DOCS_BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
 X11_USE=	XORG=x11,xext,xproto
 X11_CONFIGURE_ENABLE=	--x11
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 3cac1753614d..9a44c5802697 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Graphical frontend to the objdump disassembler
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:${PORTSDIR}/www/py-webkitgtk
-LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk
+LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 4723ecc2b300..0eec8e25aef8 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 USES=		alias gmake tar:bzip2
@@ -56,7 +56,7 @@ GTK_DESC=	Monitor based on GTK
 LLVMLINK_DESC=	Create llvm compiler links if llvm is installed
 
 AVAHI_CONFIGURE_WITH=	avahi
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 DOCS_PLIST_FILES=	${README_FILES:S|^|${DOCSDIR_REL}/|}
 DOCS_PLIST_FILES+=	${DOC_FILES:S|^|${DOCSDIR_REL}/|}
 GNOME_CONFIGURE_WITH=	gnome
diff --git a/devel/distel/Makefile b/devel/distel/Makefile
index bf4218fd4655..8b207eddc883 100644
--- a/devel/distel/Makefile
+++ b/devel/distel/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel elisp
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Distel extends Emacs Lisp with Erlang-style message passing
 
-BUILD_DEPENDS+=	erlc:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS+=	erlc:lang/erlang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	massemanet
diff --git a/devel/ditrack/Makefile b/devel/ditrack/Makefile
index 20231df19a38..02f2fe0c9563 100644
--- a/devel/ditrack/Makefile
+++ b/devel/ditrack/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tracking system based on Subversion repository
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	svn:devel/subversion
 
 USES=		python tar:tgz
 USE_PYTHON=	distutils
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 8b6d7918a595..6fd5ba8dcdad 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	GRAPHVIZ LATEX QT4 DOCS
 OPTIONS_DEFAULT=	GRAPHVIZ LATEX
 QT4_DESC=	Install Doxywizard GUI
 
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 
 LATEX_USE=	TEX=base,dvipsk,pdftex
 
@@ -42,7 +42,7 @@ QT4_PLIST_FILES=	bin/doxywizard
 
 DOCS_USES=		ghostscript:build
 DOCS_ALL_TARGET=	docs
-DOCS_BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+DOCS_BUILD_DEPENDS=	dot:graphics/graphviz
 DOCS_CMAKE_ON=		-Dbuild_doc:BOOLEAN=ON
 DOCS_CMAKE_OFF=		-Dbuild_doc:BOOLEAN=OFF
 DOCS_PLIST_FILES=	man/man1/doxygen.1.gz \
@@ -55,7 +55,7 @@ PORTDOCS=		*
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/devel/dparser/Makefile b/devel/dparser/Makefile
index 14d8c0eaa729..851fcaa55bbb 100644
--- a/devel/dparser/Makefile
+++ b/devel/dparser/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/make_dparser include/dparse.h include/dparse_tables.h \
 OPTIONS_DEFINE=	BOEHM DOCS
 BOEHM_DESC=	Boehm garbage collector support
 
-BOEHM_LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
+BOEHM_LIB_DEPENDS=	libgc.so:devel/boehm-gc
 BOEHM_MAKE_ARGS=	D_USE_GC=1 \
 			GC_CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
 BOEHM_VARS=		LIBDPARSE=libdparse_gc.a
diff --git a/devel/dprog/Makefile b/devel/dprog/Makefile
index 819088eef8bb..54d195206356 100644
--- a/devel/dprog/Makefile
+++ b/devel/dprog/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.daimi.au.dk/~mailund/dprog/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Language for specifying dynamic programming algorithms
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
diff --git a/devel/dragon/Makefile b/devel/dragon/Makefile
index 1010c131f3ff..976f4c80f7b5 100644
--- a/devel/dragon/Makefile
+++ b/devel/dragon/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.lemke-it.com/
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Combined C++ scanner/parser generator for LR compliant grammars
 
-LIB_DEPENDS=	liblfcbase.so:${PORTSDIR}/devel/lfcbase
+LIB_DEPENDS=	liblfcbase.so:devel/lfcbase
 
 LICENSE=	GPLv3
 GNU_CONFIGURE=	yes
diff --git a/devel/drpython/Makefile b/devel/drpython/Makefile
index a3061d15f17d..f0c02dad8916 100644
--- a/devel/drpython/Makefile
+++ b/devel/drpython/Makefile
@@ -17,8 +17,8 @@ LICENSE=	GPLv2
 # fails to build in presence if installed self
 CONFLICTS_BUILD=	${PORTNAME}${PYTHON_PKGNAMESUFFIX}-[0-9]*
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/dwarfdump/Makefile b/devel/dwarfdump/Makefile
index f230aa9d8501..1cc7b3be9fc2 100644
--- a/devel/dwarfdump/Makefile
+++ b/devel/dwarfdump/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	libdwarf-${PORTVERSION}
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Tool to display DWARF debugging information in ELF files
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdwarf.a:${PORTSDIR}/devel/libdwarf
+BUILD_DEPENDS=	${LOCALBASE}/lib/libdwarf.a:devel/libdwarf
 
 WRKSRC=		${WRKDIR}/dwarf-${PORTVERSION}/dwarfdump
 
diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile
index af311a6a7d62..283408778e9d 100644
--- a/devel/easygit/Makefile
+++ b/devel/easygit/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy wrapper for git
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 DISTREVISION=	0 # bump this if distfile is changed inplace
 
diff --git a/devel/eblob/Makefile b/devel/eblob/Makefile
index d24a0010bdb3..e31847afa7e2 100644
--- a/devel/eblob/Makefile
+++ b/devel/eblob/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Append-only low-level I/O library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zloidemon
@@ -33,7 +33,7 @@ CMAKE_ARGS+=	-DWITH_ASSERTS=OFF
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-LIB_DEPENDS+=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS+=	libboost_python.so:devel/boost-python-libs
 USES+=		python
 CMAKE_ARGS+=	-DWITH_PYTHON=ON
 PLIST_SUB+=	PYTHON="" PYTHON_VER=${PYTHON_VER}
@@ -43,7 +43,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSNAPPY}
-LIB_DEPENDS+=	libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS+=	libsnappy.so:archivers/snappy
 CMAKE_ARGS+=	-DWITH_SNAPPY=ON
 .else
 CMAKE_ARGS+=	-DWITH_SNAPPY=OFF
diff --git a/devel/edb/Makefile b/devel/edb/Makefile
index 6fb6e03f5f7f..2e948667a562 100644
--- a/devel/edb/Makefile
+++ b/devel/edb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross-platform x86/x86-64 debugger based on Qt 4
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		qmake tar:tgz
 USE_QT4=	gui network xml moc_build rcc_build uic_build
diff --git a/devel/efivar/Makefile b/devel/efivar/Makefile
index 46c414f06655..718becf7d035 100644
--- a/devel/efivar/Makefile
+++ b/devel/efivar/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tools and library to manipulate EFI variables
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USE_GCC=	yes
 USE_GITHUB=	yes
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 68327ee8333d..82cc85a31763 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Enlightenment Foundation Libraries
 LICENSE=	BSD2CLAUSE LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libdbus-1.so:devel/dbus \
+		libsndfile.so:audio/libsndfile
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
@@ -51,42 +51,42 @@ PHYSICS_DESC=		Physics effects
 IBUS_DESC=		Intelligent Input Bus
 SCIM_DESC=		Smart Common Input Method
 
-AVAHI_LIB_DEPENDS=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=		avahi
 
-FRIBIDI_LIB_DEPENDS=		libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=		libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
 
-HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
 
 NLS_USES=			gettext-runtime
 NLS_CONFIGURE_ENABLE=		nls
 
-PHYSICS_LIB_DEPENDS=		libBulletDynamics.so:${PORTSDIR}/devel/bullet
+PHYSICS_LIB_DEPENDS=		libBulletDynamics.so:devel/bullet
 PHYSICS_CONFIGURE_ENABLE=	physics
 
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
 GSTREAMER_USE=			GSTREAMER1=core
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer1
 
-LIBXINE_LIB_DEPENDS=		libxine.so:${PORTSDIR}/multimedia/libxine
+LIBXINE_LIB_DEPENDS=		libxine.so:multimedia/libxine
 LIBXINE_CONFIGURE_ENABLE=	xine
 
-V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_CONFIGURE_ENABLE=		v4l2
 
-IBUS_LIB_DEPENDS=		libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_LIB_DEPENDS=		libibus-1.0.so:textproc/ibus
 
-SCIM_LIB_DEPENDS=		libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_LIB_DEPENDS=		libscim-1.0.so:textproc/scim
 SCIM_CONFIGURE_ENABLE=		scim
 
-OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	image-loader-jp2k
 
-WEBP_LIB_DEPENDS=		libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 WEBP_CONFIGURE_ENABLE=		image-loader-webp
 
 OPENGL_USE=			GL=gl
@@ -135,7 +135,7 @@ USES+=				lua
 CONFIGURE_ARGS+=		--enable-lua-old
 PLIST_SUB+=			ELUA="@comment "
 .else
-LIB_DEPENDS+=			libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS+=			libluajit-5.1.so:lang/luajit
 PLIST_SUB+=			ELUA=""
 .endif
 
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index f5772e6adbeb..4ea9f110cd2d 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	D-Bus bindings for GObject
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USE_GNOME=	glib20
 USES=		gettext gmake libtool:keepla pathfix pkgconfig
@@ -23,9 +23,9 @@ CONFIGURE_ARGS=	--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=	docbook-sgml>0:textproc/docbook-sgml \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wl,--as-needed||' \
diff --git a/devel/eiffelstudio/Makefile b/devel/eiffelstudio/Makefile
index 275805afb61d..f7e79eca62da 100644
--- a/devel/eiffelstudio/Makefile
+++ b/devel/eiffelstudio/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Eiffel${PORTVERSION:S/.//}_gpl_64493-freebsd-${EIFFEL_ARCH}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete Integrated Development Environment for Eiffel
 
-LIB_DEPENDS=	libc.so.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS=	libc.so.6:misc/compat6x
 
 USES=		shebangfix
 SHEBANG_FILES=	library/event/example/gen_action_sequences \
diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index 3a32ec189b51..114425652efa 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -7,14 +7,14 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:${PORTSDIR}/devel/py-qt4-qscintilla2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:devel/py-qt4-qscintilla2
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:${PORTSDIR}/devel/py-qt4-help \
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:devel/py-qt4-help \
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		desktop-file-utils
 INSTALL_CMD=	install.py -c -f eric4config.freebsd -i ${STAGEDIR}
diff --git a/devel/eric4/Makefile.inc b/devel/eric4/Makefile.inc
index b526cc63f091..8734204a10f8 100644
--- a/devel/eric4/Makefile.inc
+++ b/devel/eric4/Makefile.inc
@@ -16,7 +16,7 @@ COMMENT=	Full featured Python and Ruby editor and IDE based on Qt4
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS?=	${PREFIX}/bin/eric4:${PORTSDIR}/devel/eric4
+RUN_DEPENDS?=	${PREFIX}/bin/eric4:devel/eric4
 
 I18N_LANG?=	ru
 INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 6ffec945d7d0..b8578561581b 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -4,15 +4,15 @@
 CATEGORIES=	devel python
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:${PORTSDIR}/devel/py-qt4-qscintilla2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:devel/py-qt4-qscintilla2
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:${PORTSDIR}/devel/py-qt4-help \
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:databases/py-qt4-sql \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:devel/py-qt4-help \
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		desktop-file-utils
 INSTALL_CMD=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc
index 19ca5b3bd60f..42acaf69a56f 100644
--- a/devel/eric6/Makefile.inc
+++ b/devel/eric6/Makefile.inc
@@ -16,7 +16,7 @@ COMMENT=	Full featured Python and Ruby editor and IDE based on Qt4
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS?=	${PREFIX}/bin/eric6:${PORTSDIR}/devel/eric6
+RUN_DEPENDS?=	${PREFIX}/bin/eric6:devel/eric6
 
 I18N_LANG?=	ru
 INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 1d3635bfc0b2..3cf1d330ee4d 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/worldforge/Eris%201.4%20%28client%20lib%29/${PORTVERSION}/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge client entity library
 
-LIB_DEPENDS=	libAtlas-0.6.so:${PORTSDIR}/devel/atlas-devel \
-		libskstream-0.3.so:${PORTSDIR}/net/skstream \
-		libwfmath-1.0.so:${PORTSDIR}/math/wfmath \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libmercator-0.3.so:${PORTSDIR}/devel/mercator
+LIB_DEPENDS=	libAtlas-0.6.so:devel/atlas-devel \
+		libskstream-0.3.so:net/skstream \
+		libwfmath-1.0.so:math/wfmath \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libmercator-0.3.so:devel/mercator
 
 CONFIGURE_ARGS= --disable-silent-rules
 GNU_CONFIGURE=	yes
diff --git a/devel/erlang-common_lib/Makefile b/devel/erlang-common_lib/Makefile
index 6fb752c3426c..dc204972a9f6 100644
--- a/devel/erlang-common_lib/Makefile
+++ b/devel/erlang-common_lib/Makefile
@@ -8,9 +8,9 @@ PKGNAMEPREFIX=	erlang-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library of commonly used Erlang functions
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		txt2tags:${PORTSDIR}/textproc/txt2tags
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erlc:lang/erlang \
+		txt2tags:textproc/txt2tags
+RUN_DEPENDS=	erl:lang/erlang
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/erlang-esdl/Makefile b/devel/erlang-esdl/Makefile
index a9c33c334074..e44abf6f6b0b 100644
--- a/devel/erlang-esdl/Makefile
+++ b/devel/erlang-esdl/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	erlang
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library for accessing SDL and OpenGL through Erlang
 
-BUILD_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erl:lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/erlang-exmpp/Makefile b/devel/erlang-exmpp/Makefile
index 1e00b9f59e17..1994a9b38d41 100644
--- a/devel/erlang-exmpp/Makefile
+++ b/devel/erlang-exmpp/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Fast and scalable library for XMPP written in Erlang/OTP
 
 LICENSE=	EPL
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	erlc:lang/erlang
+RUN_DEPENDS=	erl:lang/erlang
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libxml2.so:textproc/libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	processone
diff --git a/devel/erlang-oserl/Makefile b/devel/erlang-oserl/Makefile
index b9e385466465..215aeed20722 100644
--- a/devel/erlang-oserl/Makefile
+++ b/devel/erlang-oserl/Makefile
@@ -8,10 +8,10 @@ PKGNAMEPREFIX=	erlang-
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	SMPP library for Erlang
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		txt2tags:${PORTSDIR}/textproc/txt2tags
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		erlang-common_lib>=3.3.4:${PORTSDIR}/devel/erlang-common_lib
+BUILD_DEPENDS=	erlc:lang/erlang \
+		txt2tags:textproc/txt2tags
+RUN_DEPENDS=	erl:lang/erlang \
+		erlang-common_lib>=3.3.4:devel/erlang-common_lib
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
diff --git a/devel/etcd/Makefile b/devel/etcd/Makefile
index 30a87c49d48c..0b4ac6a68058 100644
--- a/devel/etcd/Makefile
+++ b/devel/etcd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Highly-available key value store and service discovery
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 CONFLICTS_INSTALL=coreos-etcdctl-0.*
 
diff --git a/devel/euca2ools/Makefile b/devel/euca2ools/Makefile
index 28f07394a01e..40e59d4472a8 100644
--- a/devel/euca2ools/Makefile
+++ b/devel/euca2ools/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Eucalyptus Command Line Tools
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:${PORTSDIR}/www/py-requestbuilder \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
 
 USES=		python:2.7
 USE_GITHUB=	yes
diff --git a/devel/eventxx/Makefile b/devel/eventxx/Makefile
index 0d02041de3ff..2b44718b6694 100644
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://proj.llucax.com.ar/home/eventxx/releases/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for libevent
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/evolution-gconf-tools/Makefile b/devel/evolution-gconf-tools/Makefile
index d6e92168070d..4c36394d0169 100644
--- a/devel/evolution-gconf-tools/Makefile
+++ b/devel/evolution-gconf-tools/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://people.redhat.com/dmalcolm/evolution-gconf-tools/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Scripts to make it easier to work with Evolution's configuration
 
-RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution:mail/evolution
 
 GNU_CONFIGURE=	yes
 USES=		python
diff --git a/devel/fastcrc/Makefile b/devel/fastcrc/Makefile
index 7e61115f5276..bdcccd32d534 100644
--- a/devel/fastcrc/Makefile
+++ b/devel/fastcrc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.whizkidtech.redprince.net/fports/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast CRC routines
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index 94cdd35a50b7..9ae476dd730e 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Facebook Bassline
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libthrift.so:${PORTSDIR}/devel/thrift-cpp
-BUILD_DEPENDS=	thrift:${PORTSDIR}/devel/thrift
+LIB_DEPENDS=	libthrift.so:devel/thrift-cpp
+BUILD_DEPENDS=	thrift:devel/thrift
 
 ACLOCAL_ARGS=	-I ./aclocal
 AUTOMAKE_ARGS=	-a
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index a469e7ad51e5..0b78403cb5e4 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utilities to maintain file history, do file comparisons, and merges
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexplain.so:${PORTSDIR}/devel/libexplain
+LIB_DEPENDS=	libexplain.so:devel/libexplain
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/devel/florist-gpl/Makefile b/devel/florist-gpl/Makefile
index 69f6718fded1..2feb1fe42d26 100644
--- a/devel/florist-gpl/Makefile
+++ b/devel/florist-gpl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	POSIX Ada binding, IEEE Standards 1003.5(b,c)
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/flyspray/Makefile b/devel/flyspray/Makefile
index 0cdcb255a607..860b6f074229 100644
--- a/devel/flyspray/Makefile
+++ b/devel/flyspray/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://flyspray.org/packed/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple, easy-to-use web based bug tracking system
 
-RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb
+RUN_DEPENDS=	${LOCALBASE}/share/adodb/adodb.inc.php:databases/adodb
 
 USE_PHP=	pcre session zlib xml gd
 USES=		dos2unix zip
@@ -52,7 +52,7 @@ PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 MYSQL_USE=	PHP=mysql
 MYSQLI_USE=	PHP=mysqli
 PGSQL_USE=	PHP=pgsql
-GRAPHVIZ_RUN_DEPENDS=	${LOCALBASE}/bin/dot:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	${LOCALBASE}/bin/dot:graphics/graphviz
 
 post-patch:
 	@${CP} ${PKGDIR}/files/README.FreeBSD ${WRKSRC}/docs/
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index a87ab40ce03b..7e0d614b59f1 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Profiling library/utilities for C/C++ programs
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libbfd.so:${PORTSDIR}/devel/libbfd
+LIB_DEPENDS=	libbfd.so:devel/libbfd
 
 USES=		autoreconf libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index efeff2c91524..d47d96580a95 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CORBA 2.0 ORB written in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 USES=		python
 USE_PYTHON=	distutils noegginfo
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index a739008137b1..9de1ec7c09c4 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -29,7 +29,7 @@ FUSE_DESC=	Enable fossil fusefs command
 JSON_CONFIGURE_ON=	--json
 STATIC_CONFIGURE_ON=	--static
 FUSE_CONFIGURE_OFF=	--disable-fusefs
-FUSE_LIB_DEPENDS=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
 FUSE_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 post-install:
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index 297b1015e1fc..cb852e97d10d 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -14,6 +14,6 @@ MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR=	${WRKUNITDIR}
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/binutils
+RUN_DEPENDS=	${LOCALBASE}/lib/libbfd.a:devel/binutils
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-dbus/Makefile b/devel/fpc-dbus/Makefile
index ecc240e106c7..8647e86e0659 100644
--- a/devel/fpc-dbus/Makefile
+++ b/devel/fpc-dbus/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	DBUS
 DBUS_DESC=	Install dbus library
 OPTIONS_DEFAULT=	DBUS
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile
index deefa92aab52..b3c85014cb90 100644
--- a/devel/fpc-newt/Makefile
+++ b/devel/fpc-newt/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	NEWT
 NEWT_DESC=	Install newt library
 OPTIONS_DEFAULT=	NEWT
 
-NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile
index 852a09c9e81d..8dd5b664b706 100644
--- a/devel/frama-c/Makefile
+++ b/devel/frama-c/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Extensible platform for source-code analysis of C
 
 LICENSE=	LGPL21
 
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
-RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:${PORTSDIR}/math/ocaml-ocamlgraph
+EXTRACT_DEPENDS=	gtar:archivers/gtar
+BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:math/ocaml-ocamlgraph
+RUN_DEPENDS=	${LOCALBASE}/lib/ocaml/ocamlgraph/graph.a:math/ocaml-ocamlgraph
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile
index 06f3b17a1450..dd740307e728 100644
--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free Open Computing Language (OpenCL) implementation for CPU
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops \
-		${LOCALBASE}/include/CL/opencl.h:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
+		${LOCALBASE}/include/CL/opencl.h:devel/opencl
 
 CONFLICTS=	ocl-icd[0-9]* opencl-icd[0-9]* pocl[0-9]*
 
diff --git a/devel/fstrm/Makefile b/devel/fstrm/Makefile
index 05f8f81789dc..4bb387e44623 100644
--- a/devel/fstrm/Makefile
+++ b/devel/fstrm/Makefile
@@ -12,7 +12,7 @@ COMMENT=		Implementation of the Frame Streams data transport protocol in C
 LICENSE=		APACHE20
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-LIB_DEPENDS=		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=		libevent.so:devel/libevent2
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		farsightsec
@@ -23,7 +23,7 @@ USE_LDCONFIG=		yes
 
 OPTIONS_DEFINE=		DOXYGEN
 DOXYGEN_DESC=		Use doxygen for docs
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 
 PORTDOCS=		*
diff --git a/devel/fuel/Makefile b/devel/fuel/Makefile
index f7adbafb2223..81c083a00f39 100644
--- a/devel/fuel/Makefile
+++ b/devel/fuel/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GUI front-end to fossil SCM tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/fossil:${PORTSDIR}/devel/fossil
+RUN_DEPENDS=	${LOCALBASE}/bin/fossil:devel/fossil
 
 USES=		qmake
 USE_QT4=	corelib gui \
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 485995d99972..a0b5733d6d18 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -41,7 +41,7 @@ CPPFLAGS+=	-DUSE_GAMIN_POLLER=1
 .if ${PORT_OPTIONS:MLIBINOTIFY}
 CONFIGURE_ARGS+=--enable-inotify
 LIBS+=		-linotify
-LIB_DEPENDS+=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS+=	libinotify.so:devel/libinotify
 .else
 CONFIGURE_ARGS+=--disable-inotify
 .endif
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 4cf9b7feb63f..79d064321da2 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -19,9 +19,9 @@ COMMENT=	UML modeling environment written in Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}zope.component>3.4.0:${PORTSDIR}/devel/py-zope.component
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}zope.component>3.4.0:devel/py-zope.component
 
 USE_GNOME=	pygtk2
 USES=		python
diff --git a/devel/gauche-readline/Makefile b/devel/gauche-readline/Makefile
index 6be96cec41b1..bf72c9106318 100644
--- a/devel/gauche-readline/Makefile
+++ b/devel/gauche-readline/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	gauche
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Pure gauche/scheme implementation of the Readline library
 
-RUN_DEPENDS=	gosh:${PORTSDIR}/lang/gauche
-BUILD_DEPENDS=	gauche-config:${PORTSDIR}/lang/gauche
+RUN_DEPENDS=	gosh:lang/gauche
+BUILD_DEPENDS=	gauche-config:lang/gauche
 
 GAUCHE_LIBDIR=	share/gauche/site/lib
 GAUCHE_FILES=	readline/history.scm readline/keymap.scm readline/term-util.scm
diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile
index e7f0e3858206..1ab801435d78 100644
--- a/devel/gaul/Makefile
+++ b/devel/gaul/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-devel-${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Genetic Algorithm Utility Library
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 
 USES=		gmake libtool tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 72b1fafaa63f..8668f13176d9 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GUI builder for the GTK+ toolkit
 LICENSE=	LGPL21+ # source mentions LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:${PORTSDIR}/x11-toolkits/py-kiwi
-BUILD_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:${PORTSDIR}/x11-toolkits/py-kiwi
+RUN_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi
+BUILD_DEPENDS=	${LOCALBASE}/bin/kiwi-i18n:x11-toolkits/py-kiwi
 
 USES=		desktop-file-utils gettext python
 USE_GNOME=	pygtk2
diff --git a/devel/gb/Makefile b/devel/gb/Makefile
index 2dfa738e3b6f..91168f046421 100644
--- a/devel/gb/Makefile
+++ b/devel/gb/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Project based build tool for Go
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	constabulary
diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile
index 1b0016fbbb16..0822a7d0a8d4 100644
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@@ -21,16 +21,16 @@ PDF_DESC=	Install PDF documentation (requires TeX, it is huge)
 PYGDB_DESC=	Build and install pyhon-enabled gdb in addition to standard one
 
 PURE_LIB_DEPENDS_OFF=	\
-			libexpat.so:${PORTSDIR}/textproc/expat2 \
-			libgmp.so:${PORTSDIR}/math/gmp \
-			libmpfr.so:${PORTSDIR}/math/mpfr \
-			libmpc.so:${PORTSDIR}/math/mpc \
-			libisl.so:${PORTSDIR}/devel/isl \
-			libcloog-isl.so:${PORTSDIR}/math/cloog \
-			libelf.so:${PORTSDIR}/devel/libelf
+			libexpat.so:textproc/expat2 \
+			libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc \
+			libisl.so:devel/isl \
+			libcloog-isl.so:math/cloog \
+			libelf.so:devel/libelf
 
 PDF_USE=		TEX=base:build,tex:build,dvipsk:build
-PDF_BUILD_DEPENDS=	texi2dvi:${PORTSDIR}/print/texinfo
+PDF_BUILD_DEPENDS=	texi2dvi:print/texinfo
 OPTIONS_SUB=		yes
 PYGDB_USES=		python:2
 
diff --git a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile
index d94a1b462bcf..582400e61df0 100644
--- a/devel/gcc-msp430-ti-toolchain/Makefile
+++ b/devel/gcc-msp430-ti-toolchain/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Complete gcc-based toolcahin for TI MSP430 uC
 LICENSE=	GPLv2 LGPL20 LGPL21 GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect \
-		flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	expect:lang/expect \
+		flex:textproc/flex
 
 OPTIONS_DEFINE=	INSIGHT PURE
 OPTIONS_DEFAULT=
@@ -35,9 +35,9 @@ INSIGHT_USE=			XORG=x11
 PURE_CONFIGURE_OFF=	--with-gmp=${PREFIX} \
 			--with-mprf=${PREFIX} \
 			--with-mpc=${PREFIX}
-PURE_LIB_DEPENDS_OFF=	libgmp.so:${PORTSDIR}/math/gmp \
-			libmpfr.so:${PORTSDIR}/math/mpfr \
-			libmpc.so:${PORTSDIR}/math/mpc
+PURE_LIB_DEPENDS_OFF=	libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc
 PURE_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-libgui_configure \
 			${PATCHDIR}/extra-patch-gdb_configure
 
@@ -59,7 +59,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MPURE} && ${PORT_OPTIONS:MINSIGHT}
-RUN_DEPENDS+=		iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+RUN_DEPENDS+=		iwidgets>0:x11-toolkits/iwidgets
 USES+=			tk:84+
 CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
 			--with-tk=${TK_LIBDIR}
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile
index 206b90025506..9e1a60036ac6 100644
--- a/devel/gccmakedep/Makefile
+++ b/devel/gccmakedep/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Create dependencies in makefiles using 'gcc -M'
 
 XORG_CAT=	util
 
-BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
+BUILD_DEPENDS=	tradcpp:devel/tradcpp
 
 PLIST_FILES=	bin/gccmakedep man/man1/gccmakedep.1.gz
 CONFIGURE_ENV+=	ac_cv_path_RAWCPP=tradcpp
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index ff4180e74280..cc9f7ebb0bb5 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -20,8 +20,8 @@ USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	orbit2 gtk20 libxml2 \
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 6ed9f1891d00..b3ddc99d7ff3 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gconf2 API library
 
-LIB_DEPENDS=	libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libglibmm-2.4.so:devel/glibmm
+BUILD_DEPENDS=	gm4:devel/m4 \
+		${LOCALBASE}/lib/libgtkmm-2.4.so.1:x11-toolkits/gtkmm24
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	x11
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 9abc999612b2..36b90c542250 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNU GDB of newer version than comes with the system
 
 LICENSE=	GPLv3
 
-TEST_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
+TEST_DEPENDS=	runtest:misc/dejagnu
 
 TEST_TARGET=	check
 USES=		cpe iconv gmake libtool tar:xz
@@ -57,10 +57,10 @@ BASE_READLINE_CFLAGS=	-D_rl_echoing_p=readline_echoing_p
 BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
 DEBUG_CFLAGS=		-g
 EXPAT_CONFIGURE_WITH=	expat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 GUILE_CONFIGURE_WITH=	guile
 GUILE_USES=		pkgconfig
-GUILE_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 PORT_READLINE_USES=	readline:port
 PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
 PYTHON_CONFIGURE_OFF=	--without-python
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 4a1c42cd9fff..ccfdc1a24315 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -43,8 +43,8 @@ CFLAGS+=	-Dreadline_echoing_p=_rl_echoing_p
 .if ${PORT_OPTIONS:MINSIGHT}
 PKGNAMESUFFIX=	-insight
 USES+=		tk
-LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
-RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+LIB_DEPENDS=	libitk.so:x11-toolkits/itk
+RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 DISTFILES+=	gdbtk-6.6${EXTRACT_SUFX}:gdbtk
 PLIST_SUB+=	INSIGHT=''
 EXTRA_PATCHES=	${FILESDIR}/itcl33-patch \
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 8db998e2b406..97a0e08a01f8 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Grassroots DICOM library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
+		libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		VTK
 OPTIONS_RADIO_VTK=	VTK5 VTK6
 OPTIONS_SUB=		yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			docbook-xsl-ns>0:${PORTSDIR}/textproc/docbook-xsl-ns
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			docbook-xsl-ns>0:textproc/docbook-xsl-ns
 DOXYGEN_USES=		ghostscript
 DOXYGEN_USE=		gnome=libxslt:build tex=latex:build
 DOXYGEN_CMAKE_ON=	-DGDCM_DOCUMENTATION:BOOL=ON \
@@ -31,11 +31,11 @@ DOXYGEN_CMAKE_ON=	-DGDCM_DOCUMENTATION:BOOL=ON \
 DOXYGEN_CMAKE_OFF=	-DGDCM_DOCUMENTATION:BOOL=OFF
 
 VTK5_DESC=		Build VTK 5 integration classes
-VTK5_LIB_DEPENDS=	libvtkHybrid.so:${PORTSDIR}/math/vtk5
+VTK5_LIB_DEPENDS=	libvtkHybrid.so:math/vtk5
 VTK5_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
 			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK5_VERSION}
 VTK6_DESC=		Build VTK 6 integration classes
-VTK6_LIB_DEPENDS=	libvtkCommonCore-${VTK6_VERSION}.so:${PORTSDIR}/math/vtk6
+VTK6_LIB_DEPENDS=	libvtkCommonCore-${VTK6_VERSION}.so:math/vtk6
 VTK6_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
 			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION}
 
diff --git a/devel/geany-plugin-ctags/Makefile b/devel/geany-plugin-ctags/Makefile
index 183c4ab98d38..666132402a04 100644
--- a/devel/geany-plugin-ctags/Makefile
+++ b/devel/geany-plugin-ctags/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS=	exctags:devel/ctags
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-devhelp/Makefile b/devel/geany-plugin-devhelp/Makefile
index a207317ce68e..b22277713dc2 100644
--- a/devel/geany-plugin-devhelp/Makefile
+++ b/devel/geany-plugin-devhelp/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USE_GNOME=	gconf2
 
diff --git a/devel/geany-plugin-gendoc/Makefile b/devel/geany-plugin-gendoc/Makefile
index 634b4af14d73..e137594248a8 100644
--- a/devel/geany-plugin-gendoc/Makefile
+++ b/devel/geany-plugin-gendoc/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libctpl.so:${PORTSDIR}/textproc/ctpl
-RUN_DEPENDS=	${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils
+LIB_DEPENDS=	libctpl.so:textproc/ctpl
+RUN_DEPENDS=	${LOCALBASE}/bin/rst2html:textproc/py-docutils
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-geniuspaste/Makefile b/devel/geany-plugin-geniuspaste/Makefile
index 19cc5e172e41..3736e5f52bad 100644
--- a/devel/geany-plugin-geniuspaste/Makefile
+++ b/devel/geany-plugin-geniuspaste/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile
index be24ea56cc88..1f474b0e32bf 100644
--- a/devel/geany-plugin-git-changebar/Makefile
+++ b/devel/geany-plugin-git-changebar/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-markdown/Makefile b/devel/geany-plugin-markdown/Makefile
index 1d6156eb8e89..7cc32b2c2556 100644
--- a/devel/geany-plugin-markdown/Makefile
+++ b/devel/geany-plugin-markdown/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-multiterm/Makefile b/devel/geany-plugin-multiterm/Makefile
index d9199a261d7c..4d2e79601057 100644
--- a/devel/geany-plugin-multiterm/Makefile
+++ b/devel/geany-plugin-multiterm/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 USE_GNOME=	vte
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile
index b4daffd04a9b..ce9573605dd5 100644
--- a/devel/geany-plugin-pg/Makefile
+++ b/devel/geany-plugin-pg/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+LIB_DEPENDS=	libgpgme.so:security/gpgme
+RUN_DEPENDS=	gpg2:security/gnupg
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-spellcheck/Makefile b/devel/geany-plugin-spellcheck/Makefile
index 1b2d26b926e4..55e22db41456 100644
--- a/devel/geany-plugin-spellcheck/Makefile
+++ b/devel/geany-plugin-spellcheck/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-updatechecker/Makefile b/devel/geany-plugin-updatechecker/Makefile
index 2f934b4d23e7..194e7c0f2a06 100644
--- a/devel/geany-plugin-updatechecker/Makefile
+++ b/devel/geany-plugin-updatechecker/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile
index 3c81b98e0c9e..2dca198ce3cf 100644
--- a/devel/geany-plugin-vc/Makefile
+++ b/devel/geany-plugin-vc/Makefile
@@ -11,7 +11,7 @@ OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
 
 GTKSPELL_DESC=	Spell checking support via GtkSpell
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
diff --git a/devel/geany-plugin-webhelper/Makefile b/devel/geany-plugin-webhelper/Makefile
index 666b2b07c918..84e9c7e94e0e 100644
--- a/devel/geany-plugin-webhelper/Makefile
+++ b/devel/geany-plugin-webhelper/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
index 5d097c05056f..f2d9e4a291f7 100644
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -19,9 +19,9 @@ NO_OPTIONS_SORT=	yes
 
 .for plugin in ${GEANY_PLUGINS_ALL}
 ${plugin:tu}_DESC=	${${plugin}_DESC}
-${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin}
+${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
 .endfor
 
-NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:${PORTSDIR}/devel/geany-plugins-l10n
+NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:devel/geany-plugins-l10n
 
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index c2b043d11028..9a327a8d2ffb 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -6,8 +6,8 @@ MASTER_SITES=	http://plugins.geany.org/geany-plugins/
 DISTNAME=	geany-plugins-${PORTVERSION}
 DISTINFO_FILE=	${.CURDIR}/../../devel/geany-plugins/distinfo
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany
-RUN_DEPENDS+=	${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany
+BUILD_DEPENDS+=	${LOCALBASE}/bin/geany:devel/geany
+RUN_DEPENDS+=	${LOCALBASE}/bin/geany:devel/geany
 
 GNU_CONFIGURE=	yes
 USES+=		gettext-tools gmake libtool pkgconfig tar:bzip2
diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile
index d97cfbdec6c5..973e492a2222 100644
--- a/devel/gearmand-devel/Makefile
+++ b/devel/gearmand-devel/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Gearman C Server and Library
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs \
-		${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs \
+		${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+LIB_DEPENDS=	libevent.so:devel/libevent2 \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS=	p5-Gearman-Server-1.* gearmand-1.0.*
 
@@ -48,15 +48,15 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for persistent queue
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=		libdrizzleso:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=		libdrizzleso:databases/libdrizzle
 CONFIGURE_ARGS+=	--enable-libdrizzle
 .else
 CONFIGURE_ARGS+=	--disable-libdrizzle
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
-BUILD_DEPENDS+=		memcached>=0:${PORTSDIR}/databases/memcached
+LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
+BUILD_DEPENDS+=		memcached>=0:databases/memcached
 CONFIGURE_ARGS+=	--enable-libmemcached
 # This hack is required for the test programs invoked by configure,
 # in the event that libmemcached was compiled with SASL support.
@@ -89,15 +89,15 @@ CONFIGURE_ARGS+=	--disable-libpq
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-BUILD_DEPENDS+=		sqlite3>=3.0.0:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS+=		sqlite3>=3.0.0:databases/sqlite3
+LIB_DEPENDS+=		libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MTOKYOCAB}
-LIB_DEPENDS+=		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=		libtokyocabinet.so:databases/tokyocabinet
 CONFIGURE_ARGS+=	--enable-libtokyocabinet
 CONFIGURE_ENV+=		LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \
 			LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+=	--disable-libtokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MHIREDIS}
-LIB_DEPENDS+=		libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=		libhiredis.so:databases/hiredis
 CONFIGURE_ARGS+=	--enable-hires
 CONFIGURE_ENV+=		LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \
 			LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
index ca355a09c6a1..44417ad3f809 100644
--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Gearman C Server and Library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
+		libevent.so:devel/libevent2 \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 CONFLICTS=	p5-Gearman-Server-1.* gearmand-1.1.*
 
@@ -46,15 +46,15 @@ TOKYOCAB_DESC=	Tokyo Cabinet support for persistent queue
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDRIZZLE}
-LIB_DEPENDS+=		libdrizzle.so:${PORTSDIR}/databases/libdrizzle
+LIB_DEPENDS+=		libdrizzle.so:databases/libdrizzle
 CONFIGURE_ARGS+=	--enable-libdrizzle
 .else
 CONFIGURE_ARGS+=	--disable-libdrizzle
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
-LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
-BUILD_DEPENDS+=		memcached>=0:${PORTSDIR}/databases/memcached
+LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
+BUILD_DEPENDS+=		memcached>=0:databases/memcached
 CONFIGURE_ARGS+=	--enable-libmemcached
 # This hack is required for the test programs invoked by configure,
 # in the event that libmemcached was compiled with SASL support.
@@ -87,15 +87,15 @@ CONFIGURE_ARGS+=	--disable-libpq
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-BUILD_DEPENDS+=		sqlite3>=3.0.0:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS+=		sqlite3>=3.0.0:databases/sqlite3
+LIB_DEPENDS+=		libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MTOKYOCAB}
-LIB_DEPENDS+=		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=		libtokyocabinet.so:databases/tokyocabinet
 CONFIGURE_ARGS+=	--enable-libtokyocabinet
 CONFIGURE_ENV+=		LIBTOKYOCABINET_CPPFLAGS=-I${LOCALBASE}/include \
 			LIBTOKYOCABINET_LDFLAGS=-L${LOCALBASE}/lib
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=	--disable-libtokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MHIREDIS}
-LIB_DEPENDS+=		libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=		libhiredis.so:databases/hiredis
 CONFIGURE_ARGS+=	--enable-hires
 CONFIGURE_ENV+=		LIBHIREDIS_CPPFLAGS=-I${LOCALBASE}/include/hiredis \
 			LIBHIREDIS_LDFLAGS=-L${LOCALBASE}/lib
diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index df092d628e61..990f9971f021 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generic Constraint Development Environment
 LICENSE=	BSL MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 USES=		bison gmake perl5
 USE_PERL5=	build
diff --git a/devel/generatorrunner/Makefile b/devel/generatorrunner/Makefile
index c63a7070d195..62fd691679c8 100644
--- a/devel/generatorrunner/Makefile
+++ b/devel/generatorrunner/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tool to create binding generators for C++ and Qt libraries
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libapiextractor.so:${PORTSDIR}/devel/apiextractor
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+LIB_DEPENDS=	libapiextractor.so:devel/apiextractor
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git a/devel/geoip-java/Makefile b/devel/geoip-java/Makefile
index 9c3f01d69367..d332f586f7ce 100644
--- a/devel/geoip-java/Makefile
+++ b/devel/geoip-java/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java bindings for GeoIP API
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	GeoIP>=1.4.8:${PORTSDIR}/net/GeoIP
+RUN_DEPENDS=	GeoIP>=1.4.8:net/GeoIP
 
 PKGNAMESUFFIX:=	-java
 USES=		zip
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 7f2772ac1678..03c0932af64c 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -13,10 +13,10 @@ COMMENT=	GTK+ frontend for git version control system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+BUILD_DEPENDS=	git:devel/git \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		itstool:textproc/itstool
+RUN_DEPENDS=	git:devel/git
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_DEFAULT=	NLS
diff --git a/devel/git-bzr-ng/Makefile b/devel/git-bzr-ng/Makefile
index c89a3dab0f63..4fa69b52027c 100644
--- a/devel/git-bzr-ng/Makefile
+++ b/devel/git-bzr-ng/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Bi-directional git to bzr bridge
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
-		bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_SITELIBDIR}/bzrlib/plugins/fastimport/__init__.py:${PORTSDIR}/devel/bzr-fastimport
+RUN_DEPENDS=	git:devel/git \
+		bzr:devel/bzr \
+		${PYTHON_SITELIBDIR}/bzrlib/plugins/fastimport/__init__.py:devel/bzr-fastimport
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	termie
diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile
index 33820bf8aa2f..e6e600be1e7e 100644
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Command-line tool for working with Gerrit
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
diff --git a/devel/git-cvs/Makefile b/devel/git-cvs/Makefile
index fb4536cfae27..f84244f0e3e1 100644
--- a/devel/git-cvs/Makefile
+++ b/devel/git-cvs/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel python
 MAINTAINER=	mp39590@gmail.com
 COMMENT=	Tool to incrementally import changesets from CVS into Git
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rcsparse>0:${PORTSDIR}/devel/py-rcsparse \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index 3c4557b7d2d1..2f2ebee7bc8d 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Sub-commands for repo summary, repl, changelog population, and more
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	git:devel/git \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tj
diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
index f41482a5391a..fa0b26b7df05 100644
--- a/devel/git-merge-changelog/Makefile
+++ b/devel/git-merge-changelog/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Git "merge" driver for GNU style ChangeLog files
 
 EXTRACT_DEPENDS=	${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR}	\
-			automake-1.15:${PORTSDIR}/devel/automake		\
-			autoconf-2.69:${PORTSDIR}/devel/autoconf
+			automake-1.15:devel/automake		\
+			autoconf-2.69:devel/autoconf
 
 GNU_CONFIGURE=	yes
 
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index f43cf883025e..a35a6bdc7bbe 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -27,8 +27,8 @@ OPTIONS_DEFINE=	DOCS GIT_SUBVERSION
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 PLIST_SUB=	ELISPDIR=${ELISPDIR}
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
+GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile
index e46f3175a2d3..b818f1ae3e61 100644
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Allow to push code to review and interact with a Gerrit server
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git \
-		${PYTHON_PKGNAMEPREFIX}requests>2.4:${PORTSDIR}/www/py-requests
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr
+RUN_DEPENDS=	git:devel/git \
+		${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/git/Makefile b/devel/git/Makefile
index c7527aa1adbc..15998b487237 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -59,21 +59,21 @@ NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes
 
 PERL_USES=		perl5
 PERL_MAKE_ENV=		PERL_PATH=${PERL}
-PERL_BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
-PERL_RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+PERL_BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error
+PERL_RUN_DEPENDS=	p5-Error>=0:lang/p5-Error
 PERL_MAKE_ARGS_OFF=	NO_PERL=1
 
 SEND_EMAIL_IMPLIES=	PERL
-SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
-			p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:mail/p5-Net-SMTP-SSL \
+			p5-Authen-SASL>=0:security/p5-Authen-SASL
 
 ICONV_USES=		iconv
 ICONV_MAKE_ARGS_OFF=	NO_ICONV=1
 
 CURL_MAKE_ENV=		CURLDIR=${LOCALBASE}
-CURL_BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-CURL_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-CURL_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+CURL_BUILD_DEPENDS=	curl:ftp/curl
+CURL_RUN_DEPENDS=	curl:ftp/curl
+CURL_LIB_DEPENDS=	libexpat.so:textproc/expat2
 CURL_MAKE_ARGS_OFF=	NO_CURL=1 NO_EXPAT=1
 
 HTMLDOCS_DISTFILES=	${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
@@ -87,14 +87,14 @@ GUI_MAKE_ARGS_OFF=	NO_TCLTK=yes
 # to have git use devel/subversion18 it will be brought in through
 # devel/p5-subversion if you set WITH_SUBVERSION_VER=18. Otherwise
 # devel/subversion will be brought in.
-SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-			p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+			p5-subversion>=0:devel/p5-subversion
 
-CONTRIB_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-			asciidoc:${PORTSDIR}/textproc/asciidoc \
-			docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+CONTRIB_BUILD_DEPENDS=	xmlto:textproc/xmlto \
+			asciidoc:textproc/asciidoc \
+			docbook-xml>0:textproc/docbook-xml
 
-CVS_RUN_DEPENDS=	cvsps:${PORTSDIR}/devel/cvsps
+CVS_RUN_DEPENDS=	cvsps:devel/cvsps
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/gitflow/Makefile b/devel/gitflow/Makefile
index 2fdd705f0581..e4e2dfe42849 100644
--- a/devel/gitflow/Makefile
+++ b/devel/gitflow/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Git extensions to provide high-level repository operations
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
+RUN_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nbari
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index ba9bc3704d74..e83011d6ad9c 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -12,15 +12,15 @@ COMMENT=	GTK-based git repository viewer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		valac:${PORTSDIR}/lang/vala
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
+		libgee-0.8.so:devel/libgee \
+		libgit2-glib-1.0.so:devel/libgit2-glib \
+		libpeas-1.0.so:devel/libpeas \
+		libgtkspell3-3.so:textproc/gtkspell3 \
+		libsecret-1.so:security/libsecret
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		valac:lang/vala
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 CONFLICTS=	gitg0-[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/devel/gitg0/Makefile b/devel/gitg0/Makefile
index 6913a463bc23..e528b49cc671 100644
--- a/devel/gitg0/Makefile
+++ b/devel/gitg0/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK-based git repository viewer (gtk2 version)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 CONFLICTS=	gitg-[0-9]*
 
diff --git a/devel/github-backup-utils/Makefile b/devel/github-backup-utils/Makefile
index 626b80bd9e1d..d33bab52e005 100644
--- a/devel/github-backup-utils/Makefile
+++ b/devel/github-backup-utils/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	devel
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	GitHub Enterprise Backup Utilities
 
-RUN_DEPENDS=	git>0:${PORTSDIR}/devel/git \
-		rsync>0:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	git>0:devel/git \
+		rsync>0:net/rsync
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	github
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index a51001f91b10..027eed0ff2d2 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	ports@toco-domains.de
 COMMENT=	GitLab Shell handles git commands for GitLab
 
-BUILD_DEPENDS=	ruby>=2.1.5:${PORTSDIR}/lang/ruby21 \
-		gem:${PORTSDIR}/devel/ruby-gems
+BUILD_DEPENDS=	ruby>=2.1.5:lang/ruby21 \
+		gem:devel/ruby-gems
 
 USERS=		git
 GROUPS=		git
diff --git a/devel/gitlist/Makefile b/devel/gitlist/Makefile
index 44f75edff086..831d67a2e3cb 100644
--- a/devel/gitlist/Makefile
+++ b/devel/gitlist/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Web based Git repository browser written in PHP
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 PLIST=		${WRKDIR}/plist
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index de50661d53b9..29dcfa7b26cb 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Access control layer on top of git
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+RUN_DEPENDS=	git>=0:devel/git \
+		p5-JSON>=0:converters/p5-JSON
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
diff --git a/devel/gitolite2/Makefile b/devel/gitolite2/Makefile
index deb95088ddaf..33c00ad0c0a0 100644
--- a/devel/gitolite2/Makefile
+++ b/devel/gitolite2/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Access control layer on top of git
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git>=0:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sitaramc
diff --git a/devel/gitphp/Makefile b/devel/gitphp/Makefile
index 4744a39ad9e2..eadcbaeb6deb 100644
--- a/devel/gitphp/Makefile
+++ b/devel/gitphp/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:${PORTSDIR}/textproc/pecl-xdiff
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/devel/gittrac/Makefile b/devel/gittrac/Makefile
index 0a3530c98f79..165be07ef283 100644
--- a/devel/gittrac/Makefile
+++ b/devel/gittrac/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel
 
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For Git
 
-RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git>=0:devel/git
 
 MASTERDIR=	${.CURDIR}/../cvstrac
 MAKE_ARGS=	APPNAME=gittrac
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 2bd636e3f73e..90abd5a877b3 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	User interface builder for GTK+ 3
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	glade3-3.*
 PORTSCOUT=	limitw:1,even
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 8f2530b0ceca..262c2403387d 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	User interface builder for GTK+
 
-LIB_DEPENDS=	librarian.so:${PORTSDIR}/textproc/rarian
+LIB_DEPENDS=	librarian.so:textproc/rarian
 
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index f18e50141a85..b903036aec1f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -17,8 +17,8 @@ PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libffi.so:devel/libffi
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -78,7 +78,7 @@ GLIB_ARCH=	${ARCH}
 CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
 
 .if ${PORT_OPTIONS:MCOLLATION_FIX}
-LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicui18n.so:devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 		${FILESDIR}/extra-patch-glib_gunicollate.c
 # Disable it until someone can figure why it causes net-im/pidgin crashed.
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index 4e9069ab32f7..ff2472464370 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -3,8 +3,8 @@
 
 PORTREVISION=	0
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/glibmm \
-		gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:devel/glibmm \
+		gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 4c4369d08592..e4473faed5f6 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -18,7 +18,7 @@ PLIST_SUB=	VERSION="2.4"
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES+=		gettext gmake libtool pathfix perl5 pkgconfig
 USE_GNOME=	glib20 libsigc++20
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index edf6d2f422db..19035040eed7 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library of C++ classes for flexible logging
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgflags.so:${PORTSDIR}/devel/gflags
+LIB_DEPENDS=	libgflags.so:devel/gflags
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile
index 07e91d4bf2cd..2f21f867c31d 100644
--- a/devel/gnatcoll/Makefile
+++ b/devel/gnatcoll/Makefile
@@ -13,11 +13,11 @@ COMMENT=	GNAT Component Collection from Adacore
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
-		gnat_util>=20140422:${PORTSDIR}/lang/gnat_util
-LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3 \
-		libgmp.so:${PORTSDIR}/math/gmp
-RUN_DEPENDS=	gnat_util>=20140422:${PORTSDIR}/lang/gnat_util
+BUILD_DEPENDS=	gprbuild>=20120510:devel/gprbuild \
+		gnat_util>=20140422:lang/gnat_util
+LIB_DEPENDS=	libgtkada.so:x11-toolkits/gtkada3 \
+		libgmp.so:math/gmp
+RUN_DEPENDS=	gnat_util>=20140422:lang/gnat_util
 
 USES=		ada gmake pkgconfig python
 USE_GNOME=	pygobject3
@@ -32,7 +32,7 @@ MAKE_ARGS=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 OPTIONS_DEFINE=		READLINE SYSLOG PGSQL ICONV DOCS EXAMPLES
 OPTIONS_DEFAULT=	READLINE SYSLOG
 OPTIONS_SUB=		yes
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 SYSLOG_CONFIGURE_ENABLE=	syslog
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
diff --git a/devel/gnome-builder/Makefile b/devel/gnome-builder/Makefile
index 35fe45ab1731..f0e0c5ee1ef3 100644
--- a/devel/gnome-builder/Makefile
+++ b/devel/gnome-builder/Makefile
@@ -12,14 +12,14 @@ COMMENT=	IDE for writing software for GNOME
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	intltool-update:${PORTSDIR}/textproc/intltool \
-		llvm-config35:${PORTSDIR}/devel/llvm35 \
-		clang35:${PORTSDIR}/lang/clang35
-LIB_DEPENDS=	libgit2-glib-1.0.so:${PORTSDIR}/devel/libgit2-glib \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libdevhelp-3.so:${PORTSDIR}/devel/devhelp \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	intltool-update:textproc/intltool \
+		llvm-config35:devel/llvm35 \
+		clang35:lang/clang35
+LIB_DEPENDS=	libgit2-glib-1.0.so:devel/libgit2-glib \
+		libpeas-1.0.so:devel/libpeas \
+		libdevhelp-3.so:devel/devhelp \
+		libgjs.so:lang/gjs \
+		libpcre.so:devel/pcre
 
 BROKEN_FreeBSD_9=	Does not builds
 
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 755335f4eee5..f76280957537 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common automake macros for GNOME 3
 
-BUILD_DEPENDS=	autoconf-archive>=0:${PORTSDIR}/devel/autoconf-archive
-RUN_DEPENDS=	autoconf-archive>=0:${PORTSDIR}/devel/autoconf-archive
+BUILD_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
+RUN_DEPENDS=	autoconf-archive>=0:devel/autoconf-archive
 
 USES=		gmake gnome pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 94da0f86e05b..df1615f94237 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -15,7 +15,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS=	update-mime-database:misc/shared-mime-info
 
 USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gconf2 gnomemimedata intlhack referencehack
@@ -50,18 +50,18 @@ USES+=		fam
 .endif
 
 .if exists(${LOCALBASE}/lib/libkrb5.so)
-LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/heimdal
+LIB_DEPENDS+=	libkrb5.so:security/heimdal
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
 CONFIGURE_ARGS+=--enable-hal
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:sysutils/hal
 .else
 CONFIGURE_ARGS+=--disable-hal
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS+=	libsmbclient.so:net/samba-libsmbclient
 PLIST_SUB+=	SAMBA=""
 .else
 PLIST_SUB+=	SAMBA="@comment "
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-samba
 .endif
 
 .if ${PORT_OPTIONS:MMDNS}
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 .else
 CONFIGURE_ARGS+=--disable-avahi
 .endif
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 69f71d6a3431..090d9a1ae403 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gnomevfs2 library
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	glibmm gnomevfs2
diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile
index eeb865474f61..73dd2e45ebb9 100644
--- a/devel/gnu-efi/Makefile
+++ b/devel/gnu-efi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	SDK for EFI applications
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:devel/binutils
 
 USES=		gmake tar:bz2
 USE_GCC=	yes
diff --git a/devel/gnulib/Makefile b/devel/gnulib/Makefile
index 7cea2b8f10bd..d44ed6104049 100644
--- a/devel/gnulib/Makefile
+++ b/devel/gnulib/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-stable
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU portability library
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 USES=		gmake perl5 shebangfix
 SHEBANG_FILES=	check-module
diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile
index 796982e32751..5d08880d52cc 100644
--- a/devel/go-bindata/Makefile
+++ b/devel/go-bindata/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generates Go code from any file
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jteeuwen
diff --git a/devel/go-pretty/Makefile b/devel/go-pretty/Makefile
index 57a8248e03dc..637c5554f1a1 100644
--- a/devel/go-pretty/Makefile
+++ b/devel/go-pretty/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	LOCAL/gblach/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pretty-printing package for go values
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:${PORTSDIR}/textproc/go-text
-RUN_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:${PORTSDIR}/textproc/go-text
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text
+RUN_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/kr/text.a:textproc/go-text
 
 GO_PKGNAME=	github.com/kr/pretty
 
diff --git a/devel/go-slices/Makefile b/devel/go-slices/Makefile
index f935138f94df..54230c7c890c 100644
--- a/devel/go-slices/Makefile
+++ b/devel/go-slices/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Go library for slice-based datatypes
 
 #LICENSE=	MIT based, with no-evli clause
 
-BUILD_DEPENDS=	go-raw>0:${PORTSDIR}/devel/go-raw
+BUILD_DEPENDS=	go-raw>0:devel/go-raw
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	feyeleanor
diff --git a/devel/go-termbox/Makefile b/devel/go-termbox/Makefile
index 73c4d18b5c8b..265dadbc0cbb 100644
--- a/devel/go-termbox/Makefile
+++ b/devel/go-termbox/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pure Go termbox implementation
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:${PORTSDIR}/devel/go-runewidth
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:devel/go-runewidth
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nsf
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 47d5ab7237f4..34b4af84dd51 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
 # we need cairo otherwise the generated Cairo gir is broken
-BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	cairo-trace:graphics/cairo
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/godep/Makefile b/devel/godep/Makefile
index a8c881410364..3ad3f39240e0 100644
--- a/devel/godep/Makefile
+++ b/devel/godep/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Godep helps build packages reproducibly
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tools
diff --git a/devel/godot/Makefile b/devel/godot/Makefile
index acca3dcdddb1..83178ea54ef0 100644
--- a/devel/godot/Makefile
+++ b/devel/godot/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Game engine and development environment
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libasound.so:audio/alsa-lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	okamstudio
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 40e0916dcb0d..e7be879a1f90 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	ignore:1
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intlhack gtk20 libgsf
diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
index b2785163c19e..39c4c33b0957 100644
--- a/devel/google-gdata/Makefile
+++ b/devel/google-gdata/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DOT NET library for the Google Data API
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:${PORTSDIR}/devel/newtonsoft-json
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json
 
 USES=		dos2unix gmake mono
 DOS2UNIX_FILES=	Makefile misc/gdata-sharp-core.pc.in
diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile
index 28958cbfaeae..6b28cde27237 100644
--- a/devel/goprotobuf/Makefile
+++ b/devel/goprotobuf/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Go support for Google's protocol buffers
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
+RUN_DEPENDS=	protoc:devel/protobuf
 
 GO_PKGNAME=	github.com/golang/protobuf
 GO_TARGET=	${GO_PKGNAME}/proto \
diff --git a/devel/gprbuild/Makefile b/devel/gprbuild/Makefile
index cdb6432fec16..c9d81580f6d6 100644
--- a/devel/gprbuild/Makefile
+++ b/devel/gprbuild/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Adacore multi-language software build tool
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	xmlada>=4.4:${PORTSDIR}/textproc/xmlada
+BUILD_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
 YEAR=		2015
 SNAPSHOT=	20150506
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 6ff4246e0df0..f716f87f249a 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -14,16 +14,16 @@ COMMENT=	GNAT Programming Studio - IDE for Ada and many other languages
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada \
-		gnatcoll>=2015:${PORTSDIR}/devel/gnatcoll \
-		templates_parser>11:${PORTSDIR}/textproc/templates_parser
-LIB_DEPENDS=	libgtkada.so:${PORTSDIR}/x11-toolkits/gtkada3
-RUN_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
-		gdb${PORTGDB}:${PORTSDIR}/devel/gdb \
-		gprbuild:${PORTSDIR}/devel/gprbuild \
-		${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}jedi>0:${PORTSDIR}/devel/py-jedi
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		xmlada>=4.4:textproc/xmlada \
+		gnatcoll>=2015:devel/gnatcoll \
+		templates_parser>11:textproc/templates_parser
+LIB_DEPENDS=	libgtkada.so:x11-toolkits/gtkada3
+RUN_DEPENDS=	rsvg-convert:graphics/librsvg2 \
+		gdb${PORTGDB}:devel/gdb \
+		gprbuild:devel/gprbuild \
+		${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi
 
 GNU_CONFIGURE=	yes
 USES=		ada:run gmake perl5 pkgconfig python
@@ -45,7 +45,7 @@ PORTGDB=	${GDBVER:S/.//}
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
 OPTIONS_SUB=		yes
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-aux-${OPSYS:tl}${OSREL}
 CONFIGURE_ENV+=		AWK=/usr/bin/awk
diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile
index 307c9b9ea283..7db1e3c47bc7 100644
--- a/devel/gpsim/Makefile
+++ b/devel/gpsim/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Software simulator for Microchip PIC microcontrollers
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
-RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
+BUILD_DEPENDS=	gpasm:devel/gputils
+LIB_DEPENDS=	libpopt.so:devel/popt
+RUN_DEPENDS=	gpasm:devel/gputils
 
 USES=		gmake libtool pathfix pkgconfig readline
 USE_GNOME=	glib20
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=		DOCS EXAMPLES GTK2
 OPTIONS_DEFAULT=	GTK2
 OPTIONS_SUB=		yes
 
-GTK2_LIB_DEPENDS=	libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2
+GTK2_LIB_DEPENDS=	libgtkextra-x11-2.0.so:x11-toolkits/gtkextra2
 GTK2_USE=		gnome=gtk20
 GTK2_CONFIGURE_ENABLE=	gui
 GTK2_DESKTOP_ENTRIES=	"GPSim" "" "" "gpsim" "Development;GTK;" ""
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 3e3ca27c9f6f..de911e7f5fa9 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/gputils-${PORTVERSION:R}
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.35:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=2.5.35:textproc/flex
 CONFIGURE_ARGS+=LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index 0a97c38a58c5..1236b9ff9628 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Collection of globally shared GSetting schemas
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11-fonts/cantarell-fonts
+RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:x11-fonts/cantarell-fonts
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 1132deea92b3..a70c9163ebf6 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -21,9 +21,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 OPTIONS_RADIO=	SSL
 OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-			libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-			libgpg-error.so:${PORTSDIR}/security/libgpg-error
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt \
+			libgpg-error.so:security/libgpg-error
 GNUTLS_CONFIGURE_ON=	--enable-gnutls
 GNUTLS_LDFLAGS=		-L${LOCALBASE}/lib
 OPENSSL_CONFIGURE_ENABLE=	ssl
diff --git a/devel/gtgt/Makefile b/devel/gtgt/Makefile
index 56b633fbefba..5ea1ad81f2c7 100644
--- a/devel/gtgt/Makefile
+++ b/devel/gtgt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General (or GNU) template generation tools
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 LICENSE=	GPLv2+ # though COPYING has GPLv3
 
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 33c1afc540d9..9aa74363635f 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -11,14 +11,14 @@ COMMENT=	GNOME application for creating GNU gettext translation files
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		itstool:${PORTSDIR}/textproc/itstool \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libgdl-3.so:${PORTSDIR}/x11-toolkits/gdl \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		itstool:textproc/itstool \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libpeas-1.0.so:devel/libpeas \
+		libgdl-3.so:x11-toolkits/gdl \
+		libjson-glib-1.0.so:devel/json-glib
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USE_GNOME=	intlhack gnomeprefix gtk30 libgda5 gtksourceview3 libxml2 \
 		introspection:build
@@ -46,9 +46,9 @@ DICT_DESC=	Build dictionary plugin
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDICT}
-BUILD_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
-LIB_DEPENDS+=	libgdict-1.0.so:${PORTSDIR}/deskutils/gnome-dictionary
-RUN_DEPENDS+=	gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary
+BUILD_DEPENDS+=	gnome-dictionary>=3.4.0:deskutils/gnome-dictionary
+LIB_DEPENDS+=	libgdict-1.0.so:deskutils/gnome-dictionary
+RUN_DEPENDS+=	gnome-dictionary>=3.4.0:deskutils/gnome-dictionary
 GLIB_SCHEMAS+=	org.gnome.gtranslator.plugins.dictionary.gschema.xml
 CONFIGURE_ARGS+=--with-dictionary
 PLIST_SUB+=	DICT=""
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 56e5314484e1..ec54f8d44290 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -35,7 +35,7 @@ PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MALLEGRO}
-LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
+LIB_DEPENDS+=	liballeg.so:devel/allegro
 CONFIGURE_ARGS+=--enable-allegro
 PLIST_SUB+=	ALLEGRO=""
 .else
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index b546513e82a6..e06a8fc2f67d 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://cactus.rulez.org/projects/guikachu/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Resource editor for PalmOS(tm) systems
 
-LIB_DEPENDS=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26 \
-		libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm
+LIB_DEPENDS=	libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26 \
+		libgnomevfsmm-2.6.so:devel/gnome-vfsmm
 
 USES=		gmake pathfix pkgconfig shared-mime-info desktop-file-utils
 USE_GNOME=	gnomeprefix intlhack libgnomeui
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index 0fadd60d4376..6fc717cd4e8e 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Repository of useful code written in Guile Scheme
 
-BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	guile:lang/guile
+RUN_DEPENDS=	guile:lang/guile
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/guiloader-c++/Makefile b/devel/guiloader-c++/Makefile
index 792a06b913f7..4e9b7cebb0e6 100644
--- a/devel/guiloader-c++/Makefile
+++ b/devel/guiloader-c++/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ binding to the GuiLoader library
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libguiloader.so:${PORTSDIR}/devel/guiloader \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
+LIB_DEPENDS=	libguiloader.so:devel/guiloader \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 PROJECTHOST=	nothing-personal
 USES=		gettext libtool pathfix pkgconfig tar:bzip2
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 7dd6922bee4c..ce11742dbc39 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -11,12 +11,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 
-BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgcr-base-3.so:${PORTSDIR}/security/gcr \
-		libsecret-1.so:${PORTSDIR}/security/libsecret
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libgcrypt.so:security/libgcrypt \
+		libgcr-base-3.so:security/gcr \
+		libsecret-1.so:security/libsecret
 
 PORTSCOUT=	limitw:1,even
 
@@ -53,25 +53,25 @@ GOOGLE_DESC=	Google backend
 FUSE_USES=	fuse
 FUSE_CONFIGURE_ENABLE=	fuse
 
-SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SAMBA_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SAMBA_CONFIGURE_ENABLE=	samba
 
-CDDA_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDDA_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDDA_CONFIGURE_ENABLE=	cdda
 
-GPHOTO2_LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO2_CONFIGURE_ENABLE=	gphoto2
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
-AFC_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice \
-			libplist.so:${PORTSDIR}/devel/libplist
+AFC_LIB_DEPENDS=	libimobiledevice.so:comms/libimobiledevice \
+			libplist.so:devel/libplist
 AFC_CONFIGURE_ENABLE=	afc
 
 GOOGLE_CONFIGURE_ENABLE=	google
-GOOGLE_LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata \
-			libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts
+GOOGLE_LIB_DEPENDS=	libgdata.so:devel/libgdata \
+			libgoa-1.0.so:net/gnome-online-accounts
 
 .include <bsd.port.options.mk>
 
@@ -84,8 +84,8 @@ GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
 .endif
 
 .if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
-RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+LIB_DEPENDS+=	libhal.so:sysutils/hal
+RUN_DEPENDS+=	gnome-mount:sysutils/gnome-mount
 PLIST_SUB+=	HAL=""
 .else
 CONFIGURE_ARGS+=--disable-hal
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index bb9d39955711..509f9b8f805a 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -12,8 +12,8 @@ COMMENT?=	Multi-platform helper library for networking and security applications
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls
 
 USES=		gettext gmake iconv libtool pathfix pkgconfig
 USE_OPENSSL=	yes
@@ -32,8 +32,8 @@ PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
 .if !defined(SLAVEPORT)
 OPTIONS_DEFINE=			DOXYGEN MEMDEBUG
 
-DOXYGEN_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen \
-				dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen \
+				dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	full-doc
 
 MEMDEBUG_DESC=			Enable memory debugger statistic
@@ -43,12 +43,12 @@ MEMDEBUG_CONFIGURE_ENABLE=	memtrace
 .include <bsd.port.options.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar
+LIB_DEPENDS+=	libgwenhywfar.so:devel/gwenhywfar
 BUILD_WRKSRC=	${WRKSRC}/gui
 INSTALL_WRKSRC=	${WRKSRC}/gui/${SLAVEPORT}
 
 .  if ${SLAVEPORT}=="fox16"
-LIB_DEPENDS+=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS+=	libFOX-1.6.so:x11-toolkits/fox16
 CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \
 		--with-fox-libs=${LOCALBASE}/lib
 .  endif
diff --git a/devel/hachoir-parser/Makefile b/devel/hachoir-parser/Makefile
index e2ec19dce883..1130e4166cb7 100644
--- a/devel/hachoir-parser/Makefile
+++ b/devel/hachoir-parser/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Parsers of most common file formats
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:${PORTSDIR}/devel/hachoir-core
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:${PORTSDIR}/devel/hachoir-core
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:devel/hachoir-core
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_core/__init__.py:devel/hachoir-core
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index 0a4c47b452a5..9ff3d518453e 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	gmake:${PORTSDIR}/devel/gmake \
-		gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	gmake:devel/gmake \
+		gsed:textproc/gsed
+RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS_INSTALL=	hadoop2-2*
 
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index 7f5f971b63ea..d5fb645501e0 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -23,12 +23,12 @@ COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3 \
-		cmake:${PORTSDIR}/devel/cmake \
-		${LOCALBASE}/protobuf25/bin/protoc:${PORTSDIR}/devel/protobuf25
-LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		ssid:${PORTSDIR}/sysutils/ssid
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
+		cmake:devel/cmake \
+		${LOCALBASE}/protobuf25/bin/protoc:devel/protobuf25
+LIB_DEPENDS=	libsnappy.so:archivers/snappy
+RUN_DEPENDS=	bash:shells/bash \
+		ssid:sysutils/ssid
 
 BROKEN_FreeBSD_9=	fails to build
 
diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index f8cf2c5571fa..36b8d22af0dc 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Mercurial extension to pull from or push to a Git repository
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \
-		mercurial>=*:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:devel/dulwich \
+		mercurial>=*:devel/mercurial
 
 PORTDOCS=	README.md
 
diff --git a/devel/hgreviewboard/Makefile b/devel/hgreviewboard/Makefile
index 41bdd5f08f13..835c3a830356 100644
--- a/devel/hgreviewboard/Makefile
+++ b/devel/hgreviewboard/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Mercurial reviewboard extension
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		rbt:${PORTSDIR}/devel/rbtools
+RUN_DEPENDS=	hg:devel/mercurial \
+		rbt:devel/rbtools
 
 WRKSRC=		${WRKDIR}/ccaughie-hgreviewboard-e461a0baf62d
 USES=		python
diff --git a/devel/hgsvn/Makefile b/devel/hgsvn/Makefile
index f1ea706bb247..496f9fcf1114 100644
--- a/devel/hgsvn/Makefile
+++ b/devel/hgsvn/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Scripts to work locally on Subversion checkouts using Mercurial
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion \
-		hg:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	svn:devel/subversion \
+		hg:devel/mercurial
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 6b9bcbedd121..45e9389d1c3d 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Fast Mercurial log navigator written in pyqt4
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>0:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}mx-base>0:${PORTSDIR}/lang/py-mx-base \
-		${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils
-BUILD_DEPENDS=	hg:${PORTSDIR}/devel/mercurial \
-		pyrcc4:${PORTSDIR}/textproc/py-qt4-xml \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		asciidoc:${PORTSDIR}/textproc/asciidoc
+RUN_DEPENDS=	hg:devel/mercurial \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>0:devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base \
+		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils
+BUILD_DEPENDS=	hg:devel/mercurial \
+		pyrcc4:textproc/py-qt4-xml \
+		xmlto:textproc/xmlto \
+		asciidoc:textproc/asciidoc
 
 NO_ARCH=	yes
 USE_PYTHON=	distutils
diff --git a/devel/hive/Makefile b/devel/hive/Makefile
index 8440e25483ef..5971bf02d119 100644
--- a/devel/hive/Makefile
+++ b/devel/hive/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for data warehousing on top of Hadoop
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3 \
-		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
+		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		cpe
 CPE_VENDOR=	apache
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 65fc81cd2dc5..54cd8d9fa7eb 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -31,7 +31,7 @@ FLAGS_ENABLE=		library executable
 
 CURL_DESC=		Use libcurl for HTTP support
 CURL_FLAG_ENABLE=	curl
-CURL_FLAG_LIB=		libcurl.so:${PORTSDIR}/ftp/curl
+CURL_FLAG_LIB=		libcurl.so:ftp/curl
 
 HTTP_DESC=		Use the pure HTTP package
 HTTP_FLAG_ENABLE=	http
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index fe5f1a734d17..95ef2c76d532 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -23,13 +23,13 @@ USE_PERL5=	build
 
 MAN1PAGES=	git-annex.1 git-annex-shell.1
 
-BUILD_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
-		git:${PORTSDIR}/devel/git \
-		gsha256sum:${PORTSDIR}/sysutils/coreutils
+BUILD_DEPENDS+=	rsync:net/rsync \
+		git:devel/git \
+		gsha256sum:sysutils/coreutils
 
-RUN_DEPENDS+=	rsync:${PORTSDIR}/net/rsync \
-		git:${PORTSDIR}/devel/git \
-		gsha256sum:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS+=	rsync:net/rsync \
+		git:devel/git \
+		gsha256sum:sysutils/coreutils
 
 EXECUTABLE=	git-annex git-annex-shell
 STANDALONE=	yes
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 25f4c3f68826..3b55f6aed5a7 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Haskell binding to inotify
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 6a05960f629b..5a103a4c373c 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	network
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 10c0a3c5e1fa..5bcbdb735e50 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Small, efficient, and portable regex library for Perl 5 compatible
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 1fd6fa86a606..0fb235064b94 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -11,7 +11,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	text>=0.9.1.0
 
-LIB_DEPENDS+=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicui18n.so:devel/icu
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hub/Makefile b/devel/hub/Makefile
index ee95c67efee4..d5887127502e 100644
--- a/devel/hub/Makefile
+++ b/devel/hub/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Introduces git to GitHub
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	go:lang/go \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	github
diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index 9e03bd3cfad1..3104f0fb0a89 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Portable Hardware Locality software package
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess
+LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
@@ -35,7 +35,7 @@ OPTIONS_SUB=	yes
 
 CAIRO_CONFIGURE_OFF=	--disable-cairo --without-x
 CAIRO_CONFIGURE_ON=	--enable-cairo --with-x
-CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_USE=		XORG=x11
 
 post-install:
diff --git a/devel/hyperscan/Makefile b/devel/hyperscan/Makefile
index 326ce6fd374d..a9e9e51e5916 100644
--- a/devel/hyperscan/Makefile
+++ b/devel/hyperscan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High-performance multiple regex matching library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	ragel:${PORTSDIR}/devel/ragel
+BUILD_DEPENDS=	ragel:devel/ragel
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	01org
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index cc9bb93c2643..68a27437c70d 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -14,12 +14,12 @@ LICENSE=		GPLv2
 SLAVE_PORT?=		no
 
 .if ${SLAVE_PORT} == "no"
-LIB_DEPENDS=		libexpat.so:${PORTSDIR}/textproc/expat2 \
-			libmcpp.so:${PORTSDIR}/devel/mcpp
+LIB_DEPENDS=		libexpat.so:textproc/expat2 \
+			libmcpp.so:devel/mcpp
 USE_OPENSSL=		yes
 .else
 LIB_VRS=		${PORTVERSION:R:S|.||g}
-LIB_DEPENDS+=		libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
+LIB_DEPENDS+=		libIce.so.${LIB_VRS}:devel/ice
 PLIST_SUB+=		LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
 .endif
 
@@ -31,7 +31,7 @@ USES+=			iconv gmake
 
 .if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
 USES+=			python:build
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:${PORTSDIR}/security/py-passlib
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib
 .endif
 
 WRKSRC=			${WRKDIR}/ice-${PORTVERSION}
diff --git a/devel/icmake/Makefile b/devel/icmake/Makefile
index 4c46d09e9f2d..81ee6ac9eaa4 100644
--- a/devel/icmake/Makefile
+++ b/devel/icmake/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Intelligent C-like Maker
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	bash:shells/bash \
+		gsed:textproc/gsed
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
diff --git a/devel/ifd-test/Makefile b/devel/ifd-test/Makefile
index b424dd67200c..95000f44f7d0 100644
--- a/devel/ifd-test/Makefile
+++ b/devel/ifd-test/Makefile
@@ -12,7 +12,7 @@ COMMENT=	IFD Test Suite for PC/SC Lite
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		gmake
 NOMAN=
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index fe04f68743c2..fb80a142dd14 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from X.Org
 
-BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
-RUN_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep \
-		makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/lib/X11/config/xorg.cf:${PORTSDIR}/x11/xorg-cf-files
+BUILD_DEPENDS=	tradcpp:devel/tradcpp
+RUN_DEPENDS=	gccmakedep:devel/gccmakedep \
+		makedepend:devel/makedepend \
+		${LOCALBASE}/lib/X11/config/xorg.cf:x11/xorg-cf-files
 
 USES=	shebangfix perl5 pkgconfig
 USE_PERL5=	run
diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile
index c8eb3071bd1f..4590c96d6e50 100644
--- a/devel/include-what-you-use/Makefile
+++ b/devel/include-what-you-use/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tool for use with clang to analyze #includes in C and C++ source files
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-BUILD_DEPENDS=	clang37:${PORTSDIR}/devel/llvm37
-RUN_DEPENDS=	clang37:${PORTSDIR}/devel/llvm37
+BUILD_DEPENDS=	clang37:devel/llvm37
+RUN_DEPENDS=	clang37:devel/llvm37
 
 USES=		cmake:outsource ncurses python:run
 USE_GITHUB=	yes
diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index ad224b1a482d..cd4cc0e695f7 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Enhanced Interactive Python shell
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>=2:${PORTSDIR}/misc/py-pexpect \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=2:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>=2:misc/py-pexpect \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -32,20 +32,20 @@ ZMQ_DESC=		ZMQ support (parallel computing, qt console, notebook)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments
 .endif
 
 .if ${PORT_OPTIONS:MHTML_NOTEBOOK}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=2.0:${PORTSDIR}/www/py-tornado \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:${PORTSDIR}/devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}mistune>=0:${PORTSDIR}/textproc/py-mistune
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \
+		${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune
 .endif
 
 .if ${PORT_OPTIONS:MZMQ} || ${PORT_OPTIONS:MHTML_NOTEBOOK}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:${PORTSDIR}/net/py-pyzmq
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.4:net/py-pyzmq
 .endif
 
 post-install:
diff --git a/devel/isl/Makefile b/devel/isl/Makefile
index fb242e4ebe30..d3569f7a588a 100644
--- a/devel/isl/Makefile
+++ b/devel/isl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Integer Set Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS=	--with-gmp-prefix=${LOCALBASE}
 GNU_CONFIGURE=	yes
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index 6a742106c808..f1a1ef62eb5b 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Java-PDF Library
 LICENSE=	MPL LGPL20
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
-		${JAVAJARDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j \
-		${JAVAJARDIR}/pdf-renderer.jar:${PORTSDIR}/print/pdf-renderer
-RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
-		${JAVAJARDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j \
-		${JAVAJARDIR}/pdf-renderer.jar:${PORTSDIR}/print/pdf-renderer
+BUILD_DEPENDS=	${JAVAJARDIR}/bcmail.jar:java/bouncycastle \
+		${JAVAJARDIR}/dom4j.jar:textproc/dom4j \
+		${JAVAJARDIR}/pdf-renderer.jar:print/pdf-renderer
+RUN_DEPENDS=	${JAVAJARDIR}/bcmail.jar:java/bouncycastle \
+		${JAVAJARDIR}/dom4j.jar:textproc/dom4j \
+		${JAVAJARDIR}/pdf-renderer.jar:print/pdf-renderer
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/jakarta-commons-configuration/Makefile
index 028270d17bd3..cbfe62f5ce9e 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/jakarta-commons-configuration/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Java package for the reading of configuration/preferences files
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
-		${JAVALIBDIR}/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang \
-		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index e31b9de8c9d7..8c0ac6758e59 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of I/O utilities for Java
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
+BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:java/junit
 
 ALL_TARGET=	dist
 JAVA_VERSION=	1.6+
diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index 8cd8eb14f2c4..a0d09bf85cbe 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Streaming-based Java implementation of ISO 9660
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${JAVALIBDIR}/sabre.jar:${PORTSDIR}/devel/sabre
-RUN_DEPENDS=	${JAVALIBDIR}/sabre.jar:${PORTSDIR}/devel/sabre
+BUILD_DEPENDS=	${JAVALIBDIR}/sabre.jar:devel/sabre
+RUN_DEPENDS=	${JAVALIBDIR}/sabre.jar:devel/sabre
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_JAVA=	yes
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index 8afad59505ff..d0773ac67ca5 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utility to work with JTAG-aware boards
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${OPENWINCE_INCLUDE_DEP}:${PORTSDIR}/devel/openwince-include
+BUILD_DEPENDS=	${OPENWINCE_INCLUDE_DEP}:devel/openwince-include
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 88802f0c7329..8142797a2ebf 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}r2695-src
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	Makefile framework
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		autoreconf:build gmake makeinfo
 
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index 7e5d10f95185..ac43d2d54cce 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -20,9 +20,9 @@ SHEBANG_FILES=	converters/op2calltree converters/dprof2calltree \
 OPTIONS_DEFINE=	DOT VALGRIND
 
 DOT_DESC=		Use GraphViz/dot to render call graphs
-DOT_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz
+DOT_RUN_DEPENDS=	dot:graphics/graphviz
 
 VALGRIND_DESC=		Install devel/valgrind
-VALGRIND_RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
+VALGRIND_RUN_DEPENDS=	valgrind:devel/valgrind
 
 .include <bsd.port.mk>
diff --git a/devel/kdebindings4/Makefile b/devel/kdebindings4/Makefile
index 506362d9502f..124459fd8681 100644
--- a/devel/kdebindings4/Makefile
+++ b/devel/kdebindings4/Makefile
@@ -17,11 +17,11 @@ PERL_DESC=	Perl bindings
 PERL_USE=	KDE4=perlkde_run
 
 PYTHON_DESC=	Python bindings
-PYTHON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krosspython.so:${PORTSDIR}/devel/py-krosspython
+PYTHON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython
 PYTHON_USE=	KDE4=pykde4_run,pykdeuic4_run
 
 RUBY_DESC=	Ruby bindings
-RUBY_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krossruby.so:${PORTSDIR}/devel/ruby-krossruby
+RUBY_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/krossruby.so:devel/ruby-krossruby
 RUBY_USE=	KDE4=korundum_run
 
 .include <bsd.port.mk>
diff --git a/devel/kdesdk4-kioslaves/Makefile b/devel/kdesdk4-kioslaves/Makefile
index f03bbabf6c0e..8796aba59917 100644
--- a/devel/kdesdk4-kioslaves/Makefile
+++ b/devel/kdesdk4-kioslaves/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	SDK related KIO slaves
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 USES=		cmake:outsource perl5 shebangfix tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index df8bc8d33b7c..7e9aef3b0ab9 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -29,51 +29,51 @@ OPTIONS_DEFINE=	CERVISIA \
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CERVISIA_DESC=		CVS frontend
-CERVISIA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/cervisia:${PORTSDIR}/devel/cervisia
+CERVISIA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/cervisia:devel/cervisia
 
 DEVUTILS_DESC=		KDE development utilities
-DEVUTILS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuiviewer:${PORTSDIR}/devel/kde-dev-utils
+DEVUTILS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuiviewer:devel/kde-dev-utils
 
 DEVSCRIPTS_DESC=	KDE development scripts
-DEVSCRIPTS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kdekillall:${PORTSDIR}/devel/kde-dev-scripts
+DEVSCRIPTS_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kdekillall:devel/kde-dev-scripts
 
 DOLPHIN_DESC=		Plugins for Dolphin file manager
-DOLPHIN_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/fileviewgitplugin.so:${PORTSDIR}/devel/dolphin-plugins
+DOLPHIN_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/fileviewgitplugin.so:devel/dolphin-plugins
 
 KAPPTEMPLATE_DESC=	Template generator
-KAPPTEMPLATE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kapptemplate:${PORTSDIR}/devel/kapptemplate
+KAPPTEMPLATE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kapptemplate:devel/kapptemplate
 
 KATE_DESC=		KDE advanced text editor
 KATE_USE=		KDE4=kate_run
 
 KATE_PATE_DESC=		Support for Python plugins in Kate
-KATE_PATE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepateplugin.so:${PORTSDIR}/editors/kate-plugin-pate
+KATE_PATE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepateplugin.so:editors/kate-plugin-pate
 
 KCACHEGRIND_DESC=	Profiler frontend
-KCACHEGRIND_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcachegrind:${PORTSDIR}/devel/kcachegrind
+KCACHEGRIND_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kcachegrind:devel/kcachegrind
 
 KIOSLAVES_DESC=		SDK related KIO slaves
-KIOSLAVES_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kio_svn.so:${PORTSDIR}/devel/kdesdk4-kioslaves
+KIOSLAVES_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kio_svn.so:devel/kdesdk4-kioslaves
 
 KOMPARE_DESC=		Diff/Patch frontend
-KOMPARE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kompare:${PORTSDIR}/textproc/kompare
+KOMPARE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kompare:textproc/kompare
 
 LOKALIZE_DESC=		Computer-aided translation system
-LOKALIZE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/lokalize:${PORTSDIR}/devel/lokalize
+LOKALIZE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/lokalize:devel/lokalize
 
 OKTETA_DESC=		Hex editor
-OKTETA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/okteta:${PORTSDIR}/devel/okteta
+OKTETA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/okteta:devel/okteta
 
 POXML_DESC=		Tools to translate DocBook XML using gettext
-POXML_RUN_DEPENDS=	${KDE4_PREFIX}/bin/po2xml:${PORTSDIR}/devel/poxml
+POXML_RUN_DEPENDS=	${KDE4_PREFIX}/bin/po2xml:devel/poxml
 
 STRIGI_DESC=		Strigi analyzers for SDK file formats
-STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigila_diff.so:${PORTSDIR}/devel/kdesdk4-strigi-analyzers
+STRIGI_RUN_DEPENDS=	${KDE4_PREFIX}/lib/strigi/strigila_diff.so:devel/kdesdk4-strigi-analyzers
 
 THUMBNAILER_DESC=	Thumbnail generator for gettext po files
-THUMBNAILER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/pothumbnail.so:${PORTSDIR}/devel/kdesdk4-thumbnailers
+THUMBNAILER_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/pothumbnail.so:devel/kdesdk4-thumbnailers
 
 UMBRELLO_DESC=		UML modeller
-UMBRELLO_RUN_DEPENDS=	${KDE4_PREFIX}/bin/umbrello:${PORTSDIR}/devel/umbrello
+UMBRELLO_RUN_DEPENDS=	${KDE4_PREFIX}/bin/umbrello:devel/umbrello
 
 .include <bsd.port.mk>
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 7fb62afa0b6c..ffa489caaa71 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -11,7 +11,7 @@ COMMENT=	KDE frontend for Subversion
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 CONFLICTS=	qsvn-[0-9]*
 
diff --git a/devel/kdevelop-kde4/Makefile b/devel/kdevelop-kde4/Makefile
index f313a751fc05..a9e5a6fe121f 100644
--- a/devel/kdevelop-kde4/Makefile
+++ b/devel/kdevelop-kde4/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plugin extensible IDE for KDE
 
-LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
+LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
+RUN_DEPENDS=	gmake:devel/gmake
 
 USE_KDE4=	kdelibs kdeprefix workspace automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
@@ -24,12 +24,12 @@ OPTIONS_DEFAULT=	OKTETA PHP
 OPTIONS_SUB=	yes
 
 OKTETA_DESC=	Hex editing support via Okteta
-OKTETA_LIB_DEPENDS=	libokteta1core.so:${PORTSDIR}/devel/okteta
+OKTETA_LIB_DEPENDS=	libokteta1core.so:devel/okteta
 OKTETA_CMAKE_OFF=	-DWITH_LibOktetaKasten:BOOL=OFF
 OKTETA_CMAKE_ON=	-DWITH_LibOktetaKasten:BOOL=ON
 
 PHP_DESC=	PHP support for KDevelop
-PHP_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:${PORTSDIR}/devel/kdevelop-php
+PHP_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphplanguagesupport.so:devel/kdevelop-php
 
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DBUILD_po:BOOL=FALSE
diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile
index cfe41df540b9..0de8cf77310c 100644
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Parser-generator from KDevplatform
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		bison cmake:outsource compiler:c++11-lib tar:bzip2
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/devel/kdevelop-php-docs/Makefile b/devel/kdevelop-php-docs/Makefile
index a8667611e08f..b75b5de88618 100644
--- a/devel/kdevelop-php-docs/Makefile
+++ b/devel/kdevelop-php-docs/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PHP documentation for KDevelop
 
-LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
+LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
diff --git a/devel/kdevelop-php/Makefile b/devel/kdevelop-php/Makefile
index fa8e733c8285..05db25a27f5c 100644
--- a/devel/kdevelop-php/Makefile
+++ b/devel/kdevelop-php/Makefile
@@ -9,8 +9,8 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PHP support for KDevelop
 
-LIB_DEPENDS=	libkdevplatforminterfaces.so:${PORTSDIR}/devel/kdevplatform
-BUILD_DEPENDS=	${KDE4_PREFIX}/bin/kdev-pg-qt:${PORTSDIR}/devel/kdevelop-pg-qt
+LIB_DEPENDS=	libkdevplatforminterfaces.so:devel/kdevplatform
+BUILD_DEPENDS=	${KDE4_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=	PHPDOCS
 OPTIONS_SUB=	yes
 
 PHPDOCS_DESC=	Integrate with PHP.net documentation
-PHPDOCS_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:${PORTSDIR}/devel/kdevelop-php-docs
+PHPDOCS_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kdevphpdocs.so:devel/kdevelop-php-docs
 
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DBUILD_po:BOOL=Off
diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile
index 9c7db676d0a7..0e6e77ec5eae 100644
--- a/devel/kdevplatform/Makefile
+++ b/devel/kdevplatform/Makefile
@@ -11,10 +11,10 @@ DIST_SUBDIR=	KDE/kdevelop/${KDEVELOP_VERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Set of libraries for KDE IDE-like programs
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libqjson.so:${PORTSDIR}/devel/qjson \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
+		libboost_thread.so:devel/boost-libs \
+		libqjson.so:devel/qjson \
+		libgrantlee_gui.so:devel/grantlee
 
 USE_KDE4=	kate_run kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile
index 673b942f52e4..89abef8ade6f 100644
--- a/devel/kyra/Makefile
+++ b/devel/kyra/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple Sprite engine written in C++
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index 5b70ca811733..9a7fdbd2398d 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Testing framework for infrastructure software
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	liblutok.so:${PORTSDIR}/devel/lutok
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	liblutok.so:devel/lutok
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
@@ -31,8 +31,8 @@ OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
+TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
+TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index 9e8eef64533f..adfecab25180 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	libLASi-${PORTVERSION}
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	C++ stream output interface for creating Postscript documents
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -28,7 +28,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_DATADIR:PATH=${DATADIR}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:devel/doxygen
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cmake+modules+lasi.cmake
 .endif
diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile
index 8857b9e619d9..1fc860ff7ea8 100644
--- a/devel/lcov/Makefile
+++ b/devel/lcov/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Linux Test Project GCOV extension
 
 LICENSE=	GPLv1
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/devel/leiningen/Makefile b/devel/leiningen/Makefile
index 99d49c52e051..a00bffa82003 100644
--- a/devel/leiningen/Makefile
+++ b/devel/leiningen/Makefile
@@ -21,7 +21,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS+=	bash:shells/bash
 
 PLIST_FILES=	bin/lein \
 		etc/bash_completion.d/_lein.bash \
diff --git a/devel/lfcxml/Makefile b/devel/lfcxml/Makefile
index b5c6d14c1317..bc04cbf8f0fb 100644
--- a/devel/lfcxml/Makefile
+++ b/devel/lfcxml/Makefile
@@ -10,7 +10,7 @@ COMMENT=	C++ XML library, used for databases/cego
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	liblfcbase.so:${PORTSDIR}/devel/lfcbase
+LIB_DEPENDS=	liblfcbase.so:devel/lfcbase
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/libarea/Makefile b/devel/libarea/Makefile
index 4c9bb53f867d..8520fd7c66a8 100644
--- a/devel/libarea/Makefile
+++ b/devel/libarea/Makefile
@@ -10,8 +10,8 @@ COMMENT=	CAM-related software for profile and pocketing operations
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	python-config:${PORTSDIR}/lang/python
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+BUILD_DEPENDS=	python-config:lang/python
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Heeks
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index 8b1d101d63f7..71f771348ec1 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to share image and audio files between projects
 
-BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+BUILD_DEPENDS=	texi2html:textproc/texi2html
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		gettext gmake libtool:keepla makeinfo pathfix pkgconfig
 USE_GNOME=	gnomeprefix glib20 libxml2
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 6fe587f17f2c..a5fa310161c4 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library of assorted spiffy things
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libImlib2.so:graphics/imlib2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libbobcat/Makefile b/devel/libbobcat/Makefile
index e8fb27d9f96b..22700c86c550 100644
--- a/devel/libbobcat/Makefile
+++ b/devel/libbobcat/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Brokken's Own Base Classes And Templates
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
-		yodl>=3.0:${PORTSDIR}/textproc/yodl
+BUILD_DEPENDS=	icmake:devel/icmake \
+		yodl>=3.0:textproc/yodl
 
 USE_GCC=	4.9+
 USE_XORG=	x11
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index a0eb2c0e3596..e95ea76ff64b 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -16,7 +16,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig perl5
 USE_LDCONFIG=	yes
diff --git a/devel/libc++/Makefile b/devel/libc++/Makefile
index 2b4974eec8b7..bf1a0d558b39 100644
--- a/devel/libc++/Makefile
+++ b/devel/libc++/Makefile
@@ -28,7 +28,7 @@ CXXRT_LIB=	/usr/lib/libcxxrt.so
 .else
 CXXRT_INCS=	${LOCALBASE}/include/cxxrt/
 CXXRT_LIB=	${LOCALBASE}/lib/libcxxrt.so
-LIB_DEPENDS+=	libcxxrt.so:${PORTSDIR}/devel/libcxxrt
+LIB_DEPENDS+=	libcxxrt.so:devel/libcxxrt
 .endif
 
 .include <bsd.port.options.mk>
@@ -44,7 +44,7 @@ SVN_REV!=       LC_ALL=C svn info http://llvm.org/svn/llvm-project/ | ${GREP} Re
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+= svn:devel/subversion
 
 post-patch:
 	# remove .orig files because they can get installed in stagedir
diff --git a/devel/libccid/Makefile b/devel/libccid/Makefile
index e452d74f681a..812a0c59bd8c 100644
--- a/devel/libccid/Makefile
+++ b/devel/libccid/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generic USB CCID (Chip/Smart Card Interface Devices) driver
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		perl5 pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile
index 7edd06ac4b19..806a277f382e 100644
--- a/devel/libchipcard/Makefile
+++ b/devel/libchipcard/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library for easy access to chipcards
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite \
-		libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
+		libgwenhywfar.so:devel/gwenhywfar
 
 USES=		gmake libtool
 USE_OPENSSL=	yes
@@ -34,8 +34,8 @@ GWEN_SHLIB_VER=	60
 
 OPTIONS_DEFINE=			DOXYGEN MEMDEBUG
 
-DOXYGEN_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen \
-				dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen \
+				dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	full-doc
 
 MEMDEBUG_DESC=			Enable memory debugger statistic
diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile
index cec665a3a969..a192ba39149c 100644
--- a/devel/libclaw/Makefile
+++ b/devel/libclaw/Makefile
@@ -13,8 +13,8 @@ COMMENT=	C++ Library Absolutely Wonderful
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libpng.so:graphics/png
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:devel/boost-libs
 
 USES=		cmake gettext jpeg
 CMAKE_ARGS=	-DCLAW_CMAKE_MODULES_INSTALL_PATH="${DATADIR}/cmake"
diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
index 8a5dfc422454..5c606271ec5c 100644
--- a/devel/libclc/Makefile
+++ b/devel/libclc/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Required library functions for OpenCL C programming language
 
-BUILD_DEPENDS=	clang${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} \
-		libedit>=0:${PORTSDIR}/devel/libedit
+BUILD_DEPENDS=	clang${LLVMVER}:devel/llvm${LLVMVER} \
+		libedit>=0:devel/libedit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	llvm-mirror
diff --git a/devel/libconcurrent/Makefile b/devel/libconcurrent/Makefile
index 175c9690fd65..c2d9cd7e9fe9 100644
--- a/devel/libconcurrent/Makefile
+++ b/devel/libconcurrent/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tiny asymmetric-coroutine library
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sharow
diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile
index 6d36db08731d..b178ead96829 100644
--- a/devel/libcrossguid/Makefile
+++ b/devel/libcrossguid/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Minimal and cross platform C++ GUID library
 LICENSE=	MIT
 LICENSE_FILES=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	graeme-hill
diff --git a/devel/libcutl/Makefile b/devel/libcutl/Makefile
index da61d9250c86..70051aa1fccf 100644
--- a/devel/libcutl/Makefile
+++ b/devel/libcutl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	C++ utility library with generic and independent components
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile
index 8f65af9a7e04..cc0616377fae 100644
--- a/devel/libdap/Makefile
+++ b/devel/libdap/Makefile
@@ -13,9 +13,9 @@ COMMENT=	SDK which contains an implementation of DAP 2.0 and 3.1
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index f6a0e6a9cf23..441392e434a0 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -28,7 +28,7 @@ OPTIONS_SUB=		YES
 DOXYGEN_DESC=		Build documentation (requires doxygen)
 DOXYGEN_CMAKE_ON=	-DWITH_DOC:BOOL=TRUE
 DOXYGEN_CMAKE_OFF=	-DWITH_DOC:BOOL=FALSE
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	DOXYGEN
diff --git a/devel/libdbusmenu-qt5/Makefile b/devel/libdbusmenu-qt5/Makefile
index f284523e8191..4c525688db8b 100644
--- a/devel/libdbusmenu-qt5/Makefile
+++ b/devel/libdbusmenu-qt5/Makefile
@@ -28,7 +28,7 @@ OPTIONS_SUB=		YES
 DOXYGEN_DESC=		Build documentation (requires doxygen)
 DOXYGEN_CMAKE_ON=	-DWITH_DOC:BOOL=TRUE
 DOXYGEN_CMAKE_OFF=	-DWITH_DOC:BOOL=FALSE
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	DOXYGEN
diff --git a/devel/libdbusmenu/Makefile b/devel/libdbusmenu/Makefile
index 49685d1dd0be..85e0031bf3c9 100644
--- a/devel/libdbusmenu/Makefile
+++ b/devel/libdbusmenu/Makefile
@@ -16,9 +16,9 @@ LICENSE_COMB=	multi
 LICENSE_DISTFILES=	${WRKSRC}/COPYING-GPL3 ${WRKSRC}/COPYING.2.1 \
 	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+BUILD_DEPENDS=	vapigen:lang/vala \
+		gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig pathfix libtool
diff --git a/devel/libdfui/Makefile b/devel/libdfui/Makefile
index 68c826e47268..2046afe08433 100644
--- a/devel/libdfui/Makefile
+++ b/devel/libdfui/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Abstract user interface protocol library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libaura3.so:${PORTSDIR}/devel/libaura
+LIB_DEPENDS=	libaura3.so:devel/libaura
 
 USES=	tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/devel/libdistance/Makefile b/devel/libdistance/Makefile
index 5652cc2f2429..4c92cb5cd458 100644
--- a/devel/libdistance/Makefile
+++ b/devel/libdistance/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Compute the distance between two pieces of data
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS=	swig2.0:devel/swig20
 
 USES+=		fakeroot pkgconfig tcl
 USE_LDCONFIG=	yes
diff --git a/devel/libdlna/Makefile b/devel/libdlna/Makefile
index d106b1739293..0233a64a1f74 100644
--- a/devel/libdlna/Makefile
+++ b/devel/libdlna/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://libdlna.geexbox.org/releases/ \
 MAINTAINER=	malus.x@gmail.com
 COMMENT=	Reference DLNA open-source implementation
 
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 
 HAS_CONFIGURE=	yes
 USES=		tar:bzip2 gmake pkgconfig
diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile
index 07291d48afc6..18769f257095 100644
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://monkey.org/~provos/
 MAINTAINER=	oz@nixil.net
 COMMENT=	Provides a non-blocking thread-safe API for resolving DNS names
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/libe/Makefile b/devel/libe/Makefile
index cb4745d3715e..6e4aef912341 100644
--- a/devel/libe/Makefile
+++ b/devel/libe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High-performance datastructures and utilities for C++
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:${PORTSDIR}/devel/libpo6
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libpo6.pc:devel/libpo6
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig
diff --git a/devel/libee/Makefile b/devel/libee/Makefile
index e239bb42b22b..0dcf67fcd4c6 100644
--- a/devel/libee/Makefile
+++ b/devel/libee/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.libee.org/files/download/
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Event expression library inspired by CEE
 
-LIB_DEPENDS=	libestr.so:${PORTSDIR}/devel/libestr
+LIB_DEPENDS=	libestr.so:devel/libestr
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/libepp-nicbr/Makefile b/devel/libepp-nicbr/Makefile
index af65dcccbed8..a9cd06ce8d03 100644
--- a/devel/libepp-nicbr/Makefile
+++ b/devel/libepp-nicbr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Partial Extensible Provisioning Protocol to .br domains
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 
 USES=		gmake
 USE_OPENSSL=	yes
diff --git a/devel/libevdev/Makefile b/devel/libevdev/Makefile
index 98141381e289..1342dfad8fa8 100644
--- a/devel/libevdev/Makefile
+++ b/devel/libevdev/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Linux Event Device library
 LICENSE=	MIT # without linux/*.h
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
+RUN_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		gmake libtool pathfix python:build tar:xz
 EXTRACT_AFTER_ARGS=	--exclude include # v4l_compat
diff --git a/devel/libevt/Makefile b/devel/libevt/Makefile
index cd7df29914b7..2ea0db8b31d5 100644
--- a/devel/libevt/Makefile
+++ b/devel/libevt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library and tooling to access the Windows Event Log (EVT) format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libregf.so:${PORTSDIR}/devel/libregf
+LIB_DEPENDS=	libregf.so:devel/libregf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libregf=${LOCALBASE}
diff --git a/devel/libevtx/Makefile b/devel/libevtx/Makefile
index 0efb72338d6a..2aa5444d4227 100644
--- a/devel/libevtx/Makefile
+++ b/devel/libevtx/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library and tooling to access the Windows XML Event Log (EVTX) format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libregf.so:${PORTSDIR}/devel/libregf
+LIB_DEPENDS=	libregf.so:devel/libregf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libregf=${LOCALBASE}
diff --git a/devel/libewf/Makefile b/devel/libewf/Makefile
index 7b4bb39c625c..e407ab31d0b1 100644
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for support of the Expert Witness Compression Format (EWF)
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig python:2
 USE_LDCONFIG=	yes
diff --git a/devel/libexplain/Makefile b/devel/libexplain/Makefile
index 99d061a0edb0..ebdb0e216b22 100644
--- a/devel/libexplain/Makefile
+++ b/devel/libexplain/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Library which may be used to explain Unix and Linux system call errors
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
+BUILD_DEPENDS=	gsed:textproc/gsed
+RUN_DEPENDS=	lsof:sysutils/lsof
 
 USES=		bison gettext ghostscript:build gmake iconv libtool:build
 GNU_CONFIGURE=	yes
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 1731c7b09d8b..f86be437e258 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Foreign Function Interface
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
+TEST_DEPENDS=	runtest:misc/dejagnu
 
 USES=		libtool pathfix
 USE_LDCONFIG=	yes
diff --git a/devel/libfreefare/Makefile b/devel/libfreefare/Makefile
index ecf969c65e0b..7f2a4ffcefd6 100644
--- a/devel/libfreefare/Makefile
+++ b/devel/libfreefare/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://${PORTNAME}.googlecode.com/files/ \
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	MIFARE contactless tag access library
 
-LIB_DEPENDS=	libnfc.so:${PORTSDIR}/devel/libnfc
+LIB_DEPENDS=	libnfc.so:devel/libnfc
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index 2b1bf301a126..d42906f93c88 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -23,13 +23,13 @@ OPTIONS_DEFAULT=BOOST PYTHON
 OPTIONS_SUB=	yes
 
 BOOST_DESC=		C++ bindings (requires Boost)
-BOOST_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+BOOST_LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 BOOST_CMAKE_ON=		-DFTDIPP:BOOL=ON
 BOOST_CMAKE_OFF=	-DFTDIPP:BOOL=OFF
 BOOST_CXXFLAGS=		-I${LOCALBASE}/include
 
 PYTHON_DESC=		Python bindings
-PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+PYTHON_BUILD_DEPENDS=	swig2.0:devel/swig20
 PYTHON_CMAKE_ON=	-DPYTHON_BINDINGS:BOOL=ON
 PYTHON_CMAKE_OFF=	-DPYTHON_BINDINGS:BOOL=OFF
 PYTHON_USES=		python
diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile
index 636b02e06c10..133a56109328 100644
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Library (using libusb) to talk to FTDI chips
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
 OPTIONS_DEFINE=		PYTHON BOOST DOCS EXAMPLES
 OPTIONS_DEFAULT=	PYTHON BOOST DOCS EXAMPLES
@@ -41,14 +41,14 @@ CMAKE_ARGS+=	-DEXAMPLES:BOOL=false
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python:2
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=true
-BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS+=	swig2.0:devel/swig20
 .else
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MBOOST}
 CMAKE_ARGS+=		-DFTDIPP:BOOL=true
-LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 .else
 CMAKE_ARGS+=		-DFTDIPP:BOOL=false
 .endif
diff --git a/devel/libg19draw/Makefile b/devel/libg19draw/Makefile
index 26257ba72dc5..4f3a302bae1e 100644
--- a/devel/libg19draw/Makefile
+++ b/devel/libg19draw/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/g19linux/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	armin@frozen-zone.org
 COMMENT=	G19 draw library
 
-LIB_DEPENDS=	libg19.so:${PORTSDIR}/devel/libg19 \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libg19.so:devel/libg19 \
+		libfreetype.so:print/freetype2
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -pthread"
 
diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile
index 523cdff7f8ea..f996f32bdfdb 100644
--- a/devel/libgalago/Makefile
+++ b/devel/libgalago/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.galago-project.org/files/releases/source/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Galago desktop presence library
 
-LIB_PC_DEPENDS=	dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
+LIB_PC_DEPENDS=	dbus-glib-1.pc:devel/dbus-glib
 
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 1f0c5e4ce61c..ab2e673ad951 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -9,15 +9,15 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GLib based implimentation of the GData protocol
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libuhttpmock-0.0.so:${PORTSDIR}/net/uhttpmock \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		liboauth.so:${PORTSDIR}/net/liboauth
-RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		gtkdoc-check:textproc/gtk-doc \
+		vapigen:lang/vala
+LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libuhttpmock-0.0.so:net/uhttpmock \
+		libgcr-3.so:security/gcr \
+		liboauth.so:net/liboauth
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomeprefix intlhack \
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 522fb272dee5..bedf9f26973b 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GObject collection library
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile
index a06a8cbab9b8..e17147db8d94 100644
--- a/devel/libgit2-glib/Makefile
+++ b/devel/libgit2-glib/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Glib wrapper library around the libgit2 git access library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	vapigen:lang/vala \
+		gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 USES=		compiler:c11 gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomeprefix gtk30 intlhack introspection
diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile
index 3e5a56d74225..0267e18f331f 100644
--- a/devel/libgit2/Makefile
+++ b/devel/libgit2/Makefile
@@ -24,12 +24,12 @@ OPTIONS_DEFAULT=SSH THREADS CURL
 SSH_DESC=	Enable SSH support through libssh2
 CURL_DESC=	Enable HTTP support through cURL
 
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_CMAKE_ON=		-DUSE_SSH=ON
 SSH_CMAKE_OFF=		-DUSE_SSH=OFF
 THREADS_CMAKE_ON=	-DTHREADSAFE=ON
 THREADS_CMAKE_OFF=	-DTHREADSAFE=OFF
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_ON=		-DCURL=ON
 CURL_CMAKE_OFF=		-DCURL=OFF
 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 5b901d35dd9a..888b27bd27df 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -17,7 +17,7 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
 
 GNU_CONFIGURE=	yes
 USES+=		gmake libtool:keepla pathfix pkgconfig
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 6729c0c0cc13..aedf6e83fd94 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -14,8 +14,8 @@ COMMENT=	C++ wrapper for libglade2 library
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
+BUILD_DEPENDS=	gm4:devel/m4
 
 USE_XORG=	x11 ice
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
diff --git a/devel/libgpkg/Makefile b/devel/libgpkg/Makefile
index d9c69de4db00..14ee336dee32 100644
--- a/devel/libgpkg/Makefile
+++ b/devel/libgpkg/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/luciad-libgpkg-c56e3708453e
 
 GEOS_CMAKE_OFF=		-DGPKG_GEOS=OFF
 GEOS_CMAKE_ON=		-DGPKG_GEOS=ON
-GEOS_LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos
+GEOS_LIB_DEPENDS=	libgeos_c.so:graphics/geos
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gpkg/libgpkg.a ${STAGEDIR}${PREFIX}/lib/
diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile
index fa3f4920bdd5..099731d4b5a4 100644
--- a/devel/libgutenfetch/Makefile
+++ b/devel/libgutenfetch/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	johntabularasa@users.sf.net
 COMMENT=	Library that allows application developers to connect to PG
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index c81261841553..4db39f3a5a71 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://alioth.debian.org/frs/download.php/1958/
 MAINTAINER=	ntarmos@cs.uoi.gr
 COMMENT=	User-space HID access library written in C
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS=	${LOCALBASE}/bin/xsltproc:textproc/libxslt \
+		docbook-xsl>0:textproc/docbook-xsl \
+		${LOCALBASE}/bin/swig1.3:devel/swig13
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-doxygen --disable-werror
diff --git a/devel/libical-glib/Makefile b/devel/libical-glib/Makefile
index 5b9b72e42b14..58a77f2c37c8 100644
--- a/devel/libical-glib/Makefile
+++ b/devel/libical-glib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Introspection bindings for libical
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libical.so:devel/libical
 
 USES=		compiler:c11 gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 introspection:build libxml2
diff --git a/devel/libiqxmlrpc/Makefile b/devel/libiqxmlrpc/Makefile
index 98f587ecd1bc..e113ffc19eca 100644
--- a/devel/libiqxmlrpc/Makefile
+++ b/devel/libiqxmlrpc/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Free, object-oriented XML-RPC implementation written in C++
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CMAKE_ARGS_OFF=	-Dbuild_docs=off
 
 USE_GNOME=	libxml2
diff --git a/devel/libisofs/Makefile b/devel/libisofs/Makefile
index c43e99d1eed4..3e3e95738688 100644
--- a/devel/libisofs/Makefile
+++ b/devel/libisofs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Libburnia ISO9660 filesystem creation library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libburn.so:${PORTSDIR}/devel/libburn
+LIB_DEPENDS=	libburn.so:devel/libburn
 
 GNU_CONFIGURE=	yes
 USES=		iconv libtool
diff --git a/devel/libkgapi/Makefile b/devel/libkgapi/Makefile
index b4db2f383059..573eb5cd9785 100644
--- a/devel/libkgapi/Makefile
+++ b/devel/libkgapi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	KDE-based library for accessing various Google services
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 USES=		cmake:outsource tar:bzip2
 USE_KDE4=	automoc4 kdelibs kdeprefix pimlibs
diff --git a/devel/libklel/Makefile b/devel/libklel/Makefile
index 5d7732c9f8e5..ec6cacea7ab9 100644
--- a/devel/libklel/Makefile
+++ b/devel/libklel/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	klm@uidzero.org
 COMMENT=	KoreLogic Expression Language library
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 USES=		perl5 libtool
diff --git a/devel/libkolab/Makefile b/devel/libkolab/Makefile
index ae015ee1148a..5f29e4864861 100644
--- a/devel/libkolab/Makefile
+++ b/devel/libkolab/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced Kolab Object Handling Library
 # itself to be LGPL3-licensed (and so are all the installed headers).
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libkolabxml.so:${PORTSDIR}/textproc/libkolabxml
+LIB_DEPENDS=	libkolabxml.so:textproc/libkolabxml
 
 # TODO: Conditionally enable the bindings based on OPTIONs.
 CMAKE_ARGS=	-DBUILD_TESTS:BOOL=OFF \
diff --git a/devel/liblangtag/Makefile b/devel/liblangtag/Makefile
index 85186794557e..676a6aff9ad3 100644
--- a/devel/liblangtag/Makefile
+++ b/devel/liblangtag/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Interface library to access tags for identifying languages
 LICENSE=	LGPL3 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/liblas/Makefile b/devel/liblas/Makefile
index 82698df8bc3d..95d076eac631 100644
--- a/devel/liblas/Makefile
+++ b/devel/liblas/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library For Reading And Writing LAS-Format Data
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/devel/liblnk/Makefile b/devel/liblnk/Makefile
index 7c572d2be23c..5127849fbd0b 100644
--- a/devel/liblnk/Makefile
+++ b/devel/liblnk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library and tools to access the Windows shortcut file (LNK) format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libfwsi.so:${PORTSDIR}/devel/libfwsi
+LIB_DEPENDS=	libfwsi.so:devel/libfwsi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libfwsi=${LOCALBASE}
diff --git a/devel/liblognorm/Makefile b/devel/liblognorm/Makefile
index b6d4f62c8777..ef6768d6afcb 100644
--- a/devel/liblognorm/Makefile
+++ b/devel/liblognorm/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Log normalizer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c \
-		libestr.so:${PORTSDIR}/devel/libestr
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libestr.so:devel/libestr
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/devel/liblouis/Makefile b/devel/liblouis/Makefile
index 636330a99eda..4007c0a141f6 100644
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open-source Braille Translator And Back-translator
 
 LICENSE=	LGPL3+
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		autoreconf gmake libtool pathfix
 USE_GITHUB=	yes
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index 328784dd9bd7..38cdae10b3ff 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library Provide Complete Braille Transcription Services
 LICENSE=	LGPL3+ GPLv3+
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	liblouis.so:${PORTSDIR}/devel/liblouis
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
+LIB_DEPENDS=	liblouis.so:devel/liblouis
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
diff --git a/devel/libmatheval/Makefile b/devel/libmatheval/Makefile
index f75d6cac98d4..9c94832e5175 100644
--- a/devel/libmatheval/Makefile
+++ b/devel/libmatheval/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Library to evaluate mathematical functions
 
-BUILD_DEPENDS=	flex>=2.5.39_1:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	flex>=2.5.39_1:textproc/flex
+LIB_DEPENDS=	libguile.so:lang/guile
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="makeinfo --no-split"
diff --git a/devel/libmcs/Makefile b/devel/libmcs/Makefile
index db64a8614488..bc25c5d5ec33 100644
--- a/devel/libmcs/Makefile
+++ b/devel/libmcs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://distfiles.atheme.org/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	BSD licenced configuration database system
 
-LIB_DEPENDS=	libmowgli.so:${PORTSDIR}/devel/libmowgli
+LIB_DEPENDS=	libmowgli.so:devel/libmowgli
 
 OPTIONS_DEFINE=	GCONF
 OPTIONS_DEFAULT=	GCONF
diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index 95a65168af5a..832de412ed54 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Open source library for SPI/I2C control via FTDI chips
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
-LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
+BUILD_DEPENDS=	swig2.0:devel/swig20
+LIB_DEPENDS=	libftdi.so:devel/libftdi
 
 USES=		gmake pkgconfig python:2
 USE_AUTOTOOLS=	autoconf
diff --git a/devel/libmsocket/Makefile b/devel/libmsocket/Makefile
index 17bf1520586e..b9e01d9d8b47 100644
--- a/devel/libmsocket/Makefile
+++ b/devel/libmsocket/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/kageki/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Socket abstraction library for C programmers
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	DEBUG
 
diff --git a/devel/libmtdev/Makefile b/devel/libmtdev/Makefile
index ec8d52b8401f..6028ee34d462 100644
--- a/devel/libmtdev/Makefile
+++ b/devel/libmtdev/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multitouch Protocol Translation Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
+RUN_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		libtool pathfix tar:bz2
 GNU_CONFIGURE=	yes
diff --git a/devel/libnfc/Makefile b/devel/libnfc/Makefile
index 9dcb09453d4f..bd4f0216e46b 100644
--- a/devel/libnfc/Makefile
+++ b/devel/libnfc/Makefile
@@ -85,8 +85,8 @@ PN53X_USB_DRIVER=
 CONFIGURE_ARGS+=--with-drivers="${ACR122_PCSC_DRIVER}${ACR122_USB_DRIVER}${ACR122S_DRIVER}${ARYGON_DRIVER}${PN532_I2C_DRIVER}${PN532_SPI_DRIVER}${PN532_UART_DRIVER}${PN53X_USB_DRIVER}"
 
 .if ${PORT_OPTIONS:MACR122_PCSC}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS+=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:${PORTSDIR}/devel/libccid
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
+RUN_DEPENDS+=	${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/FreeBSD/libccid.so:devel/libccid
 .endif
 
 post-install:
diff --git a/devel/libnsutils/Makefile b/devel/libnsutils/Makefile
index 30c85f60b9e7..8a4f397668e6 100644
--- a/devel/libnsutils/Makefile
+++ b/devel/libnsutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NetSurf generalised utility library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=	gmake
 USE_LDCONFIG=	yes
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 46ffdadf66de..535734bf8773 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Wrapping library to the System Tools Backends
 
-BUILD_DEPENDS=	system-tools-backends:${PORTSDIR}/sysutils/system-tools-backends
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libhal.so:${PORTSDIR}/sysutils/hal
-RUN_DEPENDS=	system-tools-backends:${PORTSDIR}/sysutils/system-tools-backends
+BUILD_DEPENDS=	system-tools-backends:sysutils/system-tools-backends
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libhal.so:sysutils/hal
+RUN_DEPENDS=	system-tools-backends:sysutils/system-tools-backends
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 31d90194d27a..327a0ce8c383 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Low-level event loop management library for POSIX-based OS
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns \
-		libwwwcore.so:${PORTSDIR}/www/libwww
+LIB_DEPENDS=	libadns.so:dns/adns \
+		libwwwcore.so:www/libwww
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwww
diff --git a/devel/libopencm3/Makefile b/devel/libopencm3/Makefile
index 0d7cb033b949..01fde26eb77c 100644
--- a/devel/libopencm3/Makefile
+++ b/devel/libopencm3/Makefile
@@ -9,7 +9,7 @@ COMMENT=	LGPLv3 Cortex-M0/M3/M4 runtime library
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-none-eabi-gcc:${PORTSDIR}/devel/gcc-arm-embedded
+BUILD_DEPENDS=	${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-none-eabi-gcc:devel/gcc-arm-embedded
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libopencm3
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 7089f01a75c4..451654f061b7 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/ \
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	PIM data synchronization framework
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libexslt.so:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	swig1.3:devel/swig13
+LIB_DEPENDS=	libexslt.so:textproc/libxslt
 
 CONFLICTS=	libopensync-0.22*
 
diff --git a/devel/libopensync022/Makefile b/devel/libopensync022/Makefile
index 88222f39c76a..5aa9602ecfb1 100644
--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	022
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Freedesktop synchronization framework
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 BROKEN=		unfetchable
 SWIG_LANGUAGES=	python
diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
index 4e3ca4e9106d..fd34fbfb5186 100644
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	http://kin.klever.net/dist/
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	C++ implementation of an OpenID decentralized identity system
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libtidy.so:${PORTSDIR}/www/tidy-lib \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2 \
+		libtidy.so:www/tidy-lib \
+		libxslt.so:textproc/libxslt
 
 USE_LDCONFIG=	yes
 USES=		libtool gmake pkgconfig compiler:c++11-lang
diff --git a/devel/liborcus/Makefile b/devel/liborcus/Makefile
index e35bc968f958..9aa207d97505 100644
--- a/devel/liborcus/Makefile
+++ b/devel/liborcus/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Standalone file import filter library for spreadsheet documents
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:${PORTSDIR}/devel/mdds
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:devel/mdds
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz
diff --git a/devel/liborcus07/Makefile b/devel/liborcus07/Makefile
index 94605b75f4cc..93906e0bfbe5 100644
--- a/devel/liborcus07/Makefile
+++ b/devel/liborcus07/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Standalone file import filter library for spreadsheet documents
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:${PORTSDIR}/devel/mdds
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/mdds/global.hpp:devel/mdds
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 BROKEN_sparc64=	cannot link with boost
 
diff --git a/devel/libosinfo/Makefile b/devel/libosinfo/Makefile
index 4960b126220c..5535372d4187 100644
--- a/devel/libosinfo/Makefile
+++ b/devel/libosinfo/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	https://fedorahosted.org/releases/l/i/libosinfo/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Library for managing OS information for virtualization
 
-LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
-BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
-		${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids
+LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome
+BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids \
+		${LOCALBASE}/share/usbids/usb.ids:misc/usbids
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake libtool pathfix pkgconfig
diff --git a/devel/libosmo-abis/Makefile b/devel/libosmo-abis/Makefile
index 88f6123ab674..301f77c75428 100644
--- a/devel/libosmo-abis/Makefile
+++ b/devel/libosmo-abis/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Shared code regarding the A-bis interface between BTS and BSC
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore \
-		libortp.so:${PORTSDIR}/net/ortp
+LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
+		libortp.so:net/ortp
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
diff --git a/devel/libosmo-netif/Makefile b/devel/libosmo-netif/Makefile
index 7655e2479ef4..da5e0148dc5c 100644
--- a/devel/libosmo-netif/Makefile
+++ b/devel/libosmo-netif/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library containing common/shared code regarding network interface
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore \
-		libosmoabis.so:${PORTSDIR}/devel/libosmo-abis
+LIB_DEPENDS=	libosmocore.so:devel/libosmocore \
+		libosmoabis.so:devel/libosmo-abis
 
 USES=		autoreconf libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
diff --git a/devel/libosmo-sccp/Makefile b/devel/libosmo-sccp/Makefile
index 4687e9d2fb35..2bc9636c6f6d 100644
--- a/devel/libosmo-sccp/Makefile
+++ b/devel/libosmo-sccp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SCCP network layer protocol implementation
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore
+LIB_DEPENDS=	libosmocore.so:devel/libosmocore
 
 CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a
 
diff --git a/devel/libosmocore/Makefile b/devel/libosmocore/Makefile
index 02a3ab4cfbe8..de35400c4b5f 100644
--- a/devel/libosmocore/Makefile
+++ b/devel/libosmocore/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Common library for all Osmocom projects
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		alias autoreconf execinfo gmake libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=Makefile.am
@@ -23,8 +23,8 @@ INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOXYGEN
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENV_OFF=ac_cv_path_DOXYGEN=false
 
 post-patch:
diff --git a/devel/libpafe-ruby/Makefile b/devel/libpafe-ruby/Makefile
index 8e000b554355..be85056084b7 100644
--- a/devel/libpafe-ruby/Makefile
+++ b/devel/libpafe-ruby/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ruby binding for libpafe
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpafe.so:${PORTSDIR}/devel/libpafe
+LIB_DEPENDS=	libpafe.so:devel/libpafe
 
 USE_RUBY=		yes
 USE_RUBY_EXTCONF=	yes
diff --git a/devel/libparserutils/Makefile b/devel/libparserutils/Makefile
index 4e1229932ae7..0dff09b8c673 100644
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lexer/parser utility functions for NetSurf
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
 
 USES=		gmake iconv localbase pkgconfig
 USE_LDCONFIG=	yes
diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile
index d0f9a4894ebd..dd6e86d8dc22 100644
--- a/devel/libpci/Makefile
+++ b/devel/libpci/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PCI configuration space I/O made easy
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 ALL_TARGET=	lib/libpci.a
 CPPFLAGS+=	-fPIC
diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index c864d9178c0a..83d56e5ee13e 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Generic PCI access library
 
-BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+BUILD_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 CONFIGURE_ARGS+=	--with-pciids-path=${LOCALBASE}/share/pciids
 
diff --git a/devel/libpdel/Makefile b/devel/libpdel/Makefile
index e1d101bae35b..f374b45decbc 100644
--- a/devel/libpdel/Makefile
+++ b/devel/libpdel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/archie
 MAINTAINER=	mav@alkar.net
 COMMENT=	Packet Design multi-purpose C library for embedded applications
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 
 USE_LDCONFIG=	yes
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 8ea2ca1b390f..cef5b2790262 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	Next evolution of the Gedit plugins engine
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 LIBPEAS_SLAVE?=	no
 
 .if ${LIBPEAS_SLAVE} == no
 PORTSCOUT=	limitw:1,even
 .else
-LIB_DEPENDS+=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 PORTSCOUT=	ignore:1
 .endif
 
diff --git a/devel/libpololu-avr/Makefile b/devel/libpololu-avr/Makefile
index b6ee7b6eba24..c6746fd8029a 100644
--- a/devel/libpololu-avr/Makefile
+++ b/devel/libpololu-avr/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Support libraries for Pololu robots
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	avr-gcc:${PORTSDIR}/devel/avr-gcc \
-		${LOCALBASE}/avr/lib/libc.a:${PORTSDIR}/devel/avr-libc
+BUILD_DEPENDS=	avr-gcc:devel/avr-gcc \
+		${LOCALBASE}/avr/lib/libc.a:devel/avr-libc
 
 USES=		gmake zip
 
diff --git a/devel/libqb/Makefile b/devel/libqb/Makefile
index 2079fd51ec83..09da590a747d 100644
--- a/devel/libqb/Makefile
+++ b/devel/libqb/Makefile
@@ -26,7 +26,7 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_SUB=	yes
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QB_SOCKET_DIR}
diff --git a/devel/libqxt/Makefile b/devel/libqxt/Makefile
index def13178f567..97a5daa325fc 100644
--- a/devel/libqxt/Makefile
+++ b/devel/libqxt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extension library for Qt
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USE_BDB=	44+
 USES=		tar:bzip2
@@ -43,8 +43,8 @@ PLIST_SUB+=	SHVER_1=${PORTVERSION} \
 OPTIONS_DEFAULT=	AVAHI
 OPTIONS_SINGLE=		ZEROCONF
 OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
-AVAHI_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/avahi-libdns
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 STRIP_FILES=	lib/qxt/lib*.so.${PORTVERSION} \
 		${QT_PLUGINDIR_REL}/designer/libQxtDesignerPlugins.so
diff --git a/devel/libr3/Makefile b/devel/libr3/Makefile
index 4fba748a4455..a25a146d5452 100644
--- a/devel/libr3/Makefile
+++ b/devel/libr3/Makefile
@@ -10,9 +10,9 @@ COMMENT=	URL router library with high performance
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcheck.so:${PORTSDIR}/devel/libcheck \
-		libgvc.so:${PORTSDIR}/graphics/graphviz \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libcheck.so:devel/libcheck \
+		libgvc.so:graphics/graphviz \
+		libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-graphviz
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 078056d1c825..914406f91149 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Library used by rusxmms for language autodetection
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librcd.so:${PORTSDIR}/devel/librcd \
-		libenca.so:${PORTSDIR}/converters/enca \
-		libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	librcd.so:devel/librcd \
+		libenca.so:converters/enca \
+		libaspell.so:textproc/aspell
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
@@ -39,7 +39,7 @@ BDB_USE=		BDB=41+
 
 TRANSLATE_DESC=			Online translation support
 TRANSLATE_CONFIGURE_ENABLE=	libtranslate
-TRANSLATE_LIB_DEPENDS=		libtranslate.so:${PORTSDIR}/textproc/libtranslate
+TRANSLATE_LIB_DEPENDS=		libtranslate.so:textproc/libtranslate
 
 TOOLS_DESC=		Recode configuration utility
 TOOLS_EXTRA_PATCHES=	${FILESDIR}/extrapatch-rcc-config
diff --git a/devel/libregf/Makefile b/devel/libregf/Makefile
index 0be226b842fb..bcf259b588ae 100644
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library and tools to support the Windows NT Registry File format
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libfwsi.so:${PORTSDIR}/devel/libfwsi
+LIB_DEPENDS=	libfwsi.so:devel/libfwsi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libfwsi=${LOCALBASE}
diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile
index b4b32d845559..9e1ce8a83931 100644
--- a/devel/librelp/Makefile
+++ b/devel/librelp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.rsyslog.com/librelp/
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Reliable event logging protocol library
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/devel/librest/Makefile b/devel/librest/Makefile
index 7d41cf96211a..36ebcef6538a 100644
--- a/devel/librest/Makefile
+++ b/devel/librest/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Easy access to RESTful web services
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	ca_root_nss>0:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
@@ -25,9 +25,9 @@ PORTEXAMPLES=	*.c
 OPTIONS_DEFINE=	GNOME EXAMPLES
 OPTIONS_DEFAULT=	GNOME
 
-GNOME_LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
+GNOME_LIB_DEPENDS=	libsoup-gnome-2.4.so:devel/libsoup-gnome
 GNOME_CONFIGURE_OFF=	--without-gnome
-GNOME_LIB_DEPENDS_OFF=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+GNOME_LIB_DEPENDS_OFF=	libsoup-2.4.so:devel/libsoup
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/librevisa-vish/Makefile b/devel/librevisa-vish/Makefile
index 0e7efe490924..e1ce710e1763 100644
--- a/devel/librevisa-vish/Makefile
+++ b/devel/librevisa-vish/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	vish-${PORTVERSION}
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Open Source VISA shell for interfacing test and measurement equipment
 
-LIB_DEPENDS=	libvisa.so:${PORTSDIR}/devel/librevisa
+LIB_DEPENDS=	libvisa.so:devel/librevisa
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/librolegen/Makefile b/devel/librolegen/Makefile
index b144794893cc..5bb3321fa6e1 100644
--- a/devel/librolegen/Makefile
+++ b/devel/librolegen/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Library to dynamically generate webOS system bus role files
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/cmake/Modules/webOS/webOS.cmake:${PORTSDIR}/devel/cmake-modules-webos
+BUILD_DEPENDS=	${LOCALBASE}/share/cmake/Modules/webOS/webOS.cmake:devel/cmake-modules-webos
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeWebOS
diff --git a/devel/libruin/Makefile b/devel/libruin/Makefile
index f2fecf306fdd..6abe792ac317 100644
--- a/devel/libruin/Makefile
+++ b/devel/libruin/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Renderer for User Interfaces in Ncurses
 
-BUILD_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/guile-lib
-RUN_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:${PORTSDIR}/devel/guile-lib
+BUILD_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:devel/guile-lib
+RUN_DEPENDS=	${LOCALBASE}/share/guile/site/config/load.scm:devel/guile-lib
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libsearpc/Makefile b/devel/libsearpc/Makefile
index 4c1a0318e2cf..fcfe07608c3a 100644
--- a/devel/libsearpc/Makefile
+++ b/devel/libsearpc/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Simple RPC framework based on GObject System in C
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
-		libgobject-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libjansson.so:devel/jansson \
+		libgobject-2.0.so:devel/glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 64862a9b18b2..2bd66bb435ec 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Callback Framework for C++
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile
index 5cd60efb0438..893ce3314882 100644
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extension of libSigC++
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libsigc-1.2.so:devel/libsigc++12
 
 OPTIONS_DEFINE=	STATIC
 
diff --git a/devel/libsigrok/Makefile b/devel/libsigrok/Makefile
index 7831a45a9970..ffec7f46bf62 100644
--- a/devel/libsigrok/Makefile
+++ b/devel/libsigrok/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Framework for hardware logic analyzers, core library
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libserialport.so:${PORTSDIR}/devel/libserialport \
-		libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libserialport.so:devel/libserialport \
+		libzip.so:archivers/libzip
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix libtool pkgconfig
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile
index 08e9585dc9ec..891febf2ad1f 100644
--- a/devel/libslang2/Makefile
+++ b/devel/libslang2/Makefile
@@ -36,12 +36,12 @@ ONIG_DESC=	Oniguruma support
 PORTDOCS=	*
 
 PCRE_CONFIGURE_WITH=	pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 ICONV_USES=		iconv
 ONIG_CONFIGURE_WITH=	onig
-ONIG_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma4
+ONIG_LIB_DEPENDS=	libonig.so:devel/oniguruma4
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libsmpp34/Makefile b/devel/libsmpp34/Makefile
index 8716a453337f..ec664a2f1119 100644
--- a/devel/libsmpp34/Makefile
+++ b/devel/libsmpp34/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provide an implementation of SMPP-3.4 protocol for PDUs handling
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USES=		autoreconf libtool gmake
 
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 00a7dd1b66cd..d622722fc7ef 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	SOAP (Simple Object Access Protocol) implementation in C
 
-BUILD_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
+BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking
 
 USES=		tar:xz
 PORTSCOUT=	limitw:1,even
@@ -37,7 +37,7 @@ PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}
 
 .if defined(SOUP_SLAVE)
 USE_SQLITE=	yes
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CONFIGURE_ARGS+=--with-gnome
 .else
 CONFIGURE_ARGS+=--without-gnome
diff --git a/devel/libtermkey/Makefile b/devel/libtermkey/Makefile
index a330461a0866..1849c7e54527 100644
--- a/devel/libtermkey/Makefile
+++ b/devel/libtermkey/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Easy processing of keyboard entry from terminal-based programs
 LICENSE=	MIT
 
 USES=		gmake libtool:build ncurses pkgconfig
-LIB_DEPENDS=	libunibilium.so:${PORTSDIR}/devel/unibilium
+LIB_DEPENDS=	libunibilium.so:devel/unibilium
 USE_LDCONFIG=	yes
 MAKE_ARGS=	MANDIR=${MANPREFIX}/man
 
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 5d2aa8355ee2..d741118944cb 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Thai language support library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdatrie.so:${PORTSDIR}/devel/libdatrie
+LIB_DEPENDS=	libdatrie.so:devel/libdatrie
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOXYGEN
 OPTIONS_SUB=	yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen-doc
 
 .include <bsd.port.mk>
diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index 81b2f1688d09..bdd4a29dd1c5 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	TI calculator file types library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libticonv.so:${PORTSDIR}/converters/libticonv
+LIB_DEPENDS=	libticonv.so:converters/libticonv
 
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 2be46e804953..2b2d159d50cd 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Generic shared library support script
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
+RUN_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ltdl-install
diff --git a/devel/libuninum/Makefile b/devel/libuninum/Makefile
index 98ae7856cb49..d9b647a92ce2 100644
--- a/devel/libuninum/Makefile
+++ b/devel/libuninum/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://billposer.org/Software/Downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for converting Unicode strings to numbers
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libuv/Makefile b/devel/libuv/Makefile
index dc0cfe00ed19..8ace2bd8e690 100644
--- a/devel/libuv/Makefile
+++ b/devel/libuv/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	NODE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-TEST_DEPENDS=	gyp:${PORTSDIR}/devel/py-gyp-devel	\
-		gmake:${PORTSDIR}/devel/gmake
+TEST_DEPENDS=	gyp:devel/py-gyp-devel	\
+		gmake:devel/gmake
 
 USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile
index b0c163087965..cfecae795bb7 100644
--- a/devel/libvanessa_adt/Makefile
+++ b/devel/libvanessa_adt/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	vanessa_adt-${PORTVERSION}
 MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	Library that provides ADTs (queues, dynamic arrays, and more)
 
-LIB_DEPENDS=	libvanessa_logger.so:${PORTSDIR}/devel/libvanessa_logger
+LIB_DEPENDS=	libvanessa_logger.so:devel/libvanessa_logger
 
 USE_LDCONFIG=	yes
 
diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile
index a5d5045f0d05..cdd1ea2b8259 100644
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	vanessa_socket-${PORTVERSION}
 MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	Library that provides a simple layer for TCP/IP socket operations
 
-LIB_DEPENDS=	libvanessa_logger.so:${PORTSDIR}/devel/libvanessa_logger \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libvanessa_logger.so:devel/libvanessa_logger \
+		libpopt.so:devel/popt
 
 USES=		libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 151e77d8e898..b572aeb2d952 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Glib bindings for Libvirt virtualization API
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:devel/libvirt
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection
diff --git a/devel/libvirt-java/Makefile b/devel/libvirt-java/Makefile
index 36a61738a2bb..a63977c1a6d6 100644
--- a/devel/libvirt-java/Makefile
+++ b/devel/libvirt-java/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Java bindings for Libvirt virtualization API
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
-BUILD_DEPENDS=	jna>=4.0:${PORTSDIR}/devel/jna \
-		junit>=4.8.2:${PORTSDIR}/java/junit
+LIB_DEPENDS=	libvirt.so:devel/libvirt
+BUILD_DEPENDS=	jna>=4.0:devel/jna \
+		junit>=4.8.2:java/junit
 
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile
index 85005e82914a..549e43cf8fcb 100644
--- a/devel/libvirt/Makefile
+++ b/devel/libvirt/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libssh2.so:${PORTSDIR}/security/libssh2
-BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
-		dmidecode:${PORTSDIR}/sysutils/dmidecode
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libgcrypt.so:security/libgcrypt \
+		libxml2.so:textproc/libxml2 \
+		libssh2.so:security/libssh2
+BUILD_DEPENDS=	dnsmasq:dns/dnsmasq \
+		xsltproc:textproc/libxslt
+RUN_DEPENDS=	dnsmasq:dns/dnsmasq \
+		dmidecode:sysutils/dmidecode
 
 OPTIONS_DEFINE=	DOCS GNUTLS NLS QEMU SASL
 OPTIONS_DEFAULT=	GNUTLS
@@ -42,24 +42,24 @@ BHYVE_CONFIGURE_WITH=	bhyve
 
 QEMU_CONFIGURE_WITH=	qemu yajl
 QEMU_CFLAGS=	-I${LOCALBASE}/include
-QEMU_LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
-QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
-			qemu-io:${PORTSDIR}/emulators/qemu-devel
+QEMU_LIB_DEPENDS=	libyajl.so:devel/yajl
+QEMU_RUN_DEPENDS=	dmidecode:sysutils/dmidecode \
+			qemu-io:emulators/qemu-devel
 
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
 GNUTLS_CONFIGURE_OFF=	--without-gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 
 SASL_CONFIGURE_WITH=	sasl
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 XEN_CONFIGURE_WITH=	libxl
 XEN_CFLAGS=	-I${LOCALBASE}/include
-XEN_LIB_DEPENDS=	libxenlight.so:${PORTSDIR}/sysutils/xen-tools
+XEN_LIB_DEPENDS=	libxenlight.so:sysutils/xen-tools
 
 VARDIR=		/var
 
diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile
index f602d54ae2fb..4624d583ba50 100644
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/worldforge/libwfut%20%28updates%20library%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge update library
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=--without-python
 GNU_CONFIGURE=	yes
diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
index f835db2ae2cb..4c3becd377a0 100644
--- a/devel/libxs/Makefile
+++ b/devel/libxs/Makefile
@@ -52,9 +52,9 @@ CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
+		xmlto:textproc/xmlto \
+		docbook-xml>0:textproc/docbook-xml
 
 .else
 CONFIGURE_ARGS+=	--without-documentation
@@ -68,7 +68,7 @@ CFLAGS+=		-fPIC
 
 .if ${PORT_OPTIONS:MEXTERNAL}
 CONFIGURE_ARGS+=	--with-system-pgm
-LIB_DEPENDS+=		libpgm.so:${PORTSDIR}/net/openpgm
+LIB_DEPENDS+=		libpgm.so:net/openpgm
 .endif
 
 .if ${PORT_OPTIONS:MPLUGINS}
diff --git a/devel/libzookeeper/Makefile b/devel/libzookeeper/Makefile
index 75b2c9353b01..4bf7841bfe34 100644
--- a/devel/libzookeeper/Makefile
+++ b/devel/libzookeeper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C client interface to Zookeeper server
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit
+LIB_DEPENDS=	libcppunit.so:devel/cppunit
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses x86 assembly
diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index e76efedaa16a..f22bbe873e8f 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU/ccrtp
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	ZRTP extension for GNU ccRTP
 
-LIB_DEPENDS=	libccrtp.so:${PORTSDIR}/devel/ccrtp \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libccrtp.so:devel/ccrtp \
+		libgcrypt.so:security/libgcrypt
 
 USES=		cmake pkgconfig
 USE_OPENSSL=	yes
diff --git a/devel/libzvbi/Makefile b/devel/libzvbi/Makefile
index 9cffbf1495df..06059808413f 100644
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Routines to access raw VBI capture devices
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
-		libunicode.so:${PORTSDIR}/devel/libunicode
+LIB_DEPENDS+=	libpng.so:graphics/png \
+		libunicode.so:devel/libunicode
 
 USES=		iconv libtool localbase pathfix tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/devel/linux-c6-devtools/Makefile b/devel/linux-c6-devtools/Makefile
index f1876d9a4f2b..bbde6142d0e7 100644
--- a/devel/linux-c6-devtools/Makefile
+++ b/devel/linux-c6-devtools/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Linux compilers and base libraries (CentOS ${LINUX_DIST_VER})
 
 # LICENSE=	Various GNU
 
-RUN_DEPENDS+=	linux-${USE_LINUX}-libgfortran>0:${PORTSDIR}/devel/linux-c6-libgfortran
+RUN_DEPENDS+=	linux-${USE_LINUX}-libgfortran>0:devel/linux-c6-libgfortran
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	c6
diff --git a/devel/linux_libusb/Makefile b/devel/linux_libusb/Makefile
index 64dd3d834aa8..3d6f1a1780d0 100644
--- a/devel/linux_libusb/Makefile
+++ b/devel/linux_libusb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/nox
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Linux-compatibility libusb
 
-BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux-c6-devtools
+BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:devel/linux-c6-devtools
 
 USES=		tar:bzip2
 ONLY_FOR_ARCHS=	i386 amd64
@@ -68,7 +68,7 @@ do-install:
 	${LN} -f ${STAGEDIR}${PREFIX}/usr/lib/libusb.so ${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-#FETCH_DEPENDS+=		svn:${PORTSDIR}/devel/subversion
+#FETCH_DEPENDS+=		svn:devel/subversion
 SVN?=		svnlite
 
 do-fetch:
diff --git a/devel/lldb37/Makefile b/devel/lldb37/Makefile
index afb23d735cb8..3976401f5ce8 100644
--- a/devel/lldb37/Makefile
+++ b/devel/lldb37/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM Debugger (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	37
 
diff --git a/devel/lldb38/Makefile b/devel/lldb38/Makefile
index 576a13ed4904..71fc5d3c2c18 100644
--- a/devel/lldb38/Makefile
+++ b/devel/lldb38/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM Debugger (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	lldb${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	38
 
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 882e9a78649a..ebdbbd37344d 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -46,13 +46,13 @@ DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 LIT_DESC=		Install lit and FileCheck test tools
 LLDB_DESC=		Install lldb, the LLVM debugger (ignore on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 LLVM_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index eb838f4243c2..05b988f4bfc3 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -58,7 +58,7 @@ LLD_DESC=		Install lld, the LLVM linker
 LLD_GH_PROJECT=		lld:lld
 LLD_GH_TAGNAME=		${LLD_COMMIT}:lld
 LLDB_DESC=		Install lldb, the LLVM debugger (ignored on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
@@ -67,11 +67,11 @@ OPENMP_GH_PROJECT=	openmp:openmp
 OPENMP_GH_TAGNAME=	${OPENMP_COMMIT}:openmp
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 LLVM_RELEASE=	3.8.0
 
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index a19e7d2b749e..3ec30f1786c8 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -96,12 +96,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -119,8 +119,8 @@ USES+=			python:-2.9,build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index 9459961546e3..bba4898c4bb6 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -101,12 +101,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -124,8 +124,8 @@ USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 65cb3c7571e8..0f300fff9500 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -97,12 +97,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -120,8 +120,8 @@ USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile
index 34311cb8f90a..eefe16f2185a 100644
--- a/devel/llvm36/Makefile
+++ b/devel/llvm36/Makefile
@@ -107,12 +107,12 @@ RELEASE_TYPE=		Release
 .endif
 
 .if ${PORT_OPTIONS:MCMAKE}
-BUILD_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=	cmake:devel/cmake
 PORTDATA+=	cmake
 .endif
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
@@ -130,8 +130,8 @@ USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
-BUILD_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=		ld.gold:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=		ld.gold:devel/binutils
+RUN_DEPENDS+=		ld.gold:devel/binutils
 CONFIGURE_ARGS+=	--with-binutils-include=${LOCALBASE}/include
 PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 .endif
diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile
index 1653d1a6c846..de7144bc0b9f 100644
--- a/devel/llvm37/Makefile
+++ b/devel/llvm37/Makefile
@@ -64,13 +64,13 @@ LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_DESC=		Install lldb, the LLVM debugger (ignored on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils
 
 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
 .for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
@@ -79,7 +79,7 @@ WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
 
@@ -241,7 +241,7 @@ NOT_FOR_ARCH=	ia64
 
 .if ${PYTHON_REL} < 3400
 LLDB_BUILD_DEPENDS+= \
-	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index 43eb2c030e61..6dcc04987255 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -59,13 +59,13 @@ LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_DESC=		Install lldb, the LLVM debugger (ignored on 9.x)
-LLDB_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LLDB_BUILD_DEPENDS=	swig:devel/swig13
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
-GOLD_BUILD_DEPENDS=	ld.gold:${PORTSDIR}/devel/binutils
+GOLD_BUILD_DEPENDS=	ld.gold:devel/binutils
 
 # Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
 .for option in CLANG EXTRAS LLD LLDB OPENMP
@@ -74,7 +74,7 @@ WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}
 
@@ -200,7 +200,7 @@ PORTDOCS+=	lld
 
 .if ${PYTHON_REL} < 3400
 LLDB_BUILD_DEPENDS+= \
-	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if ${PORT_OPTIONS:MLLDB} && ${PYTHON_REL} >= 3000
diff --git a/devel/lmdbg/Makefile b/devel/lmdbg/Makefile
index 90f14305c82f..fc2f45563d26 100644
--- a/devel/lmdbg/Makefile
+++ b/devel/lmdbg/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Lightweight malloc debugger
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	mk-configure>=0.24:${PORTSDIR}/devel/mk-configure
-LIB_DEPENDS=	libJudy.so:${PORTSDIR}/devel/judy
-RUN_DEPENDS=	runawk:${PORTSDIR}/lang/runawk \
-		${LOCALBASE}/bin/pipestatus:${PORTSDIR}/devel/pipestatus
+BUILD_DEPENDS=	mk-configure>=0.24:devel/mk-configure
+LIB_DEPENDS=	libJudy.so:devel/judy
+RUN_DEPENDS=	runawk:lang/runawk \
+		${LOCALBASE}/bin/pipestatus:devel/pipestatus
 
 USE_LDCONFIG=	yes
 
diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile
index bd27b6685db3..bea13104f8cc 100644
--- a/devel/log4c/Makefile
+++ b/devel/log4c/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL21
 OPTIONS_DEFINE=	EXPAT
 OPTIONS_DEFAULT=EXPAT
 EXPAT_CONFIGURE_WITH=	expat
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		libtool pathfix
 GNU_CONFIGURE=	yes
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index d69cd53d54c0..a5b67a74acb3 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -24,7 +24,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_SUB=		yes
 
-DOXYGEN_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 
 post-patch:
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 58a80b948894..1608090a6f80 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -14,7 +14,7 @@ COMMENT=	C++ port of the Log4j project
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:env autoconf:env
@@ -25,10 +25,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	BOOST DOXYGEN
 
-BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-libs
+BOOST_BUILD_DEPENDS=	${LOCALBASE}/include/boost/regex.hpp:devel/boost-libs
 
 DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
-DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|-dpR|-pr|' \
diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile
index 82c2d7e85d33..f44a96e29aae 100644
--- a/devel/lokalize/Makefile
+++ b/devel/lokalize/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Computer-aided translation system
 
-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/devel/love/Makefile b/devel/love/Makefile
index 00ffd873ccbd..6251f7b4b575 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Open-source 2D game engine
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS=	libmodplug.so:audio/libmodplug \
+		libmpg123.so:audio/mpg123 \
+		libvorbisfile.so:audio/libvorbis \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2 \
+		libtheora.so:multimedia/libtheora
 
 USES=		compiler:c++11-lib desktop-file-utils gmake libtool \
 		localbase openal pkgconfig shared-mime-info
@@ -38,7 +38,7 @@ OPTIONS_DEFAULT_i386=	LUAJIT
 OPTIONS_DEFAULT_amd64=	LUAJIT
 
 LUAJIT_DESC=	Use luajit
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUAJIT_CONFIGURE_ON=	--with-lua=luajit
 LUAJIT_USES_OFF=	lua
 LUAJIT_CONFIGURE_OFF=	--with-lua=lua \
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index afea7c4776a8..42f251826593 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 2D game engine
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libmodplug.so:audio/libmodplug \
+		libmpg123.so:audio/mpg123 \
+		libvorbisfile.so:audio/libvorbis \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 PORTSCOUT=	limit:^0\.7\.
 
diff --git a/devel/love08/Makefile b/devel/love08/Makefile
index fe9827ecf50c..15016a37347f 100644
--- a/devel/love08/Makefile
+++ b/devel/love08/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-linux-src
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 2D game engine
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libmodplug.so:audio/libmodplug \
+		libmpg123.so:audio/mpg123 \
+		libvorbisfile.so:audio/libvorbis \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 PORTSCOUT=	limit:^0\.8\.
 
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index 343cc09128f4..6ed811fd6652 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -11,10 +11,10 @@ PKGNAMESUFFIX=	5
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Open-source 2D game engine
 
-LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
-		libphysfs.so:${PORTSDIR}/devel/physfs \
-		libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libIL.so:graphics/devil \
+		libphysfs.so:devel/physfs \
+		libfreetype.so:print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USES=		tar:bzip2 gmake dos2unix lua:51
 USE_SDL=	sdl mixer
diff --git a/devel/lua-alien/Makefile b/devel/lua-alien/Makefile
index a0ab4e0a8180..b8a7eeb01e65 100644
--- a/devel/lua-alien/Makefile
+++ b/devel/lua-alien/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lua -> C FFI
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/devel/luabind/Makefile b/devel/luabind/Makefile
index ae133d67fcf0..d19b1f648c2a 100644
--- a/devel/luabind/Makefile
+++ b/devel/luabind/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library that helps you create bindings between C++ and Lua
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 
 USES=		lua:51
 USE_LDCONFIG=	yes
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 05bc0027ba26..6fcbe64b0a99 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -23,8 +23,8 @@ OPTIONS_DEFAULT=TEST
 
 OPTIONS_SUB=		yes
 TEST_CONFIGURE_WITH=	atf
-TEST_BUILD_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
-TEST_RUN_DEPENDS=	atf>=0.21:${PORTSDIR}/devel/atf
+TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
+TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index b580300f3b38..9e5342b672b1 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -10,14 +10,14 @@ MASTER_SITES=	SAVANNAH/m17n
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Library for the multilingual text handling
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
-		m17n-db>=1.6.4:${PORTSDIR}/devel/m17n-db
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libgd.so:${PORTSDIR}/graphics/gd \
-		libotf.so:${PORTSDIR}/print/libotf
-RUN_DEPENDS=	m17n-db>=1.6.4:${PORTSDIR}/devel/m17n-db
+BUILD_DEPENDS=	bison:devel/bison \
+		m17n-db>=1.6.4:devel/m17n-db
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libfribidi.so:converters/fribidi \
+		libgd.so:graphics/gd \
+		libotf.so:print/libotf
+RUN_DEPENDS=	m17n-db>=1.6.4:devel/m17n-db
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -36,14 +36,14 @@ ANTHY_DESC=	Kana-Kanji conversion support via Anthy
 ISPELL_DESC=	Spell checking support via Ispell
 THAI_DESC=	Thai language support via libThai
 
-ANTHY_LIB_DEPENDS=	libanthy.so:${PORTSDIR}/japanese/anthy
+ANTHY_LIB_DEPENDS=	libanthy.so:japanese/anthy
 ANTHY_CONFIGURE_OFF+=	--without-anthy
 
-ISPELL_BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
-ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_CONFIGURE_OFF=	HAVE_ISPELL=no
 
-THAI_LIB_DEPENDS=	libthai.so:${PORTSDIR}/devel/libthai
+THAI_LIB_DEPENDS=	libthai.so:devel/libthai
 THAI_CONFIGURE_OFF=	--without-libthai
 
 post-patch:
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index c1bf3a0b8b47..6458aaf0b65a 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -22,7 +22,7 @@ EXAMPLESDIR=	share/examples/gm4
 
 OPTIONS_DEFINE=			LIBSIGSEGV EXAMPLES
 LIBSIGSEGV_DESC=		Use alternative page fault handler (GNU libsigsegv)
-LIBSIGSEGV_LIB_DEPENDS=		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
+LIBSIGSEGV_LIB_DEPENDS=		libsigsegv.so:devel/libsigsegv
 LIBSIGSEGV_CONFIGURE_ON=	--with-libsigsegv-prefix=${LOCALBASE}
 LIBSIGSEGV_CONFIGURE_OFF=	--without-libsigsegv-prefix
 
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 3558297fd860..2a45a8471b76 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Interface to Git for Emacs
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	dash.el>=2.12.1:${PORTSDIR}/devel/dash.el \
-		with-editor-${EMACS_PORT_NAME}>=2.5.0:${PORTSDIR}/editors/with-editor
-RUN_DEPENDS=	dash.el>=2.12.1:${PORTSDIR}/devel/dash.el \
-		with-editor-${EMACS_PORT_NAME}>=2.5.0:${PORTSDIR}/editors/with-editor
+BUILD_DEPENDS=	dash.el>=2.12.1:devel/dash.el \
+		with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
+RUN_DEPENDS=	dash.el>=2.12.1:devel/dash.el \
+		with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
 
 USE_GITHUB=	yes
 
@@ -26,10 +26,10 @@ NO_ARCH=	yes
 
 OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
 GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
-GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:${PORTSDIR}/devel/git
+GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:devel/git
+GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
+GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile
index 2609c5ce03c9..a2ee7c3c3581 100644
--- a/devel/matreshka/Makefile
+++ b/devel/matreshka/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ada framework for information systems development
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake pkgconfig
 HAS_CONFIGURE=	yes
diff --git a/devel/maven-ant-tasks/Makefile b/devel/maven-ant-tasks/Makefile
index 417a0b00d89d..8ea3e3615937 100644
--- a/devel/maven-ant-tasks/Makefile
+++ b/devel/maven-ant-tasks/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows Maven artifact handling to be used from within an Ant build
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
+RUN_DEPENDS=	ant:devel/apache-ant
 
 USE_JAVA=	1.6+
 
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index f17231ffce25..330ddeefcd53 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java project management tool, 3.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_PRODUCT=	maven
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
index 3bc886d91cba..a927dcb3571c 100644
--- a/devel/maven31/Makefile
+++ b/devel/maven31/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Java project management tool, 3.1.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_PRODUCT=	maven
diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile
index 7489dd3cb1c8..92bb95ab0a15 100644
--- a/devel/maven33/Makefile
+++ b/devel/maven33/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Java project management tool, 3.3.x branch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mvn:${PORTSDIR}/devel/maven-wrapper
+RUN_DEPENDS=	mvn:devel/maven-wrapper
 
 USES=		cpe
 CPE_PRODUCT=	maven
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index b63fa29fd538..bc638da7bde4 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Procedural terrain library
 
-LIB_DEPENDS=	libwfmath-1.0.so:${PORTSDIR}/math/wfmath
+LIB_DEPENDS=	libwfmath-1.0.so:math/wfmath
 
 CONFIGURE_ARGS=	--disable-silent-rules
 USES=		libtool pathfix pkgconfig compiler:c++11-lib
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 34571c055d48..4246dd75d810 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=DATA
 OPTIONS_SUB=	yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
-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
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
diff --git a/devel/mercurialeclipse/Makefile b/devel/mercurialeclipse/Makefile
index 214c152d7e1f..f3d9a0867683 100644
--- a/devel/mercurialeclipse/Makefile
+++ b/devel/mercurialeclipse/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Mercurial plugin for the Eclipse IDE Framework
 
-RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
+RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:java/eclipse
 
 PLIST_SUB=	VER=${PORTVERSION}
 
diff --git a/devel/mingw32-directx/Makefile b/devel/mingw32-directx/Makefile
index 8d8896a00090..2427001741bb 100644
--- a/devel/mingw32-directx/Makefile
+++ b/devel/mingw32-directx/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-devel
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DirectX header files for use with MinGW
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 85807f3c2ae7..83fcf7fc7e4d 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -14,12 +14,12 @@ COMMENT=	FSF gcc-4 for Windows cross-development
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
-		mingwm10.dll:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
-RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
+BUILD_DEPENDS=	${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils \
+		mingwm10.dll:devel/${PKGNAMEPREFIX}bin-msvcrt
+RUN_DEPENDS=	${PKGNAMEPREFIX}as:devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
 
 GCCVERSION=	4.8.1
 
diff --git a/devel/mingw32-libffi/Makefile b/devel/mingw32-libffi/Makefile
index 36e46083f1d5..e3c578b3b149 100644
--- a/devel/mingw32-libffi/Makefile
+++ b/devel/mingw32-libffi/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	mingw32-
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The libffi library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 SSP_UNSAFE=	fails to link
 GNU_CONFIGURE=	yes
diff --git a/devel/mingw32-libyaml/Makefile b/devel/mingw32-libyaml/Makefile
index cbe953335e15..0d2dc0ed9f54 100644
--- a/devel/mingw32-libyaml/Makefile
+++ b/devel/mingw32-libyaml/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	repacked
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The libyaml library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/mingw32
diff --git a/devel/mingw32-openssl/Makefile b/devel/mingw32-openssl/Makefile
index d02b2105fc18..b24eb11c3c97 100644
--- a/devel/mingw32-openssl/Makefile
+++ b/devel/mingw32-openssl/Makefile
@@ -14,10 +14,10 @@ DIST_SUBDIR=	${DISTNAME}
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The OpenSSL library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/stdlib.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt \
-		${LOCALBASE}/mingw32/lib/libz.a:${PORTSDIR}/devel/mingw32-zlib
+BUILD_DEPENDS=	makedepend:devel/makedepend \
+		${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/stdlib.h:devel/${PKGNAMEPREFIX}bin-msvcrt \
+		${LOCALBASE}/mingw32/lib/libz.a:devel/mingw32-zlib
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	apps/tsget
diff --git a/devel/mingw32-pdcurses/Makefile b/devel/mingw32-pdcurses/Makefile
index fbd313288a8a..30e046c9be09 100644
--- a/devel/mingw32-pdcurses/Makefile
+++ b/devel/mingw32-pdcurses/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	PDCurses-${PORTVERSION}
 MAINTAINER= ports@FreeBSD.org
 COMMENT=	Curses and Panel terminal library for Windows
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 USES=		gmake
 MAKEFILE=	gccwin32.mak
diff --git a/devel/mingw32-pthreads/Makefile b/devel/mingw32-pthreads/Makefile
index 136b11e59445..a1da84be152d 100644
--- a/devel/mingw32-pthreads/Makefile
+++ b/devel/mingw32-pthreads/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-w32-${PORTVERSION:S/./-/g}-release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POSIX threads library for Windows compiled with MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		mingwm10.dll:${PORTSDIR}/devel/mingw32-bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		mingwm10.dll:devel/mingw32-bin-msvcrt
 
 USES=		gmake
 
diff --git a/devel/mingw32-zlib/Makefile b/devel/mingw32-zlib/Makefile
index 44fde263465c..65396f1c3d5c 100644
--- a/devel/mingw32-zlib/Makefile
+++ b/devel/mingw32-zlib/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	mingw32-
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	The zlib library cross-compiled for MinGW32
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:${PORTSDIR}/devel/${PKGNAMEPREFIX}gcc \
-		${LOCALBASE}/mingw32/include/sys/types.h:${PORTSDIR}/devel/${PKGNAMEPREFIX}bin-msvcrt
+BUILD_DEPENDS=	${PKGNAMEPREFIX}gcc:devel/${PKGNAMEPREFIX}gcc \
+		${LOCALBASE}/mingw32/include/sys/types.h:devel/${PKGNAMEPREFIX}bin-msvcrt
 
 USES=		tar:xz gmake
 MAKEFILE=	win32/Makefile.gcc
diff --git a/devel/mk-configure/Makefile b/devel/mk-configure/Makefile
index f05cbe04add6..35be9cb7aa12 100644
--- a/devel/mk-configure/Makefile
+++ b/devel/mk-configure/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Lightweight, easy to use replacement for GNU autotools
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${BMAKE}:${PORTSDIR}/devel/bmake
+BUILD_DEPENDS=	${BMAKE}:devel/bmake
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		bmkdep:${PORTSDIR}/devel/bmkdep
+		bmkdep:devel/bmkdep
 
 BMAKE?=		${LOCALBASE}/bin/bmake
 INSTALL_TARGET=	installdirs install install-doc
diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile
index 05271e8b967c..2ea60d6584af 100644
--- a/devel/mkcmd/Makefile
+++ b/devel/mkcmd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.physics.purdue.edu/pub/pundits/ \
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Command-line parser and manual page generator
 
-BUILD_DEPENDS=	makeme:${PORTSDIR}/devel/msrc0
+BUILD_DEPENDS=	makeme:devel/msrc0
 
 MAKE_FLAGS=
 MAKEFILE=
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index e716a395a571..2596a582b12e 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Common build infrastructure for the GNOME C++ binding libraries
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake pathfix tar:xz
 GNU_CONFIGURE=	yes
diff --git a/devel/mongo-c-driver/Makefile b/devel/mongo-c-driver/Makefile
index 917626c635c4..be2c3f8d5d28 100644
--- a/devel/mongo-c-driver/Makefile
+++ b/devel/mongo-c-driver/Makefile
@@ -10,8 +10,8 @@ COMMENT=	C Driver for MongoDB
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libbson-1.0.so:${PORTSDIR}/devel/libbson
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libbson-1.0.so:devel/libbson
+LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
diff --git a/devel/mongo-cxx-driver/Makefile b/devel/mongo-cxx-driver/Makefile
index 2f704f7fe3b9..3b09f086162f 100644
--- a/devel/mongo-cxx-driver/Makefile
+++ b/devel/mongo-cxx-driver/Makefile
@@ -11,14 +11,14 @@ COMMENT=	C++ Driver for MongoDB
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=         SCRAM-SHA-1
 OPTIONS_DEFAULT=        SCRAM-SHA-1
 
-SCRAM-SHA-1_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SCRAM-SHA-1_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SCRAM-SHA-1_MAKE_ARGS=		--use-sasl-client --ssl
 SCRAM-SHA-1_DESC=	SCRAM-SHA-1 authentication mechanism support.
 
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 61e81203f3f9..d859d5799bb8 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -11,10 +11,10 @@ DISTFILES=	${DISTNAME}-0${EXTRACT_SUFX}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	IDE for the .NET platform
 
-BUILD_DEPENDS=	mautil:${PORTSDIR}/devel/mono-addins
-RUN_DEPENDS=	${LOCALBASE}/lib/libgdiplus.a:${PORTSDIR}/x11-toolkits/libgdiplus \
-		exctags:${PORTSDIR}/devel/ctags \
-		mautil:${PORTSDIR}/devel/mono-addins
+BUILD_DEPENDS=	mautil:devel/mono-addins
+RUN_DEPENDS=	${LOCALBASE}/lib/libgdiplus.a:x11-toolkits/libgdiplus \
+		exctags:devel/ctags \
+		mautil:devel/mono-addins
 
 BROKEN=		GUI does not start
 DEPRECATED=	Broken for more than 6 months
@@ -34,9 +34,9 @@ GIT_DESC=	git support
 
 MONOEXT_CONFIGURE_ENABLE=monoextensions
 GIT_CONFIGURE_ENABLE=git
-GIT_RUN_DEPENDS=git:${PORTSDIR}/devel/git
+GIT_RUN_DEPENDS=git:devel/git
 SVN_CONFIGURE_ENABLE=subversion
-SVN_RUN_DEPENDS=svn:${PORTSDIR}/devel/subversion
+SVN_RUN_DEPENDS=svn:devel/subversion
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,even
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 6ed8f50250bc..1d0f7e43e4f7 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -15,10 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
-		mtn:${PORTSDIR}/devel/monotone \
-		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
+RUN_DEPENDS+=	dot:graphics/graphviz \
+		mtn:devel/monotone \
+		lablgtk2:x11-toolkits/ocaml-lablgtk2
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 8eb1788eb290..ce8ca04746d5 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Distributed version control system with digital signatures
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libbotan-1.10.so:${PORTSDIR}/security/botan110
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libidn.so:dns/libidn \
+		libsqlite3.so:databases/sqlite3 \
+		libbotan-1.10.so:security/botan110
 
 SUB_FILES=	pkg-message
 USES=		cpe gmake iconv localbase lua:51 makeinfo perl5 \
diff --git a/devel/mpatrol/Makefile b/devel/mpatrol/Makefile
index 20afaae6a825..aeb7887fac34 100644
--- a/devel/mpatrol/Makefile
+++ b/devel/mpatrol/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER= ports@FreeBSD.org
 COMMENT=	Dynamic memory debugging and profiling library
 
-LIB_DEPENDS=	libelf.so.0:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libelf.so.0:devel/libelf
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/build/unix
 
diff --git a/devel/msp430-debug-stack/Makefile b/devel/msp430-debug-stack/Makefile
index d22adc830832..80100a71a25f 100644
--- a/devel/msp430-debug-stack/Makefile
+++ b/devel/msp430-debug-stack/Makefile
@@ -18,8 +18,8 @@ COMMENT=	TI MSP430 debugging interface library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libhidapi.so:${PORTSDIR}/comms/hidapi
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
+		libhidapi.so:comms/hidapi
 
 BROKEN_FreeBSD_9=	does not build (internal compiler error)
 
diff --git a/devel/mspdebug/Makefile b/devel/mspdebug/Makefile
index 12e49a9e42fd..9c090e49f17c 100644
--- a/devel/mspdebug/Makefile
+++ b/devel/mspdebug/Makefile
@@ -21,7 +21,7 @@ LIBMSP430_DESC=		Use TI libmsp430 USB driver
 READLINE_USES=		readline pkgconfig
 READLINE_MAKE_ARGS_OFF=	WITHOUT_READLINE=1
 
-LIBMSP430_LIB_DEPENDS=	libmsp430.so:${PORTSDIR}/devel/msp430-debug-stack
+LIBMSP430_LIB_DEPENDS=	libmsp430.so:devel/msp430-debug-stack
 
 USES=		gmake
 
diff --git a/devel/mtbl/Makefile b/devel/mtbl/Makefile
index a858db30cb70..c31b9733c003 100644
--- a/devel/mtbl/Makefile
+++ b/devel/mtbl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Immutable sorted string table library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	liblz4.so:${PORTSDIR}/archivers/liblz4 \
-		libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libsnappy.so:archivers/snappy
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile
index 32ef18d89055..e3b27a3d0c54 100644
--- a/devel/ncnf/Makefile
+++ b/devel/ncnf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic configuration management library
 
-LIB_DEPENDS=	libstrfunc.so:${PORTSDIR}/devel/libstrfunc
+LIB_DEPENDS=	libstrfunc.so:devel/libstrfunc
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile
index d1487291c99c..f31fb2ce6263 100644
--- a/devel/ndesk-dbus-glib/Makefile
+++ b/devel/ndesk-dbus-glib/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.ndesk.org/archive/ndesk-dbus/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GLib main loop integration for Managed D-Bus
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
 
 USES=		gmake mono pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/netsurf-buildsystem/Makefile b/devel/netsurf-buildsystem/Makefile
index bfcf21b76fa8..3b8b7479848c 100644
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@@ -12,7 +12,7 @@ COMMENT=	NetSurf project buildsystem
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 MAKE_ENV+=	COMPONENT_TYPE=lib-shared \
 
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 9af10543ede9..ed721657f8e4 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Not Eriks Windowing Toolkit: console I/O handling library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libslang.so:devel/libslang2 \
+		libpopt.so:devel/popt
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/devel/ninja-ide/Makefile b/devel/ninja-ide/Makefile
index 96bc25bc2593..ad283257472b 100644
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Cross-platform integrated development environment (IDE)
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:${PORTSDIR}/www/py-qt4-webkit
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:${PORTSDIR}/devel/py-qt4-declarative \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:${PORTSDIR}/www/py-qt4-webkit
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:devel/py-qt4-declarative \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/node-thrift/Makefile b/devel/node-thrift/Makefile
index e8091306d0e8..036bdf2ceb07 100644
--- a/devel/node-thrift/Makefile
+++ b/devel/node-thrift/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	node-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Node.js bindings for the Apache Thrift RPC system
 
-RUN_DEPENDS=	node:${PORTSDIR}/www/node
+RUN_DEPENDS=	node:www/node
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile
index bc76e1a08377..05183bb2fa36 100644
--- a/devel/notify-sharp/Makefile
+++ b/devel/notify-sharp/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://romain.blogreen.org/distfiles/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	C\# client library for notification-daemon
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
-		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:devel/ndesk-dbus-glib
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:devel/ndesk-dbus-glib \
+		${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 28b9c5c4d075..7fc912a6a514 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	noweb
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	icont:${PORTSDIR}/lang/icon
-RUN_DEPENDS=	iconx:${PORTSDIR}/lang/icon
+BUILD_DEPENDS=	icont:lang/icon
+RUN_DEPENDS=	iconx:lang/icon
 
 USES=		tar:tgz
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/devel/nsgenbind/Makefile b/devel/nsgenbind/Makefile
index 67c6700b8934..09eeb42da617 100644
--- a/devel/nsgenbind/Makefile
+++ b/devel/nsgenbind/Makefile
@@ -12,8 +12,8 @@ COMMENT=	NetSurf Generator for JavaScript bindings
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem \
-		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem \
+		${LOCALBASE}/bin/flex:textproc/flex
 
 USES=	bison gmake
 
diff --git a/devel/nxt-python/Makefile b/devel/nxt-python/Makefile
index 91674083050e..5b0767ac5aef 100644
--- a/devel/nxt-python/Makefile
+++ b/devel/nxt-python/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python interface for the Lego Mindstorms NXT robot
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>=0:${PORTSDIR}/devel/py-usb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>=0:devel/py-usb
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index 3f54a980bd00..46f9cf4e9038 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library for synced document buffers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libnet6.so:${PORTSDIR}/net/net6
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libnet6.so:net/net6
 
 USES=		pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index 53ca70f8fcb0..a1c29a230bd6 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Cross-language way to cryptographically hash JSON objects
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libicudata.so:devel/icu \
+		libjson-c.so:devel/json-c
 
 BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
 
diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile
index da0f6b50a53b..0313126b3e4e 100644
--- a/devel/ocaml-annexlib/Makefile
+++ b/devel/ocaml-annexlib/Makefile
@@ -13,8 +13,8 @@ COMMENT=	OCaml subroutines collection
 
 LICENSE=	LGPL21
 
-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
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile
index 5086782420a0..10403728c39e 100644
--- a/devel/ocaml-cfg/Makefile
+++ b/devel/ocaml-cfg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for manipulation of context-free grammars
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	menhir:${PORTSDIR}/devel/menhir
+BUILD_DEPENDS=	menhir:devel/menhir
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
index 723d6dac8567..8a54aa5260c6 100644
--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Complete - yet small - standard library for OCaml
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	cppo:${PORTSDIR}/devel/ocaml-cppo
+BUILD_DEPENDS=	cppo:devel/ocaml-cppo
 
 WRKSRC_SUBDIR=	src
 
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 756d36f4914e..ed18d12744fe 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=TOOLBOX
 OPTIONS_SUB=	yes
 TOOLBOX_DESC=	Include toolbox interface (requires OCaml with TK)
 TOOLBOX_CONFIGURE_ON=	-with-toolbox
-TOOLBOX_RUN_DEPENDS=	labltk:${PORTSDIR}/x11-toolkits/ocaml-labltk
+TOOLBOX_RUN_DEPENDS=	labltk:x11-toolkits/ocaml-labltk
 TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/devel/ocaml-ipaddr/Makefile b/devel/ocaml-ipaddr/Makefile
index c52a09327ddd..b55e8564e8bc 100644
--- a/devel/ocaml-ipaddr/Makefile
+++ b/devel/ocaml-ipaddr/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	OCaml library for manipulation of IP address representations
 
-BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:${PORTSDIR}/devel/ocaml-sexplib
-RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:${PORTSDIR}/devel/ocaml-sexplib
+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
+RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mirage
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index ea3860277af1..f50015e38b81 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Cooperative threading library for OCaml
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \
-		${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
-RUN_DEPENDS=	${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \
-		${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
+BUILD_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
+		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
+RUN_DEPENDS=	${SA_DIR}/react/react.a:devel/ocaml-react \
+		${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocsigen
@@ -45,8 +45,8 @@ OPTIONS_DEFINE=		DOCS
 DOCS_CONFIGURE_ENABLE=	docs
 DOCS_CONFIGURE_ON=	--docdir ${STAGEDIR}${DOCSDIR}
 # For some reason, ocaml-text is needed when building documentation
-DOCS_BUILD_DEPENDS=	${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
-DOCS_RUN_DEPENDS=	${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
+DOCS_BUILD_DEPENDS=	${SA_DIR}/text/text.a:textproc/ocaml-text
+DOCS_RUN_DEPENDS=	${SA_DIR}/text/text.a:textproc/ocaml-text
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
diff --git a/devel/ocaml-magic/Makefile b/devel/ocaml-magic/Makefile
index a8f176187b69..872b1a80a203 100644
--- a/devel/ocaml-magic/Makefile
+++ b/devel/ocaml-magic/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 # This really is overzealous but I work this way
 .if !exists(/usr/lib/libmagic.so)
-LIB_DEPENDS+=	libmagic.so:${PORTSDIR}/sysutils/file
+LIB_DEPENDS+=	libmagic.so:sysutils/file
 .endif
 
 post-install:
diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index 1d1bb293879b..f82147c56f35 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Source-based package manager for OCaml
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=		camlp4:${PORTSDIR}/devel/ocaml-camlp4
+RUN_DEPENDS=		camlp4:devel/ocaml-camlp4
 
 USES=		gmake
 USE_OCAML=	yes
@@ -34,12 +34,12 @@ HG_DESC=		Remote repository synchronized with mercurial
 DARCS_DESC=		Remote repository synchronized with darcs
 ASPCUD_DESC=		Use aspcud as an external dependencies solver
 
-WGET_RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
-HG_RUN_DEPENDS=		hg:${PORTSDIR}/devel/mercurial
-DARCS_RUN_DEPENDS=	darcs:${PORTSDIR}/devel/hs-darcs
-ASPCUD_RUN_DEPENDS=	aspcud:${PORTSDIR}/math/aspcud
+WGET_RUN_DEPENDS=	wget:ftp/wget
+RSYNC_RUN_DEPENDS=	rsync:net/rsync
+GIT_RUN_DEPENDS=	git:devel/git
+HG_RUN_DEPENDS=		hg:devel/mercurial
+DARCS_RUN_DEPENDS=	darcs:devel/hs-darcs
+ASPCUD_RUN_DEPENDS=	aspcud:math/aspcud
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 2701752ecd64..2e9646847e10 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmottl
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index f672dc3c954f..f61839403002 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	OCaml interface to the SDL
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	ocaml-lablgl>0:${PORTSDIR}/graphics/ocaml-lablgl
+BUILD_DEPENDS=	ocaml-lablgl>0:graphics/ocaml-lablgl
 
 OPTIONS_DEFINE=	SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF DOCS
 OPTIONS_DEFAULT=SDL_GFX SDL_IMAGE SDL_MIXER SDL_TTF
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index cad1977579d5..f8a5f9150b66 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -15,8 +15,8 @@ LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.txt
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt
 
-BUILD_DEPENDS=	ocaml-type_conv>=0:${PORTSDIR}/devel/ocaml-type_conv
-RUN_DEPENDS=	ocaml-type_conv>=0:${PORTSDIR}/devel/ocaml-type_conv
+BUILD_DEPENDS=	ocaml-type_conv>=0:devel/ocaml-type_conv
+RUN_DEPENDS=	ocaml-type_conv>=0:devel/ocaml-type_conv
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/ocfpcsc/Makefile b/devel/ocfpcsc/Makefile
index c1017f5bdbd5..d958d7c44be7 100644
--- a/devel/ocfpcsc/Makefile
+++ b/devel/ocfpcsc/Makefile
@@ -18,7 +18,7 @@ LICENSE_NAME=	IBM OpenCard Framework
 LICENSE_FILE=	${FILESDIR}/IBMOCF
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		gmake
 USE_JAVA=	yes
diff --git a/devel/ocl-icd/Makefile b/devel/ocl-icd/Makefile
index 2393328f9aba..a0db5ecc5e12 100644
--- a/devel/ocl-icd/Makefile
+++ b/devel/ocl-icd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	OpenCL Installable Client Driver
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	opencl>=0:devel/opencl
 
 CONFLICTS=	freeocl-[0-9]* opencl-icd-[0-9]*
 
@@ -31,8 +31,8 @@ OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
-MANPAGES_BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
-			asciidoc:${PORTSDIR}/textproc/asciidoc
+MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
+			asciidoc:textproc/asciidoc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' \
diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
index d5aba3946a24..06f4e67d2db2 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE hex editor
 
-LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
+LIB_DEPENDS=	libqca.so:devel/qca
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource shared-mime-info tar:xz
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 004c62648297..c489fc0f891a 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -15,9 +15,9 @@ COMMENT=	CORBA Notification Service (CosNotification) for omniORB
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB-4.1
+LIB_DEPENDS=	libomniORB4.so:devel/omniORB-4.1
 # parts of omniORB4-4.1 source tree is required to build
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch
+BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB-4.1:patch
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_WRKSRC=	${WRKSRC}/build
diff --git a/devel/oozie/Makefile b/devel/oozie/Makefile
index fb2b22be7787..07b6e2dc6505 100644
--- a/devel/oozie/Makefile
+++ b/devel/oozie/Makefile
@@ -19,11 +19,11 @@ COMMENT=	Workflow scheduler for Hadoop
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3 \
-		yarn:${PORTSDIR}/devel/hadoop2 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
+		yarn:devel/hadoop2 \
+		zip:archivers/zip
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		shebangfix
 USE_JAVA=	yes
diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile
index 206b6dfd198f..05b89806f3dc 100644
--- a/devel/open-beagle/Makefile
+++ b/devel/open-beagle/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install-strip
 PACCVERSION=	1.3.1b
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PACCVERSION=${PACCVERSION}
-BUILD_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS+=	gsed:textproc/gsed
 
 #unfortunately, some important sed statements rely on GNU sed behavior, and can't be
 #easily changed to call GNU sed by means of the configure script
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 89b5b4b07845..87f5665f2404 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fast and powerful code search and cross-reference engine
 LICENSE=	CDDL APACHE20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS=	exctags:devel/ctags
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
@@ -31,12 +31,12 @@ OPTIONS_SINGLE=		AS
 OPTIONS_SINGLE_AS=	TOMCAT7 TOMCAT6 RESIN3
 OPTIONS_DEFAULT=	TOMCAT6
 
-TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
-TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
-RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
-RESIN3_RUN_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:${PORTSDIR}/www/resin3
+TOMCAT6_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6
+TOMCAT6_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat6
+TOMCAT7_BUILD_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7
+TOMCAT7_RUN_DEPENDS=	${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7
+RESIN3_BUILD_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:www/resin3
+RESIN3_RUN_DEPENDS=	${WEBAPP_HOME}/lib/resin.jar:www/resin3
 
 JARFILE=	${DATADIR}/opengrok.jar
 LIBFILES=	ant.jar \
diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
index 39fc37ab02f9..87b39a8e5baa 100644
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Open On-Chip Debugger
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-werror
@@ -279,17 +279,17 @@ CONFIGURE_ARGS+=	--disable-minidriver-dummy
 
 .if ${PORT_OPTIONS:MCMSISDAP}
 CONFIGURE_ARGS+=	--enable-cmsis-dap
-LIB_DEPENDS+=		libhidapi.so:${PORTSDIR}/comms/hidapi
+LIB_DEPENDS+=		libhidapi.so:comms/hidapi
 .else
 CONFIGURE_ARGS+=	--disable-cmsis-dap
 .endif
 
 .if defined(WITH_LIBFTDI)
-LIB_DEPENDS+=		libftdi.so:${PORTSDIR}/devel/libftdi
+LIB_DEPENDS+=		libftdi.so:devel/libftdi
 .endif
 
 .if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=		doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=		doxygen:devel/doxygen
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/openvex/Makefile b/devel/openvex/Makefile
index 15f3fb268282..355ab06d05b1 100644
--- a/devel/openvex/Makefile
+++ b/devel/openvex/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Open source firmware for Vex robotics controllers
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	sdcc:${PORTSDIR}/lang/sdcc \
-		gpasm:${PORTSDIR}/devel/gputils
-RUN_DEPENDS=	vexctl:${PORTSDIR}/devel/roboctl \
-		sdcc:${PORTSDIR}/lang/sdcc \
-		gpasm:${PORTSDIR}/devel/gputils
+BUILD_DEPENDS=	sdcc:lang/sdcc \
+		gpasm:devel/gputils
+RUN_DEPENDS=	vexctl:devel/roboctl \
+		sdcc:lang/sdcc \
+		gpasm:devel/gputils
 
 USES+=		tar:xz
 
diff --git a/devel/osc/Makefile b/devel/osc/Makefile
index 5df32159d8d3..1bd8d8ff5bd3 100644
--- a/devel/osc/Makefile
+++ b/devel/osc/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Command Line Interface to work with an openSUSE Build Service
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:${PORTSDIR}/www/py-urlgrabber
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>0:${PORTSDIR}/www/py-urlgrabber
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openSUSE
@@ -35,7 +35,7 @@ CA_BUNDLE_DESC=	Install CA Certificates
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCA_BUNDLE}
-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
 CA_PATH=	${LOCALBASE}/share/certs/ca-root-nss.crt
 .else
 CA_PATH=	/etc/ssl
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index c54783dece98..438951fe6513 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Defines an abstract type of buffer that can move data without copying
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index 2bb27909c456..16d21c7df466 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for parsing arbitrary C/C++-style configuration files
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index 6a0f03ab80c9..2af4897c4cde 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ossp-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible name to value mapping library for C variables
 
-LIB_DEPENDS=	libex.so:${PORTSDIR}/devel/ossp-ex
+LIB_DEPENDS=	libex.so:devel/ossp-ex
 
 USES=		gmake libtool
 USE_LDCONFIG=	yes
diff --git a/devel/p4.el/Makefile b/devel/p4.el/Makefile
index e004db0629a9..2e6f16750370 100644
--- a/devel/p4.el/Makefile
+++ b/devel/p4.el/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perforce-Emacs Integration
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 1779689bc860..6c235a5cac28 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 RESTRICTED=	Restricted distribution
 
diff --git a/devel/p4delta/Makefile b/devel/p4delta/Makefile
index 6a3d96679e64..ffb5942700ef 100644
--- a/devel/p4delta/Makefile
+++ b/devel/p4delta/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Summarizes and manages differences between local files and Perforce
 
-RUN_DEPENDS=	${LOCALBASE}/bin/p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	${LOCALBASE}/bin/p4:devel/p4
 
 USE_RUBY=	yes
 NO_BUILD=	yes
diff --git a/devel/p4genpatch/Makefile b/devel/p4genpatch/Makefile
index b47d348ceb21..1e7b24dfd71f 100644
--- a/devel/p4genpatch/Makefile
+++ b/devel/p4genpatch/Makefile
@@ -10,7 +10,7 @@ DISTFILES=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Helper scripts for generating RCS patches from Perforce
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index 4c596cbaba84..d0a20d29358e 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 RESTRICTED=	Restricted distribution
 
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index e8003ef993a2..ac92708f4ab8 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -34,7 +34,7 @@ USE_RC_SUBR=	p4web
 
 # 10.x (and higher) needs compat libs
 .if ${OSVERSION} >= 1000054
-LIB_DEPENDS+=	libstdc++.so.6:${PORTSDIR}/misc/compat9x
+LIB_DEPENDS+=	libstdc++.so.6:misc/compat9x
 .endif
 
 # Figure out what to install
diff --git a/devel/p5-AI-Pathfinding-AStar/Makefile b/devel/p5-AI-Pathfinding-AStar/Makefile
index 445d06400fa5..2392ec074a04 100644
--- a/devel/p5-AI-Pathfinding-AStar/Makefile
+++ b/devel/p5-AI-Pathfinding-AStar/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl implementation of the A* pathfinding algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Heap>=0:${PORTSDIR}/devel/p5-Heap
+BUILD_DEPENDS=	p5-Heap>=0:devel/p5-Heap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AI-Prolog/Makefile b/devel/p5-AI-Prolog/Makefile
index 4c8c62fe878a..cc5c628bb0e9 100644
--- a/devel/p5-AI-Prolog/Makefile
+++ b/devel/p5-AI-Prolog/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for logic programming
 
-RUN_DEPENDS=	p5-aliased>=0.11:${PORTSDIR}/devel/p5-aliased \
-		p5-Clone>=0.15:${PORTSDIR}/devel/p5-Clone \
-		p5-Exporter-Tidy>=0.06:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		p5-Hash-AsObject>=0.05:${PORTSDIR}/devel/p5-Hash-AsObject \
-		p5-Regexp-Common>=2.119:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Text-Quote>=0.03:${PORTSDIR}/textproc/p5-Text-Quote \
-		p5-Term-ReadKey>=2.21:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-aliased>=0.11:devel/p5-aliased \
+		p5-Clone>=0.15:devel/p5-Clone \
+		p5-Exporter-Tidy>=0.06:devel/p5-Exporter-Tidy \
+		p5-Hash-AsObject>=0.05:devel/p5-Hash-AsObject \
+		p5-Regexp-Common>=2.119:textproc/p5-Regexp-Common \
+		p5-Text-Quote>=0.03:textproc/p5-Text-Quote \
+		p5-Term-ReadKey>=2.21:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ARGV-Struct/Makefile b/devel/p5-ARGV-Struct/Makefile
index c6d6baeb009d..0d6235f3d098 100644
--- a/devel/p5-ARGV-Struct/Makefile
+++ b/devel/p5-ARGV-Struct/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+	p5-Moose>0:devel/p5-Moose
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Acme-Damn/Makefile b/devel/p5-Acme-Damn/Makefile
index f399a93d3c3e..7ef3d8edb7c7 100644
--- a/devel/p5-Acme-Damn/Makefile
+++ b/devel/p5-Acme-Damn/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Unblessing perl objects
 
-RUN_DEPENDS=	p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-Test-Exception>=0.29:devel/p5-Test-Exception
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Agent/Makefile b/devel/p5-Agent/Makefile
index 40dca303385c..f0798e3e793f 100644
--- a/devel/p5-Agent/Makefile
+++ b/devel/p5-Agent/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module that provides a foundation for software agent developers
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Class-Tom>=0:${PORTSDIR}/devel/p5-Class-Tom
+BUILD_DEPENDS=	p5-Class-Tom>=0:devel/p5-Class-Tom
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Accounting/Makefile b/devel/p5-Algorithm-Accounting/Makefile
index 633a247ecadb..45696d844605 100644
--- a/devel/p5-Algorithm-Accounting/Makefile
+++ b/devel/p5-Algorithm-Accounting/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Generate accounting statistic for general logs
 
-BUILD_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Perl6-Form>=0:${PORTSDIR}/devel/p5-Perl6-Form \
-		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw \
-		p5-Array-Compare>=0:${PORTSDIR}/misc/p5-Array-Compare \
-		p5-Array-Iterator>=0:${PORTSDIR}/devel/p5-Array-Iterator \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
-		p5-Imager-Graph>=0:${PORTSDIR}/graphics/p5-Imager-Graph \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-Perl6-Form>=0:devel/p5-Perl6-Form \
+		p5-FreezeThaw>=0:devel/p5-FreezeThaw \
+		p5-Array-Compare>=0:misc/p5-Array-Compare \
+		p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-GD-Graph>=0:graphics/p5-GD-Graph \
+		p5-Imager-Graph>=0:graphics/p5-Imager-Graph \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Annotate/Makefile b/devel/p5-Algorithm-Annotate/Makefile
index 28826e27fcae..68848c4c685e 100644
--- a/devel/p5-Algorithm-Annotate/Makefile
+++ b/devel/p5-Algorithm-Annotate/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Represent a series of changes in annotate form
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/devel/p5-Algorithm-Bucketizer/Makefile b/devel/p5-Algorithm-Bucketizer/Makefile
index 95f76124fb2e..8252ec6e739f 100644
--- a/devel/p5-Algorithm-Bucketizer/Makefile
+++ b/devel/p5-Algorithm-Bucketizer/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Distribute sized items to buckets with limited size
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Permute>=0:${PORTSDIR}/devel/p5-Algorithm-Permute \
-		p5-Sysadm-Install>=0.23:${PORTSDIR}/sysutils/p5-Sysadm-Install
+BUILD_DEPENDS=	p5-Algorithm-Permute>=0:devel/p5-Algorithm-Permute \
+		p5-Sysadm-Install>=0.23:sysutils/p5-Sysadm-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Cron/Makefile b/devel/p5-Algorithm-Cron/Makefile
index 71719e43e8d5..0d2827f03181 100644
--- a/devel/p5-Algorithm-Cron/Makefile
+++ b/devel/p5-Algorithm-Cron/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Abstract implementation of the cron(8) scheduling algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-Time-timegm>=0:${PORTSDIR}/devel/p5-Time-timegm
+BUILD_DEPENDS:=	p5-Time-timegm>=0:devel/p5-Time-timegm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Dependency-Objects/Makefile b/devel/p5-Algorithm-Dependency-Objects/Makefile
index 43afa3516f65..38fa80280ef9 100644
--- a/devel/p5-Algorithm-Dependency-Objects/Makefile
+++ b/devel/p5-Algorithm-Dependency-Objects/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Implementation of an Object Dependency Algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object
+BUILD_DEPENDS=	p5-Set-Object>=0:devel/p5-Set-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-Dependency/Makefile b/devel/p5-Algorithm-Dependency/Makefile
index c19057fdffaa..ed39559323ba 100644
--- a/devel/p5-Algorithm-Dependency/Makefile
+++ b/devel/p5-Algorithm-Dependency/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Base class for implementing various dependency trees
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0.31:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.31:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-ClassAPI>=0.6:${PORTSDIR}/devel/p5-Test-ClassAPI
+TEST_DEPENDS=	p5-Test-ClassAPI>=0.6:devel/p5-Test-ClassAPI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-Evolutionary/Makefile b/devel/p5-Algorithm-Evolutionary/Makefile
index 911db1f0a93c..43ec0668d030 100644
--- a/devel/p5-Algorithm-Evolutionary/Makefile
+++ b/devel/p5-Algorithm-Evolutionary/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Library for doing evolutionary computation in Perl
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Algorithm-Permute>=0.01:${PORTSDIR}/devel/p5-Algorithm-Permute \
-		p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Clone>=0.31:${PORTSDIR}/devel/p5-Clone \
-		p5-GD>=2.17:${PORTSDIR}/graphics/p5-GD \
-		p5-Math-Random>=0.63:${PORTSDIR}/math/p5-Math-Random \
-		p5-Object-Array>=0:${PORTSDIR}/devel/p5-Object-Array \
-		p5-Sort-Key>=0:${PORTSDIR}/devel/p5-Sort-Key \
-		p5-Statistics-Basic>=1.6:${PORTSDIR}/math/p5-Statistics-Basic \
-		p5-String-Random>=0:${PORTSDIR}/devel/p5-String-Random \
-		p5-Tree-DAG_Node>=1.04:${PORTSDIR}/devel/p5-Tree-DAG_Node \
-		p5-XML-LibXML>=1.5:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Parser-Style-EasyTree>=0:${PORTSDIR}/textproc/p5-XML-Parser-Style-EasyTree \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Algorithm-Permute>=0.01:devel/p5-Algorithm-Permute \
+		p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-Clone>=0.31:devel/p5-Clone \
+		p5-GD>=2.17:graphics/p5-GD \
+		p5-Math-Random>=0.63:math/p5-Math-Random \
+		p5-Object-Array>=0:devel/p5-Object-Array \
+		p5-Sort-Key>=0:devel/p5-Sort-Key \
+		p5-Statistics-Basic>=1.6:math/p5-Statistics-Basic \
+		p5-String-Random>=0:devel/p5-String-Random \
+		p5-Tree-DAG_Node>=1.04:devel/p5-Tree-DAG_Node \
+		p5-XML-LibXML>=1.5:textproc/p5-XML-LibXML \
+		p5-XML-Parser>=2.40:textproc/p5-XML-Parser \
+		p5-XML-Parser-Style-EasyTree>=0:textproc/p5-XML-Parser-Style-EasyTree \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-FloodControl/Makefile b/devel/p5-Algorithm-FloodControl/Makefile
index 4a515a9217ad..cafa9d55f788 100644
--- a/devel/p5-Algorithm-FloodControl/Makefile
+++ b/devel/p5-Algorithm-FloodControl/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Robot protection
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Cache-FastMmap>=0:devel/p5-Cache-FastMmap \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-IncludeExclude/Makefile b/devel/p5-Algorithm-IncludeExclude/Makefile
index f101a2f413b5..d19e93185872 100644
--- a/devel/p5-Algorithm-IncludeExclude/Makefile
+++ b/devel/p5-Algorithm-IncludeExclude/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Build and evaluate include/exclude lists
 
-BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Algorithm-Interval2Prefix/Makefile b/devel/p5-Algorithm-Interval2Prefix/Makefile
index 81d8e238341d..4caab9958c46 100644
--- a/devel/p5-Algorithm-Interval2Prefix/Makefile
+++ b/devel/p5-Algorithm-Interval2Prefix/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Generate prefixes from intervals
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Algorithm-Merge/Makefile b/devel/p5-Algorithm-Merge/Makefile
index f3f0e73ca697..eced66b3d789 100644
--- a/devel/p5-Algorithm-Merge/Makefile
+++ b/devel/p5-Algorithm-Merge/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Three-way merge and diff
 
-RUN_DEPENDS=	p5-Algorithm-Diff>=1.15:${PORTSDIR}/devel/p5-Algorithm-Diff
+RUN_DEPENDS=	p5-Algorithm-Diff>=1.15:devel/p5-Algorithm-Diff
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Alien-SDL/Makefile b/devel/p5-Alien-SDL/Makefile
index 5aa37429767a..ddcc2ff96ff9 100644
--- a/devel/p5-Alien-SDL/Makefile
+++ b/devel/p5-Alien-SDL/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Detect and get configuration setting for SDL
 LICENSE=	GPLv2
 
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Text-Patch>=1.4:${PORTSDIR}/textproc/p5-Text-Patch
-RUN_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+		p5-Text-Patch>=1.4:textproc/p5-Text-Patch
+RUN_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	modbuild
@@ -26,8 +26,8 @@ CONFIGURE_ARGS=	--with-sdl-config=${SDL_CONFIG}
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract
-RUN_DEPENDS+=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract
+BUILD_DEPENDS+=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract
+RUN_DEPENDS+=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Alzabo/Makefile b/devel/p5-Alzabo/Makefile
index 11d3fe95317b..a551cea08b51 100644
--- a/devel/p5-Alzabo/Makefile
+++ b/devel/p5-Alzabo/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Data modelling tool and RDBMS-OO mapper
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-BUILD_DEPENDS=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Class-Factory-Util>=0:${PORTSDIR}/devel/p5-Class-Factory-Util \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Class-Factory-Util>=0:devel/p5-Class-Factory-Util \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Any-Daemon/Makefile b/devel/p5-Any-Daemon/Makefile
index 0f69743c4c87..def2d400f243 100644
--- a/devel/p5-Any-Daemon/Makefile
+++ b/devel/p5-Any-Daemon/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides basic needs for a daemon
 
 LICENSE=	ART10
 
-RUN_DEPENDS:=	p5-Log-Report-Optional>=0:${PORTSDIR}/devel/p5-Log-Report-Optional \
-		p5-File-Spec-Native>=0:${PORTSDIR}/devel/p5-File-Spec-Native
+RUN_DEPENDS:=	p5-Log-Report-Optional>=0:devel/p5-Log-Report-Optional \
+		p5-File-Spec-Native>=0:devel/p5-File-Spec-Native
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Any-Moose-Convert/Makefile b/devel/p5-Any-Moose-Convert/Makefile
index 0c02c81b5f3f..1aa1cd82249b 100644
--- a/devel/p5-Any-Moose-Convert/Makefile
+++ b/devel/p5-Any-Moose-Convert/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Convert Moose libraries to Mouse ones, or vice versa
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-Util>=0:${PORTSDIR}/devel/p5-PerlIO-Util
+BUILD_DEPENDS=	p5-PerlIO-Util>=0:devel/p5-PerlIO-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
+TEST_DEPENDS=	p5-Moose>=0.90:devel/p5-Moose \
+		p5-Mouse>=0.40:devel/p5-Mouse
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Any-Moose/Makefile b/devel/p5-Any-Moose/Makefile
index cbff23cbba57..861a167330af 100644
--- a/devel/p5-Any-Moose/Makefile
+++ b/devel/p5-Any-Moose/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for/to use Moose or Mouse modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-#TEST_DEPENDS=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+#TEST_DEPENDS=	p5-Moose>0:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
@@ -27,13 +27,13 @@ MOUSE_DESC=	Use Mouse
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMOOSE}
-BUILD_DEPENDS+=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
-RUN_DEPENDS+=	p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS+=	p5-Moose>0:devel/p5-Moose
+RUN_DEPENDS+=	p5-Moose>0:devel/p5-Moose
 .endif
 
 .if ${PORT_OPTIONS:MMOUSE}
-BUILD_DEPENDS+=	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
-RUN_DEPENDS+=	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS+=	p5-Mouse>=0.40:devel/p5-Mouse
+RUN_DEPENDS+=	p5-Mouse>=0.40:devel/p5-Mouse
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-AnyEvent-AIO/Makefile b/devel/p5-AnyEvent-AIO/Makefile
index 05e960a18f67..bb5d67f76498 100644
--- a/devel/p5-AnyEvent-AIO/Makefile
+++ b/devel/p5-AnyEvent-AIO/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Asynchronous file and directory I/O with AnyEvent
 
-BUILD_DEPENDS=	p5-AnyEvent>=3.4:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-IO-AIO>=3.0:${PORTSDIR}/devel/p5-IO-AIO
+BUILD_DEPENDS=	p5-AnyEvent>=3.4:devel/p5-AnyEvent \
+		p5-IO-AIO>=3.0:devel/p5-IO-AIO
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-Connection/Makefile b/devel/p5-AnyEvent-Connection/Makefile
index 9e229e631081..bfec7a56ad10 100644
--- a/devel/p5-AnyEvent-Connection/Makefile
+++ b/devel/p5-AnyEvent-Connection/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Base class for TCP connectful clients
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Object-Event>=1.21:${PORTSDIR}/devel/p5-Object-Event \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
-RUN_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Object-Event>=1.21:${PORTSDIR}/devel/p5-Object-Event \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Object-Event>=1.21:devel/p5-Object-Event \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
+RUN_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Object-Event>=1.21:devel/p5-Object-Event \
+		p5-common-sense>=2:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-DBI-Abstract/Makefile b/devel/p5-AnyEvent-DBI-Abstract/Makefile
index da660ceb184b..25715fcb5d7c 100644
--- a/devel/p5-AnyEvent-DBI-Abstract/Makefile
+++ b/devel/p5-AnyEvent-DBI-Abstract/Makefile
@@ -14,8 +14,8 @@ COMMENT=	AnyEvent::DBI + SQL::Abstract
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent-DBI>=0:${PORTSDIR}/devel/p5-AnyEvent-DBI \
-		p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
+BUILD_DEPENDS=	p5-AnyEvent-DBI>=0:devel/p5-AnyEvent-DBI \
+		p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-DBI/Makefile b/devel/p5-AnyEvent-DBI/Makefile
index 3bd353990c63..c66fcaac1b1e 100644
--- a/devel/p5-AnyEvent-DBI/Makefile
+++ b/devel/p5-AnyEvent-DBI/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Asynchronous DBI access
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=4.15:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-DBI>=1.0:${PORTSDIR}/databases/p5-DBI \
-		p5-common-sense>=3.3:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=4.15:devel/p5-AnyEvent \
+		p5-DBI>=1.0:databases/p5-DBI \
+		p5-common-sense>=3.3:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-DBus/Makefile b/devel/p5-AnyEvent-DBus/Makefile
index 0acca0aac072..92e2ccc847a3 100644
--- a/devel/p5-AnyEvent-DBus/Makefile
+++ b/devel/p5-AnyEvent-DBus/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Seamlessly integrate Net::DBus into AnyEvent
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-DBus>=0.33:${PORTSDIR}/devel/p5-Net-DBus \
-		p5-common-sense>=3.2:${PORTSDIR}/devel/p5-common-sense
-RUN_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Net-DBus>=0.33:${PORTSDIR}/devel/p5-Net-DBus \
-		p5-common-sense>=3.2:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Net-DBus>=0.33:devel/p5-Net-DBus \
+		p5-common-sense>=3.2:devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Net-DBus>=0.33:devel/p5-Net-DBus \
+		p5-common-sense>=3.2:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-Filesys-Notify/Makefile b/devel/p5-AnyEvent-Filesys-Notify/Makefile
index b501bbed620a..e5de3f927531 100644
--- a/devel/p5-AnyEvent-Filesys-Notify/Makefile
+++ b/devel/p5-AnyEvent-Filesys-Notify/Makefile
@@ -14,18 +14,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>=1.003001:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-late>=0.014:${PORTSDIR}/devel/p5-MooX-late \
-	p5-MooX-Types-MooseLike>=0.25:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-AnyEvent>=7.05:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Path-Iterator-Rule>=1.005:${PORTSDIR}/devel/p5-Path-Iterator-Rule \
-	p5-Try-Tiny>=0.18:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-namespace-autoclean>=0.24:${PORTSDIR}/devel/p5-namespace-autoclean \
-	p5-IO-KQueue>=0.34:${PORTSDIR}/devel/p5-IO-KQueue
+	p5-Moo>=1.003001:devel/p5-Moo \
+	p5-MooX-late>=0.014:devel/p5-MooX-late \
+	p5-MooX-Types-MooseLike>=0.25:devel/p5-MooX-Types-MooseLike \
+	p5-AnyEvent>=7.05:devel/p5-AnyEvent \
+	p5-Path-Iterator-Rule>=1.005:devel/p5-Path-Iterator-Rule \
+	p5-Try-Tiny>=0.18:lang/p5-Try-Tiny \
+	p5-namespace-autoclean>=0.24:devel/p5-namespace-autoclean \
+	p5-IO-KQueue>=0.34:devel/p5-IO-KQueue
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-AnyEvent-Gearman/Makefile b/devel/p5-AnyEvent-Gearman/Makefile
index 4be69dbb6e3f..3d494e19829b 100644
--- a/devel/p5-AnyEvent-Gearman/Makefile
+++ b/devel/p5-AnyEvent-Gearman/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Asynchronous Gearman client/worker module for AnyEvent applications
 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-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Foreign>=0:${PORTSDIR}/devel/p5-MouseX-Foreign \
-		p5-Object-Container>=0:${PORTSDIR}/devel/p5-Object-Container \
-		p5-Object-Event>=0:${PORTSDIR}/devel/p5-Object-Event
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-Foreign>=0:devel/p5-MouseX-Foreign \
+		p5-Object-Container>=0:devel/p5-Object-Container \
+		p5-Object-Event>=0:devel/p5-Object-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-AnyEvent-Graphite/Makefile b/devel/p5-AnyEvent-Graphite/Makefile
index 0212f6bf5b0e..e0a70da59f57 100644
--- a/devel/p5-AnyEvent-Graphite/Makefile
+++ b/devel/p5-AnyEvent-Graphite/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Non-blocking Graphite client
 
-RUN_DEPENDS=	p5-AnyEvent>=4.15:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-SNMP>=1.0:${PORTSDIR}/net-mgmt/p5-AnyEvent-SNMP
+RUN_DEPENDS=	p5-AnyEvent>=4.15:devel/p5-AnyEvent \
+		p5-AnyEvent-SNMP>=1.0:net-mgmt/p5-AnyEvent-SNMP
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-I3/Makefile b/devel/p5-AnyEvent-I3/Makefile
index 85719ef47a8b..b85db53345ef 100644
--- a/devel/p5-AnyEvent-I3/Makefile
+++ b/devel/p5-AnyEvent-I3/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Communicate with the i3 window manager
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
-RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-JSON-XS>=0:converters/p5-JSON-XS
+RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-JSON-XS>=0:converters/p5-JSON-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AnyEvent-MessagePack/Makefile b/devel/p5-AnyEvent-MessagePack/Makefile
index 3ab213ea39f9..5cd61650fa59 100644
--- a/devel/p5-AnyEvent-MessagePack/Makefile
+++ b/devel/p5-AnyEvent-MessagePack/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of AnyEvent for MessagePack
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=7.02:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Data-MessagePack>=0.46:${PORTSDIR}/devel/p5-Data-MessagePack \
-	p5-Data-MessagePack-Stream>=0.07:${PORTSDIR}/devel/p5-Data-MessagePack-Stream
+	p5-AnyEvent>=7.02:devel/p5-AnyEvent \
+	p5-Data-MessagePack>=0.46:devel/p5-Data-MessagePack \
+	p5-Data-MessagePack-Stream>=0.07:devel/p5-Data-MessagePack-Stream
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-RPC/Makefile b/devel/p5-AnyEvent-RPC/Makefile
index d8fe5dd22f37..923012c23e37 100644
--- a/devel/p5-AnyEvent-RPC/Makefile
+++ b/devel/p5-AnyEvent-RPC/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Abstract framework for RPC clients
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-XML-Hash-LX>=0.05:${PORTSDIR}/textproc/p5-XML-Hash-LX \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-AnyEvent-HTTP>=1.43:${PORTSDIR}/www/p5-AnyEvent-HTTP \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-XML-Hash-LX>=0.05:textproc/p5-XML-Hash-LX \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		p5-AnyEvent-HTTP>=1.43:www/p5-AnyEvent-HTTP \
+		p5-libwww>=0:www/p5-libwww \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-Run/Makefile b/devel/p5-AnyEvent-Run/Makefile
index 09d12ccaad12..5c749c615c80 100644
--- a/devel/p5-AnyEvent-Run/Makefile
+++ b/devel/p5-AnyEvent-Run/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Run a process or coderef asynchronously
 
-RUN_DEPENDS=	p5-AnyEvent>=4.15:${PORTSDIR}/devel/p5-AnyEvent
+RUN_DEPENDS=	p5-AnyEvent>=4.15:devel/p5-AnyEvent
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent-Subprocess/Makefile b/devel/p5-AnyEvent-Subprocess/Makefile
index f496e3faba69..fdc1f4e25ad7 100644
--- a/devel/p5-AnyEvent-Subprocess/Makefile
+++ b/devel/p5-AnyEvent-Subprocess/Makefile
@@ -14,24 +14,24 @@ COMMENT=	Flexible, OO, asynchronous process spawning and management
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=5.2:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-EV>=4.0:${PORTSDIR}/devel/p5-EV \
-		p5-Event-Join>=0.05:${PORTSDIR}/devel/p5-Event-Join \
-		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=1.15:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types>=0.19:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Signal>=0:${PORTSDIR}/devel/p5-MooseX-Types-Signal \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-AnyEvent>=5.2:devel/p5-AnyEvent \
+		p5-EV>=4.0:devel/p5-EV \
+		p5-Event-Join>=0.05:devel/p5-Event-Join \
+		p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-Moose>=1.15:devel/p5-Moose \
+		p5-MooseX-Clone>=0:devel/p5-MooseX-Clone \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types>=0.19:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Signal>=0:devel/p5-MooseX-Types-Signal \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -39,7 +39,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/devel/p5-AnyEvent-Task/Makefile b/devel/p5-AnyEvent-Task/Makefile
index 96576bd373b7..0b84f465578c 100644
--- a/devel/p5-AnyEvent-Task/Makefile
+++ b/devel/p5-AnyEvent-Task/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Client/server-based asynchronous worker pool
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Callback-Frame>=0:${PORTSDIR}/devel/p5-Callback-Frame \
-		p5-Guard>=0:${PORTSDIR}/devel/p5-Guard \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Log-Defer>=0.300:${PORTSDIR}/devel/p5-Log-Defer \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Callback-Frame>=0:devel/p5-Callback-Frame \
+		p5-Guard>=0:devel/p5-Guard \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Log-Defer>=0.300:devel/p5-Log-Defer \
+		p5-common-sense>=0:devel/p5-common-sense
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-AnyEvent-Worker/Makefile b/devel/p5-AnyEvent-Worker/Makefile
index e1863850fa79..9261c66c4090 100644
--- a/devel/p5-AnyEvent-Worker/Makefile
+++ b/devel/p5-AnyEvent-Worker/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Manage blocking task in external process
 
-BUILD_DEPENDS=	p5-AnyEvent>=5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Test-NoWarnings>=1.03:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-TCP>=0.14:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-common-sense>=2:devel/p5-common-sense \
+		p5-Test-NoWarnings>=1.03:devel/p5-Test-NoWarnings \
+		p5-Test-TCP>=0.14:devel/p5-Test-TCP \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AnyEvent/Makefile b/devel/p5-AnyEvent/Makefile
index 11bb0a2b9f60..21842e51f9a6 100644
--- a/devel/p5-AnyEvent/Makefile
+++ b/devel/p5-AnyEvent/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provide framework for multiple event loops
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
-TEST_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Canary-Stability>=0:devel/p5-Canary-Stability
+TEST_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-AnyMQ/Makefile b/devel/p5-AnyMQ/Makefile
index 478e3f97a0f4..8aa9da49e239 100644
--- a/devel/p5-AnyMQ/Makefile
+++ b/devel/p5-AnyMQ/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Non-blocking message queue system based on 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-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-MouseX-NativeTraits>=0:${PORTSDIR}/devel/p5-MouseX-NativeTraits \
-		p5-MouseX-Traits>=0:${PORTSDIR}/devel/p5-MouseX-Traits
+BUILD_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-MouseX-NativeTraits>=0:devel/p5-MouseX-NativeTraits \
+		p5-MouseX-Traits>=0:devel/p5-MouseX-Traits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-App-Build/Makefile b/devel/p5-App-Build/Makefile
index 9afdfa9d4188..b48f7e3c8fd8 100644
--- a/devel/p5-App-Build/Makefile
+++ b/devel/p5-App-Build/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	Alex.Bakhtin@gmail.com
 COMMENT=	Build and install Perl applications
 
-RUN_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options \
-		p5-Module-Build>=0.28:${PORTSDIR}/devel/p5-Module-Build
-BUILD_DEPENDS=	p5-Test-Differences>=0.47:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options \
-		p5-Module-Build>=0.28:${PORTSDIR}/devel/p5-Module-Build
+RUN_DEPENDS=	p5-App-Options>=0:devel/p5-App-Options \
+		p5-Module-Build>=0.28:devel/p5-Module-Build
+BUILD_DEPENDS=	p5-Test-Differences>=0.47:devel/p5-Test-Differences \
+		p5-App-Options>=0:devel/p5-App-Options \
+		p5-Module-Build>=0.28:devel/p5-Module-Build
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-App-CLI-Extension/Makefile b/devel/p5-App-CLI-Extension/Makefile
index fde3622bc158..bad816d4eaaa 100644
--- a/devel/p5-App-CLI-Extension/Makefile
+++ b/devel/p5-App-CLI-Extension/Makefile
@@ -13,11 +13,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension for App::CLI extension module
 
-BUILD_DEPENDS=	p5-App-CLI>=0.313:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Class-Accessor-Grouped>=0.10000:${PORTSDIR}/devel/p5-Class-Accessor-Grouped \
-		p5-Error>=0.17000:${PORTSDIR}/lang/p5-Error \
-		p5-MRO-Compat>=0.11:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-UNIVERSAL-require>=0.13:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-App-CLI>=0.313:devel/p5-App-CLI \
+		p5-Class-Accessor-Grouped>=0.10000:devel/p5-Class-Accessor-Grouped \
+		p5-Error>=0.17000:lang/p5-Error \
+		p5-MRO-Compat>=0.11:devel/p5-MRO-Compat \
+		p5-UNIVERSAL-require>=0.13:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-Cache/Makefile b/devel/p5-App-Cache/Makefile
index 5d64a27a2aad..4e871b9e38fa 100644
--- a/devel/p5-App-Cache/Makefile
+++ b/devel/p5-App-Cache/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy application-level caching
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-Cmd/Makefile b/devel/p5-App-Cmd/Makefile
index d07a91adbaac..d756f5597749 100644
--- a/devel/p5-App-Cmd/Makefile
+++ b/devel/p5-App-Cmd/Makefile
@@ -13,20 +13,20 @@ COMMENT=	App::Cmd - Write command line apps with less suffering
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0.13:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Getopt-Long-Descriptive>=0.084:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-IO-TieCombine>=0:${PORTSDIR}/devel/p5-IO-TieCombine \
-		p5-String-RewritePrefix>=0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS=	p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
+		p5-Class-Load>=0.06:devel/p5-Class-Load \
+		p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
+		p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
+		p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-ExtUtils-MakeMaker>=6.4:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Data-Dumper>=0:devel/p5-Data-Dumper \
+		p5-PathTools>=0:devel/p5-PathTools \
+		p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
+		p5-ExtUtils-MakeMaker>=6.4:devel/p5-ExtUtils-MakeMaker
 
 USES=		perl5
 USE_PERL5=	configure
@@ -35,8 +35,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-Getopt-Long>=2.39:${PORTSDIR}/devel/p5-Getopt-Long
-RUN_DEPENDS+=	p5-Getopt-Long>=2.39:${PORTSDIR}/devel/p5-Getopt-Long
+BUILD_DEPENDS+=	p5-Getopt-Long>=2.39:devel/p5-Getopt-Long
+RUN_DEPENDS+=	p5-Getopt-Long>=2.39:devel/p5-Getopt-Long
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-App-GitGot/Makefile b/devel/p5-App-GitGot/Makefile
index 001f18ddf238..8dabd0862ee6 100644
--- a/devel/p5-App-GitGot/Makefile
+++ b/devel/p5-App-GitGot/Makefile
@@ -15,30 +15,30 @@ COMMENT=	Tool to make it easier to manage multiple git repositories
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Config-INI>=0:${PORTSDIR}/devel/p5-Config-INI \
-		p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Git-Wrapper>=0.042:${PORTSDIR}/devel/p5-Git-Wrapper \
-		p5-IO-Prompt-Simple>=0:${PORTSDIR}/devel/p5-IO-Prompt-Simple \
-		p5-List-AllUtils>=0.09:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Moo>=2:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-HandlesVia>=0.001008:${PORTSDIR}/devel/p5-MooX-HandlesVia \
-		p5-Net-GitHub>=0:${PORTSDIR}/net/p5-Net-GitHub \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-PerlX-Maybe>=0:${PORTSDIR}/devel/p5-PerlX-Maybe \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Config-INI>=0:devel/p5-Config-INI \
+		p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Git-Wrapper>=0.042:devel/p5-Git-Wrapper \
+		p5-IO-Prompt-Simple>=0:devel/p5-IO-Prompt-Simple \
+		p5-List-AllUtils>=0.09:devel/p5-List-AllUtils \
+		p5-Moo>=2:devel/p5-Moo \
+		p5-MooX-HandlesVia>=0.001008:devel/p5-MooX-HandlesVia \
+		p5-Net-GitHub>=0:net/p5-Net-GitHub \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-PerlX-Maybe>=0:devel/p5-PerlX-Maybe \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-File>=0:${PORTSDIR}/devel/p5-Test-File
+TEST_DEPENDS=	p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-File>=0:devel/p5-Test-File
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-App-GitHub/Makefile b/devel/p5-App-GitHub/Makefile
index f90903a3765e..dbea9ff0375c 100644
--- a/devel/p5-App-GitHub/Makefile
+++ b/devel/p5-App-GitHub/Makefile
@@ -14,9 +14,9 @@ COMMENT=	GitHub Command Tools
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=2.3:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Net-GitHub>=0.12:${PORTSDIR}/net/p5-Net-GitHub
+BUILD_DEPENDS=	p5-JSON-XS>=2.3:converters/p5-JSON-XS \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Net-GitHub>=0.12:net/p5-Net-GitHub
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-SD/Makefile b/devel/p5-App-SD/Makefile
index ed9a77bf869d..200b6e134772 100644
--- a/devel/p5-App-SD/Makefile
+++ b/devel/p5-App-SD/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Peer-to-peer replicated distributed issue tracker
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-DateTime>=:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Prophet>=0:${PORTSDIR}/databases/p5-Prophet \
-		p5-Test-Script-Run>=0.02:${PORTSDIR}/devel/p5-Test-Script-Run
+BUILD_DEPENDS=	p5-DateTime>=:devel/p5-DateTime \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Prophet>=0:databases/p5-Prophet \
+		p5-Test-Script-Run>=0.02:devel/p5-Test-Script-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -31,21 +31,21 @@ HIVEMINDER_DESC=	Enable huveminder sync
 TRAC_DESC=		Enable trac sync
 RT_DESC=		Enable rt sync
 
-GITHUB_BUILD_DEPENDS=	p5-Net-GitHub>=0.18:${PORTSDIR}/net/p5-Net-GitHub
-GITHUB_RUN_DEPENDS=	p5-Net-GitHub>=0.18:${PORTSDIR}/net/p5-Net-GitHub
+GITHUB_BUILD_DEPENDS=	p5-Net-GitHub>=0.18:net/p5-Net-GitHub
+GITHUB_RUN_DEPENDS=	p5-Net-GitHub>=0.18:net/p5-Net-GitHub
 
-GOOGLECODE_BUILD_DEPENDS=	p5-Net-Google-Code>=0.14:${PORTSDIR}/net/p5-Net-Google-Code
-GOOGLECODE_RUN_DEPENDS=		p5-Net-Google-Code>=0.14:${PORTSDIR}/net/p5-Net-Google-Code
+GOOGLECODE_BUILD_DEPENDS=	p5-Net-Google-Code>=0.14:net/p5-Net-Google-Code
+GOOGLECODE_RUN_DEPENDS=		p5-Net-Google-Code>=0.14:net/p5-Net-Google-Code
 
-HIVEMINDER_BUILD_DEPENDS=	p5-Net-Jifty>=0.09:${PORTSDIR}/net/p5-Net-Jifty \
-				p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-				p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME
+HIVEMINDER_BUILD_DEPENDS=	p5-Net-Jifty>=0.09:net/p5-Net-Jifty \
+				p5-Email-Address>=0:mail/p5-Email-Address \
+				p5-Email-MIME>=0:mail/p5-Email-MIME
 HIVEMINDER_RUN_DEPENDS=		${HIVEMINDER_BUILD_DEPENDS}
 
-TRAC_BUILD_DEPENDS=	p5-Net-Trac>=0.13:${PORTSDIR}/www/p5-Net-Trac
-TRAC_RUN_DEPENDS=	p5-Net-Trac>=0.13:${PORTSDIR}/www/p5-Net-Trac
+TRAC_BUILD_DEPENDS=	p5-Net-Trac>=0.13:www/p5-Net-Trac
+TRAC_RUN_DEPENDS=	p5-Net-Trac>=0.13:www/p5-Net-Trac
 
-RT_BUILD_DEPENDS=	p5-RT-Client-REST>=0:${PORTSDIR}/www/p5-RT-Client-REST
-RT_RUN_DEPENDS=		p5-RT-Client-REST>=0:${PORTSDIR}/www/p5-RT-Client-REST
+RT_BUILD_DEPENDS=	p5-RT-Client-REST>=0:www/p5-RT-Client-REST
+RT_RUN_DEPENDS=		p5-RT-Client-REST>=0:www/p5-RT-Client-REST
 
 .include <bsd.port.mk>
diff --git a/devel/p5-App-SVN-Bisect/Makefile b/devel/p5-App-SVN-Bisect/Makefile
index 62fc2ad22564..fba5408e5ce7 100644
--- a/devel/p5-App-SVN-Bisect/Makefile
+++ b/devel/p5-App-SVN-Bisect/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Binary search through svn revisions
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-IO-All>0:${PORTSDIR}/devel/p5-IO-All \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS=	p5-IO-All>0:devel/p5-IO-All \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck \
+		${LOCALBASE}/bin/svn:devel/subversion
 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
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-App-Trace/Makefile b/devel/p5-App-Trace/Makefile
index e6800b3dcdc6..1538873520e0 100644
--- a/devel/p5-App-Trace/Makefile
+++ b/devel/p5-App-Trace/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Embedded debug statements, including call/return tracing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Options>=0:${PORTSDIR}/devel/p5-App-Options
+BUILD_DEPENDS=	p5-App-Options>=0:devel/p5-App-Options
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-App-cpanoutdated/Makefile b/devel/p5-App-cpanoutdated/Makefile
index 79888a0f24af..5b9c19b31897 100644
--- a/devel/p5-App-cpanoutdated/Makefile
+++ b/devel/p5-App-cpanoutdated/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Detect outdated CPAN modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0.10:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-local-lib>=0:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0.10:devel/p5-CPAN-DistnameInfo \
+		p5-libwww>=0:www/p5-libwww \
+		p5-local-lib>=0:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-App-local-lib-helper/Makefile b/devel/p5-App-local-lib-helper/Makefile
index 6f9182cceb0f..d507cb8f8b1b 100644
--- a/devel/p5-App-local-lib-helper/Makefile
+++ b/devel/p5-App-local-lib-helper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Make it easy to run code against a local-lib
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-local-lib>=2.000004:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS:=	p5-local-lib>=2.000004:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-App-perlbrew/Makefile b/devel/p5-App-perlbrew/Makefile
index 17222a6cc121..e318644a5ced 100644
--- a/devel/p5-App-perlbrew/Makefile
+++ b/devel/p5-App-perlbrew/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Perl Environment manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-CPAN-Perl-Releases>=1.94:${PORTSDIR}/devel/p5-CPAN-Perl-Releases \
-		p5-Capture-Tiny>=0.25:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Devel-PatchPerl>=1.28:${PORTSDIR}/devel/p5-Devel-PatchPerl \
-		p5-Pod-Usage>=1.64:${PORTSDIR}/devel/p5-Pod-Usage \
-		p5-local-lib>=2.000014:${PORTSDIR}/devel/p5-local-lib
+BUILD_DEPENDS=	p5-CPAN-Perl-Releases>=1.94:devel/p5-CPAN-Perl-Releases \
+		p5-Capture-Tiny>=0.25:devel/p5-Capture-Tiny \
+		p5-Devel-PatchPerl>=1.28:devel/p5-Devel-PatchPerl \
+		p5-Pod-Usage>=1.64:devel/p5-Pod-Usage \
+		p5-local-lib>=2.000014:devel/p5-local-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-All>=0.51:${PORTSDIR}/devel/p5-IO-All \
-		p5-Path-Class>=0.33:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Exception>=0.32:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoWarnings>=1.04:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Output>=1.03:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Spec>=0.47:${PORTSDIR}/devel/p5-Test-Spec
+TEST_DEPENDS=	p5-IO-All>=0.51:devel/p5-IO-All \
+		p5-Path-Class>=0.33:devel/p5-Path-Class \
+		p5-Test-Exception>=0.32:devel/p5-Test-Exception \
+		p5-Test-NoWarnings>=1.04:devel/p5-Test-NoWarnings \
+		p5-Test-Output>=1.03:devel/p5-Test-Output \
+		p5-Test-Spec>=0.47:devel/p5-Test-Spec
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -34,11 +34,11 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Pod-Parser>=1.62:${PORTSDIR}/textproc/p5-Pod-Parser
-RUN_DEPENDS+=	p5-Pod-Parser>=1.62:${PORTSDIR}/textproc/p5-Pod-Parser
-TEST_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-File-Temp>=0.23.04:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Pod-Parser>=1.62:textproc/p5-Pod-Parser
+RUN_DEPENDS+=	p5-Pod-Parser>=1.62:textproc/p5-Pod-Parser
+TEST_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker \
+		p5-File-Temp>=0.23.04:devel/p5-File-Temp \
+		p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-App-scan_prereqs_cpanfile/Makefile b/devel/p5-App-scan_prereqs_cpanfile/Makefile
index 3f2af735935c..5b1aaf70f18f 100644
--- a/devel/p5-App-scan_prereqs_cpanfile/Makefile
+++ b/devel/p5-App-scan_prereqs_cpanfile/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Module-CPANfile>=0.9020:${PORTSDIR}/devel/p5-Module-CPANfile \
-	p5-Perl-PrereqScanner-Lite>=0.21:${PORTSDIR}/devel/p5-Perl-PrereqScanner-Lite
+	p5-Module-CPANfile>=0.9020:devel/p5-Module-CPANfile \
+	p5-Perl-PrereqScanner-Lite>=0.21:devel/p5-Perl-PrereqScanner-Lite
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-AppConfig-Std/Makefile b/devel/p5-AppConfig-Std/Makefile
index c1ddf1ef45cb..ec2af3e4cf06 100644
--- a/devel/p5-AppConfig-Std/Makefile
+++ b/devel/p5-AppConfig-Std/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Subclass of AppConfig that provides standard options
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-AppConfig>=1.52:${PORTSDIR}/devel/p5-AppConfig
+RUN_DEPENDS=	p5-AppConfig>=1.52:devel/p5-AppConfig
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Array-Iterator/Makefile b/devel/p5-Array-Iterator/Makefile
index 84433f1a11e9..4c5a217f9d45 100644
--- a/devel/p5-Array-Iterator/Makefile
+++ b/devel/p5-Array-Iterator/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Set of array iterators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Array-Window/Makefile b/devel/p5-Array-Window/Makefile
index 856ace7af313..d0a405df00c1 100644
--- a/devel/p5-Array-Window/Makefile
+++ b/devel/p5-Array-Window/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Calculate windows/subsets/pages of arrays
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0.12:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.12:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Async-Interrupt/Makefile b/devel/p5-Async-Interrupt/Makefile
index 67c9b23175fb..3c2751334924 100644
--- a/devel/p5-Async-Interrupt/Makefile
+++ b/devel/p5-Async-Interrupt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allow C/XS libraries to interrupt perl asynchronously
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Async-MergePoint/Makefile b/devel/p5-Async-MergePoint/Makefile
index 18adfca96a43..ad0dd042da60 100644
--- a/devel/p5-Async-MergePoint/Makefile
+++ b/devel/p5-Async-MergePoint/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	johan@stromnet.se
 COMMENT=	Perl modules that resynchronise diverged control flow
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 8a7bf53022c0..b6ce46dc924d 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perform exit processing for a program or object
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Attribute-Persistent/Makefile b/devel/p5-Attribute-Persistent/Makefile
index 16a8be799adc..c6dcc1d0d8e0 100644
--- a/devel/p5-Attribute-Persistent/Makefile
+++ b/devel/p5-Attribute-Persistent/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Attribute::Persistent - Really lazy persistence
 
-BUILD_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
-RUN_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:${PORTSDIR}/devel/p5-Attribute-Handlers-Prospective
+BUILD_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:devel/p5-Attribute-Handlers-Prospective \
+		p5-MLDBM>=0:databases/p5-MLDBM
+RUN_DEPENDS=	p5-Attribute-Handlers-Prospective>=0:devel/p5-Attribute-Handlers-Prospective
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-C/Makefile b/devel/p5-B-C/Makefile
index 91d7f660a42b..4a3a19465ac4 100644
--- a/devel/p5-B-C/Makefile
+++ b/devel/p5-B-C/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl compiler's C backend
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Flags>=0:${PORTSDIR}/devel/p5-B-Flags \
-		p5-Opcodes>=0:${PORTSDIR}/devel/p5-Opcodes \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-B-Flags>=0:devel/p5-B-Flags \
+		p5-Opcodes>=0:devel/p5-Opcodes \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Compiling/Makefile b/devel/p5-B-Compiling/Makefile
index 107be3478870..a04c64daf62f 100644
--- a/devel/p5-B-Compiling/Makefile
+++ b/devel/p5-B-Compiling/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Deobfuscate/Makefile b/devel/p5-B-Deobfuscate/Makefile
index 6c4fed13fbde..af031e29d93e 100644
--- a/devel/p5-B-Deobfuscate/Makefile
+++ b/devel/p5-B-Deobfuscate/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to B::Deparse for use in de-obfuscating source code
 
-RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-B-Keywords>=0:${PORTSDIR}/devel/p5-B-Keywords
+RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-B-Keywords>=0:devel/p5-B-Keywords
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Hooks-EndOfScope/Makefile b/devel/p5-B-Hooks-EndOfScope/Makefile
index b878910691af..ead30f3dbefd 100644
--- a/devel/p5-B-Hooks-EndOfScope/Makefile
+++ b/devel/p5-B-Hooks-EndOfScope/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Execute code after a scope finished compilation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Implementation>=0.05:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Sub-Exporter-Progressive>=0.001006:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
-		p5-Variable-Magic>=0.48:${PORTSDIR}/devel/p5-Variable-Magic
+BUILD_DEPENDS=	p5-Module-Implementation>=0.05:devel/p5-Module-Implementation \
+		p5-Sub-Exporter-Progressive>=0.001006:devel/p5-Sub-Exporter-Progressive \
+		p5-Variable-Magic>=0.48:devel/p5-Variable-Magic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-B-Hooks-OP-Annotation/Makefile b/devel/p5-B-Hooks-OP-Annotation/Makefile
index 61ca8a456d57..4ca251d3cbb2 100644
--- a/devel/p5-B-Hooks-OP-Annotation/Makefile
+++ b/devel/p5-B-Hooks-OP-Annotation/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Annotate and delegate hooked OPs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
index aa00b972766a..a5a500d07565 100644
--- a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
+++ b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
@@ -11,12 +11,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to invoke callback on construction of entersub OPs
 
 RUN_DEPENDS=	\
-	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-	p5-B-Utils>0:${PORTSDIR}/devel/p5-B-Utils
+	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+	p5-B-Utils>0:devel/p5-B-Utils
 BUILD_DEPENDS=	\
-	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-	p5-B-Utils>0:${PORTSDIR}/devel/p5-B-Utils \
-	p5-ExtUtils-Depends>0:${PORTSDIR}/devel/p5-ExtUtils-Depends
+	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+	p5-B-Utils>0:devel/p5-B-Utils \
+	p5-ExtUtils-Depends>0:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-Hooks-OP-Check/Makefile b/devel/p5-B-Hooks-OP-Check/Makefile
index 0dcdf4d34c0b..977e76e66f24 100644
--- a/devel/p5-B-Hooks-OP-Check/Makefile
+++ b/devel/p5-B-Hooks-OP-Check/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Wrap OP check callbacks
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-B-Hooks-OP-PPAddr/Makefile b/devel/p5-B-Hooks-OP-PPAddr/Makefile
index c924ce6315a0..468b783f0117 100644
--- a/devel/p5-B-Hooks-OP-PPAddr/Makefile
+++ b/devel/p5-B-Hooks-OP-PPAddr/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Hook into opcode execution
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-Hooks-Parser/Makefile b/devel/p5-B-Hooks-Parser/Makefile
index 25a062457124..843d4fec6357 100644
--- a/devel/p5-B-Hooks-Parser/Makefile
+++ b/devel/p5-B-Hooks-Parser/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to perls parser variables
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
-RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check
-TEST_DEPENDS=	p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check \
+		p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
+RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check
+TEST_DEPENDS=	p5-B-Hooks-EndOfScope>=0.05:devel/p5-B-Hooks-EndOfScope \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile
index 542998636ef0..b97f71638ca4 100644
--- a/devel/p5-B-OPCheck/Makefile
+++ b/devel/p5-B-OPCheck/Makefile
@@ -13,10 +13,10 @@ COMMENT=	PL_check hacks using Perl callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Utils>=0.08:${PORTSDIR}/devel/p5-B-Utils \
-		p5-Scope-Guard>=0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-B-Utils>=0.08:devel/p5-B-Utils \
+		p5-Scope-Guard>=0:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS+=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-B-Utils/Makefile b/devel/p5-B-Utils/Makefile
index 64274e464ab1..5a5752384a98 100644
--- a/devel/p5-B-Utils/Makefile
+++ b/devel/p5-B-Utils/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Helper functions for op tree manipulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.301:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.301:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-BZ-Client/Makefile b/devel/p5-BZ-Client/Makefile
index be9cfab0c9cd..5d8b0229a420 100644
--- a/devel/p5-BZ-Client/Makefile
+++ b/devel/p5-BZ-Client/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Client for the Bugzilla web services API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
+TEST_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Benchmark-Timer/Makefile b/devel/p5-Benchmark-Timer/Makefile
index 6c3d4031bc2c..85329b6e6833 100644
--- a/devel/p5-Benchmark-Timer/Makefile
+++ b/devel/p5-Benchmark-Timer/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Code benchmarking tool
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Module-Install>0:devel/p5-Module-Install \
+		p5-URI>=0:net/p5-URI
 
 OPTIONS_DEFINE=	SAMPLE
 OPTIONS_DEFAULT=	SAMPLE
 SAMPLE_DESC=	Statistical Sampling Support
-SAMPLE_BUILD_DEPENDS=	p5-Statistics-TTest>1:${PORTSDIR}/math/p5-Statistics-TTest
+SAMPLE_BUILD_DEPENDS=	p5-Statistics-TTest>1:math/p5-Statistics-TTest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Best/Makefile b/devel/p5-Best/Makefile
index 9a59bc6ef829..2d48e0fd1281 100644
--- a/devel/p5-Best/Makefile
+++ b/devel/p5-Best/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Fallbackable module loader
 
-BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Bread-Board-Declare/Makefile b/devel/p5-Bread-Board-Declare/Makefile
index 00e84cb4db87..cae34bd00971 100644
--- a/devel/p5-Bread-Board-Declare/Makefile
+++ b/devel/p5-Bread-Board-Declare/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Create Bread::Board containers as normal Moose objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bread-Board>=0.22:${PORTSDIR}/devel/p5-Bread-Board \
-		p5-Class-Load>=0.07:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=2.0200:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Bread-Board>=0.22:devel/p5-Bread-Board \
+		p5-Class-Load>=0.07:devel/p5-Class-Load \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Moose>=2.0200:devel/p5-Moose
 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
 USE_PERL5=	configure
diff --git a/devel/p5-Bread-Board/Makefile b/devel/p5-Bread-Board/Makefile
index 9cc049963a42..49a08caf93eb 100644
--- a/devel/p5-Bread-Board/Makefile
+++ b/devel/p5-Bread-Board/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Solderless way to wire up your application components
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=2.1200:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-MooseX-Params-Validate>=0.14:${PORTSDIR}/devel/p5-MooseX-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=2.1200:devel/p5-Moose \
+		p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone \
+		p5-MooseX-Params-Validate>=0.14:devel/p5-MooseX-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Form-Sensible>=0:${PORTSDIR}/devel/p5-Form-Sensible \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Form-Sensible>=0:devel/p5-Form-Sensible \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index 8a4c99a22a4f..08e43bcabe76 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to scan C language files for easily recognized constructs
 
-BUILD_DEPENDS=	p5-Data-Flow>=0:${PORTSDIR}/devel/p5-Data-Flow
+BUILD_DEPENDS=	p5-Data-Flow>=0:devel/p5-Data-Flow
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CBOR-XS/Makefile b/devel/p5-CBOR-XS/Makefile
index 489bca7ac64c..d306a3fa6a06 100644
--- a/devel/p5-CBOR-XS/Makefile
+++ b/devel/p5-CBOR-XS/Makefile
@@ -17,8 +17,8 @@ LICENSE=	GPLv3
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS=	p5-Types-Serialiser>=0:${PORTSDIR}/devel/p5-Types-Serialiser \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
+		p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 post-stage:
diff --git a/devel/p5-CHI-Driver-DBI/Makefile b/devel/p5-CHI-Driver-DBI/Makefile
index 915f94e43f65..77b2f8e79358 100644
--- a/devel/p5-CHI-Driver-DBI/Makefile
+++ b/devel/p5-CHI-Driver-DBI/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jeremybbaggs@gmail.com
 COMMENT=	Use DBI for CHI unified cache interface storage
 
-BUILD_DEPENDS=	p5-CHI>=0.241:${PORTSDIR}/devel/p5-CHI \
-		p5-DBI>=1.26:${PORTSDIR}/databases/p5-DBI \
-		p5-Moose>=0.66:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-CHI>=0.241:devel/p5-CHI \
+		p5-DBI>=1.26:databases/p5-DBI \
+		p5-Moose>=0.66:devel/p5-Moose \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CHI/Makefile b/devel/p5-CHI/Makefile
index 08177f5850ef..21442c3cf2fd 100644
--- a/devel/p5-CHI/Makefile
+++ b/devel/p5-CHI/Makefile
@@ -14,26 +14,26 @@ COMMENT=	Perl extension for unified cache interface
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
-	p5-Carp-Assert>=0.20:${PORTSDIR}/devel/p5-Carp-Assert \
-	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
-	p5-Digest-JHash>0:${PORTSDIR}/security/p5-Digest-JHash \
-	p5-Hash-MoreUtils>0:${PORTSDIR}/devel/p5-Hash-MoreUtils \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-List-MoreUtils>=0.13:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Log-Any>=0.08:${PORTSDIR}/devel/p5-Log-Any \
-	p5-Moo>=1.003:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Types-MooseLike>=0.23:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-MooX-Types-MooseLike-Numeric>0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike-Numeric \
-	p5-String-RewritePrefix>0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-	p5-Task-Weaken>0:${PORTSDIR}/devel/p5-Task-Weaken \
-	p5-Time-Duration>=1.06:${PORTSDIR}/devel/p5-Time-Duration \
-	p5-Time-Duration-Parse>=0.03:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-	p5-Try-Tiny>=0.05:${PORTSDIR}/lang/p5-Try-Tiny
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+	p5-Carp-Assert>=0.20:devel/p5-Carp-Assert \
+	p5-Data-UUID>0:devel/p5-Data-UUID \
+	p5-Digest-JHash>0:security/p5-Digest-JHash \
+	p5-Hash-MoreUtils>0:devel/p5-Hash-MoreUtils \
+	p5-JSON>0:converters/p5-JSON \
+	p5-List-MoreUtils>=0.13:lang/p5-List-MoreUtils \
+	p5-Log-Any>=0.08:devel/p5-Log-Any \
+	p5-Moo>=1.003:devel/p5-Moo \
+	p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike \
+	p5-MooX-Types-MooseLike-Numeric>0:devel/p5-MooX-Types-MooseLike-Numeric \
+	p5-String-RewritePrefix>0:textproc/p5-String-RewritePrefix \
+	p5-Task-Weaken>0:devel/p5-Task-Weaken \
+	p5-Time-Duration>=1.06:devel/p5-Time-Duration \
+	p5-Time-Duration-Parse>=0.03:devel/p5-Time-Duration-Parse \
+	p5-Try-Tiny>=0.05:lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Changes/Makefile b/devel/p5-CPAN-Changes/Makefile
index 451daa2d2b45..e944d225b419 100644
--- a/devel/p5-CPAN-Changes/Makefile
+++ b/devel/p5-CPAN-Changes/Makefile
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-version>=0.99.06:${PORTSDIR}/devel/p5-version
-RUN_DEPENDS+=	p5-version>=0.99.06:${PORTSDIR}/devel/p5-version
+BUILD_DEPENDS+=	p5-version>=0.99.06:devel/p5-version
+RUN_DEPENDS+=	p5-version>=0.99.06:devel/p5-version
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile
index 1df938baaa1c..cc2fbd624893 100644
--- a/devel/p5-CPAN-Checksums/Makefile
+++ b/devel/p5-CPAN-Checksums/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to write a CHECKSUMS file for a directory as on CPAN
 
-BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Module-Signature>=0:${PORTSDIR}/security/p5-Module-Signature
-RUN_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Module-Signature>=0:${PORTSDIR}/security/p5-Module-Signature
-TEST_DEPENDS=	p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
+BUILD_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Module-Signature>=0:security/p5-Module-Signature
+RUN_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Module-Signature>=0:security/p5-Module-Signature
+TEST_DEPENDS=	p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Inject/Makefile b/devel/p5-CPAN-Inject/Makefile
index 323662a300db..373c09e6255c 100644
--- a/devel/p5-CPAN-Inject/Makefile
+++ b/devel/p5-CPAN-Inject/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Base class for injecting distributions into CPAN sources
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-chmod>=0.30:${PORTSDIR}/devel/p5-File-chmod \
-		p5-Params-Util>=0.21:${PORTSDIR}/devel/p5-Params-Util \
-		p5-CPAN-Checksums>=1.05:${PORTSDIR}/devel/p5-CPAN-Checksums
+BUILD_DEPENDS=	p5-File-chmod>=0.30:devel/p5-File-chmod \
+		p5-Params-Util>=0.21:devel/p5-Params-Util \
+		p5-CPAN-Checksums>=1.05:devel/p5-CPAN-Checksums
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Script-Run>=1.02:${PORTSDIR}/devel/p5-Test-Script-Run \
-		p5-File-Remove>=0.34:${PORTSDIR}/devel/p5-File-Remove \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-Test-Script>=1.02:${PORTSDIR}/devel/p5-Test-Script
+TEST_DEPENDS=	p5-Test-Script-Run>=1.02:devel/p5-Test-Script-Run \
+		p5-File-Remove>=0.34:devel/p5-File-Remove \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-Test-Script>=1.02:devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Meta-Check/Makefile b/devel/p5-CPAN-Meta-Check/Makefile
index 82631f19b074..8d90f7368876 100644
--- a/devel/p5-CPAN-Meta-Check/Makefile
+++ b/devel/p5-CPAN-Meta-Check/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Verify requirements in a CPAN::Meta object
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Metadata>=1.000023:${PORTSDIR}/devel/p5-Module-Metadata
+BUILD_DEPENDS=	p5-Module-Metadata>=1.000023:devel/p5-Module-Metadata
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,13 +23,13 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
-RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
+BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements
+RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements
 .endif
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.132830:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.132830:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.132830:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.132830:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Meta-Requirements/Makefile b/devel/p5-CPAN-Meta-Requirements/Makefile
index 1f1911414e53..032894ee031c 100644
--- a/devel/p5-CPAN-Meta-Requirements/Makefile
+++ b/devel/p5-CPAN-Meta-Requirements/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-TEST_DEPENDS+=	p5-CPAN-Meta>=2.120900:${PORTSDIR}/devel/p5-CPAN-Meta
+TEST_DEPENDS+=	p5-CPAN-Meta>=2.120900:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Meta/Makefile b/devel/p5-CPAN-Meta/Makefile
index 76281f178269..eb9a96cd1040 100644
--- a/devel/p5-CPAN-Meta/Makefile
+++ b/devel/p5-CPAN-Meta/Makefile
@@ -20,15 +20,15 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
-RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
+BUILD_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+		p5-CPAN-Meta-YAML>=0.008:devel/p5-CPAN-Meta-YAML
+RUN_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+		p5-CPAN-Meta-YAML>=0.008:devel/p5-CPAN-Meta-YAML
 .endif
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:${PORTSDIR}/devel/p5-Parse-CPAN-Meta
-RUN_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:${PORTSDIR}/devel/p5-Parse-CPAN-Meta
+BUILD_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:devel/p5-Parse-CPAN-Meta
+RUN_DEPENDS+=	p5-Parse-CPAN-Meta>=1.44.14:devel/p5-Parse-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-CPAN-Mini/Makefile b/devel/p5-CPAN-Mini/Makefile
index a6f40cc3860a..3db3bb94592b 100644
--- a/devel/p5-CPAN-Mini/Makefile
+++ b/devel/p5-CPAN-Mini/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	CPAN::Mini - create a minimal mirror of CPAN
 
-RUN_DEPENDS=	p5-File-HomeDir>=0.57:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-File-HomeDir>=0.57:devel/p5-File-HomeDir \
+		p5-libwww>=5:www/p5-libwww \
+		p5-URI>=1:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Recent-Uploads/Makefile b/devel/p5-CPAN-Recent-Uploads/Makefile
index 4dad56ee1aad..9b7d6e2c9530 100644
--- a/devel/p5-CPAN-Recent-Uploads/Makefile
+++ b/devel/p5-CPAN-Recent-Uploads/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Find the distributions recently uploaded to CPAN
 
-RUN_DEPENDS=	p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.56:${PORTSDIR}/net/p5-URI \
-		p5-YAML-Syck>=1.15:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-libwww>=5.835:www/p5-libwww \
+		p5-URI>=1.56:net/p5-URI \
+		p5-YAML-Syck>=1.15:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Reporter-Smoker/Makefile b/devel/p5-CPAN-Reporter-Smoker/Makefile
index 4456c2effd60..d4c61256423e 100644
--- a/devel/p5-CPAN-Reporter-Smoker/Makefile
+++ b/devel/p5-CPAN-Reporter-Smoker/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Turnkey CPAN Testers smoking
 
-BUILD_DEPENDS=	p5-CPAN-Reporter>0:${PORTSDIR}/devel/p5-CPAN-Reporter \
-		p5-Probe-Perl>0:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-Test-Reporter>0:${PORTSDIR}/devel/p5-Test-Reporter \
-		p5-Term-Title>0:${PORTSDIR}/devel/p5-Term-Title
+BUILD_DEPENDS=	p5-CPAN-Reporter>0:devel/p5-CPAN-Reporter \
+		p5-Probe-Perl>0:sysutils/p5-Probe-Perl \
+		p5-Test-Reporter>0:devel/p5-Test-Reporter \
+		p5-Term-Title>0:devel/p5-Term-Title
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Reporter/Makefile b/devel/p5-CPAN-Reporter/Makefile
index 689a0dc56460..9be5c5b818fa 100644
--- a/devel/p5-CPAN-Reporter/Makefile
+++ b/devel/p5-CPAN-Reporter/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Adds CPAN Testers reporting to CPAN.pm
 
-BUILD_DEPENDS=	p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Config-Tiny>0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Devel-Autoflush>0:${PORTSDIR}/devel/p5-Devel-Autoflush \
-		p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-IPC-Cmd>=0.76:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-Probe-Perl>0:${PORTSDIR}/sysutils/p5-Probe-Perl \
-		p5-Test-Reporter>1.54:${PORTSDIR}/devel/p5-Test-Reporter
+BUILD_DEPENDS=	p5-Capture-Tiny>0:devel/p5-Capture-Tiny \
+		p5-Config-Tiny>0:devel/p5-Config-Tiny \
+		p5-Devel-Autoflush>0:devel/p5-Devel-Autoflush \
+		p5-File-HomeDir>0:devel/p5-File-HomeDir \
+		p5-IPC-Cmd>=0.76:devel/p5-IPC-Cmd \
+		p5-Probe-Perl>0:sysutils/p5-Probe-Perl \
+		p5-Test-Reporter>1.54:devel/p5-Test-Reporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-SQLite/Makefile b/devel/p5-CPAN-SQLite/Makefile
index f24a06954ff6..322d7a1a6a7c 100644
--- a/devel/p5-CPAN-SQLite/Makefile
+++ b/devel/p5-CPAN-SQLite/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Search CPAN using a SQLite database
 
-BUILD_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite	\
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-CPAN-DistnameInfo>=0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite	\
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-libwww>=0:www/p5-libwww \
+		p5-PathTools>=0:devel/p5-PathTools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Site/Makefile b/devel/p5-CPAN-Site/Makefile
index 3be9c3434fb6..89c0724b9e55 100644
--- a/devel/p5-CPAN-Site/Makefile
+++ b/devel/p5-CPAN-Site/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Extend CPAN with private packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Tar>=1.00:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-CPAN-Checksums>=0:${PORTSDIR}/devel/p5-CPAN-Checksums \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-Log-Report>=0.25:${PORTSDIR}/devel/p5-Log-Report
-RUN_DEPENDS=	p5-Archive-Tar>=1.00:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-CPAN-Checksums>=0:${PORTSDIR}/devel/p5-CPAN-Checksums \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-Zlib>=0:${PORTSDIR}/archivers/p5-IO-Zlib \
-		p5-Log-Report>=0.25:${PORTSDIR}/devel/p5-Log-Report
+BUILD_DEPENDS=	p5-Archive-Tar>=1.00:archivers/p5-Archive-Tar \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-CPAN-Checksums>=0:devel/p5-CPAN-Checksums \
+		p5-libwww>=0:www/p5-libwww \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-Log-Report>=0.25:devel/p5-Log-Report
+RUN_DEPENDS=	p5-Archive-Tar>=1.00:archivers/p5-Archive-Tar \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-CPAN-Checksums>=0:devel/p5-CPAN-Checksums \
+		p5-libwww>=0:www/p5-libwww \
+		p5-IO-Zlib>=0:archivers/p5-IO-Zlib \
+		p5-Log-Report>=0.25:devel/p5-Log-Report
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CPAN-Testers-Report/Makefile b/devel/p5-CPAN-Testers-Report/Makefile
index 501d0e1ec79e..97d26aa4d0bc 100644
--- a/devel/p5-CPAN-Testers-Report/Makefile
+++ b/devel/p5-CPAN-Testers-Report/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	CPAN Testers report object
 
-BUILD_DEPENDS=	p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact
+BUILD_DEPENDS=	p5-Metabase-Fact>0:devel/p5-Metabase-Fact
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPAN-Uploader/Makefile b/devel/p5-CPAN-Uploader/Makefile
index 45f7880ceb45..0cc4ff4da99e 100644
--- a/devel/p5-CPAN-Uploader/Makefile
+++ b/devel/p5-CPAN-Uploader/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.084:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-LWP-Protocol-https>=1:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.084:devel/p5-Getopt-Long-Descriptive \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-LWP-Protocol-https>=1:www/p5-LWP-Protocol-https \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-CPAN-YACSmoke/Makefile b/devel/p5-CPAN-YACSmoke/Makefile
index 301ebd66a6cf..6c38722e1f18 100644
--- a/devel/p5-CPAN-YACSmoke/Makefile
+++ b/devel/p5-CPAN-YACSmoke/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Yet Another CPAN Smoke Tester
 
-RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-File-HomeDir>=0.06:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Regexp-Assemble>=0.06:${PORTSDIR}/devel/p5-Regexp-Assemble \
-		p5-Sort-Versions>=1.5:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Test-Reporter>=1.25:${PORTSDIR}/devel/p5-Test-Reporter \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-File-HomeDir>=0.06:devel/p5-File-HomeDir \
+		p5-Regexp-Assemble>=0.06:devel/p5-Regexp-Assemble \
+		p5-Sort-Versions>=1.5:devel/p5-Sort-Versions \
+		p5-Test-Reporter>=1.25:devel/p5-Test-Reporter \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-CPANPLUS/Makefile b/devel/p5-CPANPLUS/Makefile
index f72372126bc8..7b6b96fce305 100644
--- a/devel/p5-CPANPLUS/Makefile
+++ b/devel/p5-CPANPLUS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ameliorated interface to the CPAN
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Signature>=0:${PORTSDIR}/security/p5-Module-Signature
+BUILD_DEPENDS=	p5-Module-Signature>=0:security/p5-Module-Signature
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	TEST_REPORTER YAML
@@ -27,10 +27,10 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-TEST_REPORTER_BUILD_DEPENDS=	p5-Test-Reporter>=0:${PORTSDIR}/devel/p5-Test-Reporter
-TEST_REPORTER_RUN_DEPENDS=	p5-Test-Reporter>=0:${PORTSDIR}/devel/p5-Test-Reporter
-YAML_BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-YAML_RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_REPORTER_BUILD_DEPENDS=	p5-Test-Reporter>=0:devel/p5-Test-Reporter
+TEST_REPORTER_RUN_DEPENDS=	p5-Test-Reporter>=0:devel/p5-Test-Reporter
+YAML_BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
+YAML_RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 
 post-patch:
 	@${REINPLACE_CMD} -e '/install_script/d' ${WRKSRC}/Makefile.PL
diff --git a/devel/p5-CPS/Makefile b/devel/p5-CPS/Makefile
index 1874d3a09b05..2282ed88db4b 100644
--- a/devel/p5-CPS/Makefile
+++ b/devel/p5-CPS/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Manage flow of control in Continuation-Passing Style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>0:${PORTSDIR}/devel/p5-Future
+BUILD_DEPENDS=	p5-Future>0:devel/p5-Future
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount \
-		p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Identity>0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount \
+		p5-Test-Fatal>0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Cache-AgainstFile/Makefile b/devel/p5-Cache-AgainstFile/Makefile
index eeeb782a1886..669a993d343d 100644
--- a/devel/p5-Cache-AgainstFile/Makefile
+++ b/devel/p5-Cache-AgainstFile/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cache data structures parsed from files, watching for updates
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Log-Trace>=0:${PORTSDIR}/devel/p5-Log-Trace
+BUILD_DEPENDS=	p5-Log-Trace>=0:devel/p5-Log-Trace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Assertions>=0:${PORTSDIR}/devel/p5-Test-Assertions
+TEST_DEPENDS=	p5-Test-Assertions>=0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index dbaf16bf1d34..99314b873e61 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl Cache interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
-		p5-Digest-SHA1>=2.02:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Error>=0.15:${PORTSDIR}/lang/p5-Error \
-		p5-IPC-ShareLite>=0.09:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS=	p5-Cache>=0:devel/p5-Cache \
+		p5-Digest-SHA1>=2.02:security/p5-Digest-SHA1 \
+		p5-Error>=0.15:lang/p5-Error \
+		p5-IPC-ShareLite>=0.09:devel/p5-IPC-ShareLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Cache-LRU/Makefile b/devel/p5-Cache-LRU/Makefile
index b4bd5706262f..765b603197ce 100644
--- a/devel/p5-Cache-LRU/Makefile
+++ b/devel/p5-Cache-LRU/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Simple, fast implementation of an in-memory LRU cache
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Cache-Memcached-Tie/Makefile b/devel/p5-Cache-Memcached-Tie/Makefile
index fc88f2999031..0fb88eb9c2c9 100644
--- a/devel/p5-Cache-Memcached-Tie/Makefile
+++ b/devel/p5-Cache-Memcached-Tie/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use Cache::Memcached::Fast like hash
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Fast
+BUILD_DEPENDS=	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Cache/Makefile b/devel/p5-Cache/Makefile
index 1cdd125aaf52..bf8863df8d8a 100644
--- a/devel/p5-Cache/Makefile
+++ b/devel/p5-Cache/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl Cache interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-NFSLock>=1.2:${PORTSDIR}/devel/p5-File-NFSLock \
-		p5-Heap>=0.01:${PORTSDIR}/devel/p5-Heap \
-		p5-IO-String>=1.02:${PORTSDIR}/devel/p5-IO-String \
-		p5-TimeDate>=2.24:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-File-NFSLock>=1.2:devel/p5-File-NFSLock \
+		p5-Heap>=0.01:devel/p5-Heap \
+		p5-IO-String>=1.02:devel/p5-IO-String \
+		p5-TimeDate>=2.24:devel/p5-TimeDate
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Cairo-GObject/Makefile b/devel/p5-Cairo-GObject/Makefile
index 073f24dce281..91b59bebc470 100644
--- a/devel/p5-Cairo-GObject/Makefile
+++ b/devel/p5-Cairo-GObject/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Integrate Cairo into the Glib type system
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	cairo>=1.10.0:${PORTSDIR}/graphics/cairo \
-		p5-Cairo>=1.080:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0.200:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.224:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS=	cairo>=1.10.0:${PORTSDIR}/graphics/cairo \
-		p5-Cairo>=1.080:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Glib2>=1.224:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	cairo>=1.10.0:graphics/cairo \
+		p5-Cairo>=1.080:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0.200:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.224:devel/p5-Glib2
+RUN_DEPENDS=	cairo>=1.10.0:graphics/cairo \
+		p5-Cairo>=1.080:graphics/p5-Cairo \
+		p5-Glib2>=1.224:devel/p5-Glib2
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Callback-Frame/Makefile b/devel/p5-Callback-Frame/Makefile
index a33d2143fa6d..f5c0fe2d36d3 100644
--- a/devel/p5-Callback-Frame/Makefile
+++ b/devel/p5-Callback-Frame/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Preserve error handlers and "local" variables across callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Guard>=0:${PORTSDIR}/devel/p5-Guard
+RUN_DEPENDS=	p5-Guard>=0:devel/p5-Guard
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Capture-Tiny/Makefile b/devel/p5-Capture-Tiny/Makefile
index 575c5f3632c2..549bf5900b2f 100644
--- a/devel/p5-Capture-Tiny/Makefile
+++ b/devel/p5-Capture-Tiny/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Capture STDOUT and STDERR from Perl, XS, or external programs
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Inline>=0.50:${PORTSDIR}/devel/p5-Inline
+TEST_DEPENDS=	p5-Inline>=0.50:devel/p5-Inline
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Always-Color/Makefile b/devel/p5-Carp-Always-Color/Makefile
index 6d278bfb66e0..6ec9da08e820 100644
--- a/devel/p5-Carp-Always-Color/Makefile
+++ b/devel/p5-Carp-Always-Color/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Carp::Always, but with color
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Always>=0.10:${PORTSDIR}/devel/p5-Carp-Always
+BUILD_DEPENDS=	p5-Carp-Always>=0.10:devel/p5-Carp-Always
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy
+TEST_DEPENDS=	p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Always/Makefile b/devel/p5-Carp-Always/Makefile
index 63de11f1bf75..b9029535e0e9 100644
--- a/devel/p5-Carp-Always/Makefile
+++ b/devel/p5-Carp-Always/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension to warn and die noisily with stack backtraces
 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/devel/p5-Carp-Assert-More/Makefile b/devel/p5-Carp-Assert-More/Makefile
index 64e949889045..71fea635d050 100644
--- a/devel/p5-Carp-Assert-More/Makefile
+++ b/devel/p5-Carp-Assert-More/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Convenience wrappers around Carp::Assert
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert
+BUILD_DEPENDS=	p5-Carp-Assert>=0:devel/p5-Carp-Assert
 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/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index 2b84b874d791..511db41aaa2d 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Executable comments like the ANSI C library assert.h
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	pod2test:${PORTSDIR}/devel/p5-Pod-Tests
+TEST_DEPENDS=	pod2test:devel/p5-Pod-Tests
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Carp-Clan-Share/Makefile b/devel/p5-Carp-Clan-Share/Makefile
index d96d1d730ac1..678190e7e210 100644
--- a/devel/p5-Carp-Clan-Share/Makefile
+++ b/devel/p5-Carp-Clan-Share/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Share your Carp::Clan settings with your whole Clan
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Carp-Clan/Makefile b/devel/p5-Carp-Clan/Makefile
index ee2dea8d1539..19735c2a2ea0 100644
--- a/devel/p5-Carp-Clan/Makefile
+++ b/devel/p5-Carp-Clan/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Report errors from perspective of caller of a "clan" of modules
 
-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/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index 54d3fc8b8b16..cc9cf2aa9bff 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Debugging And Tracing Ultimate Module
 
-BUILD_DEPENDS=	p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent \
-		p5-Getargs-Long>=0:${PORTSDIR}/devel/p5-Getargs-Long
+BUILD_DEPENDS=	p5-Log-Agent>=0:devel/p5-Log-Agent \
+		p5-Getargs-Long>=0:devel/p5-Getargs-Long
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Carp-REPL/Makefile b/devel/p5-Carp-REPL/Makefile
index e3cafaf7b0a7..73d7f8d02784 100644
--- a/devel/p5-Carp-REPL/Makefile
+++ b/devel/p5-Carp-REPL/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read-Eval-Print-Loop on die and/or warn
 
-BUILD_DEPENDS=	devel/p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Devel-REPL>=0:${PORTSDIR}/devel/p5-Devel-REPL \
-		p5-Devel-StackTrace-WithLexicals>0:${PORTSDIR}/devel/p5-Devel-StackTrace-WithLexicals \
-		p5-Lexical-Persistence>0:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	devel/p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-Devel-REPL>=0:devel/p5-Devel-REPL \
+		p5-Devel-StackTrace-WithLexicals>0:devel/p5-Devel-StackTrace-WithLexicals \
+		p5-Lexical-Persistence>0:devel/p5-Lexical-Persistence \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect
+TEST_DEPENDS=	p5-Test-Expect>=0:devel/p5-Test-Expect
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Cdk/Makefile b/devel/p5-Cdk/Makefile
index 9d169529459f..4d903e5d8e6a 100644
--- a/devel/p5-Cdk/Makefile
+++ b/devel/p5-Cdk/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl5 module for Curses Development Kit
 
 LICENSE=	BSD4CLAUSE
 
-LIB_DEPENDS=	libcdk.so:${PORTSDIR}/devel/cdk
+LIB_DEPENDS=	libcdk.so:devel/cdk
 
 USES=		perl5 tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/devel/p5-Check-ISA/Makefile b/devel/p5-Check-ISA/Makefile
index 9c0fa88887d8..5866af14bdfc 100644
--- a/devel/p5-Check-ISA/Makefile
+++ b/devel/p5-Check-ISA/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DWIM, correct checking of an object's class
 
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_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/devel/p5-Chooser/Makefile b/devel/p5-Chooser/Makefile
index ed814cf3eb99..f1a50ade0c98 100644
--- a/devel/p5-Chooser/Makefile
+++ b/devel/p5-Chooser/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Takes a string composed of various tests, arguments, etc and returns a value
 
-RUN_DEPENDS=	p5-Net-CIDR-Lite>=0.21:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-		p5-IO-Socket-SSL>=1.74:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Text-NeatTemplate>=0.10.01:${PORTSDIR}/textproc/p5-Text-NeatTemplate
+RUN_DEPENDS=	p5-Net-CIDR-Lite>=0.21:net/p5-Net-CIDR-Lite \
+		p5-IO-Socket-SSL>=1.74:security/p5-IO-Socket-SSL \
+		p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Chained/Makefile b/devel/p5-Class-Accessor-Chained/Makefile
index 633d644f7987..7f861f87e9eb 100644
--- a/devel/p5-Class-Accessor-Chained/Makefile
+++ b/devel/p5-Class-Accessor-Chained/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make chained accessors
 
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Children/Makefile b/devel/p5-Class-Accessor-Children/Makefile
index 512aa2620ddb..5f233aa3d1c5 100644
--- a/devel/p5-Class-Accessor-Children/Makefile
+++ b/devel/p5-Class-Accessor-Children/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Automated child-class/accessor generation
 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/devel/p5-Class-Accessor-Complex/Makefile b/devel/p5-Class-Accessor-Complex/Makefile
index 19352164d146..19581d52ab3b 100644
--- a/devel/p5-Class-Accessor-Complex/Makefile
+++ b/devel/p5-Class-Accessor-Complex/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Arrays, hashes, booleans, integers, sets, and more
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Accessor-Installer>=0:${PORTSDIR}/devel/p5-Class-Accessor-Installer \
-		p5-Data-Miscellany>=0:${PORTSDIR}/devel/p5-Data-Miscellany \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Accessor-Installer>=0:devel/p5-Class-Accessor-Installer \
+		p5-Data-Miscellany>=0:devel/p5-Data-Miscellany \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-Accessor-Constructor/Makefile b/devel/p5-Class-Accessor-Constructor/Makefile
index 3589a043c158..79abe61adaea 100644
--- a/devel/p5-Class-Accessor-Constructor/Makefile
+++ b/devel/p5-Class-Accessor-Constructor/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for constructor generator
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-Class-Accessor-Complex>0:${PORTSDIR}/devel/p5-Class-Accessor-Complex \
-	p5-Class-Accessor-Installer>=1.100880:${PORTSDIR}/devel/p5-Class-Accessor-Installer \
-	p5-Data-Inherited>0:${PORTSDIR}/devel/p5-Data-Inherited
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-Class-Accessor-Complex>0:devel/p5-Class-Accessor-Complex \
+	p5-Class-Accessor-Installer>=1.100880:devel/p5-Class-Accessor-Installer \
+	p5-Data-Inherited>0:devel/p5-Data-Inherited
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Fast-Contained/Makefile b/devel/p5-Class-Accessor-Fast-Contained/Makefile
index 38409ce0b022..53d14f95ab3f 100644
--- a/devel/p5-Class-Accessor-Fast-Contained/Makefile
+++ b/devel/p5-Class-Accessor-Fast-Contained/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast accessors with data containment
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Fast-XS/Makefile b/devel/p5-Class-Accessor-Fast-XS/Makefile
index 8013c3966093..4d336ed90581 100644
--- a/devel/p5-Class-Accessor-Fast-XS/Makefile
+++ b/devel/p5-Class-Accessor-Fast-XS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS replacement for Class::Accessor::Fast
 
-BUILD_DEPENDS=	p5-AutoXS-Header>=0.03:${PORTSDIR}/devel/p5-AutoXS-Header \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-AutoXS-Header>=0.03:devel/p5-AutoXS-Header \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index 1772bee551f7..8520a80e123f 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Lets you build groups of accessors
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Class-XSAccessor>=1.19:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Sub-Name>=0.05:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Class-XSAccessor>=1.19:devel/p5-Class-XSAccessor \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Sub-Name>=0.05:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Accessor-Installer/Makefile b/devel/p5-Class-Accessor-Installer/Makefile
index eaa81f3ba0c8..819edea23358 100644
--- a/devel/p5-Class-Accessor-Installer/Makefile
+++ b/devel/p5-Class-Accessor-Installer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Install an accessor subroutine
 
-BUILD_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Lvalue/Makefile b/devel/p5-Class-Accessor-Lvalue/Makefile
index c318729e1a96..8d093faf6248 100644
--- a/devel/p5-Class-Accessor-Lvalue/Makefile
+++ b/devel/p5-Class-Accessor-Lvalue/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Create Lvalue accessors
 
-BUILD_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Want>=0:devel/p5-Want \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Accessor-Named/Makefile b/devel/p5-Class-Accessor-Named/Makefile
index 3f1212f37364..7d7d345613b3 100644
--- a/devel/p5-Class-Accessor-Named/Makefile
+++ b/devel/p5-Class-Accessor-Named/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Better profiling output for Class::Accessor
 
-RUN_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-AlzaboWrapper/Makefile b/devel/p5-Class-AlzaboWrapper/Makefile
index 38052b531560..32d12709b014 100644
--- a/devel/p5-Class-AlzaboWrapper/Makefile
+++ b/devel/p5-Class-AlzaboWrapper/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Higher level wrapper around Alzabo Row and Table objects
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Alzabo>=0:${PORTSDIR}/devel/p5-Alzabo
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Alzabo>=0:devel/p5-Alzabo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-AutoClass/Makefile b/devel/p5-Class-AutoClass/Makefile
index f35fce6a9b4b..d0c79b7cd1db 100644
--- a/devel/p5-Class-AutoClass/Makefile
+++ b/devel/p5-Class-AutoClass/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Create get and set methods and simplify object initialization
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:${PORTSDIR}/devel/p5-Hash-AutoHash \
-		p5-Hash-AutoHash-Args>=1.18:${PORTSDIR}/devel/p5-Hash-AutoHash-Args
+BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash \
+		p5-Hash-AutoHash-Args>=1.18:devel/p5-Hash-AutoHash-Args
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=2.1:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=1.48:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-IO-stringy>=2.1:devel/p5-IO-stringy \
+		p5-Test-Deep>=0.110:devel/p5-Test-Deep \
+		p5-Test-Pod>=1.48:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 5b749e2672b5..dba61c533087 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Defer loading of one or more classes
 
-BUILD_DEPENDS=	p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
-RUN_DEPENDS=	p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
+BUILD_DEPENDS=	p5-prefork>=0:devel/p5-prefork
+RUN_DEPENDS=	p5-prefork>=0:devel/p5-prefork
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-C3-Adopt-NEXT/Makefile b/devel/p5-Class-C3-Adopt-NEXT/Makefile
index 66684e0c3e70..2719db5abe69 100644
--- a/devel/p5-Class-C3-Adopt-NEXT/Makefile
+++ b/devel/p5-Class-C3-Adopt-NEXT/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Make NEXT suck less
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat
+RUN_DEPENDS=	p5-MRO-Compat>=0:devel/p5-MRO-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.27:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,8 +23,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/devel/p5-Class-C3-Componentised/Makefile b/devel/p5-Class-C3-Componentised/Makefile
index 4e58a9b00ca5..d3dedd917e67 100644
--- a/devel/p5-Class-C3-Componentised/Makefile
+++ b/devel/p5-Class-C3-Componentised/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Load mix-ins or components to your C3-based class
 
-RUN_DEPENDS=	p5-Class-C3>=0.20:${PORTSDIR}/devel/p5-Class-C3 \
-		p5-MRO-Compat>0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+RUN_DEPENDS=	p5-Class-C3>=0.20:devel/p5-Class-C3 \
+		p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index 0fefb8ba5094..0589052b86a9 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -18,9 +18,9 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-XS_BUILD_DEPENDS=	p5-Class-C3-XS>=0.13:${PORTSDIR}/devel/p5-Class-C3-XS
-XS_RUN_DEPENDS=		p5-Class-C3-XS>=0.13:${PORTSDIR}/devel/p5-Class-C3-XS
-XS_BUILD_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:${PORTSDIR}/devel/p5-Algorithm-C3
-XS_RUN_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:${PORTSDIR}/devel/p5-Algorithm-C3
+XS_BUILD_DEPENDS=	p5-Class-C3-XS>=0.13:devel/p5-Class-C3-XS
+XS_RUN_DEPENDS=		p5-Class-C3-XS>=0.13:devel/p5-Class-C3-XS
+XS_BUILD_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:devel/p5-Algorithm-C3
+XS_RUN_DEPENDS_OFF=	p5-Algorithm-C3>=0.07:devel/p5-Algorithm-C3
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Closure/Makefile b/devel/p5-Class-Closure/Makefile
index 0fe0d5587538..8e0967744c7c 100644
--- a/devel/p5-Class-Closure/Makefile
+++ b/devel/p5-Class-Closure/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Encapsulated, declarative classes in Perl
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Sentinel>=0:${PORTSDIR}/devel/p5-Sentinel
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+		p5-Sentinel>=0:devel/p5-Sentinel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-CodeStyler/Makefile b/devel/p5-Class-CodeStyler/Makefile
index e3cc19735890..379d83f91e8c 100644
--- a/devel/p5-Class-CodeStyler/Makefile
+++ b/devel/p5-Class-CodeStyler/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for code generation program formatting and execution
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-STL-Containers>=0:${PORTSDIR}/devel/p5-Class-STL-Containers
+BUILD_DEPENDS=	p5-Class-STL-Containers>=0:devel/p5-Class-STL-Containers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Component/Makefile b/devel/p5-Class-Component/Makefile
index 40fdb5b6a0ea..bb49744d3be1 100644
--- a/devel/p5-Class-Component/Makefile
+++ b/devel/p5-Class-Component/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pluggable component framework
 
-BUILD_DEPENDS=	p5-Carp-Clan>0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Inspector>0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Carp-Clan>0:devel/p5-Carp-Clan \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Inspector>0:devel/p5-Class-Inspector \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index fbe515bc3316..2c6886b67f4e 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Glues object frameworks together transparently
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Data-ConfigHash/Makefile b/devel/p5-Class-Data-ConfigHash/Makefile
index f220347a5816..474603dcb26f 100644
--- a/devel/p5-Class-Data-ConfigHash/Makefile
+++ b/devel/p5-Class-Data-ConfigHash/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Add Catalyst-Style Config To Your Class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
-RUN_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
+RUN_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Declare/Makefile b/devel/p5-Class-Declare/Makefile
index ed8e0cec8e5d..694393830b02 100644
--- a/devel/p5-Class-Declare/Makefile
+++ b/devel/p5-Class-Declare/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	simarg@gmail.com
 COMMENT=	Perl module for declare classes
 
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index 68c08a5fab83..a860563eb194 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Static calls apply to a default instantiation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Generate/Makefile b/devel/p5-Class-Generate/Makefile
index a0e143553987..73e08ae315fb 100644
--- a/devel/p5-Class-Generate/Makefile
+++ b/devel/p5-Class-Generate/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simplify the creation of class hierarchies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Text-Soundex>=0:${PORTSDIR}/textproc/p5-Text-Soundex
+TEST_DEPENDS=	p5-Text-Soundex>=0:textproc/p5-Text-Soundex
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Class-Handle/Makefile b/devel/p5-Class-Handle/Makefile
index fc34fe22be67..76ce3fb68cfe 100644
--- a/devel/p5-Class-Handle/Makefile
+++ b/devel/p5-Class-Handle/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Create objects that are handles to classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-InsideOut/Makefile b/devel/p5-Class-InsideOut/Makefile
index 1283314298cf..6fe2e1fe24cc 100644
--- a/devel/p5-Class-InsideOut/Makefile
+++ b/devel/p5-Class-InsideOut/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Safe, simple inside-out object construction kit
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.0301
diff --git a/devel/p5-Class-Load-XS/Makefile b/devel/p5-Class-Load-XS/Makefile
index feabf253bdb5..32634f8c7ada 100644
--- a/devel/p5-Class-Load-XS/Makefile
+++ b/devel/p5-Class-Load-XS/Makefile
@@ -13,12 +13,12 @@ COMMENT=	XS implementation of parts of Class::Load
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Class-Load>=0.20:${PORTSDIR}/devel/p5-Class-Load
+BUILD_DEPENDS=	p5-Class-Load>=0.20:devel/p5-Class-Load
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Module-Implementation>=0.04:devel/p5-Module-Implementation \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Class-Load/Makefile b/devel/p5-Class-Load/Makefile
index 22177e705523..888874790c47 100644
--- a/devel/p5-Class-Load/Makefile
+++ b/devel/p5-Class-Load/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Working (require Class::Name) and more
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-OptList>0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Data-OptList>0:devel/p5-Data-OptList \
+		p5-Module-Implementation>=0.04:devel/p5-Module-Implementation \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Package-Stash>=0.14:devel/p5-Package-Stash \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 CONFIGURE_ENV=	PERL_MM_FALLBACK_SILENCE_WARNING=omg # hide warn about bad toolchain
 
diff --git a/devel/p5-Class-Measure/Makefile b/devel/p5-Class-Measure/Makefile
index 12099ee1e300..f040f23ab07a 100644
--- a/devel/p5-Class-Measure/Makefile
+++ b/devel/p5-Class-Measure/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Create, compare, and convert units of measurement
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Method-Modifiers-Fast/Makefile b/devel/p5-Class-Method-Modifiers-Fast/Makefile
index 8d4d01e78fb5..4b09e6afdd27 100644
--- a/devel/p5-Class-Method-Modifiers-Fast/Makefile
+++ b/devel/p5-Class-Method-Modifiers-Fast/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to provide Moose-like method modifiers
 
 RUN_DEPENDS=	\
-	p5-Data-Util>=0.55:${PORTSDIR}/devel/p5-Data-Util
+	p5-Data-Util>=0.55:devel/p5-Data-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Uplevel>=0.18:${PORTSDIR}/devel/p5-Sub-Uplevel
+TEST_DEPENDS=	p5-Sub-Uplevel>=0.18:devel/p5-Sub-Uplevel
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Method-Modifiers/Makefile b/devel/p5-Class-Method-Modifiers/Makefile
index 2ffacb227464..6dd4169d14ce 100644
--- a/devel/p5-Class-Method-Modifiers/Makefile
+++ b/devel/p5-Class-Method-Modifiers/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Provides Moose-like method modifiers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Mix/Makefile b/devel/p5-Class-Mix/Makefile
index d21cc1332592..2c900940ed7b 100644
--- a/devel/p5-Class-Mix/Makefile
+++ b/devel/p5-Class-Mix/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for dynamic class mixing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
+BUILD_DEPENDS=	p5-Params-Classify>=0:devel/p5-Params-Classify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-ObjectTemplate-DB/Makefile b/devel/p5-Class-ObjectTemplate-DB/Makefile
index 2d78591dc487..52d622deda5b 100644
--- a/devel/p5-Class-ObjectTemplate-DB/Makefile
+++ b/devel/p5-Class-ObjectTemplate-DB/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Optimized template builder base class with lookup capability
 
-RUN_DEPENDS=	p5-Class-ObjectTemplate>=0:${PORTSDIR}/devel/p5-Class-ObjectTemplate
+RUN_DEPENDS=	p5-Class-ObjectTemplate>=0:devel/p5-Class-ObjectTemplate
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Observable/Makefile b/devel/p5-Class-Observable/Makefile
index 2f355bbf90ba..08b9b5df3e28 100644
--- a/devel/p5-Class-Observable/Makefile
+++ b/devel/p5-Class-Observable/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hcoyote@ghostar.org
 COMMENT=	Allow other classes and objects to respond to events in yours
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-ReturnValue/Makefile b/devel/p5-Class-ReturnValue/Makefile
index dcd7889ddf67..d38d13d0618d 100644
--- a/devel/p5-Class-ReturnValue/Makefile
+++ b/devel/p5-Class-ReturnValue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Return-value object that can be treated as a boolean, array, or object
 
-BUILD_DEPENDS=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Roles/Makefile b/devel/p5-Class-Roles/Makefile
index 1b09c10070d9..d9c1aff60a7e 100644
--- a/devel/p5-Class-Roles/Makefile
+++ b/devel/p5-Class-Roles/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provides a role-based system of OOP (emulates Perl6)
 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=	modbuild
diff --git a/devel/p5-Class-StateMachine/Makefile b/devel/p5-Class-StateMachine/Makefile
index 13c53a0b6230..445c49814a32 100644
--- a/devel/p5-Class-StateMachine/Makefile
+++ b/devel/p5-Class-StateMachine/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Define classes for state machines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Define>=0.01:${PORTSDIR}/devel/p5-MRO-Define \
-		p5-Package-Stash>=0.29:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Name>=0.05:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-MRO-Define>=0.01:devel/p5-MRO-Define \
+		p5-Package-Stash>=0.29:devel/p5-Package-Stash \
+		p5-Sub-Name>=0.05:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Std-Fast/Makefile b/devel/p5-Class-Std-Fast/Makefile
index 9ac095bd1ea5..6aa1baf36921 100644
--- a/devel/p5-Class-Std-Fast/Makefile
+++ b/devel/p5-Class-Std-Fast/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Faster but less secure than Class::Std
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Std>=0.0.9:${PORTSDIR}/devel/p5-Class-Std
+BUILD_DEPENDS=	p5-Class-Std>=0.0.9:devel/p5-Class-Std
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index d7387e981d9b..b6d1983b7d85 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create constructors, accessor, update methods for objects from Tangram
 
-BUILD_DEPENDS=	p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Tangram>=0:${PORTSDIR}/databases/p5-Tangram
+BUILD_DEPENDS=	p5-Set-Object>=0:devel/p5-Set-Object \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Tangram>=0:databases/p5-Tangram
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index 15fe3dd10998..56495c3835c1 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module to transport objects from one system to another
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump
-RUN_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump
+RUN_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Trigger/Makefile b/devel/p5-Class-Trigger/Makefile
index fd935a692543..d0def0555a01 100644
--- a/devel/p5-Class-Trigger/Makefile
+++ b/devel/p5-Class-Trigger/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mixin to add / call inheritable triggers
 
-RUN_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Class-Unload/Makefile b/devel/p5-Class-Unload/Makefile
index 884cc32af56a..9c5b6aa04119 100644
--- a/devel/p5-Class-Unload/Makefile
+++ b/devel/p5-Class-Unload/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module for unloading classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Class-Virtual/Makefile b/devel/p5-Class-Virtual/Makefile
index 9ef8a7bc3bad..4525b41728d5 100644
--- a/devel/p5-Class-Virtual/Makefile
+++ b/devel/p5-Class-Virtual/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Base class for virtual base classes in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+BUILD_DEPENDS=	p5-Carp-Assert>=0:devel/p5-Carp-Assert \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-ISA>=0:devel/p5-Class-ISA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Class-Workflow/Makefile b/devel/p5-Class-Workflow/Makefile
index 332559e25112..316003099b78 100644
--- a/devel/p5-Class-Workflow/Makefile
+++ b/devel/p5-Class-Workflow/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Lightweight workflow system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-Moose>=0.37:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.04:${PORTSDIR}/devel/p5-MooseX-Clone \
-		p5-Set-Object>=1.19:${PORTSDIR}/devel/p5-Set-Object \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-Moose>=0.37:devel/p5-Moose \
+		p5-MooseX-Clone>=0.04:devel/p5-MooseX-Clone \
+		p5-Set-Object>=1.19:devel/p5-Set-Object \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Code-Perl/Makefile b/devel/p5-Code-Perl/Makefile
index d18bd52124c0..48aaf7b24d86 100644
--- a/devel/p5-Code-Perl/Makefile
+++ b/devel/p5-Code-Perl/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Produce Perl code from a tree
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-CommitBit/Makefile b/devel/p5-CommitBit/Makefile
index f422b8e1b408..ac380f220518 100644
--- a/devel/p5-CommitBit/Makefile
+++ b/devel/p5-CommitBit/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Project administration tool
 
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Jifty>=0.60728:${PORTSDIR}/www/p5-Jifty \
-		p5-Text-Password-Pronounceable>=0:${PORTSDIR}/security/p5-Text-Password-Pronounceable
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Jifty>=0.60728:www/p5-Jifty \
+		p5-Text-Password-Pronounceable>=0:security/p5-Text-Password-Pronounceable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Compiler-Lexer/Makefile b/devel/p5-Compiler-Lexer/Makefile
index b010909e9278..2c1da2d4efc7 100644
--- a/devel/p5-Compiler-Lexer/Makefile
+++ b/devel/p5-Compiler-Lexer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for lexical analyzer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Build-XSUtil>0:${PORTSDIR}/devel/p5-Module-Build-XSUtil
+BUILD_DEPENDS=	p5-Module-Build-XSUtil>0:devel/p5-Module-Build-XSUtil
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Config-ApacheFormat/Makefile b/devel/p5-Config-ApacheFormat/Makefile
index d1a453b6d845..153e433b828e 100644
--- a/devel/p5-Config-ApacheFormat/Makefile
+++ b/devel/p5-Config-ApacheFormat/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse a configuration file in the same syntax as the Apache web server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Auto/Makefile b/devel/p5-Config-Auto/Makefile
index b64ea7b871c5..b0656ac32650 100644
--- a/devel/p5-Config-Auto/Makefile
+++ b/devel/p5-Config-Auto/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Magical config file parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-YAML>=0.67:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-YAML>=0.67:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+TEST_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 
 USES=		perl5
 USE_PERL5=	configure
@@ -26,7 +26,7 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	XMLSIMPLE
 XMLSIMPLE_DESC=	Support for XML config files
 
-XMLSIMPLE_BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
-XMLSIMPLE_RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+XMLSIMPLE_BUILD_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
+XMLSIMPLE_RUN_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-AutoConf/Makefile b/devel/p5-Config-AutoConf/Makefile
index af1f33f12d74..75414f8f85ac 100644
--- a/devel/p5-Config-AutoConf/Makefile
+++ b/devel/p5-Config-AutoConf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module to implement some of AutoConf macros
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-GitLike/Makefile b/devel/p5-Config-GitLike/Makefile
index 652d06d9bb9a..4635c1b8d2c3 100644
--- a/devel/p5-Config-GitLike/Makefile
+++ b/devel/p5-Config-GitLike/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Simple git-compatible config file parser for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	devel/p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		devel/p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike
+BUILD_DEPENDS=	devel/p5-Moo>=0:devel/p5-Moo \
+		devel/p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS+=	devel/p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS+=	devel/p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-INI-Reader-Ordered/Makefile b/devel/p5-Config-INI-Reader-Ordered/Makefile
index 4dc4a3dc2bfc..53cc5c1f6504 100644
--- a/devel/p5-Config-INI-Reader-Ordered/Makefile
+++ b/devel/p5-Config-INI-Reader-Ordered/Makefile
@@ -14,10 +14,10 @@ COMMENT=	INI-file parser that returns sections in order
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-INI>=0:${PORTSDIR}/devel/p5-Config-INI
+BUILD_DEPENDS=	p5-Config-INI>=0:devel/p5-Config-INI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-INI/Makefile b/devel/p5-Config-INI/Makefile
index fb318c68f3d7..9c9243c8c875 100644
--- a/devel/p5-Config-INI/Makefile
+++ b/devel/p5-Config-INI/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple .ini files emitter and parser for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mixin-Linewise>=0.100:${PORTSDIR}/devel/p5-Mixin-Linewise
+BUILD_DEPENDS=	p5-Mixin-Linewise>=0.100:devel/p5-Mixin-Linewise
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Identity/Makefile b/devel/p5-Config-Identity/Makefile
index 152d39ef175e..8c8ce10988ad 100644
--- a/devel/p5-Config-Identity/Makefile
+++ b/devel/p5-Config-Identity/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Load (and optionally decrypt via GnuPG) user/pass identity information
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 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
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index b948f5e3a17a..28437b4a04f8 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -19,8 +19,8 @@ USE_PERL5=	modbuild
 .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/devel/p5-Config-IniHash/Makefile b/devel/p5-Config-IniHash/Makefile
index a40aedfa8b6a..bfa1da68d259 100644
--- a/devel/p5-Config-IniHash/Makefile
+++ b/devel/p5-Config-IniHash/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for reading and writing INI files
 
-RUN_DEPENDS=	p5-Hash-Case>=0:${PORTSDIR}/devel/p5-Hash-Case \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Hash-WithDefaults>=0.04:${PORTSDIR}/devel/p5-Hash-WithDefaults
+RUN_DEPENDS=	p5-Hash-Case>=0:devel/p5-Hash-Case \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Hash-WithDefaults>=0.04:devel/p5-Hash-WithDefaults
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/devel/p5-Config-IniRegEx/Makefile b/devel/p5-Config-IniRegEx/Makefile
index 62783f004c62..f0401e9448f6 100644
--- a/devel/p5-Config-IniRegEx/Makefile
+++ b/devel/p5-Config-IniRegEx/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Ini workaround, regex search for parameters and sections
 
-RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
+RUN_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-JFDI/Makefile b/devel/p5-Config-JFDI/Makefile
index e2ca5d6114be..070e78f00d6b 100644
--- a/devel/p5-Config-JFDI/Makefile
+++ b/devel/p5-Config-JFDI/Makefile
@@ -12,18 +12,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst::Plugin::ConfigLoader-style layer over Config::Any
 
-BUILD_DEPENDS=	p5-Carp-Clan-Share>=0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-		p5-Hash-Merge-Simple>=0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor
+BUILD_DEPENDS=	p5-Carp-Clan-Share>=0:devel/p5-Carp-Clan-Share \
+		p5-Hash-Merge-Simple>=0:devel/p5-Hash-Merge-Simple \
+		p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-Config-General>=0:devel/p5-Config-General \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Data-Visitor>=0.24:devel/p5-Data-Visitor
 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/devel/p5-Config-JSON/Makefile b/devel/p5-Config-JSON/Makefile
index ad0804cee9d3..92d5461de4f9 100644
--- a/devel/p5-Config-JSON/Makefile
+++ b/devel/p5-Config-JSON/Makefile
@@ -13,10 +13,10 @@ COMMENT=	JSON based config file system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=2.16:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-JSON>=2.16:converters/p5-JSON \
+		p5-Moo>=0:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-MVP-Reader-INI/Makefile b/devel/p5-Config-MVP-Reader-INI/Makefile
index ce249f95c103..5cefbd80b309 100644
--- a/devel/p5-Config-MVP-Reader-INI/Makefile
+++ b/devel/p5-Config-MVP-Reader-INI/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Config-INI>=0:${PORTSDIR}/devel/p5-Config-INI \
-		p5-Config-MVP>=2:${PORTSDIR}/devel/p5-Config-MVP
+BUILD_DEPENDS=	p5-Config-INI>=0:devel/p5-Config-INI \
+		p5-Config-MVP>=2:devel/p5-Config-MVP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Config-MVP/Makefile b/devel/p5-Config-MVP/Makefile
index e0e8b124fdc1..a05f0f0baea0 100644
--- a/devel/p5-Config-MVP/Makefile
+++ b/devel/p5-Config-MVP/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Multivalue-property package-oriented configuration
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.17:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.91:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-OneArgNew>=0:${PORTSDIR}/devel/p5-MooseX-OneArgNew \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Role-HasMessage>=0:${PORTSDIR}/devel/p5-Role-HasMessage \
-		p5-Role-Identifiable>=0:${PORTSDIR}/devel/p5-Role-Identifiable \
-		p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Load>=0.17:devel/p5-Class-Load \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0.91:devel/p5-Moose \
+		p5-MooseX-OneArgNew>=0:devel/p5-MooseX-OneArgNew \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Role-HasMessage>=0:devel/p5-Role-HasMessage \
+		p5-Role-Identifiable>=0:devel/p5-Role-Identifiable \
+		p5-Throwable>=0:devel/p5-Throwable \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Merge/Makefile b/devel/p5-Config-Merge/Makefile
index 0a81ce217c74..6790c84d1498 100644
--- a/devel/p5-Config-Merge/Makefile
+++ b/devel/p5-Config-Merge/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Load a configuration directory tree in a number of languages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index d525443c48cf..3f68fe7dc93b 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -13,31 +13,31 @@ COMMENT=	Model to create configuration validation tool
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Carp-Assert-More>=0:${PORTSDIR}/devel/p5-Carp-Assert-More \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Log4perl>=1.11:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-NativeTraits>=0:${PORTSDIR}/devel/p5-MouseX-NativeTraits \
-		p5-MouseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MouseX-StrictConstructor \
-		p5-Parse-RecDescent>=1.90.0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-Term-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-Term-ReadLine-Perl \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Text-Levenshtein-Damerau>=0:${PORTSDIR}/devel/p5-Text-Levenshtein-Damerau \
-		p5-YAML>=0.30.3:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Log-Log4perl>=1.11:devel/p5-Log-Log4perl \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-NativeTraits>=0:devel/p5-MouseX-NativeTraits \
+		p5-MouseX-StrictConstructor>=0:devel/p5-MouseX-StrictConstructor \
+		p5-Parse-RecDescent>=1.90.0:devel/p5-Parse-RecDescent \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Pod-POM>=0:textproc/p5-Pod-POM \
+		p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-Text-Levenshtein-Damerau>=0:devel/p5-Text-Levenshtein-Damerau \
+		p5-YAML>=0.30.3:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Config-Model-Tester>=2.046:${PORTSDIR}/devel/p5-Config-Model-Tester \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-File-Contents>=0:${PORTSDIR}/devel/p5-Test-File-Contents \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Config-Model-Tester>=2.046:devel/p5-Config-Model-Tester \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-File-Contents>=0:devel/p5-Test-File-Contents \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Config-MySQL/Makefile b/devel/p5-Config-MySQL/Makefile
index dd0ae43f4059..a27a1e2c3be1 100644
--- a/devel/p5-Config-MySQL/Makefile
+++ b/devel/p5-Config-MySQL/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to read/write MySQL-style configuration files
 
 RUN_DEPENDS=	\
-	p5-Config-INI>0:${PORTSDIR}/devel/p5-Config-INI
+	p5-Config-INI>0:devel/p5-Config-INI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Objective/Makefile b/devel/p5-Config-Objective/Makefile
index 8bfd5244cd0a..5dcfc8575158 100644
--- a/devel/p5-Config-Objective/Makefile
+++ b/devel/p5-Config-Objective/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Configuration data as perl objects
 
-BUILD_DEPENDS=	p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-ParseLex>=0:${PORTSDIR}/devel/p5-ParseLex
+BUILD_DEPENDS=	p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-ParseLex>=0:devel/p5-ParseLex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Record/Makefile b/devel/p5-Config-Record/Makefile
index fbec7e832d23..8e028e347fed 100644
--- a/devel/p5-Config-Record/Makefile
+++ b/devel/p5-Config-Record/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Configuration file access
 
 LICENSE=	GPLv2
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Setting/Makefile b/devel/p5-Config-Setting/Makefile
index ee051722e59d..0d84f15592b9 100644
--- a/devel/p5-Config-Setting/Makefile
+++ b/devel/p5-Config-Setting/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class that provides an easy interface to use config files
 
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Config-Std/Makefile b/devel/p5-Config-Std/Makefile
index 6c89407cbc88..d8fea1a1fbde 100644
--- a/devel/p5-Config-Std/Makefile
+++ b/devel/p5-Config-Std/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Load and save configuration files in a standard format
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std
+RUN_DEPENDS=	p5-Class-Std>=0:devel/p5-Class-Std
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Validator/Makefile b/devel/p5-Config-Validator/Makefile
index ac0575235f11..669021c943c0 100644
--- a/devel/p5-Config-Validator/Makefile
+++ b/devel/p5-Config-Validator/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Schema based configuration validation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-No-Worries>=1.0:${PORTSDIR}/devel/p5-No-Worries \
-		p5-URI>=1.67:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-No-Worries>=1.0:devel/p5-No-Worries \
+		p5-URI>=1.67:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Config-Versioned/Makefile b/devel/p5-Config-Versioned/Makefile
index 6098bae9acc7..106bd89f4554 100644
--- a/devel/p5-Config-Versioned/Makefile
+++ b/devel/p5-Config-Versioned/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Simple, versioned access to configuration data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Git-PurePerl>=0:${PORTSDIR}/devel/p5-Git-PurePerl
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Config-Std>=0:devel/p5-Config-Std \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Git-PurePerl>=0:devel/p5-Git-PurePerl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-Wrest/Makefile b/devel/p5-Config-Wrest/Makefile
index b99d33787405..29f05ee32ba4 100644
--- a/devel/p5-Config-Wrest/Makefile
+++ b/devel/p5-Config-Wrest/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Perl module for reading and writing configuration data
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Any-Template>0:${PORTSDIR}/www/p5-Any-Template \
-		p5-File-Policy>0:${PORTSDIR}/devel/p5-File-Policy \
-		p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
+BUILD_DEPENDS=	p5-Any-Template>0:www/p5-Any-Template \
+		p5-File-Policy>0:devel/p5-File-Policy \
+		p5-Log-Trace>0:devel/p5-Log-Trace
 RUN_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+TEST_DEPENDS=	p5-Test-Assertions>0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Config-YAML/Makefile b/devel/p5-Config-YAML/Makefile
index a79a12ba15c6..8d2e72ec2d39 100644
--- a/devel/p5-Config-YAML/Makefile
+++ b/devel/p5-Config-YAML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Simple configuration automation
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
+RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-ConfigReader-Simple/Makefile b/devel/p5-ConfigReader-Simple/Makefile
index 623a06f08e89..ca6d355dc25d 100644
--- a/devel/p5-ConfigReader-Simple/Makefile
+++ b/devel/p5-ConfigReader-Simple/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple configuration file parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Connector/Makefile b/devel/p5-Connector/Makefile
index f94d7fe65f15..5a7bcbd05960 100644
--- a/devel/p5-Connector/Makefile
+++ b/devel/p5-Connector/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Generic connection to a hierarchical-structured data set
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-AppConfig>=0:${PORTSDIR}/devel/p5-AppConfig \
-		p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
-		p5-Config-Versioned>=1.01:${PORTSDIR}/devel/p5-Config-Versioned \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Proc-SafeExec>=0:${PORTSDIR}/devel/p5-Proc-SafeExec \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-YAML>=1.06:${PORTSDIR}/textproc/p5-YAML \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	bash:shells/bash \
+		p5-AppConfig>=0:devel/p5-AppConfig \
+		p5-Config-GitLike>=0:devel/p5-Config-GitLike \
+		p5-Config-Versioned>=1.01:devel/p5-Config-Versioned \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Proc-SafeExec>=0:devel/p5-Proc-SafeExec \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-YAML>=1.06:textproc/p5-YAML \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Const-Fast/Makefile b/devel/p5-Const-Fast/Makefile
index 4d085b40a2c3..88b5067bcd1f 100644
--- a/devel/p5-Const-Fast/Makefile
+++ b/devel/p5-Const-Fast/Makefile
@@ -16,9 +16,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Exporter-Progressive>=0.001007:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
-TEST_DEPENDS=	p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-Progressive>=0.001007:devel/p5-Sub-Exporter-Progressive
+TEST_DEPENDS=	p5-Test-Exception>=0.29:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Context-Preserve/Makefile b/devel/p5-Context-Preserve/Makefile
index 793f0be972b1..466f0d797c62 100644
--- a/devel/p5-Context-Preserve/Makefile
+++ b/devel/p5-Context-Preserve/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Run code after a subroutine call, preserving the context the subroutine
 
-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
@@ -20,7 +20,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/devel/p5-Contextual-Return/Makefile b/devel/p5-Contextual-Return/Makefile
index 0cd8f81b2049..cf0bd1fdbab5 100644
--- a/devel/p5-Contextual-Return/Makefile
+++ b/devel/p5-Contextual-Return/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create context-sensitive return values
 
-BUILD_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want
-RUN_DEPENDS=	p5-Want>=0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Want>=0:devel/p5-Want
+RUN_DEPENDS=	p5-Want>=0:devel/p5-Want
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index 25be8483df1d..3c05773d9f95 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Coroutine process abstraction for perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=7:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-AnyEvent-AIO>=1.0:${PORTSDIR}/devel/p5-AnyEvent-AIO \
-		p5-EV>=4:${PORTSDIR}/devel/p5-EV \
-		p5-Event>=1.08:${PORTSDIR}/devel/p5-Event \
-		p5-Guard>=0.5:${PORTSDIR}/devel/p5-Guard \
-		p5-IO-AIO>=3.1:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-AnyEvent>=7:devel/p5-AnyEvent \
+		p5-AnyEvent-AIO>=1.0:devel/p5-AnyEvent-AIO \
+		p5-EV>=4:devel/p5-EV \
+		p5-Event>=1.08:devel/p5-Event \
+		p5-Guard>=0.5:devel/p5-Guard \
+		p5-IO-AIO>=3.1:devel/p5-IO-AIO \
+		p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
+BUILD_DEPENDS+=	p5-Canary-Stability>=0:devel/p5-Canary-Stability
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/p5-Curses-Application/Makefile b/devel/p5-Curses-Application/Makefile
index d3ac07e6aae4..fd0c9c1e6ed3 100644
--- a/devel/p5-Curses-Application/Makefile
+++ b/devel/p5-Curses-Application/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Curses application development framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Curses-Forms>=0:${PORTSDIR}/devel/p5-Curses-Forms
+BUILD_DEPENDS=	p5-Curses-Forms>=0:devel/p5-Curses-Forms
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Curses-Forms/Makefile b/devel/p5-Curses-Forms/Makefile
index 2f8384acc8b7..c59514dc891d 100644
--- a/devel/p5-Curses-Forms/Makefile
+++ b/devel/p5-Curses-Forms/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provide high level APIs for rapid UI design on the console
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Curses-Widgets>=0:${PORTSDIR}/devel/p5-Curses-Widgets
+BUILD_DEPENDS=	p5-Curses-Widgets>=0:devel/p5-Curses-Widgets
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index 5e3fa8063aaf..a766250e111a 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Curses based OO user interface framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index c41272c5fb56..630eecb147c3 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Curses-based widgets and functions
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Cvs/Makefile b/devel/p5-Cvs/Makefile
index 6e71d7251632..d627e7af48de 100644
--- a/devel/p5-Cvs/Makefile
+++ b/devel/p5-Cvs/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cvs - Object oriented interface to the CVS command
 
-RUN_DEPENDS=	p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Dancer-Debug/Makefile b/devel/p5-Dancer-Debug/Makefile
index d4835cc6de4c..4e4de8390bad 100644
--- a/devel/p5-Dancer-Debug/Makefile
+++ b/devel/p5-Dancer-Debug/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Dancer::Debug - Extend Plack::Middleware::Debug
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Dancer>=0:${PORTSDIR}/www/p5-Dancer \
-		p5-Plack-Middleware-Debug>=0:${PORTSDIR}/www/p5-Plack-Middleware-Debug
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Dancer>=0:www/p5-Dancer \
+		p5-Plack-Middleware-Debug>=0:www/p5-Plack-Middleware-Debug
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Danga-Socket-Callback/Makefile b/devel/p5-Danga-Socket-Callback/Makefile
index a457260c1b3f..aaeaf2b6c87c 100644
--- a/devel/p5-Danga-Socket-Callback/Makefile
+++ b/devel/p5-Danga-Socket-Callback/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Use Danga::Socket From Callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket
-RUN_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket
+BUILD_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket
+RUN_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Danga-Socket/Makefile b/devel/p5-Danga-Socket/Makefile
index 4f17d14ecb0e..4802c1792d46 100644
--- a/devel/p5-Danga-Socket/Makefile
+++ b/devel/p5-Danga-Socket/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Event loop and event-driven async socket base class
 
-RUN_DEPENDS=	p5-IO-KQueue>=0:${PORTSDIR}/devel/p5-IO-KQueue \
-		p5-Sys-Syscall>=0:${PORTSDIR}/devel/p5-Sys-Syscall
+RUN_DEPENDS=	p5-IO-KQueue>=0:devel/p5-IO-KQueue \
+		p5-Sys-Syscall>=0:devel/p5-Sys-Syscall
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-ACL/Makefile b/devel/p5-Data-ACL/Makefile
index 2309eeb5c26f..9e27285999b5 100644
--- a/devel/p5-Data-ACL/Makefile
+++ b/devel/p5-Data-ACL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::ACL - Perl extension for simple ACL lists
 
-BUILD_DEPENDS=	p5-Set-NestedGroups>=0:${PORTSDIR}/devel/p5-Set-NestedGroups
+BUILD_DEPENDS=	p5-Set-NestedGroups>=0:devel/p5-Set-NestedGroups
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Average/Makefile b/devel/p5-Data-Average/Makefile
index 73e7520ed6e2..fb98f6c15956 100644
--- a/devel/p5-Data-Average/Makefile
+++ b/devel/p5-Data-Average/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	avk@vl.ru
 COMMENT=	Hold Data Set To Calculate Average
 
-BUILD_DEPENDS=	p5-UNIVERSAL-isa>=0:${PORTSDIR}/devel/p5-UNIVERSAL-isa
-RUN_DEPENDS=	p5-UNIVERSAL-isa>=0:${PORTSDIR}/devel/p5-UNIVERSAL-isa
+BUILD_DEPENDS=	p5-UNIVERSAL-isa>=0:devel/p5-UNIVERSAL-isa
+RUN_DEPENDS=	p5-UNIVERSAL-isa>=0:devel/p5-UNIVERSAL-isa
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Bind/Makefile b/devel/p5-Data-Bind/Makefile
index db55621e536c..2e723c6eed4d 100644
--- a/devel/p5-Data-Bind/Makefile
+++ b/devel/p5-Data-Bind/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to bind and alias variables
 
-BUILD_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor	\
-		p5-Devel-Caller>0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Devel-LexAlias>0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Data-Capture>0:${PORTSDIR}/devel/p5-Data-Capture
+BUILD_DEPENDS=	p5-Class-Accessor>0:devel/p5-Class-Accessor	\
+		p5-Devel-Caller>0:devel/p5-Devel-Caller \
+		p5-Devel-LexAlias>0:devel/p5-Devel-LexAlias \
+		p5-Data-Capture>0:devel/p5-Data-Capture
 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/devel/p5-Data-ClearSilver-HDF/Makefile b/devel/p5-Data-ClearSilver-HDF/Makefile
index 7bdf8d6fb7af..fa801e5a9def 100644
--- a/devel/p5-Data-ClearSilver-HDF/Makefile
+++ b/devel/p5-Data-ClearSilver-HDF/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Convert from Perl Data Structure to ClearSilver HDF
 
-BUILD_DEPENDS=	p5-ClearSilver>=0:${PORTSDIR}/www/p5-ClearSilver \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-ClearSilver>=0:www/p5-ClearSilver \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Clone/Makefile b/devel/p5-Data-Clone/Makefile
index 55d52039f6c9..5cddadf10532 100644
--- a/devel/p5-Data-Clone/Makefile
+++ b/devel/p5-Data-Clone/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Polymorphic data cloning
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Requires>=0.03:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Requires>=0.03:devel/p5-Test-Requires
 
 USE_PERL5=	configure
 USES=		perl5
@@ -23,7 +23,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
+BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
 .endif
 
 post-install:
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index d4b0f37727fa..871bc3601249 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Data::Compare - compare perl data structures
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Domain/Makefile b/devel/p5-Data-Domain/Makefile
index e5225a9056e5..289403134fc7 100644
--- a/devel/p5-Data-Domain/Makefile
+++ b/devel/p5-Data-Domain/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Data description and validation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Scalar-Does>=0.007:${PORTSDIR}/devel/p5-Scalar-Does \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-experimental>=0:${PORTSDIR}/devel/p5-experimental
+BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Scalar-Does>=0.007:devel/p5-Scalar-Does \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-experimental>=0:devel/p5-experimental
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Data-Dump-Streamer/Makefile b/devel/p5-Data-Dump-Streamer/Makefile
index 89abe4a1251b..f3e10a2250db 100644
--- a/devel/p5-Data-Dump-Streamer/Makefile
+++ b/devel/p5-Data-Dump-Streamer/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Stream a highly accurate breadth first data dump in Perl code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-B-Utils>=0.05:${PORTSDIR}/devel/p5-B-Utils \
-		p5-PadWalker>=0.99:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-B-Utils>=0.05:devel/p5-B-Utils \
+		p5-PadWalker>=0.99:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+TEST_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
 
 CONFIGURE_ARGS=	DDS
 USES=		perl5
diff --git a/devel/p5-Data-DumpXML/Makefile b/devel/p5-Data-DumpXML/Makefile
index c9329245ad32..1d1f5481f0ea 100644
--- a/devel/p5-Data-DumpXML/Makefile
+++ b/devel/p5-Data-DumpXML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dump arbitrary data structures as XML
 
-RUN_DEPENDS=	p5-Array-RefElem>=0.01:${PORTSDIR}/misc/p5-Array-RefElem \
-		p5-XML-Parser>=2:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-Array-RefElem>=0.01:misc/p5-Array-RefElem \
+		p5-XML-Parser>=2:textproc/p5-XML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Dumper-Concise/Makefile b/devel/p5-Data-Dumper-Concise/Makefile
index 68b24b753504..7c2d55c2216f 100644
--- a/devel/p5-Data-Dumper-Concise/Makefile
+++ b/devel/p5-Data-Dumper-Concise/Makefile
@@ -19,8 +19,8 @@ OPTIONS_DEFINE=	ARGNAMES
 OPTIONS_DEFAULT=ARGNAMES
 ARGNAMES_DESC=	Enable DwarnN subroutine
 
-ARGNAMES_BUILD_DEPENDS=	p5-Devel-ArgNames>=0.03:${PORTSDIR}/devel/p5-Devel-ArgNames
-ARGNAMES_RUN_DEPENDS=	p5-Devel-ArgNames>=0.03:${PORTSDIR}/devel/p5-Devel-ArgNames
+ARGNAMES_BUILD_DEPENDS=	p5-Devel-ArgNames>=0.03:devel/p5-Devel-ArgNames
+ARGNAMES_RUN_DEPENDS=	p5-Devel-ArgNames>=0.03:devel/p5-Devel-ArgNames
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Dumper-Perltidy/Makefile b/devel/p5-Data-Dumper-Perltidy/Makefile
index ec137cf62530..dbc4cbdc65a9 100644
--- a/devel/p5-Data-Dumper-Perltidy/Makefile
+++ b/devel/p5-Data-Dumper-Perltidy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Stringify and pretty print Perl data structures
 
-RUN_DEPENDS=	perltidy:${PORTSDIR}/devel/p5-Perl-Tidy
+RUN_DEPENDS=	perltidy:devel/p5-Perl-Tidy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-GUID/Makefile b/devel/p5-Data-GUID/Makefile
index 64fa8293aa5f..ce2afbe1333d 100644
--- a/devel/p5-Data-GUID/Makefile
+++ b/devel/p5-Data-GUID/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Generate globally unique identifiers
 
-BUILD_DEPENDS=	p5-Sub-Install>=0.03:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Sub-Exporter>=0.90:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Data-UUID>=1.148:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-Sub-Install>=0.03:devel/p5-Sub-Install \
+		p5-Sub-Exporter>=0.90:devel/p5-Sub-Exporter \
+		p5-Data-UUID>=1.148:devel/p5-Data-UUID
 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/devel/p5-Data-HexDump-Range/Makefile b/devel/p5-Data-HexDump-Range/Makefile
index 9d5bc7e6dfff..73bdcf75d367 100644
--- a/devel/p5-Data-HexDump-Range/Makefile
+++ b/devel/p5-Data-HexDump-Range/Makefile
@@ -10,13 +10,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Hexadecimal Range Dumper with color, bitfields and skip ranges
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Text-Colorizer>=0:${PORTSDIR}/textproc/p5-Text-Colorizer \
-		p5-Term-Bash-Completion-Generator>=0:${PORTSDIR}/shells/p5-Term-Bash-Completion-Generator
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-Text-Colorizer>=0:textproc/p5-Text-Colorizer \
+		p5-Term-Bash-Completion-Generator>=0:shells/p5-Term-Bash-Completion-Generator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Hierarchy/Makefile b/devel/p5-Data-Hierarchy/Makefile
index 9b00966c9c67..98cea72eb514 100644
--- a/devel/p5-Data-Hierarchy/Makefile
+++ b/devel/p5-Data-Hierarchy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Handle data in a hierarchical structure
 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/devel/p5-Data-IEEE754/Makefile b/devel/p5-Data-IEEE754/Makefile
index b954f5a88234..0a0bf7a89b43 100644
--- a/devel/p5-Data-IEEE754/Makefile
+++ b/devel/p5-Data-IEEE754/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pack and unpack big-endian IEEE754 floats and doubles
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Bits>=0:${PORTSDIR}/devel/p5-Test-Bits
+TEST_DEPENDS=	p5-Test-Bits>=0:devel/p5-Test-Bits
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Data-JavaScript-Anon/Makefile b/devel/p5-Data-JavaScript-Anon/Makefile
index 80dbc244b86b..4f1db9dac1f7 100644
--- a/devel/p5-Data-JavaScript-Anon/Makefile
+++ b/devel/p5-Data-JavaScript-Anon/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Dump big dumb Perl structs to anonymous JavaScript structs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Default>=1.51:${PORTSDIR}/devel/p5-Class-Default \
-		p5-Params-Util>=0.01:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Class-Default>=1.51:devel/p5-Class-Default \
+		p5-Params-Util>=0.01:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Localize/Makefile b/devel/p5-Data-Localize/Makefile
index 8308d3a75014..e0448e9127f0 100644
--- a/devel/p5-Data-Localize/Makefile
+++ b/devel/p5-Data-Localize/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension for alternate data localization API
 LICENSE=	MIT
 
 RUN_DEPENDS=	\
-	p5-Moo>=1.000008:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Types-MooseLike>0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-	p5-Log-Minimal>=0.14:${PORTSDIR}/devel/p5-Log-Minimal
+	p5-Moo>=1.000008:devel/p5-Moo \
+	p5-MooX-Types-MooseLike>0:devel/p5-MooX-Types-MooseLike \
+	p5-Log-Minimal>=0.14:devel/p5-Log-Minimal
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=	perl5
diff --git a/devel/p5-Data-MessagePack-Stream/Makefile b/devel/p5-Data-MessagePack-Stream/Makefile
index 9c5b362e5aa6..d7706c35c9d2 100644
--- a/devel/p5-Data-MessagePack-Stream/Makefile
+++ b/devel/p5-Data-MessagePack-Stream/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for yet another messagepack streaming deserializer
 
-BUILD_DEPENDS=	p5-Data-MessagePack>0:${PORTSDIR}/devel/p5-Data-MessagePack
+BUILD_DEPENDS=	p5-Data-MessagePack>0:devel/p5-Data-MessagePack
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-MessagePack/Makefile b/devel/p5-Data-MessagePack/Makefile
index 2849e56a7534..16e7df5006f5 100644
--- a/devel/p5-Data-MessagePack/Makefile
+++ b/devel/p5-Data-MessagePack/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for MessagePack
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-LeakTrace>0:${PORTSDIR}/devel/p5-Test-LeakTrace
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-LeakTrace>0:devel/p5-Test-LeakTrace
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Model/Makefile b/devel/p5-Data-Model/Makefile
index 6e234b150230..46655e494a66 100644
--- a/devel/p5-Data-Model/Makefile
+++ b/devel/p5-Data-Model/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for model interface which had more data sources unified
 
 RUN_DEPENDS=	\
-	p5-Class-Trigger>0:${PORTSDIR}/devel/p5-Class-Trigger \
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+	p5-Class-Trigger>0:devel/p5-Class-Trigger \
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-DBI>0:databases/p5-DBI \
+	p5-Params-Validate>0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Uplevel>0:${PORTSDIR}/devel/p5-Sub-Uplevel \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Uplevel>0:devel/p5-Sub-Uplevel \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-URI>=0:net/p5-URI
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Data-Munge/Makefile b/devel/p5-Data-Munge/Makefile
index 17edf4467f78..6bfbdbd84ea9 100644
--- a/devel/p5-Data-Munge/Makefile
+++ b/devel/p5-Data-Munge/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Various utility functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Object/Makefile b/devel/p5-Data-Object/Makefile
index 15925d10a5a3..e99168128c09 100644
--- a/devel/p5-Data-Object/Makefile
+++ b/devel/p5-Data-Object/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Data Type Objects for Perl 5
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moo>=2.000001:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=1.000005:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-Type-Tiny-Signatures>=0.05:${PORTSDIR}/devel/p5-Type-Tiny-Signatures
+BUILD_DEPENDS=	p5-Moo>=2.000001:devel/p5-Moo \
+		p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
+		p5-Type-Tiny-Signatures>=0.05:devel/p5-Type-Tiny-Signatures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Data-ObjectDriver/Makefile b/devel/p5-Data-ObjectDriver/Makefile
index 31aca66d5c7d..a3672ab1ac62 100644
--- a/devel/p5-Data-ObjectDriver/Makefile
+++ b/devel/p5-Data-ObjectDriver/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Simple, transparent data interface, with caching
 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-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Text-SimpleTable>=0:${PORTSDIR}/textproc/p5-Text-SimpleTable
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Trigger>=0:devel/p5-Class-Trigger \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Text-SimpleTable>=0:textproc/p5-Text-SimpleTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Data-OptList/Makefile b/devel/p5-Data-OptList/Makefile
index 4f89721cf808..698744ae1e8f 100644
--- a/devel/p5-Data-OptList/Makefile
+++ b/devel/p5-Data-OptList/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Params-Util>=0.14:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Install>=0.92:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-Params-Util>=0.14:devel/p5-Params-Util \
+		p5-Sub-Install>=0.92:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Data-Page-NoTotalEntries/Makefile b/devel/p5-Data-Page-NoTotalEntries/Makefile
index ad347bcad958..dc3f38032860 100644
--- a/devel/p5-Data-Page-NoTotalEntries/Makefile
+++ b/devel/p5-Data-Page-NoTotalEntries/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for paging results without total entries
 
 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}
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-ParseBinary/Makefile b/devel/p5-Data-ParseBinary/Makefile
index 095488695553..56f30b698b27 100644
--- a/devel/p5-Data-ParseBinary/Makefile
+++ b/devel/p5-Data-ParseBinary/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	az@FreeBSD.org
 COMMENT=	Yet Another parser for binary structures
 
-BUILD_DEPENDS=	p5-Math-BigInt>=1.993:${PORTSDIR}/math/p5-Math-BigInt
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Math-BigInt>=1.993:math/p5-Math-BigInt
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Path/Makefile b/devel/p5-Data-Path/Makefile
index b0833c6d61d4..f8e46c7c16c8 100644
--- a/devel/p5-Data-Path/Makefile
+++ b/devel/p5-Data-Path/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	XPath-like access to complex data structures
 
-BUILD_DEPENDS=	p5-Test-MockObject>=1.08:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Test-MockObject>=1.08:devel/p5-Test-MockObject \
+		p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Peek/Makefile b/devel/p5-Data-Peek/Makefile
index 89852db4f180..d6ac8cfe40cf 100644
--- a/devel/p5-Data-Peek/Makefile
+++ b/devel/p5-Data-Peek/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of low-level debug facilities
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Perl/Makefile b/devel/p5-Data-Perl/Makefile
index 10e172808fdb..e113fedebe2e 100644
--- a/devel/p5-Data-Perl/Makefile
+++ b/devel/p5-Data-Perl/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Base classes wrapping fundamental Perl data types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-strictures>=1:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-strictures>=1:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Printer/Makefile b/devel/p5-Data-Printer/Makefile
index 5741ca3f98c5..4a6ec9843284 100644
--- a/devel/p5-Data-Printer/Makefile
+++ b/devel/p5-Data-Printer/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Colored pretty-print of Perl data structures and objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone-PP>=0:${PORTSDIR}/devel/p5-Clone-PP \
-		p5-File-HomeDir>=0.91:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Package-Stash>=0.30:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally
+BUILD_DEPENDS=	p5-Clone-PP>=0:devel/p5-Clone-PP \
+		p5-File-HomeDir>=0.91:devel/p5-File-HomeDir \
+		p5-Package-Stash>=0.30:devel/p5-Package-Stash \
+		p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-IO-Pty-Easy>=0:${PORTSDIR}/devel/p5-IO-Pty-Easy \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Rand-Obscure/Makefile b/devel/p5-Data-Rand-Obscure/Makefile
index 81b902c1c9ab..0d4d631639df 100644
--- a/devel/p5-Data-Rand-Obscure/Makefile
+++ b/devel/p5-Data-Rand-Obscure/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl module for generating (fairly) random strings easily
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Object-Tiny>=1.08:${PORTSDIR}/devel/p5-Object-Tiny
-RUN_DEPENDS=	p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Object-Tiny>=1.08:${PORTSDIR}/devel/p5-Object-Tiny
+BUILD_DEPENDS=	p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
+		p5-Object-Tiny>=1.08:devel/p5-Object-Tiny
+RUN_DEPENDS=	p5-Carp-Clan>=6.04:devel/p5-Carp-Clan \
+		p5-Object-Tiny>=1.08:devel/p5-Object-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Random/Makefile b/devel/p5-Data-Random/Makefile
index 9974d455e6ec..a49ef3f8540f 100644
--- a/devel/p5-Data-Random/Makefile
+++ b/devel/p5-Data-Random/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module for generating random data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Time-Piece>=1.16:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny
-RUN_DEPENDS=	p5-Time-Piece>=1.16:${PORTSDIR}/devel/p5-Time-Piece
+BUILD_DEPENDS=	p5-Time-Piece>=1.16:devel/p5-Time-Piece \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny
+RUN_DEPENDS=	p5-Time-Piece>=1.16:devel/p5-Time-Piece
 
 OPTIONS_DEFINE=	GD
 GD_DESC=	Support for rand_image()
@@ -23,7 +23,7 @@ GD_DESC=	Support for rand_image()
 USES=		perl5
 USE_PERL5=	configure
 
-GD_BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
-GD_RUN_DEPENDS=		p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+GD_BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
+GD_RUN_DEPENDS=		p5-GD>=0:graphics/p5-GD
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Record/Makefile b/devel/p5-Data-Record/Makefile
index 70f273ca7885..838962c26994 100644
--- a/devel/p5-Data-Record/Makefile
+++ b/devel/p5-Data-Record/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Data::Record - "split" on steroids
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Hash-Util-FieldHash-Compat>0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat
-BUILD_DEPENDS=	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Hash-Util-FieldHash-Compat>0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Scope-Guard>=0.20:${PORTSDIR}/devel/p5-Scope-Guard
+RUN_DEPENDS=	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Hash-Util-FieldHash-Compat>0:devel/p5-Hash-Util-FieldHash-Compat
+BUILD_DEPENDS=	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Hash-Util-FieldHash-Compat>0:devel/p5-Hash-Util-FieldHash-Compat
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Remember/Makefile b/devel/p5-Data-Remember/Makefile
index 39d1d10339e2..67581e0cad6d 100644
--- a/devel/p5-Data-Remember/Makefile
+++ b/devel/p5-Data-Remember/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Remember complex information without giving yourself a headache
 
-BUILD_DEPENDS=	p5-DBM-Deep>0:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-POE>0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-DBM-Deep>0:databases/p5-DBM-Deep \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+		p5-POE>0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Rmap/Makefile b/devel/p5-Data-Rmap/Makefile
index e02aae849eb6..d9547c482d26 100644
--- a/devel/p5-Data-Rmap/Makefile
+++ b/devel/p5-Data-Rmap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Recursive map, apply a block to a data structure
 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/devel/p5-Data-Rx/Makefile b/devel/p5-Data-Rx/Makefile
index fb378b86bf80..5518a0954ab0 100644
--- a/devel/p5-Data-Rx/Makefile
+++ b/devel/p5-Data-Rx/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl implementation of Rx schema system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Number-Tolerant>=0:${PORTSDIR}/devel/p5-Number-Tolerant
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-Number-Tolerant>=0:devel/p5-Number-Tolerant
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-SExpression/Makefile b/devel/p5-Data-SExpression/Makefile
index 0a696f5dde44..9faf711df0bd 100644
--- a/devel/p5-Data-SExpression/Makefile
+++ b/devel/p5-Data-SExpression/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to parse lisp S-expressions into perl data structures
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+	p5-Class-Accessor>0:devel/p5-Class-Accessor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Section/Makefile b/devel/p5-Data-Section/Makefile
index 6123567f5fad..6da1ec1f25cd 100644
--- a/devel/p5-Data-Section/Makefile
+++ b/devel/p5-Data-Section/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Read multiple hunks of data out of your DATA section
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Sub-Exporter>=0.979:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+		p5-Sub-Exporter>=0.979:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Serializable/Makefile b/devel/p5-Data-Serializable/Makefile
index 566ec8432a75..088d8b373278 100644
--- a/devel/p5-Data-Serializable/Makefile
+++ b/devel/p5-Data-Serializable/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Moose role that adds serialization support to any class
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Serializer-Sereal/Makefile b/devel/p5-Data-Serializer-Sereal/Makefile
index 574cfff6d858..1cd4b3cc7b2a 100644
--- a/devel/p5-Data-Serializer-Sereal/Makefile
+++ b/devel/p5-Data-Serializer-Sereal/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Creates bridge between Data::Serializer and Sereal
 
-BUILD_DEPENDS=	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer \
-		p5-Sereal-Decoder>=0:${PORTSDIR}/converters/p5-Sereal-Decoder \
-		p5-Sereal-Encoder>=0:${PORTSDIR}/converters/p5-Sereal-Encoder
+BUILD_DEPENDS=	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+		p5-Sereal-Decoder>=0:converters/p5-Sereal-Decoder \
+		p5-Sereal-Encoder>=0:converters/p5-Sereal-Encoder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Stag/Makefile b/devel/p5-Data-Stag/Makefile
index f5704302124f..d7635498308b 100644
--- a/devel/p5-Data-Stag/Makefile
+++ b/devel/p5-Data-Stag/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Structured Tags datastructures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+RUN_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Stream-Bulk/Makefile b/devel/p5-Data-Stream-Bulk/Makefile
index 9d4da3319565..16fc076d7531 100644
--- a/devel/p5-Data-Stream-Bulk/Makefile
+++ b/devel/p5-Data-Stream-Bulk/Makefile
@@ -14,13 +14,13 @@ COMMENT=	N at a time iteration API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=0.90:devel/p5-Moose \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_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/devel/p5-Data-Structure-Util/Makefile b/devel/p5-Data-Structure-Util/Makefile
index e1908b3d53b1..f9196a0ab3af 100644
--- a/devel/p5-Data-Structure-Util/Makefile
+++ b/devel/p5-Data-Structure-Util/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module to change the nature of data within a structure
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Data-Throttler-Memcached/Makefile b/devel/p5-Data-Throttler-Memcached/Makefile
index a2d1ce2fda8f..0abc36ed5c38 100644
--- a/devel/p5-Data-Throttler-Memcached/Makefile
+++ b/devel/p5-Data-Throttler-Memcached/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Memcached-Based Data::Throttler
 
-BUILD_DEPENDS=	p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \
-		p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Cache-Memcached-Managed>=0:${PORTSDIR}/databases/p5-Cache-Memcached-Managed \
-		p5-Data-Throttler>=0:${PORTSDIR}/devel/p5-Data-Throttler \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
+		p5-Data-Throttler>=0:devel/p5-Data-Throttler \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Cache-Memcached-Managed>=0:databases/p5-Cache-Memcached-Managed \
+		p5-Data-Throttler>=0:devel/p5-Data-Throttler \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Throttler/Makefile b/devel/p5-Data-Throttler/Makefile
index 146ae85a7bac..4aeece040fad 100644
--- a/devel/p5-Data-Throttler/Makefile
+++ b/devel/p5-Data-Throttler/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Limit data throughput
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Log4perl>=1:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Set-IntSpan>0:${PORTSDIR}/math/p5-Set-IntSpan \
-		p5-Text-ASCIITable>0:${PORTSDIR}/textproc/p5-Text-ASCIITable \
-		p5-YAML>=0.62:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Log-Log4perl>=1:devel/p5-Log-Log4perl \
+		p5-Set-IntSpan>0:math/p5-Set-IntSpan \
+		p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable \
+		p5-YAML>=0.62:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-Thunk/Makefile b/devel/p5-Data-Thunk/Makefile
index a1e4d4c2969f..9f628db23bbc 100644
--- a/devel/p5-Data-Thunk/Makefile
+++ b/devel/p5-Data-Thunk/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Lazy/deferred evaluation - a sneakier Scalar::Defer
 
-BUILD_DEPENDS=	p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-Data-Swap>=0:${PORTSDIR}/devel/p5-Data-Swap \
-		p5-Devel-Refcount>=0:${PORTSDIR}/devel/p5-Devel-Refcount \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-UNIVERSAL-ref>=0:${PORTSDIR}/devel/p5-UNIVERSAL-ref \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-Data-Swap>=0:devel/p5-Data-Swap \
+		p5-Devel-Refcount>=0:devel/p5-Devel-Refcount \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-UNIVERSAL-ref>=0:devel/p5-UNIVERSAL-ref \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
index 1395c644cb7c..4510b3032da2 100644
--- a/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
+++ b/devel/p5-Data-TreeDumper-Renderer-GTK/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	GTK renderer for Data::TreeDumper
 
-BUILD_DEPENDS=	p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Data-TreeDumper/Makefile b/devel/p5-Data-TreeDumper/Makefile
index 6ba9ccb624a6..12616ecc6e3b 100644
--- a/devel/p5-Data-TreeDumper/Makefile
+++ b/devel/p5-Data-TreeDumper/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Dumps a data structure in a tree fashion
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-Devel-Size>=0:${PORTSDIR}/devel/p5-Devel-Size \
-		p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+BUILD_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-Devel-Size>=0:devel/p5-Devel-Size \
+		p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally \
+		p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Data-Util/Makefile b/devel/p5-Data-Util/Makefile
index 6e2279beeccd..34e75209ae8b 100644
--- a/devel/p5-Data-Util/Makefile
+++ b/devel/p5-Data-Util/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-MRO-Compat>=0.09:${PORTSDIR}/devel/p5-MRO-Compat \
-	p5-Hash-Util-FieldHash-Compat>0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat
+	p5-MRO-Compat>=0.09:devel/p5-MRO-Compat \
+	p5-Hash-Util-FieldHash-Compat>0:devel/p5-Hash-Util-FieldHash-Compat
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Scope-Guard>=0.20:${PORTSDIR}/devel/p5-Scope-Guard
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+	p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Data-Validator/Makefile b/devel/p5-Data-Validator/Makefile
index 639103ae575d..22b2038d175e 100644
--- a/devel/p5-Data-Validator/Makefile
+++ b/devel/p5-Data-Validator/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Rule based validator on type constraint system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.93:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.93:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Data-Visitor-Encode/Makefile b/devel/p5-Data-Visitor-Encode/Makefile
index 0b3b411b63f2..83aebffd3a8c 100644
--- a/devel/p5-Data-Visitor-Encode/Makefile
+++ b/devel/p5-Data-Visitor-Encode/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to encode/decode values in a structure
 
 RUN_DEPENDS=	\
-	p5-Data-Visitor>=0.18:${PORTSDIR}/devel/p5-Data-Visitor
+	p5-Data-Visitor>=0.18:devel/p5-Data-Visitor
 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/devel/p5-Data-Visitor/Makefile b/devel/p5-Data-Visitor/Makefile
index e8e3d00ff357..70adf242f4ae 100644
--- a/devel/p5-Data-Visitor/Makefile
+++ b/devel/p5-Data-Visitor/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Visitor style traversal of Perl data structures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Tie-ToObject>=0.01:${PORTSDIR}/devel/p5-Tie-ToObject \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load \
+		p5-Moose>=0.89:devel/p5-Moose \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Tie-ToObject>=0.01:devel/p5-Tie-ToObject \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Data-Alias>=0:${PORTSDIR}/devel/p5-Data-Alias \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Data-Alias>=0:devel/p5-Data-Alias \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Calc-Iterator/Makefile b/devel/p5-Date-Calc-Iterator/Makefile
index 4f5effd2cd43..dab0274975ab 100644
--- a/devel/p5-Date-Calc-Iterator/Makefile
+++ b/devel/p5-Date-Calc-Iterator/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Iterate over a range of dates
 
-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/devel/p5-Date-Calc-XS/Makefile b/devel/p5-Date-Calc-XS/Makefile
index 0240af985e33..f551c4442cbd 100644
--- a/devel/p5-Date-Calc-XS/Makefile
+++ b/devel/p5-Date-Calc-XS/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	XS wrapper and C library plug-in for Date::Calc
 
-BUILD_DEPENDS=	p5-Date-Calc>=6.4:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Bit-Vector>=7.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Date-Calc>=6.4:devel/p5-Date-Calc \
+		p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
+		p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Calc/Makefile b/devel/p5-Date-Calc/Makefile
index 4ba1fe547913..d99b2d2d7447 100644
--- a/devel/p5-Date-Calc/Makefile
+++ b/devel/p5-Date-Calc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Gregorian calendar date calculations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Bit-Vector>=7.4:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-Carp-Clan>=6.04:${PORTSDIR}/devel/p5-Carp-Clan
+RUN_DEPENDS=	p5-Bit-Vector>=7.4:math/p5-Bit-Vector \
+		p5-Carp-Clan>=6.04:devel/p5-Carp-Clan
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-DayOfWeek/Makefile b/devel/p5-Date-DayOfWeek/Makefile
index 5008b5e93130..dad0fce22663 100644
--- a/devel/p5-Date-DayOfWeek/Makefile
+++ b/devel/p5-Date-DayOfWeek/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Determine the day of the week for any date
 
-BUILD_DEPENDS=	p5-Date-Leapyear>=0:${PORTSDIR}/devel/p5-Date-Leapyear \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Date-Leapyear>=0:devel/p5-Date-Leapyear \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Extract/Makefile b/devel/p5-Date-Extract/Makefile
index 4dc28288482c..ce315f93259a 100644
--- a/devel/p5-Date-Extract/Makefile
+++ b/devel/p5-Date-Extract/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Extract probable dates from strings
 
-BUILD_DEPENDS=	p5-DateTime-Format-Natural>0:${PORTSDIR}/devel/p5-DateTime-Format-Natural	\
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable
+BUILD_DEPENDS=	p5-DateTime-Format-Natural>0:devel/p5-DateTime-Format-Natural	\
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 NO_ARCH=	yes
 
diff --git a/devel/p5-Date-Holidays-DK/Makefile b/devel/p5-Date-Holidays-DK/Makefile
index b8a44e6ba331..bb9b866c1a29 100644
--- a/devel/p5-Date-Holidays-DK/Makefile
+++ b/devel/p5-Date-Holidays-DK/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Determine Danish public holidays
 
-BUILD_DEPENDS=	p5-Date-Simple>=0:${PORTSDIR}/devel/p5-Date-Simple \
-		p5-Date-Easter>=0:${PORTSDIR}/devel/p5-Date-Easter
+BUILD_DEPENDS=	p5-Date-Simple>=0:devel/p5-Date-Simple \
+		p5-Date-Easter>=0:devel/p5-Date-Easter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-ICal/Makefile b/devel/p5-Date-ICal/Makefile
index 1a2d05607bea..2b496d9ea671 100644
--- a/devel/p5-Date-ICal/Makefile
+++ b/devel/p5-Date-ICal/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ICalendar date objects
 
-BUILD_DEPENDS=	p5-Date-Leapyear>=1.03:${PORTSDIR}/devel/p5-Date-Leapyear
-RUN_DEPENDS=	p5-Date-Leapyear>=1.03:${PORTSDIR}/devel/p5-Date-Leapyear
+BUILD_DEPENDS=	p5-Date-Leapyear>=1.03:devel/p5-Date-Leapyear
+RUN_DEPENDS=	p5-Date-Leapyear>=1.03:devel/p5-Date-Leapyear
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-ISO/Makefile b/devel/p5-Date-ISO/Makefile
index 77526d2b5b7e..193f5a3a6d21 100644
--- a/devel/p5-Date-ISO/Makefile
+++ b/devel/p5-Date-ISO/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Converts dates between ISO and Gregorian formats
 
-BUILD_DEPENDS=	p5-Date-ICal>=1.54:${PORTSDIR}/devel/p5-Date-ICal \
-		p5-Date-Leapyear>=0:${PORTSDIR}/devel/p5-Date-Leapyear
+BUILD_DEPENDS=	p5-Date-ICal>=1.54:devel/p5-Date-ICal \
+		p5-Date-Leapyear>=0:devel/p5-Date-Leapyear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 6fa29731e03d..46f0288c7d87 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl5 module containing date manipulation routines
 
-TEST_DEPENDS=	p5-Test-Inter>=0:${PORTSDIR}/devel/p5-Test-Inter
+TEST_DEPENDS=	p5-Test-Inter>=0:devel/p5-Test-Inter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Pcalc/Makefile b/devel/p5-Date-Pcalc/Makefile
index e09edf5d0775..36c71455fe08 100644
--- a/devel/p5-Date-Pcalc/Makefile
+++ b/devel/p5-Date-Pcalc/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Gregorian calendar date calculations
 
-BUILD_DEPENDS=	p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Bit-Vector>=7.0:${PORTSDIR}/math/p5-Bit-Vector
+BUILD_DEPENDS=	p5-Carp-Clan>=5.3:devel/p5-Carp-Clan \
+		p5-Bit-Vector>=7.0:math/p5-Bit-Vector
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Piece/Makefile b/devel/p5-Date-Piece/Makefile
index af26e4912683..eef2f97d37e9 100644
--- a/devel/p5-Date-Piece/Makefile
+++ b/devel/p5-Date-Piece/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	Date-Piece-v0.0.3
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	Perl5 module containing date manipulation routines
 
-BUILD_DEPENDS=	p5-Date-Simple>=3.03:${PORTSDIR}/devel/p5-Date-Simple
-RUN_DEPENDS=	p5-Date-Simple>=3.03:${PORTSDIR}/devel/p5-Date-Simple
-#TEST_DEPENDS=	p5-Test-Inter>=0:${PORTSDIR}/devel/p5-Test-Inter
+BUILD_DEPENDS=	p5-Date-Simple>=3.03:devel/p5-Date-Simple
+RUN_DEPENDS=	p5-Date-Simple>=3.03:devel/p5-Date-Simple
+#TEST_DEPENDS=	p5-Test-Inter>=0:devel/p5-Test-Inter
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Date-Range/Makefile b/devel/p5-Date-Range/Makefile
index 5dd8f43003b9..4644eef9681b 100644
--- a/devel/p5-Date-Range/Makefile
+++ b/devel/p5-Date-Range/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Date::Range - work with a range of dates
 
-BUILD_DEPENDS=	p5-Date-Simple>=0.03:${PORTSDIR}/devel/p5-Date-Simple
-RUN_DEPENDS=	p5-Date-Simple>=0.03:${PORTSDIR}/devel/p5-Date-Simple
+BUILD_DEPENDS=	p5-Date-Simple>=0.03:devel/p5-Date-Simple
+RUN_DEPENDS=	p5-Date-Simple>=0.03:devel/p5-Date-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Date-Roman/Makefile b/devel/p5-Date-Roman/Makefile
index 0118629130e1..24f3f2e09135 100644
--- a/devel/p5-Date-Roman/Makefile
+++ b/devel/p5-Date-Roman/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	Perl module to play with Roman dates
 
-BUILD_DEPENDS=	p5-Roman>=0:${PORTSDIR}/math/p5-Roman
+BUILD_DEPENDS=	p5-Roman>=0:math/p5-Roman
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Astro/Makefile b/devel/p5-DateTime-Astro/Makefile
index eca62de2bb31..921080c5ee61 100644
--- a/devel/p5-DateTime-Astro/Makefile
+++ b/devel/p5-DateTime-Astro/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Functions For Astromical Calendars
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set
+LIB_DEPENDS=	libmpfr.so:math/mpfr
 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
 
 USE_PERL5=	configure
 USES=		gmake localbase perl5
diff --git a/devel/p5-DateTime-Calendar-Chinese/Makefile b/devel/p5-DateTime-Calendar-Chinese/Makefile
index c003aae963b7..cce5909f352f 100644
--- a/devel/p5-DateTime-Calendar-Chinese/Makefile
+++ b/devel/p5-DateTime-Calendar-Chinese/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Traditional Chinese Calendar Implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:${PORTSDIR}/devel/p5-DateTime-Event-Chinese
-RUN_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:${PORTSDIR}/devel/p5-DateTime-Event-Chinese
+BUILD_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:devel/p5-DateTime-Event-Chinese
+RUN_DEPENDS=	p5-DateTime-Event-Chinese>=1.00:devel/p5-DateTime-Event-Chinese
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Calendar-Christian/Makefile b/devel/p5-DateTime-Calendar-Christian/Makefile
index 96e57c539532..8f40186d28bd 100644
--- a/devel/p5-DateTime-Calendar-Christian/Makefile
+++ b/devel/p5-DateTime-Calendar-Christian/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Christian calendar
 
-BUILD_DEPENDS=	p5-DateTime-Calendar-Julian>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Julian
+BUILD_DEPENDS=	p5-DateTime-Calendar-Julian>=0:devel/p5-DateTime-Calendar-Julian
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Discordian/Makefile b/devel/p5-DateTime-Calendar-Discordian/Makefile
index ade326b2d31a..8981de9f8c9c 100644
--- a/devel/p5-DateTime-Calendar-Discordian/Makefile
+++ b/devel/p5-DateTime-Calendar-Discordian/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	philip@FreeBSD.org
 COMMENT=	Perl extension for the Discordian Calendar
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Locale>=0:devel/p5-DateTime-Locale \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
index d902b6914e97..3634a665a93a 100644
--- a/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
+++ b/devel/p5-DateTime-Calendar-FrenchRevolutionary/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0.14:${PORTSDIR}/devel/p5-DateTime \
-		p5-Roman>=1.22:${PORTSDIR}/math/p5-Roman
+RUN_DEPENDS=	p5-DateTime>=0.14:devel/p5-DateTime \
+		p5-Roman>=1.22:math/p5-Roman
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Calendar-Hebrew/Makefile b/devel/p5-DateTime-Calendar-Hebrew/Makefile
index a25d35087e48..cad3e8d06278 100644
--- a/devel/p5-DateTime-Calendar-Hebrew/Makefile
+++ b/devel/p5-DateTime-Calendar-Hebrew/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Hebrew calendar
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Event-Sunrise>=0:${PORTSDIR}/devel/p5-DateTime-Event-Sunrise
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Japanese/Makefile b/devel/p5-DateTime-Calendar-Japanese/Makefile
index e23c8403ed74..a2d390b62970 100644
--- a/devel/p5-DateTime-Calendar-Japanese/Makefile
+++ b/devel/p5-DateTime-Calendar-Japanese/Makefile
@@ -12,20 +12,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	DateTime Extension for Traditional Japanese Calendars
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Util-Calc>=0:${PORTSDIR}/devel/p5-DateTime-Util-Calc \
-		p5-DateTime-Calendar-Chinese>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Chinese \
-		p5-DateTime-Event-Sunrise>=0:${PORTSDIR}/devel/p5-DateTime-Event-Sunrise \
-		ja-p5-DateTime-Calendar-Japanese-Era>=0:${PORTSDIR}/japanese/p5-DateTime-Calendar-Japanese-Era \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Util-Calc>=0:${PORTSDIR}/devel/p5-DateTime-Util-Calc \
-		p5-DateTime-Calendar-Chinese>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Chinese \
-		p5-DateTime-Event-Sunrise>=0:${PORTSDIR}/devel/p5-DateTime-Event-Sunrise \
-		ja-p5-DateTime-Calendar-Japanese-Era>=0:${PORTSDIR}/japanese/p5-DateTime-Calendar-Japanese-Era \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Util-Calc>=0:devel/p5-DateTime-Util-Calc \
+		p5-DateTime-Calendar-Chinese>=0:devel/p5-DateTime-Calendar-Chinese \
+		p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise \
+		ja-p5-DateTime-Calendar-Japanese-Era>=0:japanese/p5-DateTime-Calendar-Japanese-Era \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-YAML>0:textproc/p5-YAML
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Util-Calc>=0:devel/p5-DateTime-Util-Calc \
+		p5-DateTime-Calendar-Chinese>=0:devel/p5-DateTime-Calendar-Chinese \
+		p5-DateTime-Event-Sunrise>=0:devel/p5-DateTime-Event-Sunrise \
+		ja-p5-DateTime-Calendar-Japanese-Era>=0:japanese/p5-DateTime-Calendar-Japanese-Era \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-YAML>0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Calendar-Julian/Makefile b/devel/p5-DateTime-Calendar-Julian/Makefile
index ffa8b3a19169..411cdff0e192 100644
--- a/devel/p5-DateTime-Calendar-Julian/Makefile
+++ b/devel/p5-DateTime-Calendar-Julian/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dates in the Julian calendar
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Mayan/Makefile b/devel/p5-DateTime-Calendar-Mayan/Makefile
index 8c04858faea6..b478e347933d 100644
--- a/devel/p5-DateTime-Calendar-Mayan/Makefile
+++ b/devel/p5-DateTime-Calendar-Mayan/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mayan Long Count, Haab, and Tzolkin calendars
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Calendar-Pataphysical/Makefile b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
index 2f7d88e99989..b9a364bb745f 100644
--- a/devel/p5-DateTime-Calendar-Pataphysical/Makefile
+++ b/devel/p5-DateTime-Calendar-Pataphysical/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Dates in the pataphysical calendar
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0:${PORTSDIR}/devel/p5-DateTime-Locale
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Locale>=0:devel/p5-DateTime-Locale
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Event-Chinese/Makefile b/devel/p5-DateTime-Event-Chinese/Makefile
index c39c3642fb19..068b64f844d3 100644
--- a/devel/p5-DateTime-Event-Chinese/Makefile
+++ b/devel/p5-DateTime-Event-Chinese/Makefile
@@ -15,10 +15,10 @@ COMMENT=	DateTime Extension for Calculating Important Chinese Dates
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Astro>=0:${PORTSDIR}/devel/p5-DateTime-Astro \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
-RUN_DEPENDS=	p5-DateTime-Astro>=0:${PORTSDIR}/devel/p5-DateTime-Astro \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
+BUILD_DEPENDS=	p5-DateTime-Astro>=0:devel/p5-DateTime-Astro \
+		p5-Math-Round>=0:math/p5-Math-Round
+RUN_DEPENDS=	p5-DateTime-Astro>=0:devel/p5-DateTime-Astro \
+		p5-Math-Round>=0:math/p5-Math-Round
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Event-Cron/Makefile b/devel/p5-DateTime-Event-Cron/Makefile
index 9e5ff252e5fb..ad9db17ab837 100644
--- a/devel/p5-DateTime-Event-Cron/Makefile
+++ b/devel/p5-DateTime-Event-Cron/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime extension for generating recurrence sets from crontab
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Set-Crontab>=0:${PORTSDIR}/devel/p5-Set-Crontab
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Set-Crontab>=0:devel/p5-Set-Crontab
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Easter/Makefile b/devel/p5-DateTime-Event-Easter/Makefile
index 5ef9e68a84ba..53f1975b98bd 100644
--- a/devel/p5-DateTime-Event-Easter/Makefile
+++ b/devel/p5-DateTime-Event-Easter/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Returns Easter events for DateTime objects
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Calendar-Julian>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Julian \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Calendar-Julian>=0:devel/p5-DateTime-Calendar-Julian \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-ICal/Makefile b/devel/p5-DateTime-Event-ICal/Makefile
index 583f1924bc0a..aa4307a9b68b 100644
--- a/devel/p5-DateTime-Event-ICal/Makefile
+++ b/devel/p5-DateTime-Event-ICal/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl DateTime extension for computing rfc2445 recurrences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Event-Recurrence>=0.11:${PORTSDIR}/devel/p5-DateTime-Event-Recurrence
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Event-Recurrence>=0.11:devel/p5-DateTime-Event-Recurrence
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Event-Lunar/Makefile b/devel/p5-DateTime-Event-Lunar/Makefile
index c6aafa538cd9..1bcc448267d6 100644
--- a/devel/p5-DateTime-Event-Lunar/Makefile
+++ b/devel/p5-DateTime-Event-Lunar/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Compute Lunar Events
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime-Astro>=1.00:${PORTSDIR}/devel/p5-DateTime-Astro \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-DateTime-Astro>=1.00:devel/p5-DateTime-Astro \
+		p5-Math-Round>=0:math/p5-Math-Round
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-NameDay/Makefile b/devel/p5-DateTime-Event-NameDay/Makefile
index e90816fd7e1c..a8279dd06e14 100644
--- a/devel/p5-DateTime-Event-NameDay/Makefile
+++ b/devel/p5-DateTime-Event-NameDay/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl DateTime extension to work with namedays from various countries
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime-Calendar-Christian>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Christian \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-DateTime-Calendar-Christian>=0:devel/p5-DateTime-Calendar-Christian \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Random/Makefile b/devel/p5-DateTime-Event-Random/Makefile
index b31e0cb6a7f8..5c080b198cd5 100644
--- a/devel/p5-DateTime-Event-Random/Makefile
+++ b/devel/p5-DateTime-Event-Random/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime extension for creating random datetimes
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Recurrence/Makefile b/devel/p5-DateTime-Event-Recurrence/Makefile
index 95474fb8870c..3dd977339e88 100644
--- a/devel/p5-DateTime-Event-Recurrence/Makefile
+++ b/devel/p5-DateTime-Event-Recurrence/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl DateTime extension for computing basic recurrences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.27:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0.36:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-DateTime>=0.27:devel/p5-DateTime \
+		p5-DateTime-Set>=0.36:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/p5-DateTime-Event-Sunrise/Makefile b/devel/p5-DateTime-Event-Sunrise/Makefile
index f4b6c73cfbd9..9e0e6556045d 100644
--- a/devel/p5-DateTime-Event-Sunrise/Makefile
+++ b/devel/p5-DateTime-Event-Sunrise/Makefile
@@ -15,10 +15,10 @@ COMMENT=	DateTime Objects for sunrise and sunset for a given day
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.21:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0.16:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Set-Infinite>=0:${PORTSDIR}/devel/p5-Set-Infinite
+BUILD_DEPENDS=	p5-DateTime>=0.21:devel/p5-DateTime \
+		p5-DateTime-Set>=0.16:devel/p5-DateTime-Set \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Set-Infinite>=0:devel/p5-Set-Infinite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Event-Zodiac/Makefile b/devel/p5-DateTime-Event-Zodiac/Makefile
index 34010befdb73..7aa71b37bdbf 100644
--- a/devel/p5-DateTime-Event-Zodiac/Makefile
+++ b/devel/p5-DateTime-Event-Zodiac/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Return zodiac for a given date
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Astro>=0:${PORTSDIR}/devel/p5-DateTime-Astro
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Astro>=0:devel/p5-DateTime-Astro
 BUILD_DEPENDS:=	${RUN_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
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Fiscal-Year/Makefile b/devel/p5-DateTime-Fiscal-Year/Makefile
index 4768a5377322..a6eb096c6db2 100644
--- a/devel/p5-DateTime-Fiscal-Year/Makefile
+++ b/devel/p5-DateTime-Fiscal-Year/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate the day or week of the Fiscal Year with an arbitrary start date
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Baby/Makefile b/devel/p5-DateTime-Format-Baby/Makefile
index ebcf7b7f6c08..4f4bec33044f 100644
--- a/devel/p5-DateTime-Format-Baby/Makefile
+++ b/devel/p5-DateTime-Format-Baby/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DateTime>=0.16:${PORTSDIR}/devel/p5-DateTime \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0.16:devel/p5-DateTime \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Format-Bork/Makefile b/devel/p5-DateTime-Format-Bork/Makefile
index 014a081e9c7f..5780e010d73d 100644
--- a/devel/p5-DateTime-Format-Bork/Makefile
+++ b/devel/p5-DateTime-Format-Bork/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Formats datetimes for that guy from The Muppet Show
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 6e23af75087b..f8b84d87e8e8 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Create DateTime parser classes and objects
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:${PORTSDIR}/devel/p5-Class-Factory-Util \
-		p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=1.04:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Params-Validate>=0.72:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:devel/p5-Class-Factory-Util \
+		p5-DateTime>=0.12:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=1.04:devel/p5-DateTime-Format-Strptime \
+		p5-Params-Validate>=0.72:devel/p5-Params-Validate \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Devel-Cycle>=1.07:${PORTSDIR}/devel/p5-Devel-Cycle \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-Devel-Cycle>=1.07:devel/p5-Devel-Cycle \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/p5-DateTime-Format-DBI/Makefile b/devel/p5-DateTime-Format-DBI/Makefile
index adc26e4f9b65..2ee3199449bf 100644
--- a/devel/p5-DateTime-Format-DBI/Makefile
+++ b/devel/p5-DateTime-Format-DBI/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Find a parser class for a database connection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBI>=1.21:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime>=0.1:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DBI>=1.21:databases/p5-DBI \
+		p5-DateTime>=0.1:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-DateManip/Makefile b/devel/p5-DateTime-Format-DateManip/Makefile
index 7ada363ba807..2b895b2e9518 100644
--- a/devel/p5-DateTime-Format-DateManip/Makefile
+++ b/devel/p5-DateTime-Format-DateManip/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert Date::Manip dates and durations to DateTimes and vice versa
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Date-Manip>=0:devel/p5-Date-Manip
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-DateParse/Makefile b/devel/p5-DateTime-Format-DateParse/Makefile
index a4a873a6b1d6..a64ad027769f 100644
--- a/devel/p5-DateTime-Format-DateParse/Makefile
+++ b/devel/p5-DateTime-Format-DateParse/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	This module is a compatibility wrapper around Date::Parse
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-TimeDate>=0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Duration/Makefile b/devel/p5-DateTime-Format-Duration/Makefile
index 4b6addf2d33e..a318bbbee13f 100644
--- a/devel/p5-DateTime-Format-Duration/Makefile
+++ b/devel/p5-DateTime-Format-Duration/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Format and parse DateTime::Durations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a$//}
diff --git a/devel/p5-DateTime-Format-Epoch/Makefile b/devel/p5-DateTime-Format-Epoch/Makefile
index 77dbc3b1e2ff..e9b391e4b2f8 100644
--- a/devel/p5-DateTime-Format-Epoch/Makefile
+++ b/devel/p5-DateTime-Format-Epoch/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Convert DateTimes to/from epoch seconds
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.31:${PORTSDIR}/devel/p5-DateTime \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0.31:devel/p5-DateTime \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.801
diff --git a/devel/p5-DateTime-Format-Excel/Makefile b/devel/p5-DateTime-Format-Excel/Makefile
index 19a3b08e68ef..27cd6f7da481 100644
--- a/devel/p5-DateTime-Format-Excel/Makefile
+++ b/devel/p5-DateTime-Format-Excel/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between DateTime and Excel dates
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Flexible/Makefile b/devel/p5-DateTime-Format-Flexible/Makefile
index 8ff3a95a7bf6..e57ee634eec4 100644
--- a/devel/p5-DateTime-Format-Flexible/Makefile
+++ b/devel/p5-DateTime-Format-Flexible/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Flexibly parse strings and turn them into DateTime objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.74:${PORTSDIR}/devel/p5-DateTime-Format-Builder \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.74:devel/p5-DateTime-Format-Builder \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Format-HTTP/Makefile b/devel/p5-DateTime-Format-HTTP/Makefile
index c86ffed645ea..82c216b4825d 100644
--- a/devel/p5-DateTime-Format-HTTP/Makefile
+++ b/devel/p5-DateTime-Format-HTTP/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	HTTP date conversion routines
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-IBeat/Makefile b/devel/p5-DateTime-Format-IBeat/Makefile
index 55ca702b7ccd..a59738994b74 100644
--- a/devel/p5-DateTime-Format-IBeat/Makefile
+++ b/devel/p5-DateTime-Format-IBeat/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Format times in .beat notation
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-ICal/Makefile b/devel/p5-DateTime-Format-ICal/Makefile
index 92b26a3b5143..78ed90d7d5cf 100644
--- a/devel/p5-DateTime-Format-ICal/Makefile
+++ b/devel/p5-DateTime-Format-ICal/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format ICal datetime and duration strings
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime-Event-ICal>=0:${PORTSDIR}/devel/p5-DateTime-Event-ICal \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-DateTime-Event-ICal>=0:devel/p5-DateTime-Event-ICal \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-ISO8601/Makefile b/devel/p5-DateTime-Format-ISO8601/Makefile
index 7c703da6fde7..fb4e779cb985 100644
--- a/devel/p5-DateTime-Format-ISO8601/Makefile
+++ b/devel/p5-DateTime-Format-ISO8601/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Parse ISO8601 formats
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.18:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.77:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-DateTime>=0.18:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.77:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Mail/Makefile b/devel/p5-DateTime-Format-Mail/Makefile
index f1415ce6ef4e..77b1b2493b1d 100644
--- a/devel/p5-DateTime-Format-Mail/Makefile
+++ b/devel/p5-DateTime-Format-Mail/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert between DateTime and RFC2822/822 formats
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-MySQL/Makefile b/devel/p5-DateTime-Format-MySQL/Makefile
index d7b6319eebcb..31c1e3653378 100644
--- a/devel/p5-DateTime-Format-MySQL/Makefile
+++ b/devel/p5-DateTime-Format-MySQL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parse and format MySQL dates and times
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.6:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.6:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-Natural/Makefile b/devel/p5-DateTime-Format-Natural/Makefile
index 4511984be9ae..4084a9aa473d 100644
--- a/devel/p5-DateTime-Format-Natural/Makefile
+++ b/devel/p5-DateTime-Format-Natural/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Create machine readable date/time with natural parsing logic
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-boolean>=0:${PORTSDIR}/devel/p5-boolean \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Module-Util>=0:${PORTSDIR}/devel/p5-Module-Util
+BUILD_DEPENDS=	p5-boolean>=0:devel/p5-boolean \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Module-Util>=0:devel/p5-Module-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
+TEST_DEPENDS=	p5-Test-MockTime>=0:devel/p5-Test-MockTime
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Format-Oracle/Makefile b/devel/p5-DateTime-Format-Oracle/Makefile
index 2eba64b1dca5..3647ab486990 100644
--- a/devel/p5-DateTime-Format-Oracle/Makefile
+++ b/devel/p5-DateTime-Format-Oracle/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Parse and format Oracle dates and timestamps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-NLS_DATE_FORMAT>=0.03:${PORTSDIR}/converters/p5-Convert-NLS_DATE_FORMAT \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-Convert-NLS_DATE_FORMAT>=0.03:converters/p5-Convert-NLS_DATE_FORMAT \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Format-Pg/Makefile b/devel/p5-DateTime-Format-Pg/Makefile
index 201deeed17a9..a344ebc7df86 100644
--- a/devel/p5-DateTime-Format-Pg/Makefile
+++ b/devel/p5-DateTime-Format-Pg/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format PostgreSQL dates and times
 
-BUILD_DEPENDS=	p5-DateTime>=0.10:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Builder>=0.72:${PORTSDIR}/devel/p5-DateTime-Format-Builder \
-		p5-DateTime-TimeZone>=0.05:${PORTSDIR}/devel/p5-DateTime-TimeZone
+BUILD_DEPENDS=	p5-DateTime>=0.10:devel/p5-DateTime \
+		p5-DateTime-Format-Builder>=0.72:devel/p5-DateTime-Format-Builder \
+		p5-DateTime-TimeZone>=0.05:devel/p5-DateTime-TimeZone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-RFC3339/Makefile b/devel/p5-DateTime-Format-RFC3339/Makefile
index ed4eebe2d6c3..f061bbda7110 100644
--- a/devel/p5-DateTime-Format-RFC3339/Makefile
+++ b/devel/p5-DateTime-Format-RFC3339/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	citric@cubicone.tmetic.com
 COMMENT=	Parse and format RFC3339 times
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Format-RSS/Makefile b/devel/p5-DateTime-Format-RSS/Makefile
index 1d5d6583777b..b76accd6546c 100644
--- a/devel/p5-DateTime-Format-RSS/Makefile
+++ b/devel/p5-DateTime-Format-RSS/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Format DateTime For RSS
 
-RUN_DEPENDS=	p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS
-BUILD_DEPENDS=	p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS
+RUN_DEPENDS=	p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS
+BUILD_DEPENDS=	p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Format-Roman/Makefile b/devel/p5-DateTime-Format-Roman/Makefile
index 3a34b6b5c5d3..0d9e11673543 100644
--- a/devel/p5-DateTime-Format-Roman/Makefile
+++ b/devel/p5-DateTime-Format-Roman/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Roman day numbering for DateTime objects
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Roman>=0:${PORTSDIR}/math/p5-Roman
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Roman>=0:math/p5-Roman
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-SQLite/Makefile b/devel/p5-DateTime-Format-SQLite/Makefile
index b092b4e26ffd..6865a493e506 100644
--- a/devel/p5-DateTime-Format-SQLite/Makefile
+++ b/devel/p5-DateTime-Format-SQLite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse and format SQLite dates and times
 
-BUILD_DEPENDS=	p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-W3CDTF/Makefile b/devel/p5-DateTime-Format-W3CDTF/Makefile
index 9bf33c7ce89e..c876b1dfa2bd 100644
--- a/devel/p5-DateTime-Format-W3CDTF/Makefile
+++ b/devel/p5-DateTime-Format-W3CDTF/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Parse and format W3CDTF datetime strings
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Format-XSD/Makefile b/devel/p5-DateTime-Format-XSD/Makefile
index 8a9d860f7f3c..46b91ee92d82 100644
--- a/devel/p5-DateTime-Format-XSD/Makefile
+++ b/devel/p5-DateTime-Format-XSD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sergey.dyatko@gmail.com
 COMMENT=	Format DateTime according to xsd:dateTime
 
-BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
-RUN_DEPENDS=	p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601
+BUILD_DEPENDS=	p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
+RUN_DEPENDS=	p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-Functions/Makefile b/devel/p5-DateTime-Functions/Makefile
index 6d382e8407c3..0b8c05c5b554 100644
--- a/devel/p5-DateTime-Functions/Makefile
+++ b/devel/p5-DateTime-Functions/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Procedural interface to DateTime functions
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-HiRes/Makefile b/devel/p5-DateTime-HiRes/Makefile
index b6fe367a9b64..2769bf1dad33 100644
--- a/devel/p5-DateTime-HiRes/Makefile
+++ b/devel/p5-DateTime-HiRes/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create DateTime objects with sub-second current time resolution
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-Incomplete/Makefile b/devel/p5-DateTime-Incomplete/Makefile
index 24bcd97edaf4..059d093b1a8d 100644
--- a/devel/p5-DateTime-Incomplete/Makefile
+++ b/devel/p5-DateTime-Incomplete/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Set>=0.14:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-DateTime-Event-Recurrence>=0:${PORTSDIR}/devel/p5-DateTime-Event-Recurrence
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Set>=0.14:devel/p5-DateTime-Set \
+		p5-DateTime-Event-Recurrence>=0:devel/p5-DateTime-Event-Recurrence
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index 0c5775b05bab..8176536d34bf 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-DateTime-Precise/Makefile b/devel/p5-DateTime-Precise/Makefile
index c7f70b88a112..75bab82677f7 100644
--- a/devel/p5-DateTime-Precise/Makefile
+++ b/devel/p5-DateTime-Precise/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perform common time and date operations with additional GPS operations
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-DateTime-Set/Makefile b/devel/p5-DateTime-Set/Makefile
index fd47011b3ae8..14d69702082e 100644
--- a/devel/p5-DateTime-Set/Makefile
+++ b/devel/p5-DateTime-Set/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Datetime sets and set math
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
-		p5-Set-Infinite>=0.59:${PORTSDIR}/devel/p5-Set-Infinite
+BUILD_DEPENDS=	p5-DateTime>=0.12:devel/p5-DateTime \
+		p5-Set-Infinite>=0.59:devel/p5-Set-Infinite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/devel/p5-DateTime-TimeZone-Alias/Makefile b/devel/p5-DateTime-TimeZone-Alias/Makefile
index bd480d8596cc..9a2c8efcff0d 100644
--- a/devel/p5-DateTime-TimeZone-Alias/Makefile
+++ b/devel/p5-DateTime-TimeZone-Alias/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create aliases for DateTime timezones
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+RUN_DEPENDS=	p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-DateTime-TimeZone-LMT/Makefile b/devel/p5-DateTime-TimeZone-LMT/Makefile
index b335ee18984b..4cc82b3e52a7 100644
--- a/devel/p5-DateTime-TimeZone-LMT/Makefile
+++ b/devel/p5-DateTime-TimeZone-LMT/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Local Mean Time time zone for DateTime
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.12:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0.13:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-DateTime>=0.12:devel/p5-DateTime \
+		p5-DateTime-TimeZone>=0.13:devel/p5-DateTime-TimeZone \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTime-TimeZone/Makefile b/devel/p5-DateTime-TimeZone/Makefile
index a868c88fe902..164b6b929b62 100644
--- a/devel/p5-DateTime-TimeZone/Makefile
+++ b/devel/p5-DateTime-TimeZone/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Time zone object base class and factory
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Singleton>=1.03:${PORTSDIR}/devel/p5-Class-Singleton \
-		p5-List-AllUtils>0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Validate>=0.72:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Singleton>=1.03:devel/p5-Class-Singleton \
+		p5-List-AllUtils>0:devel/p5-List-AllUtils \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Params-Validate>=0.72:devel/p5-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 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/devel/p5-DateTime-Util-Calc/Makefile b/devel/p5-DateTime-Util-Calc/Makefile
index 5ccc9f81ccd5..cac6970a72a3 100644
--- a/devel/p5-DateTime-Util-Calc/Makefile
+++ b/devel/p5-DateTime-Util-Calc/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	DateTime Calculation Utilities
 
-BUILD_DEPENDS=	p5-Math-BigInt>=0:${PORTSDIR}/math/p5-Math-BigInt \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-Math-BigInt>=0:math/p5-Math-BigInt \
+		p5-DateTime>=0:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	GMP
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGMP}
-BUILD_DEPENDS+=	p5-Math-BigInt-GMP>=0:${PORTSDIR}/math/p5-Math-BigInt-GMP
+BUILD_DEPENDS+=	p5-Math-BigInt-GMP>=0:math/p5-Math-BigInt-GMP
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/p5-DateTime/Makefile b/devel/p5-DateTime/Makefile
index 36eb3c0d2607..8bb7906a0d18 100644
--- a/devel/p5-DateTime/Makefile
+++ b/devel/p5-DateTime/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Date and time object
 LICENSE=	ART20
 
 # Do not add p5-DateTime-Format-Strptime>=1.20.00 to TEST_DEPENDS to avoid cyclic dependency in tinderbox
-BUILD_DEPENDS=	p5-DateTime-Locale>=0.41:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-TimeZone>=1.74:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Params-Validate>=1.03:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-DateTime-Locale>=0.41:devel/p5-DateTime-Locale \
+		p5-DateTime-TimeZone>=1.74:devel/p5-DateTime-TimeZone \
+		p5-Params-Validate>=1.03:devel/p5-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0.005:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DateTimeX-Easy/Makefile b/devel/p5-DateTimeX-Easy/Makefile
index 2e2912095207..bb2c846356fb 100644
--- a/devel/p5-DateTimeX-Easy/Makefile
+++ b/devel/p5-DateTimeX-Easy/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Parse a date/time string using the best method available
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-DateTime-Format-Flexible>=0:${PORTSDIR}/devel/p5-DateTime-Format-Flexible \
-		p5-DateTime-Format-ICal>=0:${PORTSDIR}/devel/p5-DateTime-Format-ICal \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+		p5-DateTime-Format-Flexible>=0:devel/p5-DateTime-Format-Flexible \
+		p5-DateTime-Format-ICal>=0:devel/p5-DateTime-Format-ICal \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-TimeDate>=0:devel/p5-TimeDate
 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
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index d932f4580230..2b042f68a385 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Client for the standard Perl debugger
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PadWalker>=1.96:${PORTSDIR}/devel/p5-PadWalker \
-		p5-ReadLine-Perl>=1.0303:${PORTSDIR}/devel/p5-ReadLine-Perl
+BUILD_DEPENDS=	p5-PadWalker>=1.96:devel/p5-PadWalker \
+		p5-ReadLine-Perl>=1.0303:devel/p5-ReadLine-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-HomeDir>=1:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-ReadLine-Gnu>=1.20:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Test-CheckDeps>=0.006:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Class>=0.39:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Requires>=0.07:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-File-HomeDir>=1:devel/p5-File-HomeDir \
+		p5-ReadLine-Gnu>=1.20:devel/p5-ReadLine-Gnu \
+		p5-Test-CheckDeps>=0.006:devel/p5-Test-CheckDeps \
+		p5-Test-Class>=0.39:devel/p5-Test-Class \
+		p5-Test-Deep>=0.110:devel/p5-Test-Deep \
+		p5-Test-Requires>=0.07:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -30,13 +30,13 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-version>=0.99.02:${PORTSDIR}/devel/p5-version
-RUN_DEPENDS+=	p5-version>=0.99.02:${PORTSDIR}/devel/p5-version
+BUILD_DEPENDS+=	p5-version>=0.99.02:devel/p5-version
+RUN_DEPENDS+=	p5-version>=0.99.02:devel/p5-version
 .endif
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.21:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0.21:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0.21:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0.21:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Declare-Constraints-Simple/Makefile b/devel/p5-Declare-Constraints-Simple/Makefile
index 2a9c40bc5ddf..1026910e601d 100644
--- a/devel/p5-Declare-Constraints-Simple/Makefile
+++ b/devel/p5-Declare-Constraints-Simple/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Declarative Validation of Perl Data Structures
 
-BUILD_DEPENDS=	p5-Class-Inspector>=1.24:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
-RUN_DEPENDS=	p5-Class-Inspector>=1.24:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-Carp-Clan>=5.3:${PORTSDIR}/devel/p5-Carp-Clan
+BUILD_DEPENDS=	p5-Class-Inspector>=1.24:devel/p5-Class-Inspector \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
+RUN_DEPENDS=	p5-Class-Inspector>=1.24:devel/p5-Class-Inspector \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-Carp-Clan>=5.3:devel/p5-Carp-Clan
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-ArgNames/Makefile b/devel/p5-Devel-ArgNames/Makefile
index 93ec23451b88..6dabf74503a3 100644
--- a/devel/p5-Devel-ArgNames/Makefile
+++ b/devel/p5-Devel-ArgNames/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Figure out the names of variables passed into subroutines
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
-RUN_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
+RUN_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,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/devel/p5-Devel-Autoflush/Makefile b/devel/p5-Devel-Autoflush/Makefile
index 96f6877a07e9..358a2fc07288 100644
--- a/devel/p5-Devel-Autoflush/Makefile
+++ b/devel/p5-Devel-Autoflush/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Set autoflush from the command line
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput
+BUILD_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Backtrace/Makefile b/devel/p5-Devel-Backtrace/Makefile
index d086069cb2c3..ab179728859b 100644
--- a/devel/p5-Devel-Backtrace/Makefile
+++ b/devel/p5-Devel-Backtrace/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object-oriented backtrace
 
-BUILD_DEPENDS=	p5-String-Escape>=0:${PORTSDIR}/textproc/p5-String-Escape \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-String-Escape>=0:${PORTSDIR}/textproc/p5-String-Escape \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-String-Escape>=0:textproc/p5-String-Escape \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-String-Escape>=0:textproc/p5-String-Escape \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-BeginLift/Makefile b/devel/p5-Devel-BeginLift/Makefile
index 453b827bbc73..f0f6fb2834e5 100644
--- a/devel/p5-Devel-BeginLift/Makefile
+++ b/devel/p5-Devel-BeginLift/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to make selected sub calls evaluate at compile time
 
 RUN_DEPENDS=	\
-	p5-B-Hooks-OP-Check-EntersubForCV>=0.03:${PORTSDIR}/devel/p5-B-Hooks-OP-Check-EntersubForCV
+	p5-B-Hooks-OP-Check-EntersubForCV>=0.03:devel/p5-B-Hooks-OP-Check-EntersubForCV
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-	p5-ExtUtils-Depends>0:${PORTSDIR}/devel/p5-ExtUtils-Depends
+	p5-ExtUtils-Depends>0:devel/p5-ExtUtils-Depends
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-CallChecker/Makefile b/devel/p5-Devel-CallChecker/Makefile
index 0339c9a6f2ff..570d2aaceadb 100644
--- a/devel/p5-Devel-CallChecker/Makefile
+++ b/devel/p5-Devel-CallChecker/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Custom op checking attached to subroutines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DynaLoader-Functions>=0.001:${PORTSDIR}/devel/p5-DynaLoader-Functions
+BUILD_DEPENDS=	p5-DynaLoader-Functions>=0.001:devel/p5-DynaLoader-Functions
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Devel-Caller/Makefile b/devel/p5-Devel-Caller/Makefile
index 00f01bea023c..f53864088f5a 100644
--- a/devel/p5-Devel-Caller/Makefile
+++ b/devel/p5-Devel-Caller/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module which is meatier versions of caller
 
-BUILD_DEPENDS=	p5-PadWalker>=0.08:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0.08:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-CheckCompiler/Makefile b/devel/p5-Devel-CheckCompiler/Makefile
index b3378b0839c8..a99649256b8d 100644
--- a/devel/p5-Devel-CheckCompiler/Makefile
+++ b/devel/p5-Devel-CheckCompiler/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check the compiler availability
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-CheckLib/Makefile b/devel/p5-Devel-CheckLib/Makefile
index ddd6ddf163f7..e128885743de 100644
--- a/devel/p5-Devel-CheckLib/Makefile
+++ b/devel/p5-Devel-CheckLib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check that a library is available
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>=1.08:${PORTSDIR}/devel/p5-IO-CaptureOutput
+BUILD_DEPENDS=	p5-IO-CaptureOutput>=1.08:devel/p5-IO-CaptureOutput
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Devel-CheckOS/Makefile b/devel/p5-Devel-CheckOS/Makefile
index 99736adf9a6b..5350da5f1d58 100644
--- a/devel/p5-Devel-CheckOS/Makefile
+++ b/devel/p5-Devel-CheckOS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Check currently running OS
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Compare>=1.2100:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-File-Find-Rule>=0.28:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-Data-Compare>=1.2100:devel/p5-Data-Compare \
+		p5-File-Find-Rule>=0.28:devel/p5-File-Find-Rule
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Cover-Report-Clover/Makefile b/devel/p5-Devel-Cover-Report-Clover/Makefile
index 34d5f2136b70..39499303101f 100644
--- a/devel/p5-Devel-Cover-Report-Clover/Makefile
+++ b/devel/p5-Devel-Cover-Report-Clover/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Clover reporting of coverage statistics
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-	p5-Devel-Cover>0:${PORTSDIR}/devel/p5-Devel-Cover \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit
+	p5-Class-Accessor>0:devel/p5-Class-Accessor \
+	p5-Devel-Cover>0:devel/p5-Devel-Cover \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-Template-Toolkit>0:www/p5-Template-Toolkit
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS= \
-	p5-File-Path>=2.06:${PORTSDIR}/devel/p5-File-Path \
-	p5-File-Which>=1.08:${PORTSDIR}/sysutils/p5-File-Which \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-MockObject>0:${PORTSDIR}/devel/p5-Test-MockObject
+	p5-File-Path>=2.06:devel/p5-File-Path \
+	p5-File-Which>=1.08:sysutils/p5-File-Which \
+	p5-Test-Exception>0:devel/p5-Test-Exception \
+	p5-Test-MockObject>0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile
index 2c6857c9693e..ee3c6ca7901b 100644
--- a/devel/p5-Devel-Cover/Makefile
+++ b/devel/p5-Devel-Cover/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Code coverage metrics for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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
@@ -23,20 +23,20 @@ OPTIONS_DEFAULT=CPANCOVER HTML_REPORTS POD_COVERAGE
 OPTIONS_SUB=	yes
 
 CPANCOVER_DESC=			Coverage statistics on CPAN modules
-CPANCOVER_BUILD_DEPENDS=	p5-Parallel-Iterator>=0:${PORTSDIR}/devel/p5-Parallel-Iterator \
-				p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+CPANCOVER_BUILD_DEPENDS=	p5-Parallel-Iterator>=0:devel/p5-Parallel-Iterator \
+				p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 CPANCOVER_RUN_DEPENDS=		${CPANCOVER_BUILD_DEPENDS}
 
 HTML_REPORTS=			Build HTML reports with p5-HTML-Parser
-HTML_REPORTS_BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+HTML_REPORTS_BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 HTML_REPORTS_RUN_DEPENDS=	${HTML_REPORTS_BUILD_DEPENDS}
 
 POD_COVERAGE_DESC=		POD coverage via p5-Pod-Coverage
-POD_COVERAGE_BUILD_DEPENDS=	p5-Pod-Coverage>=0.06:${PORTSDIR}/devel/p5-Pod-Coverage
+POD_COVERAGE_BUILD_DEPENDS=	p5-Pod-Coverage>=0.06:devel/p5-Pod-Coverage
 POD_COVERAGE_RUN_DEPENDS=	${POD_COVERAGE_BUILD_DEPENDS}
 
 SYNTAX_HIGHLIGHTING_DESC=		Syntax highlighting via p5-PPI-HTML
-SYNTAX_HIGHLIGHTING_BUILD_DEPENDS=	p5-PPI-HTML>=1.07:${PORTSDIR}/textproc/p5-PPI-HTML
+SYNTAX_HIGHLIGHTING_BUILD_DEPENDS=	p5-PPI-HTML>=1.07:textproc/p5-PPI-HTML
 SYNTAX_HIGHLIGHTING_RUN_DEPENDS=	${SYNTAX_HIGHLIGHTING_BUILD_DEPENDS}
 
 post-install:
diff --git a/devel/p5-Devel-Declare-Parser/Makefile b/devel/p5-Devel-Declare-Parser/Makefile
index dcecced11478..e5749486311b 100644
--- a/devel/p5-Devel-Declare-Parser/Makefile
+++ b/devel/p5-Devel-Declare-Parser/Makefile
@@ -13,11 +13,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-B-Compiling>=0.02:${PORTSDIR}/devel/p5-B-Compiling \
-	p5-B-Hooks-EndOfScope>=0.08:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-	p5-Devel-Declare>=0.006:${PORTSDIR}/devel/p5-Devel-Declare
+	p5-B-Compiling>=0.02:devel/p5-B-Compiling \
+	p5-B-Hooks-EndOfScope>=0.08:devel/p5-B-Hooks-EndOfScope \
+	p5-Devel-Declare>=0.006:devel/p5-Devel-Declare
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception-LessClever>=0:${PORTSDIR}/devel/p5-Test-Exception-LessClever
+TEST_DEPENDS=	p5-Test-Exception-LessClever>=0:devel/p5-Test-Exception-LessClever
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-Declare/Makefile b/devel/p5-Devel-Declare/Makefile
index a4ba64dca415..426ff340c321 100644
--- a/devel/p5-Devel-Declare/Makefile
+++ b/devel/p5-Devel-Declare/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Adding keywords to Perl, in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends \
+RUN_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-B-Hooks-EndOfScope>=0.05:devel/p5-B-Hooks-EndOfScope \
+		p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-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/devel/p5-Devel-Ditto/Makefile b/devel/p5-Devel-Ditto/Makefile
index da67ab3b9418..61442ca7e12f 100644
--- a/devel/p5-Devel-Ditto/Makefile
+++ b/devel/p5-Devel-Ditto/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Devel::Ditto - Identify where print output comes from
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-EvalContext/Makefile b/devel/p5-Devel-EvalContext/Makefile
index 19aa3d47cddf..2f44ed4de68f 100644
--- a/devel/p5-Devel-EvalContext/Makefile
+++ b/devel/p5-Devel-EvalContext/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Save lexicals and hints between calls to eval
 
-RUN_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Data-Alias>=0:${PORTSDIR}/devel/p5-Data-Alias \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Data-Alias>=0:devel/p5-Data-Alias \
+		p5-YAML>=0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Events-Objects/Makefile b/devel/p5-Devel-Events-Objects/Makefile
index 732fea60b823..92d604166e12 100644
--- a/devel/p5-Devel-Events-Objects/Makefile
+++ b/devel/p5-Devel-Events-Objects/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module providing object tracking support for Devel::Events
 
-BUILD_DEPENDS=	p5-Devel-Events>=0:${PORTSDIR}/devel/p5-Devel-Events \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Tie-RefHash-Weak>=0:${PORTSDIR}/devel/p5-Tie-RefHash-Weak \
-		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+BUILD_DEPENDS=	p5-Devel-Events>=0:devel/p5-Devel-Events \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Tie-RefHash-Weak>=0:devel/p5-Tie-RefHash-Weak \
+		p5-Variable-Magic>=0:devel/p5-Variable-Magic
 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/devel/p5-Devel-Events/Makefile b/devel/p5-Devel-Events/Makefile
index a95b84bbeca1..30b3c7082f69 100644
--- a/devel/p5-Devel-Events/Makefile
+++ b/devel/p5-Devel-Events/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl5 module providing an extensible instrumentation framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.33:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0.03:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Moose>=0.33:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0.03:devel/p5-MooseX-AttributeHelpers \
+		p5-Set-Object>=0:devel/p5-Set-Object \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel
+TEST_DEPENDS=	p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel
 
 NO_ARCH=	yes
 USES=		perl5
@@ -28,7 +28,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Devel-GlobalDestruction/Makefile b/devel/p5-Devel-GlobalDestruction/Makefile
index a10ca95698b8..3d5941f4c187 100644
--- a/devel/p5-Devel-GlobalDestruction/Makefile
+++ b/devel/p5-Devel-GlobalDestruction/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Expose PL_dirty, the flag which marks global destruction
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0.001011:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0.001011:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-KYTProf/Makefile b/devel/p5-Devel-KYTProf/Makefile
index 84c6378614ec..813f97c42d80 100644
--- a/devel/p5-Devel-KYTProf/Makefile
+++ b/devel/p5-Devel-KYTProf/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple profiler
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBI>0:databases/p5-DBI \
+		p5-DBD-SQLite>0:databases/p5-DBD-SQLite
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-Leak-Cb/Makefile b/devel/p5-Devel-Leak-Cb/Makefile
index fbebf9067412..5cf7b4334482 100644
--- a/devel/p5-Devel-Leak-Cb/Makefile
+++ b/devel/p5-Devel-Leak-Cb/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Detect leaked callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=2:${PORTSDIR}/devel/p5-common-sense \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare
-RUN_DEPENDS=	p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare
+BUILD_DEPENDS=	p5-common-sense>=2:devel/p5-common-sense \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare
+RUN_DEPENDS=	p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-LeakGuard-Object/Makefile b/devel/p5-Devel-LeakGuard-Object/Makefile
index 3e0592a01768..c09cf2430fae 100644
--- a/devel/p5-Devel-LeakGuard-Object/Makefile
+++ b/devel/p5-Devel-LeakGuard-Object/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Scoped checks for object leaks
 
-BUILD_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+BUILD_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-latest>0:${PORTSDIR}/devel/p5-latest
+TEST_DEPENDS=	p5-latest>0:devel/p5-latest
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-LexAlias/Makefile b/devel/p5-Devel-LexAlias/Makefile
index b1ab4f854a08..f84f60fb4f1f 100644
--- a/devel/p5-Devel-LexAlias/Makefile
+++ b/devel/p5-Devel-LexAlias/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module which does alias lexical variables
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Caller>=0.03:${PORTSDIR}/devel/p5-Devel-Caller
+BUILD_DEPENDS=	p5-Devel-Caller>=0.03:devel/p5-Devel-Caller
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-MAT/Makefile b/devel/p5-Devel-MAT/Makefile
index ee487bfbc99d..8277bcc75357 100644
--- a/devel/p5-Devel-MAT/Makefile
+++ b/devel/p5-Devel-MAT/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-List-UtilsBy>=0:${PORTSDIR}/devel/p5-List-UtilsBy \
-		p5-Struct-Dumb>=0.07:${PORTSDIR}/devel/p5-Struct-Dumb
+BUILD_DEPENDS=	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-List-UtilsBy>=0:devel/p5-List-UtilsBy \
+		p5-Struct-Dumb>=0.07:devel/p5-Struct-Dumb
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	modbuild
 USES=		perl5
@@ -28,11 +28,11 @@ USES=		perl5
 .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
 .else
-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
 
 post-install:
diff --git a/devel/p5-Devel-NYTProf/Makefile b/devel/p5-Devel-NYTProf/Makefile
index bfafe6f1715c..91dcfe1607ae 100644
--- a/devel/p5-Devel-NYTProf/Makefile
+++ b/devel/p5-Devel-NYTProf/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Powerful feature-rich Perl source code profiler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS
+BUILD_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0.60:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>=0.60:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-OverloadInfo/Makefile b/devel/p5-Devel-OverloadInfo/Makefile
index 9f636da30bf8..86ba6322502b 100644
--- a/devel/p5-Devel-OverloadInfo/Makefile
+++ b/devel/p5-Devel-OverloadInfo/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Introspect overloaded operators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify
+BUILD_DEPENDS=	p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Package-Stash>=0.14:devel/p5-Package-Stash \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify
 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
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-PackagePath/Makefile b/devel/p5-Devel-PackagePath/Makefile
index 2c1873ee5d38..cfecea5a1e1c 100644
--- a/devel/p5-Devel-PackagePath/Makefile
+++ b/devel/p5-Devel-PackagePath/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Inspect and manipulate a Path based on a Package name
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.64:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-Path-Class>=0.04:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Moose>=0.64:devel/p5-Moose \
+		p5-MooseX-Types-Path-Class>=0.04:devel/p5-MooseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Devel-PartialDump/Makefile b/devel/p5-Devel-PartialDump/Makefile
index 67dd26dac45c..b985a47b2a23 100644
--- a/devel/p5-Devel-PartialDump/Makefile
+++ b/devel/p5-Devel-PartialDump/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Partial dumping of data structures, optimized for argument printing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Tiny>=0:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-Tiny>=0:devel/p5-Class-Tiny \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 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
 
 NO_ARCH=	yes
 USES=		perl5
@@ -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/devel/p5-Devel-PatchPerl/Makefile b/devel/p5-Devel-PatchPerl/Makefile
index 8b9e31e5cf2d..842835017f91 100644
--- a/devel/p5-Devel-PatchPerl/Makefile
+++ b/devel/p5-Devel-PatchPerl/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-pushd>=1:${PORTSDIR}/devel/p5-File-pushd
+BUILD_DEPENDS=	p5-File-pushd>=1:devel/p5-File-pushd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Devel-REPL/Makefile b/devel/p5-Devel-REPL/Makefile
index 0229901f2602..6e94b12740bd 100644
--- a/devel/p5-Devel-REPL/Makefile
+++ b/devel/p5-Devel-REPL/Makefile
@@ -14,22 +14,22 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Object-Pluggable>=0.0009:${PORTSDIR}/devel/p5-MooseX-Object-Pluggable \
-	p5-MooseX-Getopt>=0.18:${PORTSDIR}/devel/p5-MooseX-Getopt \
-	p5-MooseX-AttributeHelpers>=0.16:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean \
-	p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-	p5-Task-Weaken>0:${PORTSDIR}/devel/p5-Task-Weaken \
-	p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-	p5-Data-Dump-Streamer>0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-	p5-Data-Dumper-Concise>0:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-	p5-File-Next>0:${PORTSDIR}/sysutils/p5-File-Next \
-	p5-B-Keywords>0:${PORTSDIR}/devel/p5-B-Keywords \
-	p5-Lexical-Persistence>0:${PORTSDIR}/devel/p5-Lexical-Persistence \
-	p5-App-Nopaste>0:${PORTSDIR}/www/p5-App-Nopaste \
-	p5-Module-Refresh>0:${PORTSDIR}/devel/p5-Module-Refresh \
-	p5-Sys-SigAction>0:${PORTSDIR}/devel/p5-Sys-SigAction
+BUILD_DEPENDS=	p5-Moose>=0.93:devel/p5-Moose \
+	p5-MooseX-Object-Pluggable>=0.0009:devel/p5-MooseX-Object-Pluggable \
+	p5-MooseX-Getopt>=0.18:devel/p5-MooseX-Getopt \
+	p5-MooseX-AttributeHelpers>=0.16:devel/p5-MooseX-AttributeHelpers \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean \
+	p5-File-HomeDir>0:devel/p5-File-HomeDir \
+	p5-Task-Weaken>0:devel/p5-Task-Weaken \
+	p5-PPI>0:textproc/p5-PPI \
+	p5-Data-Dump-Streamer>0:devel/p5-Data-Dump-Streamer \
+	p5-Data-Dumper-Concise>0:devel/p5-Data-Dumper-Concise \
+	p5-File-Next>0:sysutils/p5-File-Next \
+	p5-B-Keywords>0:devel/p5-B-Keywords \
+	p5-Lexical-Persistence>0:devel/p5-Lexical-Persistence \
+	p5-App-Nopaste>0:www/p5-App-Nopaste \
+	p5-Module-Refresh>0:devel/p5-Module-Refresh \
+	p5-Sys-SigAction>0:devel/p5-Sys-SigAction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-Refcount/Makefile b/devel/p5-Devel-Refcount/Makefile
index 21f6a8fc803d..202c010bd70e 100644
--- a/devel/p5-Devel-Refcount/Makefile
+++ b/devel/p5-Devel-Refcount/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Obtain the REFCNT value of a referent
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Devel-RingBuffer/Makefile b/devel/p5-Devel-RingBuffer/Makefile
index d7c504256a95..15bdaf8dbff4 100644
--- a/devel/p5-Devel-RingBuffer/Makefile
+++ b/devel/p5-Devel-RingBuffer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Shared memory ring buffers for Perl scripts diagnosis/debug
 
-RUN_DEPENDS=	p5-IPC-Mmap>=0:${PORTSDIR}/devel/p5-IPC-Mmap
+RUN_DEPENDS=	p5-IPC-Mmap>=0:devel/p5-IPC-Mmap
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-STrace/Makefile b/devel/p5-Devel-STrace/Makefile
index 1710351b42f1..4759a5a03107 100644
--- a/devel/p5-Devel-STrace/Makefile
+++ b/devel/p5-Devel-STrace/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	strace(1)-like runtime call trace for Perl applications
 
-RUN_DEPENDS=	p5-Devel-RingBuffer>=0:${PORTSDIR}/devel/p5-Devel-RingBuffer
+RUN_DEPENDS=	p5-Devel-RingBuffer>=0:devel/p5-Devel-RingBuffer
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-SimpleTrace/Makefile b/devel/p5-Devel-SimpleTrace/Makefile
index fbdc06fea79e..3b4ce840b463 100644
--- a/devel/p5-Devel-SimpleTrace/Makefile
+++ b/devel/p5-Devel-SimpleTrace/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for better stack traces on interpreter-generated warn/die
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS=	p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper
+BUILD_DEPENDS=	p5-Data-Dumper>=0:devel/p5-Data-Dumper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Devel-Size-Report/Makefile b/devel/p5-Devel-Size-Report/Makefile
index fb29d4483834..0ca72d3d64c9 100644
--- a/devel/p5-Devel-Size-Report/Makefile
+++ b/devel/p5-Devel-Size-Report/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Extension to generate a size report for all elements in a structure
 
-BUILD_DEPENDS=	p5-Array-RefElem>=1.00:${PORTSDIR}/misc/p5-Array-RefElem \
-		p5-Devel-Size>=0.69:${PORTSDIR}/devel/p5-Devel-Size
+BUILD_DEPENDS=	p5-Array-RefElem>=1.00:misc/p5-Array-RefElem \
+		p5-Devel-Size>=0.69:devel/p5-Devel-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-StackTrace-AsHTML/Makefile b/devel/p5-Devel-StackTrace-AsHTML/Makefile
index f66da2083b42..0d5f56f2f092 100644
--- a/devel/p5-Devel-StackTrace-AsHTML/Makefile
+++ b/devel/p5-Devel-StackTrace-AsHTML/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to display stack trace in HTML
 
-RUN_DEPENDS=	p5-Devel-StackTrace>0:${PORTSDIR}/devel/p5-Devel-StackTrace
+RUN_DEPENDS=	p5-Devel-StackTrace>0:devel/p5-Devel-StackTrace
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-StackTrace-WithLexicals/Makefile b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
index e8464adac540..d78927483105 100644
--- a/devel/p5-Devel-StackTrace-WithLexicals/Makefile
+++ b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Devel-StackTrace>=2.00:${PORTSDIR}/devel/p5-Devel-StackTrace \
-	p5-PadWalker>=1.98:${PORTSDIR}/devel/p5-PadWalker
+	p5-Devel-StackTrace>=2.00:devel/p5-Devel-StackTrace \
+	p5-PadWalker>=1.98:devel/p5-PadWalker
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Devel-StealthDebug/Makefile b/devel/p5-Devel-StealthDebug/Makefile
index 0ec5edca2b06..574470109f05 100644
--- a/devel/p5-Devel-StealthDebug/Makefile
+++ b/devel/p5-Devel-StealthDebug/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple non-intrusive debug module
 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/devel/p5-Devel-ebug/Makefile b/devel/p5-Devel-ebug/Makefile
index f060e0d3b8ee..b0a5e8832755 100644
--- a/devel/p5-Devel-ebug/Makefile
+++ b/devel/p5-Devel-ebug/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Simple, extensible Perl debugger
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Proc-Background>=0:${PORTSDIR}/devel/p5-Proc-Background \
-		p5-String-Koremutake>=0:${PORTSDIR}/textproc/p5-String-Koremutake \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Proc-Background>=0:devel/p5-Proc-Background \
+		p5-String-Koremutake>=0:textproc/p5-String-Koremutake \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Expect>=0:devel/p5-Test-Expect \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index 22ea2b01e735..3c8eaa51caa3 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk debugger for Perl
 
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile
index e0c93b48ee26..3de69e84cf27 100644
--- a/devel/p5-Device-USB/Makefile
+++ b/devel/p5-Device-USB/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl wrapper for libusb
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=yes
diff --git a/devel/p5-Directory-Queue/Makefile b/devel/p5-Directory-Queue/Makefile
index cf68b23fa504..ef7418f45187 100644
--- a/devel/p5-Directory-Queue/Makefile
+++ b/devel/p5-Directory-Queue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Object oriented interface to a directory based queue in Perl
 
-BUILD_DEPENDS=	p5-No-Worries>=0:${PORTSDIR}/devel/p5-No-Worries
+BUILD_DEPENDS=	p5-No-Worries>=0:devel/p5-No-Worries
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Directory-Scratch-Structured/Makefile b/devel/p5-Directory-Scratch-Structured/Makefile
index 827b2407092a..4bf362a5a2e6 100644
--- a/devel/p5-Directory-Scratch-Structured/Makefile
+++ b/devel/p5-Directory-Scratch-Structured/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Creates temporary files and directories from a structured description
 USES=		perl5
 USE_PERL5=	modbuild
 
-RUN_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch
+RUN_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-Directory-Scratch>=0:devel/p5-Directory-Scratch
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Block>0:${PORTSDIR}/devel/p5-Test-Block \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Strict>0:${PORTSDIR}/devel/p5-Test-Strict \
-		p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Block>0:devel/p5-Test-Block \
+		p5-Test-Exception>0:devel/p5-Test-Exception \
+		p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
+		p5-Test-Strict>0:devel/p5-Test-Strict \
+		p5-Test-Warn>0:devel/p5-Test-Warn
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Directory-Scratch/Makefile b/devel/p5-Directory-Scratch/Makefile
index f18a7ee363f0..ec70f2d10cb7 100644
--- a/devel/p5-Directory-Scratch/Makefile
+++ b/devel/p5-Directory-Scratch/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Easy-to-use self-cleaning scratch space
 
-BUILD_DEPENDS=	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-File-Slurp>=9999.12:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-String-Random>0:${PORTSDIR}/devel/p5-String-Random
+BUILD_DEPENDS=	p5-Path-Class>0:devel/p5-Path-Class \
+		p5-File-Slurp>=9999.12:devel/p5-File-Slurp \
+		p5-String-Random>0:devel/p5-String-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Dist-CheckConflicts/Makefile b/devel/p5-Dist-CheckConflicts/Makefile
index 5eebb4187f61..9d8334c33fdd 100644
--- a/devel/p5-Dist-CheckConflicts/Makefile
+++ b/devel/p5-Dist-CheckConflicts/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Declare version conflicts for your dist
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Module-Runtime>=0.009:${PORTSDIR}/devel/p5-Module-Runtime
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+RUN_DEPENDS=	p5-Module-Runtime>=0.009:devel/p5-Module-Runtime
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Dist-Joseki/Makefile b/devel/p5-Dist-Joseki/Makefile
index d43c475aa767..a8b185b223c4 100644
--- a/devel/p5-Dist-Joseki/Makefile
+++ b/devel/p5-Dist-Joseki/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Tools for the prolific module author
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Class-Accessor-Complex>=0:${PORTSDIR}/devel/p5-Class-Accessor-Complex \
-		p5-Data-Rmap>=0:${PORTSDIR}/devel/p5-Data-Rmap \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Getopt-Attribute>=0:${PORTSDIR}/devel/p5-Getopt-Attribute \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-App-Cmd>=0:devel/p5-App-Cmd \
+		p5-Class-Accessor-Complex>=0:devel/p5-Class-Accessor-Complex \
+		p5-Data-Rmap>=0:devel/p5-Data-Rmap \
+		p5-Error>=0:lang/p5-Error \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Getopt-Attribute>=0:devel/p5-Getopt-Attribute \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS+=	p5-URI>=0:net/p5-URI
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Dist-Metadata/Makefile b/devel/p5-Dist-Metadata/Makefile
index f2cbe877d9af..51cfb6b7c125 100644
--- a/devel/p5-Dist-Metadata/Makefile
+++ b/devel/p5-Dist-Metadata/Makefile
@@ -13,18 +13,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Archive-Zip>=1.30:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-CPAN-DistnameInfo>=0.12:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-	p5-CPAN-Meta>=2.1:${PORTSDIR}/devel/p5-CPAN-Meta \
-	p5-File-Spec-Native>=1.002:${PORTSDIR}/devel/p5-File-Spec-Native \
-	p5-Module-Metadata>0:${PORTSDIR}/devel/p5-Module-Metadata \
-	p5-Path-Class>=0.24:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip \
+	p5-CPAN-DistnameInfo>=0.12:devel/p5-CPAN-DistnameInfo \
+	p5-CPAN-Meta>=2.1:devel/p5-CPAN-Meta \
+	p5-File-Spec-Native>=1.002:devel/p5-File-Spec-Native \
+	p5-Module-Metadata>0:devel/p5-Module-Metadata \
+	p5-Path-Class>=0.24:devel/p5-Path-Class \
+	p5-Try-Tiny>=0.09:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Test-MockObject>0:${PORTSDIR}/devel/p5-Test-MockObject \
-	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+	p5-Test-MockObject>0:devel/p5-Test-MockObject \
+	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Dist-Zilla/Makefile b/devel/p5-Dist-Zilla/Makefile
index 27ba901fb862..e99142bd59ef 100644
--- a/devel/p5-Dist-Zilla/Makefile
+++ b/devel/p5-Dist-Zilla/Makefile
@@ -10,53 +10,53 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Distribution builder
 
-BUILD_DEPENDS=	p5-App-Cmd>=0.309:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-CPAN-Uploader>=0.101550:${PORTSDIR}/devel/p5-CPAN-Uploader \
-		p5-Class-Load>=0.17:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Config-MVP-Reader-INI>=2:${PORTSDIR}/devel/p5-Config-MVP-Reader-INI \
-		p5-Config-MVP>=2.200002:${PORTSDIR}/devel/p5-Config-MVP \
-		p5-Data-Section>=0.004:${PORTSDIR}/devel/p5-Data-Section \
-		p5-DateTime>=0.44:${PORTSDIR}/devel/p5-DateTime \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
-		p5-Hash-Merge-Simple>=0:${PORTSDIR}/devel/p5-Hash-Merge-Simple \
-		p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Dispatchouli>=1.102220:${PORTSDIR}/devel/p5-Log-Dispatchouli \
-		p5-Moose-Autobox>=0.10:${PORTSDIR}/devel/p5-Moose-Autobox \
-		p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-LazyRequire>=0:${PORTSDIR}/devel/p5-MooseX-LazyRequire \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-SetOnce>=0:${PORTSDIR}/devel/p5-MooseX-SetOnce \
-		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-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Perl-PrereqScanner>=1.005:${PORTSDIR}/devel/p5-Perl-PrereqScanner \
-		p5-Perl-Version>=0:${PORTSDIR}/devel/p5-Perl-Version \
-		p5-Pod-Eventual>=0.091480:${PORTSDIR}/textproc/p5-Pod-Eventual \
-		p5-Software-License>=0.101370:${PORTSDIR}/misc/p5-Software-License \
-		p5-String-Formatter>=0.100680:${PORTSDIR}/devel/p5-String-Formatter \
-		p5-String-RewritePrefix>=0.005:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Sub-Exporter-ForMethods>=0:${PORTSDIR}/devel/p5-Sub-Exporter-ForMethods \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-Glob>=0.08:${PORTSDIR}/textproc/p5-Text-Glob \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-autobox>=2.53:${PORTSDIR}/devel/p5-autobox \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0.309:devel/p5-App-Cmd \
+		p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+		p5-CPAN-Uploader>=0.101550:devel/p5-CPAN-Uploader \
+		p5-Class-Load>=0.17:devel/p5-Class-Load \
+		p5-Config-MVP-Reader-INI>=2:devel/p5-Config-MVP-Reader-INI \
+		p5-Config-MVP>=2.200002:devel/p5-Config-MVP \
+		p5-Data-Section>=0.004:devel/p5-Data-Section \
+		p5-DateTime>=0.44:devel/p5-DateTime \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-File-pushd>=0:devel/p5-File-pushd \
+		p5-Hash-Merge-Simple>=0:devel/p5-Hash-Merge-Simple \
+		p5-JSON>=2:converters/p5-JSON \
+		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Log-Dispatchouli>=1.102220:devel/p5-Log-Dispatchouli \
+		p5-Moose-Autobox>=0.10:devel/p5-Moose-Autobox \
+		p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-LazyRequire>=0:devel/p5-MooseX-LazyRequire \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-SetOnce>=0:devel/p5-MooseX-SetOnce \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-MooseX-Types-Perl>=0:devel/p5-MooseX-Types-Perl \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-PPI>=0:textproc/p5-PPI \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Perl-PrereqScanner>=1.005:devel/p5-Perl-PrereqScanner \
+		p5-Perl-Version>=0:devel/p5-Perl-Version \
+		p5-Pod-Eventual>=0.091480:textproc/p5-Pod-Eventual \
+		p5-Software-License>=0.101370:misc/p5-Software-License \
+		p5-String-Formatter>=0.100680:devel/p5-String-Formatter \
+		p5-String-RewritePrefix>=0.005:textproc/p5-String-RewritePrefix \
+		p5-Sub-Exporter-ForMethods>=0:devel/p5-Sub-Exporter-ForMethods \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-Glob>=0.08:textproc/p5-Text-Glob \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		p5-autobox>=2.53:devel/p5-autobox \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Doxygen-Filter-Perl/Makefile b/devel/p5-Doxygen-Filter-Perl/Makefile
index 4f87c4485556..dd877321fd9f 100644
--- a/devel/p5-Doxygen-Filter-Perl/Makefile
+++ b/devel/p5-Doxygen-Filter-Perl/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Input filter for Doxygen enabling support for Perl code documentation
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-		p5-Pod-POM>=0.27:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-Log-Log4perl>=1.33:${PORTSDIR}/devel/p5-Log-Log4perl
-TEST_DEPENDS=	p5-Test-Output>=1.01:${PORTSDIR}/devel/p5-Test-Output
+RUN_DEPENDS=	doxygen:devel/doxygen \
+		p5-Pod-POM>=0.27:textproc/p5-Pod-POM \
+		p5-Log-Log4perl>=1.33:devel/p5-Log-Log4perl
+TEST_DEPENDS=	p5-Test-Output>=1.01:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-DynaLoader-Functions/Makefile b/devel/p5-DynaLoader-Functions/Makefile
index 5318261bad5d..87c2568ecab0 100644
--- a/devel/p5-DynaLoader-Functions/Makefile
+++ b/devel/p5-DynaLoader-Functions/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Deconstructed dynamic C library loading
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-EV/Makefile b/devel/p5-EV/Makefile
index 09790b010c63..f8d330c492af 100644
--- a/devel/p5-EV/Makefile
+++ b/devel/p5-EV/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl interface to libev, a high performance full-featured event loop
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense \
-		p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
+RUN_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense \
+		p5-Canary-Stability>=0:devel/p5-Canary-Stability
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Error-Helper/Makefile b/devel/p5-Error-Helper/Makefile
index 3092c9caeb37..61ea082ef3f1 100644
--- a/devel/p5-Error-Helper/Makefile
+++ b/devel/p5-Error-Helper/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides some easy error related methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Eval-Closure/Makefile b/devel/p5-Eval-Closure/Makefile
index 5aaa784d7be6..c6544d6a144b 100644
--- a/devel/p5-Eval-Closure/Makefile
+++ b/devel/p5-Eval-Closure/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Safely and cleanly create closures via string eval
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Devel-LexAlias>=0.05:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Devel-LexAlias>=0.05:devel/p5-Devel-LexAlias \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Eval-Context/Makefile b/devel/p5-Eval-Context/Makefile
index dc836ad8ef04..3dcfce0adfc9 100644
--- a/devel/p5-Eval-Context/Makefile
+++ b/devel/p5-Eval-Context/Makefile
@@ -15,20 +15,20 @@ COMMENT=	Evaluate Perl code in context wrapper
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Package-Generator>=0:${PORTSDIR}/devel/p5-Package-Generator \
-		p5-Test-Spelling>=0:${PORTSDIR}/devel/p5-Test-Spelling \
-		p5-Test-Block>=0:${PORTSDIR}/devel/p5-Test-Block \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Dependencies>=0:${PORTSDIR}/devel/p5-Test-Dependencies \
-		p5-Test-Strict>=0:${PORTSDIR}/devel/p5-Test-Strict \
-		p5-Directory-Scratch-Structured>=0:${PORTSDIR}/devel/p5-Directory-Scratch-Structured \
-		p5-Data-TreeDumper>=0:${PORTSDIR}/devel/p5-Data-TreeDumper \
-		p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Package-Generator>=0:devel/p5-Package-Generator \
+		p5-Test-Spelling>=0:devel/p5-Test-Spelling \
+		p5-Test-Block>=0:devel/p5-Test-Block \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Distribution>=0:devel/p5-Test-Distribution \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Dependencies>=0:devel/p5-Test-Dependencies \
+		p5-Test-Strict>=0:devel/p5-Test-Strict \
+		p5-Directory-Scratch-Structured>=0:devel/p5-Directory-Scratch-Structured \
+		p5-Data-TreeDumper>=0:devel/p5-Data-TreeDumper \
+		p5-Data-Compare>=0:devel/p5-Data-Compare \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Eval-WithLexicals/Makefile b/devel/p5-Eval-WithLexicals/Makefile
index def218701dcd..059ff2b6289d 100644
--- a/devel/p5-Eval-WithLexicals/Makefile
+++ b/devel/p5-Eval-WithLexicals/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>=0.009006:${PORTSDIR}/devel/p5-Moo
+	p5-Moo>=0.009006:devel/p5-Moo
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Event-ExecFlow/Makefile b/devel/p5-Event-ExecFlow/Makefile
index d8b991bb8915..c809d9aa36f5 100644
--- a/devel/p5-Event-ExecFlow/Makefile
+++ b/devel/p5-Event-ExecFlow/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	API for complex flow controls with asynchronous execution of external programs
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Locale-libintl>=0:devel/p5-Locale-libintl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Event-Join/Makefile b/devel/p5-Event-Join/Makefile
index e7f48c10b1e6..94c24e56743f 100644
--- a/devel/p5-Event-Join/Makefile
+++ b/devel/p5-Event-Join/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Join multiple "events" into one
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose
 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
@@ -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/devel/p5-Event-Lib/Makefile b/devel/p5-Event-Lib/Makefile
index 8278a7a8d2a4..a8688a23ce20 100644
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Makes libevent(3) accessible with Perl
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Event-Notify/Makefile b/devel/p5-Event-Notify/Makefile
index bf28acae70ac..0326dd1a922f 100644
--- a/devel/p5-Event-Notify/Makefile
+++ b/devel/p5-Event-Notify/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Simple Observer/Notifier
 
-BUILD_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
-RUN_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject
+BUILD_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
+RUN_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Event-RPC/Makefile b/devel/p5-Event-RPC/Makefile
index 639dd18b9aca..d79c121d3875 100644
--- a/devel/p5-Event-RPC/Makefile
+++ b/devel/p5-Event-RPC/Makefile
@@ -28,24 +28,24 @@ OPTIONS_DEFAULT=	EVENT ANYEVENT SSL
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
-BUILD_DEPENDS=	p5-Storable>=0:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS=	p5-Storable>=0:devel/p5-Storable
 
 .if ${PORT_OPTIONS:MEVENT}
-BUILD_DEPENDS+=	p5-Event>=0:${PORTSDIR}/devel/p5-Event
+BUILD_DEPENDS+=	p5-Event>=0:devel/p5-Event
 .endif
 
 .if ${PORT_OPTIONS:MANYEVENT}
-BUILD_DEPENDS+=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+BUILD_DEPENDS+=	p5-AnyEvent>=0:devel/p5-AnyEvent
 .endif
 
 .if ${PORT_OPTIONS:MGLIB}
-BUILD_DEPENDS+=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS+=	p5-Glib2>=0:devel/p5-Glib2
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
-BUILD_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/devel/p5-Every/Makefile b/devel/p5-Every/Makefile
index 483fe4f8b7f8..595d212b9812 100644
--- a/devel/p5-Every/Makefile
+++ b/devel/p5-Every/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Return true every N cycles or S seconds
 
-BUILD_DEPENDS=	p5-Devel-Callsite>=0.04:${PORTSDIR}/devel/p5-Devel-Callsite
+BUILD_DEPENDS=	p5-Devel-Callsite>=0.04:devel/p5-Devel-Callsite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Exception-Class-TryCatch/Makefile b/devel/p5-Exception-Class-TryCatch/Makefile
index e6998ad968de..8d29e7d0ab8a 100644
--- a/devel/p5-Exception-Class-TryCatch/Makefile
+++ b/devel/p5-Exception-Class-TryCatch/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Syntactic try/catch sugar for use with Exception::Class
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
-RUN_DEPENDS+=	p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS+=	p5-Exception-Class>=0:devel/p5-Exception-Class
+RUN_DEPENDS+=	p5-Exception-Class>=0:devel/p5-Exception-Class
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Exception-Class/Makefile b/devel/p5-Exception-Class/Makefile
index 29024d97237b..8d18c05180c6 100644
--- a/devel/p5-Exception-Class/Makefile
+++ b/devel/p5-Exception-Class/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Devel-StackTrace>=2.00:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0.02:devel/p5-Class-Data-Inheritable \
+		p5-Devel-StackTrace>=2.00:devel/p5-Devel-StackTrace
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Expect-Simple/Makefile b/devel/p5-Expect-Simple/Makefile
index 0539425dd270..9fa65b62c509 100644
--- a/devel/p5-Expect-Simple/Makefile
+++ b/devel/p5-Expect-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrapper around the Expect module
 
-BUILD_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect
+BUILD_DEPENDS=	p5-Expect>=0:lang/p5-Expect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Exporter-Declare/Makefile b/devel/p5-Exporter-Declare/Makefile
index bda73882043d..e8130e94187d 100644
--- a/devel/p5-Exporter-Declare/Makefile
+++ b/devel/p5-Exporter-Declare/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Meta-Builder>=0.003:${PORTSDIR}/devel/p5-Meta-Builder \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-Meta-Builder>=0.003:devel/p5-Meta-Builder \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Fennec-Lite>=0:${PORTSDIR}/devel/p5-Fennec-Lite \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Fennec-Lite>=0:devel/p5-Fennec-Lite \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Exporter-Tiny/Makefile b/devel/p5-Exporter-Tiny/Makefile
index b1415e9366b6..09338b7a31c5 100644
--- a/devel/p5-Exporter-Tiny/Makefile
+++ b/devel/p5-Exporter-Tiny/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Exporter with features of Sub::Exporter but only core dependencies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-ExtUtils-CChecker/Makefile b/devel/p5-ExtUtils-CChecker/Makefile
index 1a26627c8d67..988ffe56363a 100644
--- a/devel/p5-ExtUtils-CChecker/Makefile
+++ b/devel/p5-ExtUtils-CChecker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Configure-time utilities for using C headers, libraries, OS features
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-ExtUtils-CppGuess/Makefile b/devel/p5-ExtUtils-CppGuess/Makefile
index d608cafc365b..b04f41443f95 100644
--- a/devel/p5-ExtUtils-CppGuess/Makefile
+++ b/devel/p5-ExtUtils-CppGuess/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Guess C++ compiler and flags
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-ExtUtils-InstallPaths/Makefile b/devel/p5-ExtUtils-InstallPaths/Makefile
index 12c409223f29..1f34b3372056 100644
--- a/devel/p5-ExtUtils-InstallPaths/Makefile
+++ b/devel/p5-ExtUtils-InstallPaths/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Build.PL install path logic made easy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Config>=0.002:${PORTSDIR}/devel/p5-ExtUtils-Config
+BUILD_DEPENDS=	p5-ExtUtils-Config>=0.002:devel/p5-ExtUtils-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
index 4efb0c9fcec4..8e149b8b8d68 100644
--- a/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-CPANfile/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cpanfile support for ExtUtils::MakeMaker
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-CPANfile>=0:${PORTSDIR}/devel/p5-Module-CPANfile
+BUILD_DEPENDS=	p5-Module-CPANfile>=0:devel/p5-Module-CPANfile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
index dabe08e15ca4..ac1663e5c410 100644
--- a/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker-Coverage/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Add a Makefile target to determine test coverage using Devel::Cover
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Cover>=0:${PORTSDIR}/devel/p5-Devel-Cover \
-		p5-Object-Accessor>=0:${PORTSDIR}/devel/p5-Object-Accessor
+BUILD_DEPENDS=	p5-Devel-Cover>=0:devel/p5-Devel-Cover \
+		p5-Object-Accessor>=0:devel/p5-Object-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 4e3b22e28f01..1dde9b2ab749 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:${PORTSDIR}/devel/p5-ExtUtils-Manifest
-RUN_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:${PORTSDIR}/devel/p5-ExtUtils-Manifest
+BUILD_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:devel/p5-ExtUtils-Manifest
+RUN_DEPENDS+=	p5-ExtUtils-Manifest>=1.65:devel/p5-ExtUtils-Manifest
 .endif
 
 post-patch:
diff --git a/devel/p5-ExtUtils-XSBuilder/Makefile b/devel/p5-ExtUtils-XSBuilder/Makefile
index 52ec04c4ab9d..d6a618bea0d0 100644
--- a/devel/p5-ExtUtils-XSBuilder/Makefile
+++ b/devel/p5-ExtUtils-XSBuilder/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Autogenerating XS-glue Code
 
-RUN_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+RUN_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ExtUtils-XSpp/Makefile b/devel/p5-ExtUtils-XSpp/Makefile
index 2363634d11f7..97f6e8874b5a 100644
--- a/devel/p5-ExtUtils-XSpp/Makefile
+++ b/devel/p5-ExtUtils-XSpp/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS for C++ in Perl
 
-BUILD_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+BUILD_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-FSA-Rules/Makefile b/devel/p5-FSA-Rules/Makefile
index 28995d7a06f8..f829129b56cd 100644
--- a/devel/p5-FSA-Rules/Makefile
+++ b/devel/p5-FSA-Rules/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Build simple rules-based state machines in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GraphViz>=2:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+BUILD_DEPENDS=	p5-GraphViz>=2:graphics/p5-GraphViz \
+		p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Append-TempFile/Makefile b/devel/p5-File-Append-TempFile/Makefile
index 6504e6f3776a..4fa2b8ac1237 100644
--- a/devel/p5-File-Append-TempFile/Makefile
+++ b/devel/p5-File-Append-TempFile/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Append data to files using a temporary copy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/p5-File-Assets/Makefile b/devel/p5-File-Assets/Makefile
index baa568d1872d..b75a3c3e7e9e 100644
--- a/devel/p5-File-Assets/Makefile
+++ b/devel/p5-File-Assets/Makefile
@@ -12,30 +12,30 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module to Manage .css and .js assets
 
-BUILD_DEPENDS=	p5-Test-Memory-Cycle>0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-	p5-Directory-Scratch>0:${PORTSDIR}/devel/p5-Directory-Scratch \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Path-Resource>0:${PORTSDIR}/devel/p5-Path-Resource \
-	p5-Tie-LLHash>0:${PORTSDIR}/devel/p5-Tie-LLHash \
-	p5-Carp-Clan-Share>0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-	p5-Object-Tiny>0:${PORTSDIR}/devel/p5-Object-Tiny \
-	p5-HTML-Declare>0:${PORTSDIR}/www/p5-HTML-Declare \
-	p5-XML-Tiny>0:${PORTSDIR}/textproc/p5-XML-Tiny \
-	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-	p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS
-RUN_DEPENDS=	p5-Test-Memory-Cycle>0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-	p5-Directory-Scratch>0:${PORTSDIR}/devel/p5-Directory-Scratch \
-	p5-MIME-Types>0:${PORTSDIR}/mail/p5-MIME-Types \
-	p5-Path-Resource>0:${PORTSDIR}/devel/p5-Path-Resource \
-	p5-Tie-LLHash>0:${PORTSDIR}/devel/p5-Tie-LLHash \
-	p5-Carp-Clan-Share>0:${PORTSDIR}/devel/p5-Carp-Clan-Share \
-	p5-Object-Tiny>0:${PORTSDIR}/devel/p5-Object-Tiny \
-	p5-HTML-Declare>0:${PORTSDIR}/www/p5-HTML-Declare \
-	p5-XML-Tiny>0:${PORTSDIR}/textproc/p5-XML-Tiny \
-	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-	p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS
+BUILD_DEPENDS=	p5-Test-Memory-Cycle>0:devel/p5-Test-Memory-Cycle \
+	p5-Directory-Scratch>0:devel/p5-Directory-Scratch \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Path-Resource>0:devel/p5-Path-Resource \
+	p5-Tie-LLHash>0:devel/p5-Tie-LLHash \
+	p5-Carp-Clan-Share>0:devel/p5-Carp-Clan-Share \
+	p5-Object-Tiny>0:devel/p5-Object-Tiny \
+	p5-HTML-Declare>0:www/p5-HTML-Declare \
+	p5-XML-Tiny>0:textproc/p5-XML-Tiny \
+	p5-IO-stringy>0:devel/p5-IO-stringy \
+	p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+	p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS
+RUN_DEPENDS=	p5-Test-Memory-Cycle>0:devel/p5-Test-Memory-Cycle \
+	p5-Directory-Scratch>0:devel/p5-Directory-Scratch \
+	p5-MIME-Types>0:mail/p5-MIME-Types \
+	p5-Path-Resource>0:devel/p5-Path-Resource \
+	p5-Tie-LLHash>0:devel/p5-Tie-LLHash \
+	p5-Carp-Clan-Share>0:devel/p5-Carp-Clan-Share \
+	p5-Object-Tiny>0:devel/p5-Object-Tiny \
+	p5-HTML-Declare>0:www/p5-HTML-Declare \
+	p5-XML-Tiny>0:textproc/p5-XML-Tiny \
+	p5-IO-stringy>0:devel/p5-IO-stringy \
+	p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+	p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Attributes-Recursive/Makefile b/devel/p5-File-Attributes-Recursive/Makefile
index 69a3b79a2eba..6eb476f0c395 100644
--- a/devel/p5-File-Attributes-Recursive/Makefile
+++ b/devel/p5-File-Attributes-Recursive/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Inherit file attributes from parent directories
 
-BUILD_DEPENDS=	p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-File-Attributes>=0:${PORTSDIR}/devel/p5-File-Attributes
+BUILD_DEPENDS=	p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-File-Attributes>=0:devel/p5-File-Attributes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Attributes/Makefile b/devel/p5-File-Attributes/Makefile
index 9ec93b18c012..ce1ddcf65426 100644
--- a/devel/p5-File-Attributes/Makefile
+++ b/devel/p5-File-Attributes/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	File::Attributes - Manipulate file metadata
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Directory-Scratch>=0:${PORTSDIR}/devel/p5-Directory-Scratch \
-		p5-Best>=0:${PORTSDIR}/devel/p5-Best \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-Directory-Scratch>=0:devel/p5-Directory-Scratch \
+		p5-Best>=0:devel/p5-Best \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-BOM/Makefile b/devel/p5-File-BOM/Makefile
index 2c433183eabf..fb90bbdee20a 100644
--- a/devel/p5-File-BOM/Makefile
+++ b/devel/p5-File-BOM/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl module to handle Unicode byte order marks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-BaseDir/Makefile b/devel/p5-File-BaseDir/Makefile
index 2064b89f5c11..e18d9f26af2d 100644
--- a/devel/p5-File-BaseDir/Makefile
+++ b/devel/p5-File-BaseDir/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Use the freedesktop basedir spec
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IPC-System-Simple>=0:${PORTSDIR}/devel/p5-IPC-System-Simple
+BUILD_DEPENDS=	p5-IPC-System-Simple>=0:devel/p5-IPC-System-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which  \
-		p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.00:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which  \
+		p5-Test-Pod>=1.00:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.00:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-Binary/Makefile b/devel/p5-File-Binary/Makefile
index 91f08113e2b4..eb06ee249146 100644
--- a/devel/p5-File-Binary/Makefile
+++ b/devel/p5-File-Binary/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to modify and read binary files
 
-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}
 
 USES=		perl5
diff --git a/devel/p5-File-ChangeNotify/Makefile b/devel/p5-File-ChangeNotify/Makefile
index ac0bacbf9586..946302f851ec 100644
--- a/devel/p5-File-ChangeNotify/Makefile
+++ b/devel/p5-File-ChangeNotify/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Watch for changes to files
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-IO-KQueue>=0:${PORTSDIR}/devel/p5-IO-KQueue \
-		p5-MooseX-Params-Validate>=0:${PORTSDIR}/devel/p5-MooseX-Params-Validate \
-		p5-MooseX-SemiAffordanceAccessor>=0:${PORTSDIR}/devel/p5-MooseX-SemiAffordanceAccessor \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-IO-KQueue>=0:devel/p5-IO-KQueue \
+		p5-MooseX-Params-Validate>=0:devel/p5-MooseX-Params-Validate \
+		p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 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=	modbuild
diff --git a/devel/p5-File-ConfigDir/Makefile b/devel/p5-File-ConfigDir/Makefile
index 652ba9ca45b6..224d3bbb86ce 100644
--- a/devel/p5-File-ConfigDir/Makefile
+++ b/devel/p5-File-ConfigDir/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Get directories of configuration files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0.50:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-File-HomeDir>=0.50:devel/p5-File-HomeDir \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-CreationTime/Makefile b/devel/p5-File-CreationTime/Makefile
index 1de5ac050d0e..07b1dfc456d6 100644
--- a/devel/p5-File-CreationTime/Makefile
+++ b/devel/p5-File-CreationTime/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Keeps track of file creation times
 
-BUILD_DEPENDS=	p5-File-Attributes>=0:${PORTSDIR}/devel/p5-File-Attributes
+BUILD_DEPENDS=	p5-File-Attributes>=0:devel/p5-File-Attributes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-DesktopEntry/Makefile b/devel/p5-File-DesktopEntry/Makefile
index 39fba6197283..5598c15a4584 100644
--- a/devel/p5-File-DesktopEntry/Makefile
+++ b/devel/p5-File-DesktopEntry/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Object to handle desktop files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir
+BUILD_DEPENDS=	p5-File-BaseDir>=0.03:devel/p5-File-BaseDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Dir-Dumper/Makefile b/devel/p5-File-Dir-Dumper/Makefile
index 0b9ff4d6953d..36cb152d3fb9 100644
--- a/devel/p5-File-Dir-Dumper/Makefile
+++ b/devel/p5-File-Dir-Dumper/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	tolid@tolid.eu.org
 COMMENT=	Perl5 module to dump directory structures meta-data
 
-BUILD_DEPENDS=	p5-File-Find-Object>0:${PORTSDIR}/devel/p5-File-Find-Object \
-		p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Devel-CheckOS>0:${PORTSDIR}/devel/p5-Devel-CheckOS
+BUILD_DEPENDS=	p5-File-Find-Object>0:devel/p5-File-Find-Object \
+		p5-IO-String>0:devel/p5-IO-String \
+		p5-JSON>0:converters/p5-JSON \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Devel-CheckOS>0:devel/p5-Devel-CheckOS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Object/Makefile b/devel/p5-File-Find-Object/Makefile
index e25a987c128d..8d31d42142a4 100644
--- a/devel/p5-File-Find-Object/Makefile
+++ b/devel/p5-File-Find-Object/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Object oriented File::Find replacement
 LICENSE=	ART20 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor
+BUILD_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
index 1f2b0cfef872..66a8b0b4761b 100644
--- a/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
+++ b/devel/p5-File-Find-Rule-Filesys-Virtual/Makefile
@@ -14,9 +14,9 @@ COMMENT=	File::Find::Rule adapted to Filesys::Virtual
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Filesys-Virtual>=0:${PORTSDIR}/devel/p5-Filesys-Virtual \
-		p5-Filesys-Virtual-Plain>=0:${PORTSDIR}/devel/p5-Filesys-Virtual-Plain
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-Filesys-Virtual>=0:devel/p5-Filesys-Virtual \
+		p5-Filesys-Virtual-Plain>=0:devel/p5-Filesys-Virtual-Plain
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Find-Rule-Perl/Makefile b/devel/p5-File-Find-Rule-Perl/Makefile
index b801b83946c9..5b1079d067b7 100644
--- a/devel/p5-File-Find-Rule-Perl/Makefile
+++ b/devel/p5-File-Find-Rule-Perl/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Common rules for searching for Perl things
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Parse-CPAN-Meta>=1.38:${PORTSDIR}/devel/p5-Parse-CPAN-Meta \
-		p5-Params-Util>=0.38:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
+		p5-Parse-CPAN-Meta>=1.38:devel/p5-Parse-CPAN-Meta \
+		p5-Params-Util>=0.38:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Rule-VCS/Makefile b/devel/p5-File-Find-Rule-VCS/Makefile
index 748f9fdc01e0..7f7af7d988fd 100644
--- a/devel/p5-File-Find-Rule-VCS/Makefile
+++ b/devel/p5-File-Find-Rule-VCS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Exclude files and directories for Version Control Systems
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Text-Glob>=0.08:${PORTSDIR}/textproc/p5-Text-Glob
+BUILD_DEPENDS=	p5-File-Find-Rule>=0.20:devel/p5-File-Find-Rule \
+		p5-Text-Glob>=0.08:textproc/p5-Text-Glob
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Find-Rule/Makefile b/devel/p5-File-Find-Rule/Makefile
index a6d199c65605..d98a978cf4eb 100644
--- a/devel/p5-File-Find-Rule/Makefile
+++ b/devel/p5-File-Find-Rule/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Alternative interface to File::Find
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Number-Compare>=0:${PORTSDIR}/math/p5-Number-Compare \
-		p5-Text-Glob>=0.07:${PORTSDIR}/textproc/p5-Text-Glob
+RUN_DEPENDS=	p5-Number-Compare>=0:math/p5-Number-Compare \
+		p5-Text-Glob>=0.07:textproc/p5-Text-Glob
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Finder/Makefile b/devel/p5-File-Finder/Makefile
index 52d58d40a235..e4e98b3d0f92 100644
--- a/devel/p5-File-Finder/Makefile
+++ b/devel/p5-File-Finder/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Nice wrapper for File::Find ala find(1)
 
-RUN_DEPENDS=	p5-Text-Glob>0:${PORTSDIR}/textproc/p5-Text-Glob
+RUN_DEPENDS=	p5-Text-Glob>0:textproc/p5-Text-Glob
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Flat/Makefile b/devel/p5-File-Flat/Makefile
index 8575b45d6016..700271ff7bed 100644
--- a/devel/p5-File-Flat/Makefile
+++ b/devel/p5-File-Flat/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements a flat filesystem
 
-BUILD_DEPENDS=	p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove \
-		p5-Class-Autouse>=0:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-prefork>=0:${PORTSDIR}/devel/p5-prefork
+BUILD_DEPENDS=	p5-File-NCopy>=0:devel/p5-File-NCopy \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Remove>=0:devel/p5-File-Remove \
+		p5-Class-Autouse>=0:devel/p5-Class-Autouse \
+		p5-prefork>=0:devel/p5-prefork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-ClassAPI>=0:${PORTSDIR}/devel/p5-Test-ClassAPI
+TEST_DEPENDS=	p5-Test-ClassAPI>=0:devel/p5-Test-ClassAPI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Flock-Retry/Makefile b/devel/p5-File-Flock-Retry/Makefile
index 8573e661db0b..d2d968b202a5 100644
--- a/devel/p5-File-Flock-Retry/Makefile
+++ b/devel/p5-File-Flock-Retry/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Yet another flock module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir
+TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-File-Flock/Makefile b/devel/p5-File-Flock/Makefile
index dd45fd851df9..d2937868a215 100644
--- a/devel/p5-File-Flock/Makefile
+++ b/devel/p5-File-Flock/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl5 module for file locking with flock
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util \
-		p5-IO-Event>=0.812:${PORTSDIR}/devel/p5-IO-Event
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util \
+		p5-IO-Event>=0.812:devel/p5-IO-Event
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-HomeDir-PathClass/Makefile b/devel/p5-File-HomeDir-PathClass/Makefile
index 8c563ce53b2c..49e9f0e44c7f 100644
--- a/devel/p5-File-HomeDir-PathClass/Makefile
+++ b/devel/p5-File-HomeDir-PathClass/Makefile
@@ -13,9 +13,9 @@ COMMENT=	File::HomeDir returning Path::Class objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0.93:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-File-HomeDir>=0.93:devel/p5-File-HomeDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-HomeDir/Makefile b/devel/p5-File-HomeDir/Makefile
index a00393e461a4..5d9d0c3ba848 100644
--- a/devel/p5-File-HomeDir/Makefile
+++ b/devel/p5-File-HomeDir/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Get home directory for self or other users
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
-RUN_DEPENDS=	p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-File-Which>=0.05:sysutils/p5-File-Which
+RUN_DEPENDS=	p5-File-Which>=0.05:sysutils/p5-File-Which
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Map/Makefile b/devel/p5-File-Map/Makefile
index 03dddf424feb..4f96d289e26e 100644
--- a/devel/p5-File-Map/Makefile
+++ b/devel/p5-File-Map/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Memory mapping made simple and safe
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-Layers>=0:${PORTSDIR}/devel/p5-PerlIO-Layers \
-		p5-Sub-Exporter-Progressive>=0.001005:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-PerlIO-Layers>=0:devel/p5-PerlIO-Layers \
+		p5-Sub-Exporter-Progressive>=0.001005:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-MimeInfo/Makefile b/devel/p5-File-MimeInfo/Makefile
index 9c94b3d79830..992844dd14a5 100644
--- a/devel/p5-File-MimeInfo/Makefile
+++ b/devel/p5-File-MimeInfo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Determine file type
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-File-DesktopEntry>=0.04:${PORTSDIR}/devel/p5-File-DesktopEntry
+BUILD_DEPENDS=	p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
+		p5-File-DesktopEntry>=0.04:devel/p5-File-DesktopEntry
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Modified/Makefile b/devel/p5-File-Modified/Makefile
index ba89b1fb3751..38d6fca62148 100644
--- a/devel/p5-File-Modified/Makefile
+++ b/devel/p5-File-Modified/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for checking intelligently if files have changed
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Pid/Makefile b/devel/p5-File-Pid/Makefile
index 0ddf2c86614d..3cb5dad75771 100644
--- a/devel/p5-File-Pid/Makefile
+++ b/devel/p5-File-Pid/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pid File Manipulation
 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/devel/p5-File-Policy/Makefile b/devel/p5-File-Policy/Makefile
index cc077ff6e661..3f8896551f7b 100644
--- a/devel/p5-File-Policy/Makefile
+++ b/devel/p5-File-Policy/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple policy for file I/O functions
 
-BUILD_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace \
-		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace \
+		p5-File-Slurp>0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+TEST_DEPENDS=	p5-Test-Assertions>0:devel/p5-Test-Assertions
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Random/Makefile b/devel/p5-File-Random/Makefile
index 0240f109f2b9..4ed0311f1419 100644
--- a/devel/p5-File-Random/Makefile
+++ b/devel/p5-File-Random/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Perl module for random selecting of a file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Set-Scalar>0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Want>=0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Set-Scalar>0:devel/p5-Set-Scalar \
+		p5-Want>=0:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0.03:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Differences>=0.43:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>0.1:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-ManyParams>0:${PORTSDIR}/devel/p5-Test-ManyParams \
-		p5-Test-Warn>0.05:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Class>=0.03:devel/p5-Test-Class \
+		p5-Test-Differences>=0.43:devel/p5-Test-Differences \
+		p5-Test-Exception>0.1:devel/p5-Test-Exception \
+		p5-Test-ManyParams>0:devel/p5-Test-ManyParams \
+		p5-Test-Warn>0.05:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index b7274d8a4fd0..f25f3c61b100 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	File::ReadBackwards -- read a file backwards by lines
 
-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/devel/p5-File-SearchPath/Makefile b/devel/p5-File-SearchPath/Makefile
index bf63966ca8f4..c07ad6bdb458 100644
--- a/devel/p5-File-SearchPath/Makefile
+++ b/devel/p5-File-SearchPath/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Search for a file in an environment variable path
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Env-Path>=0:${PORTSDIR}/devel/p5-Env-Path
+BUILD_DEPENDS=	p5-Env-Path>=0:devel/p5-Env-Path
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-PAR/Makefile b/devel/p5-File-ShareDir-PAR/Makefile
index 0b1fbde12eba..db7429bb59bb 100644
--- a/devel/p5-File-ShareDir-PAR/Makefile
+++ b/devel/p5-File-ShareDir-PAR/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl5 File::ShareDir module with PAR support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-PAR>=0:${PORTSDIR}/devel/p5-PAR \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-PAR>=0:devel/p5-PAR \
+		p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-PathClass/Makefile b/devel/p5-File-ShareDir-PathClass/Makefile
index 2e2ebd64c157..9be5ca903c8c 100644
--- a/devel/p5-File-ShareDir-PathClass/Makefile
+++ b/devel/p5-File-ShareDir-PathClass/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	File::ShareDir returning Path::Class objects
 
-BUILD_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-ProjectDistDir/Makefile b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
index fa5c82823aff..2398758ec067 100644
--- a/devel/p5-File-ShareDir-ProjectDistDir/Makefile
+++ b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Perl extension for set-and-forget using a directory in projects root
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Path-FindDev>0:${PORTSDIR}/devel/p5-Path-FindDev \
-		p5-Path-IsDev>0:${PORTSDIR}/devel/p5-Path-IsDev \
-		p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-File-ShareDir>0:devel/p5-File-ShareDir \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-Path-FindDev>0:devel/p5-Path-FindDev \
+		p5-Path-IsDev>0:devel/p5-Path-IsDev \
+		p5-Path-Tiny>0:devel/p5-Path-Tiny \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=	perl5
diff --git a/devel/p5-File-ShareDir/Makefile b/devel/p5-File-ShareDir/Makefile
index 14ca5e5b1a5b..0b4f5626042f 100644
--- a/devel/p5-File-ShareDir/Makefile
+++ b/devel/p5-File-ShareDir/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Locate per-dist and per-module shared files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Class-Inspector>=1.12:${PORTSDIR}/devel/p5-Class-Inspector
+RUN_DEPENDS=	p5-Class-Inspector>=1.12:devel/p5-Class-Inspector
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Slurp-Tree/Makefile b/devel/p5-File-Slurp-Tree/Makefile
index f59eba388c65..450ced6e0a6c 100644
--- a/devel/p5-File-Slurp-Tree/Makefile
+++ b/devel/p5-File-Slurp-Tree/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Slurp and emit file trees as nested hashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-File-Stream/Makefile b/devel/p5-File-Stream/Makefile
index eb5d82d8a6d5..e7b6b5298d63 100644
--- a/devel/p5-File-Stream/Makefile
+++ b/devel/p5-File-Stream/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Regular expression delimited records from streams
 
-RUN_DEPENDS=	p5-YAPE-Regex>=4.00:${PORTSDIR}/textproc/p5-YAPE-Regex
+RUN_DEPENDS=	p5-YAPE-Regex>=4.00:textproc/p5-YAPE-Regex
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-File-Tail-Dir/Makefile b/devel/p5-File-Tail-Dir/Makefile
index 77d63cb3e803..d3afb0955cc3 100644
--- a/devel/p5-File-Tail-Dir/Makefile
+++ b/devel/p5-File-Tail-Dir/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tail all matching files in a given set of directories
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-ChangeNotify>0:${PORTSDIR}/devel/p5-File-ChangeNotify \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-File-ChangeNotify>0:devel/p5-File-ChangeNotify \
+		p5-Moose>0:devel/p5-Moose \
+		p5-YAML>0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-File-Tail-Scribe/Makefile b/devel/p5-File-Tail-Scribe/Makefile
index 301042299498..f0451ec4b269 100644
--- a/devel/p5-File-Tail-Scribe/Makefile
+++ b/devel/p5-File-Tail-Scribe/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl Module to tail file to Scribe server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Tail-Dir>=0:${PORTSDIR}/devel/p5-File-Tail-Dir \
-		p5-Log-Dispatch-Scribe>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Scribe \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-File-Tail-Dir>=0:devel/p5-File-Tail-Dir \
+		p5-Log-Dispatch-Scribe>=0:devel/p5-Log-Dispatch-Scribe \
+		p5-Moose>=0:devel/p5-Moose
 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/devel/p5-File-Util/Makefile b/devel/p5-File-Util/Makefile
index 32a43406ae3d..a5eb27962b6a 100644
--- a/devel/p5-File-Util/Makefile
+++ b/devel/p5-File-Util/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jeffhung@mail2000.com.tw
 COMMENT=	Perl5 module for easy, versatile, portable file handling
 
-RUN_DEPENDS=	p5-Class-OOorNO>=0.01:${PORTSDIR}/devel/p5-Class-OOorNO \
-		p5-Exception-Handler>=1:${PORTSDIR}/devel/p5-Exception-Handler
+RUN_DEPENDS=	p5-Class-OOorNO>=0.01:devel/p5-Class-OOorNO \
+		p5-Exception-Handler>=1:devel/p5-Exception-Handler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-File-Write-Rotate/Makefile b/devel/p5-File-Write-Rotate/Makefile
index 81adf68ad589..cb9b2136583d 100644
--- a/devel/p5-File-Write-Rotate/Makefile
+++ b/devel/p5-File-Write-Rotate/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Write to files that archive/rotate themselves
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Flock-Retry>=0:${PORTSDIR}/devel/p5-File-Flock-Retry \
-		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
+BUILD_DEPENDS=	p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
+		p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Taint-Runtime>=0:${PORTSDIR}/devel/p5-Taint-Runtime \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warnings>=0.014:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Taint-Runtime>=0:devel/p5-Taint-Runtime \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Warnings>=0.014:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-FileHandle-Unget/Makefile b/devel/p5-FileHandle-Unget/Makefile
index d835e9f34881..56d706fa0c8f 100644
--- a/devel/p5-FileHandle-Unget/Makefile
+++ b/devel/p5-FileHandle-Unget/Makefile
@@ -12,8 +12,8 @@ COMMENT=	FileHandle which supports ungetting of multiple bytes
 
 LICENSE=	GPLv2
 
-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/devel/p5-Filesys-Notify-KQueue/Makefile b/devel/p5-Filesys-Notify-KQueue/Makefile
index 4458f81e45c8..adeda545df0e 100644
--- a/devel/p5-Filesys-Notify-KQueue/Makefile
+++ b/devel/p5-Filesys-Notify-KQueue/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-IO-KQueue>0:${PORTSDIR}/devel/p5-IO-KQueue
+	p5-IO-KQueue>0:devel/p5-IO-KQueue
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-SharedFork>=0.19:${PORTSDIR}/devel/p5-Test-SharedFork
+TEST_DEPENDS=	p5-Test-SharedFork>=0.19:devel/p5-Test-SharedFork
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Filesys-Virtual-Plain/Makefile b/devel/p5-Filesys-Virtual-Plain/Makefile
index 0e0af5f9e244..a7727f648658 100644
--- a/devel/p5-Filesys-Virtual-Plain/Makefile
+++ b/devel/p5-Filesys-Virtual-Plain/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Plain virtual filesystem
 
-BUILD_DEPENDS=	p5-Filesys-Virtual>=0.05:${PORTSDIR}/devel/p5-Filesys-Virtual
+BUILD_DEPENDS=	p5-Filesys-Virtual>=0.05:devel/p5-Filesys-Virtual
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Filter-Template/Makefile b/devel/p5-Filter-Template/Makefile
index da7e7ab0d46f..caa56a9e563c 100644
--- a/devel/p5-Filter-Template/Makefile
+++ b/devel/p5-Filter-Template/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Source filter for inline code templates (macros)
 
-BUILD_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter
+BUILD_DEPENDS=	p5-Filter>=0:devel/p5-Filter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Forest/Makefile b/devel/p5-Forest/Makefile
index efc4fe4b267b..cd1f6c3c4d27 100644
--- a/devel/p5-Forest/Makefile
+++ b/devel/p5-Forest/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Collection of n-ary tree related modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Clone>=0.05:${PORTSDIR}/devel/p5-MooseX-Clone
+BUILD_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Clone>=0.05:devel/p5-MooseX-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Form-Sensible/Makefile b/devel/p5-Form-Sensible/Makefile
index 309c8b10eb29..15fcfd92ab45 100644
--- a/devel/p5-Form-Sensible/Makefile
+++ b/devel/p5-Form-Sensible/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Sensible way to handle form based user interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Natural>=0:${PORTSDIR}/devel/p5-DateTime-Format-Natural \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set \
-		p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Natural>=0:devel/p5-DateTime-Format-Natural \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set \
+		p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Function-Parameters/Makefile b/devel/p5-Function-Parameters/Makefile
index 95bc103e6112..941586746df2 100644
--- a/devel/p5-Function-Parameters/Makefile
+++ b/devel/p5-Function-Parameters/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Subroutine definitions with parameter lists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Dir-Self>=0:${PORTSDIR}/devel/p5-Dir-Self \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+TEST_DEPENDS=	p5-Dir-Self>=0:devel/p5-Dir-Self \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-aliased>=0:devel/p5-aliased
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/devel/p5-Future/Makefile b/devel/p5-Future/Makefile
index 255922cd70bd..8d26793c689c 100644
--- a/devel/p5-Future/Makefile
+++ b/devel/p5-Future/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Build objects representing outstanding operations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Identity>0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Refcount>0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-Identity>0:devel/p5-Test-Identity \
+		p5-Test-Refcount>0:devel/p5-Test-Refcount
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Gearman-Client-Async/Makefile b/devel/p5-Gearman-Client-Async/Makefile
index 3bf717e81070..4d6ad385736a 100644
--- a/devel/p5-Gearman-Client-Async/Makefile
+++ b/devel/p5-Gearman-Client-Async/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Asynchronous client module for Gearman for Danga::Socket applications
 
-RUN_DEPENDS=	p5-Danga-Socket>=0:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-Gearman>=0:${PORTSDIR}/devel/p5-Gearman
+RUN_DEPENDS=	p5-Danga-Socket>=0:devel/p5-Danga-Socket \
+		p5-Gearman>=0:devel/p5-Gearman
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Gearman-Server>=0:${PORTSDIR}/devel/p5-Gearman-Server
+TEST_DEPENDS=	p5-Gearman-Server>=0:devel/p5-Gearman-Server
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Gearman-Server/Makefile b/devel/p5-Gearman-Server/Makefile
index 46175be28fcd..4a7fc37132bd 100644
--- a/devel/p5-Gearman-Server/Makefile
+++ b/devel/p5-Gearman-Server/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Gearman server daemon
 
-RUN_DEPENDS=	p5-Gearman>=1.10:${PORTSDIR}/devel/p5-Gearman \
-		p5-Danga-Socket>=1.52:${PORTSDIR}/devel/p5-Danga-Socket
+RUN_DEPENDS=	p5-Gearman>=1.10:devel/p5-Gearman \
+		p5-Danga-Socket>=1.52:devel/p5-Danga-Socket
 
 CONFLICTS=	gearmand-0.* gearmand-1.0.* gearmand-1.1.*
 
diff --git a/devel/p5-Gearman-XS/Makefile b/devel/p5-Gearman-XS/Makefile
index ac4df476f9d3..1bdf2e378c65 100644
--- a/devel/p5-Gearman-XS/Makefile
+++ b/devel/p5-Gearman-XS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	otaviof@gmail.com
 COMMENT=	Perl front end for the Gearman C library
 
-LIB_DEPENDS=	libgearman.so:${PORTSDIR}/devel/gearmand
+LIB_DEPENDS=	libgearman.so:devel/gearmand
 
 CFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/devel/p5-Gearman/Makefile b/devel/p5-Gearman/Makefile
index c1dcd6757d3f..e3a8c120d99f 100644
--- a/devel/p5-Gearman/Makefile
+++ b/devel/p5-Gearman/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Gearman client libraray for Perl
 
-RUN_DEPENDS+=	p5-String-CRC32>=0.0:${PORTSDIR}/devel/p5-String-CRC32
+RUN_DEPENDS+=	p5-String-CRC32>=0.0:devel/p5-String-CRC32
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Geo-JSON/Makefile b/devel/p5-Geo-JSON/Makefile
index 47faddf657c6..437a3cb51b25 100644
--- a/devel/p5-Geo-JSON/Makefile
+++ b/devel/p5-Geo-JSON/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl OO interface for geojson
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=1.004003:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Moo>=1.004003:devel/p5-Moo \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 USE_PERL5=	modbuildtiny
 USES=		perl5
diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile
index bdd61907c0f9..060d04cb2cca 100644
--- a/devel/p5-Geo-ShapeFile/Makefile
+++ b/devel/p5-Geo-ShapeFile/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for handling ESRI GIS Shapefiles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tree-R>0:${PORTSDIR}/devel/p5-Tree-R \
-		p5-autovivification>0:${PORTSDIR}/devel/p5-autovivification
+BUILD_DEPENDS=	p5-Tree-R>0:devel/p5-Tree-R \
+		p5-autovivification>0:devel/p5-autovivification
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Getargs-Long/Makefile b/devel/p5-Getargs-Long/Makefile
index 48591a853afb..e9e3185c77b9 100644
--- a/devel/p5-Getargs-Long/Makefile
+++ b/devel/p5-Getargs-Long/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parse routine arguments
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Agent>=0.105:${PORTSDIR}/devel/p5-Log-Agent \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Log-Agent>=0.105:devel/p5-Log-Agent \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Getopt-Compact-WithCmd/Makefile b/devel/p5-Getopt-Compact-WithCmd/Makefile
index 26843d9d7fb6..a4f91437d912 100644
--- a/devel/p5-Getopt-Compact-WithCmd/Makefile
+++ b/devel/p5-Getopt-Compact-WithCmd/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sub-command friendly, like Getopt::Compact
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-Text-Table>=0:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Getopt-Compact/Makefile b/devel/p5-Getopt-Compact/Makefile
index 79292fac0648..4c2c08e3c0f5 100644
--- a/devel/p5-Getopt-Compact/Makefile
+++ b/devel/p5-Getopt-Compact/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Getopt processing in a compact statement with long and short options
 
-RUN_DEPENDS=	p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table \
-		p5-Env-Path>=0:${PORTSDIR}/devel/p5-Env-Path
+RUN_DEPENDS=	p5-Text-Table>=0:textproc/p5-Text-Table \
+		p5-Env-Path>=0:devel/p5-Env-Path
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Getopt-Long-Descriptive/Makefile b/devel/p5-Getopt-Long-Descriptive/Makefile
index 75a01523550b..23d604ba2dee 100644
--- a/devel/p5-Getopt-Long-Descriptive/Makefile
+++ b/devel/p5-Getopt-Long-Descriptive/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Getopt::Long with usage text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Validate>=0.97:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Sub-Exporter>=0.972:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Params-Validate>=0.97:devel/p5-Params-Validate \
+		p5-Sub-Exporter>=0.972:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>=0.005:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile
index c13269371477..d228e3855c0d 100644
--- a/devel/p5-Git-PurePerl/Makefile
+++ b/devel/p5-Git-PurePerl/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Pure Perl interface to Git repositories
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract \
-		p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
-		p5-Data-Stream-Bulk>=0:${PORTSDIR}/devel/p5-Data-Stream-Bulk \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-IO-Digest>0:${PORTSDIR}/devel/p5-IO-Digest \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
+		p5-Config-GitLike>=0:devel/p5-Config-GitLike \
+		p5-Data-Stream-Bulk>=0:devel/p5-Data-Stream-Bulk \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-IO-Digest>0:devel/p5-IO-Digest \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-utf8>=0:${PORTSDIR}/devel/p5-Test-utf8
+TEST_DEPENDS=	p5-Test-utf8>=0:devel/p5-Test-utf8
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Git-Repository-Plugin-Log/Makefile b/devel/p5-Git-Repository-Plugin-Log/Makefile
index b9debbd0f4b0..04f97056da5a 100644
--- a/devel/p5-Git-Repository-Plugin-Log/Makefile
+++ b/devel/p5-Git-Repository-Plugin-Log/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Git-Repository>=1.309:${PORTSDIR}/devel/p5-Git-Repository
+BUILD_DEPENDS=	p5-Git-Repository>=1.309:devel/p5-Git-Repository
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile
index 67dd6f2a1207..0d8bca68f3b8 100644
--- a/devel/p5-Git-Repository/Makefile
+++ b/devel/p5-Git-Repository/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		p5-Git-Version-Compare>=1.001:${PORTSDIR}/devel/p5-Git-Version-Compare \
-		p5-System-Command>=1.103:${PORTSDIR}/devel/p5-System-Command \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	git:devel/git \
+		p5-Git-Version-Compare>=1.001:devel/p5-Git-Version-Compare \
+		p5-System-Command>=1.103:devel/p5-System-Command \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Git-Sub/Makefile b/devel/p5-Git-Sub/Makefile
index a942b0fdfcc7..a6911d2c311b 100644
--- a/devel/p5-Git-Sub/Makefile
+++ b/devel/p5-Git-Sub/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Git commands imported into the git:: namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-System-Sub>=0:${PORTSDIR}/devel/p5-System-Sub
+BUILD_DEPENDS:=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-System-Sub>=0:devel/p5-System-Sub
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Git-Version-Compare/Makefile b/devel/p5-Git-Version-Compare/Makefile
index e90da94a9712..5f6f0da2af16 100644
--- a/devel/p5-Git-Version-Compare/Makefile
+++ b/devel/p5-Git-Version-Compare/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Git-Wrapper/Makefile b/devel/p5-Git-Wrapper/Makefile
index 9be4ba4c7a24..f7c97ed5fdf3 100644
--- a/devel/p5-Git-Wrapper/Makefile
+++ b/devel/p5-Git-Wrapper/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Wrap git(7) command-line interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Devel-CheckBin>=0:${PORTSDIR}/devel/p5-Devel-CheckBin \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions
+BUILD_DEPENDS=	git:devel/git \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Devel-CheckBin>=0:devel/p5-Devel-CheckBin \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions
 RUN_DEPENDS:=	${BUILD_DEPENDS:Np5-Devel-CheckBin*}
-TEST_DEPENDS=	p5-Path-Class>=0.26:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Path-Class>=0.26:devel/p5-Path-Class \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Glib-Object-Introspection/Makefile b/devel/p5-Glib-Object-Introspection/Makefile
index 5faedafa8d59..c40d33e0cdc3 100644
--- a/devel/p5-Glib-Object-Introspection/Makefile
+++ b/devel/p5-Glib-Object-Introspection/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Dynamically create Perl language bindings
 LICENSE=	LGPL21
 
 # t/vfunc-ref-counting.t requires gobject-introspection 1.35.5+
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.270:${PORTSDIR}/devel/p5-Glib2
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	p5-Glib2>=1.270:${PORTSDIR}/devel/p5-Glib2
-TEST_DEPENDS=	p5-Cairo-GObject>=0:${PORTSDIR}/devel/p5-Cairo-GObject
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.270:devel/p5-Glib2
+LIB_DEPENDS=	libffi.so:devel/libffi
+RUN_DEPENDS=	p5-Glib2>=1.270:devel/p5-Glib2
+TEST_DEPENDS=	p5-Cairo-GObject>=0:devel/p5-Cairo-GObject
 
 OPTIONS_DEFINE=	TEST
 
@@ -28,8 +28,8 @@ USES=		perl5
 
 # Glib::Object::Introspection requires cairo and glib20 to build
 # test libraries during build phase, therefore we add them to BUILD_DEPENDS.
-TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
-			${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20
+TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cairo.pc:graphics/cairo \
+			${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:devel/glib20
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Glib/Object/Introspection/Introspection.so
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index 8227715247cb..005a5c9b0f6f 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	This module provides access to Glib and GObject libraries
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GNOME=	glib20
diff --git a/devel/p5-Gnome2-GConf/Makefile b/devel/p5-Gnome2-GConf/Makefile
index b02ba383e051..62763fa77124 100644
--- a/devel/p5-Gnome2-GConf/Makefile
+++ b/devel/p5-Gnome2-GConf/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings for the GConf2 configuration engine
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Goo-Canvas/Makefile b/devel/p5-Goo-Canvas/Makefile
index 609c53aa0225..93d1bc520f97 100644
--- a/devel/p5-Goo-Canvas/Makefile
+++ b/devel/p5-Goo-Canvas/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Perl interface to the GooCanvas
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libgoocanvas.so:${PORTSDIR}/graphics/goocanvas \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		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>=1:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libgoocanvas.so:graphics/goocanvas \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USE_GNOME=	pango gtk20
 USE_PERL5=	configure
diff --git a/devel/p5-Google-Checkout/Makefile b/devel/p5-Google-Checkout/Makefile
index 9dc6cd726ff3..c0dd5e623023 100644
--- a/devel/p5-Google-Checkout/Makefile
+++ b/devel/p5-Google-Checkout/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl implementation of Google Checkout (GCO)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Crypt-SSLeay>=0.45:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Date-Manip>=5.40:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Digest-HMAC>=1.01:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-XML-Simple>=2.09:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Writer>=0.6:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-libwww>=5.65:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Crypt-SSLeay>=0.45:security/p5-Crypt-SSLeay \
+		p5-Date-Manip>=5.40:devel/p5-Date-Manip \
+		p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
+		p5-XML-Simple>=2.09:textproc/p5-XML-Simple \
+		p5-XML-Writer>=0.6:textproc/p5-XML-Writer \
+		p5-libwww>=5.65:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Google-ProtocolBuffers/Makefile b/devel/p5-Google-ProtocolBuffers/Makefile
index 2b778ece2d99..9cc0096293ea 100644
--- a/devel/p5-Google-ProtocolBuffers/Makefile
+++ b/devel/p5-Google-ProtocolBuffers/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple interface to Google Protocol Buffers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Gravatar-URL/Makefile b/devel/p5-Gravatar-URL/Makefile
index 6c104e78ca75..83f6d6e35b97 100644
--- a/devel/p5-Gravatar-URL/Makefile
+++ b/devel/p5-Gravatar-URL/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make URLs for Gravatars from an email address
 
-BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-URI>=0:net/p5-URI
 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=	modbuild
diff --git a/devel/p5-Gtk2-Notify/Makefile b/devel/p5-Gtk2-Notify/Makefile
index 7e3f2fbc16fa..8ce5b307df99 100644
--- a/devel/p5-Gtk2-Notify/Makefile
+++ b/devel/p5-Gtk2-Notify/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Perl interface to libnotify
 
-BUILD_DEPENDS=	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
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	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
+LIB_DEPENDS=	libnotify.so:devel/libnotify
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
diff --git a/devel/p5-Gtk2-Spell/Makefile b/devel/p5-Gtk2-Spell/Makefile
index dcbc0963c78a..ab815c065cf8 100644
--- a/devel/p5-Gtk2-Spell/Makefile
+++ b/devel/p5-Gtk2-Spell/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl interface to the Gtk2Spell library
 
 LICENSE=	LGPL21
 
-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>=1.001:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.001:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+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>=1.001:devel/p5-Glib2 \
+		p5-Gtk2>=1.001:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-HOP-Lexer/Makefile b/devel/p5-HOP-Lexer/Makefile
index 4cd73ddba7f3..63c2a426d4ee 100644
--- a/devel/p5-HOP-Lexer/Makefile
+++ b/devel/p5-HOP-Lexer/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Higher Order Perl Lexer
 
-BUILD_DEPENDS=	p5-HOP-Stream>=0.01:${PORTSDIR}/devel/p5-HOP-Stream
+BUILD_DEPENDS=	p5-HOP-Stream>=0.01:devel/p5-HOP-Stream
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Hash-AutoHash-Args/Makefile b/devel/p5-Hash-AutoHash-Args/Makefile
index 271e4ac341a9..d79442fbeeb6 100644
--- a/devel/p5-Hash-AutoHash-Args/Makefile
+++ b/devel/p5-Hash-AutoHash-Args/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Object-oriented processing of keyword-based argument lists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:${PORTSDIR}/devel/p5-Hash-AutoHash
+BUILD_DEPENDS=	p5-Hash-AutoHash>=1.17:devel/p5-Hash-AutoHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.110:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=1.48:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Deep>=0.110:devel/p5-Test-Deep \
+		p5-Test-Pod>=1.48:devel/p5-Test-Pod
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Hash-AutoHash/Makefile b/devel/p5-Hash-AutoHash/Makefile
index e1a857a5f2de..5504eacf9660 100644
--- a/devel/p5-Hash-AutoHash/Makefile
+++ b/devel/p5-Hash-AutoHash/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Object-oriented access to real and tied hashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Tie-ToObject>=0.03:${PORTSDIR}/devel/p5-Tie-ToObject
+BUILD_DEPENDS=	p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+		p5-Tie-ToObject>=0.03:devel/p5-Tie-ToObject
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.11:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Tie-Hash-MultiValue>=1.02:${PORTSDIR}/devel/p5-Tie-Hash-MultiValue
+TEST_DEPENDS=	p5-Test-Deep>=0.11:devel/p5-Test-Deep \
+		p5-Tie-Hash-MultiValue>=1.02:devel/p5-Tie-Hash-MultiValue
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Hash-Case/Makefile b/devel/p5-Hash-Case/Makefile
index 85a1d8ee13cb..fb5f3f05cd7c 100644
--- a/devel/p5-Hash-Case/Makefile
+++ b/devel/p5-Hash-Case/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0*$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for hashes with key-casing requirements
 
-BUILD_DEPENDS=	p5-Log-Report>=0.26:${PORTSDIR}/devel/p5-Log-Report
+BUILD_DEPENDS=	p5-Log-Report>=0.26:devel/p5-Log-Report
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Hash-Diff/Makefile b/devel/p5-Hash-Diff/Makefile
index 9c93fdb20406..e99466baa563 100644
--- a/devel/p5-Hash-Diff/Makefile
+++ b/devel/p5-Hash-Diff/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Return the difference between two hashes as a hash
 
-RUN_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
-BUILD_DEPENDS=	p5-Hash-Merge>=0.12:${PORTSDIR}/textproc/p5-Hash-Merge
-TEST_DEPENDS=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
+BUILD_DEPENDS=	p5-Hash-Merge>=0.12:textproc/p5-Hash-Merge
+TEST_DEPENDS=	p5-Test-Simple>=0.98:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,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/devel/p5-Hash-FieldHash/Makefile b/devel/p5-Hash-FieldHash/Makefile
index 90c7d49dde91..8d990d642188 100644
--- a/devel/p5-Hash-FieldHash/Makefile
+++ b/devel/p5-Hash-FieldHash/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lightweight field hash implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-LeakTrace>=0.07:${PORTSDIR}/devel/p5-Test-LeakTrace
+TEST_DEPENDS=	p5-Test-LeakTrace>=0.07:devel/p5-Test-LeakTrace
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Hash-Flatten/Makefile b/devel/p5-Hash-Flatten/Makefile
index 281af1955b27..a67aaa4f737a 100644
--- a/devel/p5-Hash-Flatten/Makefile
+++ b/devel/p5-Hash-Flatten/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	az@FreeBSD.org
 COMMENT=	Flatten, unflatten complex data hashes
 
-BUILD_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace \
-		p5-Test-Assertions>0:${PORTSDIR}/devel/p5-Test-Assertions
+BUILD_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace \
+		p5-Test-Assertions>0:devel/p5-Test-Assertions
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Hash-Merge-Simple/Makefile b/devel/p5-Hash-Merge-Simple/Makefile
index 229d2bce3ae6..8459278077a9 100644
--- a/devel/p5-Hash-Merge-Simple/Makefile
+++ b/devel/p5-Hash-Merge-Simple/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Recursively merge two or more hashes, simply
 
-TEST_DEPENDS+=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS+=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Hash-MultiValue/Makefile b/devel/p5-Hash-MultiValue/Makefile
index 216dafed80c3..9276d1b0f86e 100644
--- a/devel/p5-Hash-MultiValue/Makefile
+++ b/devel/p5-Hash-MultiValue/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension to store multiple values per key
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-UNIVERSAL-ref>0:${PORTSDIR}/devel/p5-UNIVERSAL-ref
+TEST_DEPENDS=	p5-UNIVERSAL-ref>0:devel/p5-UNIVERSAL-ref
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Hash-Slice/Makefile b/devel/p5-Hash-Slice/Makefile
index 12184ee62579..ebdd2c5bd006 100644
--- a/devel/p5-Hash-Slice/Makefile
+++ b/devel/p5-Hash-Slice/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Make a hash from a deep slice of another hash
 
-BUILD_DEPENDS=	p5-Carp-Clan>=0:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Clone>=0.09:${PORTSDIR}/devel/p5-Clone
+BUILD_DEPENDS=	p5-Carp-Clan>=0:devel/p5-Carp-Clan \
+		p5-Clone>=0.09:devel/p5-Clone
 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/devel/p5-Hash-Util-FieldHash-Compat/Makefile b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
index 5396df023864..cc136a426cd9 100644
--- a/devel/p5-Hash-Util-FieldHash-Compat/Makefile
+++ b/devel/p5-Hash-Util-FieldHash-Compat/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Use Hash::Util::FieldHash or ties, depending on availability
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Metadata>=0:${PORTSDIR}/devel/p5-Module-Metadata \
-		p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak
-RUN_DEPENDS=	p5-Tie-RefHash-Weak>=0.08:${PORTSDIR}/devel/p5-Tie-RefHash-Weak
+BUILD_DEPENDS=	p5-Module-Metadata>=0:devel/p5-Module-Metadata \
+		p5-Tie-RefHash-Weak>=0.08:devel/p5-Tie-RefHash-Weak
+RUN_DEPENDS=	p5-Tie-RefHash-Weak>=0.08:devel/p5-Tie-RefHash-Weak
 
 NO_ARCH=	yes
 USES=		perl5
@@ -24,7 +24,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-TEST_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Heap-Simple-Perl/Makefile b/devel/p5-Heap-Simple-Perl/Makefile
index 7ee5e06d5ffa..bfcfc41b009b 100644
--- a/devel/p5-Heap-Simple-Perl/Makefile
+++ b/devel/p5-Heap-Simple-Perl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure perl implementation of the Heap::Simple interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Heap-Simple>=0:${PORTSDIR}/devel/p5-Heap-Simple
+BUILD_DEPENDS=	p5-Heap-Simple>=0:devel/p5-Heap-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Heap-Simple-XS/Makefile b/devel/p5-Heap-Simple-XS/Makefile
index 9e5c7cf3c6fa..5bbda1ebb1b8 100644
--- a/devel/p5-Heap-Simple-XS/Makefile
+++ b/devel/p5-Heap-Simple-XS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	XS implementation of the Heap::Simple interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Heap-Simple>=0:${PORTSDIR}/devel/p5-Heap-Simple
+BUILD_DEPENDS=	p5-Heap-Simple>=0:devel/p5-Heap-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-AIO/Makefile b/devel/p5-IO-AIO/Makefile
index 46651be5e090..c3b0dd7cf58d 100644
--- a/devel/p5-IO-AIO/Makefile
+++ b/devel/p5-IO-AIO/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Asynchronous Input/Output
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Canary-Stability>=2001:${PORTSDIR}/devel/p5-Canary-Stability \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
-RUN_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-Canary-Stability>=2001:devel/p5-Canary-Stability \
+		p5-common-sense>=0:devel/p5-common-sense
+RUN_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-All-LWP/Makefile b/devel/p5-IO-All-LWP/Makefile
index 0b645732c0a2..78091bbd1424 100644
--- a/devel/p5-IO-All-LWP/Makefile
+++ b/devel/p5-IO-All-LWP/Makefile
@@ -14,8 +14,8 @@ COMMENT=	IO::All interface to LWP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-All>=0.30:${PORTSDIR}/devel/p5-IO-All \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-IO-All>=0.30:devel/p5-IO-All \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IO-All/Makefile b/devel/p5-IO-All/Makefile
index f5363fbf4fa7..4d873ec15585 100644
--- a/devel/p5-IO-All/Makefile
+++ b/devel/p5-IO-All/Makefile
@@ -13,11 +13,11 @@ COMMENT=	IO::All combines all of the best Perl IO modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ReadBackwards>=0:${PORTSDIR}/devel/p5-File-ReadBackwards \
-		p5-IO-String>=1.08:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
+		p5-IO-String>=1.08:devel/p5-IO-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-MLDBM>=0:${PORTSDIR}/databases/p5-MLDBM
+TEST_DEPENDS=	p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
+		p5-MLDBM>=0:databases/p5-MLDBM
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Any/Makefile b/devel/p5-IO-Any/Makefile
index a4faf02014ca..c5daf7608b1a 100644
--- a/devel/p5-IO-Any/Makefile
+++ b/devel/p5-IO-Any/Makefile
@@ -14,18 +14,18 @@ COMMENT=	IO::Any opens anything
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fixme>=0:${PORTSDIR}/devel/p5-Test-Fixme \
-		p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Distribution>=0:devel/p5-Test-Distribution \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fixme>=0:devel/p5-Test-Fixme \
+		p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-IO-Async/Makefile b/devel/p5-IO-Async/Makefile
index a7fc407a16b6..15b98ddb67ad 100644
--- a/devel/p5-IO-Async/Makefile
+++ b/devel/p5-IO-Async/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl modules that implement asynchronous filehandle IO
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0.33:${PORTSDIR}/devel/p5-Future \
-		p5-Struct-Dumb>0:${PORTSDIR}/devel/p5-Struct-Dumb
+BUILD_DEPENDS=	p5-Future>=0.33:devel/p5-Future \
+		p5-Struct-Dumb>0:devel/p5-Struct-Dumb
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-IO-Callback/Makefile b/devel/p5-IO-Callback/Makefile
index eeeed3762097..f575941a3ab2 100644
--- a/devel/p5-IO-Callback/Makefile
+++ b/devel/p5-IO-Callback/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String
+	p5-IO-String>0:devel/p5-IO-String
 BUILD_DEPENDS:=	\
 	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-Test-Exception>0:devel/p5-Test-Exception \
+	p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-IO-Detect/Makefile b/devel/p5-IO-Detect/Makefile
index 93d5f286845d..3f4a511f7520 100644
--- a/devel/p5-IO-Detect/Makefile
+++ b/devel/p5-IO-Detect/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Detect if a given scalar is a filehandle
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+TEST_DEPENDS=	p5-IO-All>=0:devel/p5-IO-All \
+		p5-Path-Class>=0:devel/p5-Path-Class
 
 CONFLICTS_INSTALL=	p5-Scalar-Does-0.[1-9]*
 
diff --git a/devel/p5-IO-Digest/Makefile b/devel/p5-IO-Digest/Makefile
index a54ad2f0b4e1..9122a7292514 100644
--- a/devel/p5-IO-Digest/Makefile
+++ b/devel/p5-IO-Digest/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Calculate digests while reading or writing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-via-dynamic>=0:${PORTSDIR}/devel/p5-PerlIO-via-dynamic
+BUILD_DEPENDS=	p5-PerlIO-via-dynamic>=0:devel/p5-PerlIO-via-dynamic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Event/Makefile b/devel/p5-IO-Event/Makefile
index b84b5c5e7787..b83d6c3de79b 100644
--- a/devel/p5-IO-Event/Makefile
+++ b/devel/p5-IO-Event/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Tied Filehandles for Nonblocking IO with Object Callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
+TEST_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
 
 OPTIONS_DEFINE=	ANYEVENT EVENT
 OPTIONS_DEFAULT=ANYEVENT EVENT
@@ -26,9 +26,9 @@ EVENT_DESC=	Use Event as underlying event handler
 USE_PERL5=	configure
 USES=		perl5
 
-ANYEVENT_BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
-ANYEVENT_RUN_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent
-EVENT_BUILD_DEPENDS=	p5-Event>=0:${PORTSDIR}/devel/p5-Event
-EVENT_RUN_DEPENDS=	p5-Event>=0:${PORTSDIR}/devel/p5-Event
+ANYEVENT_BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
+ANYEVENT_RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent
+EVENT_BUILD_DEPENDS=	p5-Event>=0:devel/p5-Event
+EVENT_RUN_DEPENDS=	p5-Event>=0:devel/p5-Event
 
 .include <bsd.port.mk>
diff --git a/devel/p5-IO-FDPass/Makefile b/devel/p5-IO-FDPass/Makefile
index 9bedde319916..4b9e0126e46a 100644
--- a/devel/p5-IO-FDPass/Makefile
+++ b/devel/p5-IO-FDPass/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to pass a file descriptor over a socket
 
-BUILD_DEPENDS=	p5-Canary-Stability>0:${PORTSDIR}/devel/p5-Canary-Stability
+BUILD_DEPENDS=	p5-Canary-Stability>0:devel/p5-Canary-Stability
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-File-AtomicChange/Makefile b/devel/p5-IO-File-AtomicChange/Makefile
index 2f4aa1faa6da..a3608428f762 100644
--- a/devel/p5-IO-File-AtomicChange/Makefile
+++ b/devel/p5-IO-File-AtomicChange/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Sync>0:${PORTSDIR}/devel/p5-File-Sync \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class
+	p5-File-Sync>0:devel/p5-File-Sync \
+	p5-Path-Class>0:devel/p5-Path-Class
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-Handle-Util/Makefile b/devel/p5-IO-Handle-Util/Makefile
index 8a335b9c10ea..10c00e686a7a 100644
--- a/devel/p5-IO-Handle-Util/Makefile
+++ b/devel/p5-IO-Handle-Util/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for working with IO::Handle like objects
 
 RUN_DEPENDS=	\
-	p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-	p5-asa>0:${PORTSDIR}/devel/p5-asa
+	p5-IO-String>0:devel/p5-IO-String \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+	p5-asa>0:devel/p5-asa
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -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/devel/p5-IO-Lambda/Makefile b/devel/p5-IO-Lambda/Makefile
index 130b21804f2c..482109941000 100644
--- a/devel/p5-IO-Lambda/Makefile
+++ b/devel/p5-IO-Lambda/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ivan@serezhkin.com
 COMMENT=	Non-blocking I/O in lambda style
 
-BUILD_DEPENDS=	p5-Sub-Name>=0.04:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Net-DNS>=0.64:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-libwww>=5.822:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=1.37:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Sub-Name>=0.04:devel/p5-Sub-Name \
+		p5-Net-DNS>=0.64:dns/p5-Net-DNS \
+		p5-libwww>=5.822:www/p5-libwww \
+		p5-URI>=1.37:net/p5-URI
 
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-IO-Socket-SSL>=1.19:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-AnyEvent>=4.33:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-DBI>=1.60.4:${PORTSDIR}/databases/p5-DBI
+		p5-IO-Socket-SSL>=1.19:security/p5-IO-Socket-SSL \
+		p5-AnyEvent>=4.33:devel/p5-AnyEvent \
+		p5-DBI>=1.60.4:databases/p5-DBI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Pipely/Makefile b/devel/p5-IO-Pipely/Makefile
index 3f768a7a9b7f..02fb5a755a0e 100644
--- a/devel/p5-IO-Pipely/Makefile
+++ b/devel/p5-IO-Pipely/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:${PORTSDIR}/lang/p5-Scalar-List-Utils
+TEST_DEPENDS=	p5-Scalar-List-Utils>=1.29:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-IO-Prompt-Simple/Makefile b/devel/p5-IO-Prompt-Simple/Makefile
index 968015857a10..fd1571b54760 100644
--- a/devel/p5-IO-Prompt-Simple/Makefile
+++ b/devel/p5-IO-Prompt-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple interface for user input
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0.06:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Prompt-Tiny/Makefile b/devel/p5-IO-Prompt-Tiny/Makefile
index 67f6e380f104..49cbf3617a42 100644
--- a/devel/p5-IO-Prompt-Tiny/Makefile
+++ b/devel/p5-IO-Prompt-Tiny/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Prompt for user input with a default option
 
 LICENSE=	APACHE20
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0.12:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0.12:devel/p5-Capture-Tiny
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-IO-Prompt/Makefile b/devel/p5-IO-Prompt/Makefile
index 9a4b63efc63d..44ac0a8b2165 100644
--- a/devel/p5-IO-Prompt/Makefile
+++ b/devel/p5-IO-Prompt/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Interactively prompt for user input
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Want>0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Term-ReadKey>0:devel/p5-Term-ReadKey \
+		p5-Want>0:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-Prompter/Makefile b/devel/p5-IO-Prompter/Makefile
index 8235baf719a6..9dff96aeca2e 100644
--- a/devel/p5-IO-Prompter/Makefile
+++ b/devel/p5-IO-Prompter/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Prompt for input, read it, clean it, return it
 
-BUILD_DEPENDS=	devel/p5-Contextual-Return>0:${PORTSDIR}/devel/p5-Contextual-Return
+BUILD_DEPENDS=	devel/p5-Contextual-Return>0:devel/p5-Contextual-Return
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IO-Pty-Easy/Makefile b/devel/p5-IO-Pty-Easy/Makefile
index 86f023d75a3a..a265eeba370c 100644
--- a/devel/p5-IO-Pty-Easy/Makefile
+++ b/devel/p5-IO-Pty-Easy/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Easy interface to IO::Pty
 
-BUILD_DEPENDS=	p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty
+BUILD_DEPENDS=	p5-IO-Tty>=0:devel/p5-IO-Tty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IO-Toolkit/Makefile b/devel/p5-IO-Toolkit/Makefile
index 3ed3c7324c5d..cc96f8abe570 100644
--- a/devel/p5-IO-Toolkit/Makefile
+++ b/devel/p5-IO-Toolkit/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	IO::Toolkit - Perl extension to create logfiles
 
-BUILD_DEPENDS=	p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6
-RUN_DEPENDS=	p5-Crypt-RC6>=0:${PORTSDIR}/security/p5-Crypt-RC6
+BUILD_DEPENDS=	p5-Crypt-RC6>=0:security/p5-Crypt-RC6
+RUN_DEPENDS=	p5-Crypt-RC6>=0:security/p5-Crypt-RC6
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IO-YAML/Makefile b/devel/p5-IO-YAML/Makefile
index 43090a148fd3..740ff68fa289 100644
--- a/devel/p5-IO-YAML/Makefile
+++ b/devel/p5-IO-YAML/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read and write YAML streams incrementally
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-YAML>=0:textproc/p5-YAML
+RUN_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-IOC/Makefile b/devel/p5-IOC/Makefile
index 48ebad04dc10..48c2645a9b8a 100644
--- a/devel/p5-IOC/Makefile
+++ b/devel/p5-IOC/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight IOC (Inversion of Control) framework
 
-BUILD_DEPENDS=	p5-Class-Throwable>=0:${PORTSDIR}/devel/p5-Class-Throwable \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-Class-StrongSingleton>=0:${PORTSDIR}/devel/p5-Class-StrongSingleton \
-		p5-Class-Interfaces>=0:${PORTSDIR}/devel/p5-Class-Interfaces
+BUILD_DEPENDS=	p5-Class-Throwable>=0:devel/p5-Class-Throwable \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-Class-StrongSingleton>=0:devel/p5-Class-StrongSingleton \
+		p5-Class-Interfaces>=0:devel/p5-Class-Interfaces
 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/devel/p5-IPC-Cache/Makefile b/devel/p5-IPC-Cache/Makefile
index 0d95ac8e053f..868ac7a70a48 100644
--- a/devel/p5-IPC-Cache/Makefile
+++ b/devel/p5-IPC-Cache/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Persist data across processes via shared memory
 
 LICENSE=	GPLv1
 
-BUILD_DEPENDS=	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS=	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-Cmd/Makefile b/devel/p5-IPC-Cmd/Makefile
index 81b11032b1c5..547d52e1e270 100644
--- a/devel/p5-IPC-Cmd/Makefile
+++ b/devel/p5-IPC-Cmd/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Finding and running system commands made easy
 
-COMMON_DEPENDS=	p5-IPC-Run>=0.55:${PORTSDIR}/devel/p5-IPC-Run
+COMMON_DEPENDS=	p5-IPC-Run>=0.55:devel/p5-IPC-Run
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/devel/p5-IPC-DirQueue/Makefile b/devel/p5-IPC-DirQueue/Makefile
index b04435d1d82d..70d662d1542a 100644
--- a/devel/p5-IPC-DirQueue/Makefile
+++ b/devel/p5-IPC-DirQueue/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	IPC::DirQueue - disk-based many-to-many task queue
 
-BUILD_DEPENDS=	p5-POE>0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-MM/Makefile b/devel/p5-IPC-MM/Makefile
index bab4665b2986..31c1e71b8bc1 100644
--- a/devel/p5-IPC-MM/Makefile
+++ b/devel/p5-IPC-MM/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Ralf Engelschall's mm library
 
-LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+LIB_DEPENDS=	libmm.so:devel/mm
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-MMA/Makefile b/devel/p5-IPC-MMA/Makefile
index 299ef82b8d93..3e7dbdcd4056 100644
--- a/devel/p5-IPC-MMA/Makefile
+++ b/devel/p5-IPC-MMA/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	peter@vereshagin.org
 COMMENT=	Improved Perl interface to Ralf Engelschall's mm library
 
-BUILD_DEPENDS=	p5-Devel-CheckOS>=0:${PORTSDIR}/devel/p5-Devel-CheckOS
-RUN_DEPENDS=	p5-Devel-CheckOS>=0:${PORTSDIR}/devel/p5-Devel-CheckOS
-LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS
+RUN_DEPENDS=	p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS
+LIB_DEPENDS=	libmm.so:devel/mm
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-Mmap-Share/Makefile b/devel/p5-IPC-Mmap-Share/Makefile
index 39f79024168a..e30753b85cfc 100644
--- a/devel/p5-IPC-Mmap-Share/Makefile
+++ b/devel/p5-IPC-Mmap-Share/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Safely share structures among processes using anonymous mmap
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IPC-Mmap>=0:${PORTSDIR}/devel/p5-IPC-Mmap
+BUILD_DEPENDS=	p5-IPC-Mmap>=0:devel/p5-IPC-Mmap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-IPC-PubSub/Makefile b/devel/p5-IPC-PubSub/Makefile
index 786c21da21f3..562de30b4157 100644
--- a/devel/p5-IPC-PubSub/Makefile
+++ b/devel/p5-IPC-PubSub/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Interprocess Publish/Subscribe channels
 
-BUILD_DEPENDS=	p5-DBM-Deep>=1:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-DBM-Deep>=1:databases/p5-DBM-Deep \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Data-UUID>0:devel/p5-Data-UUID
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 18a4347a5d9f..89d82dd974ed 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -13,7 +13,7 @@ COMMENT=	IPC::Run - Run subprocesses with piping and redirection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Tty>=1.08:${PORTSDIR}/devel/p5-IO-Tty
+BUILD_DEPENDS=	p5-IO-Tty>=1.08:devel/p5-IO-Tty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-IPC-SharedCache/Makefile b/devel/p5-IPC-SharedCache/Makefile
index 43597ac80d8d..5f058c17fcc0 100644
--- a/devel/p5-IPC-SharedCache/Makefile
+++ b/devel/p5-IPC-SharedCache/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for managing a SysV IPC shared memory cache
 
-BUILD_DEPENDS=	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite
+BUILD_DEPENDS=	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-IPC-ShellCmd/Makefile b/devel/p5-IPC-ShellCmd/Makefile
index 0d2b72de2b49..62b5c095102f 100644
--- a/devel/p5-IPC-ShellCmd/Makefile
+++ b/devel/p5-IPC-ShellCmd/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Run a command with a given environment and capture output
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		sudo:${PORTSDIR}/security/sudo
+BUILD_DEPENDS=	p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		sudo:security/sudo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Import-Base/Makefile b/devel/p5-Import-Base/Makefile
index 03573e965f4b..acd1c49d90b3 100644
--- a/devel/p5-Import-Base/Makefile
+++ b/devel/p5-Import-Base/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Import a set of modules into the calling module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Import-Into>=1.002005:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime
+BUILD_DEPENDS=	p5-Import-Into>=1.002005:devel/p5-Import-Into \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Dancer2-Plugin-Ajax>=0:${PORTSDIR}/www/p5-Dancer2-Plugin-Ajax \
-		p5-Dancer2>=0:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+TEST_DEPENDS=	p5-Dancer2-Plugin-Ajax>=0:www/p5-Dancer2-Plugin-Ajax \
+		p5-Dancer2>=0:www/p5-Dancer2 \
+		p5-Moo>=0:devel/p5-Moo
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Import-Into/Makefile b/devel/p5-Import-Into/Makefile
index 7625ec9551d9..c62165ac785b 100644
--- a/devel/p5-Import-Into/Makefile
+++ b/devel/p5-Import-Into/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Import packages into other packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Inline-ASM/Makefile b/devel/p5-Inline-ASM/Makefile
index 4f08db7ab8bc..ea45653d9054 100644
--- a/devel/p5-Inline-ASM/Makefile
+++ b/devel/p5-Inline-ASM/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Write Perl Subroutines in assembler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline-C>=0.42:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline-C>=0.42:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Inline-C/Makefile b/devel/p5-Inline-C/Makefile
index 5f37a8401ed5..9abd356ad02d 100644
--- a/devel/p5-Inline-C/Makefile
+++ b/devel/p5-Inline-C/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Write Perl Subroutines in C
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=7.00:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-Inline>=0.79:${PORTSDIR}/devel/p5-Inline \
-		p5-Parse-RecDescent>=1.967.009:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Pegex>=0.58:${PORTSDIR}/devel/p5-Pegex
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=7.00:devel/p5-ExtUtils-MakeMaker \
+		p5-Inline>=0.79:devel/p5-Inline \
+		p5-Parse-RecDescent>=1.967.009:devel/p5-Parse-RecDescent \
+		p5-Pegex>=0.58:devel/p5-Pegex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
-BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install
+TEST_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Test-Warn>=0.23:devel/p5-Test-Warn \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
+BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
 
 CONFLICTS_INSTALL=	p5-Inline-0.[0-5]*
 
diff --git a/devel/p5-Inline-CPP/Makefile b/devel/p5-Inline-CPP/Makefile
index 556d44903b79..4f5837f0f313 100644
--- a/devel/p5-Inline-CPP/Makefile
+++ b/devel/p5-Inline-CPP/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Write Perl subroutines and classes in C++
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Inline>=0.78:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.67:${PORTSDIR}/devel/p5-Inline-C \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Inline>=0.78:devel/p5-Inline \
+		p5-Inline-C>=0.67:devel/p5-Inline-C \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-ExtUtils-CppGuess>=0.11:${PORTSDIR}/devel/p5-ExtUtils-CppGuess
+BUILD_DEPENDS+=	p5-ExtUtils-CppGuess>=0.11:devel/p5-ExtUtils-CppGuess
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Inline-Filters/Makefile b/devel/p5-Inline-Filters/Makefile
index 92509115e5b9..9c48a181d8e9 100644
--- a/devel/p5-Inline-Filters/Makefile
+++ b/devel/p5-Inline-Filters/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Common source code filters for Inline Modules
 LICENSE=	ART10 GPLv1 GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.42:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.76:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0.42:devel/p5-Inline \
+		p5-Inline-C>=0.76:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Inline-Java/Makefile b/devel/p5-Inline-Java/Makefile
index efeeba1b8648..a2dac8869ef6 100644
--- a/devel/p5-Inline-Java/Makefile
+++ b/devel/p5-Inline-Java/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Write Perl subroutines and classes in Java
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Inline>=0.68:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.62:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0.68:devel/p5-Inline \
+		p5-Inline-C>=0.62:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_JAVA=	yes
diff --git a/devel/p5-Inline-Python/Makefile b/devel/p5-Inline-Python/Makefile
index 8546ec6c7678..1e118b9b7694 100644
--- a/devel/p5-Inline-Python/Makefile
+++ b/devel/p5-Inline-Python/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Write Perl Subroutines in Python
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.79:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS=	p5-Inline>=0.79:devel/p5-Inline
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Inline-TT/Makefile b/devel/p5-Inline-TT/Makefile
index 578b93c984fc..4aff44a868b9 100644
--- a/devel/p5-Inline-TT/Makefile
+++ b/devel/p5-Inline-TT/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Provides inline support for template toolkit 2.x
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.42:${PORTSDIR}/devel/p5-Inline \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Inline>=0.42:devel/p5-Inline \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Inline-Tcl/Makefile b/devel/p5-Inline-Tcl/Makefile
index 681c21340fd5..b7541f8c8c90 100644
--- a/devel/p5-Inline-Tcl/Makefile
+++ b/devel/p5-Inline-Tcl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Write Perl subroutines in Tcl
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tcl
diff --git a/devel/p5-Inline/Makefile b/devel/p5-Inline/Makefile
index 5f9b3f994d9b..709f5ba67a6b 100644
--- a/devel/p5-Inline/Makefile
+++ b/devel/p5-Inline/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Write Perl subroutines in other programming languages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.800:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.800:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Inline-Files>=0:${PORTSDIR}/devel/p5-Inline-Files \
-		p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Inline-Files>=0:devel/p5-Inline-Files \
+		p5-Test-Warn>=0.23:devel/p5-Test-Warn
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
diff --git a/devel/p5-InlineX-C2XS/Makefile b/devel/p5-InlineX-C2XS/Makefile
index be22d31e64bb..0d674b463274 100644
--- a/devel/p5-InlineX-C2XS/Makefile
+++ b/devel/p5-InlineX-C2XS/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl module to create an XS file from an Inline C file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline-C>=0.54:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline-C>=0.54:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.23:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-InlineX-CPP2XS/Makefile b/devel/p5-InlineX-CPP2XS/Makefile
index 87c95863d37b..e07679cfe1f7 100644
--- a/devel/p5-InlineX-CPP2XS/Makefile
+++ b/devel/p5-InlineX-CPP2XS/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Convert from Inline C++ code to XS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.50:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-CPP>=0.39:${PORTSDIR}/devel/p5-Inline-CPP
+BUILD_DEPENDS=	p5-Inline>=0.50:devel/p5-Inline \
+		p5-Inline-CPP>=0.39:devel/p5-Inline-CPP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warn>=0.24:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.24:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Input-Validator/Makefile b/devel/p5-Input-Validator/Makefile
index 34daf22751cf..267fa09ffbda 100644
--- a/devel/p5-Input-Validator/Makefile
+++ b/devel/p5-Input-Validator/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Input validator that just validates input
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iodef-Pb-Simple/Makefile b/devel/p5-Iodef-Pb-Simple/Makefile
index a5f60aec08e1..9d472bcf64b6 100644
--- a/devel/p5-Iodef-Pb-Simple/Makefile
+++ b/devel/p5-Iodef-Pb-Simple/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Perl extension providing high level API access to Iodef-Pb
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.34:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Compress-Snappy>=0.18:${PORTSDIR}/archivers/p5-Compress-Snappy \
-		p5-DateTime>=0.61:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-DateParse>=0.05:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-		p5-Google-ProtocolBuffers>=0.08:${PORTSDIR}/devel/p5-Google-ProtocolBuffers \
-		p5-HTML-Table>=2.08:${PORTSDIR}/www/p5-HTML-Table \
-		p5-JSON-XS>=2.29:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-MIME-Base64>=0.08:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Module-Install>=1.00:${PORTSDIR}/devel/p5-Module-Install \
-		p5-OSSP-uuid>=1.6.2:${PORTSDIR}/misc/p5-OSSP-uuid \
-		p5-Parse-Range>=0.96:${PORTSDIR}/math/p5-Parse-Range \
-		p5-Regexp-Common>=2010010201:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Regexp-Common-net-CIDR>=0.02:${PORTSDIR}/textproc/p5-Regexp-Common-net-CIDR \
-		p5-Snort-Rule>=1.07:${PORTSDIR}/security/p5-Snort-Rule \
-		p5-Text-Table>=1.126:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-Class-Accessor>=0.34:devel/p5-Class-Accessor \
+		p5-Compress-Snappy>=0.18:archivers/p5-Compress-Snappy \
+		p5-DateTime>=0.61:devel/p5-DateTime \
+		p5-DateTime-Format-DateParse>=0.05:devel/p5-DateTime-Format-DateParse \
+		p5-Google-ProtocolBuffers>=0.08:devel/p5-Google-ProtocolBuffers \
+		p5-HTML-Table>=2.08:www/p5-HTML-Table \
+		p5-JSON-XS>=2.29:converters/p5-JSON-XS \
+		p5-MIME-Base64>=0.08:converters/p5-MIME-Base64 \
+		p5-Module-Install>=1.00:devel/p5-Module-Install \
+		p5-OSSP-uuid>=1.6.2:misc/p5-OSSP-uuid \
+		p5-Parse-Range>=0.96:math/p5-Parse-Range \
+		p5-Regexp-Common>=2010010201:textproc/p5-Regexp-Common \
+		p5-Regexp-Common-net-CIDR>=0.02:textproc/p5-Regexp-Common-net-CIDR \
+		p5-Snort-Rule>=1.07:security/p5-Snort-Rule \
+		p5-Text-Table>=1.126:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator-IO/Makefile b/devel/p5-Iterator-IO/Makefile
index d1962dc54a25..f60f90d227f8 100644
--- a/devel/p5-Iterator-IO/Makefile
+++ b/devel/p5-Iterator-IO/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Filesystem and stream iterators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator-Misc/Makefile b/devel/p5-Iterator-Misc/Makefile
index ee20004f867a..d43eac79108a 100644
--- a/devel/p5-Iterator-Misc/Makefile
+++ b/devel/p5-Iterator-Misc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Miscellaneous iterator functions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator-Util/Makefile b/devel/p5-Iterator-Util/Makefile
index 73899665d4f8..d99f7736b29d 100644
--- a/devel/p5-Iterator-Util/Makefile
+++ b/devel/p5-Iterator-Util/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Essential utilities for the Iterator class
 
-BUILD_DEPENDS=	p5-Iterator>=0:${PORTSDIR}/devel/p5-Iterator
+BUILD_DEPENDS=	p5-Iterator>=0:devel/p5-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Iterator/Makefile b/devel/p5-Iterator/Makefile
index d532020d3563..4ccde0a71ec3 100644
--- a/devel/p5-Iterator/Makefile
+++ b/devel/p5-Iterator/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	General-purpose iterator class
 
-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/devel/p5-JIRA-Client/Makefile b/devel/p5-JIRA-Client/Makefile
index 686c33e11a35..b23033c88fc8 100644
--- a/devel/p5-JIRA-Client/Makefile
+++ b/devel/p5-JIRA-Client/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extended interface to JIRA's SOAP API
 
-RUN_DEPENDS=	p5-Data-Util>=0:${PORTSDIR}/devel/p5-Data-Util \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS=	p5-Data-Util>=0:devel/p5-Data-Util \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JIRA-REST/Makefile b/devel/p5-JIRA-REST/Makefile
index d03c2fc3e7cd..ad2e2856cb7a 100644
--- a/devel/p5-JIRA-REST/Makefile
+++ b/devel/p5-JIRA-REST/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Extended interface to JIRA REST API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-TreeBuilder-LibXML>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-LibXML \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-REST-Client>=0:${PORTSDIR}/www/p5-REST-Client \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-TreeBuilder-LibXML>=0:www/p5-HTML-TreeBuilder-LibXML \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-REST-Client>=0:www/p5-REST-Client \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JQuery/Makefile b/devel/p5-JQuery/Makefile
index 9d3ccca73d5f..5c8611309e16 100644
--- a/devel/p5-JQuery/Makefile
+++ b/devel/p5-JQuery/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Interface to Jquery, a language based on JavaScript
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-CSS>=0:${PORTSDIR}/textproc/p5-CSS \
-		p5-HTML-Table>=0:${PORTSDIR}/www/p5-HTML-Table \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-CSS>=0:textproc/p5-CSS \
+		p5-HTML-Table>=0:www/p5-HTML-Table \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-JSON-Hyper/Makefile b/devel/p5-JSON-Hyper/Makefile
index 296241a27a7d..499732521962 100644
--- a/devel/p5-JSON-Hyper/Makefile
+++ b/devel/p5-JSON-Hyper/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Extract links from JSON objects
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-Path>=0:${PORTSDIR}/devel/p5-JSON-Path \
-		p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-JSON>=2.0:converters/p5-JSON \
+		p5-JSON-Path>=0:devel/p5-JSON-Path \
+		p5-URI>=1.30:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-Path/Makefile b/devel/p5-JSON-Path/Makefile
index b058c074c9bb..6e17171a1874 100644
--- a/devel/p5-JSON-Path/Makefile
+++ b/devel/p5-JSON-Path/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Search nested hashref/arrayref structures using JSONPath
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-LV>=0:${PORTSDIR}/devel/p5-LV
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-LV>=0:devel/p5-LV
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-Pointer/Makefile b/devel/p5-JSON-Pointer/Makefile
index aeab745d9482..d5ed15d185ed 100644
--- a/devel/p5-JSON-Pointer/Makefile
+++ b/devel/p5-JSON-Pointer/Makefile
@@ -13,10 +13,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Clone>=0.36:${PORTSDIR}/devel/p5-Clone \
-	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-	p5-URI>=1.65:${PORTSDIR}/net/p5-URI
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-Clone>=0.36:devel/p5-Clone \
+	p5-JSON>=2.53:converters/p5-JSON \
+	p5-URI>=1.65:net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-RPC-Common/Makefile b/devel/p5-JSON-RPC-Common/Makefile
index 65d7ca8f1ae2..26745d865143 100644
--- a/devel/p5-JSON-RPC-Common/Makefile
+++ b/devel/p5-JSON-RPC-Common/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Transport agnostic JSON RPC helper objects
 
-BUILD_DEPENDS=	p5-libwww>=5:${PORTSDIR}/www/p5-libwww \
-		p5-Moose>=0.81:${PORTSDIR}/devel/p5-Moose \
-		p5-JSON>=2.11:${PORTSDIR}/converters/p5-JSON \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-libwww>=5:www/p5-libwww \
+		p5-Moose>=0.81:devel/p5-Moose \
+		p5-JSON>=2.11:converters/p5-JSON \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Try-Tiny>0:lang/p5-Try-Tiny \
+		p5-URI>0:net/p5-URI \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -27,7 +27,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/devel/p5-JSON-RPC-Dispatcher/Makefile b/devel/p5-JSON-RPC-Dispatcher/Makefile
index f806258169a8..5968a90519a2 100644
--- a/devel/p5-JSON-RPC-Dispatcher/Makefile
+++ b/devel/p5-JSON-RPC-Dispatcher/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=2.16:${PORTSDIR}/converters/p5-JSON \
-		p5-Log-Any>=0.11:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose \
-		p5-Plack>=0.9913:${PORTSDIR}/www/p5-Plack
+BUILD_DEPENDS=	p5-JSON>=2.16:converters/p5-JSON \
+		p5-Log-Any>=0.11:devel/p5-Log-Any \
+		p5-Moose>=0.93:devel/p5-Moose \
+		p5-Plack>=0.9913:www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-RPC/Makefile b/devel/p5-JSON-RPC/Makefile
index 3a731c6d22d9..1cd482f0cf94 100644
--- a/devel/p5-JSON-RPC/Makefile
+++ b/devel/p5-JSON-RPC/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Perl implementation of JSON-RPC 1.1 protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Router-Simple>=0:${PORTSDIR}/www/p5-Router-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Router-Simple>=0:www/p5-Router-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-JSON-Schema/Makefile b/devel/p5-JSON-Schema/Makefile
index 2870a38ac9e0..75dfe794094d 100644
--- a/devel/p5-JSON-Schema/Makefile
+++ b/devel/p5-JSON-Schema/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Validate JSON against a schema
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-Path>=0:${PORTSDIR}/devel/p5-JSON-Path \
-		p5-JSON-Hyper>=0:${PORTSDIR}/devel/p5-JSON-Hyper \
-		p5-HTTP-Link-Parser>=0:${PORTSDIR}/www/p5-HTTP-Link-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-autovivification>=0:${PORTSDIR}/devel/p5-autovivification \
-		p5-match-simple>=0:${PORTSDIR}/devel/p5-match-simple
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-JSON-Path>=0:devel/p5-JSON-Path \
+		p5-JSON-Hyper>=0:devel/p5-JSON-Hyper \
+		p5-HTTP-Link-Parser>=0:www/p5-HTTP-Link-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-autovivification>=0:devel/p5-autovivification \
+		p5-match-simple>=0:devel/p5-match-simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Jonk/Makefile b/devel/p5-Jonk/Makefile
index b60fd13d58ac..da67f16577bd 100644
--- a/devel/p5-Jonk/Makefile
+++ b/devel/p5-Jonk/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple job tank manager
 
 RUN_DEPENDS=	\
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-DBI>0:databases/p5-DBI \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-LV/Makefile b/devel/p5-LV/Makefile
index 1a59fc8d2e75..a9357a253471 100644
--- a/devel/p5-LV/Makefile
+++ b/devel/p5-LV/Makefile
@@ -15,8 +15,8 @@ COMMENT=	LV for lvalue
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Sentinel>=0:${PORTSDIR}/devel/p5-Sentinel \
-		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+TEST_DEPENDS=	p5-Sentinel>=0:devel/p5-Sentinel \
+		p5-Variable-Magic>=0:devel/p5-Variable-Magic
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Lexical-Import/Makefile b/devel/p5-Lexical-Import/Makefile
index 852297eb4f31..d6ca38ca78d3 100644
--- a/devel/p5-Lexical-Import/Makefile
+++ b/devel/p5-Lexical-Import/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Clean imports from package-exporting modules
 
-BUILD_DEPENDS=	p5-Lexical-Var>=0.006:${PORTSDIR}/devel/p5-Lexical-Var \
-		p5-Module-Runtime>=0.011:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
+BUILD_DEPENDS=	p5-Lexical-Var>=0.006:devel/p5-Lexical-Var \
+		p5-Module-Runtime>=0.011:devel/p5-Module-Runtime \
+		p5-Params-Classify>=0:devel/p5-Params-Classify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Lexical-Persistence/Makefile b/devel/p5-Lexical-Persistence/Makefile
index 44db34b0553e..f1956eed214d 100644
--- a/devel/p5-Lexical-Persistence/Makefile
+++ b/devel/p5-Lexical-Persistence/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Persistent lexical variable values for arbitrary calls
 
-BUILD_DEPENDS=	p5-Devel-LexAlias>=0.04:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-PadWalker>=1.1:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
+		p5-PadWalker>=1.1:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-List-AllUtils/Makefile b/devel/p5-List-AllUtils/Makefile
index 0de02359ff69..596ac5a18056 100644
--- a/devel/p5-List-AllUtils/Makefile
+++ b/devel/p5-List-AllUtils/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Combines List::Util and List::MoreUtils in one bite-sized package
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0.28:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-List-MoreUtils>=0.28:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
@@ -22,8 +22,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.31:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.31:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.31:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.31:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-List-Group/Makefile b/devel/p5-List-Group/Makefile
index 422c6aa6c781..2670b99feb55 100644
--- a/devel/p5-List-Group/Makefile
+++ b/devel/p5-List-Group/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tillman@seekingfire.com
 COMMENT=	Perl module that allows you to group a list by columns or rows
 
-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/devel/p5-List-Objects-Types/Makefile b/devel/p5-List-Objects-Types/Makefile
index 2c055185019c..f07e02716fd6 100644
--- a/devel/p5-List-Objects-Types/Makefile
+++ b/devel/p5-List-Objects-Types/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-List-Objects-WithUtils>=2:${PORTSDIR}/devel/p5-List-Objects-WithUtils \
-		p5-Type-Tiny>=0.022:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-List-Objects-WithUtils>=2:devel/p5-List-Objects-WithUtils \
+		p5-Type-Tiny>=0.022:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-List-Objects-WithUtils/Makefile b/devel/p5-List-Objects-WithUtils/Makefile
index 6ffba4c304de..049df97f5810 100644
--- a/devel/p5-List-Objects-WithUtils/Makefile
+++ b/devel/p5-List-Objects-WithUtils/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-List-UtilsBy>=0.09:${PORTSDIR}/devel/p5-List-UtilsBy \
-		p5-Module-Runtime>=0.013:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Role-Tiny>=1.003:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Type-Tie>=0.004:${PORTSDIR}/devel/p5-Type-Tie \
-		p5-autobox>=0:${PORTSDIR}/devel/p5-autobox \
-		p5-strictures>=2:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-List-UtilsBy>=0.09:devel/p5-List-UtilsBy \
+		p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
+		p5-Role-Tiny>=1.003:devel/p5-Role-Tiny \
+		p5-Type-Tie>=0.004:devel/p5-Type-Tie \
+		p5-autobox>=0:devel/p5-autobox \
+		p5-strictures>=2:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -30,8 +30,8 @@ USES=		perl5
 .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/devel/p5-List-SomeUtils-XS/Makefile b/devel/p5-List-SomeUtils-XS/Makefile
index 5b2ece2407f0..bc9c4f0129e0 100644
--- a/devel/p5-List-SomeUtils-XS/Makefile
+++ b/devel/p5-List-SomeUtils-XS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XS implementation for List::SomeUtils
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Warnings>=0.006:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Warnings>=0.006:devel/p5-Test-Warnings
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-List-SomeUtils/Makefile b/devel/p5-List-SomeUtils/Makefile
index 38a971aad41c..2caddf6edf93 100644
--- a/devel/p5-List-SomeUtils/Makefile
+++ b/devel/p5-List-SomeUtils/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-List-SomeUtils-XS>=0:${PORTSDIR}/devel/p5-List-SomeUtils-XS \
-		p5-Module-Implementation>=0:${PORTSDIR}/devel/p5-Module-Implementation
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-List-SomeUtils-XS>=0:devel/p5-List-SomeUtils-XS \
+		p5-Module-Implementation>=0:devel/p5-Module-Implementation
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Locale-Maketext-Lexicon/Makefile b/devel/p5-Locale-Maketext-Lexicon/Makefile
index f53e369c3737..bb677749de8f 100644
--- a/devel/p5-Locale-Maketext-Lexicon/Makefile
+++ b/devel/p5-Locale-Maketext-Lexicon/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Use other catalog formats in Locale::Maketext
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	p5-Locale-Maketext>=1.17:${PORTSDIR}/devel/p5-Locale-Maketext
+RUN_DEPENDS=	p5-Locale-Maketext>=1.17:devel/p5-Locale-Maketext
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Locale-Maketext/Makefile b/devel/p5-Locale-Maketext/Makefile
index f9b78c0a145c..ea54ebf0a50f 100644
--- a/devel/p5-Locale-Maketext/Makefile
+++ b/devel/p5-Locale-Maketext/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Framework for software localization and inheritance-based lexicons
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Locale-PO/Makefile b/devel/p5-Locale-PO/Makefile
index 7b607993d501..e321950ad1b3 100644
--- a/devel/p5-Locale-PO/Makefile
+++ b/devel/p5-Locale-PO/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for manipulating .po entries from GNU gettext
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Accounting-SVK/Makefile b/devel/p5-Log-Accounting-SVK/Makefile
index 6759ac573411..d105baebbad7 100644
--- a/devel/p5-Log-Accounting-SVK/Makefile
+++ b/devel/p5-Log-Accounting-SVK/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Perl module for accounting SVK repository
 
-BUILD_DEPENDS=	svk>=0:${PORTSDIR}/devel/svk \
-		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Graph-SocialMap>=0:${PORTSDIR}/graphics/p5-Graph-SocialMap \
-		p5-Graph-Writer-GraphViz>=0:${PORTSDIR}/graphics/p5-Graph-Writer-GraphViz \
-		p5-Algorithm-Accounting>=0:${PORTSDIR}/devel/p5-Algorithm-Accounting
+BUILD_DEPENDS=	svk>=0:devel/svk \
+		p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-Graph-SocialMap>=0:graphics/p5-Graph-SocialMap \
+		p5-Graph-Writer-GraphViz>=0:graphics/p5-Graph-Writer-GraphViz \
+		p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Accounting-SVN/Makefile b/devel/p5-Log-Accounting-SVN/Makefile
index 391a868742d1..b0c7790dc650 100644
--- a/devel/p5-Log-Accounting-SVN/Makefile
+++ b/devel/p5-Log-Accounting-SVN/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Perl module for accounting SVN repository
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-SVN-Log>=0:${PORTSDIR}/devel/p5-SVN-Log \
-		p5-Algorithm-Accounting>=0:${PORTSDIR}/devel/p5-Algorithm-Accounting \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-SVN-Log>=0:devel/p5-SVN-Log \
+		p5-Algorithm-Accounting>=0:devel/p5-Algorithm-Accounting \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 13e08e6b12ff..6ec8f28bb2e8 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Agent::Logger - a logging interface for perl
 
-BUILD_DEPENDS=	p5-Log-Agent>=0:${PORTSDIR}/devel/p5-Log-Agent
+BUILD_DEPENDS=	p5-Log-Agent>=0:devel/p5-Log-Agent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Callback/Makefile b/devel/p5-Log-Any-Adapter-Callback/Makefile
index 5475c772ac25..1a77442b3157 100644
--- a/devel/p5-Log-Any-Adapter-Callback/Makefile
+++ b/devel/p5-Log-Any-Adapter-Callback/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension adapter for Log::Any with callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS:=	p5-Log-Any>0:${PORTSDIR}/devel/p5-Log-Any
+RUN_DEPENDS:=	p5-Log-Any>0:devel/p5-Log-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Dispatch/Makefile b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
index c5d60ccf272b..3ec5a976b839 100644
--- a/devel/p5-Log-Any-Adapter-Dispatch/Makefile
+++ b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for adapter to use Log::Dispatch with Log::Any
 
 RUN_DEPENDS=	\
-	p5-Log-Any>0:${PORTSDIR}/devel/p5-Log-Any \
-	p5-Log-Dispatch>=2.26:${PORTSDIR}/devel/p5-Log-Dispatch
+	p5-Log-Any>0:devel/p5-Log-Any \
+	p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Log4perl/Makefile b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
index 93a892c1f42b..fd0134a5ee48 100644
--- a/devel/p5-Log-Any-Adapter-Log4perl/Makefile
+++ b/devel/p5-Log-Any-Adapter-Log4perl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Log::Any adapter for Log4perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Any>=1.03:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Log-Log4perl>=1.32:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Log-Any>=1.03:devel/p5-Log-Any \
+		p5-Log-Log4perl>=1.32:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Any-Adapter-Syslog/Makefile b/devel/p5-Log-Any-Adapter-Syslog/Makefile
index 8dfd3157dd4b..d6e5e50ecf08 100644
--- a/devel/p5-Log-Any-Adapter-Syslog/Makefile
+++ b/devel/p5-Log-Any-Adapter-Syslog/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Send Log::Any logs to syslog
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Log-Any>=0:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog
+RUN_DEPENDS=	p5-Log-Any>=0:devel/p5-Log-Any \
+		p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Any-App/Makefile b/devel/p5-Log-Any-App/Makefile
index a64855d335b5..636eb20b9f4f 100644
--- a/devel/p5-Log-Any-App/Makefile
+++ b/devel/p5-Log-Any-App/Makefile
@@ -14,18 +14,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Write-Rotate>=0.29:${PORTSDIR}/devel/p5-File-Write-Rotate \
-		p5-IO-Socket-UNIX-Util>=0:${PORTSDIR}/net/p5-IO-Socket-UNIX-Util \
-		p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Log-Any-Adapter-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Any-Adapter-Log4perl \
-		p5-Log-Any-IfLOG>=0.07:${PORTSDIR}/devel/p5-Log-Any-IfLOG \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-ArrayWithLimits>=0:${PORTSDIR}/devel/p5-Log-Dispatch-ArrayWithLimits \
-		p5-Log-Dispatch-Dir>=0.08:${PORTSDIR}/devel/p5-Log-Dispatch-Dir \
-		p5-Log-Dispatch-FileWriteRotate>=0.04:${PORTSDIR}/devel/p5-Log-Dispatch-FileWriteRotate
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
+		p5-IO-Socket-UNIX-Util>=0:net/p5-IO-Socket-UNIX-Util \
+		p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Log-Any-Adapter-Log4perl>=0:devel/p5-Log-Any-Adapter-Log4perl \
+		p5-Log-Any-IfLOG>=0.07:devel/p5-Log-Any-IfLOG \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-ArrayWithLimits>=0:devel/p5-Log-Dispatch-ArrayWithLimits \
+		p5-Log-Dispatch-Dir>=0.08:devel/p5-Log-Dispatch-Dir \
+		p5-Log-Dispatch-FileWriteRotate>=0.04:devel/p5-Log-Dispatch-FileWriteRotate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurper>=0:${PORTSDIR}/devel/p5-File-Slurper
+TEST_DEPENDS=	p5-File-Slurper>=0:devel/p5-File-Slurper
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Any-IfLOG/Makefile b/devel/p5-Log-Any-IfLOG/Makefile
index cf02c926a2ac..7269abfe05e9 100644
--- a/devel/p5-Log-Any-IfLOG/Makefile
+++ b/devel/p5-Log-Any-IfLOG/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Load Log::Any only if LOG environment variable is true
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Any>=0:${PORTSDIR}/devel/p5-Log-Any
+BUILD_DEPENDS=	p5-Log-Any>=0:devel/p5-Log-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-Contextual/Makefile b/devel/p5-Log-Contextual/Makefile
index 8d60ba84f0e0..5a24526f9214 100644
--- a/devel/p5-Log-Contextual/Makefile
+++ b/devel/p5-Log-Contextual/Makefile
@@ -13,11 +13,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Dumper-Concise>0:${PORTSDIR}/devel/p5-Data-Dumper-Concise \
-	p5-Exporter-Declare>=0.111:${PORTSDIR}/devel/p5-Exporter-Declare \
-	p5-Moo>=1.003:${PORTSDIR}/devel/p5-Moo
+	p5-Data-Dumper-Concise>0:devel/p5-Data-Dumper-Concise \
+	p5-Exporter-Declare>=0.111:devel/p5-Exporter-Declare \
+	p5-Moo>=1.003:devel/p5-Moo
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl
+TEST_DEPENDS=	p5-Log-Log4perl>0:devel/p5-Log-Log4perl
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Defer/Makefile b/devel/p5-Log-Defer/Makefile
index 4784259a80f7..4fdfc031c674 100644
--- a/devel/p5-Log-Defer/Makefile
+++ b/devel/p5-Log-Defer/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Deferred logs and timers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Guard>=0:${PORTSDIR}/devel/p5-Guard
+RUN_DEPENDS=	p5-Guard>=0:devel/p5-Guard
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-Dispatch-Array/Makefile b/devel/p5-Log-Dispatch-Array/Makefile
index 95f44e056180..7ab27dfa6b6a 100644
--- a/devel/p5-Log-Dispatch-Array/Makefile
+++ b/devel/p5-Log-Dispatch-Array/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile b/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile
index d0c6ee52f7ff..e63b42288548 100644
--- a/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile
+++ b/devel/p5-Log-Dispatch-ArrayWithLimits/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Log to array, with some limits applied
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Perl-osnames>=0.09:${PORTSDIR}/devel/p5-Perl-osnames
-RUN_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Perl-osnames>=0.09:devel/p5-Perl-osnames
+RUN_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Colorful/Makefile b/devel/p5-Log-Dispatch-Colorful/Makefile
index f72b353f945b..649f12749475 100644
--- a/devel/p5-Log-Dispatch-Colorful/Makefile
+++ b/devel/p5-Log-Dispatch-Colorful/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for logging to screen
 
-BUILD_DEPENDS=	p5-Filter>0:${PORTSDIR}/devel/p5-Filter \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Filter>0:devel/p5-Filter \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Config/Makefile b/devel/p5-Log-Dispatch-Config/Makefile
index 3ba120fc9090..9ece15cad18a 100644
--- a/devel/p5-Log-Dispatch-Config/Makefile
+++ b/devel/p5-Log-Dispatch-Config/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log4j equivalent for Perl
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-AppConfig>=1.52:${PORTSDIR}/devel/p5-AppConfig \
-		p5-Log-Dispatch>=2:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-AppConfig>=1.52:devel/p5-AppConfig \
+		p5-Log-Dispatch>=2:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Configurator-Any/Makefile b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
index f22eb7babef0..82eb01fa3f37 100644
--- a/devel/p5-Log-Dispatch-Configurator-Any/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-Any/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Configurator implementation with Config::Any
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0.15:${PORTSDIR}/devel/p5-Config-Any \
-		p5-Log-Dispatch>=2.23:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config
+BUILD_DEPENDS=	p5-Config-Any>=0.15:devel/p5-Config-Any \
+		p5-Log-Dispatch>=2.23:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+TEST_DEPENDS=	p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Configurator-YAML/Makefile b/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
index 6049c00a7311..0fa835a2e825 100644
--- a/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
+++ b/devel/p5-Log-Dispatch-Configurator-YAML/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	oleg@mamontov.net
 COMMENT=	Configurator implementation with YAML
 
-RUN_DEPENDS=	p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-BUILD_DEPENDS=	p5-Log-Dispatch-Config>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Config \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config \
+		p5-YAML>=0:textproc/p5-YAML
+BUILD_DEPENDS=	p5-Log-Dispatch-Config>=0:devel/p5-Log-Dispatch-Config \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-DBI/Makefile b/devel/p5-Log-Dispatch-DBI/Makefile
index 9602089b9235..dad438100865 100644
--- a/devel/p5-Log-Dispatch-DBI/Makefile
+++ b/devel/p5-Log-Dispatch-DBI/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Log::Dispatch output class for logging to database via DBI interface
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
+		p5-DBI>0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-CSV>0:${PORTSDIR}/databases/p5-DBD-CSV
+TEST_DEPENDS=	p5-DBD-CSV>0:databases/p5-DBD-CSV
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-Dir/Makefile b/devel/p5-Log-Dispatch-Dir/Makefile
index 84010dd6a3fa..16a280ff6149 100644
--- a/devel/p5-Log-Dispatch-Dir/Makefile
+++ b/devel/p5-Log-Dispatch-Dir/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
+BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-LibMagic>=0:${PORTSDIR}/devel/p5-File-LibMagic \
-		p5-Media-Type-Simple>=0:${PORTSDIR}/devel/p5-Media-Type-Simple
+TEST_DEPENDS=	p5-File-LibMagic>=0:devel/p5-File-LibMagic \
+		p5-Media-Type-Simple>=0:devel/p5-Media-Type-Simple
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
index 92698cc6a5b2..b474afb248dc 100644
--- a/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
+++ b/devel/p5-Log-Dispatch-Email-EmailSend/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Subclass of Log-Dispatch-Email that uses Email-Send
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Email-Send>=2.0:${PORTSDIR}/mail/p5-Email-Send \
-		p5-Email-Simple>=2.100:${PORTSDIR}/mail/p5-Email-Simple \
-		p5-Log-Dispatch>=2.0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Email-Send>=2.0:mail/p5-Email-Send \
+		p5-Email-Simple>=2.100:mail/p5-Email-Simple \
+		p5-Log-Dispatch>=2.0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-File-Rolling/Makefile b/devel/p5-Log-Dispatch-File-Rolling/Makefile
index 576201306b94..22f94065a33f 100644
--- a/devel/p5-Log-Dispatch-File-Rolling/Makefile
+++ b/devel/p5-Log-Dispatch-File-Rolling/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Object for logging to date/time/pid stamped files
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.37:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=1.38:${PORTSDIR}/devel/p5-Log-Log4perl
-RUN_DEPENDS=	p5-Log-Dispatch>=2.37:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=1.38:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.37:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=1.38:devel/p5-Log-Log4perl
+RUN_DEPENDS=	p5-Log-Dispatch>=2.37:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=1.38:devel/p5-Log-Log4perl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-File-Stamped/Makefile b/devel/p5-Log-Dispatch-File-Stamped/Makefile
index 24f0d9c3f095..cf6cd6c4ed28 100644
--- a/devel/p5-Log-Dispatch-File-Stamped/Makefile
+++ b/devel/p5-Log-Dispatch-File-Stamped/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Logging to date/time stamped files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=2.38:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Log-Dispatch>=2.38:devel/p5-Log-Dispatch \
+		p5-Params-Validate>0:devel/p5-Params-Validate \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-CheckDeps>=0.002:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-TempDir-Tiny>0:${PORTSDIR}/devel/p5-Test-TempDir-Tiny
+TEST_DEPENDS=	p5-Path-Tiny>0:devel/p5-Path-Tiny \
+		p5-Test-CheckDeps>=0.002:devel/p5-Test-CheckDeps \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-TempDir-Tiny>0:devel/p5-Test-TempDir-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch-FileRotate/Makefile b/devel/p5-Log-Dispatch-FileRotate/Makefile
index 69120bb30ff7..34801528d83c 100644
--- a/devel/p5-Log-Dispatch-FileRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileRotate/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Log::Dispatch plug-in for files that archive/rotate themselves
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-FileShared/Makefile b/devel/p5-Log-Dispatch-FileShared/Makefile
index c3d4726d90ac..ef5d5fd6af25 100644
--- a/devel/p5-Log-Dispatch-FileShared/Makefile
+++ b/devel/p5-Log-Dispatch-FileShared/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Dispatch output class for logging to shared files
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-FileWriteRotate/Makefile b/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
index 306850dca89b..0f5c91b73e15 100644
--- a/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
+++ b/devel/p5-Log-Dispatch-FileWriteRotate/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-File-Write-Rotate>=0.29:${PORTSDIR}/devel/p5-File-Write-Rotate \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-File-Write-Rotate>=0.29:devel/p5-File-Write-Rotate \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-Dispatch-Perl/Makefile b/devel/p5-Log-Dispatch-Perl/Makefile
index b8174da0a1cf..5b5ae920aaaf 100644
--- a/devel/p5-Log-Dispatch-Perl/Makefile
+++ b/devel/p5-Log-Dispatch-Perl/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log::Dispatch plug-in using core Perl functions for logging
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Dispatch-Screen-Color/Makefile b/devel/p5-Log-Dispatch-Screen-Color/Makefile
index cd91195ad297..b3ccd1f1bed7 100644
--- a/devel/p5-Log-Dispatch-Screen-Color/Makefile
+++ b/devel/p5-Log-Dispatch-Screen-Color/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to support color for Log::Dispatch::Screen
 
 RUN_DEPENDS=	\
-	p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
-	p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+	p5-Log-Dispatch>0:devel/p5-Log-Dispatch \
+	p5-Params-Validate>0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-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/devel/p5-Log-Dispatch-Scribe/Makefile b/devel/p5-Log-Dispatch-Scribe/Makefile
index b7edcddae7e6..cc89fef1f800 100644
--- a/devel/p5-Log-Dispatch-Scribe/Makefile
+++ b/devel/p5-Log-Dispatch-Scribe/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Logging via Facebook's Scribe server software
 
-BUILD_DEPENDS=	p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch
+BUILD_DEPENDS=	p5-Log-Dispatch>0:devel/p5-Log-Dispatch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-Test-Timer>=0:${PORTSDIR}/devel/p5-Test-Timer
+TEST_DEPENDS=	p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-Test-Timer>=0:devel/p5-Test-Timer
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Dispatch/Makefile b/devel/p5-Log-Dispatch/Makefile
index 6fc31e8644c6..bde4224356da 100644
--- a/devel/p5-Log-Dispatch/Makefile
+++ b/devel/p5-Log-Dispatch/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Suite of OO modules for logging messages to multiple outputs
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Validate>=1.03:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Params-Validate>=1.03:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 OPTIONS_DEFINE=		APACHELOG MIMELITE MAILSEND MAILSENDER MAILSENDMAIL
 OPTIONS_DEFAULT=	MAILSENDMAIL
@@ -33,11 +33,11 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-APACHELOG_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+APACHELOG_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 APACHELOG_USE=		APACHE_RUN=22+
-MIMELITE_RUN_DEPENDS=	p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite
-MAILSEND_RUN_DEPENDS=	p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
-MAILSENDER_RUN_DEPENDS=	p5-Mail-Sender>=0:${PORTSDIR}/mail/p5-Mail-Sender
-MAILSENDMAIL_RUN_DEPENDS=	p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail
+MIMELITE_RUN_DEPENDS=	p5-MIME-Lite>=0:mail/p5-MIME-Lite
+MAILSEND_RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools
+MAILSENDER_RUN_DEPENDS=	p5-Mail-Sender>=0:mail/p5-Mail-Sender
+MAILSENDMAIL_RUN_DEPENDS=	p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Dispatchouli/Makefile b/devel/p5-Log-Dispatchouli/Makefile
index 14cb0adc449e..39ae04802245 100644
--- a/devel/p5-Log-Dispatchouli/Makefile
+++ b/devel/p5-Log-Dispatchouli/Makefile
@@ -15,17 +15,17 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-Array>=0:${PORTSDIR}/devel/p5-Log-Dispatch-Array \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-String-Flogger>=0:${PORTSDIR}/textproc/p5-String-Flogger \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Exporter-GlobExporter>=0.002:${PORTSDIR}/devel/p5-Sub-Exporter-GlobExporter \
-		p5-Sys-Syslog>=0.16:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-Array>=0:devel/p5-Log-Dispatch-Array \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-String-Flogger>=0:textproc/p5-String-Flogger \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-GlobExporter>=0.002:devel/p5-Sub-Exporter-GlobExporter \
+		p5-Sys-Syslog>=0.16:sysutils/p5-Sys-Syslog \
+		p5-Try-Tiny>=0.04:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Dump/Makefile b/devel/p5-Log-Dump/Makefile
index 6392f81c99f8..b1280e66cb7c 100644
--- a/devel/p5-Log-Dump/Makefile
+++ b/devel/p5-Log-Dump/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
-	p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+	p5-Data-Dump>0:devel/p5-Data-Dump \
+	p5-Sub-Install>0:devel/p5-Sub-Install
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Handler/Makefile b/devel/p5-Log-Handler/Makefile
index 7793894e70e1..264927b6098a 100644
--- a/devel/p5-Log-Handler/Makefile
+++ b/devel/p5-Log-Handler/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Object-oriented handler for logging, tracing, and debugging in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Email-Date>=0:${PORTSDIR}/mail/p5-Email-Date
+TEST_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Email-Date>=0:mail/p5-Email-Date
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
index 09f962184003..f0f60205a616 100644
--- a/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
+++ b/devel/p5-Log-Log4perl-Appender-RabbitMQ/Makefile
@@ -12,15 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module which allows logging to RabbitMQ via log4perl
 
-RUN_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Net-RabbitMQ>0:${PORTSDIR}/net/p5-Net-RabbitMQ \
-		p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly \
+RUN_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:devel/p5-Log-Log4perl \
+		p5-Net-RabbitMQ>0:net/p5-Net-RabbitMQ \
+		p5-Readonly>0:devel/p5-Readonly \
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Net-RabbitMQ>0:${PORTSDIR}/net/p5-Net-RabbitMQ \
-		p5-Readonly>0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Output>0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Net-RabbitMQ>0:${PORTSDIR}/devel/p5-Test-Net-RabbitMQ
+BUILD_DEPENDS=	${LOCALBASE}/bin/l4p-tmpl:devel/p5-Log-Log4perl \
+		p5-Net-RabbitMQ>0:net/p5-Net-RabbitMQ \
+		p5-Readonly>0:devel/p5-Readonly \
+		p5-Test-Output>0:devel/p5-Test-Output \
+		p5-Test-Net-RabbitMQ>0:devel/p5-Test-Net-RabbitMQ
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Message-Simple/Makefile b/devel/p5-Log-Message-Simple/Makefile
index 5d8c4f1e826b..d8bedbae4300 100644
--- a/devel/p5-Log-Message-Simple/Makefile
+++ b/devel/p5-Log-Message-Simple/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides standardized logging facilities using the Log::Message module
 
-BUILD_DEPENDS=	p5-Log-Message>=0:${PORTSDIR}/devel/p5-Log-Message
+BUILD_DEPENDS=	p5-Log-Message>=0:devel/p5-Log-Message
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Message/Makefile b/devel/p5-Log-Message/Makefile
index d67669c16846..1b5b03dfd777 100644
--- a/devel/p5-Log-Message/Makefile
+++ b/devel/p5-Log-Message/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Powerful and flexible message logging mechanism
 
-BUILD_DEPENDS=	p5-Params-Check>=0:${PORTSDIR}/devel/p5-Params-Check \
-		p5-Module-Load>=0:${PORTSDIR}/devel/p5-Module-Load \
-		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple
+BUILD_DEPENDS=	p5-Params-Check>=0:devel/p5-Params-Check \
+		p5-Module-Load>=0:devel/p5-Module-Load \
+		p5-Locale-Maketext-Simple>=0:devel/p5-Locale-Maketext-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Log-Report-Optional/Makefile b/devel/p5-Log-Report-Optional/Makefile
index 6c15700efea2..f0954b12a87b 100644
--- a/devel/p5-Log-Report-Optional/Makefile
+++ b/devel/p5-Log-Report-Optional/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Log::Report or ::Minimal
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-String-Print>=0.13:${PORTSDIR}/textproc/p5-String-Print
+BUILD_DEPENDS=	p5-String-Print>=0.13:textproc/p5-String-Print
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Log-Report/Makefile b/devel/p5-Log-Report/Makefile
index e8f84e2b5ec9..ae5627dbcd7d 100644
--- a/devel/p5-Log-Report/Makefile
+++ b/devel/p5-Log-Report/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Report a problem, pluggable handlers and language support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0.09:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Log-Report-Optional>=1.02:${PORTSDIR}/devel/p5-Log-Report-Optional \
-		p5-String-Print>=0.13:${PORTSDIR}/textproc/p5-String-Print
+BUILD_DEPENDS=	p5-Devel-GlobalDestruction>=0.09:devel/p5-Devel-GlobalDestruction \
+		p5-Log-Report-Optional>=1.02:devel/p5-Log-Report-Optional \
+		p5-String-Print>=0.13:textproc/p5-String-Print
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Log-TraceMessages/Makefile b/devel/p5-Log-TraceMessages/Makefile
index 0e5ca03dcf67..ed53e3db0896 100644
--- a/devel/p5-Log-TraceMessages/Makefile
+++ b/devel/p5-Log-TraceMessages/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for trace messages used in debugging
 
-BUILD_DEPENDS=	p5-HTML-FromText>=0:${PORTSDIR}/www/p5-HTML-FromText
+BUILD_DEPENDS=	p5-HTML-FromText>=0:www/p5-HTML-FromText
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Luka/Makefile b/devel/p5-Luka/Makefile
index 8d55adb72497..b1f3b825cb17 100644
--- a/devel/p5-Luka/Makefile
+++ b/devel/p5-Luka/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Exception handling and reporting framework
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Mail-SendEasy>=0:${PORTSDIR}/mail/p5-Mail-SendEasy \
-		p5-Sub-Uplevel>=0:${PORTSDIR}/devel/p5-Sub-Uplevel \
-		p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-		p5-What>=0:${PORTSDIR}/net/p5-What
+BUILD_DEPENDS=	p5-Class-Std>=0:devel/p5-Class-Std \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Error>=0:lang/p5-Error \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Mail-SendEasy>=0:mail/p5-Mail-SendEasy \
+		p5-Sub-Uplevel>=0:devel/p5-Sub-Uplevel \
+		p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
+		p5-What>=0:net/p5-What
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MRO-Compat/Makefile b/devel/p5-MRO-Compat/Makefile
index 826ebe5c2f76..97e7a26bd13e 100644
--- a/devel/p5-MRO-Compat/Makefile
+++ b/devel/p5-MRO-Compat/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add mro::* interface compatibility for Perls < 5.9.5
 
-BUILD_DEPENDS=	p5-Class-C3>=0.19:${PORTSDIR}/devel/p5-Class-C3
+BUILD_DEPENDS=	p5-Class-C3>=0.19:devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MRO-Define/Makefile b/devel/p5-MRO-Define/Makefile
index 3ecda7a5e9af..24fe38f7c514 100644
--- a/devel/p5-MRO-Define/Makefile
+++ b/devel/p5-MRO-Define/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Define your own method resolution order
 
-TEST_DEPENDS=	p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+TEST_DEPENDS=	p5-Variable-Magic>=0:devel/p5-Variable-Magic
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Mac-PropertyList/Makefile b/devel/p5-Mac-PropertyList/Makefile
index 75fdf3d2d6b1..b3f74a6b97b5 100644
--- a/devel/p5-Mac-PropertyList/Makefile
+++ b/devel/p5-Mac-PropertyList/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for parsing Mac OS X property lists
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
+BUILD_DEPENDS=	p5-XML-Entities>=0:textproc/p5-XML-Entities
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -22,7 +22,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Make/Makefile b/devel/p5-Make/Makefile
index 4a21a837c86e..d0515c4480b6 100644
--- a/devel/p5-Make/Makefile
+++ b/devel/p5-Make/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-Compile>=1.2.1:${PORTSDIR}/devel/p5-Test-Compile
+TEST_DEPENDS=	p5-Test-Compile>=1.2.1:devel/p5-Test-Compile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Media-Type-Simple/Makefile b/devel/p5-Media-Type-Simple/Makefile
index 6041072c3080..6ac719691feb 100644
--- a/devel/p5-Media-Type-Simple/Makefile
+++ b/devel/p5-Media-Type-Simple/Makefile
@@ -15,10 +15,10 @@ COMMENT=	MIME Media Types and their file extensions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Meta-Builder/Makefile b/devel/p5-Meta-Builder/Makefile
index c90d767984d3..44798230d855 100644
--- a/devel/p5-Meta-Builder/Makefile
+++ b/devel/p5-Meta-Builder/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for creating Meta objects to track custom metrics
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Fennec-Lite>=0:${PORTSDIR}/devel/p5-Fennec-Lite
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Fennec-Lite>=0:devel/p5-Fennec-Lite
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MetaCPAN-Client/Makefile b/devel/p5-MetaCPAN-Client/Makefile
index c693382bc18b..1e1efd237c1e 100644
--- a/devel/p5-MetaCPAN-Client/Makefile
+++ b/devel/p5-MetaCPAN-Client/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Comprehensive, DWIM-featured client to the MetaCPAN API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Search-Elasticsearch>=1.10:${PORTSDIR}/textproc/p5-Search-Elasticsearch \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Search-Elasticsearch>=1.10:textproc/p5-Search-Elasticsearch \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Metabase-Client-Simple/Makefile b/devel/p5-Metabase-Client-Simple/Makefile
index bd594b078969..3df44085dff2 100644
--- a/devel/p5-Metabase-Client-Simple/Makefile
+++ b/devel/p5-Metabase-Client-Simple/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Client that submits to Metabase servers
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact
-RUN_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact \
-		p5-Crypt-SSLeay>0:${PORTSDIR}/security/p5-Crypt-SSLeay
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Metabase-Fact>0:devel/p5-Metabase-Fact
+RUN_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Metabase-Fact>0:devel/p5-Metabase-Fact \
+		p5-Crypt-SSLeay>0:security/p5-Crypt-SSLeay
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Metabase-Fact/Makefile b/devel/p5-Metabase-Fact/Makefile
index 582718a433de..a99b291c08a6 100644
--- a/devel/p5-Metabase-Fact/Makefile
+++ b/devel/p5-Metabase-Fact/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Metabase Facts
 
-BUILD_DEPENDS=	p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-Data-GUID>=0:${PORTSDIR}/devel/p5-Data-GUID \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo
+BUILD_DEPENDS=	p5-JSON>=2.0:converters/p5-JSON \
+		p5-Data-GUID>=0:devel/p5-Data-GUID \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Method-Signatures-Simple/Makefile b/devel/p5-Method-Signatures-Simple/Makefile
index abf0defb4ad4..95c4e9c6eb4f 100644
--- a/devel/p5-Method-Signatures-Simple/Makefile
+++ b/devel/p5-Method-Signatures-Simple/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Basic method declarations with signatures, without source filters
 
-BUILD_DEPENDS=	p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare
+BUILD_DEPENDS=	p5-Devel-Declare>=0:devel/p5-Devel-Declare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Minilla/Makefile b/devel/p5-Minilla/Makefile
index 32664ccc1c9c..3e38a2061e42 100644
--- a/devel/p5-Minilla/Makefile
+++ b/devel/p5-Minilla/Makefile
@@ -17,44 +17,44 @@ COMMENT=	CPAN module authoring tool
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	git>=0:${PORTSDIR}/devel/git \
-		tree>=0:${PORTSDIR}/sysutils/tree \
-		p5-App-cpanminus>=1.6902:${PORTSDIR}/devel/p5-App-cpanminus \
-		p5-Archive-Tar>=1.60:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-CPAN-Meta>=2.132830:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-Config-Identity>=0:${PORTSDIR}/devel/p5-Config-Identity \
-		p5-Data-Section-Simple>=0.04:${PORTSDIR}/devel/p5-Data-Section-Simple \
-		p5-ExtUtils-Manifest>=1.54:${PORTSDIR}/devel/p5-ExtUtils-Manifest \
-		p5-CPAN-Uploader>=0:${PORTSDIR}/devel/p5-CPAN-Uploader \
-		p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Config-Identity>=0:${PORTSDIR}/devel/p5-Config-Identity \
-		p5-Devel-CheckBin>=0:${PORTSDIR}/devel/p5-Devel-CheckBin \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
-		p5-Getopt-Long>=2.36:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-Build-Tiny>=0:${PORTSDIR}/devel/p5-Module-Build-Tiny \
-		p5-Module-CPANfile>=0.9025:${PORTSDIR}/devel/p5-Module-CPANfile \
-		p5-Module-Metadata>=1.000012:${PORTSDIR}/devel/p5-Module-Metadata \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=1.001:${PORTSDIR}/devel/p5-Moo \
-		p5-Pod-Markdown>=1.322:${PORTSDIR}/textproc/p5-Pod-Markdown \
-		p5-TOML>=0:${PORTSDIR}/textproc/p5-TOML \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Text-MicroTemplate>=0.20:${PORTSDIR}/textproc/p5-Text-MicroTemplate \
-		p5-Time-Piece>=1.16:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Harness>=0:${PORTSDIR}/devel/p5-Test-Harness \
-		p5-strictures>=0:${PORTSDIR}/devel/p5-strictures \
-		p5-Software-License>=0:${PORTSDIR}/misc/p5-Software-License \
-		p5-Version-Next>=0:${PORTSDIR}/textproc/p5-Version-Next
+BUILD_DEPENDS=	git>=0:devel/git \
+		tree>=0:sysutils/tree \
+		p5-App-cpanminus>=1.6902:devel/p5-App-cpanminus \
+		p5-Archive-Tar>=1.60:archivers/p5-Archive-Tar \
+		p5-CPAN-Meta>=2.132830:devel/p5-CPAN-Meta \
+		p5-Config-Identity>=0:devel/p5-Config-Identity \
+		p5-Data-Section-Simple>=0.04:devel/p5-Data-Section-Simple \
+		p5-ExtUtils-Manifest>=1.54:devel/p5-ExtUtils-Manifest \
+		p5-CPAN-Uploader>=0:devel/p5-CPAN-Uploader \
+		p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-Config-Identity>=0:devel/p5-Config-Identity \
+		p5-Devel-CheckBin>=0:devel/p5-Devel-CheckBin \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-File-pushd>=0:devel/p5-File-pushd \
+		p5-Getopt-Long>=2.36:devel/p5-Getopt-Long \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Module-Build-Tiny>=0:devel/p5-Module-Build-Tiny \
+		p5-Module-CPANfile>=0.9025:devel/p5-Module-CPANfile \
+		p5-Module-Metadata>=1.000012:devel/p5-Module-Metadata \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=1.001:devel/p5-Moo \
+		p5-Pod-Markdown>=1.322:textproc/p5-Pod-Markdown \
+		p5-TOML>=0:textproc/p5-TOML \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor \
+		p5-Text-MicroTemplate>=0.20:textproc/p5-Text-MicroTemplate \
+		p5-Time-Piece>=1.16:devel/p5-Time-Piece \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Harness>=0:devel/p5-Test-Harness \
+		p5-strictures>=0:devel/p5-strictures \
+		p5-Software-License>=0:misc/p5-Software-License \
+		p5-Version-Next>=0:textproc/p5-Version-Next
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Minion/Makefile b/devel/p5-Minion/Makefile
index 35b05bd38828..dd4d14930b90 100644
--- a/devel/p5-Minion/Makefile
+++ b/devel/p5-Minion/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asynchronous job queue for Mojolicious
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Mojolicious>=6.0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS=	p5-Mojolicious>=6.0:www/p5-Mojolicious
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 
 OPTIONS_DEFINE=	PGSQL
 
-PGSQL_BUILD_DEPENDS=	p5-Mojo-Pg>=0:${PORTSDIR}/databases/p5-Mojo-Pg
+PGSQL_BUILD_DEPENDS=	p5-Mojo-Pg>=0:databases/p5-Mojo-Pg
 PGSQL_RUN_DEPENDS=	${PGSQL_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Mixin-Event-Dispatch/Makefile b/devel/p5-Mixin-Event-Dispatch/Makefile
index d3a065ddc650..d042c58f4464 100644
--- a/devel/p5-Mixin-Event-Dispatch/Makefile
+++ b/devel/p5-Mixin-Event-Dispatch/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Mixin methods for simple event/message dispatch framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-UtilsBy>=0:${PORTSDIR}/devel/p5-List-UtilsBy
+BUILD_DEPENDS=	p5-List-UtilsBy>=0:devel/p5-List-UtilsBy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Fatal>=0.010:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Refcount>=0.07:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
+		p5-Test-Fatal>=0.010:devel/p5-Test-Fatal \
+		p5-Test-Refcount>=0.07:devel/p5-Test-Refcount
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Mixin-Linewise/Makefile b/devel/p5-Mixin-Linewise/Makefile
index 719e1b3f240c..b35dd41527b1 100644
--- a/devel/p5-Mixin-Linewise/Makefile
+++ b/devel/p5-Mixin-Linewise/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Write your linewise code for handles; this does the rest
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PerlIO-utf8_strict>=0:${PORTSDIR}/devel/p5-PerlIO-utf8_strict \
-		p5-Sub-Exporter>=0.900:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-PerlIO-utf8_strict>=0:devel/p5-PerlIO-utf8_strict \
+		p5-Sub-Exporter>=0.900:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Mo/Makefile b/devel/p5-Mo/Makefile
index 856b8b531342..d57e77f9e4ad 100644
--- a/devel/p5-Mo/Makefile
+++ b/devel/p5-Mo/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Micro Objects. Mo is less
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs
+TEST_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-PPI>=0:textproc/p5-PPI \
+		p5-Test-NoTabs>=0:devel/p5-Test-NoTabs
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Mock-Quick/Makefile b/devel/p5-Mock-Quick/Makefile
index a89709f91208..c43894b1879b 100644
--- a/devel/p5-Mock-Quick/Makefile
+++ b/devel/p5-Mock-Quick/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Quickly mock objects and classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Declare>=0.103:${PORTSDIR}/devel/p5-Exporter-Declare
+BUILD_DEPENDS=	p5-Exporter-Declare>=0.103:devel/p5-Exporter-Declare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Fennec-Lite>=0.004:${PORTSDIR}/devel/p5-Fennec-Lite \
-		p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Fennec-Lite>=0.004:devel/p5-Fennec-Lite \
+		p5-Test-Exception>=0.29:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Module-Build-Convert/Makefile b/devel/p5-Module-Build-Convert/Makefile
index 6e47f3667be4..9757f9628896 100644
--- a/devel/p5-Module-Build-Convert/Makefile
+++ b/devel/p5-Module-Build-Convert/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Makefile.PL to Build.PL converter
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-PPI>=0:textproc/p5-PPI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Kwalitee/Makefile b/devel/p5-Module-Build-Kwalitee/Makefile
index 4a32a9152845..9139ac40740a 100644
--- a/devel/p5-Module-Build-Kwalitee/Makefile
+++ b/devel/p5-Module-Build-Kwalitee/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Module::Build subclass with prepackaged tests
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Module-Build>=0.26.09:${PORTSDIR}/devel/p5-Module-Build \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
-RUN_DEPENDS=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-Module-Build>=0.26.09:devel/p5-Module-Build \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
+RUN_DEPENDS=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile b/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
index 7563327e77d3..649a7252041e 100644
--- a/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
+++ b/devel/p5-Module-Build-Pluggable-ReadmeMarkdownFromPod/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Make README.mkdn from POD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-Module-Build-Pluggable>=0.09:${PORTSDIR}/devel/p5-Module-Build-Pluggable \
-		p5-Pod-Markdown>=0:${PORTSDIR}/textproc/p5-Pod-Markdown
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-Module-Build-Pluggable>=0.09:devel/p5-Module-Build-Pluggable \
+		p5-Pod-Markdown>=0:textproc/p5-Pod-Markdown
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Pluggable/Makefile b/devel/p5-Module-Build-Pluggable/Makefile
index ad75b1b84aad..4308758b9ef4 100644
--- a/devel/p5-Module-Build-Pluggable/Makefile
+++ b/devel/p5-Module-Build-Pluggable/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Module::Build meets plugins
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Data-OptList>=0:devel/p5-Data-OptList \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build-Tiny/Makefile b/devel/p5-Module-Build-Tiny/Makefile
index 5db235a21204..4a795958619b 100644
--- a/devel/p5-Module-Build-Tiny/Makefile
+++ b/devel/p5-Module-Build-Tiny/Makefile
@@ -18,10 +18,10 @@ COMMENT=	Tiny replacement for Module::Build
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Config>=0.003:${PORTSDIR}/devel/p5-ExtUtils-Config \
-		p5-ExtUtils-Helpers>=0.020:${PORTSDIR}/devel/p5-ExtUtils-Helpers \
-		p5-ExtUtils-InstallPaths>=0.002:${PORTSDIR}/devel/p5-ExtUtils-InstallPaths \
-		p5-Test-Harness>=3.29:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS=	p5-ExtUtils-Config>=0.003:devel/p5-ExtUtils-Config \
+		p5-ExtUtils-Helpers>=0.020:devel/p5-ExtUtils-Helpers \
+		p5-ExtUtils-InstallPaths>=0.002:devel/p5-ExtUtils-InstallPaths \
+		p5-Test-Harness>=3.29:devel/p5-Test-Harness
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Module-Build-XSUtil/Makefile b/devel/p5-Module-Build-XSUtil/Makefile
index aa8bdadbab01..3f122b6b063e 100644
--- a/devel/p5-Module-Build-XSUtil/Makefile
+++ b/devel/p5-Module-Build-XSUtil/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Module::Build class for building XS modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckCompiler>=0:${PORTSDIR}/devel/p5-Devel-CheckCompiler
+BUILD_DEPENDS=	p5-Devel-CheckCompiler>=0:devel/p5-Devel-CheckCompiler
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Cwd-Guard>=0:${PORTSDIR}/devel/p5-Cwd-Guard \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Cwd-Guard>=0:devel/p5-Cwd-Guard \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index 1ab002282b86..a7f12ab0ae27 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Build and install Perl modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-PAR-Dist>=0.17:${PORTSDIR}/devel/p5-PAR-Dist
+TEST_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-PAR-Dist>=0.17:devel/p5-PAR-Dist
 
 PORTSCOUT=	skipv:0.31011,0.31012
 
@@ -29,13 +29,13 @@ USE_PERL5=	modbuild
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Test-Harness>=3.29:${PORTSDIR}/devel/p5-Test-Harness
-RUN_DEPENDS+=	p5-Test-Harness>=3.29:${PORTSDIR}/devel/p5-Test-Harness
+BUILD_DEPENDS+=	p5-Test-Harness>=3.29:devel/p5-Test-Harness
+RUN_DEPENDS+=	p5-Test-Harness>=3.29:devel/p5-Test-Harness
 .endif
 
 .if ${PERL_LEVEL} < 502105
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.142060:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.142060:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.142060:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.142060:devel/p5-CPAN-Meta
 .endif
 
 post-patch:
diff --git a/devel/p5-Module-CPANTS-Analyse/Makefile b/devel/p5-Module-CPANTS-Analyse/Makefile
index be5781e0e2ee..b29fc28e4774 100644
--- a/devel/p5-Module-CPANTS-Analyse/Makefile
+++ b/devel/p5-Module-CPANTS-Analyse/Makefile
@@ -14,22 +14,22 @@ COMMENT=	Generate Kwalitee ratings for a distribution
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Any-Lite>=0.06:${PORTSDIR}/archivers/p5-Archive-Any-Lite \
-		p5-Array-Diff>=0.04:${PORTSDIR}/misc/p5-Array-Diff \
-		p5-CPAN-DistnameInfo>=0.06:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-CPAN-Meta>=2.131490:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-CPAN-Meta-YAML>=0.008:${PORTSDIR}/devel/p5-CPAN-Meta-YAML \
-		p5-Class-Accessor>=0.19:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IO-Capture>=0.05:${PORTSDIR}/devel/p5-IO-Capture \
-		p5-JSON-MaybeXS>0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-File-Find-Object>=0.2.1:${PORTSDIR}/devel/p5-File-Find-Object \
-		p5-Module-ExtractUse>=0.33:${PORTSDIR}/devel/p5-Module-ExtractUse \
-		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Software-License>=0.103008:${PORTSDIR}/misc/p5-Software-License \
-		p5-Software-License-CCpack>=0:${PORTSDIR}/misc/p5-Software-License-CCpack
+BUILD_DEPENDS=	p5-Archive-Any-Lite>=0.06:archivers/p5-Archive-Any-Lite \
+		p5-Array-Diff>=0.04:misc/p5-Array-Diff \
+		p5-CPAN-DistnameInfo>=0.06:devel/p5-CPAN-DistnameInfo \
+		p5-CPAN-Meta>=2.131490:devel/p5-CPAN-Meta \
+		p5-CPAN-Meta-YAML>=0.008:devel/p5-CPAN-Meta-YAML \
+		p5-Class-Accessor>=0.19:devel/p5-Class-Accessor \
+		p5-IO-Capture>=0.05:devel/p5-IO-Capture \
+		p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS \
+		p5-File-Find-Object>=0.2.1:devel/p5-File-Find-Object \
+		p5-Module-ExtractUse>=0.33:devel/p5-Module-ExtractUse \
+		p5-Set-Scalar>=0:devel/p5-Set-Scalar \
+		p5-Software-License>=0.103008:misc/p5-Software-License \
+		p5-Software-License-CCpack>=0:misc/p5-Software-License-CCpack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker-CPANfile>=0.06:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker-CPANfile>=0.06:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
@@ -37,8 +37,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.133380:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.133380:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.133380:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.133380:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-CheckDeps/Makefile b/devel/p5-Module-CheckDeps/Makefile
index 00df51df4183..b954c69bcf0b 100644
--- a/devel/p5-Module-CheckDeps/Makefile
+++ b/devel/p5-Module-CheckDeps/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI
+BUILD_DEPENDS=	p5-PPI>=0:textproc/p5-PPI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Module-CheckVersion/Makefile b/devel/p5-Module-CheckVersion/Makefile
index ab9ce1692db7..e5e208f7e9e4 100644
--- a/devel/p5-Module-CheckVersion/Makefile
+++ b/devel/p5-Module-CheckVersion/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Check module (e.g. latest version) with CPAN (or equivalent repo)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Perl-osnames>=0.09:${PORTSDIR}/devel/p5-Perl-osnames
-RUN_DEPENDS=	p5-JSON-MaybeXS>=0:${PORTSDIR}/converters/p5-JSON-MaybeXS
+BUILD_DEPENDS=	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS \
+		p5-Perl-osnames>=0.09:devel/p5-Perl-osnames
+RUN_DEPENDS=	p5-JSON-MaybeXS>=0:converters/p5-JSON-MaybeXS
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Collect/Makefile b/devel/p5-Module-Collect/Makefile
index 51b505359d0c..331fd5c54900 100644
--- a/devel/p5-Module-Collect/Makefile
+++ b/devel/p5-Module-Collect/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to collect module files from some directories
 
 RUN_DEPENDS=	\
-	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule
+	p5-File-Find-Rule>0:devel/p5-File-Find-Rule
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Compile/Makefile b/devel/p5-Module-Compile/Makefile
index ba47f3d45db4..283cc9d00c1e 100644
--- a/devel/p5-Module-Compile/Makefile
+++ b/devel/p5-Module-Compile/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Provide a system for writing modules that compile other Perl modules
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Depends/Makefile b/devel/p5-Module-Depends/Makefile
index c157b4c54bfd..f0fd4e1a5a4e 100644
--- a/devel/p5-Module-Depends/Makefile
+++ b/devel/p5-Module-Depends/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Identify the dependencies of a distribution
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-YAML>=0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Extract/Makefile b/devel/p5-Module-Extract/Makefile
index 41b1d9a63063..5191335ab80e 100644
--- a/devel/p5-Module-Extract/Makefile
+++ b/devel/p5-Module-Extract/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Base class for working with Perl distributions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Extract>=0:${PORTSDIR}/archivers/p5-Archive-Extract
+BUILD_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-ExtractUse/Makefile b/devel/p5-Module-ExtractUse/Makefile
index f5e037e170b2..e922e72e1a62 100644
--- a/devel/p5-Module-ExtractUse/Makefile
+++ b/devel/p5-Module-ExtractUse/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.967:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Pod-Strip>=0:${PORTSDIR}/textproc/p5-Pod-Strip
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.967:devel/p5-Parse-RecDescent \
+		p5-Pod-Strip>=0:textproc/p5-Pod-Strip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require \
+		p5-Test-Deep>0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Module-Functions/Makefile b/devel/p5-Module-Functions/Makefile
index d23cb3c3eca5..3c462f816e3a 100644
--- a/devel/p5-Module-Functions/Makefile
+++ b/devel/p5-Module-Functions/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to get function list from package
 
 RUN_DEPENDS=	\
-	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify
+	p5-Sub-Identify>=0.04:devel/p5-Sub-Identify
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Implementation/Makefile b/devel/p5-Module-Implementation/Makefile
index 909b43cf9b93..35a5f75a81ce 100644
--- a/devel/p5-Module-Implementation/Makefile
+++ b/devel/p5-Module-Implementation/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Loads one of several alternate underlying implementations for a module
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.006:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-NoTabs>=0:${PORTSDIR}/devel/p5-Test-NoTabs \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Taint>=0:${PORTSDIR}/devel/p5-Test-Taint
+TEST_DEPENDS=	p5-Test-Fatal>=0.006:devel/p5-Test-Fatal \
+		p5-Test-NoTabs>=0:devel/p5-Test-NoTabs \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Taint>=0:devel/p5-Test-Taint
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Module-Info-File/Makefile b/devel/p5-Module-Info-File/Makefile
index fadd431db1f5..fccad9e6b685 100644
--- a/devel/p5-Module-Info-File/Makefile
+++ b/devel/p5-Module-Info-File/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Retrieves module information from a file or script
 
-RUN_DEPENDS=	p5-Module-Info>0.20:${PORTSDIR}/devel/p5-Module-Info
+RUN_DEPENDS=	p5-Module-Info>0.20:devel/p5-Module-Info
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Info/Makefile b/devel/p5-Module-Info/Makefile
index d4ec29f3ab87..eaaa411edc08 100644
--- a/devel/p5-Module-Info/Makefile
+++ b/devel/p5-Module-Info/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Provides information about Perl modules
 
-BUILD_DEPENDS=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools
+BUILD_DEPENDS=	p5-PathTools>=0:devel/p5-PathTools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Inspector/Makefile b/devel/p5-Module-Inspector/Makefile
index f2ff1d8d4ae5..c0f92dc57bbf 100644
--- a/devel/p5-Module-Inspector/Makefile
+++ b/devel/p5-Module-Inspector/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Integrated API for inspecting Perl distributions
 
-BUILD_DEPENDS=	p5-File-Find-Rule-VCS>=0:${PORTSDIR}/devel/p5-File-Find-Rule-VCS \
-		p5-File-Find-Rule-Perl>=0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl \
-		p5-Module-Extract>=0:${PORTSDIR}/devel/p5-Module-Extract \
-		p5-Module-Manifest>=0:${PORTSDIR}/devel/p5-Module-Manifest \
-		p5-Module-Math-Depends>=0:${PORTSDIR}/devel/p5-Module-Math-Depends \
-		p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI \
-		p5-YAML-Tiny>=0:${PORTSDIR}/textproc/p5-YAML-Tiny \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-File-Find-Rule-VCS>=0:devel/p5-File-Find-Rule-VCS \
+		p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl \
+		p5-Module-Extract>=0:devel/p5-Module-Extract \
+		p5-Module-Manifest>=0:devel/p5-Module-Manifest \
+		p5-Module-Math-Depends>=0:devel/p5-Module-Math-Depends \
+		p5-PPI>=0:textproc/p5-PPI \
+		p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
+		p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-AuthorRequires/Makefile b/devel/p5-Module-Install-AuthorRequires/Makefile
index b89e4c72722e..5987c1c70562 100644
--- a/devel/p5-Module-Install-AuthorRequires/Makefile
+++ b/devel/p5-Module-Install-AuthorRequires/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to declare author-only dependencies
 
 RUN_DEPENDS=	\
-	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+	p5-Module-Install>0:devel/p5-Module-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-AuthorTests/Makefile b/devel/p5-Module-Install-AuthorTests/Makefile
index b71d04e4c63f..e345969511af 100644
--- a/devel/p5-Module-Install-AuthorTests/Makefile
+++ b/devel/p5-Module-Install-AuthorTests/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to designate tests only run by module authors
 
 RUN_DEPENDS=	\
-	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+	p5-Module-Install>0:devel/p5-Module-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-ReadmeFromPod/Makefile b/devel/p5-Module-Install-ReadmeFromPod/Makefile
index c921ddbfb8d9..cd65089b12b8 100644
--- a/devel/p5-Module-Install-ReadmeFromPod/Makefile
+++ b/devel/p5-Module-Install-ReadmeFromPod/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Automatically generate README from POD during installation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=1.00:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Capture-Tiny>=0.05:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Module-Install>=1.00:devel/p5-Module-Install \
+		p5-Capture-Tiny>=0.05:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-Template/Makefile b/devel/p5-Module-Install-Template/Makefile
index cd9faf853324..829655836088 100644
--- a/devel/p5-Module-Install-Template/Makefile
+++ b/devel/p5-Module-Install-Template/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Treat module source code as a template
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-TestBase/Makefile b/devel/p5-Module-Install-TestBase/Makefile
index 145b92413409..a93a14ca667e 100644
--- a/devel/p5-Module-Install-TestBase/Makefile
+++ b/devel/p5-Module-Install-TestBase/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Module::Install Support for Test::Base
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=1.10:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Test-Base>=0.86:${PORTSDIR}/devel/p5-Test-Base
+BUILD_DEPENDS=	p5-Module-Install>=1.10:devel/p5-Module-Install \
+		p5-Test-Base>=0.86:devel/p5-Test-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Install-XSUtil/Makefile b/devel/p5-Module-Install-XSUtil/Makefile
index 84959b795f33..0dac0717e994 100644
--- a/devel/p5-Module-Install-XSUtil/Makefile
+++ b/devel/p5-Module-Install-XSUtil/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Utility functions for XS modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>=0.91:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Module-Install>=0.91:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Annotation
+TEST_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation
 
 USE_PERL5=	configure
 USES=		perl5
@@ -24,8 +24,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
-RUN_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
+BUILD_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
+RUN_DEPENDS+=	p5-ExtUtils-ParseXS>=3.18:devel/p5-ExtUtils-ParseXS
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Install/Makefile b/devel/p5-Module-Install/Makefile
index d4a616c0aab2..a36060266a6a 100644
--- a/devel/p5-Module-Install/Makefile
+++ b/devel/p5-Module-Install/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Standalone, extensible Perl module installer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Remove>=1.42:${PORTSDIR}/devel/p5-File-Remove \
-		p5-JSON>=2.14:${PORTSDIR}/converters/p5-JSON \
-		p5-Module-ScanDeps>=1.09:${PORTSDIR}/devel/p5-Module-ScanDeps \
-		p5-PAR-Dist>=0.29:${PORTSDIR}/devel/p5-PAR-Dist \
-		p5-YAML-Tiny>=1.38:${PORTSDIR}/textproc/p5-YAML-Tiny
+BUILD_DEPENDS=	p5-File-Remove>=1.42:devel/p5-File-Remove \
+		p5-JSON>=2.14:converters/p5-JSON \
+		p5-Module-ScanDeps>=1.09:devel/p5-Module-ScanDeps \
+		p5-PAR-Dist>=0.29:devel/p5-PAR-Dist \
+		p5-YAML-Tiny>=1.38:textproc/p5-YAML-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Load-Conditional/Makefile b/devel/p5-Module-Load-Conditional/Makefile
index 6a9c4db70286..b81bd8db8122 100644
--- a/devel/p5-Module-Load-Conditional/Makefile
+++ b/devel/p5-Module-Load-Conditional/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS=	p5-Module-Load>=0.28:${PORTSDIR}/devel/p5-Module-Load
+BUILD_DEPENDS=	p5-Module-Load>=0.28:devel/p5-Module-Load
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 .endif
 
diff --git a/devel/p5-Module-Manifest/Makefile b/devel/p5-Module-Manifest/Makefile
index 06091d1bdff3..32482ee161f8 100644
--- a/devel/p5-Module-Manifest/Makefile
+++ b/devel/p5-Module-Manifest/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Parse and examine a Perl distribution MANIFEST file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 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/devel/p5-Module-Math-Depends/Makefile b/devel/p5-Module-Math-Depends/Makefile
index 9af38d45034c..26b6ab8054f9 100644
--- a/devel/p5-Module-Math-Depends/Makefile
+++ b/devel/p5-Module-Math-Depends/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convenience object for manipulating module dependencies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Path/Makefile b/devel/p5-Module-Path/Makefile
index 3142f48e5c40..29b38897cd45 100644
--- a/devel/p5-Module-Path/Makefile
+++ b/devel/p5-Module-Path/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Get the full path to a locally installed module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Devel-FindPerl>0:${PORTSDIR}/devel/p5-Devel-FindPerl
+TEST_DEPENDS=	p5-Devel-FindPerl>0:devel/p5-Devel-FindPerl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Pluggable-Fast/Makefile b/devel/p5-Module-Pluggable-Fast/Makefile
index 3aad232cecbc..cfbd179aa9ff 100644
--- a/devel/p5-Module-Pluggable-Fast/Makefile
+++ b/devel/p5-Module-Pluggable-Fast/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast plugins with instantiation
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Pluggable-Ordered/Makefile b/devel/p5-Module-Pluggable-Ordered/Makefile
index ae788b515a5b..8482048da89c 100644
--- a/devel/p5-Module-Pluggable-Ordered/Makefile
+++ b/devel/p5-Module-Pluggable-Ordered/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Call module plugins in a specified order
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Recursive-Require/Makefile b/devel/p5-Module-Recursive-Require/Makefile
index 68f574a80e62..95b6d1808de1 100644
--- a/devel/p5-Module-Recursive-Require/Makefile
+++ b/devel/p5-Module-Recursive-Require/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Require module recursively
 
-BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Refresh/Makefile b/devel/p5-Module-Refresh/Makefile
index a7dd0256a4f0..ea03b7e708fc 100644
--- a/devel/p5-Module-Refresh/Makefile
+++ b/devel/p5-Module-Refresh/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Refresh %INC files when updated on disk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+TEST_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Release/Makefile b/devel/p5-Module-Release/Makefile
index 3c72c88f14bf..f5db4ff213c8 100644
--- a/devel/p5-Module-Release/Makefile
+++ b/devel/p5-Module-Release/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Upload files to CPAN and SourceForge
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CACertOrg-CA>=0:${PORTSDIR}/security/p5-CACertOrg-CA \
-		p5-ConfigReader-Simple>=0:${PORTSDIR}/devel/p5-ConfigReader-Simple \
-		p5-IO-Null>=0:${PORTSDIR}/devel/p5-IO-Null \
-		p5-Mojolicious>=4.50:${PORTSDIR}/www/p5-Mojolicious \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-CACertOrg-CA>=0:security/p5-CACertOrg-CA \
+		p5-ConfigReader-Simple>=0:devel/p5-ConfigReader-Simple \
+		p5-IO-Null>=0:devel/p5-IO-Null \
+		p5-Mojolicious>=4.50:www/p5-Mojolicious \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=6.02:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -33,7 +33,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.64:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Module-Setup/Makefile b/devel/p5-Module-Setup/Makefile
index 2e1f5ed7de3a..b2c000ac713b 100644
--- a/devel/p5-Module-Setup/Makefile
+++ b/devel/p5-Module-Setup/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for a simple module maker
 
 RUN_DEPENDS=	\
-	p5-Class-Trigger>0:${PORTSDIR}/devel/p5-Class-Trigger \
-	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-	p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Module-Collect>=0.06:${PORTSDIR}/devel/p5-Module-Collect \
-	p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML \
-	p5-Module-Install-AuthorTests>0:${PORTSDIR}/devel/p5-Module-Install-AuthorTests \
-	p5-Text-Patch>0:${PORTSDIR}/textproc/p5-Text-Patch
+	p5-Class-Trigger>0:devel/p5-Class-Trigger \
+	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+	p5-File-HomeDir>0:devel/p5-File-HomeDir \
+	p5-libwww>0:www/p5-libwww \
+	p5-Module-Collect>=0.06:devel/p5-Module-Collect \
+	p5-Path-Class>0:devel/p5-Path-Class \
+	p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit \
+	p5-YAML>0:textproc/p5-YAML \
+	p5-Module-Install-AuthorTests>0:devel/p5-Module-Install-AuthorTests \
+	p5-Text-Patch>0:textproc/p5-Text-Patch
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Starter-PBP/Makefile b/devel/p5-Module-Starter-PBP/Makefile
index 363a60235784..03091829a5e4 100644
--- a/devel/p5-Module-Starter-PBP/Makefile
+++ b/devel/p5-Module-Starter-PBP/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Create a module as recommended in "Perl Best Practices"
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Starter>=0:${PORTSDIR}/devel/p5-Module-Starter
+BUILD_DEPENDS=	p5-Module-Starter>=0:devel/p5-Module-Starter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile b/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
index a289bca3fd33..5abb0a2149df 100644
--- a/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
+++ b/devel/p5-Module-Starter-Plugin-SimpleStore/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provide methods of retrieving templates for Module::Starter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Starter>=1.32:${PORTSDIR}/devel/p5-Module-Starter
+BUILD_DEPENDS=	p5-Module-Starter>=1.32:devel/p5-Module-Starter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Starter-Plugin-TT2/Makefile b/devel/p5-Module-Starter-Plugin-TT2/Makefile
index 8cc16e186ccd..2660332d67d0 100644
--- a/devel/p5-Module-Starter-Plugin-TT2/Makefile
+++ b/devel/p5-Module-Starter-Plugin-TT2/Makefile
@@ -14,9 +14,9 @@ COMMENT=	TT2 templates for Module::Starter::Template
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Starter>=1.47:${PORTSDIR}/devel/p5-Module-Starter \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
-RUN_DEPENDS=	p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Module-Starter>=1.47:devel/p5-Module-Starter \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
+RUN_DEPENDS=	p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Module-Starter/Makefile b/devel/p5-Module-Starter/Makefile
index 32575850c993..95898ef15bbf 100644
--- a/devel/p5-Module-Starter/Makefile
+++ b/devel/p5-Module-Starter/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple starter kit for any Perl module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:1.470
diff --git a/devel/p5-Module-Used/Makefile b/devel/p5-Module-Used/Makefile
index a6586441e5f1..6e9bd2ff456f 100644
--- a/devel/p5-Module-Used/Makefile
+++ b/devel/p5-Module-Used/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Find modules loaded by Perl code without running it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-Next>=1.02:${PORTSDIR}/sysutils/p5-File-Next \
-		p5-PPI>=1.203:${PORTSDIR}/textproc/p5-PPI \
-		p5-Test-Deep>=0.098:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly
+RUN_DEPENDS=	p5-File-Next>=1.02:sysutils/p5-File-Next \
+		p5-PPI>=1.203:textproc/p5-PPI \
+		p5-Test-Deep>=0.098:devel/p5-Test-Deep \
+		p5-Readonly>=1.03:devel/p5-Readonly
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index c577ebb99ba8..da2455cce28f 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Minimalist Object Orientation (with Moose compatibility)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.10:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Devel-GlobalDestruction>=0.11:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Module-Runtime>=0.014:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Role-Tiny>=2:${PORTSDIR}/devel/p5-Role-Tiny
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.10:devel/p5-Class-Method-Modifiers \
+		p5-Devel-GlobalDestruction>=0.11:devel/p5-Devel-GlobalDestruction \
+		p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
+		p5-Role-Tiny>=2:devel/p5-Role-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 OPTIONS_DEFINE=	XS
 
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-XS_BUILD_DEPENDS=	p5-Class-XSAccessor>=1.18:${PORTSDIR}/devel/p5-Class-XSAccessor
+XS_BUILD_DEPENDS=	p5-Class-XSAccessor>=1.18:devel/p5-Class-XSAccessor
 XS_RUN_DEPENDS=		${XS_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-MooX-Cmd/Makefile b/devel/p5-MooX-Cmd/Makefile
index 2d8829d52f1b..9ec88c4a35a8 100644
--- a/devel/p5-MooX-Cmd/Makefile
+++ b/devel/p5-MooX-Cmd/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Giving an easy Moo style way to make command organized CLI apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-TieCombine>=0:${PORTSDIR}/devel/p5-IO-TieCombine \
-		p5-Module-Pluggable>=4.8:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Moo>=0.009013:${PORTSDIR}/devel/p5-Moo \
-		p5-Package-Stash>=0.33:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Regexp-Common>=2011121001:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Test-LoadAllModules>=0.021:${PORTSDIR}/devel/p5-Test-LoadAllModules
+BUILD_DEPENDS=	p5-IO-TieCombine>=0:devel/p5-IO-TieCombine \
+		p5-Module-Pluggable>=4.8:devel/p5-Module-Pluggable \
+		p5-Moo>=0.009013:devel/p5-Moo \
+		p5-Package-Stash>=0.33:devel/p5-Package-Stash \
+		p5-Regexp-Common>=2011121001:textproc/p5-Regexp-Common \
+		p5-Test-LoadAllModules>=0.021:devel/p5-Test-LoadAllModules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-TieCombine>=0:${PORTSDIR}/devel/p5-IO-TieCombine
+TEST_DEPENDS=	p5-IO-TieCombine>=0:devel/p5-IO-TieCombine
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-ConfigFromFile/Makefile b/devel/p5-MooX-ConfigFromFile/Makefile
index 2c76bd6bdb52..4dae4626de13 100644
--- a/devel/p5-MooX-ConfigFromFile/Makefile
+++ b/devel/p5-MooX-ConfigFromFile/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Moo eXtension for initializing objects from config file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-File-ConfigDir>=0.002:${PORTSDIR}/devel/p5-MooX-File-ConfigDir
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-File-Find-Rule>=0.30:devel/p5-File-Find-Rule \
+		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+		p5-Moo>=1.003000:devel/p5-Moo \
+		p5-MooX-File-ConfigDir>=0.002:devel/p5-MooX-File-ConfigDir
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-File-ConfigDir/Makefile b/devel/p5-MooX-File-ConfigDir/Makefile
index ff49b15dc4d7..1411438943fc 100644
--- a/devel/p5-MooX-File-ConfigDir/Makefile
+++ b/devel/p5-MooX-File-ConfigDir/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Moo eXtension for File::ConfigDir
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ConfigDir>=0.011:${PORTSDIR}/devel/p5-File-ConfigDir \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-File-ConfigDir>=0.011:devel/p5-File-ConfigDir \
+		p5-Moo>=1.003000:devel/p5-Moo \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-HandlesVia/Makefile b/devel/p5-MooX-HandlesVia/Makefile
index 29c74c616991..4a346da01eba 100644
--- a/devel/p5-MooX-HandlesVia/Makefile
+++ b/devel/p5-MooX-HandlesVia/Makefile
@@ -12,12 +12,12 @@ COMMENT=	NativeTrait-like behavior for Moo
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Perl>=0.002006:${PORTSDIR}/devel/p5-Data-Perl \
-		p5-Moo>=1.003000:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-Data-Perl>=0.002006:devel/p5-Data-Perl \
+		p5-Moo>=1.003000:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-MooX-Types-MooseLike>=0.23:${PORTSDIR}/devel/p5-MooX-Types-MooseLike
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-Options/Makefile b/devel/p5-MooX-Options/Makefile
index 60ce250ddf6a..4b3693188109 100644
--- a/devel/p5-MooX-Options/Makefile
+++ b/devel/p5-MooX-Options/Makefile
@@ -13,26 +13,26 @@ COMMENT=	Option keywords to your object (Mo/Moo/Moose)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Record>=0:${PORTSDIR}/devel/p5-Data-Record \
-		p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Module-Metadata>=1.000019:${PORTSDIR}/devel/p5-Module-Metadata \
-		p5-Moo>=1.003001:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooX-ConfigFromFile \
-		p5-Path-Class>=0.32:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Term-Size-Any>=0:${PORTSDIR}/devel/p5-Term-Size-Any \
-		p5-Text-WrapI18N>=0:${PORTSDIR}/textproc/p5-Text-WrapI18N
+BUILD_DEPENDS=	p5-Data-Record>=0:devel/p5-Data-Record \
+		p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+		p5-Module-Metadata>=1.000019:devel/p5-Module-Metadata \
+		p5-Moo>=1.003001:devel/p5-Moo \
+		p5-MooX-ConfigFromFile>=0:devel/p5-MooX-ConfigFromFile \
+		p5-Path-Class>=0.32:devel/p5-Path-Class \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Term-Size-Any>=0:devel/p5-Term-Size-Any \
+		p5-Text-WrapI18N>=0:textproc/p5-Text-WrapI18N
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Mo>=0:${PORTSDIR}/devel/p5-Mo \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Mo>=0:devel/p5-Mo \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MooX-StrictConstructor/Makefile b/devel/p5-MooX-StrictConstructor/Makefile
index 09dd56807f02..07330e92d0ae 100644
--- a/devel/p5-MooX-StrictConstructor/Makefile
+++ b/devel/p5-MooX-StrictConstructor/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Make your Moo-based object constructors blow up on unknown attributes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-strictures>=1:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Moo>=1.001000:devel/p5-Moo \
+		p5-strictures>=1:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-bareword-filehandles>=0:${PORTSDIR}/devel/p5-bareword-filehandles \
-		p5-indirect>=0:${PORTSDIR}/devel/p5-indirect \
-		p5-multidimensional>=0:${PORTSDIR}/devel/p5-multidimensional
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-bareword-filehandles>=0:devel/p5-bareword-filehandles \
+		p5-indirect>=0:devel/p5-indirect \
+		p5-multidimensional>=0:devel/p5-multidimensional
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-MooX-TypeTiny/Makefile b/devel/p5-MooX-TypeTiny/Makefile
index c78e82c6196d..d8bd293491e7 100644
--- a/devel/p5-MooX-TypeTiny/Makefile
+++ b/devel/p5-MooX-TypeTiny/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Optimized type checks for Moo + Type::Tiny
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moo>=1.004003:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>=1.000002:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Moo>=1.004003:devel/p5-Moo \
+		p5-Type-Tiny>=1.000002:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
index 48e52cdc7d7b..f77c37be6281 100644
--- a/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
+++ b/devel/p5-MooX-Types-MooseLike-Numeric/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Moo types for numbers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooX-Types-MooseLike>=0.23:${PORTSDIR}/devel/p5-MooX-Types-MooseLike
+BUILD_DEPENDS=	p5-MooX-Types-MooseLike>=0.23:devel/p5-MooX-Types-MooseLike
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-Types-MooseLike/Makefile b/devel/p5-MooX-Types-MooseLike/Makefile
index 921f9c50bfde..10797c9fef1f 100644
--- a/devel/p5-MooX-Types-MooseLike/Makefile
+++ b/devel/p5-MooX-Types-MooseLike/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Some Moosish types and a typer builder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0.014:${PORTSDIR}/devel/p5-Module-Runtime
+BUILD_DEPENDS=	p5-Module-Runtime>=0.014:devel/p5-Module-Runtime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=1.004002:${PORTSDIR}/devel/p5-Moo \
-		p5-Set-Object>=1:${PORTSDIR}/devel/p5-Set-Object \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Moo>=1.004002:devel/p5-Moo \
+		p5-Set-Object>=1:devel/p5-Set-Object \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-MooX-late/Makefile b/devel/p5-MooX-late/Makefile
index 0f1e1d275e7a..d196d14662ad 100644
--- a/devel/p5-MooX-late/Makefile
+++ b/devel/p5-MooX-late/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>=1.006000:${PORTSDIR}/devel/p5-Moo \
-	p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Type-Tiny>=1.000001:${PORTSDIR}/devel/p5-Type-Tiny
+	p5-Moo>=1.006000:devel/p5-Moo \
+	p5-Test-Requires>=0.06:devel/p5-Test-Requires \
+	p5-Type-Tiny>=1.000001:devel/p5-Type-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Moos/Makefile b/devel/p5-Moos/Makefile
index c6bfe18551af..2975bf1d40e4 100644
--- a/devel/p5-Moos/Makefile
+++ b/devel/p5-Moos/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Moo s{imple,peedy,ingle}
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=1.07:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Role-Tiny>=1.002.000:${PORTSDIR}/devel/p5-Role-Tiny
+BUILD_DEPENDS=	p5-Class-XSAccessor>=1.07:devel/p5-Class-XSAccessor \
+		p5-Role-Tiny>=1.002.000:devel/p5-Role-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Moose-Autobox/Makefile b/devel/p5-Moose-Autobox/Makefile
index be987b939895..53a32cf924e4 100644
--- a/devel/p5-Moose-Autobox/Makefile
+++ b/devel/p5-Moose-Autobox/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Autoboxed wrappers for Native Perl datatypes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-autobox>=2.23:${PORTSDIR}/devel/p5-autobox \
-		p5-Moose>=0.42:${PORTSDIR}/devel/p5-Moose \
-		p5-Syntax-Keyword-Junction>=0:${PORTSDIR}/devel/p5-Syntax-Keyword-Junction
+BUILD_DEPENDS=	p5-autobox>=2.23:devel/p5-autobox \
+		p5-Moose>=0.42:devel/p5-Moose \
+		p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.21:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Moose-Policy/Makefile b/devel/p5-Moose-Policy/Makefile
index d45f96f24a94..0436635441b1 100644
--- a/devel/p5-Moose-Policy/Makefile
+++ b/devel/p5-Moose-Policy/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Moose-mounted police
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 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/devel/p5-Moose-Test/Makefile b/devel/p5-Moose-Test/Makefile
index 77f516e5bbf8..dab4ff33bd95 100644
--- a/devel/p5-Moose-Test/Makefile
+++ b/devel/p5-Moose-Test/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test Runner for the Moose test suite
 
-BUILD_DEPENDS=	p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Mouse>=0:devel/p5-Mouse \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index 0944b9bf828f..fca0980fa4e8 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -16,51 +16,51 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 # Do not add p5-Data-Visitor to TEST_DEPENDS to avoid cyclic dependency
-BUILD_DEPENDS=	p5-Class-Load>=0.09:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Load-XS>=0.01:${PORTSDIR}/devel/p5-Class-Load-XS \
-		p5-Data-OptList>=0.107:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-Devel-OverloadInfo>=0.004:${PORTSDIR}/devel/p5-Devel-OverloadInfo \
-		p5-Devel-StackTrace>=1.33:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Eval-Closure>=0.04:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-List-MoreUtils>=0.28:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MRO-Compat>=0.05:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Module-Runtime-Conflicts>=0.002:${PORTSDIR}/devel/p5-Module-Runtime-Conflicts \
-		p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager \
-		p5-Package-Stash>=0.32:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Package-Stash-XS>=0.24:${PORTSDIR}/devel/p5-Package-Stash-XS \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>=0.980:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-Sub-Name>=0.05:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Try-Tiny>=0.17:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Load>=0.09:devel/p5-Class-Load \
+		p5-Class-Load-XS>=0.01:devel/p5-Class-Load-XS \
+		p5-Data-OptList>=0.107:devel/p5-Data-OptList \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-Devel-OverloadInfo>=0.004:devel/p5-Devel-OverloadInfo \
+		p5-Devel-StackTrace>=1.33:devel/p5-Devel-StackTrace \
+		p5-Eval-Closure>=0.04:devel/p5-Eval-Closure \
+		p5-List-MoreUtils>=0.28:lang/p5-List-MoreUtils \
+		p5-MRO-Compat>=0.05:devel/p5-MRO-Compat \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Module-Runtime-Conflicts>=0.002:devel/p5-Module-Runtime-Conflicts \
+		p5-Package-DeprecationManager>=0.10:devel/p5-Package-DeprecationManager \
+		p5-Package-Stash>=0.32:devel/p5-Package-Stash \
+		p5-Package-Stash-XS>=0.24:devel/p5-Package-Stash-XS \
+		p5-Params-Util>=1.00:devel/p5-Params-Util \
+		p5-Sub-Exporter>=0.980:devel/p5-Sub-Exporter \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify \
+		p5-Sub-Name>=0.05:devel/p5-Sub-Name \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Try-Tiny>=0.17:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-Check \
-		p5-DBM-Deep>=0:${PORTSDIR}/databases/p5-DBM-Deep \
-		p5-DateTime-Calendar-Mayan>=0:${PORTSDIR}/devel/p5-DateTime-Calendar-Mayan \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-Declare-Constraints-Simple>=0:${PORTSDIR}/devel/p5-Declare-Constraints-Simple \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Locale-US>=0:${PORTSDIR}/misc/p5-Locale-US \
-		p5-Module-Refresh>=0:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Params-Coerce>=0:${PORTSDIR}/devel/p5-Params-Coerce \
-		p5-Specio>=0:${PORTSDIR}/devel/p5-Specio \
-		p5-SUPER>=0:${PORTSDIR}/devel/p5-SUPER \
-		p5-Test-CleanNamespaces>=0.13:${PORTSDIR}/devel/p5-Test-CleanNamespaces \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-DependentModules>=0:${PORTSDIR}/devel/p5-Test-DependentModules \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
+		p5-DBM-Deep>=0:databases/p5-DBM-Deep \
+		p5-DateTime-Calendar-Mayan>=0:devel/p5-DateTime-Calendar-Mayan \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Locale-US>=0:misc/p5-Locale-US \
+		p5-Module-Refresh>=0:devel/p5-Module-Refresh \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Params-Coerce>=0:devel/p5-Params-Coerce \
+		p5-Specio>=0:devel/p5-Specio \
+		p5-SUPER>=0:devel/p5-SUPER \
+		p5-Test-CleanNamespaces>=0.13:devel/p5-Test-CleanNamespaces \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-DependentModules>=0:devel/p5-Test-DependentModules \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle \
+		p5-Test-Fatal>=0.001:devel/p5-Test-Fatal \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0.05:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings \
+		p5-URI>=0:net/p5-URI
 
 CFLAGS+=	-I.	# mop.h
 MAKE_JOBS_UNSAFE=	yes
@@ -73,8 +73,8 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.35:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.35:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.35:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.35:lang/p5-Scalar-List-Utils
 .endif
 
 post-install:
diff --git a/devel/p5-MooseX-Aliases/Makefile b/devel/p5-MooseX-Aliases/Makefile
index a7b9ad8eb0df..638aec3cf2e6 100644
--- a/devel/p5-MooseX-Aliases/Makefile
+++ b/devel/p5-MooseX-Aliases/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Easy aliasing of methods and attributes in Moose
 
-COMMON_DEPENDS=	p5-Moose>=1.09:${PORTSDIR}/devel/p5-Moose
+COMMON_DEPENDS=	p5-Moose>=1.09:devel/p5-Moose
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-App-Cmd/Makefile b/devel/p5-MooseX-App-Cmd/Makefile
index d3276d942f05..28eac1886f5a 100644
--- a/devel/p5-MooseX-App-Cmd/Makefile
+++ b/devel/p5-MooseX-App-Cmd/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Mashes up MooseX::Getopt and App::Cmd
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0.321:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-NonMoose>=0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0.321:devel/p5-App-Cmd \
+		p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-App/Makefile b/devel/p5-MooseX-App/Makefile
index 8257e76e6acd..1cd3f5c2f7a2 100644
--- a/devel/p5-MooseX-App/Makefile
+++ b/devel/p5-MooseX-App/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Write user-friendly command line apps with even less suffering
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Pod-Elemental>=0:${PORTSDIR}/textproc/p5-Pod-Elemental \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-IO-Interactive>=0:devel/p5-IO-Interactive \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Pod-Elemental>=0:textproc/p5-Pod-Elemental \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-ArrayRef/Makefile b/devel/p5-MooseX-ArrayRef/Makefile
index 421dafa0dea2..a2e75170a03a 100644
--- a/devel/p5-MooseX-ArrayRef/Makefile
+++ b/devel/p5-MooseX-ArrayRef/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Moose blessed array references
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2.00:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=2.00:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Async/Makefile b/devel/p5-MooseX-Async/Makefile
index 6c779a007849..39c205f8d960 100644
--- a/devel/p5-MooseX-Async/Makefile
+++ b/devel/p5-MooseX-Async/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The Orphanange of Asynchronous Love Children
 
-RUN_DEPENDS=	p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0.13:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers
+RUN_DEPENDS=	p5-Moose>=0.56:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0.13:devel/p5-MooseX-AttributeHelpers
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Attribute-Chained/Makefile b/devel/p5-MooseX-Attribute-Chained/Makefile
index b670de0c7241..cb688b0ea1b2 100644
--- a/devel/p5-MooseX-Attribute-Chained/Makefile
+++ b/devel/p5-MooseX-Attribute-Chained/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	p5-MooseX-ChainedAccessors-[0-9]*
diff --git a/devel/p5-MooseX-Attribute-ENV/Makefile b/devel/p5-MooseX-Attribute-ENV/Makefile
index f8a18a1bfcbc..554b760033c2 100644
--- a/devel/p5-MooseX-Attribute-ENV/Makefile
+++ b/devel/p5-MooseX-Attribute-ENV/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Set default of an attribute to a value from %ENV
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.19:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=1.19:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-AttributeHelpers/Makefile b/devel/p5-MooseX-AttributeHelpers/Makefile
index f30f68640281..72bdc138715b 100644
--- a/devel/p5-MooseX-AttributeHelpers/Makefile
+++ b/devel/p5-MooseX-AttributeHelpers/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Extend your attribute interfaces
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.56:devel/p5-Moose
 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
 
 DEPRECATED=	Functionality is now a part of p5-Moose (Moose::Meta::Attribute::Native). Do not use for new projects
 
diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile
index 16d13008ce53..a256461e2628 100644
--- a/devel/p5-MooseX-AttributeShortcuts/Makefile
+++ b/devel/p5-MooseX-AttributeShortcuts/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Shorthand for common attribute options
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+		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/devel/p5-MooseX-AuthorizedMethods/Makefile b/devel/p5-MooseX-AuthorizedMethods/Makefile
index 6e2fccfb5c1c..3adbd1d43a82 100644
--- a/devel/p5-MooseX-AuthorizedMethods/Makefile
+++ b/devel/p5-MooseX-AuthorizedMethods/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Syntax sugar for authorized methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.21:${PORTSDIR}/devel/p5-Moose \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+BUILD_DEPENDS=	p5-Moose>=1.21:devel/p5-Moose \
+		p5-aliased>=0:devel/p5-aliased
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-ClassAttribute/Makefile b/devel/p5-MooseX-ClassAttribute/Makefile
index 4f98f353d304..f4d19a389f9c 100644
--- a/devel/p5-MooseX-ClassAttribute/Makefile
+++ b/devel/p5-MooseX-ClassAttribute/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Declare class attributes Moose-style
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.11:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-namespace-autoclean>=0.11:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Role-Strict>=0:${PORTSDIR}/devel/p5-MooseX-Role-Strict \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Role-Strict>=0:devel/p5-MooseX-Role-Strict \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Clone/Makefile b/devel/p5-MooseX-Clone/Makefile
index b2d701e54520..ed8c771ddd6a 100644
--- a/devel/p5-MooseX-Clone/Makefile
+++ b/devel/p5-MooseX-Clone/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Fine grained cloning support for Moose objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Data-Visitor>=0.24:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-Data-Visitor>=0.24:devel/p5-Data-Visitor \
+		p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-CompileTime-Traits/Makefile b/devel/p5-MooseX-CompileTime-Traits/Makefile
index d00e394df306..b3434c2540d2 100644
--- a/devel/p5-MooseX-CompileTime-Traits/Makefile
+++ b/devel/p5-MooseX-CompileTime-Traits/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to allow compile time traits for classes/roles
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-ConfigFromFile/Makefile b/devel/p5-MooseX-ConfigFromFile/Makefile
index 4a6930b623da..51af971b6813 100644
--- a/devel/p5-MooseX-ConfigFromFile/Makefile
+++ b/devel/p5-MooseX-ConfigFromFile/Makefile
@@ -13,18 +13,18 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Types>=0.19:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Path-Tiny>=0.005:${PORTSDIR}/devel/p5-MooseX-Types-Path-Tiny \
-	p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-Types>=0.19:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Path-Tiny>=0.005:devel/p5-MooseX-Types-Path-Tiny \
+	p5-namespace-autoclean>0:devel/p5-namespace-autoclean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-CheckDeps>=0.006:${PORTSDIR}/devel/p5-Test-CheckDeps \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Test-NoWarnings>=1.04:${PORTSDIR}/devel/p5-Test-NoWarnings \
-	p5-Test-Without-Module>0:${PORTSDIR}/devel/p5-Test-Without-Module \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+	p5-Test-CheckDeps>=0.006:devel/p5-Test-CheckDeps \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+	p5-Test-NoWarnings>=1.04:devel/p5-Test-NoWarnings \
+	p5-Test-Without-Module>0:devel/p5-Test-Without-Module \
+	p5-Test-Deep>0:devel/p5-Test-Deep
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Daemonize/Makefile b/devel/p5-MooseX-Daemonize/Makefile
index 86de873786e1..3d0bd4755847 100644
--- a/devel/p5-MooseX-Daemonize/Makefile
+++ b/devel/p5-MooseX-Daemonize/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Role for daemonizing your Moose based application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.33:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0.07:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Moose>=0.33:devel/p5-Moose \
+		p5-MooseX-Getopt>=0.07:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
-BUILD_DEPENDS+=	p5-Devel-CheckOS>=1.63:${PORTSDIR}/devel/p5-Devel-CheckOS
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
+BUILD_DEPENDS+=	p5-Devel-CheckOS>=1.63:devel/p5-Devel-CheckOS
 
 DEPRECATED=	Deprecated by upstream, use devel/p5-Daemon-Control instead
 
diff --git a/devel/p5-MooseX-Declare/Makefile b/devel/p5-MooseX-Declare/Makefile
index 69d2c88b0024..c75a60201f99 100644
--- a/devel/p5-MooseX-Declare/Makefile
+++ b/devel/p5-MooseX-Declare/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Declarative syntax for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Method-Signatures>=0.36:${PORTSDIR}/devel/p5-MooseX-Method-Signatures \
-		p5-MooseX-Role-Parameterized>=0.12:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-MooseX-Types>=0.20:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Parse-Method-Signatures>=0:${PORTSDIR}/devel/p5-Parse-Method-Signatures \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0.16:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0.90:devel/p5-Moose \
+		p5-MooseX-Method-Signatures>=0.36:devel/p5-MooseX-Method-Signatures \
+		p5-MooseX-Role-Parameterized>=0.12:devel/p5-MooseX-Role-Parameterized \
+		p5-MooseX-Types>=0.20:devel/p5-MooseX-Types \
+		p5-Parse-Method-Signatures>=0:devel/p5-Parse-Method-Signatures \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 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
 
 DEPRECATED=	Deprecated by upstream
 
diff --git a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
index cbb79b8f1bd2..21971bb7a5a2 100644
--- a/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
+++ b/devel/p5-MooseX-Emulate-Class-Accessor-Fast/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Emulate Class::Accessor::Fast behavior using Moose attributes
 
-BUILD_DEPENDS=	p5-Moose>=0.84:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=0.84:devel/p5-Moose \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-FollowPBP/Makefile b/devel/p5-MooseX-FollowPBP/Makefile
index 6d111d7e2605..a4283ad6d9b0 100644
--- a/devel/p5-MooseX-FollowPBP/Makefile
+++ b/devel/p5-MooseX-FollowPBP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Name your accessors get_foo() and set_foo()
 
-BUILD_DEPENDS=	p5-Moose>=1.16:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=1.16:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	ART20
diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile
index d6686775397f..e0fbef20ce53 100644
--- a/devel/p5-MooseX-Getopt/Makefile
+++ b/devel/p5-MooseX-Getopt/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Moose role for processing command line options
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.081:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-Moose>=0.56:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0.081:devel/p5-Getopt-Long-Descriptive \
+		p5-Moose>=0.56:devel/p5-Moose \
+		p5-MooseX-ConfigFromFile>=0:devel/p5-MooseX-ConfigFromFile \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-SimpleConfig>=0.07:${PORTSDIR}/devel/p5-MooseX-SimpleConfig \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Path-Tiny>=0.009:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-MooseX-SimpleConfig>=0.07:devel/p5-MooseX-SimpleConfig \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Path-Tiny>=0.009:devel/p5-Path-Tiny \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Has-Options/Makefile b/devel/p5-MooseX-Has-Options/Makefile
index 5702ae8cf455..ce8cd3a50dce 100644
--- a/devel/p5-MooseX-Has-Options/Makefile
+++ b/devel/p5-MooseX-Has-Options/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MooseX::Has::Options - Succinct options for Moose
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Package-Stash>=0.18:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-String-RewritePrefix>=0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Package-Stash>=0.18:devel/p5-Package-Stash \
+		p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 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/devel/p5-MooseX-Has-Sugar/Makefile b/devel/p5-MooseX-Has-Sugar/Makefile
index ff0bd4ec950f..c214e1f9f8fb 100644
--- a/devel/p5-MooseX-Has-Sugar/Makefile
+++ b/devel/p5-MooseX-Has-Sugar/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Sugar Syntax for moose has fields
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Types>=0.44:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+TEST_DEPENDS=	p5-MooseX-Types>=0.44:devel/p5-MooseX-Types \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-HasDefaults/Makefile b/devel/p5-MooseX-HasDefaults/Makefile
index 3efb94a910e5..8ed31767859d 100644
--- a/devel/p5-MooseX-HasDefaults/Makefile
+++ b/devel/p5-MooseX-HasDefaults/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Default "is" to "ro" or "rw" for all attributes
 
-BUILD_DEPENDS=	p5-Moose>2:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Moose>2:devel/p5-Moose \
+		p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-IOC/Makefile b/devel/p5-MooseX-IOC/Makefile
index 24129c12a87d..a6c36676f82a 100644
--- a/devel/p5-MooseX-IOC/Makefile
+++ b/devel/p5-MooseX-IOC/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Moose attributes with IOC integration
 
-BUILD_DEPENDS=	p5-IOC>=0:${PORTSDIR}/devel/p5-IOC \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
-RUN_DEPENDS=	p5-IOC>=0:${PORTSDIR}/devel/p5-IOC \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-IOC>=0:devel/p5-IOC \
+		p5-Moose>=0:devel/p5-Moose
+RUN_DEPENDS=	p5-IOC>=0:devel/p5-IOC \
+		p5-Moose>=0:devel/p5-Moose
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-InsideOut/Makefile b/devel/p5-MooseX-InsideOut/Makefile
index e46e7deb2194..71e1438ef1e1 100644
--- a/devel/p5-MooseX-InsideOut/Makefile
+++ b/devel/p5-MooseX-InsideOut/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Inside-out objects with Moose
 
-BUILD_DEPENDS=	p5-Hash-Util-FieldHash-Compat>=0:${PORTSDIR}/devel/p5-Hash-Util-FieldHash-Compat \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-clean>=0.11:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Hash-Util-FieldHash-Compat>=0:devel/p5-Hash-Util-FieldHash-Compat \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-namespace-clean>=0.11:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-LazyRequire/Makefile b/devel/p5-MooseX-LazyRequire/Makefile
index 190b6eef221e..4f39f2715d76 100644
--- a/devel/p5-MooseX-LazyRequire/Makefile
+++ b/devel/p5-MooseX-LazyRequire/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Required attributes which fail only when trying to use them
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-aliased>=0.30:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose \
+		p5-aliased>=0.30:devel/p5-aliased \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Lists/Makefile b/devel/p5-MooseX-Lists/Makefile
index 3789124b90a5..4a83e72537f7 100644
--- a/devel/p5-MooseX-Lists/Makefile
+++ b/devel/p5-MooseX-Lists/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Treat arrays and hashes as lists
 
-RUN_DEPENDS=	p5-Moose>=0.93:${PORTSDIR}/devel/p5-Moose
+RUN_DEPENDS=	p5-Moose>=0.93:devel/p5-Moose
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Log-Log4perl/Makefile b/devel/p5-MooseX-Log-Log4perl/Makefile
index 6fdf932d0f0e..b0584878fae3 100644
--- a/devel/p5-MooseX-Log-Log4perl/Makefile
+++ b/devel/p5-MooseX-Log-Log4perl/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Logging role for Moose based on Log::Log4perl
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.12:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Log-Log4perl>=1.13:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Any-Moose>=0.12:devel/p5-Any-Moose \
+		p5-Log-Log4perl>=1.13:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Moose>=0.65:${PORTSDIR}/devel/p5-Moose
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Moose>=0.65:devel/p5-Moose
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-MarkAsMethods/Makefile b/devel/p5-MooseX-MarkAsMethods/Makefile
index 3304e5a09633..c19ede1aa142 100644
--- a/devel/p5-MooseX-MarkAsMethods/Makefile
+++ b/devel/p5-MooseX-MarkAsMethods/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Mark overload code symbols as methods
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0.12:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
+		p5-Moose>=0.94:devel/p5-Moose \
+		p5-namespace-autoclean>=0.12:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
index 559716aff0ee..4921e579cda2 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Force coercion when validating type constraints
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile b/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
index bc1041876d48..a69807fa4669 100644
--- a/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
+++ b/devel/p5-MooseX-Meta-TypeConstraint-Mooish/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Translate Moo-style constraints to Moose-style
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-autoclean>=0.24:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-autoclean>=0.24:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Moose-More>=0.028:${PORTSDIR}/devel/p5-Test-Moose-More \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+TEST_DEPENDS=	p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Moose-More>=0.028:devel/p5-Test-Moose-More \
+		p5-aliased>=0:devel/p5-aliased
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-MetaDescription/Makefile b/devel/p5-MooseX-MetaDescription/Makefile
index 561a2327c2f5..dc84d7971976 100644
--- a/devel/p5-MooseX-MetaDescription/Makefile
+++ b/devel/p5-MooseX-MetaDescription/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Framework for adding additional metadata to Moose classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.4:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.4:devel/p5-Moose
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MooseX-Method-Signatures/Makefile b/devel/p5-MooseX-Method-Signatures/Makefile
index 39c0b6244a99..3d4ebda30d1e 100644
--- a/devel/p5-MooseX-Method-Signatures/Makefile
+++ b/devel/p5-MooseX-Method-Signatures/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Method declarations with type constraints and no source filter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.10:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Context-Preserve>=0:${PORTSDIR}/devel/p5-Context-Preserve \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-LazyRequire>=0.06:${PORTSDIR}/devel/p5-MooseX-LazyRequire \
-		p5-MooseX-Meta-TypeConstraint-ForceCoercion>=0:${PORTSDIR}/devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion \
-		p5-MooseX-Types>=0.35:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Structured>=0.24:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-Parse-Method-Signatures>=1.003014:${PORTSDIR}/devel/p5-Parse-Method-Signatures \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.10:devel/p5-B-Hooks-EndOfScope \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-Context-Preserve>=0:devel/p5-Context-Preserve \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Moose>=0.89:devel/p5-Moose \
+		p5-MooseX-LazyRequire>=0.06:devel/p5-MooseX-LazyRequire \
+		p5-MooseX-Meta-TypeConstraint-ForceCoercion>=0:devel/p5-MooseX-Meta-TypeConstraint-ForceCoercion \
+		p5-MooseX-Types>=0.35:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Structured>=0.24:devel/p5-MooseX-Types-Structured \
+		p5-Parse-Method-Signatures>=1.003014:devel/p5-Parse-Method-Signatures \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Eval-Closure>=0:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Eval-Closure>=0:devel/p5-Eval-Closure \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-MethodAttributes/Makefile b/devel/p5-MooseX-MethodAttributes/Makefile
index cab79d36af9e..cc1dee5587ae 100644
--- a/devel/p5-MooseX-MethodAttributes/Makefile
+++ b/devel/p5-MooseX-MethodAttributes/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Code attribute introspection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.98:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.21:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0.98:devel/p5-Moose \
+		p5-MooseX-Types>=0.21:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-MultiInitArg/Makefile b/devel/p5-MooseX-MultiInitArg/Makefile
index 1ef15f94c5b7..4193d76314e3 100644
--- a/devel/p5-MooseX-MultiInitArg/Makefile
+++ b/devel/p5-MooseX-MultiInitArg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Attributes with aliases for constructor arguments for MooseX
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-MultiMethods/Makefile b/devel/p5-MooseX-MultiMethods/Makefile
index c0ae3d816da1..cf15a31e3670 100644
--- a/devel/p5-MooseX-MultiMethods/Makefile
+++ b/devel/p5-MooseX-MultiMethods/Makefile
@@ -11,15 +11,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Multi Method Dispatch based on Moose type constraints
 
-RUN_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-aliased>0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-Devel-Declare>=0.004000:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-MooseX-Types-VariantTable>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-VariantTable \
-		p5-MooseX-Method-Signatures>=0.29:${PORTSDIR}/devel/p5-MooseX-Method-Signatures \
-		p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types
+RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-aliased>0:devel/p5-aliased \
+		p5-namespace-autoclean>0:devel/p5-namespace-autoclean \
+		p5-Devel-Declare>=0.004000:devel/p5-Devel-Declare \
+		p5-MooseX-Types-VariantTable>=0.03:devel/p5-MooseX-Types-VariantTable \
+		p5-MooseX-Method-Signatures>=0.29:devel/p5-MooseX-Method-Signatures \
+		p5-MooseX-Types>0:devel/p5-MooseX-Types
 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/devel/p5-MooseX-NonMoose/Makefile b/devel/p5-MooseX-NonMoose/Makefile
index 474612690ba5..d1b7c4e49fa4 100644
--- a/devel/p5-MooseX-NonMoose/Makefile
+++ b/devel/p5-MooseX-NonMoose/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Easy subclassing of non-Moose classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-InsideOut>=0:${PORTSDIR}/devel/p5-MooseX-InsideOut \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-MooseX-InsideOut>=0:devel/p5-MooseX-InsideOut \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Object-Pluggable/Makefile b/devel/p5-MooseX-Object-Pluggable/Makefile
index d83d9e393ba7..d2b415c7b64c 100644
--- a/devel/p5-MooseX-Object-Pluggable/Makefile
+++ b/devel/p5-MooseX-Object-Pluggable/Makefile
@@ -15,13 +15,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-OneArgNew/Makefile b/devel/p5-MooseX-OneArgNew/Makefile
index f671b678ec36..575fc815fead 100644
--- a/devel/p5-MooseX-OneArgNew/Makefile
+++ b/devel/p5-MooseX-OneArgNew/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=1.01:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=1.01:devel/p5-MooseX-Role-Parameterized \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-MooseX-POE/Makefile b/devel/p5-MooseX-POE/Makefile
index c03c5a868aa7..7fe9238ebdcb 100644
--- a/devel/p5-MooseX-POE/Makefile
+++ b/devel/p5-MooseX-POE/Makefile
@@ -14,13 +14,13 @@ COMMENT=	The Illicit Love Child of Moose and POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2.0002:${PORTSDIR}/devel/p5-Moose \
-		p5-POE>=1.310:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Moose>=2.0002:devel/p5-Moose \
+		p5-POE>=1.310:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-MooseX-Daemonize>=0:${PORTSDIR}/devel/p5-MooseX-Daemonize \
-		p5-MooseX-Declare>=0:${PORTSDIR}/devel/p5-MooseX-Declare \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-MooseX-Daemonize>=0:devel/p5-MooseX-Daemonize \
+		p5-MooseX-Declare>=0:devel/p5-MooseX-Declare \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Params-Validate/Makefile b/devel/p5-MooseX-Params-Validate/Makefile
index 676b8622ba1c..9c2d3a814001 100644
--- a/devel/p5-MooseX-Params-Validate/Makefile
+++ b/devel/p5-MooseX-Params-Validate/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Extension of Params::Validate for using Moose types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Moose>=0.58:${PORTSDIR}/devel/p5-Moose \
-		p5-Params-Validate>=0.88:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+		p5-Moose>=0.58:devel/p5-Moose \
+		p5-Params-Validate>=0.88:devel/p5-Params-Validate \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-RelatedClassRoles/Makefile b/devel/p5-MooseX-RelatedClassRoles/Makefile
index b687f255c45b..79b0eb2be3d2 100644
--- a/devel/p5-MooseX-RelatedClassRoles/Makefile
+++ b/devel/p5-MooseX-RelatedClassRoles/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Apply roles to a class related to yours
 
-BUILD_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0.04:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0.04:devel/p5-MooseX-Role-Parameterized
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Role-Loggable/Makefile b/devel/p5-MooseX-Role-Loggable/Makefile
index 961921381b7c..102b429a4816 100644
--- a/devel/p5-MooseX-Role-Loggable/Makefile
+++ b/devel/p5-MooseX-Role-Loggable/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Extensive, yet simple, logging role using Log::Dispatchouli
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Dispatchouli>=0:${PORTSDIR}/devel/p5-Log-Dispatchouli \
-		p5-Moo>=1.000001:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Sys-Syslog>=0.25:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-namespace-sweep>=0:${PORTSDIR}/devel/p5-namespace-sweep
+BUILD_DEPENDS=	p5-Log-Dispatchouli>=0:devel/p5-Log-Dispatchouli \
+		p5-Moo>=1.000001:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Sys-Syslog>=0.25:sysutils/p5-Sys-Syslog \
+		p5-namespace-sweep>=0:devel/p5-namespace-sweep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Role-Matcher/Makefile b/devel/p5-MooseX-Role-Matcher/Makefile
index 34f85752b306..06350afa7edd 100644
--- a/devel/p5-MooseX-Role-Matcher/Makefile
+++ b/devel/p5-MooseX-Role-Matcher/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Generic object matching based on attributes and methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MooseX-Role-Parameterized>=0.03:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-MooseX-Role-Parameterized>=0.03:devel/p5-MooseX-Role-Parameterized
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MooseX-Role-Parameterized/Makefile b/devel/p5-MooseX-Role-Parameterized/Makefile
index 0bfab5b85c79..3c434f062610 100644
--- a/devel/p5-MooseX-Role-Parameterized/Makefile
+++ b/devel/p5-MooseX-Role-Parameterized/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Roles with composition parameters
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=2.0300:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=2.0300:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Role-Strict/Makefile b/devel/p5-MooseX-Role-Strict/Makefile
index 828b9c4906f7..48bf72cd0d83 100644
--- a/devel/p5-MooseX-Role-Strict/Makefile
+++ b/devel/p5-MooseX-Role-Strict/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Use strict 'roles'
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.89:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.89:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Role-WithOverloading/Makefile b/devel/p5-MooseX-Role-WithOverloading/Makefile
index e172647ddfe7..3befa936d315 100644
--- a/devel/p5-MooseX-Role-WithOverloading/Makefile
+++ b/devel/p5-MooseX-Role-WithOverloading/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Roles which support overloading
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.15:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0.16:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=1.15:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 DEPRECATED=	deprecated by upstream (obsolete with modern Moose)
diff --git a/devel/p5-MooseX-Runnable/Makefile b/devel/p5-MooseX-Runnable/Makefile
index 9550b75a7ce0..00362389eb91 100644
--- a/devel/p5-MooseX-Runnable/Makefile
+++ b/devel/p5-MooseX-Runnable/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Tag a class as a runnable application
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-SomeUtils>=0:${PORTSDIR}/devel/p5-List-SomeUtils \
-		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-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-List-SomeUtils>=0:devel/p5-List-SomeUtils \
+		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-Params-Util>=0:devel/p5-Params-Util \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-TableDriven>=0:${PORTSDIR}/devel/p5-Test-TableDriven
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-TableDriven>=0:devel/p5-Test-TableDriven
 
 NO_ARCH=	yes
 USE_PERL5=	modbuildtiny
@@ -33,7 +33,7 @@ USES=		perl5
 .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/devel/p5-MooseX-SemiAffordanceAccessor/Makefile b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
index f413f4c6e4c3..8c8fedb81aa3 100644
--- a/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
+++ b/devel/p5-MooseX-SemiAffordanceAccessor/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Name your accessors foo() and set_foo()
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-SetOnce/Makefile b/devel/p5-MooseX-SetOnce/Makefile
index 4ec15ca371d2..f733e9c6e653 100644
--- a/devel/p5-MooseX-SetOnce/Makefile
+++ b/devel/p5-MooseX-SetOnce/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Write-once, read-many attributes for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.90:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.90:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-SimpleConfig/Makefile b/devel/p5-MooseX-SimpleConfig/Makefile
index a5c981c8af49..4ac8943ca9a7 100644
--- a/devel/p5-MooseX-SimpleConfig/Makefile
+++ b/devel/p5-MooseX-SimpleConfig/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Moose role for setting attributes from a simple configfile
 
-RUN_DEPENDS=	p5-Moose>=0.35:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-ConfigFromFile>=0.02:${PORTSDIR}/devel/p5-MooseX-ConfigFromFile \
-		p5-Config-Any>=0.13:${PORTSDIR}/devel/p5-Config-Any
+RUN_DEPENDS=	p5-Moose>=0.35:devel/p5-Moose \
+		p5-MooseX-ConfigFromFile>=0.02:devel/p5-MooseX-ConfigFromFile \
+		p5-Config-Any>=0.13:devel/p5-Config-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Singleton/Makefile b/devel/p5-MooseX-Singleton/Makefile
index 73b1e0aadf8a..44d11032652f 100644
--- a/devel/p5-MooseX-Singleton/Makefile
+++ b/devel/p5-MooseX-Singleton/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Turn Moose class into a singleton
 
-BUILD_DEPENDS=	p5-Moose>=1.10:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=1.10:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-MooseX-StrictConstructor>=0:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-NoWarnings>=0.01:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warn>=0.01:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-MooseX-StrictConstructor>=0:devel/p5-MooseX-StrictConstructor \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-NoWarnings>=0.01:devel/p5-Test-NoWarnings \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warn>=0.01:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Storage/Makefile b/devel/p5-MooseX-Storage/Makefile
index b9a141f12ac9..0a0b4dd52b33 100644
--- a/devel/p5-MooseX-Storage/Makefile
+++ b/devel/p5-MooseX-Storage/Makefile
@@ -13,21 +13,21 @@ COMMENT=	Serialization framework for Moose classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-MaybeXS>=1.001000:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Moose>=0.99:${PORTSDIR}/devel/p5-Moose \
-		p5-String-RewritePrefix>=0.004:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-JSON-MaybeXS>=1.001000:converters/p5-JSON-MaybeXS \
+		p5-Moose>=0.99:devel/p5-Moose \
+		p5-String-RewritePrefix>=0.004:textproc/p5-String-RewritePrefix \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-JSON>=0.06:${PORTSDIR}/devel/p5-Test-JSON \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-JSON>=0.06:devel/p5-Test-JSON \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Without-Module>=0:devel/p5-Test-Without-Module \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-StrictConstructor/Makefile b/devel/p5-MooseX-StrictConstructor/Makefile
index ce0a9bcd9ee9..f56c9f4064bf 100644
--- a/devel/p5-MooseX-StrictConstructor/Makefile
+++ b/devel/p5-MooseX-StrictConstructor/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Make your MooseX object constructors blow up on unknown attributes
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Traits-Pluggable/Makefile b/devel/p5-MooseX-Traits-Pluggable/Makefile
index aba4daece7a6..44ec3cf959a9 100644
--- a/devel/p5-MooseX-Traits-Pluggable/Makefile
+++ b/devel/p5-MooseX-Traits-Pluggable/Makefile
@@ -15,12 +15,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	\
-	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-	p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+	p5-Moose>=0:devel/p5-Moose \
+	p5-Class-Load>=0:devel/p5-Class-Load \
+	p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 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/devel/p5-MooseX-Traits/Makefile b/devel/p5-MooseX-Traits/Makefile
index c34f4fa6819b..60976fd0d44f 100644
--- a/devel/p5-MooseX-Traits/Makefile
+++ b/devel/p5-MooseX-Traits/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Moose eXtension to automatically apply roles at object creation time
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
@@ -29,7 +29,7 @@ USE_PERL5=	modbuildtiny
 .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/devel/p5-MooseX-TransactionalMethods/Makefile b/devel/p5-MooseX-TransactionalMethods/Makefile
index 24190d8e6fca..7505fb703145 100644
--- a/devel/p5-MooseX-TransactionalMethods/Makefile
+++ b/devel/p5-MooseX-TransactionalMethods/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Syntax sugar for transactional methods
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=1.21:${PORTSDIR}/devel/p5-Moose \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased
+BUILD_DEPENDS=	p5-Moose>=1.21:devel/p5-Moose \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-aliased>=0:devel/p5-aliased
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-Common/Makefile b/devel/p5-MooseX-Types-Common/Makefile
index 3ccba3e4d5cb..c2ef387d2b97 100644
--- a/devel/p5-MooseX-Types-Common/Makefile
+++ b/devel/p5-MooseX-Types-Common/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Set of commonly-used type constraints that do not ship with p5-Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.39:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-Moose>=0.39:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warnings>=0.005:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Warnings>=0.005:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
index 81313ea7df08..2e1cde2b02b9 100644
--- a/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-ButMaintained/Makefile
@@ -14,15 +14,15 @@ COMMENT=	DateTime related constraints and coercions for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.43:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0.40:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-TimeZone>=0.96:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Olson-Abbreviations>=0.03:${PORTSDIR}/devel/p5-Olson-Abbreviations \
-		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTime>=0.43:devel/p5-DateTime \
+		p5-DateTime-Locale>=0.40:devel/p5-DateTime-Locale \
+		p5-DateTime-TimeZone>=0.96:devel/p5-DateTime-TimeZone \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-Olson-Abbreviations>=0.03:devel/p5-Olson-Abbreviations \
+		p5-namespace-clean>=0.08:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.27:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.27:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
@@ -31,7 +31,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/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
index 943ebf893c5f..4fe69d1f0b2a 100644
--- a/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MoreCoercions/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Extensions to MooseX::Types::DateTime
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTimeX-Easy>=0.085:${PORTSDIR}/devel/p5-DateTimeX-Easy \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-DateTime>=0.06:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTime>=0.43.02:devel/p5-DateTime \
+		p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-MooseX-Types-DateTime>=0.06:devel/p5-MooseX-Types-DateTime \
+		p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 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
 USE_PERL5=	modbuildtiny
@@ -30,7 +30,7 @@ USES=		perl5
 .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/devel/p5-MooseX-Types-DateTime-MySQL/Makefile b/devel/p5-MooseX-Types-DateTime-MySQL/Makefile
index 20b780236fce..13d9240003f2 100644
--- a/devel/p5-MooseX-Types-DateTime-MySQL/Makefile
+++ b/devel/p5-MooseX-Types-DateTime-MySQL/Makefile
@@ -9,16 +9,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	MySQL datetime type constraints and coercions
 
-RUN_DEPENDS=	p5-DateTime>=0.03:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Duration>=1.03:${PORTSDIR}/devel/p5-DateTime-Format-Duration \
-		p5-DateTime-Format-MySQL>=0:${PORTSDIR}/devel/p5-DateTime-Format-MySQL \
-		p5-Moose>=0.79:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-DateTime>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-namespace-clean>=0.05:${PORTSDIR}/devel/p5-namespace-clean
+RUN_DEPENDS=	p5-DateTime>=0.03:devel/p5-DateTime \
+		p5-DateTime-Format-Duration>=1.03:devel/p5-DateTime-Format-Duration \
+		p5-DateTime-Format-MySQL>=0:devel/p5-DateTime-Format-MySQL \
+		p5-Moose>=0.79:devel/p5-Moose \
+		p5-MooseX-Types-DateTime>=0.03:devel/p5-MooseX-Types-DateTime \
+		p5-namespace-clean>=0.05:devel/p5-namespace-clean
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-#TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-#		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+#TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+#		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-DateTime/Makefile b/devel/p5-MooseX-Types-DateTime/Makefile
index 26273a82cb0b..e8370a5398b8 100644
--- a/devel/p5-MooseX-Types-DateTime/Makefile
+++ b/devel/p5-MooseX-Types-DateTime/Makefile
@@ -14,14 +14,14 @@ COMMENT=	DateTime related constraints and coercions for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Locale>=0.40.01:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-TimeZone>=0.95:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.30:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTime>=0.43.02:devel/p5-DateTime \
+		p5-DateTime-Locale>=0.40.01:devel/p5-DateTime-Locale \
+		p5-DateTime-TimeZone>=0.95:devel/p5-DateTime-TimeZone \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.30:devel/p5-MooseX-Types \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 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
 USE_PERL5=	modbuildtiny
@@ -30,7 +30,7 @@ USES=		perl5
 .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/devel/p5-MooseX-Types-DateTimeX/Makefile b/devel/p5-MooseX-Types-DateTimeX/Makefile
index 0b7efd07d561..91bbbe95b128 100644
--- a/devel/p5-MooseX-Types-DateTimeX/Makefile
+++ b/devel/p5-MooseX-Types-DateTimeX/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Extensions to MooseX::Types::DateTime::ButMaintained
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTimeX-Easy>=0.085:${PORTSDIR}/devel/p5-DateTimeX-Easy \
-		p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-DateTime-ButMaintained>=0.04:${PORTSDIR}/devel/p5-MooseX-Types-DateTime-ButMaintained \
-		p5-Time-Duration-Parse>=0.06:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-DateTimeX-Easy>=0.085:devel/p5-DateTimeX-Easy \
+		p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-MooseX-Types-DateTime-ButMaintained>=0.04:devel/p5-MooseX-Types-DateTime-ButMaintained \
+		p5-Time-Duration-Parse>=0.06:devel/p5-Time-Duration-Parse \
+		p5-namespace-clean>=0.08:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Types-ISO8601/Makefile b/devel/p5-MooseX-Types-ISO8601/Makefile
index 01705abb6b5b..58273edff82e 100644
--- a/devel/p5-MooseX-Types-ISO8601/Makefile
+++ b/devel/p5-MooseX-Types-ISO8601/Makefile
@@ -9,19 +9,19 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	ISO8601 date and duration string type constraints and coercions
 
-RUN_DEPENDS=	p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-DateTime>=0.03:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Duration>=1.03:${PORTSDIR}/devel/p5-DateTime-Format-Duration \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Moose>=0.79:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-DateTime>=0.03:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-MooseX-Types-DateTime-MySQL>=0:${PORTSDIR}/devel/p5-MooseX-Types-DateTime-MySQL \
-		p5-namespace-clean>=0.05:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-Safe-Isa>=0:${PORTSDIR}/devel/p5-Safe-Isa \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+RUN_DEPENDS=	p5-aliased>=0:devel/p5-aliased \
+		p5-DateTime>=0.03:devel/p5-DateTime \
+		p5-DateTime-Format-Duration>=1.03:devel/p5-DateTime-Format-Duration \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-Moose>=0.79:devel/p5-Moose \
+		p5-MooseX-Types-DateTime>=0.03:devel/p5-MooseX-Types-DateTime \
+		p5-MooseX-Types-DateTime-MySQL>=0:devel/p5-MooseX-Types-DateTime-MySQL \
+		p5-namespace-clean>=0.05:devel/p5-namespace-clean \
+		p5-Safe-Isa>=0:devel/p5-Safe-Isa \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-JSON/Makefile b/devel/p5-MooseX-Types-JSON/Makefile
index 09aab35fa0c5..7ebb5cf28ab0 100644
--- a/devel/p5-MooseX-Types-JSON/Makefile
+++ b/devel/p5-MooseX-Types-JSON/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-JSON>=2.00:${PORTSDIR}/converters/p5-JSON \
-		p5-Moose>=0.82:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.15:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-JSON>=2.00:converters/p5-JSON \
+		p5-Moose>=0.82:devel/p5-Moose \
+		p5-MooseX-Types>=0.15:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.00:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-MooseX-Types-LoadableClass/Makefile b/devel/p5-MooseX-Types-LoadableClass/Makefile
index e050b53ab3e9..7ac5a0918b33 100644
--- a/devel/p5-MooseX-Types-LoadableClass/Makefile
+++ b/devel/p5-MooseX-Types-LoadableClass/Makefile
@@ -13,13 +13,13 @@ COMMENT=	ClassName type constraint with coercion to load the class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.42:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+RUN_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0.42:devel/p5-MooseX-Types \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile
index dbc27a0a7680..015996549960 100644
--- a/devel/p5-MooseX-Types-Path-Class/Makefile
+++ b/devel/p5-MooseX-Types-Path-Class/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Path::Class type library for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-Types>=0.04:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0.16:${PORTSDIR}/devel/p5-Path-Class
+RUN_DEPENDS=	p5-Moose>=2:devel/p5-Moose \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-Types>=0.04:devel/p5-MooseX-Types \
+		p5-Path-Class>=0.16:devel/p5-Path-Class
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-MooseX-Types-Path-Tiny/Makefile b/devel/p5-MooseX-Types-Path-Tiny/Makefile
index f42d74d360ab..1eb15b47a137 100644
--- a/devel/p5-MooseX-Types-Path-Tiny/Makefile
+++ b/devel/p5-MooseX-Types-Path-Tiny/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl extension of Path::Tiny types and coercions for Moose
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Stringlike>=0:${PORTSDIR}/devel/p5-MooseX-Types-Stringlike \
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny
+	p5-Moose>=2:devel/p5-Moose \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Stringlike>=0:devel/p5-MooseX-Types-Stringlike \
+	p5-Path-Tiny>0:devel/p5-Path-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd \
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
+	p5-File-pushd>0:devel/p5-File-pushd \
+	p5-Test-Fatal>0:devel/p5-Test-Fatal
 
 USES=	perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-MooseX-Types-Perl/Makefile b/devel/p5-MooseX-Types-Perl/Makefile
index 7f5509ced239..8f5622ec57c8 100644
--- a/devel/p5-MooseX-Types-Perl/Makefile
+++ b/devel/p5-MooseX-Types-Perl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Moose types that check against Perl syntax
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Params-Util>=0:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-PortNumber/Makefile b/devel/p5-MooseX-Types-PortNumber/Makefile
index 74badb1abba3..4db8357fbb19 100644
--- a/devel/p5-MooseX-Types-PortNumber/Makefile
+++ b/devel/p5-MooseX-Types-PortNumber/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Port number type for Moose classes by the IANA
 
-BUILD_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-RUN_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
+RUN_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ regression-test: build
 .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/devel/p5-MooseX-Types-Set-Object/Makefile b/devel/p5-MooseX-Types-Set-Object/Makefile
index 4fed07b6a032..64bfd6252628 100644
--- a/devel/p5-MooseX-Types-Set-Object/Makefile
+++ b/devel/p5-MooseX-Types-Set-Object/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Set::Object type with coercions and stuff
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.50:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Set-Object>=0:${PORTSDIR}/devel/p5-Set-Object
+BUILD_DEPENDS=	p5-Moose>=0.50:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Set-Object>=0:devel/p5-Set-Object
 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
 USE_PERL5=	modbuildtiny
@@ -26,7 +26,7 @@ USES=		perl5
 .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/devel/p5-MooseX-Types-Signal/Makefile b/devel/p5-MooseX-Types-Signal/Makefile
index 19b5db4dc958..811a8c4d36f3 100644
--- a/devel/p5-MooseX-Types-Signal/Makefile
+++ b/devel/p5-MooseX-Types-Signal/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Type to represent valid UNIX or Perl signals
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types
+BUILD_DEPENDS=	p5-MooseX-Types>0:devel/p5-MooseX-Types
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception \
+		p5-Moose>0:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MooseX-Types-Stringlike/Makefile b/devel/p5-MooseX-Types-Stringlike/Makefile
index 9b6d9cb04a4b..c465b951263b 100644
--- a/devel/p5-MooseX-Types-Stringlike/Makefile
+++ b/devel/p5-MooseX-Types-Stringlike/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension of Moose type constraints for string-like objects
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types
+	p5-MooseX-Types>0:devel/p5-MooseX-Types
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MooseX-Types-Structured/Makefile b/devel/p5-MooseX-Types-Structured/Makefile
index 68899bb2c4ae..0bbb19616144 100644
--- a/devel/p5-MooseX-Types-Structured/Makefile
+++ b/devel/p5-MooseX-Types-Structured/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Moose Type Constraint classes for Structured Types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-PartialDump>=0.13:${PORTSDIR}/devel/p5-Devel-PartialDump \
-		p5-Moose>=1.08:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.22:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Devel-PartialDump>=0.13:devel/p5-Devel-PartialDump \
+		p5-Moose>=1.08:devel/p5-Moose \
+		p5-MooseX-Types>=0.22:devel/p5-MooseX-Types \
+		p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-MooseX-Types-DateTime>=0:${PORTSDIR}/devel/p5-MooseX-Types-DateTime \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-MooseX-Types-DateTime>=0:devel/p5-MooseX-Types-DateTime \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
@@ -31,8 +31,8 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-JSON-PP>=2.27300:${PORTSDIR}/converters/p5-JSON-PP
-RUN_DEPENDS+=	p5-JSON-PP>=2.27300:${PORTSDIR}/converters/p5-JSON-PP
+BUILD_DEPENDS+=	p5-JSON-PP>=2.27300:converters/p5-JSON-PP
+RUN_DEPENDS+=	p5-JSON-PP>=2.27300:converters/p5-JSON-PP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-MooseX-Types-URI/Makefile b/devel/p5-MooseX-Types-URI/Makefile
index f22f4a9d332c..8e9ae31ee0a7 100644
--- a/devel/p5-MooseX-Types-URI/Makefile
+++ b/devel/p5-MooseX-Types-URI/Makefile
@@ -13,12 +13,12 @@ COMMENT=	URI related types and coercions for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0.40:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-URI-FromHash>=0:${PORTSDIR}/net/p5-URI-FromHash \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0.40:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-URI-FromHash>=0:net/p5-URI-FromHash \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -28,11 +28,11 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-TEST_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.120.900:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements
+TEST_DEPENDS+=	p5-CPAN-Meta-Requirements>=2.120.900:devel/p5-CPAN-Meta-Requirements
 .endif
 
 .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/devel/p5-MooseX-Types-VariantTable/Makefile b/devel/p5-MooseX-Types-VariantTable/Makefile
index 0b52aa03ee27..c2497609c7f3 100644
--- a/devel/p5-MooseX-Types-VariantTable/Makefile
+++ b/devel/p5-MooseX-Types-VariantTable/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Type constraint based variant table
 
-RUN_DEPENDS=	p5-MooseX-Types-Structured>=0.12:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-MooseX-Clone>=0.03:${PORTSDIR}/devel/p5-MooseX-Clone
+RUN_DEPENDS=	p5-MooseX-Types-Structured>=0.12:devel/p5-MooseX-Types-Structured \
+		p5-MooseX-Clone>=0.03:devel/p5-MooseX-Clone
 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/devel/p5-MooseX-Types/Makefile b/devel/p5-MooseX-Types/Makefile
index d94298a9613c..a1be57c17bd4 100644
--- a/devel/p5-MooseX-Types/Makefile
+++ b/devel/p5-MooseX-Types/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Organise your Moose types in libraries
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Clan>=6.00:${PORTSDIR}/devel/p5-Carp-Clan \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=1.06:${PORTSDIR}/devel/p5-Moose \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Exporter-ForMethods>=0.100052:${PORTSDIR}/devel/p5-Sub-Exporter-ForMethods \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Carp-Clan>=6.00:devel/p5-Carp-Clan \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moose>=1.06:devel/p5-Moose \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Exporter-ForMethods>=0.100052:devel/p5-Sub-Exporter-ForMethods \
+		p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-Mouse/Makefile b/devel/p5-Mouse/Makefile
index 44910e3806b4..24d9ff02448e 100644
--- a/devel/p5-Mouse/Makefile
+++ b/devel/p5-Mouse/Makefile
@@ -16,21 +16,21 @@ COMMENT=	Moose minus the antlers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Build-XSUtil>=0:${PORTSDIR}/devel/p5-Module-Build-XSUtil
-TEST_DEPENDS=	p5-Declare-Constraints-Simple>=0:${PORTSDIR}/devel/p5-Declare-Constraints-Simple \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Locale-US>=0:${PORTSDIR}/misc/p5-Locale-US \
-		p5-Params-Coerce>=0:${PORTSDIR}/devel/p5-Params-Coerce \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Module-Build-XSUtil>=0:devel/p5-Module-Build-XSUtil
+TEST_DEPENDS=	p5-Declare-Constraints-Simple>=0:devel/p5-Declare-Constraints-Simple \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Locale-US>=0:misc/p5-Locale-US \
+		p5-Params-Coerce>=0:devel/p5-Params-Coerce \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-MouseX-App-Cmd/Makefile b/devel/p5-MouseX-App-Cmd/Makefile
index 0cd88474d32c..4fade9f70194 100644
--- a/devel/p5-MouseX-App-Cmd/Makefile
+++ b/devel/p5-MouseX-App-Cmd/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Mashes up MouseX::Getopt and App::Cmd
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Cmd>=0.321:${PORTSDIR}/devel/p5-App-Cmd \
-		p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-ConfigFromFile>=0:${PORTSDIR}/devel/p5-MouseX-ConfigFromFile \
-		p5-MouseX-Getopt>=0:${PORTSDIR}/devel/p5-MouseX-Getopt \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-App-Cmd>=0.321:devel/p5-App-Cmd \
+		p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-ConfigFromFile>=0:devel/p5-MouseX-ConfigFromFile \
+		p5-MouseX-Getopt>=0:devel/p5-MouseX-Getopt \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MouseX-AttributeHelpers/Makefile b/devel/p5-MouseX-AttributeHelpers/Makefile
index e684174da1f0..beb40a26d257 100644
--- a/devel/p5-MouseX-AttributeHelpers/Makefile
+++ b/devel/p5-MouseX-AttributeHelpers/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to extend your attribute interfaces
 
 RUN_DEPENDS=	\
-	p5-Mouse>=0.40:${PORTSDIR}/devel/p5-Mouse
+	p5-Mouse>=0.40:devel/p5-Mouse
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-Test-Data>=0:${PORTSDIR}/devel/p5-Test-Data
+TEST_DEPENDS=	p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-Test-Data>=0:devel/p5-Test-Data
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-ConfigFromFile/Makefile b/devel/p5-MouseX-ConfigFromFile/Makefile
index 30df5f3b271d..236734b25ae8 100644
--- a/devel/p5-MouseX-ConfigFromFile/Makefile
+++ b/devel/p5-MouseX-ConfigFromFile/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Abstract Mouse role for setting attributes from a configfile
 
-BUILD_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
-		p5-Mouse>=0.19:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Types-Path-Class>=0.05:${PORTSDIR}/devel/p5-MouseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Filter>=0:devel/p5-Filter \
+		p5-Mouse>=0.19:devel/p5-Mouse \
+		p5-MouseX-Types-Path-Class>=0.05:devel/p5-MouseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-MouseX-Foreign/Makefile b/devel/p5-MouseX-Foreign/Makefile
index a14b92b5e618..1f83a57f3f39 100644
--- a/devel/p5-MouseX-Foreign/Makefile
+++ b/devel/p5-MouseX-Foreign/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Extends non-Mouse classes as well as Mouse classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.77:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.77:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Any-Moose>=0.15:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Any-Moose>=0.15:devel/p5-Any-Moose \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index 1aad6477bfc4..9e4a9fdb945c 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Mouse>=0.64:${PORTSDIR}/devel/p5-Mouse \
-	p5-Getopt-Long-Descriptive>=0.091:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive
+	p5-Mouse>=0.64:devel/p5-Mouse \
+	p5-Getopt-Long-Descriptive>=0.091:devel/p5-Getopt-Long-Descriptive
 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=	modbuild
diff --git a/devel/p5-MouseX-NativeTraits/Makefile b/devel/p5-MouseX-NativeTraits/Makefile
index 8c6c5a7bf206..29852dc49671 100644
--- a/devel/p5-MouseX-NativeTraits/Makefile
+++ b/devel/p5-MouseX-NativeTraits/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Extend your attribute interfaces for Mouse
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.82:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.82:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Any-Moose>=0.13:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+		p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-StrictConstructor/Makefile b/devel/p5-MouseX-StrictConstructor/Makefile
index 14607d07e481..205ae5ad693f 100644
--- a/devel/p5-MouseX-StrictConstructor/Makefile
+++ b/devel/p5-MouseX-StrictConstructor/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Make your object constructors blow up on unknown attributes
 
-BUILD_DEPENDS=	p5-Mouse>=0.62:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.62:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-Traits/Makefile b/devel/p5-MouseX-Traits/Makefile
index f17fdf3086c6..041c08ecbb7f 100644
--- a/devel/p5-MouseX-Traits/Makefile
+++ b/devel/p5-MouseX-Traits/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically apply roles at object creation time
 
-BUILD_DEPENDS=	p5-Mouse>=0.81:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Mouse>=0.81:devel/p5-Mouse
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-MouseX-Types-Path-Class/Makefile b/devel/p5-MouseX-Types-Path-Class/Makefile
index 1c24fe7d6c66..e7deb0e9f346 100644
--- a/devel/p5-MouseX-Types-Path-Class/Makefile
+++ b/devel/p5-MouseX-Types-Path-Class/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Path::Class type library for Mouse
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>=0.39:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Types>=0.02:${PORTSDIR}/devel/p5-MouseX-Types \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-MouseX-Getopt>=0.22:${PORTSDIR}/devel/p5-MouseX-Getopt
+BUILD_DEPENDS=	p5-Mouse>=0.39:devel/p5-Mouse \
+		p5-MouseX-Types>=0.02:devel/p5-MouseX-Types \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-MouseX-Getopt>=0.22:devel/p5-MouseX-Getopt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-UseAllModules>0:${PORTSDIR}/devel/p5-Test-UseAllModules
+TEST_DEPENDS=	p5-Test-UseAllModules>0:devel/p5-Test-UseAllModules
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-MouseX-Types/Makefile b/devel/p5-MouseX-Types/Makefile
index 74f4bfb5e5d6..b59d4da4461f 100644
--- a/devel/p5-MouseX-Types/Makefile
+++ b/devel/p5-MouseX-Types/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to organize your Mouse types in libraries
 
 RUN_DEPENDS=	\
-	p5-Any-Moose>=0.15:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-Mouse>=0.77:${PORTSDIR}/devel/p5-Mouse
+	p5-Any-Moose>=0.15:devel/p5-Any-Moose \
+	p5-Mouse>=0.77:devel/p5-Mouse
 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/devel/p5-Net-DBus/Makefile b/devel/p5-Net-DBus/Makefile
index f603beee4ac3..104fbd855cef 100644
--- a/devel/p5-Net-DBus/Makefile
+++ b/devel/p5-Net-DBus/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Perl extension for the DBus message system
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-XML-Grove>=0:${PORTSDIR}/textproc/p5-XML-Grove \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+RUN_DEPENDS=	p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-XML-Grove>=0:textproc/p5-XML-Grove \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 USES=		pkgconfig perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Net-ZooKeeper/Makefile b/devel/p5-Net-ZooKeeper/Makefile
index 63664447a4d1..7c3c69657811 100644
--- a/devel/p5-Net-ZooKeeper/Makefile
+++ b/devel/p5-Net-ZooKeeper/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for Apache ZooKeeper
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
+LIB_DEPENDS=	libzookeeper_mt.so:devel/libzookeeper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-No-Worries/Makefile b/devel/p5-No-Worries/Makefile
index fa9115b162d0..cfe888eae4fc 100644
--- a/devel/p5-No-Worries/Makefile
+++ b/devel/p5-No-Worries/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	No::Worries - coding without worries
 
-BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Number-Tolerant/Makefile b/devel/p5-Number-Tolerant/Makefile
index 47094bf6ddaa..0c67922dde5c 100644
--- a/devel/p5-Number-Tolerant/Makefile
+++ b/devel/p5-Number-Tolerant/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides inexact number comparisons with tolerance ranges
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0.950:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0.950:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -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/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 65e34fa4a0c5..ab3615baa1cd 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for OLE document interface
 
-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}
 
 USES=		perl5
diff --git a/devel/p5-Object-Accessor/Makefile b/devel/p5-Object-Accessor/Makefile
index ae49459018c5..8128a24aceef 100644
--- a/devel/p5-Object-Accessor/Makefile
+++ b/devel/p5-Object-Accessor/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Interface to create per object accessors
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Check>=0.34:${PORTSDIR}/devel/p5-Params-Check
-RUN_DEPENDS=	p5-Params-Check>=0.34:${PORTSDIR}/devel/p5-Params-Check
+BUILD_DEPENDS=	p5-Params-Check>=0.34:devel/p5-Params-Check
+RUN_DEPENDS=	p5-Params-Check>=0.34:devel/p5-Params-Check
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Object-Array/Makefile b/devel/p5-Object-Array/Makefile
index f2f3548ed39d..0e22f12be542 100644
--- a/devel/p5-Object-Array/Makefile
+++ b/devel/p5-Object-Array/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Array references with accessors
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Object-Authority/Makefile b/devel/p5-Object-Authority/Makefile
index 1db377c4c73c..b168c3fe6eb4 100644
--- a/devel/p5-Object-Authority/Makefile
+++ b/devel/p5-Object-Authority/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that adds an AUTHORITY method to your class
 
-BUILD_DEPENDS=	p5-Object-Role>=0:${PORTSDIR}/devel/p5-Object-Role
+BUILD_DEPENDS=	p5-Object-Role>=0:devel/p5-Object-Role
 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/devel/p5-Object-Container/Makefile b/devel/p5-Object-Container/Makefile
index 98094779ff05..5a214ffa94ef 100644
--- a/devel/p5-Object-Container/Makefile
+++ b/devel/p5-Object-Container/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Simple object container
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 PORTSCOUT=	limit:^[0-9]*.[0-9][0-9]$$
 
diff --git a/devel/p5-Object-Declare/Makefile b/devel/p5-Object-Declare/Makefile
index 7845c2a8a317..ccf3cafa5ca1 100644
--- a/devel/p5-Object-Declare/Makefile
+++ b/devel/p5-Object-Declare/Makefile
@@ -16,7 +16,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502106
-TEST_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=0:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Object-Enum/Makefile b/devel/p5-Object-Enum/Makefile
index 277ea18595f9..2f52bb69313a 100644
--- a/devel/p5-Object-Enum/Makefile
+++ b/devel/p5-Object-Enum/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Replacement for if ($$foo eq 'bar')
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Sub-Install>=0:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Sub-Install>=0:devel/p5-Sub-Install \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Event/Makefile b/devel/p5-Object-Event/Makefile
index 174198e068b3..92a0ce93732d 100644
--- a/devel/p5-Object-Event/Makefile
+++ b/devel/p5-Object-Event/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	mons@cpan.org
 COMMENT=	Class that provides an event callback interface
 
-RUN_DEPENDS=	p5-AnyEvent>=3.5:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+RUN_DEPENDS=	p5-AnyEvent>=3.5:devel/p5-AnyEvent \
+		p5-common-sense>=0:devel/p5-common-sense
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Object-InsideOut/Makefile b/devel/p5-Object-InsideOut/Makefile
index fc0a95d98875..f72f0ed1da3b 100644
--- a/devel/p5-Object-InsideOut/Makefile
+++ b/devel/p5-Object-InsideOut/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Comprehensive inside-out object support module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exception-Class>=1.32:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Want>=0.21:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Exception-Class>=1.32:devel/p5-Exception-Class \
+		p5-Want>=0.21:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Pluggable/Makefile b/devel/p5-Object-Pluggable/Makefile
index 473c26c7a33b..fda4a3586c92 100644
--- a/devel/p5-Object-Pluggable/Makefile
+++ b/devel/p5-Object-Pluggable/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Base class for creating plugin-enabled objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Object-Role/Makefile b/devel/p5-Object-Role/Makefile
index 5ec1782e60c9..23ed2154bd2d 100644
--- a/devel/p5-Object-Role/Makefile
+++ b/devel/p5-Object-Role/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl base class for non-Moose roles
 
-BUILD_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Olson-Abbreviations/Makefile b/devel/p5-Olson-Abbreviations/Makefile
index 4b4e113d70cf..4af2b75387d5 100644
--- a/devel/p5-Olson-Abbreviations/Makefile
+++ b/devel/p5-Olson-Abbreviations/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Globally unique timezones abbreviation handling
 
-RUN_DEPENDS=	p5-Moose>=0.41:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-ClassAttribute>=0:${PORTSDIR}/devel/p5-MooseX-ClassAttribute
+RUN_DEPENDS=	p5-Moose>=0.41:devel/p5-Moose \
+		p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-ClassAttribute>=0:devel/p5-MooseX-ClassAttribute
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-OrePAN2/Makefile b/devel/p5-OrePAN2/Makefile
index 204332b2aa1f..0b18e5735151 100644
--- a/devel/p5-OrePAN2/Makefile
+++ b/devel/p5-OrePAN2/Makefile
@@ -14,22 +14,22 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Archive-Extract>=0.72:${PORTSDIR}/archivers/p5-Archive-Extract \
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd \
-	p5-IO-File-AtomicChange>=0:${PORTSDIR}/devel/p5-IO-File-AtomicChange \
-	p5-IO-Socket-SSL>=1.42:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-List-Compare>0:${PORTSDIR}/misc/p5-List-Compare \
-	p5-MetaCPAN-Client>=1.006:${PORTSDIR}/devel/p5-MetaCPAN-Client \
-	p5-Moo>=1.007000:${PORTSDIR}/devel/p5-Moo \
-	p5-MooX-Options>0:${PORTSDIR}/devel/p5-MooX-Options \
-	p5-Parse-CPAN-Packages>=2.39:${PORTSDIR}/devel/p5-Parse-CPAN-Packages \
-	p5-Parse-LocalDistribution>=0.14:${PORTSDIR}/devel/p5-Parse-LocalDistribution \
-	p5-Parse-PMFile>=0.29:${PORTSDIR}/devel/p5-Parse-PMFile \
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-Types-URI>=0:${PORTSDIR}/devel/p5-Types-URI
+	p5-Archive-Extract>=0.72:archivers/p5-Archive-Extract \
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-File-pushd>0:devel/p5-File-pushd \
+	p5-IO-File-AtomicChange>=0:devel/p5-IO-File-AtomicChange \
+	p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
+	p5-List-Compare>0:misc/p5-List-Compare \
+	p5-MetaCPAN-Client>=1.006:devel/p5-MetaCPAN-Client \
+	p5-Moo>=1.007000:devel/p5-Moo \
+	p5-MooX-Options>0:devel/p5-MooX-Options \
+	p5-Parse-CPAN-Packages>=2.39:devel/p5-Parse-CPAN-Packages \
+	p5-Parse-LocalDistribution>=0.14:devel/p5-Parse-LocalDistribution \
+	p5-Parse-PMFile>=0.29:devel/p5-Parse-PMFile \
+	p5-Path-Tiny>0:devel/p5-Path-Tiny \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+	p5-Types-URI>=0:devel/p5-Types-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Ouch/Makefile b/devel/p5-Ouch/Makefile
index eb506e48bb2c..c9413c3eaf37 100644
--- a/devel/p5-Ouch/Makefile
+++ b/devel/p5-Ouch/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for exceptions that don't hurt
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap
+TEST_DEPENDS=	p5-Test-Trap>=0:devel/p5-Test-Trap
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-PAR/Makefile b/devel/p5-PAR/Makefile
index a15cdfbe3b71..7ba39b7bf019 100644
--- a/devel/p5-PAR/Makefile
+++ b/devel/p5-PAR/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl Archive Toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-PAR-Dist>=0.32:${PORTSDIR}/devel/p5-PAR-Dist
+BUILD_DEPENDS=	p5-Archive-Zip>=1:archivers/p5-Archive-Zip \
+		p5-PAR-Dist>=0.32:devel/p5-PAR-Dist
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-PCSC-Card/Makefile b/devel/p5-PCSC-Card/Makefile
index d7e4c61ef940..0a0893924b49 100644
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Perl bindings for the PC/SC Lite Framework
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		perl5 pkgconfig tar:bzip2
 USE_PERL5=	configure
diff --git a/devel/p5-POE-API-Hooks/Makefile b/devel/p5-POE-API-Hooks/Makefile
index 8f717b4fd045..cae6c6612b8a 100644
--- a/devel/p5-POE-API-Hooks/Makefile
+++ b/devel/p5-POE-API-Hooks/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implement lightweight hooks into POE
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-API-Peek/Makefile b/devel/p5-POE-API-Peek/Makefile
index 8a1eef30477f..7af351aedc94 100644
--- a/devel/p5-POE-API-Peek/Makefile
+++ b/devel/p5-POE-API-Peek/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Peek into the internals of a running POE environment
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Devel-Size>0:${PORTSDIR}/devel/p5-Devel-Size
+BUILD_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
+		p5-Devel-Size>0:devel/p5-Devel-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Child/Makefile b/devel/p5-POE-Component-Child/Makefile
index c94b02bd374c..319ec6bc94c9 100644
--- a/devel/p5-POE-Component-Child/Makefile
+++ b/devel/p5-POE-Component-Child/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE child management
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
-RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-Cron/Makefile b/devel/p5-POE-Component-Cron/Makefile
index 55aaeb95d73e..fbc528c3f44e 100644
--- a/devel/p5-POE-Component-Cron/Makefile
+++ b/devel/p5-POE-Component-Cron/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Schedule POE Events using a cron spec
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Schedule>=0:${PORTSDIR}/devel/p5-POE-Component-Schedule \
-		p5-DateTime-Event-Random>=0:${PORTSDIR}/devel/p5-DateTime-Event-Random \
-		p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron
-RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Schedule>=0:${PORTSDIR}/devel/p5-POE-Component-Schedule \
-		p5-DateTime-Event-Random>=0:${PORTSDIR}/devel/p5-DateTime-Event-Random \
-		p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Schedule>=0:devel/p5-POE-Component-Schedule \
+		p5-DateTime-Event-Random>=0:devel/p5-DateTime-Event-Random \
+		p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Schedule>=0:devel/p5-POE-Component-Schedule \
+		p5-DateTime-Event-Random>=0:devel/p5-DateTime-Event-Random \
+		p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-Daemon/Makefile b/devel/p5-POE-Component-Daemon/Makefile
index b99416864a46..fa22424d2d21 100644
--- a/devel/p5-POE-Component-Daemon/Makefile
+++ b/devel/p5-POE-Component-Daemon/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Handles all the housework for a daemon in POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-POE-Component-DebugShell/Makefile b/devel/p5-POE-Component-DebugShell/Makefile
index ca90b098e03b..9b537a82c9d2 100644
--- a/devel/p5-POE-Component-DebugShell/Makefile
+++ b/devel/p5-POE-Component-DebugShell/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interactive peeking into a running POE application
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-API-Peek>=0:${PORTSDIR}/devel/p5-POE-API-Peek
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-API-Peek>=0:devel/p5-POE-API-Peek
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Distribution>=0:${PORTSDIR}/devel/p5-Test-Distribution
+TEST_DEPENDS=	p5-Test-Distribution>=0:devel/p5-Test-Distribution
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index b20725b34b8e..9521486fa487 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -13,10 +13,10 @@ COMMENT=	POE directory watcher
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0.12:${PORTSDIR}/devel/p5-POE \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-MooseX-Types-Path-Class>0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-File-Signature>0:${PORTSDIR}/sysutils/p5-File-Signature
+BUILD_DEPENDS=	p5-POE>=0.12:devel/p5-POE \
+		p5-Path-Class>0:devel/p5-Path-Class \
+		p5-MooseX-Types-Path-Class>0:devel/p5-MooseX-Types-Path-Class \
+		p5-File-Signature>0:sysutils/p5-File-Signature
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Hailo/Makefile b/devel/p5-POE-Component-Hailo/Makefile
index be4074de819e..57a84bf5da02 100644
--- a/devel/p5-POE-Component-Hailo/Makefile
+++ b/devel/p5-POE-Component-Hailo/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Non-blocking wrapper around Hailo
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Hailo>=0:${PORTSDIR}/textproc/p5-Hailo
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Hailo>=0:textproc/p5-Hailo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-IKC/Makefile b/devel/p5-POE-Component-IKC/Makefile
index a6264d975d51..b7beb23eb881 100644
--- a/devel/p5-POE-Component-IKC/Makefile
+++ b/devel/p5-POE-Component-IKC/Makefile
@@ -13,9 +13,9 @@ COMMENT=	POE Inter-Kernel Communication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Size>=0.77:${PORTSDIR}/devel/p5-Devel-Size \
-		p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Data-Dump>=1:${PORTSDIR}/devel/p5-Data-Dump
+BUILD_DEPENDS=	p5-Devel-Size>=0.77:devel/p5-Devel-Size \
+		p5-POE>=1.311:devel/p5-POE \
+		p5-Data-Dump>=1:devel/p5-Data-Dump
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-JobQueue/Makefile b/devel/p5-POE-Component-JobQueue/Makefile
index 1c14137b0294..cae47badc464 100644
--- a/devel/p5-POE-Component-JobQueue/Makefile
+++ b/devel/p5-POE-Component-JobQueue/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0+$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE component to manage queues and worker pools
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 1d721358f399..8721062db2f4 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE logging class
 
-BUILD_DEPENDS=	p5-POE>=1.293:${PORTSDIR}/devel/p5-POE \
-		p5-Log-Dispatch>=2.26:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Dispatch-Config>=1.03:${PORTSDIR}/devel/p5-Log-Dispatch-Config
+BUILD_DEPENDS=	p5-POE>=1.293:devel/p5-POE \
+		p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch \
+		p5-Log-Dispatch-Config>=1.03:devel/p5-Log-Dispatch-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Component-Pluggable/Makefile b/devel/p5-POE-Component-Pluggable/Makefile
index 2d5f44ff14a5..dfbc04a47021 100644
--- a/devel/p5-POE-Component-Pluggable/Makefile
+++ b/devel/p5-POE-Component-Pluggable/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for creating plugin enabled POE Components
 
-BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-POE>=1.004:devel/p5-POE \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-RSS/Makefile b/devel/p5-POE-Component-RSS/Makefile
index 0c5301bc634b..01b36f60e15e 100644
--- a/devel/p5-POE-Component-RSS/Makefile
+++ b/devel/p5-POE-Component-RSS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for event based RSS parsing
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-RSSAggregator/Makefile b/devel/p5-POE-Component-RSSAggregator/Makefile
index 4506969d2bbc..fb62fccbb160 100644
--- a/devel/p5-POE-Component-RSSAggregator/Makefile
+++ b/devel/p5-POE-Component-RSSAggregator/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Watch Muliple RSS Feeds for New Headlines
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-RSS-Feed>=0:${PORTSDIR}/textproc/p5-XML-RSS-Feed \
-		p5-POE-Component-Client-DNS>=0.98:${PORTSDIR}/dns/p5-POE-Component-Client-DNS \
-		p5-POE-Component-Client-HTTP>=0.51:${PORTSDIR}/www/p5-POE-Component-Client-HTTP
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-RSS-Feed>=0:textproc/p5-XML-RSS-Feed \
+		p5-POE-Component-Client-DNS>=0.98:dns/p5-POE-Component-Client-DNS \
+		p5-POE-Component-Client-HTTP>=0.51:www/p5-POE-Component-Client-HTTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Schedule/Makefile b/devel/p5-POE-Component-Schedule/Makefile
index 1bb4dad4a69e..874711f262fc 100644
--- a/devel/p5-POE-Component-Schedule/Makefile
+++ b/devel/p5-POE-Component-Schedule/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Schedule POE Events using a cron spec
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-DateTime-Set>=0:${PORTSDIR}/devel/p5-DateTime-Set
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-DateTime-Set>=0:devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Server-XMLRPC/Makefile b/devel/p5-POE-Component-Server-XMLRPC/Makefile
index 9a3b3490ee7f..13fc7c01ab2c 100644
--- a/devel/p5-POE-Component-Server-XMLRPC/Makefile
+++ b/devel/p5-POE-Component-Server-XMLRPC/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jesper@jdn.dk
 COMMENT=	POE Component to create XMLRPC Servers
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-POE-Component-Server-HTTP>=0:${PORTSDIR}/www/p5-POE-Component-Server-HTTP \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-Syndicator/Makefile b/devel/p5-POE-Component-Syndicator/Makefile
index 733ce0e75322..9c97308aa216 100644
--- a/devel/p5-POE-Component-Syndicator/Makefile
+++ b/devel/p5-POE-Component-Syndicator/Makefile
@@ -15,9 +15,9 @@ COMMENT=	POE component base class which implements the Observer pattern
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.311:${PORTSDIR}/devel/p5-POE \
-		p5-Object-Pluggable>=1.29:${PORTSDIR}/devel/p5-Object-Pluggable \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-POE>=1.311:devel/p5-POE \
+		p5-Object-Pluggable>=1.29:devel/p5-Object-Pluggable \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Component-TSTP/Makefile b/devel/p5-POE-Component-TSTP/Makefile
index af39016e079d..337422527794 100644
--- a/devel/p5-POE-Component-TSTP/Makefile
+++ b/devel/p5-POE-Component-TSTP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	POE component to correctly handle Ctrl-Z in your program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Devel-Profiler/Makefile b/devel/p5-POE-Devel-Profiler/Makefile
index 6ddca4c0456e..0752f38f9f51 100644
--- a/devel/p5-POE-Devel-Profiler/Makefile
+++ b/devel/p5-POE-Devel-Profiler/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Profiles POE programs
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Loop-AnyEvent/Makefile b/devel/p5-POE-Loop-AnyEvent/Makefile
index 427cb8529498..f28819646770 100644
--- a/devel/p5-POE-Loop-AnyEvent/Makefile
+++ b/devel/p5-POE-Loop-AnyEvent/Makefile
@@ -13,10 +13,10 @@ COMMENT=	AnyEvent event loop support for POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-AnyEvent>=0:${PORTSDIR}/devel/p5-AnyEvent \
-		p5-POE>=1.289:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+		p5-POE>=1.289:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-POE-Test-Loops>=1.035:${PORTSDIR}/devel/p5-POE-Test-Loops
+BUILD_DEPENDS+=	p5-POE-Test-Loops>=1.035:devel/p5-POE-Test-Loops
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-POE-Loop-Glib/Makefile b/devel/p5-POE-Loop-Glib/Makefile
index 5baef93a2efe..0f2305c9fec3 100644
--- a/devel/p5-POE-Loop-Glib/Makefile
+++ b/devel/p5-POE-Loop-Glib/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Bridge that supports Glib event loop from POE
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-POE>=1.288:${PORTSDIR}/devel/p5-POE \
-		p5-Glib2>=1.222:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	p5-POE>=1.288:devel/p5-POE \
+		p5-Glib2>=1.222:devel/p5-Glib2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-POE-Loop-Tk/Makefile b/devel/p5-POE-Loop-Tk/Makefile
index 5631917e0888..2fd58642d7bf 100644
--- a/devel/p5-POE-Loop-Tk/Makefile
+++ b/devel/p5-POE-Loop-Tk/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bridge that allows POE to be driven by Tk
 
-BUILD_DEPENDS=	p5-POE>=1.356:${PORTSDIR}/devel/p5-POE \
-		p5-Tk>=804.031:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-POE>=1.356:devel/p5-POE \
+		p5-Tk>=804.031:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Quickie/Makefile b/devel/p5-POE-Quickie/Makefile
index db4329a64c43..9b6412d5749c 100644
--- a/devel/p5-POE-Quickie/Makefile
+++ b/devel/p5-POE-Quickie/Makefile
@@ -15,10 +15,10 @@ LICENSE=	GPLv1 ART10
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-POE>=1.350:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.350:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.07:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Capture-Tiny>=0.07:devel/p5-Capture-Tiny \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-Session-MultiDispatch/Makefile b/devel/p5-POE-Session-MultiDispatch/Makefile
index 4855749a1cc4..9b66c5400184 100644
--- a/devel/p5-POE-Session-MultiDispatch/Makefile
+++ b/devel/p5-POE-Session-MultiDispatch/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Callback dispatch for session events
 
-RUN_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+RUN_DEPENDS=	p5-POE>=0:devel/p5-POE
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Stage/Makefile b/devel/p5-POE-Stage/Makefile
index 1318c6efcb7e..affbdaeb7235 100644
--- a/devel/p5-POE-Stage/Makefile
+++ b/devel/p5-POE-Stage/Makefile
@@ -13,12 +13,12 @@ PORTREVISION=	1
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Base class for formalized POE components
 
-BUILD_DEPENDS=	p5-POE>=1.351:${PORTSDIR}/devel/p5-POE \
-		p5-PadWalker>=1.93:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Devel-LexAlias>=0.04:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Lexical-Persistence>=1.020:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		p5-Attribute-Handlers>=0.93:${PORTSDIR}/devel/p5-Attribute-Handlers
+BUILD_DEPENDS=	p5-POE>=1.351:devel/p5-POE \
+		p5-PadWalker>=1.93:devel/p5-PadWalker \
+		p5-Net-DNS>=0.68:dns/p5-Net-DNS \
+		p5-Devel-LexAlias>=0.04:devel/p5-Devel-LexAlias \
+		p5-Lexical-Persistence>=1.020:devel/p5-Lexical-Persistence \
+		p5-Attribute-Handlers>=0.93:devel/p5-Attribute-Handlers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE-Test-Loops/Makefile b/devel/p5-POE-Test-Loops/Makefile
index 37b8585b1d1a..d82b70722f03 100644
--- a/devel/p5-POE-Test-Loops/Makefile
+++ b/devel/p5-POE-Test-Loops/Makefile
@@ -21,8 +21,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-POE-XS-Loop-Poll/Makefile b/devel/p5-POE-XS-Loop-Poll/Makefile
index 3707d93362a6..d1e85343c84d 100644
--- a/devel/p5-POE-XS-Loop-Poll/Makefile
+++ b/devel/p5-POE-XS-Loop-Poll/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS implementation of POE::Loop, using poll(2)
 
-BUILD_DEPENDS=	p5-POE-Test-Loops>=1.033:${PORTSDIR}/devel/p5-POE-Test-Loops \
-		p5-POE>=1.003:${PORTSDIR}/devel/p5-POE
-RUN_DEPENDS=	p5-POE>=1.003:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE-Test-Loops>=1.033:devel/p5-POE-Test-Loops \
+		p5-POE>=1.003:devel/p5-POE
+RUN_DEPENDS=	p5-POE>=1.003:devel/p5-POE
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-POE-XS-Queue-Array/Makefile b/devel/p5-POE-XS-Queue-Array/Makefile
index f3da9591995d..957d4ec92f36 100644
--- a/devel/p5-POE-XS-Queue-Array/Makefile
+++ b/devel/p5-POE-XS-Queue-Array/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS implementation of POE::Queue::Array
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POE/Makefile b/devel/p5-POE/Makefile
index 2f04ad3f5674..6482595e40b3 100644
--- a/devel/p5-POE/Makefile
+++ b/devel/p5-POE/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Multitasking and networking framework for perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Curses>=1.08:${PORTSDIR}/devel/p5-Curses \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-Pipely>=0.005:${PORTSDIR}/devel/p5-IO-Pipely \
-		p5-IO-Tty>=1.08:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-POE-Test-Loops>=1.360:${PORTSDIR}/devel/p5-POE-Test-Loops \
-		p5-Socket-GetAddrInfo>=0.20:${PORTSDIR}/net/p5-Socket-GetAddrInfo \
-		p5-Term-ReadKey>=2.21:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=5.79:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Curses>=1.08:devel/p5-Curses \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-Pipely>=0.005:devel/p5-IO-Pipely \
+		p5-IO-Tty>=1.08:devel/p5-IO-Tty \
+		p5-POE-Test-Loops>=1.360:devel/p5-POE-Test-Loops \
+		p5-Socket-GetAddrInfo>=0.20:net/p5-Socket-GetAddrInfo \
+		p5-Term-ReadKey>=2.21:devel/p5-Term-ReadKey \
+		p5-URI>=1.30:net/p5-URI \
+		p5-libwww>=5.79:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/devel/p5-POEx-Role-SessionInstantiation/Makefile b/devel/p5-POEx-Role-SessionInstantiation/Makefile
index 37e77aaf054c..6381b49ef1fb 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/Makefile
+++ b/devel/p5-POEx-Role-SessionInstantiation/Makefile
@@ -12,13 +12,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension of Moose role for turning objects into POE sessions
 
 RUN_DEPENDS=	\
-	p5-MooseX-CompileTime-Traits>=0:${PORTSDIR}/devel/p5-MooseX-CompileTime-Traits \
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POEx-Types>=0:${PORTSDIR}/devel/p5-POEx-Types \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-MooseX-CompileTime-Traits>=0:devel/p5-MooseX-CompileTime-Traits \
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-POE>0:devel/p5-POE \
+	p5-POEx-Types>=0:devel/p5-POEx-Types \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POEx-Role-Streaming/Makefile b/devel/p5-POEx-Role-Streaming/Makefile
index a7799fde8fc3..e442a3368dce 100644
--- a/devel/p5-POEx-Role-Streaming/Makefile
+++ b/devel/p5-POEx-Role-Streaming/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for streaming from one filehandle to another
 
 RUN_DEPENDS=	\
-	p5-MooseX-Declare>0:${PORTSDIR}/devel/p5-MooseX-Declare \
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE \
-	p5-POEx-Role-SessionInstantiation>=0:${PORTSDIR}/devel/p5-POEx-Role-SessionInstantiation \
-	p5-POEx-Types>0:${PORTSDIR}/devel/p5-POEx-Types \
-	p5-aliased>0:${PORTSDIR}/devel/p5-aliased
+	p5-MooseX-Declare>0:devel/p5-MooseX-Declare \
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-POE>0:devel/p5-POE \
+	p5-POEx-Role-SessionInstantiation>=0:devel/p5-POEx-Role-SessionInstantiation \
+	p5-POEx-Types>0:devel/p5-POEx-Types \
+	p5-aliased>0:devel/p5-aliased
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index 703146ae80a1..e0b28992283b 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to provide MooseX::Types types for modern POE
 
 RUN_DEPENDS=	\
-	p5-MooseX-Types>0:${PORTSDIR}/devel/p5-MooseX-Types \
-	p5-MooseX-Types-Structured>0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-	p5-POE>0:${PORTSDIR}/devel/p5-POE
+	p5-MooseX-Types>0:devel/p5-MooseX-Types \
+	p5-MooseX-Types-Structured>0:devel/p5-MooseX-Types-Structured \
+	p5-POE>0:devel/p5-POE
 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/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 1224391e9620..efacfc873f1e 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl5 library for text-mode user interface widgets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 
 USES=		perl5
 
diff --git a/devel/p5-Package-DeprecationManager/Makefile b/devel/p5-Package-DeprecationManager/Makefile
index d5532bcd2b83..82f4bb44f6e8 100644
--- a/devel/p5-Package-DeprecationManager/Makefile
+++ b/devel/p5-Package-DeprecationManager/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Manage deprecation warnings for your distribution
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Package-Stash>0:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Params-Util>0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-Package-Stash>0:devel/p5-Package-Stash \
+		p5-Params-Util>0:devel/p5-Params-Util \
+		p5-Sub-Install>0:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>0:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>0:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USES=		perl5
@@ -27,8 +27,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/devel/p5-Package-Stash-XS/Makefile b/devel/p5-Package-Stash-XS/Makefile
index 22657b8eb9c7..e09d2262bd09 100644
--- a/devel/p5-Package-Stash-XS/Makefile
+++ b/devel/p5-Package-Stash-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Faster and more correct implementation of the Package::Stash API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index 199a81ff9ffa..2950b17633ac 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Routines for manipulating stashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:${PORTSDIR}/devel/p5-Dist-CheckConflicts \
-		p5-Module-Implementation>=0.06:${PORTSDIR}/devel/p5-Module-Implementation \
-		p5-Package-Stash-XS>=0.22:${PORTSDIR}/devel/p5-Package-Stash-XS
+BUILD_DEPENDS=	p5-Dist-CheckConflicts>=0.02:devel/p5-Dist-CheckConflicts \
+		p5-Module-Implementation>=0.06:devel/p5-Module-Implementation \
+		p5-Package-Stash-XS>=0.22:devel/p5-Package-Stash-XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Package-Variant/Makefile b/devel/p5-Package-Variant/Makefile
index 23c71d07d4d3..61a047a344f9 100644
--- a/devel/p5-Package-Variant/Makefile
+++ b/devel/p5-Package-Variant/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Parameterizable packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Import-Into>=1:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0.013:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-strictures>=2:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Import-Into>=1:devel/p5-Import-Into \
+		p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
+		p5-strictures>=2:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Moo>=0:devel/p5-Moo \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Parallel-Async/Makefile b/devel/p5-Parallel-Async/Makefile
index 0cc4cae85682..83bbbe6f91c9 100644
--- a/devel/p5-Parallel-Async/Makefile
+++ b/devel/p5-Parallel-Async/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Parallel-Prefork/Makefile b/devel/p5-Parallel-Prefork/Makefile
index 76c6be34a5a3..809b2f82488f 100644
--- a/devel/p5-Parallel-Prefork/Makefile
+++ b/devel/p5-Parallel-Prefork/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Simple prefork server framework
 
-BUILD_DEPENDS=	p5-Proc-Wait3>=0.03:${PORTSDIR}/devel/p5-Proc-Wait3 \
-		p5-Class-Accessor-Lite>=0.04:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Scope-Guard>=0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-Proc-Wait3>=0.03:devel/p5-Proc-Wait3 \
+		p5-Class-Accessor-Lite>=0.04:devel/p5-Class-Accessor-Lite \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Scope-Guard>=0:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-SharedFork>=0:${PORTSDIR}/devel/p5-Test-SharedFork \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-SharedFork>=0:devel/p5-Test-SharedFork \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parallel-Scoreboard/Makefile b/devel/p5-Parallel-Scoreboard/Makefile
index b769a11237db..331166bd8298 100644
--- a/devel/p5-Parallel-Scoreboard/Makefile
+++ b/devel/p5-Parallel-Scoreboard/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON
+	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+	p5-HTML-Parser>0:www/p5-HTML-Parser \
+	p5-JSON>0:converters/p5-JSON
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Params-CallbackRequest/Makefile b/devel/p5-Params-CallbackRequest/Makefile
index 3cc25ef0a1d9..71ed67e3abf5 100644
--- a/devel/p5-Params-CallbackRequest/Makefile
+++ b/devel/p5-Params-CallbackRequest/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide callbacks to method and function parameters
 
-RUN_DEPENDS=	p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA
+RUN_DEPENDS=	p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Class-ISA>=0:devel/p5-Class-ISA
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Params-Coerce/Makefile b/devel/p5-Params-Coerce/Makefile
index d1bcb014f97e..8026342796ee 100644
--- a/devel/p5-Params-Coerce/Makefile
+++ b/devel/p5-Params-Coerce/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	coryking@mozimedia.com
 COMMENT=	Allows your classes to do coercion of parameters  (Params::Coerce)
 
-BUILD_DEPENDS=	p5-Params-Util>=0.20:${PORTSDIR}/devel/p5-Params-Util
-RUN_DEPENDS=	p5-Params-Util>=0.20:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Params-Util>=0.20:devel/p5-Params-Util
+RUN_DEPENDS=	p5-Params-Util>=0.20:devel/p5-Params-Util
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Params-Validate-Dependencies/Makefile b/devel/p5-Params-Validate-Dependencies/Makefile
index b1ea911f64ea..e2b5807a89c0 100644
--- a/devel/p5-Params-Validate-Dependencies/Makefile
+++ b/devel/p5-Params-Validate-Dependencies/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Validate combinations of parameters
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0.38:${PORTSDIR}/devel/p5-Clone \
-		p5-Data-Domain>=1.02:${PORTSDIR}/devel/p5-Data-Domain \
-		p5-PadWalker>=1.96:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Params-Validate>=1.07:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Clone>=0.38:devel/p5-Clone \
+		p5-Data-Domain>=1.02:devel/p5-Data-Domain \
+		p5-PadWalker>=1.96:devel/p5-PadWalker \
+		p5-Params-Validate>=1.07:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Params-Validate/Makefile b/devel/p5-Params-Validate/Makefile
index 6be0485a3213..cefc6275648c 100644
--- a/devel/p5-Params-Validate/Makefile
+++ b/devel/p5-Params-Validate/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Validate method/function parameters
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation
-RUN_DEPENDS=	p5-Module-Implementation>=0.04:${PORTSDIR}/devel/p5-Module-Implementation
-TEST_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Taint>=0.02:${PORTSDIR}/devel/p5-Test-Taint
+BUILD_DEPENDS=	p5-Module-Implementation>=0.04:devel/p5-Module-Implementation
+RUN_DEPENDS=	p5-Module-Implementation>=0.04:devel/p5-Module-Implementation
+TEST_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>0:devel/p5-Test-Requires \
+		p5-Test-Taint>=0.02:devel/p5-Test-Taint
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Paranoid/Makefile b/devel/p5-Paranoid/Makefile
index 5526d450acba..aea86899f112 100644
--- a/devel/p5-Paranoid/Makefile
+++ b/devel/p5-Paranoid/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Paranoia support for safer programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-BerkeleyDB>=0.32:${PORTSDIR}/databases/p5-BerkeleyDB \
-		p5-Unix-Syslog>=1.1:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-Socket6>=0.23:${PORTSDIR}/net/p5-Socket6
+BUILD_DEPENDS=	p5-BerkeleyDB>=0.32:databases/p5-BerkeleyDB \
+		p5-Unix-Syslog>=1.1:sysutils/p5-Unix-Syslog \
+		p5-Socket6>=0.23:net/p5-Socket6
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-CPAN-Meta/Makefile b/devel/p5-Parse-CPAN-Meta/Makefile
index b562b194a6c9..930798a4551d 100644
--- a/devel/p5-Parse-CPAN-Meta/Makefile
+++ b/devel/p5-Parse-CPAN-Meta/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Parse META.yml and other similar CPAN metadata files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
-RUN_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-YAML
+BUILD_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:devel/p5-CPAN-Meta-YAML
+RUN_DEPENDS=	p5-CPAN-Meta-YAML>=0.011:devel/p5-CPAN-Meta-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-CPAN-Packages-Fast/Makefile b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
index 2fc95f925776..24ae3a6887da 100644
--- a/devel/p5-Parse-CPAN-Packages-Fast/Makefile
+++ b/devel/p5-Parse-CPAN-Packages-Fast/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parse CPAN package index
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo
+BUILD_DEPENDS=	p5-CPAN-DistnameInfo>=0:devel/p5-CPAN-DistnameInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Parse-CPAN-Packages/Makefile b/devel/p5-Parse-CPAN-Packages/Makefile
index 6463429af914..747606d6709d 100644
--- a/devel/p5-Parse-CPAN-Packages/Makefile
+++ b/devel/p5-Parse-CPAN-Packages/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Parse 02packages.details.txt.gz from CPAN
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Peek>0:${PORTSDIR}/archivers/p5-Archive-Peek \
-		p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Type-Tiny>0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Archive-Peek>0:archivers/p5-Archive-Peek \
+		p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-PPI>0:textproc/p5-PPI \
+		p5-Type-Tiny>0:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-InDistDir>0:${PORTSDIR}/devel/p5-Test-InDistDir \
-		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-Test-InDistDir>0:devel/p5-Test-InDistDir \
+		p5-File-Slurp>0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-ErrorString-Perl/Makefile b/devel/p5-Parse-ErrorString-Perl/Makefile
index 9d40546560af..0bc845d837e0 100644
--- a/devel/p5-Parse-ErrorString-Perl/Makefile
+++ b/devel/p5-Parse-ErrorString-Perl/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Parse error messages from the Perl interpreter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Pod-POM>=0.27:${PORTSDIR}/textproc/p5-Pod-POM
+BUILD_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor \
+		p5-Module-Install>0:devel/p5-Module-Install \
+		p5-Pod-POM>=0.27:textproc/p5-Pod-POM
 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/devel/p5-Parse-LocalDistribution/Makefile b/devel/p5-Parse-LocalDistribution/Makefile
index 3b53722d5ac3..bb7e2fcba718 100644
--- a/devel/p5-Parse-LocalDistribution/Makefile
+++ b/devel/p5-Parse-LocalDistribution/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Parse-PMFile>=0.35:${PORTSDIR}/devel/p5-Parse-PMFile
+	p5-Parse-PMFile>=0.35:devel/p5-Parse-PMFile
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-Method-Signatures/Makefile b/devel/p5-Parse-Method-Signatures/Makefile
index 5b3de0b89f90..b8f4aff60953 100644
--- a/devel/p5-Parse-Method-Signatures/Makefile
+++ b/devel/p5-Parse-Method-Signatures/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Perl6 like method signature parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.19:${PORTSDIR}/devel/p5-Class-Load \
-		p5-List-MoreUtils>=0.20:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Traits>=0.06:${PORTSDIR}/devel/p5-MooseX-Traits \
-		p5-MooseX-Types>=0.17:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Structured>=0:${PORTSDIR}/devel/p5-MooseX-Types-Structured \
-		p5-PPI>=1.203:${PORTSDIR}/textproc/p5-PPI \
-		p5-namespace-clean>=0.10:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Class-Load>=0.19:devel/p5-Class-Load \
+		p5-List-MoreUtils>=0.20:lang/p5-List-MoreUtils \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Traits>=0.06:devel/p5-MooseX-Traits \
+		p5-MooseX-Types>=0.17:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Structured>=0:devel/p5-MooseX-Types-Structured \
+		p5-PPI>=1.203:textproc/p5-PPI \
+		p5-namespace-clean>=0.10:devel/p5-namespace-clean
 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-aliased>=0:${PORTSDIR}/devel/p5-aliased
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-aliased>=0:devel/p5-aliased
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Parse-PMFile/Makefile b/devel/p5-Parse-PMFile/Makefile
index 4cdfed60adb5..37359e81def1 100644
--- a/devel/p5-Parse-PMFile/Makefile
+++ b/devel/p5-Parse-PMFile/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension to parses .pm file as PAUSE does
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-Pidl/Makefile b/devel/p5-Parse-Pidl/Makefile
index efc102b79d45..4aa9699f6df1 100644
--- a/devel/p5-Parse-Pidl/Makefile
+++ b/devel/p5-Parse-Pidl/Makefile
@@ -12,7 +12,7 @@ COMMENT=		IDL compiler written in Perl
 
 LICENSE=		GPLv3
 
-BUILD_DEPENDS=		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 CONFLICTS=
diff --git a/devel/p5-Parse-PlainConfig/Makefile b/devel/p5-Parse-PlainConfig/Makefile
index c594db86a3cb..8f7be294b510 100644
--- a/devel/p5-Parse-PlainConfig/Makefile
+++ b/devel/p5-Parse-PlainConfig/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	peter@vereshagin.org
 COMMENT=	Perl5 module to use plain config files
 
-RUN_DEPENDS=	p5-Paranoid>0:${PORTSDIR}/devel/p5-Paranoid \
-		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Text-Tabs+Wrap>0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+RUN_DEPENDS=	p5-Paranoid>0:devel/p5-Paranoid \
+		p5-Text-ParseWords>0:textproc/p5-Text-ParseWords \
+		p5-Text-Tabs+Wrap>0:textproc/p5-Text-Tabs+Wrap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Parse-RecDescent/Makefile b/devel/p5-Parse-RecDescent/Makefile
index f676dbc1a51f..f13e6ed54443 100644
--- a/devel/p5-Parse-RecDescent/Makefile
+++ b/devel/p5-Parse-RecDescent/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Recursive descent parsing framework for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/p5-ParseLex/Makefile b/devel/p5-ParseLex/Makefile
index b85a9a04df36..2b628df64b47 100644
--- a/devel/p5-ParseLex/Makefile
+++ b/devel/p5-ParseLex/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Object-oriented generator of lexical analyzers
 
-BUILD_DEPENDS=	p5-ParseTemplate>=3.01:${PORTSDIR}/devel/p5-ParseTemplate
+BUILD_DEPENDS=	p5-ParseTemplate>=3.01:devel/p5-ParseTemplate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Abstract/Makefile b/devel/p5-Path-Abstract/Makefile
index 8b0cc8ff1332..5f80fdb6456d 100644
--- a/devel/p5-Path-Abstract/Makefile
+++ b/devel/p5-Path-Abstract/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Fast and featureful UNIX-style path parsing and manipulation
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Lazy>=0:${PORTSDIR}/devel/p5-Test-Lazy
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-Lazy>=0:devel/p5-Test-Lazy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Class-File-Lockable/Makefile b/devel/p5-Path-Class-File-Lockable/Makefile
index 36a67ff74666..e8e3afe3e7bf 100644
--- a/devel/p5-Path-Class-File-Lockable/Makefile
+++ b/devel/p5-Path-Class-File-Lockable/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Lock your files with Path::Class::File
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-NFSLock>0:${PORTSDIR}/devel/p5-File-NFSLock \
-		p5-Path-Class>0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-File-NFSLock>0:devel/p5-File-NFSLock \
+		p5-Path-Class>0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Dispatcher-Declarative/Makefile b/devel/p5-Path-Dispatcher-Declarative/Makefile
index 037453fc24b1..9e468f372f5e 100644
--- a/devel/p5-Path-Dispatcher-Declarative/Makefile
+++ b/devel/p5-Path-Dispatcher-Declarative/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sugary dispatcher for perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Path-Dispatcher>=1.02:${PORTSDIR}/devel/p5-Path-Dispatcher \
-		p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Path-Dispatcher>=1.02:devel/p5-Path-Dispatcher \
+		p5-Any-Moose>=0:devel/p5-Any-Moose \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Dispatcher/Makefile b/devel/p5-Path-Dispatcher/Makefile
index b3142540ee75..9d0d65e34f78 100644
--- a/devel/p5-Path-Dispatcher/Makefile
+++ b/devel/p5-Path-Dispatcher/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl flexible and extensible dispatch
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.12:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Try-Tiny>=0.02:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Any-Moose>=0.12:devel/p5-Any-Moose \
+		p5-Try-Tiny>=0.02:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Extended/Makefile b/devel/p5-Path-Extended/Makefile
index 862be4730921..071f2396c295 100644
--- a/devel/p5-Path-Extended/Makefile
+++ b/devel/p5-Path-Extended/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-	p5-Log-Dump>0:${PORTSDIR}/devel/p5-Log-Dump \
-	p5-Sub-Install>0:${PORTSDIR}/devel/p5-Sub-Install
+	p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+	p5-Log-Dump>0:devel/p5-Log-Dump \
+	p5-Sub-Install>0:devel/p5-Sub-Install
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-	p5-ExtUtils-MakeMaker-CPANfile>0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
+	p5-ExtUtils-MakeMaker-CPANfile>0:devel/p5-ExtUtils-MakeMaker-CPANfile
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-FindDev/Makefile b/devel/p5-Path-FindDev/Makefile
index 151e461cfda2..b70ba02f62b7 100644
--- a/devel/p5-Path-FindDev/Makefile
+++ b/devel/p5-Path-FindDev/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Find a development path in an upper hierarchy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Tiny>=0.010:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-Path-IsDev>=0.2.2:${PORTSDIR}/devel/p5-Path-IsDev \
-		p5-Path-Tiny>=0.054:${PORTSDIR}/devel/p5-Path-Tiny
+BUILD_DEPENDS=	p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
+		p5-Path-IsDev>=0.2.2:devel/p5-Path-IsDev \
+		p5-Path-Tiny>=0.054:devel/p5-Path-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Meta>0:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-CPAN-Meta-Requirements>2.120:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-		p5-Test-Simple>=1.001.003:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-CPAN-Meta>0:devel/p5-CPAN-Meta \
+		p5-CPAN-Meta-Requirements>2.120:devel/p5-CPAN-Meta-Requirements \
+		p5-Test-Simple>=1.001.003:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-IsDev/Makefile b/devel/p5-Path-IsDev/Makefile
index a0ec3a0eed14..87b27f408eef 100644
--- a/devel/p5-Path-IsDev/Makefile
+++ b/devel/p5-Path-IsDev/Makefile
@@ -15,12 +15,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Tiny>=0.010:${PORTSDIR}/devel/p5-Class-Tiny \
-	p5-File-HomeDir>0:${PORTSDIR}/devel/p5-File-HomeDir \
-	p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime \
-	p5-Path-Tiny>=0.004:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Role-Tiny>0:${PORTSDIR}/devel/p5-Role-Tiny \
-	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+	p5-Class-Tiny>=0.010:devel/p5-Class-Tiny \
+	p5-File-HomeDir>0:devel/p5-File-HomeDir \
+	p5-Module-Runtime>0:devel/p5-Module-Runtime \
+	p5-Path-Tiny>=0.004:devel/p5-Path-Tiny \
+	p5-Role-Tiny>0:devel/p5-Role-Tiny \
+	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Path-Iterator-Rule/Makefile b/devel/p5-Path-Iterator-Rule/Makefile
index 2b47dca9c3a9..fd8851db35b5 100644
--- a/devel/p5-Path-Iterator-Rule/Makefile
+++ b/devel/p5-Path-Iterator-Rule/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl extension for iterative, recursive file finder
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	p5-Data-Clone>0:${PORTSDIR}/devel/p5-Data-Clone \
-	p5-Number-Compare>=0.02:${PORTSDIR}/math/p5-Number-Compare \
-	p5-Text-Glob>0:${PORTSDIR}/textproc/p5-Text-Glob \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+	p5-Data-Clone>0:devel/p5-Data-Clone \
+	p5-Number-Compare>=0.02:math/p5-Number-Compare \
+	p5-Text-Glob>0:textproc/p5-Text-Glob \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-namespace-clean>0:devel/p5-namespace-clean
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-File-pushd>0:${PORTSDIR}/devel/p5-File-pushd \
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Filename>0:${PORTSDIR}/devel/p5-Test-Filename
+	p5-File-pushd>0:devel/p5-File-pushd \
+	p5-Path-Tiny>0:devel/p5-Path-Tiny \
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Filename>0:devel/p5-Test-Filename
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Resource/Makefile b/devel/p5-Path-Resource/Makefile
index a52d078a936e..1e3e31a4eb4e 100644
--- a/devel/p5-Path-Resource/Makefile
+++ b/devel/p5-Path-Resource/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl module for combining local path manipulation and URI manipulation
 
-BUILD_DEPENDS=	p5-Path-Abstract>0:${PORTSDIR}/devel/p5-Path-Abstract \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Path-Abstract>0:${PORTSDIR}/devel/p5-Path-Abstract \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-TEST_DEPENDS=	p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-Lazy>=0:${PORTSDIR}/devel/p5-Test-Lazy
+BUILD_DEPENDS=	p5-Path-Abstract>0:devel/p5-Path-Abstract \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Path-Abstract>0:devel/p5-Path-Abstract \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-URI>=0:net/p5-URI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
+TEST_DEPENDS=	p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-Lazy>=0:devel/p5-Test-Lazy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Path-Tiny/Makefile b/devel/p5-Path-Tiny/Makefile
index 8cf7217a03df..3c498f0dad6a 100644
--- a/devel/p5-Path-Tiny/Makefile
+++ b/devel/p5-Path-Tiny/Makefile
@@ -14,7 +14,7 @@ COMMENT=	File path utility
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Paws/Makefile b/devel/p5-Paws/Makefile
index 5d74253bc371..2e448af752fc 100644
--- a/devel/p5-Paws/Makefile
+++ b/devel/p5-Paws/Makefile
@@ -13,29 +13,29 @@ COMMENT=	Perl extension of SDK for AWS (Amazon Web Services) APIs
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
-	p5-ARGV-Struct>=0:${PORTSDIR}/devel/p5-ARGV-Struct \
-	p5-Browser-Open>0:${PORTSDIR}/www/p5-Browser-Open \
-	p5-Config-INI>0:${PORTSDIR}/devel/p5-Config-INI \
-	p5-Data-Compare>0:${PORTSDIR}/devel/p5-Data-Compare \
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-ISO8601>0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-Hash-Flatten>0:${PORTSDIR}/devel/p5-Hash-Flatten \
-	p5-IO-Socket-SSL>0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-	p5-JSON>0:${PORTSDIR}/converters/p5-JSON \
-	p5-Module-Find>0:${PORTSDIR}/devel/p5-Module-Find \
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-ClassAttribute>0:${PORTSDIR}/devel/p5-MooseX-ClassAttribute \
-	p5-MooseX-Getopt>0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-	p5-Net-Amazon-Signature-V3>=0:${PORTSDIR}/net/p5-Net-Amazon-Signature-V3 \
-	p5-Net-Amazon-Signature-V4>=0:${PORTSDIR}/net/p5-Net-Amazon-Signature-V4 \
-	p5-String-Util>=0:${PORTSDIR}/textproc/p5-String-Util \
-	p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-URI-Template>0:${PORTSDIR}/net/p5-URI-Template \
-	p5-URL-Encode>0:${PORTSDIR}/www/p5-URL-Encode \
-	p5-URL-Encode-XS>0:${PORTSDIR}/www/p5-URL-Encode-XS \
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-ARGV-Struct>=0:devel/p5-ARGV-Struct \
+	p5-Browser-Open>0:www/p5-Browser-Open \
+	p5-Config-INI>0:devel/p5-Config-INI \
+	p5-Data-Compare>0:devel/p5-Data-Compare \
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-DateTime-Format-ISO8601>0:devel/p5-DateTime-Format-ISO8601 \
+	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+	p5-Hash-Flatten>0:devel/p5-Hash-Flatten \
+	p5-IO-Socket-SSL>0:security/p5-IO-Socket-SSL \
+	p5-JSON>0:converters/p5-JSON \
+	p5-Module-Find>0:devel/p5-Module-Find \
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-ClassAttribute>0:devel/p5-MooseX-ClassAttribute \
+	p5-MooseX-Getopt>0:devel/p5-MooseX-Getopt \
+	p5-Net-Amazon-Signature-V3>=0:net/p5-Net-Amazon-Signature-V3 \
+	p5-Net-Amazon-Signature-V4>=0:net/p5-Net-Amazon-Signature-V4 \
+	p5-String-Util>=0:textproc/p5-String-Util \
+	p5-Throwable>=0:devel/p5-Throwable \
+	p5-URI>0:net/p5-URI \
+	p5-URI-Template>0:net/p5-URI-Template \
+	p5-URL-Encode>0:www/p5-URL-Encode \
+	p5-URL-Encode-XS>0:www/p5-URL-Encode-XS \
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Pegex/Makefile b/devel/p5-Pegex/Makefile
index dfc802e6a772..b1739d59863f 100644
--- a/devel/p5-Pegex/Makefile
+++ b/devel/p5-Pegex/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Acmeist PEG Parser Framework
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+BUILD_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install
+BUILD_DEPENDS+=	p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 8fb6e9c2778d..8e352fe92e8b 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Framework for passing digitally signed perl5 code between machines
 
-RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+RUN_DEPENDS=	pgp:security/pgp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Perl-Critic-Deprecated/Makefile b/devel/p5-Perl-Critic-Deprecated/Makefile
index c85c9efd0f21..75dc40cf65d9 100644
--- a/devel/p5-Perl-Critic-Deprecated/Makefile
+++ b/devel/p5-Perl-Critic-Deprecated/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Policies that are no longer included with Perl::Critic
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Perl-Critic
+BUILD_DEPENDS=	p5-Perl-Critic>=0:textproc/p5-Perl-Critic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl-Metrics-Lite/Makefile b/devel/p5-Perl-Metrics-Lite/Makefile
index d8fd74c1f3df..b16026a42670 100644
--- a/devel/p5-Perl-Metrics-Lite/Makefile
+++ b/devel/p5-Perl-Metrics-Lite/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for pluggable Perl Code Metrics System
 
 RUN_DEPENDS=	\
-	p5-PPI>=1.205:${PORTSDIR}/textproc/p5-PPI \
-	p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-	p5-Text-ASCIITable>0:${PORTSDIR}/textproc/p5-Text-ASCIITable
+	p5-PPI>=1.205:textproc/p5-PPI \
+	p5-Readonly>=1.03:devel/p5-Readonly \
+	p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl-Metrics-Simple/Makefile b/devel/p5-Perl-Metrics-Simple/Makefile
index 633f26c2e5f8..4b8c0cbceb11 100644
--- a/devel/p5-Perl-Metrics-Simple/Makefile
+++ b/devel/p5-Perl-Metrics-Simple/Makefile
@@ -13,13 +13,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-PPI>=1.113:${PORTSDIR}/textproc/p5-PPI \
-	p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-	p5-Statistics-Basic>0:${PORTSDIR}/math/p5-Statistics-Basic
+	p5-PPI>=1.113:textproc/p5-PPI \
+	p5-Readonly>=1.03:devel/p5-Readonly \
+	p5-Statistics-Basic>0:math/p5-Statistics-Basic
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Pod>0:${PORTSDIR}/devel/p5-Test-Pod \
-	p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+	p5-Test-Pod>0:devel/p5-Test-Pod \
+	p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Perl-PrereqScanner-Lite/Makefile b/devel/p5-Perl-PrereqScanner-Lite/Makefile
index f0cf2c6b2aa8..1aee5718e75c 100644
--- a/devel/p5-Perl-PrereqScanner-Lite/Makefile
+++ b/devel/p5-Perl-PrereqScanner-Lite/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Compiler-Lexer>=0.22:${PORTSDIR}/devel/p5-Compiler-Lexer \
-	p5-Module-Path>0:${PORTSDIR}/devel/p5-Module-Path
+	p5-Compiler-Lexer>=0.22:devel/p5-Compiler-Lexer \
+	p5-Module-Path>0:devel/p5-Module-Path
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl-PrereqScanner/Makefile b/devel/p5-Perl-PrereqScanner/Makefile
index 8317a714dfbb..6d5d70690005 100644
--- a/devel/p5-Perl-PrereqScanner/Makefile
+++ b/devel/p5-Perl-PrereqScanner/Makefile
@@ -14,16 +14,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Path>=0:${PORTSDIR}/devel/p5-Module-Path \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-PPI>=1.215:${PORTSDIR}/textproc/p5-PPI \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-String-RewritePrefix>=0.005:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Getopt-Long-Descriptive>=0:devel/p5-Getopt-Long-Descriptive \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Path>=0:devel/p5-Module-Path \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-PPI>=1.215:textproc/p5-PPI \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-String-RewritePrefix>=0.005:textproc/p5-String-RewritePrefix \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Perl-Version/Makefile b/devel/p5-Perl-Version/Makefile
index b3026f2dc67a..de85fb2daee9 100644
--- a/devel/p5-Perl-Version/Makefile
+++ b/devel/p5-Perl-Version/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse and manipulate Perl version strings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny
+RUN_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Builtins/Makefile b/devel/p5-Perl6-Builtins/Makefile
index 717aced79bf0..6ce396b03c73 100644
--- a/devel/p5-Perl6-Builtins/Makefile
+++ b/devel/p5-Perl6-Builtins/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide Perl 5 versions of the new Perl 6 builtins
 
-BUILD_DEPENDS=	p5-Contextual-Return>=0:${PORTSDIR}/devel/p5-Contextual-Return
+BUILD_DEPENDS=	p5-Contextual-Return>=0:devel/p5-Contextual-Return
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Export-Attrs/Makefile b/devel/p5-Perl6-Export-Attrs/Makefile
index 5f3d4e9509e7..6beb67ce6cf6 100644
--- a/devel/p5-Perl6-Export-Attrs/Makefile
+++ b/devel/p5-Perl6-Export-Attrs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl 6 'is export(...)' trait as a Perl 5 attribute
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Perl6-Form/Makefile b/devel/p5-Perl6-Form/Makefile
index 5423b339417b..98a3a398db17 100644
--- a/devel/p5-Perl6-Form/Makefile
+++ b/devel/p5-Perl6-Form/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Implements the Perl 6 'form' built-in
 
-BUILD_DEPENDS=	p5-Perl6-Export>=0:${PORTSDIR}/devel/p5-Perl6-Export
+BUILD_DEPENDS=	p5-Perl6-Export>=0:devel/p5-Perl6-Export
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Rules/Makefile b/devel/p5-Perl6-Rules/Makefile
index 293ecc1e27de..0900988444fb 100644
--- a/devel/p5-Perl6-Rules/Makefile
+++ b/devel/p5-Perl6-Rules/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements (most of) the Perl 6 regex syntax
 
-BUILD_DEPENDS=	p5-Attribute-Handlers>=0:${PORTSDIR}/devel/p5-Attribute-Handlers \
-		p5-Filter-Simple>=0:${PORTSDIR}/textproc/p5-Filter-Simple
+BUILD_DEPENDS=	p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
+		p5-Filter-Simple>=0:textproc/p5-Filter-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Perl6-Slurp/Makefile b/devel/p5-Perl6-Slurp/Makefile
index e39fb610dbcc..af7d3ac125c7 100644
--- a/devel/p5-Perl6-Slurp/Makefile
+++ b/devel/p5-Perl6-Slurp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Implements the Perl6 'slurp' built-in
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Perl6-Export>=0.07:${PORTSDIR}/devel/p5-Perl6-Export
+BUILD_DEPENDS=	p5-Perl6-Export>=0.07:devel/p5-Perl6-Export
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-PerlIO-utf8_strict/Makefile b/devel/p5-PerlIO-utf8_strict/Makefile
index 930dc602c809..165a724e2a65 100644
--- a/devel/p5-PerlIO-utf8_strict/Makefile
+++ b/devel/p5-PerlIO-utf8_strict/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Fast and correct UTF-8 IO
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index d8746c01df46..a9451e8e27db 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Symbolic link PerlIO layers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Module-Install>0:devel/p5-Module-Install
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-PerlX-Maybe/Makefile b/devel/p5-PerlX-Maybe/Makefile
index b8a7d15261ed..6b3c8423d9ca 100644
--- a/devel/p5-PerlX-Maybe/Makefile
+++ b/devel/p5-PerlX-Maybe/Makefile
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-XS_BUILD_DEPENDS=	p5-PerlX-Maybe-XS>=0:${PORTSDIR}/devel/p5-PerlX-Maybe-XS
-XS_RUN_DEPENDS=		p5-PerlX-Maybe-XS>=0:${PORTSDIR}/devel/p5-PerlX-Maybe-XS
+XS_BUILD_DEPENDS=	p5-PerlX-Maybe-XS>=0:devel/p5-PerlX-Maybe-XS
+XS_RUN_DEPENDS=		p5-PerlX-Maybe-XS>=0:devel/p5-PerlX-Maybe-XS
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Pipeline/Makefile b/devel/p5-Pipeline/Makefile
index 763b39cded8f..4113a60b4fa1 100644
--- a/devel/p5-Pipeline/Makefile
+++ b/devel/p5-Pipeline/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rouslan@rshell.net
 COMMENT=	Pipeline - Generic pipeline interface
 
-BUILD_DEPENDS=	p5-Class-ISA>=0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-IO-Null>=0:${PORTSDIR}/devel/p5-IO-Null \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Data-Structure-Util>=0:${PORTSDIR}/devel/p5-Data-Structure-Util
+BUILD_DEPENDS=	p5-Class-ISA>=0:devel/p5-Class-ISA \
+		p5-Error>=0:lang/p5-Error \
+		p5-IO-Null>=0:devel/p5-IO-Null \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-Data-Structure-Util>=0:devel/p5-Data-Structure-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Pithub/Makefile b/devel/p5-Pithub/Makefile
index 2590566c9cae..396807dc1f5c 100644
--- a/devel/p5-Pithub/Makefile
+++ b/devel/p5-Pithub/Makefile
@@ -15,17 +15,17 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Array-Iterator>=0:${PORTSDIR}/devel/p5-Array-Iterator \
-		p5-Cache-LRU>=0.04:${PORTSDIR}/devel/p5-Cache-LRU \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON-MaybeXS>=1.003003:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+		p5-Cache-LRU>=0.04:devel/p5-Cache-LRU \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON-MaybeXS>=1.003003:converters/p5-JSON-MaybeXS \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Moo>=1.001000:devel/p5-Moo \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Import-Into>=1.002004:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Path-Tiny>=0.037:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-Import-Into>=1.002004:devel/p5-Import-Into \
+		p5-Path-Tiny>=0.037:devel/p5-Path-Tiny \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Pod-Coverage-Moose/Makefile b/devel/p5-Pod-Coverage-Moose/Makefile
index baab9379c2fe..9eebbcb3dfcd 100644
--- a/devel/p5-Pod-Coverage-Moose/Makefile
+++ b/devel/p5-Pod-Coverage-Moose/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Pod::Coverage extension for Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=2.1300:${PORTSDIR}/devel/p5-Moose \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-namespace-autoclean>=0.08:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Moose>=2.1300:devel/p5-Moose \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-namespace-autoclean>=0.08:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:${PORTSDIR}/devel/p5-MooseX-AttributeHelpers \
-		p5-MooseX-Role-WithOverloading>=0:${PORTSDIR}/devel/p5-MooseX-Role-WithOverloading \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-MooseX-AttributeHelpers>=0:devel/p5-MooseX-AttributeHelpers \
+		p5-MooseX-Role-WithOverloading>=0:devel/p5-MooseX-Role-WithOverloading \
+		p5-Test-Requires>=0:devel/p5-Test-Requires
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Pod-Coverage-TrustPod/Makefile b/devel/p5-Pod-Coverage-TrustPod/Makefile
index 9ac383f4ba31..12af6fc5e033 100644
--- a/devel/p5-Pod-Coverage-TrustPod/Makefile
+++ b/devel/p5-Pod-Coverage-TrustPod/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Declare trusted symbol names in POD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Pod-Eventual>=0:${PORTSDIR}/textproc/p5-Pod-Eventual
-TEST_DEPENDS=	p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+BUILD_DEPENDS=	p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-Pod-Eventual>=0:textproc/p5-Pod-Eventual
+TEST_DEPENDS=	p5-Test-Pod>=1.41:devel/p5-Test-Pod
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Pod-Coverage/Makefile b/devel/p5-Pod-Coverage/Makefile
index bc9266d68e9a..52c9df63ecff 100644
--- a/devel/p5-Pod-Coverage/Makefile
+++ b/devel/p5-Pod-Coverage/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Checks if the documentation of a module is comprehensive
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=2.01:${PORTSDIR}/devel/p5-Devel-Symdump
-RUN_DEPENDS=	p5-Devel-Symdump>=2.01:${PORTSDIR}/devel/p5-Devel-Symdump
+BUILD_DEPENDS=	p5-Devel-Symdump>=2.01:devel/p5-Devel-Symdump
+RUN_DEPENDS=	p5-Devel-Symdump>=2.01:devel/p5-Devel-Symdump
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Pod-Usage/Makefile b/devel/p5-Pod-Usage/Makefile
index 0e8e9e7dd334..49c2e22b7931 100644
--- a/devel/p5-Pod-Usage/Makefile
+++ b/devel/p5-Pod-Usage/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Print a usage message from embedded pod documentation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-podlators>=4:${PORTSDIR}/textproc/p5-podlators
+BUILD_DEPENDS=	p5-podlators>=4:textproc/p5-podlators
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Proc-Daemon/Makefile b/devel/p5-Proc-Daemon/Makefile
index c5cfba21beae..0d8935f6aeb4 100644
--- a/devel/p5-Proc-Daemon/Makefile
+++ b/devel/p5-Proc-Daemon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module that provides a method to daemonify a Perl script
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Proc-ProcessTable>0:${PORTSDIR}/devel/p5-Proc-ProcessTable
+TEST_DEPENDS=	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Proc-Fork/Makefile b/devel/p5-Proc-Fork/Makefile
index 80198a2fe1c9..162ac7e8145e 100644
--- a/devel/p5-Proc-Fork/Makefile
+++ b/devel/p5-Proc-Fork/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Proc::Fork - Simple, intuitive interface to the fork() system call
 
-BUILD_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		p5-Object-Tiny-Lvalue>=0:${PORTSDIR}/devel/p5-Object-Tiny-Lvalue
-RUN_DEPENDS=	p5-Exporter-Tidy>=0:${PORTSDIR}/devel/p5-Exporter-Tidy \
-		p5-Object-Tiny-Lvalue>=0:${PORTSDIR}/devel/p5-Object-Tiny-Lvalue
+BUILD_DEPENDS=	p5-Exporter-Tidy>=0:devel/p5-Exporter-Tidy \
+		p5-Object-Tiny-Lvalue>=0:devel/p5-Object-Tiny-Lvalue
+RUN_DEPENDS=	p5-Exporter-Tidy>=0:devel/p5-Exporter-Tidy \
+		p5-Object-Tiny-Lvalue>=0:devel/p5-Object-Tiny-Lvalue
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Proc-Guard/Makefile b/devel/p5-Proc-Guard/Makefile
index 1e5ec7d9535e..7829139ae417 100644
--- a/devel/p5-Proc-Guard/Makefile
+++ b/devel/p5-Proc-Guard/Makefile
@@ -13,9 +13,9 @@ 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}
-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/devel/p5-Proc-Pidfile/Makefile b/devel/p5-Proc-Pidfile/Makefile
index c1ec9d589c6b..5a91735c9670 100644
--- a/devel/p5-Proc-Pidfile/Makefile
+++ b/devel/p5-Proc-Pidfile/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Proc-ProcessTable>0:${PORTSDIR}/devel/p5-Proc-ProcessTable
+	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Proc-WaitStat/Makefile b/devel/p5-Proc-WaitStat/Makefile
index ab68e90fb0f4..643029f73789 100644
--- a/devel/p5-Proc-WaitStat/Makefile
+++ b/devel/p5-Proc-WaitStat/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Interpret and act on wait() status values
 
-BUILD_DEPENDS=	p5-IPC-Signal>=0:${PORTSDIR}/devel/p5-IPC-Signal
+BUILD_DEPENDS=	p5-IPC-Signal>=0:devel/p5-IPC-Signal
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile
index 873265f6d7ef..0d45ad9dce30 100644
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create Gantt charts to manage project scheduling
 
-BUILD_DEPENDS=	p5-Class-Date>=0:${PORTSDIR}/devel/p5-Class-Date \
-		convert:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	p5-Class-Date>=0:devel/p5-Class-Date \
+		convert:graphics/ImageMagick
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Project-Libs/Makefile b/devel/p5-Project-Libs/Makefile
index c485024e8748..0f01f64784c6 100644
--- a/devel/p5-Project-Libs/Makefile
+++ b/devel/p5-Project-Libs/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to add module directories of a project into @INC
 
 RUN_DEPENDS=	\
-	p5-FindBin-libs>0:${PORTSDIR}/devel/p5-FindBin-libs
+	p5-FindBin-libs>0:devel/p5-FindBin-libs
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Qudo/Makefile b/devel/p5-Qudo/Makefile
index 27f5c45196b9..81aa5575e424 100644
--- a/devel/p5-Qudo/Makefile
+++ b/devel/p5-Qudo/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for simple and extensible job queue manager
 
 RUN_DEPENDS=	\
-	p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-	p5-DBIx-Skinny>0:${PORTSDIR}/databases/p5-DBIx-Skinny \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+	p5-DBI>0:databases/p5-DBI \
+	p5-DBIx-Skinny>0:databases/p5-DBIx-Skinny \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-RPSL-Parser/Makefile b/devel/p5-RPSL-Parser/Makefile
index 2af780048463..33361a565e96 100644
--- a/devel/p5-RPSL-Parser/Makefile
+++ b/devel/p5-RPSL-Parser/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Router Policy Specification Language (RFC2622) Parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.31:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0.31:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.039001,0.039_001,0.19,0.28,0.29,0.32,0.38,0.39
diff --git a/devel/p5-RRDTool-OO/Makefile b/devel/p5-RRDTool-OO/Makefile
index 40576d58accb..3bcaa59d79f6 100644
--- a/devel/p5-RRDTool-OO/Makefile
+++ b/devel/p5-RRDTool-OO/Makefile
@@ -13,8 +13,8 @@ COMMENT=	RRDTool::OO - Object-oriented interface to RRDTool
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-Log-Log4perl>=0.40:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	rrdtool>=0:databases/rrdtool \
+		p5-Log-Log4perl>=0.40:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Rcs-Agent/Makefile b/devel/p5-Rcs-Agent/Makefile
index 97d356a063c7..accc6967443b 100644
--- a/devel/p5-Rcs-Agent/Makefile
+++ b/devel/p5-Rcs-Agent/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	nick@foobar.org
 COMMENT=	Perl module for RCS archive manipulation
 
-BUILD_DEPENDS=	p5-String-ShellQuote>1.00:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-String-ShellQuote>1.00:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Readonly-XS/Makefile b/devel/p5-Readonly-XS/Makefile
index 9611e9b3dfa5..1a0a6eff5ba2 100644
--- a/devel/p5-Readonly-XS/Makefile
+++ b/devel/p5-Readonly-XS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Companion module for Readonly.pm, to speed up read-only scalar variable
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=1.02:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Readonly>=1.02:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Reflex/Makefile b/devel/p5-Reflex/Makefile
index dfea8b1fa9a5..91298309c1db 100644
--- a/devel/p5-Reflex/Makefile
+++ b/devel/p5-Reflex/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Class library for flexible, reactive programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-POE>=1.294:${PORTSDIR}/devel/p5-POE \
-		p5-Moose>=2.0203:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0.23:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized
+BUILD_DEPENDS=	p5-POE>=1.294:devel/p5-POE \
+		p5-Moose>=2.0203:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0.23:devel/p5-MooseX-Role-Parameterized
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Regexp-Assemble-Compressed/Makefile b/devel/p5-Regexp-Assemble-Compressed/Makefile
index 10c678926d2a..eb04e6be229b 100644
--- a/devel/p5-Regexp-Assemble-Compressed/Makefile
+++ b/devel/p5-Regexp-Assemble-Compressed/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to compress Regular Expression
 
 RUN_DEPENDS=	\
-	p5-Regexp-Assemble>0:${PORTSDIR}/devel/p5-Regexp-Assemble
+	p5-Regexp-Assemble>0:devel/p5-Regexp-Assemble
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Regexp-Lexer/Makefile b/devel/p5-Regexp-Lexer/Makefile
index 411cb835d4c8..91cfe89a9993 100644
--- a/devel/p5-Regexp-Lexer/Makefile
+++ b/devel/p5-Regexp-Lexer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lexer for Perl regular expressions
 
-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/devel/p5-Regexp-RegGrp/Makefile b/devel/p5-Regexp-RegGrp/Makefile
index fb72de185e0b..2905e3b01fde 100644
--- a/devel/p5-Regexp-RegGrp/Makefile
+++ b/devel/p5-Regexp-RegGrp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Groups a regular expressions collection
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Reply/Makefile b/devel/p5-Reply/Makefile
index 1a0fcc37972d..548ad268836f 100644
--- a/devel/p5-Reply/Makefile
+++ b/devel/p5-Reply/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Lightweight, extensible REPL for Perl
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Config-INI-Reader-Ordered>=0:${PORTSDIR}/devel/p5-Config-INI-Reader-Ordered \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-Eval-Closure>=0.11:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Package-Stash>=0:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Config-INI-Reader-Ordered>=0:devel/p5-Config-INI-Reader-Ordered \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-Eval-Closure>=0.11:devel/p5-Eval-Closure \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Package-Stash>=0:devel/p5-Package-Stash \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Return-MultiLevel/Makefile b/devel/p5-Return-MultiLevel/Makefile
index 5184b052076b..e6ec2727fbb9 100644
--- a/devel/p5-Return-MultiLevel/Makefile
+++ b/devel/p5-Return-MultiLevel/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Return across multiple call levels
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Munge>=0.07:${PORTSDIR}/devel/p5-Data-Munge
+BUILD_DEPENDS=	p5-Data-Munge>=0.07:devel/p5-Data-Munge
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Rinci/Makefile b/devel/p5-Rinci/Makefile
index eb718671fad1..227fa5ca4118 100644
--- a/devel/p5-Rinci/Makefile
+++ b/devel/p5-Rinci/Makefile
@@ -15,8 +15,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-DefHash>=1.0.6:${PORTSDIR}/devel/p5-DefHash \
-		p5-Sah>=0.9.36:${PORTSDIR}/devel/p5-Sah
+TEST_DEPENDS=	p5-DefHash>=1.0.6:devel/p5-DefHash \
+		p5-Sah>=0.9.36:devel/p5-Sah
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Role-HasMessage/Makefile b/devel/p5-Role-HasMessage/Makefile
index c36a631a302d..947127b333c2 100644
--- a/devel/p5-Role-HasMessage/Makefile
+++ b/devel/p5-Role-HasMessage/Makefile
@@ -15,11 +15,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Role-Parameterized>=0:${PORTSDIR}/devel/p5-MooseX-Role-Parameterized \
-		p5-String-Errf>=0:${PORTSDIR}/devel/p5-String-Errf \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \
+		p5-String-Errf>=0:devel/p5-String-Errf \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Role-Identifiable/Makefile b/devel/p5-Role-Identifiable/Makefile
index d9e764f2c82a..9a38b817c5e7 100644
--- a/devel/p5-Role-Identifiable/Makefile
+++ b/devel/p5-Role-Identifiable/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Role-Tiny/Makefile b/devel/p5-Role-Tiny/Makefile
index 4f93505e8140..fca00f4e8b59 100644
--- a/devel/p5-Role-Tiny/Makefile
+++ b/devel/p5-Role-Tiny/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Roles, like a nouvelle cusine portion size slice of Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.05:${PORTSDIR}/devel/p5-Class-Method-Modifiers
+BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.05:devel/p5-Class-Method-Modifiers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0.003:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-strictures>=0:${PORTSDIR}/devel/p5-strictures
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-strictures>=0:devel/p5-strictures
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Rose-DateTime/Makefile b/devel/p5-Rose-DateTime/Makefile
index 2df41ce4d9ea..4743c72b266c 100644
--- a/devel/p5-Rose-DateTime/Makefile
+++ b/devel/p5-Rose-DateTime/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DateTime helper functions and objects
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Rose-Object>=0.82:${PORTSDIR}/devel/p5-Rose-Object
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-Rose-Object>=0.82:devel/p5-Rose-Object
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Rose-Object/Makefile b/devel/p5-Rose-Object/Makefile
index 98cbac5377a8..e78329657cdc 100644
--- a/devel/p5-Rose-Object/Makefile
+++ b/devel/p5-Rose-Object/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple object base class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor
+TEST_DEPENDS=	p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Router-R3/Makefile b/devel/p5-Router-R3/Makefile
index 8a77e640b6c2..d7d5cdbde5e2 100644
--- a/devel/p5-Router-R3/Makefile
+++ b/devel/p5-Router-R3/Makefile
@@ -13,9 +13,9 @@ COMMENT=	XS wrapper around a C library R3
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=0:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-LIB_DEPENDS=	libr3.so:${PORTSDIR}/devel/libr3
+BUILD_DEPENDS=	p5-ExtUtils-MakeMaker>=0:devel/p5-ExtUtils-MakeMaker \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
+LIB_DEPENDS=	libr3.so:devel/libr3
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-RunApp/Makefile b/devel/p5-RunApp/Makefile
index fa535eb20ba9..3c77aa50d051 100644
--- a/devel/p5-RunApp/Makefile
+++ b/devel/p5-RunApp/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Generic module to run web-applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-App-Control>=0:${PORTSDIR}/devel/p5-App-Control \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-App-Control>=0:devel/p5-App-Control \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile
index 05e7db9f21c7..aa304cba2c0b 100644
--- a/devel/p5-SDL/Makefile
+++ b/devel/p5-SDL/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Perl Bindings for SDL
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Alien-SDL>=1.426:${PORTSDIR}/devel/p5-Alien-SDL
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-RUN_DEPENDS=	p5-Alien-SDL>=1.426:${PORTSDIR}/devel/p5-Alien-SDL \
-		p5-Tie-Simple>=0:${PORTSDIR}/devel/p5-Tie-Simple
+BUILD_DEPENDS=	p5-Alien-SDL>=1.426:devel/p5-Alien-SDL
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libsmpeg.so:multimedia/smpeg
+RUN_DEPENDS=	p5-Alien-SDL>=1.426:devel/p5-Alien-SDL \
+		p5-Tie-Simple>=0:devel/p5-Tie-Simple
 
 USES=		jpeg perl5
 USE_GL=		glu
diff --git a/devel/p5-SOAP-WSDL/Makefile b/devel/p5-SOAP-WSDL/Makefile
index b47f18bf30c4..64fe9a10f756 100644
--- a/devel/p5-SOAP-WSDL/Makefile
+++ b/devel/p5-SOAP-WSDL/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl module for SOAP with WSDL support
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.20:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Std-Fast>=0.0.5:${PORTSDIR}/devel/p5-Class-Std-Fast \
-		p5-Template-Toolkit>=2.18:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Load>=0.20:devel/p5-Class-Load \
+		p5-Class-Std-Fast>=0.0.5:devel/p5-Class-Std-Fast \
+		p5-Template-Toolkit>=2.18:www/p5-Template-Toolkit \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SUPER/Makefile b/devel/p5-SUPER/Makefile
index 725adb831e33..b15289690e9d 100644
--- a/devel/p5-SUPER/Makefile
+++ b/devel/p5-SUPER/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Perl module control superclass method dispatch
 
-BUILD_DEPENDS=	p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify
+BUILD_DEPENDS=	p5-Sub-Identify>=0.04:devel/p5-Sub-Identify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-ACL/Makefile b/devel/p5-SVN-ACL/Makefile
index 9f2fd6a5690f..18a7a7039539 100644
--- a/devel/p5-SVN-ACL/Makefile
+++ b/devel/p5-SVN-ACL/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple ACL frontend for subversion
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index ec767ec7228f..898094c06b46 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension to manipulate SVN Access files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tie-IxHash>=1.21:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-Tie-IxHash>=1.21:devel/p5-Tie-IxHash \
+		p5-subversion>=0:devel/p5-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Agent/Makefile b/devel/p5-SVN-Agent/Makefile
index 478af9cce0e2..88b56f042c16 100644
--- a/devel/p5-SVN-Agent/Makefile
+++ b/devel/p5-SVN-Agent/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Simple svn manipulation
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Dumpfile/Makefile b/devel/p5-SVN-Dumpfile/Makefile
index b3dccb31fade..ef1dc772ee5f 100644
--- a/devel/p5-SVN-Dumpfile/Makefile
+++ b/devel/p5-SVN-Dumpfile/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access and manipulate Subversion dumpfiles
 
-BUILD_DEPENDS=	p5-Data-GUID>=0:${PORTSDIR}/devel/p5-Data-GUID \
-		p5-TimeDate>=2.27:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Data-GUID>=0:devel/p5-Data-GUID \
+		p5-TimeDate>=2.27:devel/p5-TimeDate \
+		p5-Readonly>=1.03:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Hook/Makefile b/devel/p5-SVN-Hook/Makefile
index d839074f5aa3..2fb50c677c4f 100644
--- a/devel/p5-SVN-Hook/Makefile
+++ b/devel/p5-SVN-Hook/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module for managing Subversion hook scripts
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Hooks/Makefile b/devel/p5-SVN-Hooks/Makefile
index c4aa5cb847c1..00e2e608d5fd 100644
--- a/devel/p5-SVN-Hooks/Makefile
+++ b/devel/p5-SVN-Hooks/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Framework for implementing Subversion hooks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Util>=0:${PORTSDIR}/devel/p5-Data-Util \
-		p5-SVN-Look>=0:${PORTSDIR}/devel/p5-SVN-Look \
-		p5-SVN-Notify>=0:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-JIRA-Client>=0:${PORTSDIR}/devel/p5-JIRA-Client \
-		p5-XMLRPC-Lite>0:${PORTSDIR}/net/p5-XMLRPC-Lite \
-		subversion>=1.4.0:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS=	p5-Data-Util>=0:devel/p5-Data-Util \
+		p5-SVN-Look>=0:devel/p5-SVN-Look \
+		p5-SVN-Notify>=0:devel/p5-SVN-Notify \
+		p5-JIRA-Client>=0:devel/p5-JIRA-Client \
+		p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite \
+		subversion>=1.4.0:devel/subversion
 RUN_DEPENDS:=	${BUILD_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/devel/p5-SVN-Log/Makefile b/devel/p5-SVN-Log/Makefile
index 7c3ad6e418e0..76c36beb1f25 100644
--- a/devel/p5-SVN-Log/Makefile
+++ b/devel/p5-SVN-Log/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	SVN::Log - Extract change logs from a Subversion server
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Look/Makefile b/devel/p5-SVN-Look/Makefile
index 9a5ddd9649e1..9b79eefd4f8d 100644
--- a/devel/p5-SVN-Look/Makefile
+++ b/devel/p5-SVN-Look/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Caching wrapper around the svnlook command
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		subversion>=1.7.0:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		subversion>=1.7.0:devel/subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Mirror/Makefile b/devel/p5-SVN-Mirror/Makefile
index 9b2ef423579f..00743b8a6cb0 100644
--- a/devel/p5-SVN-Mirror/Makefile
+++ b/devel/p5-SVN-Mirror/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Mirror remote subversion repository to local
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-SVN-Simple>=0:${PORTSDIR}/devel/p5-SVN-Simple \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-VCP-autrijus>=0:${PORTSDIR}/devel/p5-VCP-autrijus \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-SVN-Simple>=0:devel/p5-SVN-Simple \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-URI>=0:net/p5-URI \
+		p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+		p5-subversion>=0:devel/p5-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Notify-Config/Makefile b/devel/p5-SVN-Notify-Config/Makefile
index 1bb6680fb9fd..7c9ac499ba9e 100644
--- a/devel/p5-SVN-Notify-Config/Makefile
+++ b/devel/p5-SVN-Notify-Config/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Perl module for config-driven Subversion notification
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svnlook:${PORTSDIR}/devel/subversion \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-YAML>=0.62:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	${LOCALBASE}/bin/svnlook:devel/subversion \
+		p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
+		p5-YAML>=0.62:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.1:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0.1:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile b/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
index 435884046d18..e418970b647e 100644
--- a/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
+++ b/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Determines Subversion accounts to receive email via the authz file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Access>=0:${PORTSDIR}/devel/p5-SVN-Access \
-		p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	p5-SVN-Access>=0:${PORTSDIR}/devel/p5-SVN-Access \
-		p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	p5-SVN-Access>=0:devel/p5-SVN-Access \
+		p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
+RUN_DEPENDS=	p5-SVN-Access>=0:devel/p5-SVN-Access \
+		p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
index d709996efae7..707054c60a6f 100644
--- a/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
+++ b/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Converts account names to email address based on a flat-file database
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
+RUN_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Notify-Filter-Markdown/Makefile b/devel/p5-SVN-Notify-Filter-Markdown/Makefile
index 6d2452b2f3ae..3952f45f4540 100644
--- a/devel/p5-SVN-Notify-Filter-Markdown/Makefile
+++ b/devel/p5-SVN-Notify-Filter-Markdown/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl module to convert SVN::Notify log messages from Markdown to HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-Text-Markdown>=1.04:${PORTSDIR}/textproc/p5-Text-Markdown
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-Text-Markdown>=1.04:${PORTSDIR}/textproc/p5-Text-Markdown
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
+		p5-Text-Markdown>=1.04:textproc/p5-Text-Markdown
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-SVN-Notify>=2.70:devel/p5-SVN-Notify \
+		p5-Text-Markdown>=1.04:textproc/p5-Text-Markdown
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-SVN-Notify-Filter-Watchers/Makefile b/devel/p5-SVN-Notify-Filter-Watchers/Makefile
index a94a8b5ca764..27392283e95a 100644
--- a/devel/p5-SVN-Notify-Filter-Watchers/Makefile
+++ b/devel/p5-SVN-Notify-Filter-Watchers/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Subscribe to SVN::Notify commits with a Subversion property
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
+RUN_DEPENDS=	p5-SVN-Notify>=2.72:devel/p5-SVN-Notify
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Notify-Mirror/Makefile b/devel/p5-SVN-Notify-Mirror/Makefile
index 0fd222a3e960..f21d96bc12a9 100644
--- a/devel/p5-SVN-Notify-Mirror/Makefile
+++ b/devel/p5-SVN-Notify-Mirror/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Keep a mirrored working copy of a repository path
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVN-Notify>=2.83:${PORTSDIR}/devel/p5-SVN-Notify \
-		p5-YAML>=0.81:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-SVN-Notify>=2.83:devel/p5-SVN-Notify \
+		p5-YAML>=0.81:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -28,11 +28,11 @@ CONFIG_DESC=	Enable YAML syntax for post-commit hook
 SSH_DESC=	Enable SSH for remote working copy update
 RSYNC_DESC=	Enable rsync for remote working copy update
 
-CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0.0906:${PORTSDIR}/devel/p5-SVN-Notify-Config
-CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0.0906:${PORTSDIR}/devel/p5-SVN-Notify-Config
-RSYNC_BUILD_DEPENDS=	p5-File-Rsync>=0.42:${PORTSDIR}/net/p5-File-Rsync
-RSYNC_RUN_DEPENDS=	p5-File-Rsync>=0.42:${PORTSDIR}/net/p5-File-Rsync
-SSH_BUILD_DEPENDS=	p5-Net-SSH>=0.08:${PORTSDIR}/net/p5-Net-SSH
-SSH_RUN_DEPENDS=	p5-Net-SSH>=0.08:${PORTSDIR}/net/p5-Net-SSH
+CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0.0906:devel/p5-SVN-Notify-Config
+CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0.0906:devel/p5-SVN-Notify-Config
+RSYNC_BUILD_DEPENDS=	p5-File-Rsync>=0.42:net/p5-File-Rsync
+RSYNC_RUN_DEPENDS=	p5-File-Rsync>=0.42:net/p5-File-Rsync
+SSH_BUILD_DEPENDS=	p5-Net-SSH>=0.08:net/p5-Net-SSH
+SSH_RUN_DEPENDS=	p5-Net-SSH>=0.08:net/p5-Net-SSH
 
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-Notify-Snapshot/Makefile b/devel/p5-SVN-Notify-Snapshot/Makefile
index 865d6b76c180..e1843d5e52aa 100644
--- a/devel/p5-SVN-Notify-Snapshot/Makefile
+++ b/devel/p5-SVN-Notify-Snapshot/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Take snapshots from Subversion activity
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svnnotify:${PORTSDIR}/devel/p5-SVN-Notify
-RUN_DEPENDS=	${LOCALBASE}/bin/svnnotify:${PORTSDIR}/devel/p5-SVN-Notify
+BUILD_DEPENDS=	${LOCALBASE}/bin/svnnotify:devel/p5-SVN-Notify
+RUN_DEPENDS=	${LOCALBASE}/bin/svnnotify:devel/p5-SVN-Notify
 
 OPTIONS_DEFINE=	CONFIG
 CONFIG_DESC=	Enable YAML syntax for post-commit hook
@@ -23,7 +23,7 @@ CONFIG_DESC=	Enable YAML syntax for post-commit hook
 USES=		perl5
 USE_PERL5=	modbuild
 
-CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0:${PORTSDIR}/devel/p5-SVN-Notify-Config
-CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0:${PORTSDIR}/devel/p5-SVN-Notify-Config
+CONFIG_BUILD_DEPENDS=	p5-SVN-Notify-Config>=0:devel/p5-SVN-Notify-Config
+CONFIG_RUN_DEPENDS=	p5-SVN-Notify-Config>=0:devel/p5-SVN-Notify-Config
 
 .include <bsd.port.mk>
diff --git a/devel/p5-SVN-S4/Makefile b/devel/p5-SVN-S4/Makefile
index 4a81a392db54..1654270c8295 100644
--- a/devel/p5-SVN-S4/Makefile
+++ b/devel/p5-SVN-S4/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Wrapper for subversion program
 LICENSE=	ART20 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
-RUN_DEPENDS=	p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-IO-AIO>=0:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion
+RUN_DEPENDS=	p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-IO-AIO>=0:devel/p5-IO-AIO \
+		p5-subversion>=0:devel/p5-subversion
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-SVN-Simple/Makefile b/devel/p5-SVN-Simple/Makefile
index 21156575a68e..1020b260221f 100644
--- a/devel/p5-SVN-Simple/Makefile
+++ b/devel/p5-SVN-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple interface to SVN::Delta::Editor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Statistics/Makefile b/devel/p5-SVN-Statistics/Makefile
index 03b1be768fdb..a3710e494a3e 100644
--- a/devel/p5-SVN-Statistics/Makefile
+++ b/devel/p5-SVN-Statistics/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	SVN::Statistics - perl module to create subversion statistics
 
-BUILD_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO \
-		p5-Data-Dumper-Simple>=0:${PORTSDIR}/devel/p5-Data-Dumper-Simple \
-		p5-IO-Toolkit>=0:${PORTSDIR}/devel/p5-IO-Toolkit
+BUILD_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-RRDTool-OO>=0:devel/p5-RRDTool-OO \
+		p5-Data-Dumper-Simple>=0:devel/p5-Data-Dumper-Simple \
+		p5-IO-Toolkit>=0:devel/p5-IO-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-SVN-Web/Makefile b/devel/p5-SVN-Web/Makefile
index 3f4e7782c77c..bff043d754eb 100644
--- a/devel/p5-SVN-Web/Makefile
+++ b/devel/p5-SVN-Web/Makefile
@@ -11,29 +11,29 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Subversion repository web frontend
 
-RUN_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Locale-Maketext-Simple>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS \
-		p5-XML-RSS-Parser>=0:${PORTSDIR}/textproc/p5-XML-RSS-Parser \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-Exception-Class>=1.22:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Template-Plugin-Clickable-Email>=0:${PORTSDIR}/www/p5-Template-Plugin-Clickable-Email \
-		p5-Template-Plugin-Clickable>=0:${PORTSDIR}/www/p5-Template-Plugin-Clickable \
-		p5-Template-Plugin-Number-Format>=0:${PORTSDIR}/www/p5-Template-Plugin-Number-Format \
-		p5-Template-Plugin-Subst>=0:${PORTSDIR}/www/p5-Template-Plugin-Subst \
-		p5-Text-Diff-HTML>=0:${PORTSDIR}/textproc/p5-Text-Diff-HTML \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Locale-Maketext-Simple>=0:devel/p5-Locale-Maketext-Simple \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS \
+		p5-XML-RSS-Parser>=0:textproc/p5-XML-RSS-Parser \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-Exception-Class>=1.22:devel/p5-Exception-Class \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-Locale-Maketext-Lexicon>=0:devel/p5-Locale-Maketext-Lexicon \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Template-Plugin-Clickable-Email>=0:www/p5-Template-Plugin-Clickable-Email \
+		p5-Template-Plugin-Clickable>=0:www/p5-Template-Plugin-Clickable \
+		p5-Template-Plugin-Number-Format>=0:www/p5-Template-Plugin-Number-Format \
+		p5-Template-Plugin-Subst>=0:www/p5-Template-Plugin-Subst \
+		p5-Text-Diff-HTML>=0:textproc/p5-Text-Diff-HTML \
+		p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-Benchmark>=0:${PORTSDIR}/devel/p5-Test-Benchmark \
-		p5-Test-HTML-Tidy>=0:${PORTSDIR}/devel/p5-Test-HTML-Tidy \
-		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+		p5-Test-Benchmark>=0:devel/p5-Test-Benchmark \
+		p5-Test-HTML-Tidy>=0:devel/p5-Test-HTML-Tidy \
+		p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	bin/svnweb-install
diff --git a/devel/p5-Sah/Makefile b/devel/p5-Sah/Makefile
index 683328c2c09e..e75c257d3c3f 100644
--- a/devel/p5-Sah/Makefile
+++ b/devel/p5-Sah/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Schema for data structures (specification)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install
-TEST_DEPENDS=	p5-DefHash>=1.0.6:${PORTSDIR}/devel/p5-DefHash
+BUILD_DEPENDS=	p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install
+TEST_DEPENDS=	p5-DefHash>=1.0.6:devel/p5-DefHash
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Scalar-Defer/Makefile b/devel/p5-Scalar-Defer/Makefile
index bdab5ecab973..ae68334d1e79 100644
--- a/devel/p5-Scalar-Defer/Makefile
+++ b/devel/p5-Scalar-Defer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Calculate values on demand
 
-BUILD_DEPENDS=	p5-Class-InsideOut>=0:${PORTSDIR}/devel/p5-Class-InsideOut \
-		p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite
+BUILD_DEPENDS=	p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
+		p5-Exporter-Lite>=0:devel/p5-Exporter-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Scalar-Does/Makefile b/devel/p5-Scalar-Does/Makefile
index 77c615be0914..7a91a3a08855 100644
--- a/devel/p5-Scalar-Does/Makefile
+++ b/devel/p5-Scalar-Does/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Like ref() but useful
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Type-Tiny>=0.004:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-lexical-underscore>=0:${PORTSDIR}/devel/p5-lexical-underscore \
-		p5-namespace-clean>=0.19:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+		p5-Type-Tiny>=0.004:devel/p5-Type-Tiny \
+		p5-URI>=0:net/p5-URI \
+		p5-lexical-underscore>=0:devel/p5-lexical-underscore \
+		p5-namespace-clean>=0.19:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires
+TEST_DEPENDS=	p5-IO-All>=0:devel/p5-IO-All \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Requires>=0.06:devel/p5-Test-Requires
 
 CONFLICTS_INSTALL=	p5-IO-Detect-[0-9]*
 
diff --git a/devel/p5-Sentinel/Makefile b/devel/p5-Sentinel/Makefile
index e9f32a1c5979..bcbd1bc2a085 100644
--- a/devel/p5-Sentinel/Makefile
+++ b/devel/p5-Sentinel/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Create lightweight SCALARs with get/set callbacks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile
index 8963f635b56f..d10d9e0bf3a2 100644
--- a/devel/p5-Sepia/Makefile
+++ b/devel/p5-Sepia/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Simple Emacs-Perl Interface
 
-BUILD_DEPENDS=	p5-Devel-Size>=0:${PORTSDIR}/devel/p5-Devel-Size \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Devel-LexAlias>=0:${PORTSDIR}/devel/p5-Devel-LexAlias \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Module-Info>=0:${PORTSDIR}/devel/p5-Module-Info \
-		p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource
+BUILD_DEPENDS=	p5-Devel-Size>=0:devel/p5-Devel-Size \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-PadWalker>=0:devel/p5-PadWalker \
+		p5-Devel-LexAlias>=0:devel/p5-Devel-LexAlias \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Module-Info>=0:devel/p5-Module-Info \
+		p5-BSD-Resource>=0:devel/p5-BSD-Resource
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake makeinfo perl5
diff --git a/devel/p5-Set-Array/Makefile b/devel/p5-Set-Array/Makefile
index 35d5edbc1931..bcda41b14258 100644
--- a/devel/p5-Set-Array/Makefile
+++ b/devel/p5-Set-Array/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Arrays as objects with set operations
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0.11:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Want>=0:${PORTSDIR}/devel/p5-Want
+BUILD_DEPENDS=	p5-Try-Tiny>=0.11:lang/p5-Try-Tiny \
+		p5-Want>=0:devel/p5-Want
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Set-ConsistentHash/Makefile b/devel/p5-Set-ConsistentHash/Makefile
index b347effc0c9f..3107a9bc60d9 100644
--- a/devel/p5-Set-ConsistentHash/Makefile
+++ b/devel/p5-Set-ConsistentHash/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for doing consistent hashing
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index b5719ea7e2ab..1b184463d35f 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl module to manage sets of objects
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Shape/Makefile b/devel/p5-Shape/Makefile
index 4d0486a43fb5..514b704e9941 100644
--- a/devel/p5-Shape/Makefile
+++ b/devel/p5-Shape/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to read and write shapefiles via shapelib
 
-LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+LIB_DEPENDS=	libshp.so:devel/shapelib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Shell-Base/Makefile b/devel/p5-Shell-Base/Makefile
index ed6c0fef1046..baaf845a72e6 100644
--- a/devel/p5-Shell-Base/Makefile
+++ b/devel/p5-Shell-Base/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module implementing a simple command shell
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Text-Shellwords>=0:${PORTSDIR}/textproc/p5-Text-Shellwords
+BUILD_DEPENDS=	p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Text-Shellwords>=0:textproc/p5-Text-Shellwords
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Shell-EnvImporter/Makefile b/devel/p5-Shell-EnvImporter/Makefile
index 6d39cbebe391..ad9ec95aae78 100644
--- a/devel/p5-Shell-EnvImporter/Makefile
+++ b/devel/p5-Shell-EnvImporter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	Inherit different shell environments and restore previous
 
-RUN_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+RUN_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-ShipIt-Step-Manifest/Makefile b/devel/p5-ShipIt-Step-Manifest/Makefile
index 4af112e5b9a4..083f9c9f4df2 100644
--- a/devel/p5-ShipIt-Step-Manifest/Makefile
+++ b/devel/p5-ShipIt-Step-Manifest/Makefile
@@ -15,8 +15,8 @@ COMMENT=	ShipIt step for recreating the MANIFEST
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dist-Joseki>=0:${PORTSDIR}/devel/p5-Dist-Joseki \
-		p5-ShipIt>=0:${PORTSDIR}/devel/p5-ShipIt
+BUILD_DEPENDS=	p5-Dist-Joseki>=0:devel/p5-Dist-Joseki \
+		p5-ShipIt>=0:devel/p5-ShipIt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Sort-Key-DateTime/Makefile b/devel/p5-Sort-Key-DateTime/Makefile
index fd8d8c049fea..b404644bca6f 100644
--- a/devel/p5-Sort-Key-DateTime/Makefile
+++ b/devel/p5-Sort-Key-DateTime/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for sorting objects by some DateTime key
 
-RUN_DEPENDS=	p5-DateTime>=0.28:${PORTSDIR}/devel/p5-DateTime \
-		p5-Sort-Key>=1.28:${PORTSDIR}/devel/p5-Sort-Key
+RUN_DEPENDS=	p5-DateTime>=0.28:devel/p5-DateTime \
+		p5-Sort-Key>=1.28:devel/p5-Sort-Key
 BUILD_DEPENDS=  ${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Specio/Makefile b/devel/p5-Specio/Makefile
index c0e566e7b2dd..7c7145717d33 100644
--- a/devel/p5-Specio/Makefile
+++ b/devel/p5-Specio/Makefile
@@ -14,21 +14,21 @@ COMMENT=	Type constraints and coercions for Perl
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
-		p5-Devel-PartialDump>=0:${PORTSDIR}/devel/p5-Devel-PartialDump \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Eval-Closure>=0:${PORTSDIR}/devel/p5-Eval-Closure \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Class-Method-Modifiers>=0:devel/p5-Class-Method-Modifiers \
+		p5-Devel-PartialDump>=0:devel/p5-Devel-PartialDump \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-Eval-Closure>=0:devel/p5-Eval-Closure \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -37,8 +37,8 @@ USES=		perl5
 .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/devel/p5-Spoon/Makefile b/devel/p5-Spoon/Makefile
index ac370498a09e..29326587cce8 100644
--- a/devel/p5-Spoon/Makefile
+++ b/devel/p5-Spoon/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Spiffy Application Building Framework
 
-BUILD_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-String-Checker/Makefile b/devel/p5-String-Checker/Makefile
index dc6c785f589e..addf08535594 100644
--- a/devel/p5-String-Checker/Makefile
+++ b/devel/p5-String-Checker/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module implementing an extensible string validation interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-String-Diff/Makefile b/devel/p5-String-Diff/Makefile
index 4678c084fbd5..23df862e977e 100644
--- a/devel/p5-String-Diff/Makefile
+++ b/devel/p5-String-Diff/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Simple diff to String
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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}
-TEST_DEPENDS=	p5-Test-Base>=0:${PORTSDIR}/devel/p5-Test-Base \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Base>=0:devel/p5-Test-Base \
+		p5-YAML>=0:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
diff --git a/devel/p5-String-Dump/Makefile b/devel/p5-String-Dump/Makefile
index b00dbdfd44da..da33e89d7171 100644
--- a/devel/p5-String-Dump/Makefile
+++ b/devel/p5-String-Dump/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Dump strings of characters or bytes for printing and debugging
 
-BUILD_DEPENDS=	p5-Getopt-Lucid>=0:${PORTSDIR}/textproc/p5-Getopt-Lucid
+BUILD_DEPENDS=	p5-Getopt-Lucid>=0:textproc/p5-Getopt-Lucid
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-String-Errf/Makefile b/devel/p5-String-Errf/Makefile
index b19eb5f81a30..94fa64ad007b 100644
--- a/devel/p5-String-Errf/Makefile
+++ b/devel/p5-String-Errf/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Simple sprintf-like dialect
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-String-Formatter>=0.102081:${PORTSDIR}/devel/p5-String-Formatter
-BUILD_DEPENDS:=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-autodie>=0:${PORTSDIR}/devel/p5-autodie \
+RUN_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-String-Formatter>=0.102081:devel/p5-String-Formatter
+BUILD_DEPENDS:=	p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-autodie>=0:devel/p5-autodie \
 		${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-String-Formatter/Makefile b/devel/p5-String-Formatter/Makefile
index 824653fda980..46f5802be6a0 100644
--- a/devel/p5-String-Formatter/Makefile
+++ b/devel/p5-String-Formatter/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Build sprintf-like functions of your own
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Params-Util>=0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Params-Util>=0:devel/p5-Params-Util \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-String-TT/Makefile b/devel/p5-String-TT/Makefile
index 7c27d2fb1288..7916381682a8 100644
--- a/devel/p5-String-TT/Makefile
+++ b/devel/p5-String-TT/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl interface to interpolate lexical variables
 
-RUN_DEPENDS=	p5-PadWalker>=1:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-TableDriven>=0:${PORTSDIR}/devel/p5-Test-TableDriven
+RUN_DEPENDS=	p5-PadWalker>=1:devel/p5-PadWalker \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-TableDriven>=0:devel/p5-Test-TableDriven
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Struct-Dumb/Makefile b/devel/p5-Struct-Dumb/Makefile
index 1798e6b29f60..1f8cc19e9c54 100644
--- a/devel/p5-Struct-Dumb/Makefile
+++ b/devel/p5-Struct-Dumb/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/devel/p5-Sub-Alias/Makefile b/devel/p5-Sub-Alias/Makefile
index fa42f575053b..cd6bba12dc62 100644
--- a/devel/p5-Sub-Alias/Makefile
+++ b/devel/p5-Sub-Alias/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Simple subroutine alias
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Devel-BeginLift>=0:${PORTSDIR}/devel/p5-Devel-BeginLift
-RUN_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Devel-BeginLift>=0:${PORTSDIR}/devel/p5-Devel-BeginLift
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Devel-Declare>=0:devel/p5-Devel-Declare \
+		p5-Devel-BeginLift>=0:devel/p5-Devel-BeginLift
+RUN_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Devel-Declare>=0:devel/p5-Devel-Declare \
+		p5-Devel-BeginLift>=0:devel/p5-Devel-BeginLift
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Exporter-ForMethods/Makefile b/devel/p5-Sub-Exporter-ForMethods/Makefile
index 5336ebd9d231..9718cd792e42 100644
--- a/devel/p5-Sub-Exporter-ForMethods/Makefile
+++ b/devel/p5-Sub-Exporter-ForMethods/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Helper routines for using Sub::Exporter to build methods
 
-RUN_DEPENDS=	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name \
-		p5-Sub-Exporter>=0.978:${PORTSDIR}/devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-Sub-Name>=0:devel/p5-Sub-Name \
+		p5-Sub-Exporter>=0.978:devel/p5-Sub-Exporter
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Sub-Exporter-GlobExporter/Makefile b/devel/p5-Sub-Exporter-GlobExporter/Makefile
index 7d2d533f5a87..c95809bef195 100644
--- a/devel/p5-Sub-Exporter-GlobExporter/Makefile
+++ b/devel/p5-Sub-Exporter-GlobExporter/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Sub-Exporter-Lexical/Makefile b/devel/p5-Sub-Exporter-Lexical/Makefile
index eab071dc8fab..43f4d0534276 100644
--- a/devel/p5-Sub-Exporter-Lexical/Makefile
+++ b/devel/p5-Sub-Exporter-Lexical/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Export lexically-available subs with Sub::Exporter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Lexical-Var>=0:${PORTSDIR}/devel/p5-Lexical-Var \
-		p5-Sub-Exporter>=0.978:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0:devel/p5-B-Hooks-EndOfScope \
+		p5-Lexical-Var>=0:devel/p5-Lexical-Var \
+		p5-Sub-Exporter>=0.978:devel/p5-Sub-Exporter \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Exporter-Progressive/Makefile b/devel/p5-Sub-Exporter-Progressive/Makefile
index 2f54ad419043..b51448204007 100644
--- a/devel/p5-Sub-Exporter-Progressive/Makefile
+++ b/devel/p5-Sub-Exporter-Progressive/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Only use Sub::Exporter if you need it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Exporter/Makefile b/devel/p5-Sub-Exporter/Makefile
index 81354d6dfb97..9339ddd7fa3c 100644
--- a/devel/p5-Sub-Exporter/Makefile
+++ b/devel/p5-Sub-Exporter/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sophisticated exporter for custom-built routines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-OptList>=0.100:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Params-Util>=0.14:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Install>=0.920:${PORTSDIR}/devel/p5-Sub-Install
+BUILD_DEPENDS=	p5-Data-OptList>=0.100:devel/p5-Data-OptList \
+		p5-Params-Util>=0.14:devel/p5-Params-Util \
+		p5-Sub-Install>=0.920:devel/p5-Sub-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Sub-Infix/Makefile b/devel/p5-Sub-Infix/Makefile
index 6cfa29dcfc49..a9b346dc8ed3 100644
--- a/devel/p5-Sub-Infix/Makefile
+++ b/devel/p5-Sub-Infix/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Create a fake infix operator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sub-Multi/Makefile b/devel/p5-Sub-Multi/Makefile
index 820c511e6211..9166fbc0cf0b 100644
--- a/devel/p5-Sub-Multi/Makefile
+++ b/devel/p5-Sub-Multi/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Data::Bind-based multi-sub dispatch
 
-BUILD_DEPENDS=	p5-Class-Multimethods-Pure>=0.11:${PORTSDIR}/devel/p5-Class-Multimethods-Pure \
-		p5-Data-Bind>=0.26:${PORTSDIR}/devel/p5-Data-Bind
+BUILD_DEPENDS=	p5-Class-Multimethods-Pure>=0.11:devel/p5-Class-Multimethods-Pure \
+		p5-Data-Bind>=0.26:devel/p5-Data-Bind
 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/devel/p5-Sub-Name/Makefile b/devel/p5-Sub-Name/Makefile
index b9a41c29f5e7..044741b6c772 100644
--- a/devel/p5-Sub-Name/Makefile
+++ b/devel/p5-Sub-Name/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Sub::Name - (re)name a sub
 
-TEST_DEPENDS=	p5-B-C>=1.48:${PORTSDIR}/devel/p5-B-C \
-		p5-Devel-CheckBin>=0:${PORTSDIR}/devel/p5-Devel-CheckBin
+TEST_DEPENDS=	p5-B-C>=1.48:devel/p5-B-C \
+		p5-Devel-CheckBin>=0:devel/p5-Devel-CheckBin
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Override/Makefile b/devel/p5-Sub-Override/Makefile
index 2668a1e59810..ae29b9530201 100644
--- a/devel/p5-Sub-Override/Makefile
+++ b/devel/p5-Sub-Override/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for easily overriding subroutines
 
-TEST_DEPENDS=	p5-Test-Fatal>=0.0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>=0.0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Sub-Signatures/Makefile b/devel/p5-Sub-Signatures/Makefile
index f68027156106..34caf3289b7d 100644
--- a/devel/p5-Sub-Signatures/Makefile
+++ b/devel/p5-Sub-Signatures/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use proper signatures for subroutines, including dispatching
 
-BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
 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/devel/p5-Sub-WrapPackages/Makefile b/devel/p5-Sub-WrapPackages/Makefile
index 3b16370fdc56..a307a20caa4d 100644
--- a/devel/p5-Sub-WrapPackages/Makefile
+++ b/devel/p5-Sub-WrapPackages/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Add pre- and post-execution wrappers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Caller-IgnoreNamespaces>=1:${PORTSDIR}/devel/p5-Devel-Caller-IgnoreNamespaces \
-		p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Sub-Prototype>=0.02:${PORTSDIR}/devel/p5-Sub-Prototype
+BUILD_DEPENDS=	p5-Devel-Caller-IgnoreNamespaces>=1:devel/p5-Devel-Caller-IgnoreNamespaces \
+		p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-Sub-Prototype>=0.02:devel/p5-Sub-Prototype
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Syntax-Keyword-Junction/Makefile b/devel/p5-Syntax-Keyword-Junction/Makefile
index 6d3635fd8952..13750840107a 100644
--- a/devel/p5-Syntax-Keyword-Junction/Makefile
+++ b/devel/p5-Syntax-Keyword-Junction/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl6 style Junction operators in Perl5
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-syntax>=0:${PORTSDIR}/devel/p5-syntax \
-		p5-Sub-Exporter-Progressive>=0.001006:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-syntax>=0:devel/p5-syntax \
+		p5-Sub-Exporter-Progressive>=0.001006:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Sys-Info-Base/Makefile b/devel/p5-Sys-Info-Base/Makefile
index a316f912fd66..4bc75aece643 100644
--- a/devel/p5-Sys-Info-Base/Makefile
+++ b/devel/p5-Sys-Info-Base/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Base class for Sys::Info
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sys-Info-Driver-BSD/Makefile b/devel/p5-Sys-Info-Driver-BSD/Makefile
index 2c3f9c7cc2a0..f92ee198675f 100644
--- a/devel/p5-Sys-Info-Driver-BSD/Makefile
+++ b/devel/p5-Sys-Info-Driver-BSD/Makefile
@@ -14,13 +14,13 @@ COMMENT=	BSD driver for Sys::Info
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-BSD-Sysctl>=0.08:${PORTSDIR}/sysutils/p5-BSD-Sysctl \
-		p5-Sys-Info-Base>=0.7801:${PORTSDIR}/devel/p5-Sys-Info-Base \
-		p5-Unix-Processors>=0:${PORTSDIR}/sysutils/p5-Unix-Processors
+BUILD_DEPENDS=	p5-BSD-Sysctl>=0.08:sysutils/p5-BSD-Sysctl \
+		p5-Sys-Info-Base>=0.7801:devel/p5-Sys-Info-Base \
+		p5-Unix-Processors>=0:sysutils/p5-Unix-Processors
 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 \
-		p5-Test-Sys-Info>=0.20:${PORTSDIR}/devel/p5-Test-Sys-Info
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Sys-Info>=0.20:devel/p5-Test-Sys-Info
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sys-Info/Makefile b/devel/p5-Sys-Info/Makefile
index 40873bfb133b..16fee3a8a6d6 100644
--- a/devel/p5-Sys-Info/Makefile
+++ b/devel/p5-Sys-Info/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Fetch information from the host system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sys-Info-Base>=0.7800:${PORTSDIR}/devel/p5-Sys-Info-Base \
-		p5-Sys-Info-Driver-BSD>=0.7800:${PORTSDIR}/devel/p5-Sys-Info-Driver-BSD
+BUILD_DEPENDS=	p5-Sys-Info-Base>=0.7800:devel/p5-Sys-Info-Base \
+		p5-Sys-Info-Driver-BSD>=0.7800:devel/p5-Sys-Info-Driver-BSD
 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 \
-		p5-Test-Sys-Info>=0.20:${PORTSDIR}/devel/p5-Test-Sys-Info
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Sys-Info>=0.20:devel/p5-Test-Sys-Info
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Sys-SigAction/Makefile b/devel/p5-Sys-SigAction/Makefile
index ea801b09cd56..e3ccfa95c95f 100644
--- a/devel/p5-Sys-SigAction/Makefile
+++ b/devel/p5-Sys-SigAction/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for Consistent Signal Handling
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Time-HiRes>=1.9726:${PORTSDIR}/devel/p5-Time-HiRes
+BUILD_DEPENDS=	p5-Time-HiRes>=1.9726:devel/p5-Time-HiRes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index 93287585f71e..ecafa4e0aa41 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perl bindings for libvirt
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
-RUN_DEPENDS=	p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
-TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS=	p5-XML-XPath>=0:textproc/p5-XML-XPath
+LIB_DEPENDS=	libvirt.so:devel/libvirt
+RUN_DEPENDS=	p5-XML-XPath>=0:textproc/p5-XML-XPath
+TEST_DEPENDS=	p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5 pkgconfig shebangfix
 SHEBANG_FILES=	examples/*.pl
diff --git a/devel/p5-System-Command/Makefile b/devel/p5-System-Command/Makefile
index 679c973a751e..53f9b57aa2ee 100644
--- a/devel/p5-System-Command/Makefile
+++ b/devel/p5-System-Command/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Object for running system commands
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Command>=0:${PORTSDIR}/devel/p5-Test-Command \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Command>=0:devel/p5-Test-Command \
+		p5-Test-Output>=0:devel/p5-Test-Output
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-System-Sub/Makefile b/devel/p5-System-Sub/Makefile
index 46caaab2e84b..640db521a55e 100644
--- a/devel/p5-System-Sub/Makefile
+++ b/devel/p5-System-Sub/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Wrap external command with a DWIM sub
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS:=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS:=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Sub-Name>=0:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TAP-Formatter-JUnit/Makefile b/devel/p5-TAP-Formatter-JUnit/Makefile
index 2028d570da2b..48ac638d70e7 100644
--- a/devel/p5-TAP-Formatter-JUnit/Makefile
+++ b/devel/p5-TAP-Formatter-JUnit/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moose>0:${PORTSDIR}/devel/p5-Moose \
-	p5-MooseX-NonMoose>0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-XML-Generator>0:${PORTSDIR}/textproc/p5-XML-Generator \
-	p5-Test-Harness>3.12:${PORTSDIR}/devel/p5-Test-Harness
+	p5-Moose>0:devel/p5-Moose \
+	p5-MooseX-NonMoose>0:devel/p5-MooseX-NonMoose \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	p5-XML-Generator>0:textproc/p5-XML-Generator \
+	p5-Test-Harness>3.12:devel/p5-Test-Harness
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-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=	modbuild
diff --git a/devel/p5-TAP-Harness-JUnit/Makefile b/devel/p5-TAP-Harness-JUnit/Makefile
index 588f2c5d9ead..25440e248058 100644
--- a/devel/p5-TAP-Harness-JUnit/Makefile
+++ b/devel/p5-TAP-Harness-JUnit/Makefile
@@ -10,10 +10,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to generate JUnit compatible output from TAP
 
 RUN_DEPENDS=	\
-	p5-XML-Simple>0:${PORTSDIR}/textproc/p5-XML-Simple
+	p5-XML-Simple>0:textproc/p5-XML-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+	p5-Test-Deep>0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-TAP-SimpleOutput/Makefile b/devel/p5-TAP-SimpleOutput/Makefile
index 8205de4bce2c..e9be7ed7cfda 100644
--- a/devel/p5-TAP-SimpleOutput/Makefile
+++ b/devel/p5-TAP-SimpleOutput/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple closure-driven TAP generator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive
+BUILD_DEPENDS=	p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tee/Makefile b/devel/p5-Tee/Makefile
index 98aca5fee44b..5033a0c4d3a9 100644
--- a/devel/p5-Tee/Makefile
+++ b/devel/p5-Tee/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Pure Perl emulation of GNU tee
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput \
-		p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
-RUN_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput
+BUILD_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput \
+		p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
+RUN_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Template-Provider-Encode/Makefile b/devel/p5-Template-Provider-Encode/Makefile
index 0ddef03baf75..fb45ec229d38 100644
--- a/devel/p5-Template-Provider-Encode/Makefile
+++ b/devel/p5-Template-Provider-Encode/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	Encode 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/devel/p5-Term-Animation/Makefile b/devel/p5-Term-Animation/Makefile
index ead5a7e82f30..d05336f3d659 100644
--- a/devel/p5-Term-Animation/Makefile
+++ b/devel/p5-Term-Animation/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	ASCII sprite animation framework
 
-BUILD_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-Clui/Makefile b/devel/p5-Term-Clui/Makefile
index 9a252b5174b9..60853eb430b8 100644
--- a/devel/p5-Term-Clui/Makefile
+++ b/devel/p5-Term-Clui/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl module offering a Command-Line User Interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-Term-ReadKey>=2.14:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
+BUILD_DEPENDS=	p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey \
+		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-Menus/Makefile b/devel/p5-Term-Menus/Makefile
index 7e88ff72019e..a71d82361817 100644
--- a/devel/p5-Term-Menus/Makefile
+++ b/devel/p5-Term-Menus/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Create Powerful Terminal, Console, and CMD Environment Menus
 
 LICENSE=	AGPLv3
 
-BUILD_DEPENDS=	p5-Data-Dump-Streamer>0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Devel-Symdump>0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-PadWalker>0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Term-RawInput>=1.20:${PORTSDIR}/devel/p5-Term-RawInput \
-		p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Data-Dump-Streamer>0:devel/p5-Data-Dump-Streamer \
+		p5-Devel-Symdump>0:devel/p5-Devel-Symdump \
+		p5-PadWalker>0:devel/p5-PadWalker \
+		p5-Term-RawInput>=1.20:devel/p5-Term-RawInput \
+		p5-Term-ReadKey>0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Term-ProgressBar-Quiet/Makefile b/devel/p5-Term-ProgressBar-Quiet/Makefile
index 60f2803d0770..288cba9e2476 100644
--- a/devel/p5-Term-ProgressBar-Quiet/Makefile
+++ b/devel/p5-Term-ProgressBar-Quiet/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension to display a progress bar, if interactive
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
-		p5-Test-MockObject>0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-IO-Interactive>=0:${PORTSDIR}/devel/p5-IO-Interactive
+BUILD_DEPENDS=	p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+		p5-Test-MockObject>0:devel/p5-Test-MockObject \
+		p5-IO-Interactive>=0:devel/p5-IO-Interactive
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ProgressBar-Simple/Makefile b/devel/p5-Term-ProgressBar-Simple/Makefile
index 084faa2a9db8..da4c185e57b3 100644
--- a/devel/p5-Term-ProgressBar-Simple/Makefile
+++ b/devel/p5-Term-ProgressBar-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simpler Term::ProgressBar interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ProgressBar-Quiet>=0:${PORTSDIR}/devel/p5-Term-ProgressBar-Quiet
+BUILD_DEPENDS=	p5-Term-ProgressBar-Quiet>=0:devel/p5-Term-ProgressBar-Quiet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ProgressBar/Makefile b/devel/p5-Term-ProgressBar/Makefile
index 7b2e380dea62..6b2393b10be7 100644
--- a/devel/p5-Term-ProgressBar/Makefile
+++ b/devel/p5-Term-ProgressBar/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Perl extension to display a progress bar
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=1.02:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Term-ReadKey>=2.14:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Class-MethodMaker>=1.02:devel/p5-Class-MethodMaker \
+		p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.13:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Capture-Tiny>=0.13:devel/p5-Capture-Tiny \
+		p5-Test-Exception>=0.31:devel/p5-Test-Exception
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index 6066713adc63..c973946c0984 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension for prompting a user for information
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index eef41c2eba75..1a7fb7686b88 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Interactive question-response user interface module
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Array-PrintCols>=0:${PORTSDIR}/misc/p5-Array-PrintCols
+BUILD_DEPENDS=	p5-Array-PrintCols>=0:misc/p5-Array-PrintCols
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-RawInput/Makefile b/devel/p5-Term-RawInput/Makefile
index db325c762b04..db965faf5e4d 100644
--- a/devel/p5-Term-RawInput/Makefile
+++ b/devel/p5-Term-RawInput/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Drop-in replacement for <STDIN> with handling of non-standard keys
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile
index e0ef4022a44a..7eb0f8e524d3 100644
--- a/devel/p5-Term-ReadLine-Perl/Makefile
+++ b/devel/p5-Term-ReadLine-Perl/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Quick implementation of the minimal interface to Readline libraries
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Term-ReadLine-Zoid/Makefile b/devel/p5-Term-ReadLine-Zoid/Makefile
index 144871506d66..b3278ede6ff2 100644
--- a/devel/p5-Term-ReadLine-Zoid/Makefile
+++ b/devel/p5-Term-ReadLine-Zoid/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides an interactive input buffer written in plain PERL
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Term-ScreenColor/Makefile b/devel/p5-Term-ScreenColor/Makefile
index 0d94d85fd526..db8419dd5159 100644
--- a/devel/p5-Term-ScreenColor/Makefile
+++ b/devel/p5-Term-ScreenColor/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Term::Screen based screen positioning and coloring module
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Term-Screen>=0:${PORTSDIR}/devel/p5-Term-Screen
+RUN_DEPENDS=	p5-Term-Screen>=0:devel/p5-Term-Screen
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Term-Shell/Makefile b/devel/p5-Term-Shell/Makefile
index 850d3c2d97ad..713aa5e0ee0f 100644
--- a/devel/p5-Term-Shell/Makefile
+++ b/devel/p5-Term-Shell/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Write command-line shells in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-Autoformat>=0:${PORTSDIR}/textproc/p5-Text-Autoformat
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Term-Size-Any/Makefile b/devel/p5-Term-Size-Any/Makefile
index c22cc2eefd5c..63a8788bec18 100644
--- a/devel/p5-Term-Size-Any/Makefile
+++ b/devel/p5-Term-Size-Any/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Retrieve terminal size
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-Hide>=0:${PORTSDIR}/devel/p5-Devel-Hide \
-		p5-Term-Size-Perl>=0:${PORTSDIR}/devel/p5-Term-Size-Perl
+BUILD_DEPENDS=	p5-Devel-Hide>=0:devel/p5-Devel-Hide \
+		p5-Term-Size-Perl>=0:devel/p5-Term-Size-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=1.18:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=1.18:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Term-Size-Perl/Makefile b/devel/p5-Term-Size-Perl/Makefile
index f72173cadbeb..17215950b985 100644
--- a/devel/p5-Term-Size-Perl/Makefile
+++ b/devel/p5-Term-Size-Perl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Retrieving terminal size
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Pod>=1.18:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Pod>=1.18:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Term-VT102-Boundless/Makefile b/devel/p5-Term-VT102-Boundless/Makefile
index fea6698f5ea9..00f8fb2d5f8f 100644
--- a/devel/p5-Term-VT102-Boundless/Makefile
+++ b/devel/p5-Term-VT102-Boundless/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Subclass to emulate boundless DEC VT102 terminal
 
-BUILD_DEPENDS=	p5-Term-VT102>=0:${PORTSDIR}/devel/p5-Term-VT102
+BUILD_DEPENDS=	p5-Term-VT102>=0:devel/p5-Term-VT102
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -20,7 +20,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/devel/p5-Term-Visual/Makefile b/devel/p5-Term-Visual/Makefile
index 4c8335555c23..b1ddbcac4b16 100644
--- a/devel/p5-Term-Visual/Makefile
+++ b/devel/p5-Term-Visual/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Split-terminal user interface
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE \
+		p5-Curses>=0:devel/p5-Curses
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Able-Runner/Makefile b/devel/p5-Test-Able-Runner/Makefile
index d2c290f449ba..e51ef4ad7c84 100644
--- a/devel/p5-Test-Able-Runner/Makefile
+++ b/devel/p5-Test-Able-Runner/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Use Test::Able without a bunch of boilerplate
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Pluggable>=3.6:${PORTSDIR}/devel/p5-Module-Pluggable \
-		p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Able>=0.09:${PORTSDIR}/devel/p5-Test-Able
+BUILD_DEPENDS=	p5-Module-Pluggable>=3.6:devel/p5-Module-Pluggable \
+		p5-Moose>=0.94:devel/p5-Moose \
+		p5-Test-Able>=0.09:devel/p5-Test-Able
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Able/Makefile b/devel/p5-Test-Able/Makefile
index ef9620e2611c..39b64eab1b56 100644
--- a/devel/p5-Test-Able/Makefile
+++ b/devel/p5-Test-Able/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Xunit with Moose
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.94:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Aggregate/Makefile b/devel/p5-Test-Aggregate/Makefile
index a5f1aaed4d47..fe2f41ed8a62 100644
--- a/devel/p5-Test-Aggregate/Makefile
+++ b/devel/p5-Test-Aggregate/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Aggregate Perl tests for better performance
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Most>=0.21:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Trap>0:${PORTSDIR}/devel/p5-Test-Trap
+BUILD_DEPENDS=	p5-Test-Most>=0.21:devel/p5-Test-Most \
+		p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings \
+		p5-Test-Trap>0:devel/p5-Test-Trap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Assertions/Makefile b/devel/p5-Test-Assertions/Makefile
index 31c98af1505d..99107b2f6efd 100644
--- a/devel/p5-Test-Assertions/Makefile
+++ b/devel/p5-Test-Assertions/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Simple set of building blocks for both unit and runtime testing
 
-RUN_DEPENDS=	p5-Log-Trace>0:${PORTSDIR}/devel/p5-Log-Trace
+RUN_DEPENDS=	p5-Log-Trace>0:devel/p5-Log-Trace
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Base/Makefile b/devel/p5-Test-Base/Makefile
index 44f732fc209d..04a2302e02b4 100644
--- a/devel/p5-Test-Base/Makefile
+++ b/devel/p5-Test-Base/Makefile
@@ -15,13 +15,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	\
-		p5-Spiffy>=0.30:${PORTSDIR}/devel/p5-Spiffy \
-		p5-Test-Simple>=0.86:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
+		p5-Spiffy>=0.30:devel/p5-Spiffy \
+		p5-Test-Simple>=0.86:devel/p5-Test-Simple \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-YAML>=0:textproc/p5-YAML \
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/devel/p5-Test-Benchmark/Makefile b/devel/p5-Test-Benchmark/Makefile
index 9965d99f555e..036f82cfa30a 100644
--- a/devel/p5-Test-Benchmark/Makefile
+++ b/devel/p5-Test-Benchmark/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Make sure something really is faster
 
 LICENSE=	LGPL21
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USE_PERL5=	configure
 USES=		perl5
@@ -21,7 +21,7 @@ USES=		perl5
 .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/devel/p5-Test-BinaryData/Makefile b/devel/p5-Test-BinaryData/Makefile
index 72b7a5c84d86..26fa4ec676c4 100644
--- a/devel/p5-Test-BinaryData/Makefile
+++ b/devel/p5-Test-BinaryData/Makefile
@@ -20,7 +20,7 @@ USES=		perl5
 .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/devel/p5-Test-Bits/Makefile b/devel/p5-Test-Bits/Makefile
index ca0d8782149c..542308847a2b 100644
--- a/devel/p5-Test-Bits/Makefile
+++ b/devel/p5-Test-Bits/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Provides a bits_is() subroutine for testing binary data
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils
+BUILD_DEPENDS=	p5-List-AllUtils>=0:devel/p5-List-AllUtils
 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
 
 USE_PERL5=	configure
 USES=		perl5
@@ -23,7 +23,7 @@ USES=		perl5
 .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/devel/p5-Test-Block/Makefile b/devel/p5-Test-Block/Makefile
index 267bc614e0f2..1eff568a7595 100644
--- a/devel/p5-Test-Block/Makefile
+++ b/devel/p5-Test-Block/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Specify fine granularity test plans
 DEPRECATED=	Marked as depreciated upstream
 
-BUILD_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Simple>=0.47:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception \
+		p5-Test-Simple>=0.47:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-CPAN-Meta-YAML/Makefile b/devel/p5-Test-CPAN-Meta-YAML/Makefile
index a21b9807a4a8..0df4a4adce2a 100644
--- a/devel/p5-Test-CPAN-Meta-YAML/Makefile
+++ b/devel/p5-Test-CPAN-Meta-YAML/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Validate a META.yml file within a CPAN distribution
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Test-YAML-Valid>=0.03:${PORTSDIR}/devel/p5-Test-YAML-Valid
+BUILD_DEPENDS=	p5-Test-YAML-Valid>=0.03:devel/p5-Test-YAML-Valid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-CPAN-Meta/Makefile b/devel/p5-Test-CPAN-Meta/Makefile
index b09d715012f7..a57c7ab23cec 100644
--- a/devel/p5-Test-CPAN-Meta/Makefile
+++ b/devel/p5-Test-CPAN-Meta/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Validate your CPAN META.yml files
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0.08:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-CheckDeps/Makefile b/devel/p5-Test-CheckDeps/Makefile
index f5248aa5a6ef..abca487e1404 100644
--- a/devel/p5-Test-CheckDeps/Makefile
+++ b/devel/p5-Test-CheckDeps/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Check for presence of dependencies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CPAN-Meta-Check>=0.007:${PORTSDIR}/devel/p5-CPAN-Meta-Check
+BUILD_DEPENDS=	p5-CPAN-Meta-Check>=0.007:devel/p5-CPAN-Meta-Check
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,8 +23,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-CPAN-Meta>=2.120920:${PORTSDIR}/devel/p5-CPAN-Meta
-RUN_DEPENDS+=	p5-CPAN-Meta>=2.120920:${PORTSDIR}/devel/p5-CPAN-Meta
+BUILD_DEPENDS+=	p5-CPAN-Meta>=2.120920:devel/p5-CPAN-Meta
+RUN_DEPENDS+=	p5-CPAN-Meta>=2.120920:devel/p5-CPAN-Meta
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Class-Most/Makefile b/devel/p5-Test-Class-Most/Makefile
index 1d5356af3cbe..cf8dd9362c04 100644
--- a/devel/p5-Test-Class-Most/Makefile
+++ b/devel/p5-Test-Class-Most/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Test Classes the easy way
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Class>=0.38:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Most>=0.31:${PORTSDIR}/devel/p5-Test-Most
+BUILD_DEPENDS=	p5-Test-Class>=0.38:devel/p5-Test-Class \
+		p5-Test-Most>=0.31:devel/p5-Test-Most
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Class/Makefile b/devel/p5-Test-Class/Makefile
index c773b1f07f61..063ef6209a9f 100644
--- a/devel/p5-Test-Class/Makefile
+++ b/devel/p5-Test-Class/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Easily create test classes in an xUnit style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MRO-Compat>=0.11:${PORTSDIR}/devel/p5-MRO-Compat
+BUILD_DEPENDS=	p5-MRO-Compat>=0.11:devel/p5-MRO-Compat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Contextual-Return>=0:${PORTSDIR}/devel/p5-Contextual-Return \
-		p5-Test-Exception>=0.25:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Contextual-Return>=0:devel/p5-Contextual-Return \
+		p5-Test-Exception>=0.25:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Test-ClassAPI/Makefile b/devel/p5-Test-ClassAPI/Makefile
index fd9c36588033..e16ea8a936e8 100644
--- a/devel/p5-Test-ClassAPI/Makefile
+++ b/devel/p5-Test-ClassAPI/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Provides basic first-pass API testing for large class trees
 
-RUN_DEPENDS=	p5-Class-Inspector>=1.12:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Config-Tiny>=2.00:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util
+RUN_DEPENDS=	p5-Class-Inspector>=1.12:devel/p5-Class-Inspector \
+		p5-Config-Tiny>=2.00:devel/p5-Config-Tiny \
+		p5-Params-Util>=1.00:devel/p5-Params-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Classy/Makefile b/devel/p5-Test-Classy/Makefile
index 9e4a97b221a0..f0da9a7a89f6 100644
--- a/devel/p5-Test-Classy/Makefile
+++ b/devel/p5-Test-Classy/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Write your unit tests in other modules than *.t
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-Inspector>=0:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Module-Find>=0.05:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Sub-Install>=0.920:${PORTSDIR}/devel/p5-Sub-Install \
-		p5-Term-Encoding>=0:${PORTSDIR}/devel/p5-Term-Encoding
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-Inspector>=0:devel/p5-Class-Inspector \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Module-Find>=0.05:devel/p5-Module-Find \
+		p5-Sub-Install>=0.920:devel/p5-Sub-Install \
+		p5-Term-Encoding>=0:devel/p5-Term-Encoding
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-UseAllModules>=0.09:${PORTSDIR}/devel/p5-Test-UseAllModules
+TEST_DEPENDS=	p5-Test-UseAllModules>=0.09:devel/p5-Test-UseAllModules
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-CleanNamespaces/Makefile b/devel/p5-Test-CleanNamespaces/Makefile
index f86c17296e26..356933b1aa70 100644
--- a/devel/p5-Test-CleanNamespaces/Makefile
+++ b/devel/p5-Test-CleanNamespaces/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Check for uncleaned imports
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Find-Rule>0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Find-Rule-Perl>0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl \
-		p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Identify>0:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-File-Find-Rule>0:devel/p5-File-Find-Rule \
+		p5-File-Find-Rule-Perl>0:devel/p5-File-Find-Rule-Perl \
+		p5-Module-Runtime>0:devel/p5-Module-Runtime \
+		p5-Package-Stash>=0.14:devel/p5-Package-Stash \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+		p5-Sub-Identify>0:devel/p5-Sub-Identify \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0.009:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-Requires>0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0.009:devel/p5-Test-Warnings
 
 USES=		perl5
 USE_PERL5=	configure
@@ -34,7 +34,7 @@ PLIST_FILES=	%%SITE_PERL%%/Test/CleanNamespaces.pm \
 .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/devel/p5-Test-Command-Simple/Makefile b/devel/p5-Test-Command-Simple/Makefile
index 16d19b2d3470..16a6b7ad60e6 100644
--- a/devel/p5-Test-Command-Simple/Makefile
+++ b/devel/p5-Test-Command-Simple/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Test external commands (nearly) as easily as loaded modules
 
-TEST_DEPENDS=	p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.96:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Command/Makefile b/devel/p5-Test-Command/Makefile
index 3fa39a07d49c..e9bc3f9786f7 100644
--- a/devel/p5-Test-Command/Makefile
+++ b/devel/p5-Test-Command/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Test routines for external commands
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-Compile/Makefile b/devel/p5-Test-Compile/Makefile
index 5a7578eb6675..fa178983d8c4 100644
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Check whether Perl module files compile correctly
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckOS>=0:${PORTSDIR}/devel/p5-Devel-CheckOS \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Devel-CheckOS>=0:devel/p5-Devel-CheckOS \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-DBIx-Class/Makefile b/devel/p5-Test-DBIx-Class/Makefile
index f211f9470089..7e13ba1f4081 100644
--- a/devel/p5-Test-DBIx-Class/Makefile
+++ b/devel/p5-Test-DBIx-Class/Makefile
@@ -13,28 +13,28 @@ COMMENT=	Easier test cases for your DBIx::Class applications
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0.19:${PORTSDIR}/devel/p5-Config-Any \
-		p5-DBIx-Class>=0.08123:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-DBIx-Class-Schema-PopulateMore>=0.16:${PORTSDIR}/databases/p5-DBIx-Class-Schema-PopulateMore \
-		p5-DBIx-Class-TimeStamp>=0.13:${PORTSDIR}/databases/p5-DBIx-Class-TimeStamp \
-		p5-DBIx-Class-UUIDColumns>=0.02005:${PORTSDIR}/databases/p5-DBIx-Class-UUIDColumns \
-		p5-Data-UUID>=1.215:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Data-Visitor>=0.27:${PORTSDIR}/devel/p5-Data-Visitor \
-		p5-Hash-Merge>=0.11:${PORTSDIR}/textproc/p5-Hash-Merge \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Runtime>=0.013:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moose>=1.10:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Attribute-ENV>=0.01:${PORTSDIR}/devel/p5-MooseX-Attribute-ENV \
-		p5-MooseX-Types>=0.23:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Path-Class>=0.21:${PORTSDIR}/devel/p5-Path-Class \
-		p5-SQL-Translator>=0.11006:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-Sub-Exporter>=0.982:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Test-Deep>=0.106:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS=	p5-Config-Any>=0.19:devel/p5-Config-Any \
+		p5-DBIx-Class>=0.08123:databases/p5-DBIx-Class \
+		p5-DBIx-Class-Schema-PopulateMore>=0.16:databases/p5-DBIx-Class-Schema-PopulateMore \
+		p5-DBIx-Class-TimeStamp>=0.13:databases/p5-DBIx-Class-TimeStamp \
+		p5-DBIx-Class-UUIDColumns>=0.02005:databases/p5-DBIx-Class-UUIDColumns \
+		p5-Data-UUID>=1.215:devel/p5-Data-UUID \
+		p5-Data-Visitor>=0.27:devel/p5-Data-Visitor \
+		p5-Hash-Merge>=0.11:textproc/p5-Hash-Merge \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-Module-Runtime>=0.013:devel/p5-Module-Runtime \
+		p5-Moose>=1.10:devel/p5-Moose \
+		p5-MooseX-Attribute-ENV>=0.01:devel/p5-MooseX-Attribute-ENV \
+		p5-MooseX-Types>=0.23:devel/p5-MooseX-Types \
+		p5-Path-Class>=0.21:devel/p5-Path-Class \
+		p5-SQL-Translator>=0.11006:databases/p5-SQL-Translator \
+		p5-Sub-Exporter>=0.982:devel/p5-Sub-Exporter \
+		p5-Test-Deep>=0.106:devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Types-LoadableClass>=0:${PORTSDIR}/devel/p5-MooseX-Types-LoadableClass \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-mysqld>=0:${PORTSDIR}/databases/p5-Test-mysqld \
-		p5-Test-postgresql>=0:${PORTSDIR}/databases/p5-Test-postgresql
+TEST_DEPENDS=	p5-MooseX-Types-LoadableClass>=0:devel/p5-MooseX-Types-LoadableClass \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-mysqld>=0:databases/p5-Test-mysqld \
+		p5-Test-postgresql>=0:databases/p5-Test-postgresql
 # Also for test:
 #USE_MYSQL+=	server
 
diff --git a/devel/p5-Test-Declare/Makefile b/devel/p5-Test-Declare/Makefile
index b80ab26e9536..6d304effc3a0 100644
--- a/devel/p5-Test-Declare/Makefile
+++ b/devel/p5-Test-Declare/Makefile
@@ -11,18 +11,18 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for declarative testing
 
 RUN_DEPENDS=	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-PPI>0:textproc/p5-PPI \
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Exception>0:devel/p5-Test-Exception
 BUILD_DEPENDS=	\
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-PPI>0:textproc/p5-PPI \
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-Exception>0:devel/p5-Test-Exception
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Output>=0:devel/p5-Test-Output
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Deep/Makefile b/devel/p5-Test-Deep/Makefile
index e15199be8cbb..c53e996bcb01 100644
--- a/devel/p5-Test-Deep/Makefile
+++ b/devel/p5-Test-Deep/Makefile
@@ -24,8 +24,8 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Dependencies/Makefile b/devel/p5-Test-Dependencies/Makefile
index f759a1f711c7..c6227340d4eb 100644
--- a/devel/p5-Test-Dependencies/Makefile
+++ b/devel/p5-Test-Dependencies/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Ensure that your Makefile.PL specifies all module dependencies
 
-BUILD_DEPENDS=	p5-rpm-build-perl>=0:${PORTSDIR}/devel/p5-rpm-build-perl \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-Pod-Strip>=0:${PORTSDIR}/textproc/p5-Pod-Strip \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-rpm-build-perl>=0:devel/p5-rpm-build-perl \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-IPC-Cmd>=0:devel/p5-IPC-Cmd \
+		p5-Pod-Strip>=0:textproc/p5-Pod-Strip \
+		p5-YAML>=0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-DependentModules/Makefile b/devel/p5-Test-DependentModules/Makefile
index 718ccd8d73b1..683bbab69e4c 100644
--- a/devel/p5-Test-DependentModules/Makefile
+++ b/devel/p5-Test-DependentModules/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Test all modules which depend on your module
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-Parallel-ForkManager>=0.7.6:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-IO-Handle-Util>=0:${PORTSDIR}/devel/p5-IO-Handle-Util \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Log-Dispatch>=0:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-MetaCPAN-Client>=0:${PORTSDIR}/devel/p5-MetaCPAN-Client \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-autodie>=0:${PORTSDIR}/devel/p5-autodie
+BUILD_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-Parallel-ForkManager>=0.7.6:devel/p5-Parallel-ForkManager \
+		p5-IO-Handle-Util>=0:devel/p5-IO-Handle-Util \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Log-Dispatch>=0:devel/p5-Log-Dispatch \
+		p5-MetaCPAN-Client>=0:devel/p5-MetaCPAN-Client \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-autodie>=0:devel/p5-autodie
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-Module-Build-Tiny>=0:${PORTSDIR}/devel/p5-Module-Build-Tiny
+TEST_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-Module-Build-Tiny>=0:devel/p5-Module-Build-Tiny
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -33,7 +33,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-TEST_DEPENDS+=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build
+TEST_DEPENDS+=	p5-Module-Build>=0:devel/p5-Module-Build
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Differences/Makefile b/devel/p5-Test-Differences/Makefile
index 66037ea09c58..3af35f8c2a66 100644
--- a/devel/p5-Test-Differences/Makefile
+++ b/devel/p5-Test-Differences/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Test::Differences - Test strings and data structures for differences
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Diff>=0.35:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS=	p5-Text-Diff>=0.35:textproc/p5-Text-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Capture-Tiny>=0.24:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0.24:devel/p5-Capture-Tiny
 
 PORTSCOUT=	skipv:0.4801
 
diff --git a/devel/p5-Test-Distribution/Makefile b/devel/p5-Test-Distribution/Makefile
index 1110af0abaa2..9e1acd2377d9 100644
--- a/devel/p5-Test-Distribution/Makefile
+++ b/devel/p5-Test-Distribution/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Test::Distribution - Perform tests on all modules of a distribution
 
-BUILD_DEPENDS+=	p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS+=	p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-EOL/Makefile b/devel/p5-Test-EOL/Makefile
index a885a7a1144f..9098d07495ab 100644
--- a/devel/p5-Test-EOL/Makefile
+++ b/devel/p5-Test-EOL/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Check the correct line endings in your project
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Pod-Coverage-TrustPod>=0:${PORTSDIR}/devel/p5-Pod-Coverage-TrustPod \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Pod-Coverage>=1.08:devel/p5-Pod-Coverage \
+		p5-Pod-Coverage-TrustPod>=0:devel/p5-Pod-Coverage-TrustPod \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Exception-LessClever/Makefile b/devel/p5-Test-Exception-LessClever/Makefile
index b75a27d53252..8de1b758688c 100644
--- a/devel/p5-Test-Exception-LessClever/Makefile
+++ b/devel/p5-Test-Exception-LessClever/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test::Exception simplified
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mock-Quick>=1.100:${PORTSDIR}/devel/p5-Mock-Quick
+BUILD_DEPENDS=	p5-Mock-Quick>=1.100:devel/p5-Mock-Quick
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-Test-Exception/Makefile b/devel/p5-Test-Exception/Makefile
index b6784da95393..6e2e51b24dc9 100644
--- a/devel/p5-Test-Exception/Makefile
+++ b/devel/p5-Test-Exception/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Test functions for exception based code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Uplevel>=0.18:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS=	p5-Sub-Uplevel>=0.18:devel/p5-Sub-Uplevel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index 1b566e766293..8529edaad022 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Automated driving and testing of terminal-based programs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Expect-Simple>=0:${PORTSDIR}/devel/p5-Expect-Simple
+BUILD_DEPENDS=	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-Expect-Simple>=0:devel/p5-Expect-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 8749f37eede7..54ff41bc7763 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Add test failures if warnings are caught
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0.21:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Capture-Tiny>=0.21:devel/p5-Capture-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Fake-HTTPD/Makefile b/devel/p5-Test-Fake-HTTPD/Makefile
index 2366e995f2e3..c75a65635950 100644
--- a/devel/p5-Test-Fake-HTTPD/Makefile
+++ b/devel/p5-Test-Fake-HTTPD/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Fake HTTP server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Daemon>=0:${PORTSDIR}/www/p5-HTTP-Daemon \
-		p5-Plack>=0:${PORTSDIR}/www/p5-Plack \
-		p5-Test-SharedFork>=0.29:${PORTSDIR}/devel/p5-Test-SharedFork \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \
+		p5-Plack>=0:www/p5-Plack \
+		p5-Test-SharedFork>=0.29:devel/p5-Test-SharedFork \
+		p5-Test-TCP>=0:devel/p5-Test-TCP \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP \
-		p5-Test-UseAllModules>=0:${PORTSDIR}/devel/p5-Test-UseAllModules \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-TCP>=0:devel/p5-Test-TCP \
+		p5-Test-UseAllModules>=0:devel/p5-Test-UseAllModules \
+		p5-libwww>=0:www/p5-libwww
 
 OPTIONS_DEFINE=	SSL
 
 USE_PERL5=	configure
 USES=		perl5
 
-SSL_BUILD_DEPENDS=	p5-HTTP-Daemon-SSL>=0:${PORTSDIR}/www/p5-HTTP-Daemon-SSL
-SSL_RUN_DEPENDS=	p5-HTTP-Daemon-SSL>=0:${PORTSDIR}/www/p5-HTTP-Daemon-SSL
+SSL_BUILD_DEPENDS=	p5-HTTP-Daemon-SSL>=0:www/p5-HTTP-Daemon-SSL
+SSL_RUN_DEPENDS=	p5-HTTP-Daemon-SSL>=0:www/p5-HTTP-Daemon-SSL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Fatal/Makefile b/devel/p5-Test-Fatal/Makefile
index 94686b8d3391..16fd64ae3818 100644
--- a/devel/p5-Test-Fatal/Makefile
+++ b/devel/p5-Test-Fatal/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Incredibly simple helpers for testing code with exceptions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Try-Tiny>=0.07:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Try-Tiny>=0.07:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-File-Contents/Makefile b/devel/p5-Test-File-Contents/Makefile
index e253ec6dc6cd..2e3a233fe38b 100644
--- a/devel/p5-Test-File-Contents/Makefile
+++ b/devel/p5-Test-File-Contents/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Test routines for examining the contents of files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Diff>=0.35:${PORTSDIR}/textproc/p5-Text-Diff
+BUILD_DEPENDS=	p5-Text-Diff>=0.35:textproc/p5-Text-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-File-ShareDir/Makefile b/devel/p5-Test-File-ShareDir/Makefile
index 4c91cabec6bd..c8afe05b635e 100644
--- a/devel/p5-Test-File-ShareDir/Makefile
+++ b/devel/p5-Test-File-ShareDir/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Create a fake ShareDir for your modules for testing
 
-BUILD_DEPENDS=	p5-Class-Tiny>0:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-File-Copy-Recursive>0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-ShareDir>=1.00:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Tiny>=0.018:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Scope-Guard>0:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-Class-Tiny>0:devel/p5-Class-Tiny \
+		p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
+		p5-File-ShareDir>=1.00:devel/p5-File-ShareDir \
+		p5-Path-Tiny>=0.018:devel/p5-Path-Tiny \
+		p5-Scope-Guard>0:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Fatal>0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-File/Makefile b/devel/p5-Test-File/Makefile
index 73ce0b119ee3..23545d39b0c3 100644
--- a/devel/p5-Test-File/Makefile
+++ b/devel/p5-Test-File/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Test file attributes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-utf8>=0:${PORTSDIR}/devel/p5-Test-utf8
+TEST_DEPENDS=	p5-Test-utf8>=0:devel/p5-Test-utf8
 
 NO_ARCH=	yes
 USES=		perl5
@@ -22,8 +22,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502104
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.006:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.006:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.006:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.006:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Filename/Makefile b/devel/p5-Test-Filename/Makefile
index 9b7930a43a5a..501297f6d06f 100644
--- a/devel/p5-Test-Filename/Makefile
+++ b/devel/p5-Test-Filename/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for portable filename comparison
 
 RUN_DEPENDS=	\
-	p5-Path-Tiny>0:${PORTSDIR}/devel/p5-Path-Tiny
+	p5-Path-Tiny>0:devel/p5-Path-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -20,7 +20,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/devel/p5-Test-Fixture-DBIC-Schema/Makefile b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
index 503b5ef814c8..2a0585e2ae94 100644
--- a/devel/p5-Test-Fixture-DBIC-Schema/Makefile
+++ b/devel/p5-Test-Fixture-DBIC-Schema/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module providing a DBIx::Class::Schema fixture data loader
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Kwalify>=1.19:${PORTSDIR}/textproc/p5-Kwalify \
-		p5-Params-Validate>=0.15:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-YAML-Syck>=0.95:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-DBIx-Class>=0.07005:databases/p5-DBIx-Class \
+		p5-Kwalify>=1.19:textproc/p5-Kwalify \
+		p5-Params-Validate>=0.15:devel/p5-Params-Validate \
+		p5-YAML-Syck>=0.95:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite
+TEST_DEPENDS=	p5-DBD-SQLite>0:databases/p5-DBD-SQLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Group/Makefile b/devel/p5-Test-Group/Makefile
index 9502c212cc54..9752d7292c2a 100644
--- a/devel/p5-Test-Group/Makefile
+++ b/devel/p5-Test-Group/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Group together related tests in a test suite
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-Cmd>=0:${PORTSDIR}/devel/p5-Test-Cmd
+BUILD_DEPENDS=	p5-File-Slurp>0:devel/p5-File-Slurp \
+		p5-Test-Cmd>=0:devel/p5-Test-Cmd
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-HTML-Tidy/Makefile b/devel/p5-Test-HTML-Tidy/Makefile
index ee6c8db0eb09..abc85b887164 100644
--- a/devel/p5-Test-HTML-Tidy/Makefile
+++ b/devel/p5-Test-HTML-Tidy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test::More-style wrapper around HTML::Tidy
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy
+BUILD_DEPENDS=	p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-If/Makefile b/devel/p5-Test-If/Makefile
index 0113f8d69609..a27e880cc490 100644
--- a/devel/p5-Test-If/Makefile
+++ b/devel/p5-Test-If/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test only if
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-lib-abs>=0:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-lib-abs>=0:devel/p5-lib-abs
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Inline/Makefile b/devel/p5-Test-Inline/Makefile
index 42443cbbffbf..a3300dfc46c3 100644
--- a/devel/p5-Test-Inline/Makefile
+++ b/devel/p5-Test-Inline/Makefile
@@ -14,19 +14,19 @@ COMMENT=	Inlining your tests next to the code being tested
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Algorithm-Dependency>=1.02:${PORTSDIR}/devel/p5-Algorithm-Dependency \
-		p5-Class-Autouse>=1.15:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-Config-Tiny>=2.00:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-File-Find-Rule>=0.26:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Flat>=1.00:${PORTSDIR}/devel/p5-File-Flat \
-		p5-File-Remove>=0.37:${PORTSDIR}/devel/p5-File-Remove \
-		p5-File-Slurp>=9999.04:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-chmod>=0.31:${PORTSDIR}/devel/p5-File-chmod \
-		p5-Params-Util>=0.21:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Pod-Tests>=0.18:${PORTSDIR}/devel/p5-Pod-Tests
+RUN_DEPENDS=	p5-Algorithm-Dependency>=1.02:devel/p5-Algorithm-Dependency \
+		p5-Class-Autouse>=1.15:devel/p5-Class-Autouse \
+		p5-Config-Tiny>=2.00:devel/p5-Config-Tiny \
+		p5-File-Find-Rule>=0.26:devel/p5-File-Find-Rule \
+		p5-File-Flat>=1.00:devel/p5-File-Flat \
+		p5-File-Remove>=0.37:devel/p5-File-Remove \
+		p5-File-Slurp>=9999.04:devel/p5-File-Slurp \
+		p5-File-chmod>=0.31:devel/p5-File-chmod \
+		p5-Params-Util>=0.21:devel/p5-Params-Util \
+		p5-Pod-Tests>=0.18:devel/p5-Pod-Tests
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-ClassAPI>=1.02:${PORTSDIR}/devel/p5-Test-ClassAPI \
-		p5-Test-Script>=1.02:${PORTSDIR}/devel/p5-Test-Script
+BUILD_DEPENDS+=	p5-Test-ClassAPI>=1.02:devel/p5-Test-ClassAPI \
+		p5-Test-Script>=1.02:devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-JSON/Makefile b/devel/p5-Test-JSON/Makefile
index 0513f62d2266..c15c50944e3f 100644
--- a/devel/p5-Test-JSON/Makefile
+++ b/devel/p5-Test-JSON/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${DISTVERSION:C/0$//}
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test JSON data
 
-RUN_DEPENDS=	p5-Test-Differences>=0.47:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-JSON-Any>=1.20:${PORTSDIR}/converters/p5-JSON-Any
+RUN_DEPENDS=	p5-Test-Differences>=0.47:devel/p5-Test-Differences \
+		p5-JSON-Any>=1.20:converters/p5-JSON-Any
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -22,8 +22,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502200
-BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
+RUN_DEPENDS+=	p5-Test-Simple>=1.001.014:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Kwalitee/Makefile b/devel/p5-Test-Kwalitee/Makefile
index ebe45913a880..9bc0c8dffd74 100644
--- a/devel/p5-Test-Kwalitee/Makefile
+++ b/devel/p5-Test-Kwalitee/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Test the Kwalitee of a distribution before you release it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-CPANTS-Analyse>=0.92:${PORTSDIR}/devel/p5-Module-CPANTS-Analyse \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Module-CPANTS-Analyse>=0.92:devel/p5-Module-CPANTS-Analyse \
+		p5-namespace-clean>0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.007:${PORTSDIR}/devel/p5-CPAN-Meta-Check \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Warnings>=0.009:${PORTSDIR}/devel/p5-Test-Warnings
+TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.007:devel/p5-CPAN-Meta-Check \
+		p5-Test-Deep>0:devel/p5-Test-Deep \
+		p5-Test-Warnings>=0.009:devel/p5-Test-Warnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Test-Lazy/Makefile b/devel/p5-Test-Lazy/Makefile
index de6b068d9c3e..79757b44f881 100644
--- a/devel/p5-Test-Lazy/Makefile
+++ b/devel/p5-Test-Lazy/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Quick and easy way to compose and run tests with useful output
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Test-Deep>0:devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-LoadAllModules/Makefile b/devel/p5-Test-LoadAllModules/Makefile
index 495be1e3e4da..8943317cbf9c 100644
--- a/devel/p5-Test-LoadAllModules/Makefile
+++ b/devel/p5-Test-LoadAllModules/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to do use_ok for modules in search path
 
 RUN_DEPENDS=	\
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Log4perl/Makefile b/devel/p5-Test-Log4perl/Makefile
index 798d9c593404..522b9afc9826 100644
--- a/devel/p5-Test-Log4perl/Makefile
+++ b/devel/p5-Test-Log4perl/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Test::Log4perl - test Log::Log4perl
 
-BUILD_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Lingua-EN-Numbers-Ordinate>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers-Ordinate \
-		p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Lingua-EN-Numbers-Ordinate>=0:textproc/p5-Lingua-EN-Numbers-Ordinate \
+		p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-ManyParams/Makefile b/devel/p5-Test-ManyParams/Makefile
index 0ef18b29bef4..2e8e56adef6d 100644
--- a/devel/p5-Test-ManyParams/Makefile
+++ b/devel/p5-Test-ManyParams/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to test many params as one test
 
-BUILD_DEPENDS=	p5-Set-CrossProduct>0:${PORTSDIR}/devel/p5-Set-CrossProduct \
-		p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Set-CrossProduct>0:devel/p5-Set-CrossProduct \
+		p5-Test-Differences>0:devel/p5-Test-Differences \
+		p5-Test-Exception>0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Memory-Cycle/Makefile b/devel/p5-Test-Memory-Cycle/Makefile
index a2d081917966..7253dd5b65d9 100644
--- a/devel/p5-Test-Memory-Cycle/Makefile
+++ b/devel/p5-Test-Memory-Cycle/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Check for memory leaks and circular memory references
 
-BUILD_DEPENDS=	p5-Devel-Cycle>=0:${PORTSDIR}/devel/p5-Devel-Cycle \
-		p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-Devel-Cycle>=0:devel/p5-Devel-Cycle \
+		p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Mini-Unit/Makefile b/devel/p5-Test-Mini-Unit/Makefile
index f1a884724b2a..06012a2f03a9 100644
--- a/devel/p5-Test-Mini-Unit/Makefile
+++ b/devel/p5-Test-Mini-Unit/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Declarative syntactic sugar for Test::Mini
 
-BUILD_DEPENDS=	p5-Devel-Declare>=0.6.0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Test-Mini>=v1.1.3:${PORTSDIR}/devel/p5-Test-Mini
+BUILD_DEPENDS=	p5-Devel-Declare>=0.6.0:devel/p5-Devel-Declare \
+		p5-Test-Mini>=v1.1.3:devel/p5-Test-Mini
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Mini/Makefile b/devel/p5-Test-Mini/Makefile
index 62bf1f2549ca..441f179f51ca 100644
--- a/devel/p5-Test-Mini/Makefile
+++ b/devel/p5-Test-Mini/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kurt.lidl@cello.com
 COMMENT=	Provides lightweight unit testing framework
 
-BUILD_DEPENDS=	p5-Data-Inspect>=0.03:${PORTSDIR}/devel/p5-Data-Inspect \
-		p5-Exception-Class>=1.30:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-MRO-Compat>=0.10:${PORTSDIR}/devel/p5-MRO-Compat \
-		p5-Text-Outdent>=0.01:${PORTSDIR}/devel/p5-Text-Outdent \
-		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-aliased>=0.30:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-clean>=0.14:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Data-Inspect>=0.03:devel/p5-Data-Inspect \
+		p5-Exception-Class>=1.30:devel/p5-Exception-Class \
+		p5-IO-stringy>=2.110:devel/p5-IO-stringy \
+		p5-MRO-Compat>=0.10:devel/p5-MRO-Compat \
+		p5-Text-Outdent>=0.01:devel/p5-Text-Outdent \
+		p5-Try-Tiny>=0.04:lang/p5-Try-Tiny \
+		p5-aliased>=0.30:devel/p5-aliased \
+		p5-namespace-clean>=0.14:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Mock-Guard/Makefile b/devel/p5-Test-Mock-Guard/Makefile
index f2f3a2cddd3b..1cee6efdf1e9 100644
--- a/devel/p5-Test-Mock-Guard/Makefile
+++ b/devel/p5-Test-Mock-Guard/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for simple mock test library using RAII
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load
-RUN_DEPENDS=	p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load
+BUILD_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load
+RUN_DEPENDS=	p5-Class-Load>=0.06:devel/p5-Class-Load
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/devel/p5-Test-Mock-LWP-Dispatch/Makefile b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
index d9da830edfc7..e16147c22c65 100644
--- a/devel/p5-Test-Mock-LWP-Dispatch/Makefile
+++ b/devel/p5-Test-Mock-LWP-Dispatch/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Mocks LWP::UserAgent and dispatches your requests/responses
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Mock-LWP/Makefile b/devel/p5-Test-Mock-LWP/Makefile
index a691eeb37ab3..58a45047b3e5 100644
--- a/devel/p5-Test-Mock-LWP/Makefile
+++ b/devel/p5-Test-Mock-LWP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Easy mocking of LWP packages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-MockObject>=1.08:${PORTSDIR}/devel/p5-Test-MockObject
+BUILD_DEPENDS=	p5-Test-MockObject>=1.08:devel/p5-Test-MockObject
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-MockModule/Makefile b/devel/p5-Test-MockModule/Makefile
index 9cda8f68c6cd..08660aad934b 100644
--- a/devel/p5-Test-MockModule/Makefile
+++ b/devel/p5-Test-MockModule/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Override subroutines in a module for unit testing
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-SUPER>=0:${PORTSDIR}/devel/p5-SUPER
+BUILD_DEPENDS=	p5-SUPER>=0:devel/p5-SUPER
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 9555b8e6354b..6a89f996d0da 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Tests remote URLs or local web files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:${PORTSDIR}/devel/p5-UNIVERSAL-can \
-		p5-UNIVERSAL-isa>=1.20110614:${PORTSDIR}/devel/p5-UNIVERSAL-isa
-RUN_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:${PORTSDIR}/devel/p5-UNIVERSAL-can \
-		p5-UNIVERSAL-isa>=1.20110614:${PORTSDIR}/devel/p5-UNIVERSAL-isa
-TEST_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+BUILD_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:devel/p5-UNIVERSAL-can \
+		p5-UNIVERSAL-isa>=1.20110614:devel/p5-UNIVERSAL-isa
+RUN_DEPENDS=	p5-UNIVERSAL-can>=1.20110617:devel/p5-UNIVERSAL-can \
+		p5-UNIVERSAL-isa>=1.20110614:devel/p5-UNIVERSAL-isa
+TEST_DEPENDS=	p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+		p5-Test-Warn>=0.23:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-MockTime/Makefile b/devel/p5-Test-MockTime/Makefile
index 671bf010ee67..fd6cf86fb121 100644
--- a/devel/p5-Test-MockTime/Makefile
+++ b/devel/p5-Test-MockTime/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Replaces actual time with simulated time
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece
-RUN_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece
+BUILD_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece
+RUN_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Modern/Makefile b/devel/p5-Test-Modern/Makefile
index 244093b046ac..d5e98bf40173 100644
--- a/devel/p5-Test-Modern/Makefile
+++ b/devel/p5-Test-Modern/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Precision testing for modern perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Import-Into>=1:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0.012:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Test-API>=0.004:${PORTSDIR}/devel/p5-Test-API \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Warnings>0:${PORTSDIR}/devel/p5-Test-Warnings
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-Import-Into>=1:devel/p5-Import-Into \
+		p5-Module-Runtime>=0.012:devel/p5-Module-Runtime \
+		p5-Test-API>=0.004:devel/p5-Test-API \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Fatal>0:devel/p5-Test-Fatal \
+		p5-Test-Warnings>0:devel/p5-Test-Warnings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+TEST_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Module-Used/Makefile b/devel/p5-Test-Module-Used/Makefile
index 2e03f30f0391..f24bd89aa0a1 100644
--- a/devel/p5-Test-Module-Used/Makefile
+++ b/devel/p5-Test-Module-Used/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Test required module is really used and vice versa
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-CPAN-Meta>=2.102400:${PORTSDIR}/devel/p5-CPAN-Meta \
-		p5-List-MoreUtils>=0.24:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-CoreList>=2.18:${PORTSDIR}/devel/p5-Module-CoreList \
-		p5-Module-Used>=v1.2.0:${PORTSDIR}/devel/p5-Module-Used \
-		p5-PPI>=1.205:${PORTSDIR}/textproc/p5-PPI
+RUN_DEPENDS=	p5-CPAN-Meta>=2.102400:devel/p5-CPAN-Meta \
+		p5-List-MoreUtils>=0.24:lang/p5-List-MoreUtils \
+		p5-Module-CoreList>=2.18:devel/p5-Module-CoreList \
+		p5-Module-Used>=v1.2.0:devel/p5-Module-Used \
+		p5-PPI>=1.205:textproc/p5-PPI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Moose-More/Makefile b/devel/p5-Test-Moose-More/Makefile
index 9e3cd05ab24e..9e4c52d3ed34 100644
--- a/devel/p5-Test-Moose-More/Makefile
+++ b/devel/p5-Test-Moose-More/Makefile
@@ -11,15 +11,15 @@ COMMENT=	More tools for testing Moose packages
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-Syntax-Keyword-Junction>=0:${PORTSDIR}/devel/p5-Syntax-Keyword-Junction \
-		p5-Sub-Exporter-Progressive>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Progressive \
-		p5-TAP-SimpleOutput>=0:${PORTSDIR}/devel/p5-TAP-SimpleOutput \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Data-OptList>=0:devel/p5-Data-OptList \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-Syntax-Keyword-Junction>=0:devel/p5-Syntax-Keyword-Junction \
+		p5-Sub-Exporter-Progressive>=0:devel/p5-Sub-Exporter-Progressive \
+		p5-TAP-SimpleOutput>=0:devel/p5-TAP-SimpleOutput \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-Perl-Version>=0:${PORTSDIR}/devel/p5-Perl-Version
+TEST_DEPENDS=	p5-aliased>=0:devel/p5-aliased \
+		p5-Perl-Version>=0:devel/p5-Perl-Version
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-More-UTF8/Makefile b/devel/p5-Test-More-UTF8/Makefile
index a607629efbc4..cd1743de474a 100644
--- a/devel/p5-Test-More-UTF8/Makefile
+++ b/devel/p5-Test-More-UTF8/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Enhancing Test::More for UTF-8-based projects
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Most/Makefile b/devel/p5-Test-Most/Makefile
index 059ccf787277..48e4d2eef986 100644
--- a/devel/p5-Test-Most/Makefile
+++ b/devel/p5-Test-Most/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for most commonly needed test functions and features
 
 RUN_DEPENDS=	\
-	p5-Exception-Class>=1.14:${PORTSDIR}/devel/p5-Exception-Class \
-	p5-Test-Deep>=0.106:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-Differences>=0.61:${PORTSDIR}/devel/p5-Test-Differences \
-	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
-	p5-Test-Warn>=0.23:${PORTSDIR}/devel/p5-Test-Warn
+	p5-Exception-Class>=1.14:devel/p5-Exception-Class \
+	p5-Test-Deep>=0.106:devel/p5-Test-Deep \
+	p5-Test-Differences>=0.61:devel/p5-Test-Differences \
+	p5-Test-Exception>=0.31:devel/p5-Test-Exception \
+	p5-Test-Warn>=0.23:devel/p5-Test-Warn
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Name-FromLine/Makefile b/devel/p5-Test-Name-FromLine/Makefile
index dcd34704a74b..cf2c74a1f408 100644
--- a/devel/p5-Test-Name-FromLine/Makefile
+++ b/devel/p5-Test-Name-FromLine/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+	p5-File-Slurp>0:devel/p5-File-Slurp
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Net-LDAP/Makefile b/devel/p5-Test-Net-LDAP/Makefile
index c822c59daf56..855664f564c8 100644
--- a/devel/p5-Test-Net-LDAP/Makefile
+++ b/devel/p5-Test-Net-LDAP/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension of Net::LDAP subclass for testing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-perl-ldap>=0.5800:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-perl-ldap>=0.5800:net/p5-perl-ldap
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Net-RabbitMQ/Makefile b/devel/p5-Test-Net-RabbitMQ/Makefile
index 798613723612..ddd495cffe7c 100644
--- a/devel/p5-Test-Net-RabbitMQ/Makefile
+++ b/devel/p5-Test-Net-RabbitMQ/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl mock RabbitMQ implementation for use when testing
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose
 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/devel/p5-Test-NoWarnings/Makefile b/devel/p5-Test-NoWarnings/Makefile
index 1a760eeeea7d..fb5551ed2949 100644
--- a/devel/p5-Test-NoWarnings/Makefile
+++ b/devel/p5-Test-NoWarnings/Makefile
@@ -22,14 +22,14 @@ DEVEL_STACKTRACE_DESC=	Stack trace support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEVEL_STACKTRACE}
-BUILD_DEPENDS+=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
-RUN_DEPENDS+=	p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS+=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
+RUN_DEPENDS+=	p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace
 .endif
 
 .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/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile
index df33829f44cd..0c6ef2a412e8 100644
--- a/devel/p5-Test-OpenLDAP/Makefile
+++ b/devel/p5-Test-OpenLDAP/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-UUID>0:${PORTSDIR}/devel/p5-Data-UUID \
-	p5-perl-ldap>0:${PORTSDIR}/net/p5-perl-ldap \
-	${LOCALBASE}/libexec/slapd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-server \
-	p5-Net>0:${PORTSDIR}/net/p5-Net
+	p5-Data-UUID>0:devel/p5-Data-UUID \
+	p5-perl-ldap>0:net/p5-perl-ldap \
+	${LOCALBASE}/libexec/slapd:net/openldap${OPENLDAP_VER}-server \
+	p5-Net>0:net/p5-Net
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Output/Makefile b/devel/p5-Test-Output/Makefile
index a5e7502b264f..ac3cb5a67f95 100644
--- a/devel/p5-Test-Output/Makefile
+++ b/devel/p5-Test-Output/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Utilities to test STDOUT and STDERR messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Capture-Tiny>=0.17:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Capture-Tiny>=0.17:devel/p5-Capture-Tiny \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 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/devel/p5-Test-POE-Client-TCP/Makefile b/devel/p5-Test-POE-Client-TCP/Makefile
index bf1ce6d0a363..0a2b4cdebbef 100644
--- a/devel/p5-Test-POE-Client-TCP/Makefile
+++ b/devel/p5-Test-POE-Client-TCP/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	POE Component providing TCP client services for test cases
 
-BUILD_DEPENDS=	p5-POE>=1.28:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.28:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-POE-Server-TCP/Makefile b/devel/p5-Test-POE-Server-TCP/Makefile
index fbb0ebf916a7..03ea74f94cb6 100644
--- a/devel/p5-Test-POE-Server-TCP/Makefile
+++ b/devel/p5-Test-POE-Server-TCP/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	POE Component providing TCP server services for test cases
 
-BUILD_DEPENDS=	p5-POE>=1.004:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=1.004:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Parser/Makefile b/devel/p5-Test-Parser/Makefile
index 3ba0a8db2e13..35f599a46b82 100644
--- a/devel/p5-Test-Parser/Makefile
+++ b/devel/p5-Test-Parser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parsing log files from test runs, and displays in an XML syntax
 
-RUN_DEPENDS=	p5-Chart-Graph>=0:${PORTSDIR}/graphics/p5-Chart-Graph \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS=	p5-Chart-Graph>=0:graphics/p5-Chart-Graph \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-PerlTidy/Makefile b/devel/p5-Test-PerlTidy/Makefile
index d66f538b3e78..42c29a98abcb 100644
--- a/devel/p5-Test-PerlTidy/Makefile
+++ b/devel/p5-Test-PerlTidy/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to check that all your files are tidy
 
 RUN_DEPENDS=	\
-	p5-File-Finder>0:${PORTSDIR}/devel/p5-File-Finder \
-	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-	perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \
-	p5-Text-Diff>0:${PORTSDIR}/textproc/p5-Text-Diff
+	p5-File-Finder>0:devel/p5-File-Finder \
+	p5-File-Slurp>0:devel/p5-File-Slurp \
+	perltidy:devel/p5-Perl-Tidy \
+	p5-Text-Diff>0:textproc/p5-Text-Diff
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Pod-Coverage-Permissive/Makefile b/devel/p5-Test-Pod-Coverage-Permissive/Makefile
index a67b26decb0f..8c25a8acad48 100644
--- a/devel/p5-Test-Pod-Coverage-Permissive/Makefile
+++ b/devel/p5-Test-Pod-Coverage-Permissive/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Checks for pod coverage regression
 
-RUN_DEPENDS=	p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-PathTools>=0:devel/p5-PathTools \
+		p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Pod-Coverage/Makefile b/devel/p5-Test-Pod-Coverage/Makefile
index 77ff52b34554..11b21df9e841 100644
--- a/devel/p5-Test-Pod-Coverage/Makefile
+++ b/devel/p5-Test-Pod-Coverage/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Check for pod coverage in your distribution
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Pod-Coverage>0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Pod-Coverage>0:devel/p5-Pod-Coverage \
+		p5-Test-Simple>0:devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Prereq/Makefile b/devel/p5-Test-Prereq/Makefile
index e8f38f44c31c..d02c6c48e260 100644
--- a/devel/p5-Test-Prereq/Makefile
+++ b/devel/p5-Test-Prereq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check if Makefile.PL has the right pre-requisites
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Module-Info>=0:${PORTSDIR}/devel/p5-Module-Info
+BUILD_DEPENDS=	p5-Module-Info>=0:devel/p5-Module-Info
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Refcount/Makefile b/devel/p5-Test-Refcount/Makefile
index fbf2ff8994e9..5c4693671fef 100644
--- a/devel/p5-Test-Refcount/Makefile
+++ b/devel/p5-Test-Refcount/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Assert reference counts on objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-MAT>=0:${PORTSDIR}/devel/p5-Devel-MAT
+BUILD_DEPENDS=	p5-Devel-MAT>=0:devel/p5-Devel-MAT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-Reporter-Transport-Metabase/Makefile b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
index 7633438bafeb..592e51a8712c 100644
--- a/devel/p5-Test-Reporter-Transport-Metabase/Makefile
+++ b/devel/p5-Test-Reporter-Transport-Metabase/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Metabase transport for Test::Reporter
 
-BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Config-Perl-V>0:${PORTSDIR}/devel/p5-Config-Perl-V \
-		p5-CPAN-Testers-Report>0:${PORTSDIR}/devel/p5-CPAN-Testers-Report \
-		p5-Metabase-Fact>0:${PORTSDIR}/devel/p5-Metabase-Fact \
-		p5-Metabase-Client-Simple>0:${PORTSDIR}/devel/p5-Metabase-Client-Simple \
-		p5-Test-Reporter>>1.54:${PORTSDIR}/devel/p5-Test-Reporter
+BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-Config-Perl-V>0:devel/p5-Config-Perl-V \
+		p5-CPAN-Testers-Report>0:devel/p5-CPAN-Testers-Report \
+		p5-Metabase-Fact>0:devel/p5-Metabase-Fact \
+		p5-Metabase-Client-Simple>0:devel/p5-Metabase-Client-Simple \
+		p5-Test-Reporter>>1.54:devel/p5-Test-Reporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Reporter/Makefile b/devel/p5-Test-Reporter/Makefile
index 5238fd6a3173..dfd8cd82b665 100644
--- a/devel/p5-Test-Reporter/Makefile
+++ b/devel/p5-Test-Reporter/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Sends test results to cpan-testers@perl.org
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Net>0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>0:net/p5-Net
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Script-Run/Makefile b/devel/p5-Test-Script-Run/Makefile
index 7a603d811c66..1ec18d265d7c 100644
--- a/devel/p5-Test-Script-Run/Makefile
+++ b/devel/p5-Test-Script-Run/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Test the script with run
 
-RUN_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index ac35c9d1feff..df32150c9664 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test::Script - Cross-platform basic tests for scripts
 
-RUN_DEPENDS=	p5-IPC-Run3>=0.034:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Probe-Perl>=0.01:${PORTSDIR}/sysutils/p5-Probe-Perl
+RUN_DEPENDS=	p5-IPC-Run3>=0.034:devel/p5-IPC-Run3 \
+		p5-Probe-Perl>=0.01:sysutils/p5-Probe-Perl
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-SharedFork/Makefile b/devel/p5-Test-SharedFork/Makefile
index 30735ae8f440..8d603c88e316 100644
--- a/devel/p5-Test-SharedFork/Makefile
+++ b/devel/p5-Test-SharedFork/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for fork test
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/devel/p5-Test-Singleton/Makefile b/devel/p5-Test-Singleton/Makefile
index bf2fd0b8c2fb..c49564db946e 100644
--- a/devel/p5-Test-Singleton/Makefile
+++ b/devel/p5-Test-Singleton/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test for Singleton classes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Class-Singleton>=0:${PORTSDIR}/devel/p5-Class-Singleton
+BUILD_DEPENDS=	p5-Class-Singleton>=0:devel/p5-Class-Singleton
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Spec/Makefile b/devel/p5-Test-Spec/Makefile
index a137d10702df..7d111f29d47d 100644
--- a/devel/p5-Test-Spec/Makefile
+++ b/devel/p5-Test-Spec/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Write tests in a declarative specification style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Package-Stash>=0.23:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Test-Deep>=0.103:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Package-Stash>=0.23:devel/p5-Package-Stash \
+		p5-Test-Deep>=0.103:devel/p5-Test-Deep \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Test-Spelling/Makefile b/devel/p5-Test-Spelling/Makefile
index 8ac9ed51ca82..2dd90ed29b64 100644
--- a/devel/p5-Test-Spelling/Makefile
+++ b/devel/p5-Test-Spelling/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Check for spelling errors in POD files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Pod-Spell>=0:${PORTSDIR}/textproc/p5-Pod-Spell \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
-RUN_DEPENDS=	p5-Pod-Spell>=0:${PORTSDIR}/textproc/p5-Pod-Spell \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
+BUILD_DEPENDS=	p5-Pod-Spell>=0:textproc/p5-Pod-Spell \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3
+RUN_DEPENDS=	p5-Pod-Spell>=0:textproc/p5-Pod-Spell \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3
 
 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/devel/p5-Test-Strict/Makefile b/devel/p5-Test-Strict/Makefile
index 87cb892a4f54..f2499323146d 100644
--- a/devel/p5-Test-Strict/Makefile
+++ b/devel/p5-Test-Strict/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Devel-Cover>=0.43:${PORTSDIR}/devel/p5-Devel-Cover
+BUILD_DEPENDS=	p5-Devel-Cover>=0.43:devel/p5-Devel-Cover
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+TEST_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 7e0f6f71bd3c..c37459985c1f 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Track the number of times subs are called
 
-BUILD_DEPENDS=	p5-Hook-LexWrap>=0:${PORTSDIR}/devel/p5-Hook-LexWrap \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Hook-LexWrap>=0:devel/p5-Hook-LexWrap \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Synopsis/Makefile b/devel/p5-Test-Synopsis/Makefile
index ba098c95f075..c66213694e04 100644
--- a/devel/p5-Test-Synopsis/Makefile
+++ b/devel/p5-Test-Synopsis/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tsucchi@cpan.org
 COMMENT=	Test your SYNOPSIS code in CPAN module
 
-BUILD_DEPENDS=	p5-Filter>=1.35:${PORTSDIR}/devel/p5-Filter \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Filter>=1.35:${PORTSDIR}/devel/p5-Filter \
-		p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Filter>=1.35:devel/p5-Filter \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Filter>=1.35:devel/p5-Filter \
+		p5-Test-Simple>=0.88:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Sys-Info/Makefile b/devel/p5-Test-Sys-Info/Makefile
index cdd6512f95ba..c0e338e30232 100644
--- a/devel/p5-Test-Sys-Info/Makefile
+++ b/devel/p5-Test-Sys-Info/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Centralized test suite for Sys::Info
 
-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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Test-TAP-HTMLMatrix/Makefile b/devel/p5-Test-TAP-HTMLMatrix/Makefile
index cb65439d1205..7b07ac989207 100644
--- a/devel/p5-Test-TAP-HTMLMatrix/Makefile
+++ b/devel/p5-Test-TAP-HTMLMatrix/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Creates colorful matrix of Test::Harness test run results
 
-BUILD_DEPENDS=	p5-Test-TAP-Model>=0:${PORTSDIR}/devel/p5-Test-TAP-Model \
-		p5-Petal>=0:${PORTSDIR}/textproc/p5-Petal \
-		p5-Petal-Utils>=0:${PORTSDIR}/textproc/p5-Petal-Utils \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Test-TAP-Model>=0:devel/p5-Test-TAP-Model \
+		p5-Petal>=0:textproc/p5-Petal \
+		p5-Petal-Utils>=0:textproc/p5-Petal-Utils \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-TAP-Model/Makefile b/devel/p5-Test-TAP-Model/Makefile
index faacdbfdb790..9440c3971f0a 100644
--- a/devel/p5-Test-TAP-Model/Makefile
+++ b/devel/p5-Test-TAP-Model/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Accessible result collector for Test::Harness::Straps runs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Method-Alias>=0:${PORTSDIR}/devel/p5-Method-Alias \
-		p5-Test-Harness-Straps>=0.30:${PORTSDIR}/devel/p5-Test-Harness-Straps
+BUILD_DEPENDS=	p5-Method-Alias>=0:devel/p5-Method-Alias \
+		p5-Test-Harness-Straps>=0.30:devel/p5-Test-Harness-Straps
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-TCP/Makefile b/devel/p5-Test-TCP/Makefile
index aedb8ad713ee..85c54fc1aef6 100644
--- a/devel/p5-Test-TCP/Makefile
+++ b/devel/p5-Test-TCP/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for testing TCP program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-SharedFork>=0.19:${PORTSDIR}/devel/p5-Test-SharedFork
+BUILD_DEPENDS=	p5-Test-SharedFork>=0.19:devel/p5-Test-SharedFork
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -22,8 +22,8 @@ NO_ARCH=	YES
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501908
-BUILD_DEPENDS+=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
-RUN_DEPENDS+=	p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP
+BUILD_DEPENDS+=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
+RUN_DEPENDS+=	p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Test-Timer/Makefile b/devel/p5-Test-Timer/Makefile
index 9b5b9e28ee6d..375260a6ab8f 100644
--- a/devel/p5-Test-Timer/Makefile
+++ b/devel/p5-Test-Timer/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl test module to test/assert response times
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
-RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
+RUN_DEPENDS=	p5-Error>=0:lang/p5-Error
 
 USES=		perl5
 USE_PERL5=	configure
@@ -20,7 +20,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/devel/p5-Test-Trap/Makefile b/devel/p5-Test-Trap/Makefile
index a3d17b32b927..486983cf3929 100644
--- a/devel/p5-Test-Trap/Makefile
+++ b/devel/p5-Test-Trap/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Trap exit codes, exceptions, output, etc
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump
+BUILD_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Refcount>=0:${PORTSDIR}/devel/p5-Test-Refcount
+TEST_DEPENDS=	p5-Test-Refcount>=0:devel/p5-Test-Refcount
 
 USE_PERL5=	configure
 USES=		perl5
@@ -24,7 +24,7 @@ USES=		perl5
 .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/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index e50c9a5957d7..2cc89ccfc16d 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PerlUnit testing framework
 
-BUILD_DEPENDS=	p5-Class-Inner>=0:${PORTSDIR}/devel/p5-Class-Inner \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error
+BUILD_DEPENDS=	p5-Class-Inner>=0:devel/p5-Class-Inner \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Error>=0:lang/p5-Error
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Test-Version/Makefile b/devel/p5-Test-Version/Makefile
index 4b91acde74ef..296943a508da 100644
--- a/devel/p5-Test-Version/Makefile
+++ b/devel/p5-Test-Version/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Check to see that version in modules are sane
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Find-Rule-Perl>=0:${PORTSDIR}/devel/p5-File-Find-Rule-Perl
+BUILD_DEPENDS=	p5-File-Find-Rule-Perl>=0:devel/p5-File-Find-Rule-Perl
 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
 
 USE_PERL5=	configure
 USES=		perl5
@@ -23,7 +23,7 @@ USES=		perl5
 .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/devel/p5-Test-WWW-Declare/Makefile b/devel/p5-Test-WWW-Declare/Makefile
index 9d85cdd15002..a7680f618244 100644
--- a/devel/p5-Test-WWW-Declare/Makefile
+++ b/devel/p5-Test-WWW-Declare/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Declarative testing for your web app
 
-BUILD_DEPENDS=	p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+BUILD_DEPENDS=	p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -20,7 +20,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/devel/p5-Test-WWW-Mechanize-CGI/Makefile b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
index a849391c3ec0..e1ec6efbbf8e 100644
--- a/devel/p5-Test-WWW-Mechanize-CGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test CGI applications with Test::WWW::Mechanize
 
-RUN_DEPENDS=	p5-WWW-Mechanize-CGI>=0.2:${PORTSDIR}/www/p5-WWW-Mechanize-CGI \
-		p5-Test-WWW-Mechanize>=0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+RUN_DEPENDS=	p5-WWW-Mechanize-CGI>=0.2:www/p5-WWW-Mechanize-CGI \
+		p5-Test-WWW-Mechanize>=0:devel/p5-Test-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
index a28680f81a2d..9979eaf59afa 100644
--- a/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-CGIApp/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Test::WWW::Mechanize for CGIApp
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CGI-Application>=0:${PORTSDIR}/www/p5-CGI-Application \
-		p5-HTTP-Request-AsCGI>=0:${PORTSDIR}/www/p5-HTTP-Request-AsCGI \
-		p5-Test-WWW-Mechanize>=1.14:${PORTSDIR}/devel/p5-Test-WWW-Mechanize
+BUILD_DEPENDS=	p5-CGI-Application>=0:www/p5-CGI-Application \
+		p5-HTTP-Request-AsCGI>=0:www/p5-HTTP-Request-AsCGI \
+		p5-Test-WWW-Mechanize>=1.14:devel/p5-Test-WWW-Mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
index cb781fcd2299..649349425411 100644
--- a/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-Catalyst/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Test::WWW::Mechanize for Catalyst
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.9000:${PORTSDIR}/www/p5-Catalyst-Runtime \
-		p5-Moose>=0.67:${PORTSDIR}/devel/p5-Moose \
-		p5-Test-WWW-Mechanize>=1.14:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-		p5-WWW-Mechanize>=1.54:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-namespace-clean>=0.09:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Catalyst-Runtime>=5.9000:www/p5-Catalyst-Runtime \
+		p5-Moose>=0.67:devel/p5-Moose \
+		p5-Test-WWW-Mechanize>=1.14:devel/p5-Test-WWW-Mechanize \
+		p5-WWW-Mechanize>=1.54:www/p5-WWW-Mechanize \
+		p5-namespace-clean>=0.09:devel/p5-namespace-clean
 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-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-utf8>=0:${PORTSDIR}/devel/p5-Test-utf8
+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-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-utf8>=0:devel/p5-Test-utf8
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
index 83fe5b8c80eb..62088f4fa048 100644
--- a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to test PSGI programs using WWW::Mechanize
 
 RUN_DEPENDS=	\
-	p5-Plack>0:${PORTSDIR}/www/p5-Plack \
-	p5-Test-WWW-Mechanize>0:${PORTSDIR}/devel/p5-Test-WWW-Mechanize \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Plack>0:www/p5-Plack \
+	p5-Test-WWW-Mechanize>0:devel/p5-Test-WWW-Mechanize \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile
index 5a4e1b9ed3f2..e419c17d94c8 100644
--- a/devel/p5-Test-WWW-Mechanize/Makefile
+++ b/devel/p5-Test-WWW-Mechanize/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Testing-specific WWW::Mechanize subclass
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Carp-Assert-More>=0:${PORTSDIR}/devel/p5-Carp-Assert-More \
-		p5-HTML-Tree>0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTTP-Server-Simple>=0.42:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Test-LongString>=0.15:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-WWW-Mechanize>=1.68:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \
+		p5-HTML-Tree>0:www/p5-HTML-Tree \
+		p5-HTTP-Server-Simple>=0.42:www/p5-HTTP-Server-Simple \
+		p5-Test-LongString>=0.15:devel/p5-Test-LongString \
+		p5-URI>=0:net/p5-URI \
+		p5-WWW-Mechanize>=1.68:www/p5-WWW-Mechanize \
+		p5-libwww>=6.02:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Selenium/Makefile b/devel/p5-Test-WWW-Selenium/Makefile
index 5ea4cc3bca0e..b36ed3c6702c 100644
--- a/devel/p5-Test-WWW-Selenium/Makefile
+++ b/devel/p5-Test-WWW-Selenium/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Perl driver and test library for Selenium Remote Control (SRC)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Devel-REPL>=0:${PORTSDIR}/devel/p5-Devel-REPL
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Devel-REPL>=0:devel/p5-Devel-REPL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Mock-LWP>=0:${PORTSDIR}/devel/p5-Test-Mock-LWP \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Mock-LWP>=0:devel/p5-Test-Mock-LWP \
+		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Test-Warn/Makefile b/devel/p5-Test-Warn/Makefile
index d4e768fc4605..e1eb706254db 100644
--- a/devel/p5-Test-Warn/Makefile
+++ b/devel/p5-Test-Warn/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension to test methods for warnings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:${PORTSDIR}/devel/p5-Sub-Uplevel
+BUILD_DEPENDS=	p5-Sub-Uplevel>=0.12:devel/p5-Sub-Uplevel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-Warnings/Makefile b/devel/p5-Test-Warnings/Makefile
index 905536763421..fe881f0b38f9 100644
--- a/devel/p5-Test-Warnings/Makefile
+++ b/devel/p5-Test-Warnings/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENCE_FILE=	${WRKSRC}/LICENCE
 
-TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:${PORTSDIR}/devel/p5-CPAN-Meta-Check \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Test-Kwalitee>=1.12:${PORTSDIR}/devel/p5-Test-Kwalitee
+TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Test-Kwalitee>=1.12:devel/p5-Test-Kwalitee
 
 NO_ARCH=	yes
 USE_PERL5=	configure
@@ -25,7 +25,7 @@ USES=		perl5
 .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/devel/p5-Test-XML-Valid/Makefile b/devel/p5-Test-XML-Valid/Makefile
index 836f7421b5f6..34f209bb2c0c 100644
--- a/devel/p5-Test-XML-Valid/Makefile
+++ b/devel/p5-Test-XML-Valid/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Validate XML and XHTML
 
-RUN_DEPENDS=	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Test-Simple>0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML \
+		p5-Test-Simple>0:devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-XML/Makefile b/devel/p5-Test-XML/Makefile
index 6ccc21e8a88c..28ec3b72939c 100644
--- a/devel/p5-Test-XML/Makefile
+++ b/devel/p5-Test-XML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Compare XML in perl tests
 
-BUILD_DEPENDS=	p5-XML-SemanticDiff>=0:${PORTSDIR}/textproc/p5-XML-SemanticDiff \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-SemanticDiff>=0:textproc/p5-XML-SemanticDiff \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Test-YAML-Meta/Makefile b/devel/p5-Test-YAML-Meta/Makefile
index e1b9c4a3a84f..3be585060e10 100644
--- a/devel/p5-Test-YAML-Meta/Makefile
+++ b/devel/p5-Test-YAML-Meta/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Validation of the META.yml file in a distribution
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Test-YAML-Valid>=0:${PORTSDIR}/devel/p5-Test-YAML-Valid \
-		p5-Test-CPAN-Meta-YAML>=0.17:${PORTSDIR}/devel/p5-Test-CPAN-Meta-YAML
+BUILD_DEPENDS=	p5-Test-YAML-Valid>=0:devel/p5-Test-YAML-Valid \
+		p5-Test-CPAN-Meta-YAML>=0.17:devel/p5-Test-CPAN-Meta-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Test-YAML-Valid/Makefile b/devel/p5-Test-YAML-Valid/Makefile
index 2bf94d465d49..b78e9024030b 100644
--- a/devel/p5-Test-YAML-Valid/Makefile
+++ b/devel/p5-Test-YAML-Valid/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Test for valid YAML
 
-RUN_DEPENDS=	p5-YAML>=0.60:${PORTSDIR}/textproc/p5-YAML
+RUN_DEPENDS=	p5-YAML>=0.60:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
@@ -20,8 +20,8 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	YAMLSYCK
 YAMLSYCK_DESC=	Use YAML::Syck for testing
 
-YAMLSYCK_RUN_DEPENDS=	p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
-YAMLSYCK_BUILD_DEPENDS=	p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck
+YAMLSYCK_RUN_DEPENDS=	p5-YAML-Syck>0:textproc/p5-YAML-Syck
+YAMLSYCK_BUILD_DEPENDS=	p5-YAML-Syck>0:textproc/p5-YAML-Syck
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e '/auto_install.*/d' \
diff --git a/devel/p5-Test-YAML/Makefile b/devel/p5-Test-YAML/Makefile
index 2f4db0bdf014..eb91153e27de 100644
--- a/devel/p5-Test-YAML/Makefile
+++ b/devel/p5-Test-YAML/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Testing Module for YAML Implementations
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-Test-Base>=0.88:${PORTSDIR}/devel/p5-Test-Base
+BUILD_DEPENDS=	bash:shells/bash \
+		p5-Test-Base>=0.88:devel/p5-Test-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	p5-YAML-0.*
diff --git a/devel/p5-Test2-Suite/Makefile b/devel/p5-Test2-Suite/Makefile
index fb229e869035..ba3fd70b2ef6 100644
--- a/devel/p5-Test2-Suite/Makefile
+++ b/devel/p5-Test2-Suite/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Test2>=0.000027:${PORTSDIR}/devel/p5-Test2
+BUILD_DEPENDS=	p5-Test2>=0.000027:devel/p5-Test2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Text-Levenshtein/Makefile b/devel/p5-Text-Levenshtein/Makefile
index 8f2f8f12be5c..cc8254dea65d 100644
--- a/devel/p5-Text-Levenshtein/Makefile
+++ b/devel/p5-Text-Levenshtein/Makefile
@@ -20,8 +20,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Unicode-Collate>=1.04:${PORTSDIR}/textproc/p5-Unicode-Collate
-RUN_DEPENDS+=	p5-Unicode-Collate>=1.04:${PORTSDIR}/textproc/p5-Unicode-Collate
+BUILD_DEPENDS+=	p5-Unicode-Collate>=1.04:textproc/p5-Unicode-Collate
+RUN_DEPENDS+=	p5-Unicode-Collate>=1.04:textproc/p5-Unicode-Collate
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Text-vFile-asData/Makefile b/devel/p5-Text-vFile-asData/Makefile
index 756e06b984cb..3cc66a1b70cf 100644
--- a/devel/p5-Text-vFile-asData/Makefile
+++ b/devel/p5-Text-vFile-asData/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Parse vFile formatted files into data structures
 
-RUN_DEPENDS=	p5-Class-Accessor-Chained>0:${PORTSDIR}/devel/p5-Class-Accessor-Chained
+RUN_DEPENDS=	p5-Class-Accessor-Chained>0:devel/p5-Class-Accessor-Chained
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TheSchwartz-Simple/Makefile b/devel/p5-TheSchwartz-Simple/Makefile
index 7b2ccbb860a0..71ae273767a7 100644
--- a/devel/p5-TheSchwartz-Simple/Makefile
+++ b/devel/p5-TheSchwartz-Simple/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI only job dispatcher for TheSchwartz
 
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
index 2b246f971063..0d777b31ba8b 100644
--- a/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
+++ b/devel/p5-TheSchwartz-Worker-SendEmail/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	TheSchwartz Worker Task to Send Email
 
-BUILD_DEPENDS=	p5-TheSchwartz>=1.10:${PORTSDIR}/devel/p5-TheSchwartz \
-		p5-Net-DNS>=0.66_1:${PORTSDIR}/dns/p5-Net-DNS
+BUILD_DEPENDS=	p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \
+		p5-Net-DNS>=0.66_1:dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-TheSchwartz/Makefile b/devel/p5-TheSchwartz/Makefile
index 6ba0630c9028..aeb44fabe5ab 100644
--- a/devel/p5-TheSchwartz/Makefile
+++ b/devel/p5-TheSchwartz/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Reliable job queue
 
-BUILD_DEPENDS=	p5-Data-ObjectDriver>=0.04:${PORTSDIR}/devel/p5-Data-ObjectDriver
+BUILD_DEPENDS=	p5-Data-ObjectDriver>=0.04:devel/p5-Data-ObjectDriver
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index 8c15ff5003ad..bcddb86652a7 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -16,9 +16,9 @@ LICENSE_NAME=	Academic Free License version 2.1
 LICENSE_FILE=	${WRKSRC}/License.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	p5-Class-ISA>=0.32:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-Class-Inspector>=1.08:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-Thread-Queue-Duplex>=0.92:${PORTSDIR}/devel/p5-Thread-Queue-Duplex
+BUILD_DEPENDS=	p5-Class-ISA>=0.32:devel/p5-Class-ISA \
+		p5-Class-Inspector>=1.08:devel/p5-Class-Inspector \
+		p5-Thread-Queue-Duplex>=0.92:devel/p5-Thread-Queue-Duplex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Thread-Cancel/Makefile b/devel/p5-Thread-Cancel/Makefile
index 1922d7ec7b3c..4dd1146fd211 100644
--- a/devel/p5-Thread-Cancel/Makefile
+++ b/devel/p5-Thread-Cancel/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cancel (i.e., kill) threads
 
-RUN_DEPENDS=	p5-threads>=1.34:${PORTSDIR}/devel/p5-threads
+RUN_DEPENDS=	p5-threads>=1.34:devel/p5-threads
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Thrift-XS/Makefile b/devel/p5-Thrift-XS/Makefile
index 7dae18e7fb8e..838d1f3a18ee 100644
--- a/devel/p5-Thrift-XS/Makefile
+++ b/devel/p5-Thrift-XS/Makefile
@@ -12,15 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Faster Thrift binary protocol encoding and decoding
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Test-BinaryData>=0:${PORTSDIR}/devel/p5-Test-BinaryData \
-		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-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-Test-BinaryData>=0:devel/p5-Test-BinaryData \
+		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/devel/p5-Thrift/Makefile b/devel/p5-Thrift/Makefile
index c0a09446d309..fba4842c5abb 100644
--- a/devel/p5-Thrift/Makefile
+++ b/devel/p5-Thrift/Makefile
@@ -12,9 +12,9 @@ DISTFILES=
 MAINTAINER=	komarov@valerka.net
 COMMENT=	Perl interface to Thrift
 
-BUILD_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector
-RUN_DEPENDS=	p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector
-FETCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/thrift:extract
+BUILD_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector
+RUN_DEPENDS=	p5-Bit-Vector>=0:math/p5-Bit-Vector
+FETCH_DEPENDS+=	${NONEXISTENT}:devel/thrift:extract
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Throwable/Makefile b/devel/p5-Throwable/Makefile
index 445f927d17dd..7d88e4941603 100644
--- a/devel/p5-Throwable/Makefile
+++ b/devel/p5-Throwable/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Easy-to-use class for error objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Devel-StackTrace>=1.32:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Module-Runtime>=0.002:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=1.000001:${PORTSDIR}/devel/p5-Moo
+RUN_DEPENDS=	p5-Devel-StackTrace>=1.32:devel/p5-Devel-StackTrace \
+		p5-Module-Runtime>=0.002:devel/p5-Module-Runtime \
+		p5-Moo>=1.000001:devel/p5-Moo
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-Tie-DB_File-SplitHash/Makefile b/devel/p5-Tie-DB_File-SplitHash/Makefile
index 911e5443965c..07d139d05f64 100644
--- a/devel/p5-Tie-DB_File-SplitHash/Makefile
+++ b/devel/p5-Tie-DB_File-SplitHash/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrapper around the DB_File Berkeley database system
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tie-File-AsHash/Makefile b/devel/p5-Tie-File-AsHash/Makefile
index 923e8832166c..41536c84c0c4 100644
--- a/devel/p5-Tie-File-AsHash/Makefile
+++ b/devel/p5-Tie-File-AsHash/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	rdg@bzerk.org
 COMMENT=	Access the lines of a disk file via a Perl hash
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
-RUN_DEPENDS=	p5-Tie-File>=0:${PORTSDIR}/devel/p5-Tie-File
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Tie-File>=0:devel/p5-Tie-File
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tie-FileLRUCache/Makefile b/devel/p5-Tie-FileLRUCache/Makefile
index 414f369c09ae..e887b2785bf4 100644
--- a/devel/p5-Tie-FileLRUCache/Makefile
+++ b/devel/p5-Tie-FileLRUCache/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Lightweight but robust filesystem based persistent LRU cache
 
-BUILD_DEPENDS=	p5-Class-NamedParms>=0:${PORTSDIR}/devel/p5-Class-NamedParms \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Class-ParmList>=0:${PORTSDIR}/devel/p5-Class-ParmList
+BUILD_DEPENDS=	p5-Class-NamedParms>=0:devel/p5-Class-NamedParms \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Class-ParmList>=0:devel/p5-Class-ParmList
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tie-Hash-Regex/Makefile b/devel/p5-Tie-Hash-Regex/Makefile
index 087e88bd3f6c..ec629d9ff3b7 100644
--- a/devel/p5-Tie-Hash-Regex/Makefile
+++ b/devel/p5-Tie-Hash-Regex/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Match hash keys using Regular Expressions
 
-BUILD_DEPENDS=	p5-Attribute-Handlers>=0.76:${PORTSDIR}/devel/p5-Attribute-Handlers
-RUN_DEPENDS=	p5-Attribute-Handlers>=0.76:${PORTSDIR}/devel/p5-Attribute-Handlers
+BUILD_DEPENDS=	p5-Attribute-Handlers>=0.76:devel/p5-Attribute-Handlers
+RUN_DEPENDS=	p5-Attribute-Handlers>=0.76:devel/p5-Attribute-Handlers
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tie-RefHash-Weak/Makefile b/devel/p5-Tie-RefHash-Weak/Makefile
index 8bd08d216861..0e2837ff1def 100644
--- a/devel/p5-Tie-RefHash-Weak/Makefile
+++ b/devel/p5-Tie-RefHash-Weak/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tie::RefHash subclass with weakened references in the keys
 
-RUN_DEPENDS=	p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Variable-Magic>=0:${PORTSDIR}/devel/p5-Variable-Magic
+RUN_DEPENDS=	p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Variable-Magic>=0:devel/p5-Variable-Magic
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tie-ShareLite/Makefile b/devel/p5-Tie-ShareLite/Makefile
index b683882766c1..0646deea38e1 100644
--- a/devel/p5-Tie-ShareLite/Makefile
+++ b/devel/p5-Tie-ShareLite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	Tied hash interface to IPC::ShareLite
 
-RUN_DEPENDS=	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite
+RUN_DEPENDS=	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tie-ToObject/Makefile b/devel/p5-Tie-ToObject/Makefile
index 7685fcfe17c8..e1f7de0f3652 100644
--- a/devel/p5-Tie-ToObject/Makefile
+++ b/devel/p5-Tie-ToObject/Makefile
@@ -20,7 +20,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/devel/p5-Time-Crontab/Makefile b/devel/p5-Time-Crontab/Makefile
index f73c84ddffb6..4b892f8d675a 100644
--- a/devel/p5-Time-Crontab/Makefile
+++ b/devel/p5-Time-Crontab/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to parse crontab date and time field
 
 RUN_DEPENDS=	\
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Set-Crontab>=1.03:${PORTSDIR}/devel/p5-Set-Crontab
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Set-Crontab>=1.03:devel/p5-Set-Crontab
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Time-Duration-Parse/Makefile b/devel/p5-Time-Duration-Parse/Makefile
index c2e855704cae..06eb2f8032ce 100644
--- a/devel/p5-Time-Duration-Parse/Makefile
+++ b/devel/p5-Time-Duration-Parse/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Parse string that represents time duration
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Lite>=0.02:${PORTSDIR}/devel/p5-Exporter-Lite
+BUILD_DEPENDS=	p5-Exporter-Lite>=0.02:devel/p5-Exporter-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Time-Duration>=1.0.6:${PORTSDIR}/devel/p5-Time-Duration
+TEST_DEPENDS=	p5-Time-Duration>=1.0.6:devel/p5-Time-Duration
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-Time-Duration/Makefile b/devel/p5-Time-Duration/Makefile
index b12eb3bcb74d..04647de7fe01 100644
--- a/devel/p5-Time-Duration/Makefile
+++ b/devel/p5-Time-Duration/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Rounded or exact English expression of durations
 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
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index e612b4870bbb..84122f71e686 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl5 module implementing High resolution time, sleep, and alarm
 
-TEST_DEPENDS=	p5-Test-Simple>=0.82:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS=	p5-Test-Simple>=0.82:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Time-Interval/Makefile b/devel/p5-Time-Interval/Makefile
index 5c6def2f3b14..e80f9f61d891 100644
--- a/devel/p5-Time-Interval/Makefile
+++ b/devel/p5-Time-Interval/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts time intervals of days, hours, minutes, and seconds
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-TimeDate>0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-TimeDate>0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Time-Piece-Range/Makefile b/devel/p5-Time-Piece-Range/Makefile
index 67446013d4f8..1e93295a863b 100644
--- a/devel/p5-Time-Piece-Range/Makefile
+++ b/devel/p5-Time-Piece-Range/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Time::Piece::Range - deal with a range of Time::Piece objects
 
-BUILD_DEPENDS=	p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Date-Range>=0:${PORTSDIR}/devel/p5-Date-Range
+BUILD_DEPENDS=	p5-Time-Piece>=0:devel/p5-Time-Piece \
+		p5-Date-Range>=0:devel/p5-Date-Range
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tree-Binary-Dictionary/Makefile b/devel/p5-Tree-Binary-Dictionary/Makefile
index ba00532a79e6..98aca4798741 100644
--- a/devel/p5-Tree-Binary-Dictionary/Makefile
+++ b/devel/p5-Tree-Binary-Dictionary/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Dictionary API to a binary tree
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Tree-Binary>=0:${PORTSDIR}/devel/p5-Tree-Binary
+RUN_DEPENDS=	p5-Tree-Binary>=0:devel/p5-Tree-Binary
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Tree-Binary/Makefile b/devel/p5-Tree-Binary/Makefile
index c6a8f0aade16..deb1f7c13f55 100644
--- a/devel/p5-Tree-Binary/Makefile
+++ b/devel/p5-Tree-Binary/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Object Oriented Binary Tree for Perl
 
 LICENSE=	ART20
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-DAG_Node/Makefile b/devel/p5-Tree-DAG_Node/Makefile
index 88fca0178f4c..7b38cf8eb65c 100644
--- a/devel/p5-Tree-DAG_Node/Makefile
+++ b/devel/p5-Tree-DAG_Node/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Super class for representing nodes in a tree
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0.003:${PORTSDIR}/devel/p5-File-Slurp-Tiny
+BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0.003:devel/p5-File-Slurp-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -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/devel/p5-Tree-Parser/Makefile b/devel/p5-Tree-Parser/Makefile
index bcd10ee5ae3e..9ed5d984ed51 100644
--- a/devel/p5-Tree-Parser/Makefile
+++ b/devel/p5-Tree-Parser/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Module to parse formatted files into tree structures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Array-Iterator>=0:${PORTSDIR}/devel/p5-Array-Iterator \
-		p5-Tree-Simple>=0:${PORTSDIR}/devel/p5-Tree-Simple
+BUILD_DEPENDS=	p5-Array-Iterator>=0:devel/p5-Array-Iterator \
+		p5-Tree-Simple>=0:devel/p5-Tree-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/devel/p5-Tree-Simple-View/Makefile b/devel/p5-Tree-Simple-View/Makefile
index 2f41efaed4cf..4f8e0080f32f 100644
--- a/devel/p5-Tree-Simple-View/Makefile
+++ b/devel/p5-Tree-Simple-View/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Set of classes for viewing Tree::Simple hierarchies
 
-BUILD_DEPENDS=	p5-Tree-Simple>=0:${PORTSDIR}/devel/p5-Tree-Simple \
-		p5-Class-Throwable>=0:${PORTSDIR}/devel/p5-Class-Throwable
+BUILD_DEPENDS=	p5-Tree-Simple>=0:devel/p5-Tree-Simple \
+		p5-Class-Throwable>=0:devel/p5-Class-Throwable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-LongString>=0:devel/p5-Test-LongString
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-Simple-VisitorFactory/Makefile b/devel/p5-Tree-Simple-VisitorFactory/Makefile
index de9ba7b3260d..0aaff78dcdd2 100644
--- a/devel/p5-Tree-Simple-VisitorFactory/Makefile
+++ b/devel/p5-Tree-Simple-VisitorFactory/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Set of visitor objects for traversing Tree::Simple hierarchies
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tree-Simple>=1.22:${PORTSDIR}/devel/p5-Tree-Simple
+BUILD_DEPENDS=	p5-Tree-Simple>=1.22:devel/p5-Tree-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index 377f72991bde..8454b726716c 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple tree object
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Exception>=0.15:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.15:devel/p5-Test-Exception
 
 USES=		perl5 tar:tgz
 USE_PERL5=	configure
diff --git a/devel/p5-Type-Tie/Makefile b/devel/p5-Type-Tie/Makefile
index 38a176b2f5a1..dff2f69a2d0e 100644
--- a/devel/p5-Type-Tie/Makefile
+++ b/devel/p5-Type-Tie/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Tie a variable to a type constraint
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Hash-FieldHash>=0:${PORTSDIR}/devel/p5-Hash-FieldHash
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+		p5-Hash-FieldHash>=0:devel/p5-Hash-FieldHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Type-Tiny>=0.004:${PORTSDIR}/devel/p5-Type-Tiny
+TEST_DEPENDS=	p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Type-Tiny>=0.004:devel/p5-Type-Tiny
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Type-Tiny-Signatures/Makefile b/devel/p5-Type-Tiny-Signatures/Makefile
index bad2f76be010..59a796f8056b 100644
--- a/devel/p5-Type-Tiny-Signatures/Makefile
+++ b/devel/p5-Type-Tiny-Signatures/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Method/Function Signatures w/Type::Tiny Constraints
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Type-Tiny>=1.000005:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-Function-Parameters>=1.0605:${PORTSDIR}/devel/p5-Function-Parameters
+BUILD_DEPENDS=	p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
+		p5-Function-Parameters>=1.0605:devel/p5-Function-Parameters
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Type-Tiny/Makefile b/devel/p5-Type-Tiny/Makefile
index 28ff2f6805e6..57f4b2779f0e 100644
--- a/devel/p5-Type-Tiny/Makefile
+++ b/devel/p5-Type-Tiny/Makefile
@@ -15,25 +15,25 @@ COMMENT=	Tiny, yet Moo(se)-compatible type constraint
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-InsideOut>=0:${PORTSDIR}/devel/p5-Class-InsideOut \
-		p5-Devel-StackTrace>=0:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-Function-Parameters>=0:${PORTSDIR}/devel/p5-Function-Parameters \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-Moo>=1.002001:${PORTSDIR}/devel/p5-Moo \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-MooseX-Types-Common>=0:${PORTSDIR}/devel/p5-MooseX-Types-Common \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-Types>=0:${PORTSDIR}/devel/p5-MouseX-Types \
-		p5-Role-Tiny>=0:${PORTSDIR}/devel/p5-Role-Tiny \
-		p5-Sub-Exporter-Lexical>=0:${PORTSDIR}/devel/p5-Sub-Exporter-Lexical \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0:${PORTSDIR}/devel/p5-Test-Warnings \
-		p5-Validation-Class>=0:${PORTSDIR}/devel/p5-Validation-Class \
-		p5-match-simple>=0:${PORTSDIR}/devel/p5-match-simple
+TEST_DEPENDS=	p5-Class-InsideOut>=0:devel/p5-Class-InsideOut \
+		p5-Devel-StackTrace>=0:devel/p5-Devel-StackTrace \
+		p5-Function-Parameters>=0:devel/p5-Function-Parameters \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-Moo>=1.002001:devel/p5-Moo \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-Types>=0:devel/p5-MouseX-Types \
+		p5-Role-Tiny>=0:devel/p5-Role-Tiny \
+		p5-Sub-Exporter-Lexical>=0:devel/p5-Sub-Exporter-Lexical \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0:devel/p5-Test-Warnings \
+		p5-Validation-Class>=0:devel/p5-Validation-Class \
+		p5-match-simple>=0:devel/p5-match-simple
 
 OPTIONS_DEFINE=	XS
 OPTIONS_DEFAULT=XS
@@ -44,13 +44,13 @@ PORTSCOUT=	limit:^[0-9\.]*$$
 USE_PERL5=	configure
 USES=		perl5
 
-XS_BUILD_DEPENDS=	p5-Type-Tiny-XS>=0.010:${PORTSDIR}/devel/p5-Type-Tiny-XS
-XS_RUN_DEPENDS=		p5-Type-Tiny-XS>=0.010:${PORTSDIR}/devel/p5-Type-Tiny-XS
+XS_BUILD_DEPENDS=	p5-Type-Tiny-XS>=0.010:devel/p5-Type-Tiny-XS
+XS_RUN_DEPENDS=		p5-Type-Tiny-XS>=0.010:devel/p5-Type-Tiny-XS
 
 .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/devel/p5-Types-Core/Makefile b/devel/p5-Types-Core/Makefile
index ee4c90f0374b..14058cca2dc9 100644
--- a/devel/p5-Types-Core/Makefile
+++ b/devel/p5-Types-Core/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Core types defined as tests and literals
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Xporter>=0.0.8:${PORTSDIR}/devel/p5-Xporter \
-		p5-mem>=0.4.5:${PORTSDIR}/devel/p5-mem
+BUILD_DEPENDS=	p5-Xporter>=0.0.8:devel/p5-Xporter \
+		p5-mem>=0.4.5:devel/p5-mem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -25,7 +25,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-Types-Path-Tiny/Makefile b/devel/p5-Types-Path-Tiny/Makefile
index e89eb02e9083..578b79ee917b 100644
--- a/devel/p5-Types-Path-Tiny/Makefile
+++ b/devel/p5-Types-Path-Tiny/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Path::Tiny types and coercions for Moose and Moo
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Type-Tiny>=0.008:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS=	p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-Type-Tiny>=0.008:devel/p5-Type-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd
+TEST_DEPENDS=	p5-File-pushd>=0:devel/p5-File-pushd
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-Types-Serialiser/Makefile b/devel/p5-Types-Serialiser/Makefile
index 9825f8cb4d84..81a1a90eff7a 100644
--- a/devel/p5-Types-Serialiser/Makefile
+++ b/devel/p5-Types-Serialiser/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Simple data types for common serialisation formats
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-common-sense>=0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-common-sense>=0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-Types-URI/Makefile b/devel/p5-Types-URI/Makefile
index 240aa0a6b91d..9222d79936a7 100644
--- a/devel/p5-Types-URI/Makefile
+++ b/devel/p5-Types-URI/Makefile
@@ -14,12 +14,12 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Type-Tiny>=1.000000:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-Types-Path-Tiny>0:${PORTSDIR}/devel/p5-Types-Path-Tiny \
-	p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-Types-UUID>=0:${PORTSDIR}/devel/p5-Types-UUID \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-URI-FromHash>0:${PORTSDIR}/net/p5-URI-FromHash
+	p5-Type-Tiny>=1.000000:devel/p5-Type-Tiny \
+	p5-Types-Path-Tiny>0:devel/p5-Types-Path-Tiny \
+	p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+	p5-Types-UUID>=0:devel/p5-Types-UUID \
+	p5-URI>0:net/p5-URI \
+	p5-URI-FromHash>0:net/p5-URI-FromHash
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Types-UUID/Makefile b/devel/p5-Types-UUID/Makefile
index 1a8abff42671..ecd5e77dcd45 100644
--- a/devel/p5-Types-UUID/Makefile
+++ b/devel/p5-Types-UUID/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Type-Tiny>=1.000000:${PORTSDIR}/devel/p5-Type-Tiny \
-	p5-UUID-Tiny>=1.02:${PORTSDIR}/devel/p5-UUID-Tiny
+	p5-Type-Tiny>=1.000000:devel/p5-Type-Tiny \
+	p5-UUID-Tiny>=1.02:devel/p5-UUID-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index 1c26e9aa8bd7..2a413f4603b9 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Perl wrapper for the various dialog applications
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
+RUN_DEPENDS=	cdialog:devel/cdialog
 
 OPTIONS_DEFINE=	KDE NEWT X11 ZENITY
 
@@ -24,10 +24,10 @@ USES=		perl5
 USE_PERL5=	configure
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-KDE_RUN_DEPENDS=	kdialog:${PORTSDIR}/x11/kde4-baseapps
-NEWT_RUN_DEPENDS=	whiptail:${PORTSDIR}/devel/newt
-X11_RUN_DEPENDS=	Xdialog:${PORTSDIR}/x11/xdialog
-ZENITY_RUN_DEPENDS=	zenity:${PORTSDIR}/x11/zenity
+KDE_RUN_DEPENDS=	kdialog:x11/kde4-baseapps
+NEWT_RUN_DEPENDS=	whiptail:devel/newt
+X11_RUN_DEPENDS=	Xdialog:x11/xdialog
+ZENITY_RUN_DEPENDS=	zenity:x11/zenity
 
 post-patch:
 	@${REINPLACE_CMD} -e "/self->{'_opts'}->{'bin'}/ s|dialog|c&|" ${WRKSRC}/lib/UI/Dialog/Backend/CDialog.pm
diff --git a/devel/p5-UNIVERSAL-ref/Makefile b/devel/p5-UNIVERSAL-ref/Makefile
index 11195141c478..07d0b17866dc 100644
--- a/devel/p5-UNIVERSAL-ref/Makefile
+++ b/devel/p5-UNIVERSAL-ref/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Turns ref() into a multimethod
 
-BUILD_DEPENDS=	p5-B-Utils>=0:${PORTSDIR}/devel/p5-B-Utils
+BUILD_DEPENDS=	p5-B-Utils>=0:devel/p5-B-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-UUID-Random-Patch-UseMRS/Makefile b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
index 121ba2dd18c5..59dd16483781 100644
--- a/devel/p5-UUID-Random-Patch-UseMRS/Makefile
+++ b/devel/p5-UUID-Random-Patch-UseMRS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Make UUID::Random use Math::Random::Secure::rand()
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-Random-Secure>=0:${PORTSDIR}/math/p5-Math-Random-Secure \
-		p5-UUID-Random>=0:${PORTSDIR}/devel/p5-UUID-Random
+BUILD_DEPENDS=	p5-Math-Random-Secure>=0:math/p5-Math-Random-Secure \
+		p5-UUID-Random>=0:devel/p5-UUID-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/devel/p5-UUID-Tiny/Makefile b/devel/p5-UUID-Tiny/Makefile
index 27281d282a15..e721f5c577ef 100644
--- a/devel/p5-UUID-Tiny/Makefile
+++ b/devel/p5-UUID-Tiny/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure Perl UUID Support With Functional Interface
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-UUID/Makefile b/devel/p5-UUID/Makefile
index 87ae5cd4e284..00b3f9013883 100644
--- a/devel/p5-UUID/Makefile
+++ b/devel/p5-UUID/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl extension for using UUID interfaces as defined in e2fsprogs
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Unix-Statgrab/Makefile b/devel/p5-Unix-Statgrab/Makefile
index b6e69cc0cc03..bd0f4afd7bcf 100644
--- a/devel/p5-Unix-Statgrab/Makefile
+++ b/devel/p5-Unix-Statgrab/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Perl extension for collecting information about the machine
 
-BUILD_DEPENDS=	p5-Config-AutoConf>=0.19:${PORTSDIR}/devel/p5-Config-AutoConf
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+BUILD_DEPENDS=	p5-Config-AutoConf>=0.19:devel/p5-Config-AutoConf
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 USES=		perl5 pkgconfig
 USE_PERL5=	configure modbuild
diff --git a/devel/p5-User-Identity/Makefile b/devel/p5-User-Identity/Makefile
index 6c47a016fa6a..d43360ddae6f 100644
--- a/devel/p5-User-Identity/Makefile
+++ b/devel/p5-User-Identity/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for abstracting information about a physical person
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Geography-Countries>0:${PORTSDIR}/misc/p5-Geography-Countries
+RUN_DEPENDS=	p5-Geography-Countries>0:misc/p5-Geography-Countries
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-VCP-Dest-svk/Makefile b/devel/p5-VCP-Dest-svk/Makefile
index 43a94851b243..55750c6f64e3 100644
--- a/devel/p5-VCP-Dest-svk/Makefile
+++ b/devel/p5-VCP-Dest-svk/Makefile
@@ -15,10 +15,10 @@ COMMENT=	VCP destination driver for svn/svk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-VCP-autrijus>=0:${PORTSDIR}/devel/p5-VCP-autrijus \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		svk>=0:${PORTSDIR}/devel/svk
+BUILD_DEPENDS=	p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-subversion>=0:devel/p5-subversion \
+		svk>=0:devel/svk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index aac28ca161f2..6269f83088e3 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	VCP source driver for bk exported cvs repository
 
-BUILD_DEPENDS=	p5-VCP-autrijus>=0:${PORTSDIR}/devel/p5-VCP-autrijus \
-		p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-VCP-autrijus>=0:devel/p5-VCP-autrijus \
+		p5-Module-Install>0:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index c4088134ca3f..5c3242f68778 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -14,14 +14,14 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-snapshot-${PORTVERSION:C/\.([^.]*)$/-\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tool for copying files between various SCM repositories
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-AutoWriter>=0:${PORTSDIR}/textproc/p5-XML-AutoWriter \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-PodToHTML>=0:${PORTSDIR}/www/p5-PodToHTML \
-		p5-Regexp-Shellish>=0:${PORTSDIR}/devel/p5-Regexp-Shellish \
-		p5-BFD>=0:${PORTSDIR}/devel/p5-BFD \
-		p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-AutoWriter>=0:textproc/p5-XML-AutoWriter \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-PodToHTML>=0:www/p5-PodToHTML \
+		p5-Regexp-Shellish>=0:devel/p5-Regexp-Shellish \
+		p5-BFD>=0:devel/p5-BFD \
+		p5-Text-Table>=0:textproc/p5-Text-Table
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCS-CVS/Makefile b/devel/p5-VCS-CVS/Makefile
index b46e2b3e3b7b..f0b3d2965208 100644
--- a/devel/p5-VCS-CVS/Makefile
+++ b/devel/p5-VCS-CVS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that provides a simple interface to CVS
 
-BUILD_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+BUILD_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5 tar:tgz
 USE_PERL5=	modbuild
diff --git a/devel/p5-VCS-Lite/Makefile b/devel/p5-VCS-Lite/Makefile
index db8886cbc85c..dbdae219b379 100644
--- a/devel/p5-VCS-Lite/Makefile
+++ b/devel/p5-VCS-Lite/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Minimal version control system
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=1.13:${PORTSDIR}/devel/p5-Algorithm-Diff
+BUILD_DEPENDS=	p5-Algorithm-Diff>=1.13:devel/p5-Algorithm-Diff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile
index 97753a767c75..a8960ca1bf6b 100644
--- a/devel/p5-VCS/Makefile
+++ b/devel/p5-VCS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Library for generic Version Control System access in Perl
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Validation-Class/Makefile b/devel/p5-Validation-Class/Makefile
index 13cad62044cb..a09e0df4b16c 100644
--- a/devel/p5-Validation-Class/Makefile
+++ b/devel/p5-Validation-Class/Makefile
@@ -15,16 +15,16 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Forward>0:${PORTSDIR}/devel/p5-Class-Forward \
-	p5-Hash-Flatten>0:${PORTSDIR}/devel/p5-Hash-Flatten \
-	p5-Hash-Merge>0:${PORTSDIR}/textproc/p5-Hash-Merge \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Module-Find>0:${PORTSDIR}/devel/p5-Module-Find \
-	p5-Module-Runtime>0:${PORTSDIR}/devel/p5-Module-Runtime
+	p5-Class-Forward>0:devel/p5-Class-Forward \
+	p5-Hash-Flatten>0:devel/p5-Hash-Flatten \
+	p5-Hash-Merge>0:textproc/p5-Hash-Merge \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+	p5-Module-Find>0:devel/p5-Module-Find \
+	p5-Module-Runtime>0:devel/p5-Module-Runtime
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-	p5-Class-Method-Modifiers>0:${PORTSDIR}/devel/p5-Class-Method-Modifiers
+	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Variable-Eject/Makefile b/devel/p5-Variable-Eject/Makefile
index 880219e6dd11..183e82c9e5b8 100644
--- a/devel/p5-Variable-Eject/Makefile
+++ b/devel/p5-Variable-Eject/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Eject variables from hash to current namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lexical-Alias>=0.04:${PORTSDIR}/devel/p5-Lexical-Alias \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-uni-perl>=0.03:${PORTSDIR}/devel/p5-uni-perl
-RUN_DEPENDS=	p5-Lexical-Alias>=0.04:${PORTSDIR}/devel/p5-Lexical-Alias \
-		p5-Devel-Declare>=0.005011:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-uni-perl>=0.03:${PORTSDIR}/devel/p5-uni-perl
+BUILD_DEPENDS=	p5-Lexical-Alias>=0.04:devel/p5-Lexical-Alias \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-uni-perl>=0.03:devel/p5-uni-perl
+RUN_DEPENDS=	p5-Lexical-Alias>=0.04:devel/p5-Lexical-Alias \
+		p5-Devel-Declare>=0.005011:devel/p5-Devel-Declare \
+		p5-uni-perl>=0.03:devel/p5-uni-perl
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-Workflow/Makefile b/devel/p5-Workflow/Makefile
index 3de2d7e2da9f..32a0286e02d4 100644
--- a/devel/p5-Workflow/Makefile
+++ b/devel/p5-Workflow/Makefile
@@ -13,26 +13,26 @@ COMMENT=	Simple, flexible system to implement workflows
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.18:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Factory>=1:${PORTSDIR}/devel/p5-Class-Factory \
-		p5-Class-Observable>=1.04:${PORTSDIR}/devel/p5-Class-Observable \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime>=0.15:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=1:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-Exception-Class>=1.1:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Log-Dispatch>=2:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-Log-Log4perl>=0.34:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-XML-Simple>=2:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-Class-Accessor>=0.18:devel/p5-Class-Accessor \
+		p5-Class-Factory>=1:devel/p5-Class-Factory \
+		p5-Class-Observable>=1.04:devel/p5-Class-Observable \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DateTime>=0.15:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=1:devel/p5-DateTime-Format-Strptime \
+		p5-Exception-Class>=1.1:devel/p5-Exception-Class \
+		p5-Log-Dispatch>=2:devel/p5-Log-Dispatch \
+		p5-Log-Log4perl>=0.34:devel/p5-Log-Log4perl \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-XML-Simple>=2:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-Mock>=0.1:${PORTSDIR}/databases/p5-DBD-Mock \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Pod-Coverage-TrustPod>=0:${PORTSDIR}/devel/p5-Pod-Coverage-TrustPod \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Kwalitee>=1.21:${PORTSDIR}/devel/p5-Test-Kwalitee \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-DBD-Mock>=0.1:databases/p5-DBD-Mock \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Pod-Coverage-TrustPod>=0:devel/p5-Pod-Coverage-TrustPod \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Kwalitee>=1.21:devel/p5-Test-Kwalitee \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-XML-Compile-Tester/Makefile b/devel/p5-XML-Compile-Tester/Makefile
index c27494ca986f..1b7e0aa07f44 100644
--- a/devel/p5-XML-Compile-Tester/Makefile
+++ b/devel/p5-XML-Compile-Tester/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Support XML::Compile Related Regression Testing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Log-Report>=0.17:${PORTSDIR}/devel/p5-Log-Report \
-		p5-Test-Deep>=0.095:${PORTSDIR}/devel/p5-Test-Deep
+RUN_DEPENDS=	p5-Log-Report>=0.17:devel/p5-Log-Report \
+		p5-Test-Deep>=0.095:devel/p5-Test-Deep
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-XML-Pastor/Makefile b/devel/p5-XML-Pastor/Makefile
index ee2538f8569d..8bac9a35ab55 100644
--- a/devel/p5-XML-Pastor/Makefile
+++ b/devel/p5-XML-Pastor/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Generate Perl classes with XML bindings from a W3C XSD schema
 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-Data-HashArray>=0:${PORTSDIR}/devel/p5-Data-HashArray \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		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-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Data-HashArray>=0:devel/p5-Data-HashArray \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/p5-XS-Object-Magic/Makefile b/devel/p5-XS-Object-Magic/Makefile
index f452a7b98eaf..73968ddd0efd 100644
--- a/devel/p5-XS-Object-Magic/Makefile
+++ b/devel/p5-XS-Object-Magic/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Opaque, extensible XS pointer backed objects using sv_magic
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
-TEST_DEPENDS=	p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
+TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
@@ -21,7 +21,7 @@ USES=		perl5
 .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
 
 post-install:
diff --git a/devel/p5-Xporter/Makefile b/devel/p5-Xporter/Makefile
index b1ce3e2d4dd1..657e98701a99 100644
--- a/devel/p5-Xporter/Makefile
+++ b/devel/p5-Xporter/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Alternative Exporter with persistant defaults and auto-ISA
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-mem>=0.4.5:${PORTSDIR}/devel/p5-mem
+BUILD_DEPENDS=	p5-mem>=0.4.5:devel/p5-mem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -25,7 +25,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.86:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-YAML-AppConfig/Makefile b/devel/p5-YAML-AppConfig/Makefile
index 77a377a34ac1..cdb61e24d0ee 100644
--- a/devel/p5-YAML-AppConfig/Makefile
+++ b/devel/p5-YAML-AppConfig/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-YAML>=0.38:${PORTSDIR}/textproc/p5-YAML
+	p5-YAML>=0.38:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-Yada-Yada-Yada/Makefile b/devel/p5-Yada-Yada-Yada/Makefile
index 99c627c3630d..8c5ed900135e 100644
--- a/devel/p5-Yada-Yada-Yada/Makefile
+++ b/devel/p5-Yada-Yada-Yada/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds a Yada-Yada-Yada operator (...) to Perl 5
 
-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/devel/p5-ZConf-GUI/Makefile b/devel/p5-ZConf-GUI/Makefile
index 39c06447f0b7..fa1819a3a492 100644
--- a/devel/p5-ZConf-GUI/Makefile
+++ b/devel/p5-ZConf-GUI/Makefile
@@ -15,10 +15,10 @@ COMMENT=	GUI backend chooser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
-		p5-Error-Helper>=1.0.0:${PORTSDIR}/devel/p5-Error-Helper \
-		p5-Module-List>=0.003:${PORTSDIR}/devel/p5-Module-List \
-		${LOCALBASE}/bin/xhost:${PORTSDIR}/x11/xhost
+BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
+		p5-Error-Helper>=1.0.0:devel/p5-Error-Helper \
+		p5-Module-List>=0.003:devel/p5-Module-List \
+		${LOCALBASE}/bin/xhost:x11/xhost
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/devel/p5-ZML/Makefile b/devel/p5-ZML/Makefile
index b27f44f01c29..311c5fc98769 100644
--- a/devel/p5-ZML/Makefile
+++ b/devel/p5-ZML/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Simple, fast, and easy to read binary data storage format
 
-BUILD_DEPENDS=	p5-Error-Helper>=0:${PORTSDIR}/devel/p5-Error-Helper
-RUN_DEPENDS=	p5-Error-Helper>=0:${PORTSDIR}/devel/p5-Error-Helper
+BUILD_DEPENDS=	p5-Error-Helper>=0:devel/p5-Error-Helper
+RUN_DEPENDS=	p5-Error-Helper>=0:devel/p5-Error-Helper
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-accessors-fast/Makefile b/devel/p5-accessors-fast/Makefile
index 6131b3f46692..d478374fc21f 100644
--- a/devel/p5-accessors-fast/Makefile
+++ b/devel/p5-accessors-fast/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Wrap fastest Class::Accessor::* into pragma
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Fast-XS>=0:${PORTSDIR}/devel/p5-Class-Accessor-Fast-XS \
-		p5-constant-def>=0.01:${PORTSDIR}/devel/p5-constant-def \
-		p5-Class-C3>=0:${PORTSDIR}/devel/p5-Class-C3
+BUILD_DEPENDS=	p5-Class-Accessor-Fast-XS>=0:devel/p5-Class-Accessor-Fast-XS \
+		p5-constant-def>=0.01:devel/p5-constant-def \
+		p5-Class-C3>=0:devel/p5-Class-C3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-autobox-Core/Makefile b/devel/p5-autobox-Core/Makefile
index 28f13341af24..fba0fd332674 100644
--- a/devel/p5-autobox-Core/Makefile
+++ b/devel/p5-autobox-Core/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Core functions exposed as methods in primitive types
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Want>=0.26:${PORTSDIR}/devel/p5-Want \
-		p5-autobox>=2.71:${PORTSDIR}/devel/p5-autobox
+BUILD_DEPENDS=	p5-Want>=0.26:devel/p5-Want \
+		p5-autobox>=2.71:devel/p5-autobox
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-autobox/Makefile b/devel/p5-autobox/Makefile
index 0d0753c6325e..b8833551532b 100644
--- a/devel/p5-autobox/Makefile
+++ b/devel/p5-autobox/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bill.brinzer@gmail.com
 COMMENT=	Call methods on native Perl types
 
-BUILD_DEPENDS=	p5-Scope-Guard>=0.20:${PORTSDIR}/devel/p5-Scope-Guard
+BUILD_DEPENDS=	p5-Scope-Guard>=0.20:devel/p5-Scope-Guard
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-autodie/Makefile b/devel/p5-autodie/Makefile
index 56dad84d2c80..24bf4d450e1f 100644
--- a/devel/p5-autodie/Makefile
+++ b/devel/p5-autodie/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Replace functions with ones that succeed or die with lexical scope
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource \
-		p5-IPC-System-Simple>=0.12:${PORTSDIR}/devel/p5-IPC-System-Simple \
-		p5-Import-Into>=1.002004:${PORTSDIR}/devel/p5-Import-Into \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify
+TEST_DEPENDS=	p5-BSD-Resource>=0:devel/p5-BSD-Resource \
+		p5-IPC-System-Simple>=0.12:devel/p5-IPC-System-Simple \
+		p5-Import-Into>=1.002004:devel/p5-Import-Into \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-bareword-filehandles/Makefile b/devel/p5-bareword-filehandles/Makefile
index 9c491b27a233..ca40cbbea767 100644
--- a/devel/p5-bareword-filehandles/Makefile
+++ b/devel/p5-bareword-filehandles/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Disables bareword filehandles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-Lexical-SealRequireHints>=0:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
-RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Lexical-SealRequireHints>=0:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
+BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-Lexical-SealRequireHints>=0:devel/p5-Lexical-SealRequireHints
+RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0:devel/p5-B-Hooks-OP-Check \
+		p5-Lexical-SealRequireHints>=0:devel/p5-Lexical-SealRequireHints
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-capitalization/Makefile b/devel/p5-capitalization/Makefile
index a9b509ae3be9..db3ce53d5165 100644
--- a/devel/p5-capitalization/Makefile
+++ b/devel/p5-capitalization/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl module which allows you to use familiar style on method naming
 
-BUILD_DEPENDS=	p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+BUILD_DEPENDS=	p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Test-Simple>=0:devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-carton/Makefile b/devel/p5-carton/Makefile
index fb57059fef2b..ec0cc773b3f2 100644
--- a/devel/p5-carton/Makefile
+++ b/devel/p5-carton/Makefile
@@ -15,15 +15,15 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-App-cpanminus>=1.703:${PORTSDIR}/devel/p5-App-cpanminus \
-	p5-CPAN-Meta>=2.120921:${PORTSDIR}/devel/p5-CPAN-Meta \
-	p5-CPAN-Meta-Requirements>=2.121:${PORTSDIR}/devel/p5-CPAN-Meta-Requirements \
-	p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
-	p5-Module-CPANfile>=0.9031:${PORTSDIR}/devel/p5-Module-CPANfile \
-	p5-Module-Metadata>=1.000003:${PORTSDIR}/devel/p5-Module-Metadata \
-	p5-Module-Reader>=0.002:${PORTSDIR}/devel/p5-Module-Reader \
-	p5-Path-Tiny>=0.033:${PORTSDIR}/devel/p5-Path-Tiny \
-	p5-Try-Tiny>=0.09:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-App-cpanminus>=1.703:devel/p5-App-cpanminus \
+	p5-CPAN-Meta>=2.120921:devel/p5-CPAN-Meta \
+	p5-CPAN-Meta-Requirements>=2.121:devel/p5-CPAN-Meta-Requirements \
+	p5-JSON>=2.53:converters/p5-JSON \
+	p5-Module-CPANfile>=0.9031:devel/p5-Module-CPANfile \
+	p5-Module-Metadata>=1.000003:devel/p5-Module-Metadata \
+	p5-Module-Reader>=0.002:devel/p5-Module-Reader \
+	p5-Path-Tiny>=0.033:devel/p5-Path-Tiny \
+	p5-Try-Tiny>=0.09:lang/p5-Try-Tiny
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-constant-boolean/Makefile b/devel/p5-constant-boolean/Makefile
index a24762c186e3..ccd5e8dca500 100644
--- a/devel/p5-constant-boolean/Makefile
+++ b/devel/p5-constant-boolean/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Define TRUE and FALSE constants
 
-TEST_DEPENDS=	p5-Symol-Util>=0:${PORTSDIR}/devel/p5-Symbol-Util
+TEST_DEPENDS=	p5-Symol-Util>=0:devel/p5-Symbol-Util
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-constant-def/Makefile b/devel/p5-constant-def/Makefile
index 1a849aa40f81..c64d72b80a0a 100644
--- a/devel/p5-constant-def/Makefile
+++ b/devel/p5-constant-def/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Declare only undeclared constants
 
-BUILD_DEPENDS=	p5-ex-lib>=0.06:${PORTSDIR}/devel/p5-ex-lib
+BUILD_DEPENDS=	p5-ex-lib>=0.06:devel/p5-ex-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-constant-lexical/Makefile b/devel/p5-constant-lexical/Makefile
index a1fac3ac8293..ead965dc8f32 100644
--- a/devel/p5-constant-lexical/Makefile
+++ b/devel/p5-constant-lexical/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl pragma to declare lexical compile-time constants
 
-BUILD_DEPENDS=	p5-Sub-Delete>=0:${PORTSDIR}/devel/p5-Sub-Delete \
-		p5-Lexical-Var>=0:${PORTSDIR}/devel/p5-Lexical-Var
+BUILD_DEPENDS=	p5-Sub-Delete>=0:devel/p5-Sub-Delete \
+		p5-Lexical-Var>=0:devel/p5-Lexical-Var
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-cpan-listchanges/Makefile b/devel/p5-cpan-listchanges/Makefile
index 3e7e24389bda..9457d7522fe6 100644
--- a/devel/p5-cpan-listchanges/Makefile
+++ b/devel/p5-cpan-listchanges/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to list changes for CPAN modules
 
 RUN_DEPENDS=	\
-	p5-Algorithm-Diff>0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-	p5-CPAN-DistnameInfo>0:${PORTSDIR}/devel/p5-CPAN-DistnameInfo \
-	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-	p5-Module-Metadata>0:${PORTSDIR}/devel/p5-Module-Metadata \
-	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-	p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+	p5-Algorithm-Diff>0:devel/p5-Algorithm-Diff \
+	p5-CPAN-DistnameInfo>0:devel/p5-CPAN-DistnameInfo \
+	p5-libwww>0:www/p5-libwww \
+	p5-Module-Metadata>0:devel/p5-Module-Metadata \
+	p5-Try-Tiny>0:lang/p5-Try-Tiny \
+	p5-YAML>0:textproc/p5-YAML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ex-lib/Makefile b/devel/p5-ex-lib/Makefile
index da129db4310d..87170dd0f2b0 100644
--- a/devel/p5-ex-lib/Makefile
+++ b/devel/p5-ex-lib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Relative use lib in absolute way
 
-RUN_DEPENDS=	p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+RUN_DEPENDS=	p5-lib-abs>=0.90:devel/p5-lib-abs
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-forks/Makefile b/devel/p5-forks/Makefile
index 36ac0647ad36..ec92c2137ded 100644
--- a/devel/p5-forks/Makefile
+++ b/devel/p5-forks/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Drop-in replacement for Perl threads using fork()
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Acme-Damn>=0:${PORTSDIR}/devel/p5-Acme-Damn \
-		p5-Attribute-Handlers>=0:${PORTSDIR}/devel/p5-Attribute-Handlers \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-List-MoreUtils>=:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Sys-SigAction>=0.11:${PORTSDIR}/devel/p5-Sys-SigAction
+BUILD_DEPENDS=	p5-Acme-Damn>=0:devel/p5-Acme-Damn \
+		p5-Attribute-Handlers>=0:devel/p5-Attribute-Handlers \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-List-MoreUtils>=:lang/p5-List-MoreUtils \
+		p5-Sys-SigAction>=0.11:devel/p5-Sys-SigAction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-github_creator/Makefile b/devel/p5-github_creator/Makefile
index 89f7a34bacb3..77e742b83d2b 100644
--- a/devel/p5-github_creator/Makefile
+++ b/devel/p5-github_creator/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create a Github repository for your Perl module
 
-BUILD_DEPENDS=	p5-Config-IniFiles>0:${PORTSDIR}/devel/p5-Config-IniFiles	\
-		p5-File-Find-Closures>0:${PORTSDIR}/devel/p5-File-Find-Closures	\
-		p5-Log-Log4perl>0:${PORTSDIR}/devel/p5-Log-Log4perl	\
-		p5-WWW-Mechanize>0:${PORTSDIR}/www/p5-WWW-Mechanize	\
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Config-IniFiles>0:devel/p5-Config-IniFiles	\
+		p5-File-Find-Closures>0:devel/p5-File-Find-Closures	\
+		p5-Log-Log4perl>0:devel/p5-Log-Log4perl	\
+		p5-WWW-Mechanize>0:www/p5-WWW-Mechanize	\
+		p5-YAML>0:textproc/p5-YAML
 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/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index d3cd06dbbe39..8ec885dc8b9b 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Parse iCalendar files into a data structure
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-	p5-FreezeThaw>=0.43:${PORTSDIR}/devel/p5-FreezeThaw \
-	p5-DateTime-Format-ICal>=0.08:${PORTSDIR}/devel/p5-DateTime-Format-ICal \
-	p5-Text-vFile-asData>=0.02:${PORTSDIR}/devel/p5-Text-vFile-asData
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+	p5-FreezeThaw>=0.43:devel/p5-FreezeThaw \
+	p5-DateTime-Format-ICal>=0.08:devel/p5-DateTime-Format-ICal \
+	p5-Text-vFile-asData>=0.02:devel/p5-Text-vFile-asData
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=	perl5
diff --git a/devel/p5-lexical-underscore/Makefile b/devel/p5-lexical-underscore/Makefile
index be3dbfa394d4..be38fd946351 100644
--- a/devel/p5-lexical-underscore/Makefile
+++ b/devel/p5-lexical-underscore/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Access lexical underscore of your caller
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PadWalker>=0:${PORTSDIR}/devel/p5-PadWalker
+BUILD_DEPENDS=	p5-PadWalker>=0:devel/p5-PadWalker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-libxml-enno/Makefile b/devel/p5-libxml-enno/Makefile
index 33fd75e0ffa9..12ee032e2317 100644
--- a/devel/p5-libxml-enno/Makefile
+++ b/devel/p5-libxml-enno/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Group of Perl modules for XML parsing
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-libxml>=0:textproc/p5-libxml \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-libxml>=0:textproc/p5-libxml \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 
 CONFLICTS=	p5-XML-DOM-[0-9]* p5-XML-Filter-DetectWS-[0-9]* \
 		p5-XML-Filter-Reindent-[0-9]* p5-XML-Filter-SAXT-[0-9]* \
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 5c3a814cae8f..99fdde264921 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension to create and use a local lib/ with PERL5LIB
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
 
 USES=	perl5
 USE_PERL5=	configure
diff --git a/devel/p5-match-simple/Makefile b/devel/p5-match-simple/Makefile
index 8a54c685ff65..d7a3103122e5 100644
--- a/devel/p5-match-simple/Makefile
+++ b/devel/p5-match-simple/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Simplified clone of smartmatch operator
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-Sub-Infix>=0.004:${PORTSDIR}/devel/p5-Sub-Infix
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.026:devel/p5-Exporter-Tiny \
+		p5-Sub-Infix>=0.004:devel/p5-Sub-Infix
 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
 
 USE_PERL5=	configure
 USES=		perl5
@@ -26,8 +26,8 @@ USES=		perl5
 .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/devel/p5-mem/Makefile b/devel/p5-mem/Makefile
index fd8aa14738a1..6efd1fa7a1ba 100644
--- a/devel/p5-mem/Makefile
+++ b/devel/p5-mem/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.82:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS+=	p5-ExtUtils-MakeMaker>=6.82:devel/p5-ExtUtils-MakeMaker
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/p5-mixin/Makefile b/devel/p5-mixin/Makefile
index 79ad8b41782f..bae6f23ef4ee 100644
--- a/devel/p5-mixin/Makefile
+++ b/devel/p5-mixin/Makefile
@@ -15,7 +15,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-mocked/Makefile b/devel/p5-mocked/Makefile
index d2149823876c..c69818ae36bf 100644
--- a/devel/p5-mocked/Makefile
+++ b/devel/p5-mocked/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	mocked - use mocked libraries in unit tests
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 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/devel/p5-multidimensional/Makefile b/devel/p5-multidimensional/Makefile
index 321878d48332..151951f7d88a 100644
--- a/devel/p5-multidimensional/Makefile
+++ b/devel/p5-multidimensional/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Disables multidimensional array emulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-Lexical-SealRequireHints>=0.005:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
-RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Lexical-SealRequireHints>=0.005:${PORTSDIR}/devel/p5-Lexical-SealRequireHints
+BUILD_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-Lexical-SealRequireHints>=0.005:devel/p5-Lexical-SealRequireHints
+RUN_DEPENDS=	p5-B-Hooks-OP-Check>=0.19:devel/p5-B-Hooks-OP-Check \
+		p5-Lexical-SealRequireHints>=0.005:devel/p5-Lexical-SealRequireHints
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-namespace-autoclean/Makefile b/devel/p5-namespace-autoclean/Makefile
index 01b1c2423ab3..d0b5407ad677 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Keep imports out of your namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Moose>=2:${PORTSDIR}/devel/p5-Moose \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Spelling>0.12:${PORTSDIR}/devel/p5-Test-Spelling
+TEST_DEPENDS=	p5-Moo>=0:devel/p5-Moo \
+		p5-Moose>=2:devel/p5-Moose \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Spelling>0.12:devel/p5-Test-Spelling
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/devel/p5-namespace-clean/Makefile b/devel/p5-namespace-clean/Makefile
index 5458a18536e9..804c4a3fbef6 100644
--- a/devel/p5-namespace-clean/Makefile
+++ b/devel/p5-namespace-clean/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Keep imports and functions out of your namespace
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Package-Stash>=0.23:${PORTSDIR}/devel/p5-Package-Stash
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.12:devel/p5-B-Hooks-EndOfScope \
+		p5-Package-Stash>=0.23:devel/p5-Package-Stash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-namespace-sweep/Makefile b/devel/p5-namespace-sweep/Makefile
index 35959dd038ad..0b5871e53461 100644
--- a/devel/p5-namespace-sweep/Makefile
+++ b/devel/p5-namespace-sweep/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Sweep up imported subs in your classes
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.09:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-Package-Stash>=0.33:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Identify>=0.04:${PORTSDIR}/devel/p5-Sub-Identify \
-		p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.09:devel/p5-B-Hooks-EndOfScope \
+		p5-Package-Stash>=0.33:devel/p5-Package-Stash \
+		p5-Sub-Identify>=0.04:devel/p5-Sub-Identify \
+		p5-Sub-Name>=0:devel/p5-Sub-Name
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-orz/Makefile b/devel/p5-orz/Makefile
index eba46596e0f8..865efc29fcae 100644
--- a/devel/p5-orz/Makefile
+++ b/devel/p5-orz/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Method of annotation as /* */ in perl
 
-BUILD_DEPENDS=	p5-Module-Compile>=0.21:${PORTSDIR}/devel/p5-Module-Compile
+BUILD_DEPENDS=	p5-Module-Compile>=0.21:devel/p5-Module-Compile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 88dc2dc356af..750b5689753b 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Perl bindings for Qt
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2 \
+		libqwt.so:x11-toolkits/qwt5
 
 USE_KDE4=	kdeprefix smokeqt qimageblitz
 USE_QT4=	corelib dbus gui network xml \
diff --git a/devel/p5-pip/Makefile b/devel/p5-pip/Makefile
index 8dad267ff91f..9e2d1280da42 100644
--- a/devel/p5-pip/Makefile
+++ b/devel/p5-pip/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Perl Installation Program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.29:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-CPAN-Inject>=0.07:${PORTSDIR}/devel/p5-CPAN-Inject \
-		p5-File-Which>=1.08:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-File-pushd>=0.32:${PORTSDIR}/devel/p5-File-pushd \
-		p5-PAR-Dist>=0.25:${PORTSDIR}/devel/p5-PAR-Dist \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Archive-Zip>=1.29:archivers/p5-Archive-Zip \
+		p5-CPAN-Inject>=0.07:devel/p5-CPAN-Inject \
+		p5-File-Which>=1.08:sysutils/p5-File-Which \
+		p5-File-pushd>=0.32:devel/p5-File-pushd \
+		p5-PAR-Dist>=0.25:devel/p5-PAR-Dist \
+		p5-Params-Util>=1.00:devel/p5-Params-Util \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-LWP-Online>=0:${PORTSDIR}/www/p5-LWP-Online \
-		p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
+TEST_DEPENDS=	p5-LWP-Online>=0:www/p5-LWP-Online \
+		p5-Test-Script>=0:devel/p5-Test-Script \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-relative/Makefile b/devel/p5-relative/Makefile
index 80f5f069b609..fec63cc8c48c 100644
--- a/devel/p5-relative/Makefile
+++ b/devel/p5-relative/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Load modules with relative names
 
-RUN_DEPENDS=	p5-UNIVERSAL-require>=0.11:${PORTSDIR}/devel/p5-UNIVERSAL-require
+RUN_DEPENDS=	p5-UNIVERSAL-require>=0.11:devel/p5-UNIVERSAL-require
 
 BUILD_DEPEND=	${RUN_DEPENDS} \
-				p5-Test-Simple>=0.74:${PORTSDIR}/devel/p5-Test-Simple
+				p5-Test-Simple>=0.74:devel/p5-Test-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-rpm-build-perl/Makefile b/devel/p5-rpm-build-perl/Makefile
index aad4c1de4407..1867728ccb13 100644
--- a/devel/p5-rpm-build-perl/Makefile
+++ b/devel/p5-rpm-build-perl/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	This module is required to build Perl RPM packages
 
-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/devel/p5-self-init/Makefile b/devel/p5-self-init/Makefile
index 51151e154572..910036d70dbe 100644
--- a/devel/p5-self-init/Makefile
+++ b/devel/p5-self-init/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Invoke package init methods at compile time
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-ex-lib>=0:${PORTSDIR}/devel/p5-ex-lib
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-ex-lib>=0:devel/p5-ex-lib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/p5-self/Makefile b/devel/p5-self/Makefile
index 4274748e58ca..321e008017ca 100644
--- a/devel/p5-self/Makefile
+++ b/devel/p5-self/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Provides "self" and "args" keywords in your OO program
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-B-Hooks-Parser>=0.08:${PORTSDIR}/devel/p5-B-Hooks-Parser \
-		p5-B-OPCheck>=0.27:${PORTSDIR}/devel/p5-B-OPCheck \
-		p5-Devel-Declare>=0.003004:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-B-Hooks-Parser>=0.08:devel/p5-B-Hooks-Parser \
+		p5-B-OPCheck>=0.27:devel/p5-B-OPCheck \
+		p5-Devel-Declare>=0.003004:devel/p5-Devel-Declare \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-strictures/Makefile b/devel/p5-strictures/Makefile
index c5b1114ee9af..9fd2cd534ce9 100644
--- a/devel/p5-strictures/Makefile
+++ b/devel/p5-strictures/Makefile
@@ -23,9 +23,9 @@ OPTIONS_DEFINE=	STRICTURES_EXTRA
 OPTIONS_DEFAULT=STRICTURES_EXTRA
 
 STRICTURES_EXTRA_DESC=		Enable full set of strictures (recommended)
-STRICTURES_EXTRA_BUILD_DEPENDS=	p5-bareword-filehandles>=0:${PORTSDIR}/devel/p5-bareword-filehandles \
-				p5-indirect>=0:${PORTSDIR}/devel/p5-indirect \
-				p5-multidimensional>=0:${PORTSDIR}/devel/p5-multidimensional
+STRICTURES_EXTRA_BUILD_DEPENDS=	p5-bareword-filehandles>=0:devel/p5-bareword-filehandles \
+				p5-indirect>=0:devel/p5-indirect \
+				p5-multidimensional>=0:devel/p5-multidimensional
 STRICTURES_EXTRA_RUN_DEPENDS=	${STRICTURES_EXTRA_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/devel/p5-subatom/Makefile b/devel/p5-subatom/Makefile
index 2f0a8d8de9eb..e0321a91aef1 100644
--- a/devel/p5-subatom/Makefile
+++ b/devel/p5-subatom/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Produce an atom feed from subversion commits
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-XML-Atom-SimpleFeed>=0.80:${PORTSDIR}/textproc/p5-XML-Atom-SimpleFeed
+BUILD_DEPENDS=	p5-XML-Atom-SimpleFeed>=0.80:textproc/p5-XML-Atom-SimpleFeed
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/p5-syntax/Makefile b/devel/p5-syntax/Makefile
index d50dd1cddd83..376d115a8e9f 100644
--- a/devel/p5-syntax/Makefile
+++ b/devel/p5-syntax/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Activate syntax extensions in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-OptList>=0.104:${PORTSDIR}/devel/p5-Data-OptList \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Data-OptList>=0.104:devel/p5-Data-OptList \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/devel/p5-true/Makefile b/devel/p5-true/Makefile
index f256de536b7a..102a7b7b65e9 100644
--- a/devel/p5-true/Makefile
+++ b/devel/p5-true/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically return a true value when a file is required
 
-BUILD_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Annotation \
-		p5-B-Hooks-OP-Check>=0.18:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Devel-StackTrace>=1.27:${PORTSDIR}/devel/p5-Devel-StackTrace \
-		p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends
-RUN_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:${PORTSDIR}/devel/p5-B-Hooks-OP-Annotation \
-		p5-B-Hooks-OP-Check>=0.18:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-Devel-StackTrace>=1.27:${PORTSDIR}/devel/p5-Devel-StackTrace
+BUILD_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation \
+		p5-B-Hooks-OP-Check>=0.18:devel/p5-B-Hooks-OP-Check \
+		p5-Devel-StackTrace>=1.27:devel/p5-Devel-StackTrace \
+		p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends
+RUN_DEPENDS=	p5-B-Hooks-OP-Annotation>=0.43:devel/p5-B-Hooks-OP-Annotation \
+		p5-B-Hooks-OP-Check>=0.18:devel/p5-B-Hooks-OP-Check \
+		p5-Devel-StackTrace>=1.27:devel/p5-Devel-StackTrace
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/devel/p5-uni-perl/Makefile b/devel/p5-uni-perl/Makefile
index 3c990f1d2272..e6ddd9e8b84b 100644
--- a/devel/p5-uni-perl/Makefile
+++ b/devel/p5-uni-perl/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mons@cpan.org
 COMMENT=	Modern perl with Unicode
 
-RUN_DEPENDS=	p5-Encode>=2.37:${PORTSDIR}/converters/p5-Encode \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+RUN_DEPENDS=	p5-Encode>=2.37:converters/p5-Encode \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 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
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/paexec/Makefile b/devel/paexec/Makefile
index 2ac93d0e5db6..cded3fdd1b2c 100644
--- a/devel/paexec/Makefile
+++ b/devel/paexec/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Parallel executor, distributes tasks over network
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	mkcmake:${PORTSDIR}/devel/mk-configure \
-		runawk:${PORTSDIR}/lang/runawk
+BUILD_DEPENDS=	mkcmake:devel/mk-configure \
+		runawk:lang/runawk
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/pas2dox/Makefile b/devel/pas2dox/Makefile
index 2c5211c4bd66..d5b5412147d4 100644
--- a/devel/pas2dox/Makefile
+++ b/devel/pas2dox/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/${PORTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 MAKE_ENV+=	LEX="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index c943961c07e2..69c1768e09dd 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Wrapper class around the pcre library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/pcsc-ada/Makefile b/devel/pcsc-ada/Makefile
index 826d29f1f1a1..47b4a99dbb59 100644
--- a/devel/pcsc-ada/Makefile
+++ b/devel/pcsc-ada/Makefile
@@ -27,7 +27,7 @@ NO_OPTIONS_SORT=yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUNIT_TEST} || ${PORT_OPTIONS:MINTF_TEST}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/gnat/ahven.gpr:${PORTSDIR}/devel/ahven
+BUILD_DEPENDS+=	${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
 . if ${PORT_OPTIONS:MUNIT_TEST}
 ALL_TARGET+=	utests
 . endif
@@ -36,11 +36,11 @@ ALL_TARGET+=	itests
 . endif
 .endif
 
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc \
-		source-highlight:${PORTSDIR}/textproc/source-highlight
+BUILD_DEPENDS+= asciidoc:textproc/asciidoc \
+		source-highlight:textproc/source-highlight
 ALL_TARGET+=	doc
 USES+=		gmake
 .endif
diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile
index 0043518127bb..d14822face38 100644
--- a/devel/pdcurses/Makefile
+++ b/devel/pdcurses/Makefile
@@ -26,11 +26,11 @@ LATIN1_CONFIGURE_ENABLE=latin1
 
 NEXTAW_DESC=		Link with NeXtaw
 NEXTAW_CONFIGURE_WITH=	nextaw
-NEXTAW_LIB_DEPENDS=	libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
+NEXTAW_LIB_DEPENDS=	libneXtaw.so:x11-toolkits/neXtaw
 
 XAW3D_DESC=		Link with Xaw3d
 XAW3D_CONFIGURE_WITH=	xaw3d
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index a794b17970e2..0ce9938a0d77 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -14,7 +14,7 @@ PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
 
 USES=	pear
 
-PEAR_XML_PARSER_RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+PEAR_XML_PARSER_RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays/Makefile b/devel/pear-Date_Holidays/Makefile
index 9ab24fffa1dd..3578f748a59c 100644
--- a/devel/pear-Date_Holidays/Makefile
+++ b/devel/pear-Date_Holidays/Makefile
@@ -8,16 +8,16 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR driver based class to calculate holidays
 
-BUILD_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
-		${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 USES=		pear
 
 OPTIONS_DEFINE=	PEAR_CONSOLE_GETARGS
 PEAR_CONSOLE_GETARGS_DESC=	Console::Getargs support
 
-PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
+PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Austria/Makefile b/devel/pear-Date_Holidays_Austria/Makefile
index a2c2ce350485..0ea9a3ce54b2 100644
--- a/devel/pear-Date_Holidays_Austria/Makefile
+++ b/devel/pear-Date_Holidays_Austria/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Driver based class to calculate holidays in Austria
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=		pear
 NO_ARCH=	yes
diff --git a/devel/pear-Date_Holidays_Brazil/Makefile b/devel/pear-Date_Holidays_Brazil/Makefile
index aef293456b9e..c060c35dde89 100644
--- a/devel/pear-Date_Holidays_Brazil/Makefile
+++ b/devel/pear-Date_Holidays_Brazil/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Brazil
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Denmark/Makefile b/devel/pear-Date_Holidays_Denmark/Makefile
index e632bd8d4eb9..a091b92b50af 100644
--- a/devel/pear-Date_Holidays_Denmark/Makefile
+++ b/devel/pear-Date_Holidays_Denmark/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Denmark
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Discordian/Makefile b/devel/pear-Date_Holidays_Discordian/Makefile
index c7b15aab8f6d..3af82fc0d5d3 100644
--- a/devel/pear-Date_Holidays_Discordian/Makefile
+++ b/devel/pear-Date_Holidays_Discordian/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate Discordian holidays
 
-BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=   	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=   	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_EnglandWales/Makefile b/devel/pear-Date_Holidays_EnglandWales/Makefile
index 54a26d3c6589..a8d27f39c49b 100644
--- a/devel/pear-Date_Holidays_EnglandWales/Makefile
+++ b/devel/pear-Date_Holidays_EnglandWales/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in England and Wales
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Germany/Makefile b/devel/pear-Date_Holidays_Germany/Makefile
index e3821979d20d..1b5d35f50384 100644
--- a/devel/pear-Date_Holidays_Germany/Makefile
+++ b/devel/pear-Date_Holidays_Germany/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Germany
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Iceland/Makefile b/devel/pear-Date_Holidays_Iceland/Makefile
index fee6bf1d5ceb..9bad421058cc 100644
--- a/devel/pear-Date_Holidays_Iceland/Makefile
+++ b/devel/pear-Date_Holidays_Iceland/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Iceland
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Ireland/Makefile b/devel/pear-Date_Holidays_Ireland/Makefile
index bdd486571f02..ac8b4dbe2810 100644
--- a/devel/pear-Date_Holidays_Ireland/Makefile
+++ b/devel/pear-Date_Holidays_Ireland/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Ireland
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Italy/Makefile b/devel/pear-Date_Holidays_Italy/Makefile
index 0bb8ca5e276b..fbbbc123765d 100644
--- a/devel/pear-Date_Holidays_Italy/Makefile
+++ b/devel/pear-Date_Holidays_Italy/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Italy
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=		pear
 
diff --git a/devel/pear-Date_Holidays_Japan/Makefile b/devel/pear-Date_Holidays_Japan/Makefile
index 569f850b6b0a..dc7015280fb8 100644
--- a/devel/pear-Date_Holidays_Japan/Makefile
+++ b/devel/pear-Date_Holidays_Japan/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Japan
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Netherlands/Makefile b/devel/pear-Date_Holidays_Netherlands/Makefile
index 0305140b4628..a4677b270de5 100644
--- a/devel/pear-Date_Holidays_Netherlands/Makefile
+++ b/devel/pear-Date_Holidays_Netherlands/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the Netherlands
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS:=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Norway/Makefile b/devel/pear-Date_Holidays_Norway/Makefile
index 42c41403d98d..7daa4f6a7c49 100644
--- a/devel/pear-Date_Holidays_Norway/Makefile
+++ b/devel/pear-Date_Holidays_Norway/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Norway
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_PHPdotNet/Makefile b/devel/pear-Date_Holidays_PHPdotNet/Makefile
index 82e4091aeccb..77e7c086be3e 100644
--- a/devel/pear-Date_Holidays_PHPdotNet/Makefile
+++ b/devel/pear-Date_Holidays_PHPdotNet/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate birthdays of members of PHP.net
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Romania/Makefile b/devel/pear-Date_Holidays_Romania/Makefile
index d4d8c5bc3b48..fdb09d064fe3 100644
--- a/devel/pear-Date_Holidays_Romania/Makefile
+++ b/devel/pear-Date_Holidays_Romania/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Romania
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Slovenia/Makefile b/devel/pear-Date_Holidays_Slovenia/Makefile
index d72fbf82f6c1..9047fc4e7c3f 100644
--- a/devel/pear-Date_Holidays_Slovenia/Makefile
+++ b/devel/pear-Date_Holidays_Slovenia/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Slovenia
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Sweden/Makefile b/devel/pear-Date_Holidays_Sweden/Makefile
index f3d4240cae87..852eec590c38 100644
--- a/devel/pear-Date_Holidays_Sweden/Makefile
+++ b/devel/pear-Date_Holidays_Sweden/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Sweden
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_UNO/Makefile b/devel/pear-Date_Holidays_UNO/Makefile
index ba77fc626790..724497bb7ac1 100644
--- a/devel/pear-Date_Holidays_UNO/Makefile
+++ b/devel/pear-Date_Holidays_UNO/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the UNO
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_USA/Makefile b/devel/pear-Date_Holidays_USA/Makefile
index 139e5c5a253e..e6bbbf3f0d42 100644
--- a/devel/pear-Date_Holidays_USA/Makefile
+++ b/devel/pear-Date_Holidays_USA/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the USA
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-Date_Holidays_Ukraine/Makefile b/devel/pear-Date_Holidays_Ukraine/Makefile
index 4d0d3bd8b038..2374e709e862 100644
--- a/devel/pear-Date_Holidays_Ukraine/Makefile
+++ b/devel/pear-Date_Holidays_Ukraine/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the Ukraine
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 USES=	pear
 
diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index a19d083253b2..447d5a017038 100644
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@@ -13,6 +13,6 @@ PEAR_GRAPGHVIZ_DESC=	PEAR::GraphViz support
 
 USES=	pear
 
-PEAR_GRAPGHVIZ_RUN_DEPENDS=	${PEARDIR}/GraphViz.php:${PORTSDIR}/graphics/pear-Image_GraphViz
+PEAR_GRAPGHVIZ_RUN_DEPENDS=	${PEARDIR}/GraphViz.php:graphics/pear-Image_GraphViz
 
 .include <bsd.port.mk>
diff --git a/devel/pear-File_Iterator/Makefile b/devel/pear-File_Iterator/Makefile
index f919d759419a..b5ab7760e0be 100644
--- a/devel/pear-File_Iterator/Makefile
+++ b/devel/pear-File_Iterator/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PEAR FileIterator implementation
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile
index 7f8de5e80a3f..96ffd76c7cf3 100644
--- a/devel/pear-HTML_BBCodeParser/Makefile
+++ b/devel/pear-HTML_BBCodeParser/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Parser to replace UBB style tags with their HTML equivalents
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile
index 5c4b413caab1..5b78dbeaf577 100644
--- a/devel/pear-HTML_CSS/Makefile
+++ b/devel/pear-HTML_CSS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for generating CSS declarations
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile
index 5dcb53ae8c0c..216bc0bd7821 100644
--- a/devel/pear-HTML_Page2/Makefile
+++ b/devel/pear-HTML_Page2/Makefile
@@ -9,8 +9,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}beta
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR base class for XHTML page generation
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index 7026382f0d49..e534a490a19f 100644
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Provide methods for creating, validating, and processing HTML forms
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS:=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS:=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index 75c8a494da0f..3b51340b97c5 100644
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP5 rewrite of the HTML_QuickForm package
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
-RUN_DEPENDS=	${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2
+RUN_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile
index bbbbaeba1d9b..f088e5f991e6 100644
--- a/devel/pear-HTML_QuickForm_Controller/Makefile
+++ b/devel/pear-HTML_QuickForm_Controller/Makefile
@@ -10,8 +10,8 @@ COMMENT=	The add-on to HTML_QuickForm that allows building of multipage forms
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_Livesearch/Makefile b/devel/pear-HTML_QuickForm_Livesearch/Makefile
index 41db8e3651d4..06b99ef30e1d 100644
--- a/devel/pear-HTML_QuickForm_Livesearch/Makefile
+++ b/devel/pear-HTML_QuickForm_Livesearch/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Element for PEAR::HTML_QuickForm to enable a suggest search
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/AJAX.php:${PORTSDIR}/www/pear-HTML_AJAX
-RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/AJAX.php:${PORTSDIR}/www/pear-HTML_AJAX
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX
+RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
index 0a4bba96120b..de9531d6b048 100644
--- a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
+++ b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	chris@smartt.com
 COMMENT=	Implementation of Tableless Renderer for HTML_QuickForm
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
index a3da3f51f262..7126ddc8e21a 100644
--- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
@@ -9,8 +9,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}RC1
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Element for PEAR::HTML_QuickForm that defines dynamic filters
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index f6fce0efd976..94182fadedf3 100644
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	Element for PEAR::HTML_QuickForm that defines a 2 box multi-select
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
+		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile
index e95618273c3e..5d612613cffc 100644
--- a/devel/pear-HTML_Select/Makefile
+++ b/devel/pear-HTML_Select/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR::HTML_Select is a class for generating HTML form select elements
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 53c5bec16b48..f2975c7b37d1 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Some small PEAR classes to handle common <select> lists
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
-		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
-		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common	\
+		${PEARDIR}/I18N/Common.php:devel/pear-I18N
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common	\
+		${PEARDIR}/I18N/Common.php:devel/pear-I18N
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index a01592317678..ef31a0971546 100644
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Makes the design of HTML tables easy, flexible, reusable, and efficient
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
 
 USES=	pear
 
diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index 53aa717cd5d7..e8e81df2cb88 100644
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@@ -17,8 +17,8 @@ PEAR_TRANSLATION2_DESC=	PEAR::Translation2 support
 
 USES=	pear
 
-PEAR_HTML_JAVASCRIPT_RUN_DEPENDS=	${PEARDIR}/HTML/Javascript.php:${PORTSDIR}/devel/pear-HTML_Javascript
-PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
-PEAR_TRANSLATION2_RUN_DEPENDS=	${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
+PEAR_HTML_JAVASCRIPT_RUN_DEPENDS=	${PEARDIR}/HTML/Javascript.php:devel/pear-HTML_Javascript
+PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext
+PEAR_TRANSLATION2_RUN_DEPENDS=	${PEARDIR}/Translation2.php:sysutils/pear-Translation2
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Core/Makefile b/devel/pear-Horde_Core/Makefile
index 54d41d1b5d7a..4a3503c92a66 100644
--- a/devel/pear-Horde_Core/Makefile
+++ b/devel/pear-Horde_Core/Makefile
@@ -68,7 +68,7 @@ USE_HORDE_RUN=	Horde_Role \
 USE_HORDE_RUN+=	Horde_Routes
 
 KOLAB_USE=	HORDE_RUN=Horde_Kolab_Server,Horde_Kolab_Session,Horde_Kolab_Storage
-LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf
+LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:archivers/pecl-lzf
 SOCKETS_USE=	PHP=sockets
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Nls/Makefile b/devel/pear-Horde_Nls/Makefile
index c89f0364249f..ff9cd70357d1 100644
--- a/devel/pear-Horde_Nls/Makefile
+++ b/devel/pear-Horde_Nls/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	GEOIP
 GEOIP_DESC=	Depend on geoip PHP extension
 
 GEOIP_USE=	PHP=yes
-GEOIP_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip
+GEOIP_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:net/pecl-geoip
 
 .include <bsd.port.mk>
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index 601d20f3ea9d..ef0232dd6eee 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR internationalization package
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
 
 USES=	pear
 
diff --git a/devel/pear-Net_Gearman/Makefile b/devel/pear-Net_Gearman/Makefile
index 861333d5f04e..6e190a37c93f 100644
--- a/devel/pear-Net_Gearman/Makefile
+++ b/devel/pear-Net_Gearman/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Gearman client libraray for PHP
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear
 
 USE_PHP=	json mbstring sockets
 USES=		pear
diff --git a/devel/pear-PEAR_Info/Makefile b/devel/pear-PEAR_Info/Makefile
index dc76ccab0e33..7aa28067ed6c 100644
--- a/devel/pear-PEAR_Info/Makefile
+++ b/devel/pear-PEAR_Info/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Show Information about your PEAR install and its packages
 
-BUILD_DEPENDS=	${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
-RUN_DEPENDS=	${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
+BUILD_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
+RUN_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
 
 OPTIONS_DEFINE=	PEAR_PHPUNIT3
 OPTIONS_DEFAULT=	PEAR_PHPUNIT3
@@ -17,6 +17,6 @@ PEAR_PHPUNIT3_DESC=	PEAR::PHPUnit3 support
 
 USES=	pear
 
-PEAR_PHPUNIT3_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
+PEAR_PHPUNIT3_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:devel/pear-PHPUnit3
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index 96371f630891..71e78c04f43e 100644
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@@ -14,7 +14,7 @@ PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
 
 USES=	pear
 
-PEAR_PHP_COMPATINFO_RUN_DEPENDS=	${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInfo
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
+PEAR_PHP_COMPATINFO_RUN_DEPENDS=	${PEARDIR}/PHP/CompatInfo.php:devel/pear-PHP_CompatInfo
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager2/Makefile b/devel/pear-PEAR_PackageFileManager2/Makefile
index 55e33f712f79..1d55741dce63 100644
--- a/devel/pear-PEAR_PackageFileManager2/Makefile
+++ b/devel/pear-PEAR_PackageFileManager2/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PEAR class to maintain PEAR packages
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
-RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
+BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins
+RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins
 
 USES=	pear
 
diff --git a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
index 295d4cdc2464..783d05bd03bf 100644
--- a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
+++ b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	The plugins for PEAR_PackageFileManager
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index 9709c2043539..d244be1e8bec 100644
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@@ -15,20 +15,20 @@ COMMENT=	PEAR regression testing framework for unit tests
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		pear-PHP_CodeCoverage>=1.2.1:${PORTSDIR}/devel/pear-PHP_CodeCoverage \
-		pear-PHP_Timer>=1.0.2:${PORTSDIR}/devel/pear-PHP_Timer \
-		pear-PHPUnit_MockObject>=1.2.0:${PORTSDIR}/devel/pear-PHPUnit_MockObject \
-		pear-Symfony_Component_Yaml>=2.1.0:${PORTSDIR}/textproc/pear-Symfony_Component_Yaml \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		pear-PHP_CodeCoverage>=1.2.1:${PORTSDIR}/devel/pear-PHP_CodeCoverage \
-		pear-PHP_Timer>=1.0.2:${PORTSDIR}/devel/pear-PHP_Timer \
-		pear-PHPUnit_MockObject>=1.2.0:${PORTSDIR}/devel/pear-PHPUnit_MockObject \
-		pear-Symfony_Component_Yaml>=2.1.0:${PORTSDIR}/textproc/pear-Symfony_Component_Yaml \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-File_Iterator>=1.3.1:devel/pear-File_Iterator \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		pear-PHP_CodeCoverage>=1.2.1:devel/pear-PHP_CodeCoverage \
+		pear-PHP_Timer>=1.0.2:devel/pear-PHP_Timer \
+		pear-PHPUnit_MockObject>=1.2.0:devel/pear-PHPUnit_MockObject \
+		pear-Symfony_Component_Yaml>=2.1.0:textproc/pear-Symfony_Component_Yaml \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-File_Iterator>=1.3.1:devel/pear-File_Iterator \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		pear-PHP_CodeCoverage>=1.2.1:devel/pear-PHP_CodeCoverage \
+		pear-PHP_Timer>=1.0.2:devel/pear-PHP_Timer \
+		pear-PHPUnit_MockObject>=1.2.0:devel/pear-PHPUnit_MockObject \
+		pear-Symfony_Component_Yaml>=2.1.0:textproc/pear-Symfony_Component_Yaml \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 CONFLICTS=	pear-PHPUnit-[12]*
 
diff --git a/devel/pear-PHPUnit_MockObject/Makefile b/devel/pear-PHPUnit_MockObject/Makefile
index 8b167cd82749..2ba9627def3a 100644
--- a/devel/pear-PHPUnit_MockObject/Makefile
+++ b/devel/pear-PHPUnit_MockObject/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Mock Object library for PHPUnit
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/Text/Template.php:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/Text/Template.php:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile
index 2e5afdeba2c1..bf4774afac0d 100644
--- a/devel/pear-PHP_Beautifier/Makefile
+++ b/devel/pear-PHP_Beautifier/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
 
 USES=	pear
 USE_PHP=	tokenizer bz2
diff --git a/devel/pear-PHP_CodeBrowser/Makefile b/devel/pear-PHP_CodeBrowser/Makefile
index 5586f2fc1bfc..95cdae331441 100644
--- a/devel/pear-PHP_CodeBrowser/Makefile
+++ b/devel/pear-PHP_CodeBrowser/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Code browser that augments the code with information
 
-BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
-		pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Log>=1.2.1:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
-		pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-Log>=1.2.1:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.3:devel/pear-Console_CommandLine \
+		pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-Log>=1.2.1:sysutils/pear-Log
+RUN_DEPENDS=	pear-Console_CommandLine>=1.1.3:devel/pear-Console_CommandLine \
+		pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-Log>=1.2.1:sysutils/pear-Log
 
 USES=	pear
 USE_PHP=	dom
diff --git a/devel/pear-PHP_CodeCoverage/Makefile b/devel/pear-PHP_CodeCoverage/Makefile
index 4631d3ad8d0e..6a5f5258dcb6 100644
--- a/devel/pear-PHP_CodeCoverage/Makefile
+++ b/devel/pear-PHP_CodeCoverage/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Library that provides PHP code coverage information
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
-		pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
-		pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-PHP_TokenStream>=1.1.3:devel/pear-PHP_TokenStream \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-File_Iterator>=1.3.0:devel/pear-File_Iterator \
+		pear-PHP_TokenStream>=1.1.3:devel/pear-PHP_TokenStream \
+		pear-Text_Template>=1.1.1:textproc/pear-Text_Template \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
@@ -29,6 +29,6 @@ DOM_DESC=	Enable DOM support
 XDEBUG_DESC=	Enable Xdebug support
 
 DOM_USE=	PHP=dom
-XDEBUG_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:${PORTSDIR}/devel/php-xdebug
+XDEBUG_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:devel/php-xdebug
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index 1bcf223b199e..adea3ef6520a 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to find out the minimum version and extensions required
 
-RUN_DEPENDS=	${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table \
-		${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs \
-		${PEARDIR}/File/Find.php:${PORTSDIR}/sysutils/pear-File_Find \
-		${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
+RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table \
+		${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs \
+		${PEARDIR}/File/Find.php:sysutils/pear-File_Find \
+		${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
 
 PORTSCOUT=	skipv:1.9.0a1,1.9.0b1,1.9.0b2
 USE_PHP=	tokenizer
@@ -26,10 +26,10 @@ PEAR_PHPUNIT_DESC=	PEAR::PHPUnit support
 PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
 PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table
 
-PEAR_XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
-PEAR_VAR_DUMP_RUN_DEPENDS=	${PEARDIR}/Var/Dump.php:${PORTSDIR}/devel/pear-Var_Dump
-PEAR_PHPUNIT_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
-PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
+PEAR_XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier
+PEAR_VAR_DUMP_RUN_DEPENDS=	${PEARDIR}/Var/Dump.php:devel/pear-Var_Dump
+PEAR_PHPUNIT_RUN_DEPENDS=	${PEARDIR}/PHPUnit/Autoload.php:devel/pear-PHPUnit3
+PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PHP_Depend/Makefile b/devel/pear-PHP_Depend/Makefile
index b5a2409f2559..1a8a08239419 100644
--- a/devel/pear-PHP_Depend/Makefile
+++ b/devel/pear-PHP_Depend/Makefile
@@ -12,8 +12,8 @@ COMMENT=	PHP_Depend design quality metrics for PHP packages
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
 
 USES=	pear
 PEAR_CHANNEL=	pdepend
diff --git a/devel/pear-PHP_PMD/Makefile b/devel/pear-PHP_PMD/Makefile
index 96dcc867cdc0..9ecf5fb9e8db 100644
--- a/devel/pear-PHP_PMD/Makefile
+++ b/devel/pear-PHP_PMD/Makefile
@@ -12,8 +12,8 @@ COMMENT=	PHP Mess Detector
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
 
 USES=	pear
 PEAR_CHANNEL=	phpmd
diff --git a/devel/pear-PHP_Timer/Makefile b/devel/pear-PHP_Timer/Makefile
index c97af5a6047b..3f1ca3d0d3c1 100644
--- a/devel/pear-PHP_Timer/Makefile
+++ b/devel/pear-PHP_Timer/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Utility class for timing
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-PHP_TokenStream/Makefile b/devel/pear-PHP_TokenStream/Makefile
index 0ea0b7e17ef2..413a26978ccb 100644
--- a/devel/pear-PHP_TokenStream/Makefile
+++ b/devel/pear-PHP_TokenStream/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wrapper around PHP tokenizer extension
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-PHP_UML/Makefile b/devel/pear-PHP_UML/Makefile
index 3e16bfe4c656..e63ac38371a4 100644
--- a/devel/pear-PHP_UML/Makefile
+++ b/devel/pear-PHP_UML/Makefile
@@ -10,9 +10,9 @@ COMMENT=	PEAR Class to Create UML Representation of PHP Code
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
-		${PEARDIR}/Console/CommandLine.php:${PORTSDIR}/devel/pear-Console_CommandLine
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear \
+		${PEARDIR}/Console/CommandLine.php:devel/pear-Console_CommandLine
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
 
 USES=		pear
 USE_PHP=	spl xsl
diff --git a/devel/pear-PPW/Makefile b/devel/pear-PPW/Makefile
index 521b4eebc476..adba29b3ac1b 100644
--- a/devel/pear-PPW/Makefile
+++ b/devel/pear-PPW/Makefile
@@ -13,12 +13,12 @@ COMMENT=	PHP Project Wizard
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-Text_Template>=1.1.0:${PORTSDIR}/textproc/pear-Text_Template
-RUN_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-Text_Template>=1.1.0:${PORTSDIR}/textproc/pear-Text_Template
+BUILD_DEPENDS=	pear>=1.9.4:devel/pear \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-Text_Template>=1.1.0:textproc/pear-Text_Template
+RUN_DEPENDS=	pear>=1.9.4:devel/pear \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-Text_Template>=1.1.0:textproc/pear-Text_Template
 
 PEAR_CHANNEL=	phpunit
 USES=	pear
diff --git a/devel/pear-PhpDocumentor/Makefile b/devel/pear-PhpDocumentor/Makefile
index 2ebb41f324c1..1154634f520e 100644
--- a/devel/pear-PhpDocumentor/Makefile
+++ b/devel/pear-PhpDocumentor/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Provides automatic documenting of php-api from the source
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	pear-PHPDoc-[0-9]*
@@ -17,7 +17,7 @@ USES=	pear
 OPTIONS_DEFINE=	XML_BEAUTIFIER
 XML_BEAUTIFIER_DESC=	XML_Beautifier support
 
-XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
+XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier
 
 post-extract:
 .for dir in ${DUMMYDIRS}
diff --git a/devel/pear-Pirum/Makefile b/devel/pear-Pirum/Makefile
index c4c4b10c0453..f390676b0de0 100644
--- a/devel/pear-Pirum/Makefile
+++ b/devel/pear-Pirum/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple PEAR channel server manager
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
 
 PEAR_CHANNEL=	pirum
 USES=	pear
diff --git a/devel/pear-SebastianBergmann_FinderFacade/Makefile b/devel/pear-SebastianBergmann_FinderFacade/Makefile
index f7a4f7924fb0..c145f672d00a 100644
--- a/devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ b/devel/pear-SebastianBergmann_FinderFacade/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Convenience wrapper for Symfony's Finder component
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:devel/pear-TheSeer_fDOMDocument \
+		pear-Symfony_Component_Finder>=2.2.0:devel/pear-Symfony_Component_Finder \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-TheSeer_fDOMDocument>=1.3.1:devel/pear-TheSeer_fDOMDocument \
+		pear-Symfony_Component_Finder>=2.2.0:devel/pear-Symfony_Component_Finder \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 PEAR_CHANNEL=	phpunit
 USES=	pear
diff --git a/devel/pear-SebastianBergmann_Git/Makefile b/devel/pear-SebastianBergmann_Git/Makefile
index 0d0823e68a96..1873a65b01f7 100644
--- a/devel/pear-SebastianBergmann_Git/Makefile
+++ b/devel/pear-SebastianBergmann_Git/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple wrapper for Git
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear>=1.9.4:${PORTSDIR}/devel/pear \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear>=1.9.4:devel/pear \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear>=1.9.4:devel/pear \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USES=	pear
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-SebastianBergmann_PHPCPD/Makefile b/devel/pear-SebastianBergmann_PHPCPD/Makefile
index 658d213d76db..43f58bccada1 100644
--- a/devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ b/devel/pear-SebastianBergmann_PHPCPD/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Copy/Paste Detector (CPD) for PHP code
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
-		pear-PHP_Timer>=1.0.4:${PORTSDIR}/devel/pear-PHP_Timer \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
-		pear-PHP_Timer>=1.0.4:${PORTSDIR}/devel/pear-PHP_Timer \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-SebastianBergmann_FinderFacade>=1.0.4:devel/pear-SebastianBergmann_FinderFacade \
+		pear-PHP_Timer>=1.0.4:devel/pear-PHP_Timer \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-SebastianBergmann_FinderFacade>=1.0.4:devel/pear-SebastianBergmann_FinderFacade \
+		pear-PHP_Timer>=1.0.4:devel/pear-PHP_Timer \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 USE_PHP=	tokenizer
 PEAR_CHANNEL=	phpunit
diff --git a/devel/pear-SebastianBergmann_PHPLOC/Makefile b/devel/pear-SebastianBergmann_PHPLOC/Makefile
index fd6343b19316..647ef5381e1c 100644
--- a/devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ b/devel/pear-SebastianBergmann_PHPLOC/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Tool for quickly measuring the size of a PHP project
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-Symfony_Component_Console>=1.1.0:${PORTSDIR}/devel/pear-Symfony_Component_Console \
-		pear-SebastianBergmann_FinderFacade>=1.1.0:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
-		pear-SebastianBergmann_Git>=1.0.0:${PORTSDIR}/devel/pear-SebastianBergmann_Git \
-		pear-SebastianBergmann_Version>=1.0.0:${PORTSDIR}/devel/pear-SebastianBergmann_Version \
-		${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	pear-Symfony_Component_Console>=1.1.0:devel/pear-Symfony_Component_Console \
+		pear-SebastianBergmann_FinderFacade>=1.1.0:devel/pear-SebastianBergmann_FinderFacade \
+		pear-SebastianBergmann_Git>=1.0.0:devel/pear-SebastianBergmann_Git \
+		pear-SebastianBergmann_Version>=1.0.0:devel/pear-SebastianBergmann_Version \
+		${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PHP=	tokenizer
diff --git a/devel/pear-SebastianBergmann_Version/Makefile b/devel/pear-SebastianBergmann_Version/Makefile
index 8870944eca3b..f42992b53675 100644
--- a/devel/pear-SebastianBergmann_Version/Makefile
+++ b/devel/pear-SebastianBergmann_Version/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Managing the version number of Git-hosted PHP projects
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
 
 PEAR_CHANNEL=	phpunit
 USES=	pear
diff --git a/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile
index 66f6e18e47ef..48fd8069714c 100644
--- a/devel/pear-Structures_DataGrid/Makefile
+++ b/devel/pear-Structures_DataGrid/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Full-featured tabular structured data management package
 
-RUN_DEPENDS=	${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
+RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
index 12d4cf68da3b..f36c5c047350 100644
--- a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Console_Table Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/Console/Table.php:devel/pear-Console_Table
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
index faa89932d09e..6d2d497e8293 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	HTMLSortForm Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
index c2cf79dac752..191396b62546 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	HTML_Table Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table \
-		${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/Table.php:devel/pear-HTML_Table \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
 
 USES=	pear
 
diff --git a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
index b83ecb8dc103..b2cd5702bcc8 100644
--- a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	XUL Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=	pear
 
diff --git a/devel/pear-Symfony_Component_Console/Makefile b/devel/pear-Symfony_Component_Console/Makefile
index 61d9377d50a0..cbc6f0154543 100644
--- a/devel/pear-Symfony_Component_Console/Makefile
+++ b/devel/pear-Symfony_Component_Console/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Symfony2 Console Component
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
-RUN_DEPENDS+=	${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
+BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
+RUN_DEPENDS+=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
 
 USES=		pear
 PEAR_CHANNEL=	symfony2
diff --git a/devel/pear-Symfony_Component_Finder/Makefile b/devel/pear-Symfony_Component_Finder/Makefile
index aada7d1bd7e1..9831cdb59c64 100644
--- a/devel/pear-Symfony_Component_Finder/Makefile
+++ b/devel/pear-Symfony_Component_Finder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Symfony2 Finder Component
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:${PORTSDIR}/devel/pear-channel-symfony2
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
 
 USES=		pear
 PEAR_CHANNEL=	symfony2
diff --git a/devel/pear-TheSeer_DirectoryScanner/Makefile b/devel/pear-TheSeer_DirectoryScanner/Makefile
index 345408b610eb..c1634cece4fc 100644
--- a/devel/pear-TheSeer_DirectoryScanner/Makefile
+++ b/devel/pear-TheSeer_DirectoryScanner/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Recursive directory scanner and filter
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
 
 USE_PHP=	fileinfo
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-TheSeer_fDOMDocument/Makefile b/devel/pear-TheSeer_fDOMDocument/Makefile
index 37ae56d936ba..178ac8c50a99 100644
--- a/devel/pear-TheSeer_fDOMDocument/Makefile
+++ b/devel/pear-TheSeer_fDOMDocument/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extension to PHP's standard DOM
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
 
 USE_PHP=	dom xml
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-TheSeer_fXSL/Makefile b/devel/pear-TheSeer_fXSL/Makefile
index 3a7036e26f60..409f4a8551e2 100644
--- a/devel/pear-TheSeer_fXSL/Makefile
+++ b/devel/pear-TheSeer_fXSL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XSL wrapper / extension to the PHP 5.x XSLTProcessor
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
 
 USE_PHP=	dom xml xsl
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-TheSeer_phpDox/Makefile b/devel/pear-TheSeer_phpDox/Makefile
index 4d08cafbd58e..d1ae9337e42a 100644
--- a/devel/pear-TheSeer_phpDox/Makefile
+++ b/devel/pear-TheSeer_phpDox/Makefile
@@ -12,16 +12,16 @@ COMMENT=	PHP Documentation generation framework and tool
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
-		pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-TheSeer_fXSL>=1.0.4:${PORTSDIR}/devel/pear-TheSeer_fXSL \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-pdepend_staticReflection>=0.2.1:${PORTSDIR}/devel/pear-pdepend-staticReflection
-RUN_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
-		pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
-		pear-TheSeer_fXSL>=1.0.4:${PORTSDIR}/devel/pear-TheSeer_fXSL \
-		pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
-		pear-pdepend_staticReflection>=0.2.1:${PORTSDIR}/devel/pear-pdepend-staticReflection
+BUILD_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
+		pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
+		pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
+RUN_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
+		pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
+		pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
+		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
+		pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
 
 USE_PHP=	dom tokenizer xsl iconv
 PEAR_CHANNEL=	theseer
diff --git a/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile
index ac127c58589d..d8f7a197248c 100644
--- a/devel/pear-VFS/Makefile
+++ b/devel/pear-VFS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Virtual File System API
 
-BUILD_DEPENDS=	${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log
+RUN_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log
 
 USE_PHP=	gettext
 USES=	pear
diff --git a/devel/pear-Validate_Finance/Makefile b/devel/pear-Validate_Finance/Makefile
index a26be4ec3592..216e277f1cab 100644
--- a/devel/pear-Validate_Finance/Makefile
+++ b/devel/pear-Validate_Finance/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Finance Validation class
 
-BUILD_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
+BUILD_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
+RUN_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
 
 USES=	pear
 
diff --git a/devel/pear-Validate_US/Makefile b/devel/pear-Validate_US/Makefile
index e2e0b514be09..29ca6bad0325 100644
--- a/devel/pear-Validate_US/Makefile
+++ b/devel/pear-Validate_US/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR data validation class for US
 
-BUILD_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS=	pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
+BUILD_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
+RUN_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
 
 USES=	pear
 
diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile
index bc939becf23f..a01299983634 100644
--- a/devel/pear-Var_Dump/Makefile
+++ b/devel/pear-Var_Dump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Provides methods for dumping structured information about a variable
 
 LICENSE=	PHP30
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		pear shebangfix
 SHEBANG_FILES=	scripts/gen_php_doc.sh
diff --git a/devel/pear-VersionControl_SVN/Makefile b/devel/pear-VersionControl_SVN/Makefile
index 5653ef16f598..5b7fda88e348 100644
--- a/devel/pear-VersionControl_SVN/Makefile
+++ b/devel/pear-VersionControl_SVN/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Wrapper interface for the Subversion command-line client
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
+RUN_DEPENDS=	pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
 
 USE_PHP=	yes
 USES=	pear
diff --git a/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile
index 2176f1569c50..d38a32356ccf 100644
--- a/devel/pear-XML_NITF/Makefile
+++ b/devel/pear-XML_NITF/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR NITF XML parser
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=	pear
 
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index 26b0e11eb2ba..e64b9c5b2d1b 100644
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR RSS parser
 
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=	pear
 
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 8da7d367a7bd..5ea3ac3a2fbf 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Swiss-army knive for reading and writing XML files
 
-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/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile
index 58bde05417d0..9dfa9f98d2b8 100644
--- a/devel/pear-XML_Transformer/Makefile
+++ b/devel/pear-XML_Transformer/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR XML Transformations in PHP
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-RUN_DEPENDS:=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+RUN_DEPENDS:=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=	pear
 
diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index ad66fb3a897b..35095593b6c8 100644
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for representing XML data in a tree structure
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
 
 USES=	pear
 
diff --git a/devel/pear-ezc_Base/Makefile b/devel/pear-ezc_Base/Makefile
index a8cd5ffafa0c..f5662e0e9c19 100644
--- a/devel/pear-ezc_Base/Makefile
+++ b/devel/pear-ezc_Base/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Base package that all ezc components packages rely on
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
-RUN_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
+BUILD_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
+RUN_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
 
 PEAR_CHANNEL=	ezc
 USES=	pear
diff --git a/devel/pear-ezc_ConsoleTools/Makefile b/devel/pear-ezc_ConsoleTools/Makefile
index 06b27bd40a4a..e282d7a6a9e6 100644
--- a/devel/pear-ezc_ConsoleTools/Makefile
+++ b/devel/pear-ezc_ConsoleTools/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Set of classes to do different actions with the console
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
-		${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
-RUN_DEPENDS=	pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
-		${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
+BUILD_DEPENDS=	pear-ezc_Base>=1.8:devel/pear-ezc_Base \
+		${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
+RUN_DEPENDS=	pear-ezc_Base>=1.8:devel/pear-ezc_Base \
+		${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
 
 PEAR_CHANNEL=	ezc
 USES=	pear
diff --git a/devel/pear-htmlpurifier/Makefile b/devel/pear-htmlpurifier/Makefile
index 744d01d27a02..4315ee84167e 100644
--- a/devel/pear-htmlpurifier/Makefile
+++ b/devel/pear-htmlpurifier/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PHP HTML filter library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:${PORTSDIR}/devel/pear-channel-htmlpurifier
-RUN_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:${PORTSDIR}/devel/pear-channel-htmlpurifier
+BUILD_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier
+RUN_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier
 
 PEAR_CHANNEL=	htmlpurifier.org
 USES=	pear
diff --git a/devel/pear-pdepend-staticReflection/Makefile b/devel/pear-pdepend-staticReflection/Makefile
index 6046a6e2906f..ec27b697e0e0 100644
--- a/devel/pear-pdepend-staticReflection/Makefile
+++ b/devel/pear-pdepend-staticReflection/Makefile
@@ -12,8 +12,8 @@ COMMENT=	staticReflection package for PHP
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
 
 USE_PHP=	tokenizer
 PEAR_CHANNEL=	pdepend
diff --git a/devel/pear-phing/Makefile b/devel/pear-phing/Makefile
index 9481e456938f..deebcf7e9217 100644
--- a/devel/pear-phing/Makefile
+++ b/devel/pear-phing/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL3
 PEAR_CHANNEL=	phing
 USES=	pear
 
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:${PORTSDIR}/devel/pear-channel-phing
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:${PORTSDIR}/devel/pear-channel-phing
+BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
+RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
 
 .include <bsd.port.mk>
diff --git a/devel/pear/bsd.pear.channel.mk b/devel/pear/bsd.pear.channel.mk
index e56cb74df75b..1fa97ada6620 100644
--- a/devel/pear/bsd.pear.channel.mk
+++ b/devel/pear/bsd.pear.channel.mk
@@ -7,8 +7,8 @@ PKGNAMEPREFIX?=	pear-channel-
 MASTER_SITES?=	#no master sites
 DISTFILES?=	#no distfiles
 
-BUILD_DEPENDS?=	${LOCALBASE}/bin/pear:${PORTSDIR}/devel/pear
-RUN_DEPENDS?=	${LOCALBASE}/bin/pear:${PORTSDIR}/devel/pear
+BUILD_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear
+RUN_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear
 
 NO_BUILD?=	yes
 
diff --git a/devel/pecl-event/Makefile b/devel/pecl-event/Makefile
index d8f23b466f9b..1f0128df56ea 100644
--- a/devel/pecl-event/Makefile
+++ b/devel/pecl-event/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides interface to libevent library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		tar:tgz
 USE_OPENSSL=	yes
diff --git a/devel/pecl-expect/Makefile b/devel/pecl-expect/Makefile
index 5d2ca01f6c34..c6ac27f8e58c 100644
--- a/devel/pecl-expect/Makefile
+++ b/devel/pecl-expect/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for expect library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libexpect.so:${PORTSDIR}/lang/expect
+LIB_DEPENDS=	libexpect.so:lang/expect
 
 USES=		tar:tgz tcl:86
 USE_PHP=	yes
diff --git a/devel/pecl-gearman/Makefile b/devel/pecl-gearman/Makefile
index 5fe8c3f9130d..ec6d8993c002 100644
--- a/devel/pecl-gearman/Makefile
+++ b/devel/pecl-gearman/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Gearman API
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libgearman.so:${PORTSDIR}/devel/gearmand
+LIB_DEPENDS=	libgearman.so:devel/gearmand
 
 USES=		tar:tgz
 CONFIGURE_ARGS=	--with-gearman
diff --git a/devel/pecl-inotify/Makefile b/devel/pecl-inotify/Makefile
index af2cd45c6dd7..7d064348f2f3 100644
--- a/devel/pecl-inotify/Makefile
+++ b/devel/pecl-inotify/Makefile
@@ -15,7 +15,7 @@ COMMENT=	This extension allows to use inotify functions in a PHP scripts
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index 84ad163064be..c31809b2c00d 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to support Internationalization(ICU)
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/devel/pecl-jsonc/Makefile b/devel/pecl-jsonc/Makefile
index 46438cd151bc..5255ad312177 100644
--- a/devel/pecl-jsonc/Makefile
+++ b/devel/pecl-jsonc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PECL extension for JSON manipulation
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 USES=		pkgconfig tar:tgz
 CONFIGURE_ARGS=	--with-jsonc --with-libjson
diff --git a/devel/pecl-jsonnet/Makefile b/devel/pecl-jsonnet/Makefile
index ee5b7ab2744f..4a66cd30d8fe 100644
--- a/devel/pecl-jsonnet/Makefile
+++ b/devel/pecl-jsonnet/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Google JsonNet for PHP
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjsonnet.so:${PORTSDIR}/devel/jsonnet
+LIB_DEPENDS=	libjsonnet.so:devel/jsonnet
 
 USES=		tar:tgz
 USE_PHP=	json
diff --git a/devel/pecl-judy/Makefile b/devel/pecl-judy/Makefile
index 7fbae3da5218..055a55a29195 100644
--- a/devel/pecl-judy/Makefile
+++ b/devel/pecl-judy/Makefile
@@ -15,8 +15,8 @@ COMMENT=	PHP Judy implements sparse dynamic arrays
 
 LICENSE=	PHP301
 
-RUN_DEPENDS=	Judy>=0:${PORTSDIR}/devel/judy
-BUILD_DEPENDS=	Judy>=0:${PORTSDIR}/devel/judy
+RUN_DEPENDS=	Judy>=0:devel/judy
+BUILD_DEPENDS=	Judy>=0:devel/judy
 
 CONFIGURE_ARGS=	--with-judy=${LOCALBASE}
 USE_PHP=	yes
diff --git a/devel/pecl-libevent/Makefile b/devel/pecl-libevent/Makefile
index 705de0746900..aa6f989d75ae 100644
--- a/devel/pecl-libevent/Makefile
+++ b/devel/pecl-libevent/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Libevent extension for PHP
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=	tar:tgz
 
diff --git a/devel/pecl-mcve/Makefile b/devel/pecl-mcve/Makefile
index bb90d72f0293..4e2f472d7dde 100644
--- a/devel/pecl-mcve/Makefile
+++ b/devel/pecl-mcve/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL Extension for Interface the MCVE/Monetra API
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libmonetra.so:${PORTSDIR}/devel/libmonetra
+LIB_DEPENDS=	libmonetra.so:devel/libmonetra
 
 USES=		tar:tgz
 USE_OPENSSL=	yes
diff --git a/devel/pecl-memoize/Makefile b/devel/pecl-memoize/Makefile
index 57509100c04b..d8af275c5d81 100644
--- a/devel/pecl-memoize/Makefile
+++ b/devel/pecl-memoize/Makefile
@@ -29,8 +29,8 @@ MEMORY_DESC=	Enable the memoize memory storage module
 APC_CONFIGURE_ON=	--enable-memoize-apc
 APC_USE=		PHP=apc
 MEMCACHED_CONFIGURE_ON=	--with-memoize-memcached
-MEMCACHED_BUILD_DEPENDS=libmemcached>=0:${PORTSDIR}/databases/libmemcached
-MEMCACHED_RUN_DEPENDS=	libmemcached>=0:${PORTSDIR}/databases/libmemcached
+MEMCACHED_BUILD_DEPENDS=libmemcached>=0:databases/libmemcached
+MEMCACHED_RUN_DEPENDS=	libmemcached>=0:databases/libmemcached
 MEMORY_CONFIGURE_OFF=	--disable-memoize-memory
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-newt/Makefile b/devel/pecl-newt/Makefile
index 88dc4ce53f7c..8e597ec033f3 100644
--- a/devel/pecl-newt/Makefile
+++ b/devel/pecl-newt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PHP language extension for RedHat Newt library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+LIB_DEPENDS=	libnewt.so:devel/newt
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
diff --git a/devel/pecl-qb/Makefile b/devel/pecl-qb/Makefile
index 0b6761a2a304..a12032c53b8d 100644
--- a/devel/pecl-qb/Makefile
+++ b/devel/pecl-qb/Makefile
@@ -23,7 +23,7 @@ IGNORE_WITH_PHP=	70
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libmissing.so:${PORTSDIR}/math/libmissing
+LIB_DEPENDS+=	libmissing.so:math/libmissing
 CONFIGURE_ARGS=	--with-libmissing=${LOCALBASE}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libmissing
 .endif
diff --git a/devel/pecl-shape/Makefile b/devel/pecl-shape/Makefile
index ea87867b522f..56978e7251f1 100644
--- a/devel/pecl-shape/Makefile
+++ b/devel/pecl-shape/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension that wraps libshape
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+LIB_DEPENDS=	libshp.so:devel/shapelib
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-spl_types/Makefile b/devel/pecl-spl_types/Makefile
index b1e2afce6e37..00e414e3b3fc 100644
--- a/devel/pecl-spl_types/Makefile
+++ b/devel/pecl-spl_types/Makefile
@@ -16,7 +16,7 @@ LICENSE=	PHP301
 
 OPTIONS_DEFINE=	RE2C
 RE2C_DESC=	Compile regular expression 2 C
-RE2C_RUN_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
+RE2C_RUN_DEPENDS=	re2c:devel/re2c
 
 USE_PHP=	spl
 #USE_PHP_BUILD=	yes
diff --git a/devel/pecl-spread/Makefile b/devel/pecl-spread/Makefile
index 7293b6658e16..a087b3f48590 100644
--- a/devel/pecl-spread/Makefile
+++ b/devel/pecl-spread/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Php Interface to the Spread Toolkit API
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${LOCALBASE}/include/sp.h:${PORTSDIR}/net/spread4
-RUN_DEPENDS=	${LOCALBASE}/include/sp.h:${PORTSDIR}/net/spread4
+BUILD_DEPENDS=	${LOCALBASE}/include/sp.h:net/spread4
+RUN_DEPENDS=	${LOCALBASE}/include/sp.h:net/spread4
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-statgrab/Makefile b/devel/pecl-statgrab/Makefile
index 7561ee4e288d..7da435eb686a 100644
--- a/devel/pecl-statgrab/Makefile
+++ b/devel/pecl-statgrab/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	PECL extension to retrieve information from libstatgrab
 
-LIB_DEPENDS=	libstatgrab0.so:${PORTSDIR}/devel/libstatgrab0
+LIB_DEPENDS=	libstatgrab0.so:devel/libstatgrab0
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/devel/pecl-svn/Makefile b/devel/pecl-svn/Makefile
index fc6171ec9dc8..078228229837 100644
--- a/devel/pecl-svn/Makefile
+++ b/devel/pecl-svn/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to the libsvn library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion18
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion18
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-uuid/Makefile b/devel/pecl-uuid/Makefile
index 03657ef43611..803680e49608 100644
--- a/devel/pecl-uuid/Makefile
+++ b/devel/pecl-uuid/Makefile
@@ -13,7 +13,7 @@ COMMENT=	UUID extension in PHP
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/devel/pecl-yac/Makefile b/devel/pecl-yac/Makefile
index e7ec1b1af0fb..db0be3a330c3 100644
--- a/devel/pecl-yac/Makefile
+++ b/devel/pecl-yac/Makefile
@@ -21,7 +21,7 @@ IGNORE_WITH_PHP=	70
 
 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/devel/pecl-zookeeper/Makefile b/devel/pecl-zookeeper/Makefile
index ddc8d33cc5fa..c20d3deecc21 100644
--- a/devel/pecl-zookeeper/Makefile
+++ b/devel/pecl-zookeeper/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for interfacing with Apache ZooKeeper
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libzookeeper_mt.so:${PORTSDIR}/devel/libzookeeper
+LIB_DEPENDS=	libzookeeper_mt.so:devel/libzookeeper
 
 USE_PHP=	session
 USE_PHP_BUILD=	session
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index 6b66dc303022..c986f747fea3 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -11,10 +11,10 @@ MASTER_SITE_SUBDIR=	CPAN:SUKRIA
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Light program that lets you evaluate Perl code interactively
 
-RUN_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Module-Refresh>=0:${PORTSDIR}/devel/p5-Module-Refresh \
-		p5-Lexical-Persistence>=0:${PORTSDIR}/devel/p5-Lexical-Persistence \
-		p5-B-Keywords>=0:${PORTSDIR}/devel/p5-B-Keywords
+RUN_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Module-Refresh>=0:devel/p5-Module-Refresh \
+		p5-Lexical-Persistence>=0:devel/p5-Lexical-Persistence \
+		p5-B-Keywords>=0:devel/p5-B-Keywords
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 2f296ade1561..dd3f591a9cca 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Open source, software engineering platform
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	php5-libphutil>0:${PORTSDIR}/devel/libphutil \
-		php5-arcanist>0:${PORTSDIR}/devel/arcanist \
-		git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	php5-libphutil>0:devel/libphutil \
+		php5-arcanist>0:devel/arcanist \
+		git:devel/git
 
 OPTIONS_DEFINE=	GD OPCACHE
 OPTIONS_DEFAULT=OPCACHE
@@ -35,7 +35,7 @@ GD_USE=		PHP=gd
 .if ${PORT_OPTIONS:MOPCACHE}
 .	if ${PHP_EXT_DIR:C|[^0-9]||g}  >= 20121212
 USE_PHP+=	opcache
-RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:${PORTSDIR}/devel/pecl-APCu
+RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu
 .	else
 USE_PHP+=	apc
 .	endif
diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile
index 710f8d98b08e..69552a949f5b 100644
--- a/devel/php-composer/Makefile
+++ b/devel/php-composer/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Dependency Manager for PHP
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	ca_root_nss>0:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/devel/php-jq/Makefile b/devel/php-jq/Makefile
index 1b0f805480f3..f3085a92a42e 100644
--- a/devel/php-jq/Makefile
+++ b/devel/php-jq/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Jq shared extension for php
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libjq.so:${PORTSDIR}/textproc/jq
+LIB_DEPENDS=	libjq.so:textproc/jq
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kjdev
diff --git a/devel/php-maxminddb/Makefile b/devel/php-maxminddb/Makefile
index 319b2389d94f..057d7e55ee7c 100644
--- a/devel/php-maxminddb/Makefile
+++ b/devel/php-maxminddb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MaxMind DB Reader extension for PHP
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libmaxminddb.so:${PORTSDIR}/net/libmaxminddb
+LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile
index e39fbfaeb63e..469ca758ad17 100644
--- a/devel/php-memoize/Makefile
+++ b/devel/php-memoize/Makefile
@@ -31,13 +31,13 @@ MEMORY_DESC=	Enable the memoize memory storage module
 
 .if ${PORT_OPTIONS:MAPC}
 CONFIGURE_ARGS+=	--enable-memoize-apc
-BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC
 .endif
 
 .if ${PORT_OPTIONS:MMEMCACHED}
 CONFIGURE_ARGS+=	--with-memoize-memcached
-BUILD_DEPENDS+=		libmemcached>0:${PORTSDIR}/databases/libmemcached
-RUN_DEPENDS+=		libmemcached>0:${PORTSDIR}/databases/libmemcached
+BUILD_DEPENDS+=		libmemcached>0:databases/libmemcached
+RUN_DEPENDS+=		libmemcached>0:databases/libmemcached
 .endif
 
 .if empty(PORT_OPTIONS:MMEMORY)
diff --git a/devel/php5-dav/Makefile b/devel/php5-dav/Makefile
index 9be5785f35c4..2ab64055185b 100644
--- a/devel/php5-dav/Makefile
+++ b/devel/php5-dav/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The PHP WebDAV extension
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 USE_PHP=	yes
 USE_PHPIZE=	yes
diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index 3bf6ee73c0f5..89cc6d978135 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -9,9 +9,9 @@ COMMENT=	Ice (Internet Communications Engine) language mapping for PHP
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp \
-		slice2php:${PORTSDIR}/devel/ice
-LIB_DEPENDS=	libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
+BUILD_DEPENDS=	mcpp:devel/mcpp \
+		slice2php:devel/ice
+LIB_DEPENDS=	libIce.so.${LIB_VRS}:devel/ice
 
 OPTIONS_DEFINE=	DEBUG NAMESPACES
 OPTIONS_DEFAULT=
diff --git a/devel/php5-pinba/Makefile b/devel/php5-pinba/Makefile
index cca1b532446c..cb2fd56cc803 100644
--- a/devel/php5-pinba/Makefile
+++ b/devel/php5-pinba/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	php5-
 MAINTAINER=	komarov@valerka.net
 COMMENT=	PHP-extension part of statistics server for PHP
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tony2001
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index e41f9cfb826e..2bd82170ac44 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bug-tracking system developed in PHP
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	ctype pcre posix session tokenizer xml zlib
diff --git a/devel/pig/Makefile b/devel/pig/Makefile
index c32a4ef3318b..7f768880f217 100644
--- a/devel/pig/Makefile
+++ b/devel/pig/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Engine for executing data flows in parallel on Hadoop
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:devel/apache-ant
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 BROKEN=		tries to make outbound http connection during build phase breaking tinderbox.  Software itself does not have known issues, remove this BROKEN line and build your own package
 
diff --git a/devel/pinba_engine/Makefile b/devel/pinba_engine/Makefile
index 75ac67038633..7a6bf2cc8db1 100644
--- a/devel/pinba_engine/Makefile
+++ b/devel/pinba_engine/Makefile
@@ -9,14 +9,14 @@ CATEGORIES=	devel
 MAINTAINER=	raven428@gmail.com
 COMMENT=	Mysql-engine part of statistics server for PHP
 
-BUILD_DEPENDS=	${LOCALBASE}/include/google/protobuf/descriptor.h:${PORTSDIR}/devel/protobuf \
-		${LOCALBASE}/include/event.h:${PORTSDIR}/devel/libevent2 \
-		${LOCALBASE}/include/Judy.h:${PORTSDIR}/devel/judy \
-		${LOCALBASE}/lib/mysql/plugin:${PORTSDIR}/${_MYSQL_SERVER} \
-		${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:configure \
-		bison:${PORTSDIR}/devel/bison \
-		cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS=	${LOCALBASE}/include/google/protobuf/descriptor.h:devel/protobuf \
+		${LOCALBASE}/include/event.h:devel/libevent2 \
+		${LOCALBASE}/include/Judy.h:devel/judy \
+		${LOCALBASE}/lib/mysql/plugin:${_MYSQL_SERVER} \
+		${NONEXISTENT}:${_MYSQL_SERVER}:configure \
+		bison:devel/bison \
+		cmake:devel/cmake
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tony2001
diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index d93ab9a36620..83bd150d924c 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 BROKEN_ia64=	does not install: cleanname not found
 BROKEN_sparc64=	does not install: cleanname not found
 
-RUN_DEPENDS=	rc:${PORTSDIR}/shells/rc
+RUN_DEPENDS=	rc:shells/rc
 
 USES=		perl5 shebangfix tar:tgz
 SHEBANG_LANG=	rc
diff --git a/devel/poco-devel/Makefile b/devel/poco-devel/Makefile
index 6b6130b79f35..c33f20b04050 100644
--- a/devel/poco-devel/Makefile
+++ b/devel/poco-devel/Makefile
@@ -13,9 +13,9 @@ COMMENT=	C++ Portable Components library
 
 LICENSE=	BSL
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2
 
 CONFLICTS=	poco-ssl-[0-9]* poco-[0-9]*
 
@@ -49,11 +49,11 @@ CONFIGURE_ARGS+=	--omit=Data/ODBC
 .endif
 
 .if ${PORT_OPTIONS:MUODBC} && ! ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	libodbcinst.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbcinst.so:databases/unixODBC
 .endif
 
 .if ${PORT_OPTIONS:MIODBC} && ! ${PORT_OPTIONS:MUODBC}
-LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	libiodbc.so:databases/libiodbc
 CFLAGS+=	-I${LOCALBASE}/include/libiodbc
 LDFLAGS+=	-L${LOCALBASE}/lib/libiodbc
 .endif
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index bed93c5f7c46..95e9be47775d 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -31,7 +31,7 @@ SAMPLES_DESC=	Build sample programs
 TEST_CONFIGURE_OFF=	--no-tests
 SAMPLES_CONFIGURE_OFF=	--no-samples
 
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/libiodbc
+ODBC_LIB_DEPENDS=	libodbc.so:databases/libiodbc
 ODBC_CONFIGURE_OFF=	--omit=Data/ODBC
 
 MYSQL_USE=		MYSQL=yes
diff --git a/devel/poco/Makefile b/devel/poco/Makefile
index 82251d2cf7e3..eff36fd64035 100644
--- a/devel/poco/Makefile
+++ b/devel/poco/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C++ libraries with a network/internet focus
 
 LICENSE=	BSL
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2
 
 CONFLICTS=	poco-ssl-[0-9]*
 
@@ -32,7 +32,7 @@ OPTIONS_SUB=		yes
 
 MYSQL_USE=		mysql=yes
 MYSQL_CMAKE_OFF=	-DENABLE_DATA_MYSQL:BOOL=OFF
-IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CMAKE_ON=		-DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include/libiodbc \
 			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libiodbc.so
 SQLITE_USES=		sqlite
@@ -40,7 +40,7 @@ SQLITE_CMAKE_OFF=	-DENABLE_DATA_SQLITE:BOOL=OFF
 SSL_USE=		openssl=yes
 SSL_CMAKE_OFF=		-DENABLE_CRYPTO:BOOL=OFF \
 			-DENABLE_NETSSL:BOOL=OFF
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CMAKE_ON=	-DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include \
 			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so
 TEST_CMAKE_ON=		-DENABLE_TESTS:BOOL=ON
diff --git a/devel/powerpc64-gcc/Makefile b/devel/powerpc64-gcc/Makefile
index 5d2e651fd80b..cd8578866182 100644
--- a/devel/powerpc64-gcc/Makefile
+++ b/devel/powerpc64-gcc/Makefile
@@ -18,11 +18,11 @@ PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-RUN_DEPENDS=	${BU_PREFIX}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
+RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WRKSRC=	${WRKDIR}/build-gcc
diff --git a/devel/powerpc64-xtoolchain-gcc/Makefile b/devel/powerpc64-xtoolchain-gcc/Makefile
index 4f7febca3c1e..c9b6db4eb221 100644
--- a/devel/powerpc64-xtoolchain-gcc/Makefile
+++ b/devel/powerpc64-xtoolchain-gcc/Makefile
@@ -23,7 +23,7 @@ XCXX?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-g++
 XCPP?=		${TOOLCHAIN_PREFIX}portbld-${OPSYS:tl}${OSREL}-cpp
 X_COMPILER_TYPE?=	${PKGNAMESUFFIX:C/-//g}
 
-RUN_DEPENDS?=	${XCC}:${PORTSDIR}/devel/${PKGNAMEPREFIX}${X_COMPILER_TYPE}
+RUN_DEPENDS?=	${XCC}:devel/${PKGNAMEPREFIX}${X_COMPILER_TYPE}
 
 SUB_FILES=	xtoolchain.mk
 SUB_LIST=	TARGETARCH=${TOOLCHAIN_PREFIX:C/-//g} \
diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile
index 2046486087b6..8697e9af8a2c 100644
--- a/devel/poxml/Makefile
+++ b/devel/poxml/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tools to translate Docbook XML using gettext
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:${PORTSDIR}/devel/antlr
+BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:devel/antlr
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource gettext-tools:build,run tar:xz
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index 327140a41e3b..23d924a4ed29 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -13,9 +13,9 @@ COMMENT=	C++ library for the manipulation of convex polyhedra
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libglpk.so:${PORTSDIR}/math/glpk \
-		libgmp.so:${PORTSDIR}/math/gmp
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libglpk.so:math/glpk \
+		libgmp.so:math/gmp
 
 USES=		gmake perl5 tar:xz libtool
 USE_PERL5=	build
diff --git a/devel/protobuf-c/Makefile b/devel/protobuf-c/Makefile
index 471667addcc5..920057a5a321 100644
--- a/devel/protobuf-c/Makefile
+++ b/devel/protobuf-c/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Code generator and libraries to use Protocol Buffers from pure C
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		autoreconf gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
@@ -29,7 +29,7 @@ PORTDOCS=	*
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install-strip
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	html-local
 
 post-install-DOXYGEN-on:
diff --git a/devel/pructl/Makefile b/devel/pructl/Makefile
index 3a5760e5658e..ee4f577022d0 100644
--- a/devel/pructl/Makefile
+++ b/devel/pructl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utilities to interface with PRUs
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libpru.so:${PORTSDIR}/devel/libpru
+LIB_DEPENDS=	libpru.so:devel/libpru
 
 USES=		cmake libedit
 
diff --git a/devel/psptoolchain-gcc-stage1/Makefile b/devel/psptoolchain-gcc-stage1/Makefile
index 430ce8f16a66..2ce26920fedb 100644
--- a/devel/psptoolchain-gcc-stage1/Makefile
+++ b/devel/psptoolchain-gcc-stage1/Makefile
@@ -16,23 +16,23 @@ ONLY_FOR_ARCHS=		amd64 i386
 
 PSP_GCC_STAGE_PREFIX=	psp/stage1
 
-LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp \
-			libmpfr.so:${PORTSDIR}/math/mpfr \
-			libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=		libgmp.so:math/gmp \
+			libmpfr.so:math/mpfr \
+			libmpc.so:math/mpc
 
-BUILD_DEPENDS+=		psp-addr2line:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-c++filt:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-nm:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objcopy:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objdump:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ranlib:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-readelf:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-size:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strings:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strip:${PORTSDIR}/devel/psptoolchain-binutils
+BUILD_DEPENDS+=		psp-addr2line:devel/psptoolchain-binutils \
+			psp-ar:devel/psptoolchain-binutils \
+			psp-as:devel/psptoolchain-binutils \
+			psp-c++filt:devel/psptoolchain-binutils \
+			psp-ld:devel/psptoolchain-binutils \
+			psp-nm:devel/psptoolchain-binutils \
+			psp-objcopy:devel/psptoolchain-binutils \
+			psp-objdump:devel/psptoolchain-binutils \
+			psp-ranlib:devel/psptoolchain-binutils \
+			psp-readelf:devel/psptoolchain-binutils \
+			psp-size:devel/psptoolchain-binutils \
+			psp-strings:devel/psptoolchain-binutils \
+			psp-strip:devel/psptoolchain-binutils
 
 USES=			gmake libtool tar:bzip2
 PATCH_WRKSRC=		${SRCDIR}
diff --git a/devel/psptoolchain-gcc-stage2/Makefile b/devel/psptoolchain-gcc-stage2/Makefile
index 4a5a3eb4661b..ca879ab71f79 100644
--- a/devel/psptoolchain-gcc-stage2/Makefile
+++ b/devel/psptoolchain-gcc-stage2/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX=		-stage2
 
 MAINTAINER=		tphilipp@potion-studios.com
 
-BUILD_DEPENDS=		${LOCALBASE}/psp/lib/libc.a:${PORTSDIR}/devel/psptoolchain-newlib
+BUILD_DEPENDS=		${LOCALBASE}/psp/lib/libc.a:devel/psptoolchain-newlib
 
 MAKE_ENV=		CFLAGS_FOR_TARGET="-G0" PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ARGS=		--prefix=${PREFIX} \
diff --git a/devel/psptoolchain-gdb/Makefile b/devel/psptoolchain-gdb/Makefile
index 8f05a304b79e..1731e0eb16bf 100644
--- a/devel/psptoolchain-gdb/Makefile
+++ b/devel/psptoolchain-gdb/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=		psptoolchain-
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 
-BUILD_DEPENDS=		${LOCALBASE}/psp/sdk/lib/libpspsdk.a:${PORTSDIR}/devel/psptoolchain-pspsdk-stage2
+BUILD_DEPENDS=		${LOCALBASE}/psp/sdk/lib/libpspsdk.a:devel/psptoolchain-pspsdk-stage2
 
 USES=			gmake tar:bzip2
 USE_CSTD=		gnu89
diff --git a/devel/psptoolchain-newlib/Makefile b/devel/psptoolchain-newlib/Makefile
index 98da54f20958..2ea97a5da2b1 100644
--- a/devel/psptoolchain-newlib/Makefile
+++ b/devel/psptoolchain-newlib/Makefile
@@ -15,11 +15,11 @@ COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 PSP_GCC_STAGE_PREFIX=	psp/stage1
 PSP_SDK_STAGE_PREFIX=	psp/stage1
 
-BUILD_DEPENDS+=		${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}/sdk/include/pspsdk.h:${PORTSDIR}/devel/psptoolchain-pspsdk-stage1 \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
-			${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin/psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage1
+BUILD_DEPENDS+=		${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}/sdk/include/pspsdk.h:devel/psptoolchain-pspsdk-stage1 \
+			psp-ar:devel/psptoolchain-binutils \
+			psp-as:devel/psptoolchain-binutils \
+			psp-ld:devel/psptoolchain-binutils \
+			${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin/psp-gcc:devel/psptoolchain-gcc-stage1
 
 USES=			gmake makeinfo
 HAS_CONFIGURE=		yes
diff --git a/devel/psptoolchain-pspsdk-stage2/Makefile b/devel/psptoolchain-pspsdk-stage2/Makefile
index 26657a7d4d2f..492b8d8d4219 100644
--- a/devel/psptoolchain-pspsdk-stage2/Makefile
+++ b/devel/psptoolchain-pspsdk-stage2/Makefile
@@ -8,12 +8,12 @@ PKGNAMESUFFIX=		-stage2
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 
-BUILD_DEPENDS=		psp-cpp:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-gcov:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-g++:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			${LOCALBASE}/psp/lib/libc.a:${PORTSDIR}/devel/psptoolchain-newlib
+BUILD_DEPENDS=		psp-cpp:devel/psptoolchain-gcc-stage2 \
+			psp-gcc:devel/psptoolchain-gcc-stage2 \
+			psp-gcov:devel/psptoolchain-gcc-stage2 \
+			psp-g++:devel/psptoolchain-gcc-stage2 \
+			psp-ar:devel/psptoolchain-binutils \
+			${LOCALBASE}/psp/lib/libc.a:devel/psptoolchain-newlib
 
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-pspdev="${LOCALBASE}"
 
diff --git a/devel/psptoolchain/Makefile b/devel/psptoolchain/Makefile
index 9ebed4d1f54a..18ee429f2128 100644
--- a/devel/psptoolchain/Makefile
+++ b/devel/psptoolchain/Makefile
@@ -9,21 +9,21 @@ CATEGORIES=		devel
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain meta port
 
-RUN_DEPENDS=		psp-gdb:${PORTSDIR}/devel/psptoolchain-gdb \
-			psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-g++:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
-			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-c++filt:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-nm:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objcopy:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-objdump:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-ranlib:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-readelf:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-size:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strings:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-strip:${PORTSDIR}/devel/psptoolchain-binutils
+RUN_DEPENDS=		psp-gdb:devel/psptoolchain-gdb \
+			psp-gcc:devel/psptoolchain-gcc-stage2 \
+			psp-g++:devel/psptoolchain-gcc-stage2 \
+			psp-ar:devel/psptoolchain-binutils \
+			psp-as:devel/psptoolchain-binutils \
+			psp-c++filt:devel/psptoolchain-binutils \
+			psp-ld:devel/psptoolchain-binutils \
+			psp-nm:devel/psptoolchain-binutils \
+			psp-objcopy:devel/psptoolchain-binutils \
+			psp-objdump:devel/psptoolchain-binutils \
+			psp-ranlib:devel/psptoolchain-binutils \
+			psp-readelf:devel/psptoolchain-binutils \
+			psp-size:devel/psptoolchain-binutils \
+			psp-strings:devel/psptoolchain-binutils \
+			psp-strip:devel/psptoolchain-binutils
 
 USES=			metaport
 
diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile
index a25aa668d810..60b60a93572c 100644
--- a/devel/psvn/Makefile
+++ b/devel/psvn/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Subversion interface for Emacs
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	svn:devel/subversion
 
 USE_EMACS=	yes
 
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index b55e0cbf88a9..6ee0b08fc0f2 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross platform C++ library, used by OPAL
 
 LICENSE=	MPL
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 CONFLICTS=	pwlib-1.*
 
@@ -59,7 +59,7 @@ PLIST_SUB+=	DEBUG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 CONFIGURE_ARGS+=--enable-pulse
 .else
 CONFIGURE_ARGS+=--disable-pulse
@@ -71,14 +71,14 @@ PLLIB_VIDEO=1
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=--enable-odbc
 .else
 CONFIGURE_ARGS+=--disable-odbc
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 CONFIGURE_ARGS+=--enable-alsa
 PLIST_SUB+=	ALSA=""
 .else
@@ -96,8 +96,8 @@ PLIST_SUB+=	BSDVIDEO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS+=	v4l_compat>=0:multimedia/v4l_compat
+LIB_DEPENDS+=	libv4l2.so:multimedia/libv4l
 CONFIGURE_ARGS+=--enable-v4l --enable-v4l2
 PLIST_SUB+=	V4L=""
 PTLIB_VIDEO=1
@@ -137,8 +137,8 @@ CONFIGURE_ARGS+=--disable-openldap
 #
 ##enable libavc1394
 #.if defined(WITH_AVC1394)
-#LIB_DEPENDS+=	avc1394.2:${PORTSDIR}/devel/libavc1394 \
-#		dv.4:${PORTSDIR}/multimedia/libdv
+#LIB_DEPENDS+=	avc1394.2:devel/libavc1394 \
+#		dv.4:multimedia/libdv
 #CONFIGURE_ARGS+=	--enable-avc
 #PLIST_SUB+=	AVC1394=""
 #.else
@@ -148,7 +148,7 @@ PLIST_SUB+=	AVC1394="@comment "
 #
 ##enable libdc1394
 #.if defined(WITH_DC1394)
-#LIB_DEPENDS+=	dc1394.2[0-9]:${PORTSDIR}/multimedia/libdc1394
+#LIB_DEPENDS+=	dc1394.2[0-9]:multimedia/libdc1394
 #CONFIGURE_ARGS+=	--enable-dc
 #PLIST_SUB+=	DC1394=""
 #.else
diff --git a/devel/pure-ffi/Makefile b/devel/pure-ffi/Makefile
index 7fa8b20f6055..c3a35fab2722 100644
--- a/devel/pure-ffi/Makefile
+++ b/devel/pure-ffi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pure language interface to libffi
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libffi.so:devel/libffi
 
 USES=		pkgconfig pure
 
diff --git a/devel/pushmi/Makefile b/devel/pushmi/Makefile
index 5fd85692f5b0..6eed3e2d0d60 100644
--- a/devel/pushmi/Makefile
+++ b/devel/pushmi/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Subversion repository replication tool
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-App-CLI>=0.06:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Cache-Memcached>=0:${PORTSDIR}/databases/p5-Cache-Memcached \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		svk>=2.0.0:${PORTSDIR}/devel/svk
+RUN_DEPENDS=	p5-subversion>=0:devel/p5-subversion \
+		p5-App-CLI>=0.06:devel/p5-App-CLI \
+		p5-Cache-Memcached>=0:databases/p5-Cache-Memcached \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		svk>=2.0.0:devel/svk
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-RunApp>=0.13:${PORTSDIR}/devel/p5-RunApp \
-		p5-Test-Output>=0:${PORTSDIR}/devel/p5-Test-Output \
-		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
+		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
+		p5-RunApp>=0.13:devel/p5-RunApp \
+		p5-Test-Output>=0:devel/p5-Test-Output \
+		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:www/mod_perl2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index fccfbe1e4720..2badab907b14 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	openh323
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross platform C++ library, used by OpenH323
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 CONFLICTS=	ptlib-2.*
 
@@ -55,7 +55,7 @@ ESOUND_USE=	GNOME=esound
 ESOUND_CONFIGURE_ENABLE=	esd
 
 V4L_CONFIGURE_ENABLE=	v4l
-V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
 
 #explicity build OSS
 CONFIGURE_ARGS+=	--enable-oss
@@ -73,8 +73,8 @@ CONFIGURE_ARGS+=	--disable-odbc
 #
 ##enable libavc1394
 #.if defined(WITH_AVC1394)
-#LIB_DEPENDS+=	avc1394.2:${PORTSDIR}/devel/libavc1394 \
-#		dv.4:${PORTSDIR}/multimedia/libdv
+#LIB_DEPENDS+=	avc1394.2:devel/libavc1394 \
+#		dv.4:multimedia/libdv
 #CONFIGURE_ARGS+=	--enable-avc
 #PLIST_SUB+=	AVC1394=""
 #.else
@@ -84,7 +84,7 @@ PLIST_SUB+=	AVC1394="@comment "
 #
 ##enable libdc1394
 #.if defined(WITH_DC1394)
-#LIB_DEPENDS+=	dc1394_control.13:${PORTSDIR}/devel/libdc1394
+#LIB_DEPENDS+=	dc1394_control.13:devel/libdc1394
 #CONFIGURE_ARGS+=	--enable-dc
 #PLIST_SUB+=	DC1394=""
 #.else
diff --git a/devel/py-Acquisition/Makefile b/devel/py-Acquisition/Makefile
index e4df09901ba4..17856e17f9f1 100644
--- a/devel/py-Acquisition/Makefile
+++ b/devel/py-Acquisition/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Allows to obtain attributes from the containment hierarchy
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-AddOns/Makefile b/devel/py-AddOns/Makefile
index 337a9d71004d..a569fe9908dd 100644
--- a/devel/py-AddOns/Makefile
+++ b/devel/py-AddOns/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Dynamically extend other objects with AddOns
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/devel/py-BytecodeAssembler/Makefile b/devel/py-BytecodeAssembler/Makefile
index e0e30207ec9a..fd0e01a8d967 100644
--- a/devel/py-BytecodeAssembler/Makefile
+++ b/devel/py-BytecodeAssembler/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate Python code objects by "assembling" bytecode
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools \
-		${PYTHON_PKGNAMEPREFIX}SymbolType>0:${PORTSDIR}/devel/py-SymbolType
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools \
+		${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/devel/py-DateTime/Makefile b/devel/py-DateTime/Makefile
index d91a42dfec44..9baac1697c9a 100644
--- a/devel/py-DateTime/Makefile
+++ b/devel/py-DateTime/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Zope 2 DateTime data type
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-DocumentTemplate/Makefile b/devel/py-DocumentTemplate/Makefile
index f2079b1ba6d2..bffa0c037783 100644
--- a/devel/py-DocumentTemplate/Makefile
+++ b/devel/py-DocumentTemplate/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Document Templating Markup Language (DTML)
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:${PORTSDIR}/devel/py-zope.sequencesort \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Jinja2/Makefile b/devel/py-Jinja2/Makefile
index 28f3fb312fb2..26247bb7306b 100644
--- a/devel/py-Jinja2/Makefile
+++ b/devel/py-Jinja2/Makefile
@@ -14,8 +14,8 @@ COMMENT?=	Fast and easy to use stand-alone template engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py-MarkupSafe
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py-MarkupSafe
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py-MarkupSafe
 
 NO_ARCH=	yes
 USES=		python
@@ -29,7 +29,7 @@ OPTIONS_DEFINE?=	BABEL EXAMPLES
 OPTIONS_DEFAULT?=	BABEL
 BABEL_DESC=		Enable Babel extension
 
-BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel
+BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
@@ -39,7 +39,7 @@ PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
 .include <bsd.port.pre.mk>
 
 .if ${PKGNAMESUFFIX} == "-doc"
-BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	*
 PORT_OPTIONS:=	${PORT_OPTIONS:NEXAMPLES}
diff --git a/devel/py-Missing/Makefile b/devel/py-Missing/Makefile
index afbc1f5f51c9..9d51acf777e0 100644
--- a/devel/py-Missing/Makefile
+++ b/devel/py-Missing/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Special Missing objects used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-MultiMapping/Makefile b/devel/py-MultiMapping/Makefile
index 18918de373fa..82aaf4b9f0b9 100644
--- a/devel/py-MultiMapping/Makefile
+++ b/devel/py-MultiMapping/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Special MultiMapping objects used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-PEAK-Rules/Makefile b/devel/py-PEAK-Rules/Makefile
index f1af7eeee2d9..d42bf85399fd 100644
--- a/devel/py-PEAK-Rules/Makefile
+++ b/devel/py-PEAK-Rules/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.dev-r2686
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Generic functions and business rules support systems
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:${PORTSDIR}/devel/py-extremes \
-		${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:${PORTSDIR}/devel/py-AddOns \
-		${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:${PORTSDIR}/devel/py-BytecodeAssembler
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes \
+		${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns \
+		${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-Persistence/Makefile b/devel/py-Persistence/Makefile
index edfe4ddc0c0a..f2fd275177dc 100644
--- a/devel/py-Persistence/Makefile
+++ b/devel/py-Persistence/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Persistent ExtensionClass
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile
index 4aea1e4918d7..95902377dde2 100644
--- a/devel/py-Products.ATContentTypes/Makefile
+++ b/devel/py-Products.ATContentTypes/Makefile
@@ -12,31 +12,31 @@ COMMENT=	Default Content Types for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:${PORTSDIR}/www/py-plone.app.folder \
-		${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.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:${PORTSDIR}/devel/py-Products.Archetypes \
-		${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:${PORTSDIR}/devel/py-Products.ATReferenceBrowserWidget \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:${PORTSDIR}/devel/py-Products.CMFDynamicViewFTI \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${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 \
-		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:${PORTSDIR}/devel/py-Products.validation \
-		${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}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
+		${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.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \
+		${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \
+		${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 \
+		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.ATReferenceBrowserWidget/Makefile b/devel/py-Products.ATReferenceBrowserWidget/Makefile
index f55caf4f631d..8947e40862f5 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/Makefile
+++ b/devel/py-Products.ATReferenceBrowserWidget/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Reference widget for Archetypes
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:${PORTSDIR}/devel/py-archetypes.referencebrowserwidget \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile
index 84b9060b71c5..b9b0b1e3660a 100644
--- a/devel/py-Products.Archetypes/Makefile
+++ b/devel/py-Products.Archetypes/Makefile
@@ -12,42 +12,42 @@ COMMENT=	Developers framework for rapidly implementing content types
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${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.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.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${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.CMFFormController>=0:${PORTSDIR}/devel/py-Products.CMFFormController \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:${PORTSDIR}/devel/py-Products.CMFQuickInstallerTool \
-		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:${PORTSDIR}/devel/py-Products.DCWorkflow \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:${PORTSDIR}/devel/py-Products.Marshall \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:${PORTSDIR}/devel/py-Products.PlacelessTranslationService \
-		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:${PORTSDIR}/devel/py-Products.PortalTransforms \
-		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:${PORTSDIR}/devel/py-Products.statusmessages \
-		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:${PORTSDIR}/devel/py-Products.validation \
-		${PYTHON_PKGNAMEPREFIX}plone.folder>=0:${PORTSDIR}/www/py-plone.folder \
-		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid \
-		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:${PORTSDIR}/www/py-plone.app.folder \
-		${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}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${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.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.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${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.CMFFormController>=0:devel/py-Products.CMFFormController \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \
+		${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \
+		${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \
+		${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \
+		${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \
+		${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder \
+		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \
+		${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.BTreeFolder2/Makefile b/devel/py-Products.BTreeFolder2/Makefile
index 6851765f562c..e4f445b29516 100644
--- a/devel/py-Products.BTreeFolder2/Makefile
+++ b/devel/py-Products.BTreeFolder2/Makefile
@@ -13,14 +13,14 @@ COMMENT=	BTree based implementation for Zope 2's OFS
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${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
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-Products.CMFActionIcons/Makefile b/devel/py-Products.CMFActionIcons/Makefile
index d76142ad2131..47ca85a6679e 100644
--- a/devel/py-Products.CMFActionIcons/Makefile
+++ b/devel/py-Products.CMFActionIcons/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Action icons product for the Zope CMF
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.CMFCalendar/Makefile b/devel/py-Products.CMFCalendar/Makefile
index 4b5b3d677907..a9f32672da7c 100644
--- a/devel/py-Products.CMFCalendar/Makefile
+++ b/devel/py-Products.CMFCalendar/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Calendar product for the Zope Content Management Framework
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${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}zope.app.form>0:${PORTSDIR}/devel/py-zope.app.form
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${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}zope.app.form>0:devel/py-zope.app.form
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile
index a2b7fec80d64..06debb96ab5d 100644
--- a/devel/py-Products.CMFCore/Makefile
+++ b/devel/py-Products.CMFCore/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope Content Management Framework core components
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:${PORTSDIR}/devel/py-Products.ZSQLMethods \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:${PORTSDIR}/devel/py-zope.app.publication
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication
 
 NO_ARCH=	yes
 #USES=		zope # cyclic dependency
diff --git a/devel/py-Products.CMFDefault/Makefile b/devel/py-Products.CMFDefault/Makefile
index 5823afd732ec..56ac8aee440a 100644
--- a/devel/py-Products.CMFDefault/Makefile
+++ b/devel/py-Products.CMFDefault/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Default product for the Zope Content Management Framework
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:${PORTSDIR}/devel/py-five.formlib \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib \
+		${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/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile
index 37a70089a535..65552d5b9420 100644
--- a/devel/py-Products.CMFDiffTool/Makefile
+++ b/devel/py-Products.CMFDiffTool/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Diff tool for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile
index 194a0a7ed48e..339e30db0b2d 100644
--- a/devel/py-Products.CMFDynamicViewFTI/Makefile
+++ b/devel/py-Products.CMFDynamicViewFTI/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Product for dynamic views in CMF
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile
index 95f55afca1af..fc2f7784071d 100644
--- a/devel/py-Products.CMFEditions/Makefile
+++ b/devel/py-Products.CMFEditions/Makefile
@@ -12,19 +12,19 @@ COMMENT=	Versioning for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.copy>0:${PORTSDIR}/devel/py-zope.copy \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:${PORTSDIR}/devel/py-Products.CMFDiffTool \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:${PORTSDIR}/devel/py-Products.CMFUid \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:${PORTSDIR}/devel/py-Products.ZopeVersionControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zope
diff --git a/devel/py-Products.CMFFormController/Makefile b/devel/py-Products.CMFFormController/Makefile
index 8fc7cdf702f3..99615a120f1d 100644
--- a/devel/py-Products.CMFFormController/Makefile
+++ b/devel/py-Products.CMFFormController/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Form validation mechanism for Zope CMF
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.CMFPlacefulWorkflow/Makefile b/devel/py-Products.CMFPlacefulWorkflow/Makefile
index 835aafbe96d9..02c3289b0e61 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/Makefile
+++ b/devel/py-Products.CMFPlacefulWorkflow/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Workflow policies for CMF and Plone
 
 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.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${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}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${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/devel/py-Products.CMFQuickInstallerTool/Makefile b/devel/py-Products.CMFQuickInstallerTool/Makefile
index 78a749f9dbe3..9cae1b28d4b8 100644
--- a/devel/py-Products.CMFQuickInstallerTool/Makefile
+++ b/devel/py-Products.CMFQuickInstallerTool/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Facility for activation/deactivation of Zope CMF products
 
 LICENSE=	ZPL21
 
-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}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.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+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}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python zope
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.CMFTestCase/Makefile b/devel/py-Products.CMFTestCase/Makefile
index 7426a1346992..f981cdfb7136 100644
--- a/devel/py-Products.CMFTestCase/Makefile
+++ b/devel/py-Products.CMFTestCase/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Integration testing framework for CMF
 
 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.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.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.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${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.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.GenericSetup>=0:devel/py-Products.GenericSetup \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.CMFUid/Makefile b/devel/py-Products.CMFUid/Makefile
index a914d2dcef5e..c5e8b106832a 100644
--- a/devel/py-Products.CMFUid/Makefile
+++ b/devel/py-Products.CMFUid/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Uid product for the Zope CMF
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.DCWorkflow/Makefile b/devel/py-Products.DCWorkflow/Makefile
index 79c15b7d7386..c7d3259c7ad7 100644
--- a/devel/py-Products.DCWorkflow/Makefile
+++ b/devel/py-Products.DCWorkflow/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DCWorkflow product for the Zope Content Management Framework
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile
index da82c5f71007..58c2c385cd84 100644
--- a/devel/py-Products.ExtendedPathIndex/Makefile
+++ b/devel/py-Products.ExtendedPathIndex/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope catalog index for paths
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}transaction>0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3
 
 USES=		python zope zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ExternalMethod/Makefile b/devel/py-Products.ExternalMethod/Makefile
index 84a0419b3364..fb573831a274 100644
--- a/devel/py-Products.ExternalMethod/Makefile
+++ b/devel/py-Products.ExternalMethod/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Support for external Python methods within a Zope 2 environment
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile
index 238bccfd786c..4ef467fb3d9e 100644
--- a/devel/py-Products.GenericSetup/Makefile
+++ b/devel/py-Products.GenericSetup/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Read Zope configuration state from profile dirs / tarballs
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestinfo
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/py-five.localsitemanager \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index da8b6095713d..0a5433101240 100644
--- a/devel/py-Products.LDAPMultiPlugins/Makefile
+++ b/devel/py-Products.LDAPMultiPlugins/Makefile
@@ -14,9 +14,9 @@ COMMENT=	LDAP-backed plugins for the Zope2 PluggableAuthService
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:${PORTSDIR}/net/py-ldap \
-		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:${PORTSDIR}/devel/py-Products.LDAPUserFolder \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap \
+		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile
index abbb0bed73d2..c0df817dad61 100644
--- a/devel/py-Products.LDAPUserFolder/Makefile
+++ b/devel/py-Products.LDAPUserFolder/Makefile
@@ -13,8 +13,8 @@ COMMENT=	LDAP-enabled Zope 2 user folder
 
 LICENSE=	ZPL21
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:${PORTSDIR}/devel/py-setuptools-git
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:${PORTSDIR}/net/py-ldap
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap
 
 OPTIONS_DEFINE=		POSIXGROUP_PATCH
 POSIXGROUP_PATCH_DESC=	Use posixGroup for group membership
diff --git a/devel/py-Products.MIMETools/Makefile b/devel/py-Products.MIMETools/Makefile
index d928dbbde578..59247a34460e 100644
--- a/devel/py-Products.MIMETools/Makefile
+++ b/devel/py-Products.MIMETools/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Provides the <!--#mime--> tag for DocumentTemplate
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index 06ce4a89f3c2..8d2a9c3ad756 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Configurable Marshallers for Archetypes
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:${PORTSDIR}/www/py-plone.uuid \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.MimetypesRegistry/Makefile b/devel/py-Products.MimetypesRegistry/Makefile
index b5954007ae5a..1221e59f6f18 100644
--- a/devel/py-Products.MimetypesRegistry/Makefile
+++ b/devel/py-Products.MimetypesRegistry/Makefile
@@ -12,11 +12,11 @@ COMMENT=	MIME type handling for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.OFSP/Makefile b/devel/py-Products.OFSP/Makefile
index d576659ede54..bc2b3acd3a35 100644
--- a/devel/py-Products.OFSP/Makefile
+++ b/devel/py-Products.OFSP/Makefile
@@ -13,8 +13,8 @@ COMMENT=	General Zope 2 help screens
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile
index 67b19cbd3355..a863b7e9bf02 100644
--- a/devel/py-Products.PasswordResetTool/Makefile
+++ b/devel/py-Products.PasswordResetTool/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Password reset tool for Plone
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime
 
 NO_ARCH=	yes
 USES=		python zip zope
diff --git a/devel/py-Products.PlacelessTranslationService/Makefile b/devel/py-Products.PlacelessTranslationService/Makefile
index e4412173ec0f..cac8992b5712 100644
--- a/devel/py-Products.PlacelessTranslationService/Makefile
+++ b/devel/py-Products.PlacelessTranslationService/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Internationalizing and localizing software for Zope 2
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gettext>0:${PORTSDIR}/textproc/py-python-gettext \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation \
-		${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}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
+		${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}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile
index f3ffc01b59d9..8ea1f63b4845 100644
--- a/devel/py-Products.PloneTestCase/Makefile
+++ b/devel/py-Products.PloneTestCase/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Integration testing framework for Plone
 
 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.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.ATContentTypes>=0:${PORTSDIR}/devel/py-Products.ATContentTypes \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${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.ATContentTypes>=0:devel/py-Products.ATContentTypes \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USE_PYTHON=	autoplist distutils
 USES=		python:2 zope zip
diff --git a/devel/py-Products.PluginRegistry/Makefile b/devel/py-Products.PluginRegistry/Makefile
index c0f7dd1d1258..b93f3a01200d 100644
--- a/devel/py-Products.PluginRegistry/Makefile
+++ b/devel/py-Products.PluginRegistry/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Configure application plugins based on interfaces
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.PortalTransforms/Makefile b/devel/py-Products.PortalTransforms/Makefile
index e7af2ca8428f..f268b9f189c0 100644
--- a/devel/py-Products.PortalTransforms/Makefile
+++ b/devel/py-Products.PortalTransforms/Makefile
@@ -12,14 +12,14 @@ COMMENT=	MIME based content transformations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:${PORTSDIR}/www/py-plone.intelligenttext \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:${PORTSDIR}/devel/py-Products.MimetypesRegistry \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}markdown>=1.7:${PORTSDIR}/textproc/py-markdown
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.PythonScripts/Makefile b/devel/py-Products.PythonScripts/Makefile
index 87b291037bb8..d5e2bcb2beb4 100644
--- a/devel/py-Products.PythonScripts/Makefile
+++ b/devel/py-Products.PythonScripts/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Support for restricted execution of Python scripts in Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile
index 35c8998d1e25..acd7df838617 100644
--- a/devel/py-Products.ResourceRegistries/Makefile
+++ b/devel/py-Products.ResourceRegistries/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Registry for managing CSS and JS
 
 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.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:${PORTSDIR}/www/py-plone.app.registry
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry
 
 USES=		python:2.7 zip zope
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-Products.StandardCacheManagers/Makefile b/devel/py-Products.StandardCacheManagers/Makefile
index e51b299ed3d9..a7274859a593 100644
--- a/devel/py-Products.StandardCacheManagers/Makefile
+++ b/devel/py-Products.StandardCacheManagers/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cache managers for Zope 2
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-Products.ZCTextIndex/Makefile b/devel/py-Products.ZCTextIndex/Makefile
index 2efc8e6bec7c..61ea803e2573 100644
--- a/devel/py-Products.ZCTextIndex/Makefile
+++ b/devel/py-Products.ZCTextIndex/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Full text indexing for ZCatalog/Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ZCatalog/Makefile b/devel/py-Products.ZCatalog/Makefile
index 655b83b32559..7d455d7585a4 100644
--- a/devel/py-Products.ZCatalog/Makefile
+++ b/devel/py-Products.ZCatalog/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Zope2's indexing and search solution
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:${PORTSDIR}/security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:${PORTSDIR}/devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Missing>=0:${PORTSDIR}/devel/py-Missing \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${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}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${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}zExceptions>=0:devel/py-zExceptions \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ZSQLMethods/Makefile b/devel/py-Products.ZSQLMethods/Makefile
index 0ac487e766a1..e2768bb0ebe6 100644
--- a/devel/py-Products.ZSQLMethods/Makefile
+++ b/devel/py-Products.ZSQLMethods/Makefile
@@ -13,15 +13,15 @@ COMMENT=	SQL method support for Zope 2
 
 LICENSE=	ZPL21
 
-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}Missing>=0:${PORTSDIR}/devel/py-Missing \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+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}Missing>=0:devel/py-Missing \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile
index 155375651230..20caa22fc14b 100644
--- a/devel/py-Products.ZopeVersionControl/Makefile
+++ b/devel/py-Products.ZopeVersionControl/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope Version Control
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.statusmessages/Makefile b/devel/py-Products.statusmessages/Makefile
index 6cad3478a443..41f804640857 100644
--- a/devel/py-Products.statusmessages/Makefile
+++ b/devel/py-Products.statusmessages/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Handling of internationalized status messages for Zope
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-Products.validation/Makefile b/devel/py-Products.validation/Makefile
index f3b5499fa78c..c2e5eb9db1c6 100644
--- a/devel/py-Products.validation/Makefile
+++ b/devel/py-Products.validation/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Data validation package for Archetypes
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${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}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime
+RUN_DEPENDS=	${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}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/devel/py-RPyC/Makefile b/devel/py-RPyC/Makefile
index b0fa0751a1fc..055fa8bfcec8 100644
--- a/devel/py-RPyC/Makefile
+++ b/devel/py-RPyC/Makefile
@@ -16,7 +16,7 @@ LICENSE=	MIT
 OPTIONS_DEFINE=	PLUMBUM
 OPTIONS_DEFAULT=PLUMBUM
 
-PLUMBUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plumbum>0:${PORTSDIR}/sysutils/py-plumbum
+PLUMBUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum
 PLUMBUM_DESC=	 Required for features like rpyc_classic.py and zero deploy
 
 USES=		python:-3.3
diff --git a/devel/py-Record/Makefile b/devel/py-Record/Makefile
index 58f45f5f3cb2..1030b50a52ce 100644
--- a/devel/py-Record/Makefile
+++ b/devel/py-Record/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Special Record objects used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-TGScheduler/Makefile b/devel/py-TGScheduler/Makefile
index 03840cf05f00..96015931893d 100644
--- a/devel/py-TGScheduler/Makefile
+++ b/devel/py-TGScheduler/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Turbogears Scheduler
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-ToscaWidgets/Makefile b/devel/py-ToscaWidgets/Makefile
index 37f2f9ad312c..927cd3992a74 100644
--- a/devel/py-ToscaWidgets/Makefile
+++ b/devel/py-ToscaWidgets/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python framework for building reusable web components
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-TurboJinja/Makefile b/devel/py-TurboJinja/Makefile
index 96376aabe999..ea1f768a9f39 100644
--- a/devel/py-TurboJinja/Makefile
+++ b/devel/py-TurboJinja/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Jinja (Django & Smarty-like) template for TurboGears
 
 LICENSE=	MIT
 
-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}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja>=0.9:${PORTSDIR}/devel/py-Jinja
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja>=0.9:devel/py-Jinja
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-aniso8601/Makefile b/devel/py-aniso8601/Makefile
index dd1afd9d53c6..1db4c53a18d1 100644
--- a/devel/py-aniso8601/Makefile
+++ b/devel/py-aniso8601/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for parsing ISO 8601 strings
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-apscheduler/Makefile b/devel/py-apscheduler/Makefile
index aeb231cb61ab..3450497b8ced 100644
--- a/devel/py-apscheduler/Makefile
+++ b/devel/py-apscheduler/Makefile
@@ -12,9 +12,9 @@ COMMENT=	In-process task scheduler with Cron-like capabilities
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>0:${PORTSDIR}/devel/py-tzlocal
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal
 
 NO_ARCH=	yes
 USES=		python
@@ -22,18 +22,18 @@ USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	TEST
 
-TEST_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:${PORTSDIR}/devel/py-pytest
+TEST_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest
 TEST_MAKE_ENV=	TZ=UTC
 PYDISTUTILS_TEST_TARGET?=	test
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTEST} && ${PYTHON_REL} < 3300
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 .if ${PYTHON_REL} < 3200
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
 .endif
 
 pre-install-TEST-on:
diff --git a/devel/py-archetypes.querywidget/Makefile b/devel/py-archetypes.querywidget/Makefile
index 8e02fd79e0cd..bf5d4406c545 100644
--- a/devel/py-archetypes.querywidget/Makefile
+++ b/devel/py-archetypes.querywidget/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Widget for creating catalog queries
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:${PORTSDIR}/www/py-plone.app.querystring \
-		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:${PORTSDIR}/www/py-plone.app.jquerytools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring \
+		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-archetypes.referencebrowserwidget/Makefile b/devel/py-archetypes.referencebrowserwidget/Makefile
index a28118fbc8e3..23af89757ce6 100644
--- a/devel/py-archetypes.referencebrowserwidget/Makefile
+++ b/devel/py-archetypes.referencebrowserwidget/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Implementation of referencebrowser widget for Archetypes
 
 LICENSE=	ZPL21
 
-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.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:${PORTSDIR}/www/py-plone.app.form \
-		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:${PORTSDIR}/www/py-plone.app.jquerytools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \
+		${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-archetypes.schemaextender/Makefile b/devel/py-archetypes.schemaextender/Makefile
index f8f717a0ae33..e73987f1de30 100644
--- a/devel/py-archetypes.schemaextender/Makefile
+++ b/devel/py-archetypes.schemaextender/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Dynamically extend Archetypes schemas with named adapters
 
 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
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile
index 522a5e1df53f..6ab1d836c97d 100644
--- a/devel/py-arrow/Makefile
+++ b/devel/py-arrow/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Better dates and times for Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-astroid/Makefile b/devel/py-astroid/Makefile
index 1cbb5de3b391..429be7c8da13 100644
--- a/devel/py-astroid/Makefile
+++ b/devel/py-astroid/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Extension for Python compiler.ast module
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wrapt>0:${PORTSDIR}/devel/py-wrapt \
-		${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>0:${PORTSDIR}/devel/py-lazy-object-proxy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
+		${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>0:devel/py-lazy-object-proxy
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile
index 9224293fd218..23ff7675111f 100644
--- a/devel/py-babel/Makefile
+++ b/devel/py-babel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of tools for internationalizing Python applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-bandit/Makefile b/devel/py-bandit/Makefile
index 6375b895474f..13dcb2df77a9 100644
--- a/devel/py-bandit/Makefile
+++ b/devel/py-bandit/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Tool for finding common security issues in Python code
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:${PORTSDIR}/devel/py-stevedore
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore
 
 MAKE_ENV+=	PBR_VERSION=${PORTVERSION}
 
diff --git a/devel/py-bcdoc/Makefile b/devel/py-bcdoc/Makefile
index c28013c4c3cc..654dfcbd34ff 100644
--- a/devel/py-bcdoc/Makefile
+++ b/devel/py-bcdoc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tools to help document botocore-based projects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-binplist/Makefile b/devel/py-binplist/Makefile
index dee490b6cce3..018d8873f9ac 100644
--- a/devel/py-binplist/Makefile
+++ b/devel/py-binplist/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Binary plist parser
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-biplist/Makefile b/devel/py-biplist/Makefile
index 299e98fbd4cf..97f1571e3605 100644
--- a/devel/py-biplist/Makefile
+++ b/devel/py-biplist/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library for reading/writing binary plists
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 TEST_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/devel/py-bison/Makefile b/devel/py-bison/Makefile
index a3ca4b5bfea4..c4194d0a84a3 100644
--- a/devel/py-bison/Makefile
+++ b/devel/py-bison/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python-based parsing at the speed of C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
+BUILD_DEPENDS=	pyrex>=0.9.6.2:devel/pyrex
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/py-blinker/Makefile b/devel/py-blinker/Makefile
index ed291bf883fc..06018cef5784 100644
--- a/devel/py-blinker/Makefile
+++ b/devel/py-blinker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fast, simple object-to-object and broadcast signaling
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile
index 7719fb1d9d85..db97ac0a54ba 100644
--- a/devel/py-botocore/Makefile
+++ b/devel/py-botocore/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Low-level, core functionality of boto 3
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}jmespath>=0.9.0:${PORTSDIR}/devel/py-jmespath \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}jmespath>=0.9.0:devel/py-jmespath \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-canonicaljson/Makefile b/devel/py-canonicaljson/Makefile
index d1039b918e95..fc6905072eca 100644
--- a/devel/py-canonicaljson/Makefile
+++ b/devel/py-canonicaljson/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Canonical JSON
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-capstone/Makefile b/devel/py-capstone/Makefile
index da214d71b171..496f7a1bf4c7 100644
--- a/devel/py-capstone/Makefile
+++ b/devel/py-capstone/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for the Capstone Disassembly Engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-LIB_DEPENDS=	libcapstone.so:${PORTSDIR}/devel/capstone
+LIB_DEPENDS=	libcapstone.so:devel/capstone
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-celery/Makefile b/devel/py-celery/Makefile
index 66985a50eec7..82c50e1e2478 100644
--- a/devel/py-celery/Makefile
+++ b/devel/py-celery/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Asynchronous task queue/job queue
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:${PORTSDIR}/devel/py-billiard \
-		${PYTHON_PKGNAMEPREFIX}pytz>=1.5:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}kombu>=3.0.29:${PORTSDIR}/net/py-kombu \
-		${PYTHON_PKGNAMEPREFIX}python-memcached>=0:${PORTSDIR}/databases/py-python-memcached
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard \
+		${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}kombu>=3.0.29:net/py-kombu \
+		${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-cffi/Makefile b/devel/py-cffi/Makefile
index ee33a241f29b..33556444b714 100644
--- a/devel/py-cffi/Makefile
+++ b/devel/py-cffi/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Foreign Function Interface for Python calling C code
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:${PORTSDIR}/devel/py-pycparser
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+LIB_DEPENDS=	libffi.so:devel/libffi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 CFLAGS+=	-I${LOCALBASE}/include -Wl,-rpath,${LOCALBASE}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/py-check-manifest/Makefile b/devel/py-check-manifest/Makefile
index 85e3aa4abfe8..c7989447473e 100644
--- a/devel/py-check-manifest/Makefile
+++ b/devel/py-check-manifest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Check MANIFEST.in in a Python source package for completeness
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.rst
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index fa83dcd308e1..440a757ff682 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	Cheetah-${DISTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	HTML template engine for Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:${PORTSDIR}/textproc/py-markdown
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile
index 0d7d80bd065b..def3502f72aa 100644
--- a/devel/py-circuits/Makefile
+++ b/devel/py-circuits/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Asynchronous Component-based Event Application Framework
 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
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-cld/Makefile b/devel/py-cld/Makefile
index 93ccd6ce05fd..f97493b4394e 100644
--- a/devel/py-cld/Makefile
+++ b/devel/py-cld/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for compact language detector library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcld2.so:${PORTSDIR}/devel/cld2
+LIB_DEPENDS=	libcld2.so:devel/cld2
 
 USES=		python
 
diff --git a/devel/py-clint/Makefile b/devel/py-clint/Makefile
index 6e12f7550440..8aafa0742301 100644
--- a/devel/py-clint/Makefile
+++ b/devel/py-clint/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python command-line application tools
 
 LICENSE=	ISCL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:${PORTSDIR}/devel/py-args
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-collective.z3cform.datetimewidget/Makefile b/devel/py-collective.z3cform.datetimewidget/Makefile
index 18d693c3f370..fbb078e4f0ac 100644
--- a/devel/py-collective.z3cform.datetimewidget/Makefile
+++ b/devel/py-collective.z3cform.datetimewidget/Makefile
@@ -12,9 +12,9 @@ COMMENT=	z3c.form date and datetime widgets
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation
 
 NO_ARCH=	yes
 USES=		python:2.7 zip
diff --git a/devel/py-columnize/Makefile b/devel/py-columnize/Makefile
index 5bac0c7fec44..e7d6265475bc 100644
--- a/devel/py-columnize/Makefile
+++ b/devel/py-columnize/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Format a simple (i.e. not nested) list into aligned columns
 
 LICENSE=	MIT
 
-MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:${PORTSDIR}/devel/py-nose
+MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose
 
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
@@ -24,7 +24,7 @@ USE_PYTHON=	autoplist distutils
 .if ${PYTHON_MAJOR_VER} == "3"
 EXTRA_PATCHES=      ${FILESDIR}/extra-patch-____pkginfo____.py
 .else
-MY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:${PORTSDIR}/devel/py-backports.shutil_get_terminal_size
+MY_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:devel/py-backports.shutil_get_terminal_size
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile
index 6db9954d57bb..5ed31477ef9c 100644
--- a/devel/py-configobj/Makefile
+++ b/devel/py-configobj/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple but powerful config file reader and writer
 
 LICENSE=	BSD3CLAUSE
 
-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/devel/py-construct/Makefile b/devel/py-construct/Makefile
index 371943fa1784..5323249b1002 100644
--- a/devel/py-construct/Makefile
+++ b/devel/py-construct/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python module for parsing and building of data structures
 LICENSE=	MIT
 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=	distutils autoplist
diff --git a/devel/py-cov-core/Makefile b/devel/py-cov-core/Makefile
index 119a82e02e67..15b078a44ccc 100644
--- a/devel/py-cov-core/Makefile
+++ b/devel/py-cov-core/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Plugin core for use by pytest-cov, nose-cov and nose2-cov
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=3.6:${PORTSDIR}/devel/py-coverage
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-curtsies/Makefile b/devel/py-curtsies/Makefile
index 89dc1cd230a8..0cd95ead6425 100644
--- a/devel/py-curtsies/Makefile
+++ b/devel/py-curtsies/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Curses-like terminal wrapper, with colored strings
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blessings>=1.5:${PORTSDIR}/devel/py-blessings \
-		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:${PORTSDIR}/devel/py-wcwidth
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-cycler/Makefile b/devel/py-cycler/Makefile
index d49f8871e2a1..2280bda415de 100644
--- a/devel/py-cycler/Makefile
+++ b/devel/py-cycler/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Composable style cycles
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-d2to1/Makefile b/devel/py-d2to1/Makefile
index 53a1b2ffa1b4..febf1aaeed20 100644
--- a/devel/py-d2to1/Makefile
+++ b/devel/py-d2to1/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Distutils2-like setup.cfg files with setuptools setup.py
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-daemon/Makefile b/devel/py-daemon/Makefile
index 71938c506084..b4c6b5b702b5 100644
--- a/devel/py-daemon/Makefile
+++ b/devel/py-daemon/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Well-behaved daemon framework for Python
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:${PORTSDIR}/devel/py-lockfile
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile
index 804ddbc49e76..002feb651599 100644
--- a/devel/py-dateutil/Makefile
+++ b/devel/py-dateutil/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extensions to the standard Python datetime module
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
 
 USES=		python dos2unix
 USE_GITHUB=	yes
diff --git a/devel/py-debtcollector/Makefile b/devel/py-debtcollector/Makefile
index e8d327d14b48..63403596fd5c 100644
--- a/devel/py-debtcollector/Makefile
+++ b/devel/py-debtcollector/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Collection of Python deprecation patterns and strategies
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}wrapt>0:${PORTSDIR}/devel/py-wrapt
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt
 
 NO_ARCH=	yes
 
diff --git a/devel/py-delfick_error/Makefile b/devel/py-delfick_error/Makefile
index 3b8e05aeb489..1d87a0bdeab3 100644
--- a/devel/py-delfick_error/Makefile
+++ b/devel/py-delfick_error/Makefile
@@ -10,16 +10,16 @@ COMMENT=	Customized exception class
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}total-ordering>0:${PORTSDIR}/devel/py-total-ordering
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:${PORTSDIR}/devel/py-noseofyeti	\
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti	\
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	\
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:${PORTSDIR}/textproc/py-cloud_sptheme
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-deliciousapi/Makefile b/devel/py-deliciousapi/Makefile
index 165a27e2fbb8..55030cb35bbc 100644
--- a/devel/py-deliciousapi/Makefile
+++ b/devel/py-deliciousapi/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	DeliciousAPI-${PORTVERSION}
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Unofficial Python API for retrieving data from Delicious.com
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:${PORTSDIR}/devel/py-simplejson
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/devel/py-dialog/Makefile b/devel/py-dialog/Makefile
index eeabbfd0ad47..dc4cbc4d6f66 100644
--- a/devel/py-dialog/Makefile
+++ b/devel/py-dialog/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python interface to dialog(3)
 
 LICENSE=	LGPL20
 
-RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
+RUN_DEPENDS=	cdialog:devel/cdialog
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils
diff --git a/devel/py-diazo/Makefile b/devel/py-diazo/Makefile
index bba7c8554df9..e8e19a255f5a 100644
--- a/devel/py-diazo/Makefile
+++ b/devel/py-diazo/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Deliverance like language using a pure XSLT engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssselect>0:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}future>0:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:${PORTSDIR}/devel/py-repoze.xmliter \
-		${PYTHON_PKGNAMEPREFIX}webob>=0:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \
+		${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile
index 79ae995b840c..8317087d9062 100644
--- a/devel/py-django-rq/Makefile
+++ b/devel/py-django-rq/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Provides Django integration for RQ (Redis Queue)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:${PORTSDIR}/devel/py-rq
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ui
diff --git a/devel/py-django-tastypie-mongoengine/Makefile b/devel/py-django-tastypie-mongoengine/Makefile
index 86434419ebd9..c45afca2825e 100644
--- a/devel/py-django-tastypie-mongoengine/Makefile
+++ b/devel/py-django-tastypie-mongoengine/Makefile
@@ -14,9 +14,9 @@ COMMENT=		MongoEngine support for django-tastypie
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:${PORTSDIR}/www/py-django-tastypie \
-		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		wlanslovenija
diff --git a/devel/py-django16-tastypie-mongoengine/Makefile b/devel/py-django16-tastypie-mongoengine/Makefile
index 00b8786a1031..f1c43eba3334 100644
--- a/devel/py-django16-tastypie-mongoengine/Makefile
+++ b/devel/py-django16-tastypie-mongoengine/Makefile
@@ -10,9 +10,9 @@ COMMENT=		MongoEngine support for django-tastypie using Django 1.6
 LICENSE=		AGPLv3
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-tastypie16>=0.9.12:${PORTSDIR}/www/py-django16-tastypie \
-		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}django16>0:${PORTSDIR}/www/py-django16
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django-tastypie16>=0.9.12:www/py-django16-tastypie \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}django16>0:www/py-django16
 
 MASTERDIR=		${.CURDIR}/../py-django-tastypie-mongoengine
 
diff --git a/devel/py-dogpile.cache/Makefile b/devel/py-dogpile.cache/Makefile
index 95d4bb21af21..0ed7af6850a5 100644
--- a/devel/py-dogpile.cache/Makefile
+++ b/devel/py-dogpile.cache/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Caching front-end based on the Dogpile lock
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dogpile.core>0:${PORTSDIR}/devel/py-dogpile.core \
-		${PYTHON_PKGNAMEPREFIX}gdbm>0:${PORTSDIR}/databases/py-gdbm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dogpile.core>0:devel/py-dogpile.core \
+		${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-doit/Makefile b/devel/py-doit/Makefile
index bfc188c3ea6a..056aa22a4c00 100644
--- a/devel/py-doit/Makefile
+++ b/devel/py-doit/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Task management & automation tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:${PORTSDIR}/devel/py-cloudpickle
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -26,7 +26,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>0:${PORTSDIR}/devel/py-configparser
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser
 .endif
 
 do-test:
diff --git a/devel/py-efilter/Makefile b/devel/py-efilter/Makefile
index 79d62ca8d901..e7649c6f6508 100644
--- a/devel/py-efilter/Makefile
+++ b/devel/py-efilter/Makefile
@@ -12,8 +12,8 @@ COMMENT=	EFILTER query language
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2011:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-efl/Makefile b/devel/py-efl/Makefile
index 2e6f36219065..8dc9ec79e04f 100644
--- a/devel/py-efl/Makefile
+++ b/devel/py-efl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python bindings for EFL and Elementary
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libelementary.so:${PORTSDIR}/x11-toolkits/elementary
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libelementary.so:x11-toolkits/elementary
 
 DIST_SUBDIR=	enlightenment
 USES=		pkgconfig python tar:xz
@@ -24,11 +24,11 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus
 .else
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py3-dbus
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:${PORTSDIR}/devel/py3-dbus
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-envisage/Makefile b/devel/py-envisage/Makefile
index 2c8e4938ef26..eee1cd584433 100644
--- a/devel/py-envisage/Makefile
+++ b/devel/py-envisage/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE PSFL LGPL20
 LICENSE_COMB=	multi
 # See image_LICENSE.txt files for per file license information
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:${PORTSDIR}/devel/py-traits
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-epsilon/Makefile b/devel/py-epsilon/Makefile
index e58edbc808c5..0450583a08aa 100644
--- a/devel/py-epsilon/Makefile
+++ b/devel/py-epsilon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Set of Python utility modules used by DivMod projects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl
 
 CONFLICTS=	brlcad-[0-9]*
 USES=		python twisted
diff --git a/devel/py-evdev/Makefile b/devel/py-evdev/Makefile
index e93bc54de2ca..d7e4a49c4d4a 100644
--- a/devel/py-evdev/Makefile
+++ b/devel/py-evdev/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bindings to the Linux input handling subsystem
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-event/Makefile b/devel/py-event/Makefile
index 41f1bea8a219..51fb667ec5d6 100644
--- a/devel/py-event/Makefile
+++ b/devel/py-event/Makefile
@@ -17,7 +17,7 @@ BROKEN=		unfetchable
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 PROJECTHOST=	pyevent
 USES=		python
diff --git a/devel/py-fabric/Makefile b/devel/py-fabric/Makefile
index 17047b985afa..182b11c6a2dc 100644
--- a/devel/py-fabric/Makefile
+++ b/devel/py-fabric/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Simple, Pythonic remote execution and deployment
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:${PORTSDIR}/security/py-paramiko
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:${PORTSDIR}/devel/py-Jinja2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-filemagic/Makefile b/devel/py-filemagic/Makefile
index d45df99b1c78..964492aa49b5 100644
--- a/devel/py-filemagic/Makefile
+++ b/devel/py-filemagic/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python API for libmagic, the library behind the Unix file command
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	TESTS
 
@@ -29,7 +29,7 @@ GH_TAGNAME=	b24df9f
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 .endif
 
 regression-test: build
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index 13d43a02a9de..6504b56e64d9 100644
--- a/devel/py-five.customerize/Makefile
+++ b/devel/py-five.customerize/Makefile
@@ -13,21 +13,21 @@ COMMENT=	TTW customization of template-based Zope views
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${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.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${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}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:${PORTSDIR}/devel/py-zope.viewlet \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${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.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${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}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 USE_PYTHON=	distutils autoplist
 USES=		python:2 zope zip
diff --git a/devel/py-five.formlib/Makefile b/devel/py-five.formlib/Makefile
index d49ca86c9d49..35956bc48eb6 100644
--- a/devel/py-five.formlib/Makefile
+++ b/devel/py-five.formlib/Makefile
@@ -13,19 +13,19 @@ COMMENT=	zope.formlib integration for Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${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>=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.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}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${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>=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.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}ExtensionClass>=0:devel/py-ExtensionClass
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile
index 9a5d679a8b95..9d215b208827 100644
--- a/devel/py-five.globalrequest/Makefile
+++ b/devel/py-five.globalrequest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zope 2 integration for zope.globalrequest
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:${PORTSDIR}/devel/py-zope.globalrequest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile
index b69fd9b4db16..52a93ac2590a 100644
--- a/devel/py-five.localsitemanager/Makefile
+++ b/devel/py-five.localsitemanager/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Local site manager implementation for Zope 2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index e94173bee27c..ee3755405410 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Code checking using pep8 and pyflakes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0.2.1:${PORTSDIR}/devel/py-mccabe \
-		${PYTHON_PKGNAMEPREFIX}pep8>=1.5.7:${PORTSDIR}/devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:${PORTSDIR}/devel/py-pyflakes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0.2.1:devel/py-mccabe \
+		${PYTHON_PKGNAMEPREFIX}pep8>=1.5.7:devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-flask-babel/Makefile b/devel/py-flask-babel/Makefile
index 0c8036cdcf33..a08966760144 100644
--- a/devel/py-flask-babel/Makefile
+++ b/devel/py-flask-babel/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Adds i18n/l10n support to Flask applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:${PORTSDIR}/devel/py-speaklater
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}speaklater>=1.3:devel/py-speaklater
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile
index 61bd7c84d943..d155839987e8 100644
--- a/devel/py-foolscap/Makefile
+++ b/devel/py-foolscap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	RPC protocol for Twisted Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python twisted
diff --git a/devel/py-freenas.dispatcher/Makefile b/devel/py-freenas.dispatcher/Makefile
index 1cfd942d4b5c..cc474cc6d5f5 100644
--- a/devel/py-freenas.dispatcher/Makefile
+++ b/devel/py-freenas.dispatcher/Makefile
@@ -9,13 +9,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	FreeNAS dispatcher client
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freenas.utils>0:${PORTSDIR}/devel/py-freenas.utils
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ws4py>0:${PORTSDIR}/www/py-ws4py \
-		${PYTHON_PKGNAMEPREFIX}jsonschema>0:${PORTSDIR}/devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}gevent>0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:${PORTSDIR}/devel/py-freenas.utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \
+		${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-freenas.utils/Makefile b/devel/py-freenas.utils/Makefile
index cd07f9117131..9a3721a292af 100644
--- a/devel/py-freenas.utils/Makefile
+++ b/devel/py-freenas.utils/Makefile
@@ -11,8 +11,8 @@ COMMENT=	FreeNAS common Python modules
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile
index db4c24ae9aee..b0c5f4882188 100644
--- a/devel/py-freezegun/Makefile
+++ b/devel/py-freezegun/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Let your Python tests travel through time
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:${PORTSDIR}/devel/py-dateutil
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-fsm/Makefile b/devel/py-fsm/Makefile
index 4296bfbf34dc..acae11c7d6d6 100644
--- a/devel/py-fsm/Makefile
+++ b/devel/py-fsm/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure Python Implementation of a Finite State Machine
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:${PORTSDIR}/graphics/py-pygraphviz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 5b3403514fbd..f3383f72fa1e 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module designed to write games in Python
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		dos2unix python
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index c583120ec190..cc5c8d670a09 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -28,13 +28,13 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MM2CRYPTO}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:${PORTSDIR}/security/py-m2crypto
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto
 .endif
 .if ${PORT_OPTIONS:MPYCRYPTO}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 .endif
 .if ${PORT_OPTIONS:MGMPY}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>0:${PORTSDIR}/math/py-gmpy
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy
 .endif
 
 post-install:
diff --git a/devel/py-geojson/Makefile b/devel/py-geojson/Makefile
index c32c62a748dc..659d74cd044d 100644
--- a/devel/py-geojson/Makefile
+++ b/devel/py-geojson/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python's Encoder/decoder for simple GIS features
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:${PORTSDIR}/devel/py-nose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>1.9:${PORTSDIR}/devel/py-simplejson
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson
 
 PORTDOCS=	LICENSE.rst CHANGELOG.rst README.rst
 
diff --git a/devel/py-gevent/Makefile b/devel/py-gevent/Makefile
index 87deb63159e7..254a443b6c3e 100644
--- a/devel/py-gevent/Makefile
+++ b/devel/py-gevent/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Python co-routine networking library based on greenlet
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares \
-		libev.so:${PORTSDIR}/devel/libev
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:${PORTSDIR}/devel/py-greenlet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:${PORTSDIR}/devel/py-greenlet \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+LIB_DEPENDS=	libcares.so:dns/c-ares \
+		libev.so:devel/libev
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:devel/py-greenlet
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.7:devel/py-greenlet \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 DO_MAKE_TEST=	${SETENV} PYTHONPATH=../ ${PYTHON_CMD}
 MAKE_ENV=	CARES_EMBED=0 LIBEV_EMBED=0
diff --git a/devel/py-git-up/Makefile b/devel/py-git-up/Makefile
index d8bdffdab9a8..47bcfb27ed22 100644
--- a/devel/py-git-up/Makefile
+++ b/devel/py-git-up/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Python implementation of 'git up'
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.6:${PORTSDIR}/devel/py-gitpython \
-	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.2:${PORTSDIR}/devel/py-colorama \
-	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:${PORTSDIR}/devel/py-termcolor \
-	${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:${PORTSDIR}/devel/py-docopt
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.6:devel/py-gitpython \
+	${PYTHON_PKGNAMEPREFIX}colorama>=0.3.2:devel/py-colorama \
+	${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \
+	${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt
 
 USES=		python zip dos2unix
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index 5c9a27898fa6..2212c037cf05 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pure Python git object database
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:${PORTSDIR}/devel/py-smmap
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:devel/py-smmap
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-gitosis/Makefile b/devel/py-gitosis/Makefile
index d9c485ae824a..bb90a6ea9393 100644
--- a/devel/py-gitosis/Makefile
+++ b/devel/py-gitosis/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Software for hosting git repositories
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 USES=		python tar:bzip2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-gitpython/Makefile b/devel/py-gitpython/Makefile
index 37a16c343f96..9bbe750df6ee 100644
--- a/devel/py-gitpython/Makefile
+++ b/devel/py-gitpython/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python Git Library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:${PORTSDIR}/devel/py-gitdb
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:${PORTSDIR}/devel/py-gitdb
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:devel/py-gitdb
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}gitdb>=0.6.4:devel/py-gitdb
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index db659b15db66..39775d922627 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Python bindings for GObject
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+LIB_DEPENDS+=	libffi.so:devel/libffi
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 
 PORTSCOUT=	ignore:1
 
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index 96aa5e5c5d07..7c70e0cbac9d 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Google Application Utilities for Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gflags>2:${PORTSDIR}/devel/py-gflags \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}dateutil>2:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gflags>2:devel/py-gflags \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-grab/Makefile b/devel/py-grab/Makefile
index 7310eab305dc..5ea977b2e149 100644
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Site scraping framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}weblib>0:${PORTSDIR}/devel/py-weblib \
-		${PYTHON_PKGNAMEPREFIX}selection>0:${PORTSDIR}/devel/py-selection \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}user_agent>0:${PORTSDIR}/www/py-user_agent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib \
+		${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-hash_ring/Makefile b/devel/py-hash_ring/Makefile
index 69b27d843874..8a89322d4fc8 100644
--- a/devel/py-hash_ring/Makefile
+++ b/devel/py-hash_ring/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implementation of consistent hashing in Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:${PORTSDIR}/databases/py-python-memcached
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-hgsubversion/Makefile b/devel/py-hgsubversion/Makefile
index fb22863d4ffa..e4e4f9ae45b3 100644
--- a/devel/py-hgsubversion/Makefile
+++ b/devel/py-hgsubversion/Makefile
@@ -22,9 +22,9 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSUBVERTPY}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subvertpy>=0:${PORTSDIR}/devel/py-subvertpy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy
 .else
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:${PORTSDIR}/devel/py-subversion
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-hypothesis/Makefile b/devel/py-hypothesis/Makefile
index f2596130826d..3470a9fbd510 100644
--- a/devel/py-hypothesis/Makefile
+++ b/devel/py-hypothesis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for property based testing
 
 LICENSE=	MPL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index 4f58d2084e69..3926b1313629 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Parser and generator of iCalender files for Python
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		python
 USE_PYTHON=	distutils concurrent autoplist
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index 3030e09ec86a..11c9105a90d7 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -9,8 +9,8 @@ COMMENT=	Ice (Internet Communications Engine) language mapping for Python
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	mcpp:${PORTSDIR}/devel/mcpp
-LIB_DEPENDS=	libIce.so.${LIB_VRS}:${PORTSDIR}/devel/ice
+BUILD_DEPENDS=	mcpp:devel/mcpp
+LIB_DEPENDS=	libIce.so.${LIB_VRS}:devel/ice
 
 USES=		python shebangfix
 USE_PYTHON=	py3kplist
diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index 22c5359dd6b2..3a141f307b9f 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python module for instant inlining of C and C++ code in Python
 
 LICENSE=	LGPL3
 
-RUN_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+RUN_DEPENDS=	swig2.0:devel/swig20
 
 USES=			python:2
 USE_PYTHON=		distutils
diff --git a/devel/py-intervaltree/Makefile b/devel/py-intervaltree/Makefile
index d0a86d31cdf2..62b532c33958 100644
--- a/devel/py-intervaltree/Makefile
+++ b/devel/py-intervaltree/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Editable interval tree data structure for Python 2 and 3
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:${PORTSDIR}/devel/py-sortedcontainers
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-ipdb/Makefile b/devel/py-ipdb/Makefile
index 216076a318e6..a4eb3798417a 100644
--- a/devel/py-ipdb/Makefile
+++ b/devel/py-ipdb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	IPython-enabled pdb
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.10:${PORTSDIR}/devel/ipython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.10:devel/ipython
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-iso8601/Makefile b/devel/py-iso8601/Makefile
index df0e98fd37a5..1725cbd0e4a0 100644
--- a/devel/py-iso8601/Makefile
+++ b/devel/py-iso8601/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple module to parse ISO 8601 dates
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile
index 6eca0f92e3c3..a328d937f410 100644
--- a/devel/py-itools/Makefile
+++ b/devel/py-itools/Makefile
@@ -14,23 +14,23 @@ COMMENT=	Python library Provides Wide Range Of Capabilities
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=  ${LOCALBASE}/include/poppler/goo/gtypes.h:${PORTSDIR}/graphics/poppler \
-		${LOCALBASE}/include/git2.h:${PORTSDIR}/devel/libgit2 \
-		${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:${PORTSDIR}/print/py-reportlab2 \
-		${PYTHON_PKGNAMEPREFIX}pygit2>0:${PORTSDIR}/devel/py-pygit2 \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd \
-		${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \
-		${LOCALBASE}/bin/git:${PORTSDIR}/devel/git \
-		xapian-bindings>1.0.8:${PORTSDIR}/databases/xapian-bindings
+BUILD_DEPENDS=  ${LOCALBASE}/include/poppler/goo/gtypes.h:graphics/poppler \
+		${LOCALBASE}/include/git2.h:devel/libgit2 \
+		${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:print/py-reportlab2 \
+		${PYTHON_PKGNAMEPREFIX}pygit2>0:devel/py-pygit2 \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd \
+		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:devel/py-gobject \
+		${LOCALBASE}/bin/git:devel/git \
+		xapian-bindings>1.0.8:databases/xapian-bindings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libwv2.so:${PORTSDIR}/textproc/wv2
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20 \
+		libsoup-2.4.so:devel/libsoup \
+		libwv2.so:textproc/wv2
 
 CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/poppler
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/py-jaraco.timing/Makefile b/devel/py-jaraco.timing/Makefile
index aad623ae007d..0aa7f3d8da4a 100644
--- a/devel/py-jaraco.timing/Makefile
+++ b/devel/py-jaraco.timing/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Routines pertinent to the fourth dimension
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools \
-		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:${PORTSDIR}/devel/py-pytest-runner \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-jaraco.util/Makefile b/devel/py-jaraco.util/Makefile
index d99b6415ec7f..e053b18a4783 100644
--- a/devel/py-jaraco.util/Makefile
+++ b/devel/py-jaraco.util/Makefile
@@ -12,10 +12,10 @@ COMMENT=	General utility modules that supply commonly-used functionality
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}more-itertools>0:${PORTSDIR}/devel/py-more-itertools \
-		${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:${PORTSDIR}/devel/py-jaraco.timing
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:${PORTSDIR}/devel/py-hgtools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \
+		${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-jira/Makefile b/devel/py-jira/Makefile
index 7934b0592ecc..18e64f3300a7 100644
--- a/devel/py-jira/Makefile
+++ b/devel/py-jira/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Library to ease use of the JIRA 5 REST APIs
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:${PORTSDIR}/www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:${PORTSDIR}/security/py-tlslite \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=		MAGIC PARALLEL SHELL TESTS
 OPTIONS_DEFAULT=	MAGIC PARALLEL
@@ -29,13 +29,13 @@ PARALLEL_DESC=	Enable asynchronous requests
 SHELL_DESC=	Enable interactive shell
 TESTS_DESC=	Install test suite dependencies
 
-MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:${PORTSDIR}/devel/py-filemagic
-PARALLEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grequests>0:${PORTSDIR}/www/py-grequests
-SHELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.13:${PORTSDIR}/devel/ipython
+MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic
+PARALLEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests
+SHELL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython
 TESTS_BUILD_DEPENDS=	${TEST_DEPENDS}
 
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-jsonpatch/Makefile b/devel/py-jsonpatch/Makefile
index ec73ad06291c..31270a9664e3 100644
--- a/devel/py-jsonpatch/Makefile
+++ b/devel/py-jsonpatch/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	harm@weites.com
 COMMENT=	Apply JSON-Patches (RFC 6902)
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:${PORTSDIR}/devel/py-jsonpointer
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index cd761a48046c..f488c1ff996d 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -22,7 +22,7 @@ CJSON_DESC=	Use cjson instead of json or simplejson
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCJSON}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cjson>0:${PORTSDIR}/devel/py-cjson
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-jsonschema/Makefile b/devel/py-jsonschema/Makefile
index a677342fb802..eb124f77a3f9 100644
--- a/devel/py-jsonschema/Makefile
+++ b/devel/py-jsonschema/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JSON Schema validation for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:${PORTSDIR}/devel/py-vcversioner
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -20,7 +20,7 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} == "2.7"
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}functools32>0:${PORTSDIR}/devel/py-functools32
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-kaptan/Makefile b/devel/py-kaptan/Makefile
index 2fee13dfb478..109acfdd7d49 100644
--- a/devel/py-kaptan/Makefile
+++ b/devel/py-kaptan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python config parser for json, yaml
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-kayako/Makefile b/devel/py-kayako/Makefile
index 8d66443b75fd..7033c6db394b 100644
--- a/devel/py-kayako/Makefile
+++ b/devel/py-kayako/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Python API Wrapper for Kayako
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index 9e8d169993ef..fbd7f42e86ec 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Higher Level API to Zookeeper for Python
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent
 
 USES=		gmake python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-keystoneauth1/Makefile b/devel/py-keystoneauth1/Makefile
index 3d376d318427..242c2e9854f0 100644
--- a/devel/py-keystoneauth1/Makefile
+++ b/devel/py-keystoneauth1/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Authentication Library for OpenStack Identity
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}positional>0:${PORTSDIR}/devel/py-positional \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}stevedore>0:${PORTSDIR}/devel/py-stevedore
+BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \
+		${PYTHON_PKGNAMEPREFIX}positional>0:devel/py-positional \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore
 
 NO_ARCH=	yes
 
diff --git a/devel/py-libpeas/Makefile b/devel/py-libpeas/Makefile
index 23a19274bf5e..a9505d5acd4e 100644
--- a/devel/py-libpeas/Makefile
+++ b/devel/py-libpeas/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	libpeas Python 2 support
 
-LIB_DEPENDS+=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 
 LIBPEAS_SLAVE=	python2
 
diff --git a/devel/py-libplist/Makefile b/devel/py-libplist/Makefile
index 5265722ed85b..81a12b26b4b0 100644
--- a/devel/py-libplist/Makefile
+++ b/devel/py-libplist/Makefile
@@ -7,8 +7,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Python bindings for libplist
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/${MASTER_PORT}
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+LIB_DEPENDS=	libplist.so:${MASTER_PORT}
+BUILD_DEPENDS=	cython:lang/cython
 
 USES=		python
 CONFIGURE_ENV=	PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`"
diff --git a/devel/py-libvirt/Makefile b/devel/py-libvirt/Makefile
index a7f9330bca74..45e083934d1e 100644
--- a/devel/py-libvirt/Makefile
+++ b/devel/py-libvirt/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for Libvirt virtualization API
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:devel/libvirt
 
 USES=	pkgconfig python shebangfix
 SHEBANG_FILES=	generator.py sanitytest.py setup.py
diff --git a/devel/py-libzfs/Makefile b/devel/py-libzfs/Makefile
index c5db0e6af6f8..f3b0d80cb3f8 100644
--- a/devel/py-libzfs/Makefile
+++ b/devel/py-libzfs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python libzfs bindings
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	cython>0:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython>0:lang/cython
 
 USE_GITHUB=     yes
 GH_ACCOUNT=	freenas
@@ -27,7 +27,7 @@ MAKE_ENV=	FREEBSD_SRC=${SRC_BASE}
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .if !exists(${SRC_BASE}/sys/Makefile)
diff --git a/devel/py-lockfile/Makefile b/devel/py-lockfile/Makefile
index f7b4224f86bf..e4e5feb77d84 100644
--- a/devel/py-lockfile/Makefile
+++ b/devel/py-lockfile/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Platform-independent file locking module
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:${PORTSDIR}/devel/py-pbr
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-logan/Makefile b/devel/py-logan/Makefile
index fed1524ff6f5..2326439ea216 100644
--- a/devel/py-logan/Makefile
+++ b/devel/py-logan/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Logan is a toolkit for running standalone Django applications
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 76bb22e18ec0..055c82be3cb0 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt
 
 USES=		python uniquefiles:dirs
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-manuel/Makefile b/devel/py-manuel/Makefile
index 4657c4f93cd4..47cd126d704d 100644
--- a/devel/py-manuel/Makefile
+++ b/devel/py-manuel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lets you build tested documentation
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index 8165c62882f1..f5bce1d013f8 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python Memory Usage Analyzer
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	cython>0:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython>0:lang/cython
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-memory_profiler/Makefile b/devel/py-memory_profiler/Makefile
index 4bd669b171d2..40bd7cd39d2b 100644
--- a/devel/py-memory_profiler/Makefile
+++ b/devel/py-memory_profiler/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	PSUTIL
 PSUTIL_DESC=	Use psutil for better performance
-PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:${PORTSDIR}/sysutils/py-psutil
+PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:sysutils/py-psutil
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-mercurialserver/Makefile b/devel/py-mercurialserver/Makefile
index 008181a85f2e..ec535ab61b4d 100644
--- a/devel/py-mercurialserver/Makefile
+++ b/devel/py-mercurialserver/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Software for hosting mercurial repositories
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	hg:devel/mercurial
 
 WRKSRC=		${WRKDIR}/${SNAME}_${SVERSION}.orig
 SNAME=		mercurial-server
diff --git a/devel/py-minimongo/Makefile b/devel/py-minimongo/Makefile
index 14cafe69fbfa..2713e48aac42 100644
--- a/devel/py-minimongo/Makefile
+++ b/devel/py-minimongo/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mail@derzinn.de
 COMMENT=	Minimal database Model management for MongoDB
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:${PORTSDIR}/databases/pymongo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-mock/Makefile b/devel/py-mock/Makefile
index 46dc3ae6d555..8c878b848df3 100644
--- a/devel/py-mock/Makefile
+++ b/devel/py-mock/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Mock unit tests for Python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:${PORTSDIR}/devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six
-TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six
+TESTS_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -25,7 +25,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:${PORTSDIR}/devel/py-funcsigs
+RUN_DEPENDS+=  ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs
 .endif
 
 do-test:
diff --git a/devel/py-mongoengine/Makefile b/devel/py-mongoengine/Makefile
index 40c17e009c74..7817cdac9b9e 100644
--- a/devel/py-mongoengine/Makefile
+++ b/devel/py-mongoengine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Object-Document-Mapper for working with MongoDB
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}rednose>0:${PORTSDIR}/devel/py-rednose
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:${PORTSDIR}/databases/pymongo
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-mongokit/Makefile b/devel/py-mongokit/Makefile
index 0bc57310318d..3368804d23ee 100644
--- a/devel/py-mongokit/Makefile
+++ b/devel/py-mongokit/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	mail@derzinn.de
 COMMENT=	Python ORM-like layer on top of pymongo
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:${PORTSDIR}/databases/pymongo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:databases/pymongo
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-mwlib.rl/Makefile b/devel/py-mwlib.rl/Makefile
index b81ead664332..05ab2b73f0f5 100644
--- a/devel/py-mwlib.rl/Makefile
+++ b/devel/py-mwlib.rl/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Generate Pdfs from Mediawiki Markup
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/texvc:${PORTSDIR}/print/texvc \
-		${LOCALBASE}/bin/fribidi:${PORTSDIR}/converters/fribidi \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:${PORTSDIR}/devel/py-mwlib \
-		${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:${PORTSDIR}/devel/py-mwlib.ext \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments
+BUILD_DEPENDS=	${LOCALBASE}/bin/texvc:print/texvc \
+		${LOCALBASE}/bin/fribidi:converters/fribidi \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib \
+		${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext \
+		${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/devel/py-mwlib/Makefile b/devel/py-mwlib/Makefile
index 0ed30dc201e2..90f329190a78 100644
--- a/devel/py-mwlib/Makefile
+++ b/devel/py-mwlib/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Python's MediaWiki Parser and Utility Library
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:${PORTSDIR}/devel/py-apipkg \
-		${PYTHON_PKGNAMEPREFIX}bottle>=0.10:${PORTSDIR}/www/py-bottle \
-		${PYTHON_PKGNAMEPREFIX}flup>=1.0:${PORTSDIR}/www/py-flup \
-		${PYTHON_PKGNAMEPREFIX}gevent>=0:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:${PORTSDIR}/devel/py-odfpy \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:${PORTSDIR}/devel/py-timelib \
-		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:${PORTSDIR}/print/py-pdf \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.0:${PORTSDIR}/devel/py-py \
-		${PYTHON_PKGNAMEPREFIX}qserve>=0:${PORTSDIR}/devel/py-qserve \
-		${PYTHON_PKGNAMEPREFIX}roman>=0:${PORTSDIR}/math/py-roman \
-		${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:${PORTSDIR}/databases/py-sqlite3dbm \
-		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:${PORTSDIR}/devel/py-timelib \
-		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg \
+		${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle \
+		${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup \
+		${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \
+		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py \
+		${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve \
+		${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \
+		${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm \
+		${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob
 
 USES=		python:2 shebangfix zip
 SHEBANG_FILES=	mwlib/EasyTimeline.pl
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index cf67d9f19159..4bd7b4b33cd2 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	egenix-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sergio@softshark.org
 COMMENT=	The eGenix mx Extensions - EXPERIMENTAL Package
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/gmp
-#RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
+BUILD_DEPENDS=	${LOCALBASE}/include/gmp.h:math/gmp
+#RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-nose-cov/Makefile b/devel/py-nose-cov/Makefile
index e7abd9e629a3..801c7566a286 100644
--- a/devel/py-nose-cov/Makefile
+++ b/devel/py-nose-cov/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Nose plugin for coverage reporting
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-noseofyeti/Makefile b/devel/py-noseofyeti/Makefile
index bb8bf46f0212..08739bc57121 100644
--- a/devel/py-noseofyeti/Makefile
+++ b/devel/py-noseofyeti/Makefile
@@ -8,18 +8,18 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	Nose plugin providing BDD dsl for Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \
-		${PYTHON_PKGNAMEPREFIX}should_dsl>0:${PORTSDIR}/devel/py-should_dsl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
+		${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	\
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}fudge>0:${PORTSDIR}/devel/py-fudge \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}pinocchio>0:${PORTSDIR}/devel/py-pinocchio \
-		${PYTHON_PKGNAMEPREFIX}should_dsl>0:${PORTSDIR}/devel/py-should_dsl
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \
+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio \
+		${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl
 
 NO_ARCH=	yes
 USES=		python shebangfix
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 4cfbde026b10..c7c9f3bf127f 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -13,7 +13,7 @@ COMMENT=	python bindings for libnotify
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	pygtk2
diff --git a/devel/py-ocempgui/Makefile b/devel/py-ocempgui/Makefile
index c07e68b9fb63..11b9002c5cf1 100644
--- a/devel/py-ocempgui/Makefile
+++ b/devel/py-ocempgui/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GUI toolkit in python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:${PORTSDIR}/devel/py-game
-RUN_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:${PORTSDIR}/devel/py-game
+BUILD_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game
+RUN_DEPENDS=	${LOCALBASE}/include/${PYTHON_VERSION}/pygame/pygame.h:devel/py-game
 
 USES=		python:2
 USE_GNOME=	atk
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index da0acacbeccd..407b2b89c27e 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Python bindings for The Open Dynamics Engine
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
+BUILD_DEPENDS=	${LOCALBASE}/lib/libode.a:devel/ode
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-omnijson/Makefile b/devel/py-omnijson/Makefile
index 44f282d02cbc..e7abe40ba514 100644
--- a/devel/py-omnijson/Makefile
+++ b/devel/py-omnijson/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Wraps the best Python JSON installed
 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=	TESTS
 
diff --git a/devel/py-omniorb-3/Makefile b/devel/py-omniorb-3/Makefile
index 4abc6aacbe42..aca92e7b1125 100644
--- a/devel/py-omniorb-3/Makefile
+++ b/devel/py-omniorb-3/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libomniORB4.so.1:${PORTSDIR}/devel/omniORB-4.1
+LIB_DEPENDS=	libomniORB4.so.1:devel/omniORB-4.1
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB-4.1:patch
+BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB-4.1:patch
 
 CONFLICTS=	py${PYTHON_SUFFIX}-orbit-2* py${PYTHON_SUFFIX}-omniorb-4.2*
 
diff --git a/devel/py-omniorb/Makefile b/devel/py-omniorb/Makefile
index 4e45a0ed6353..b1b650c0b363 100644
--- a/devel/py-omniorb/Makefile
+++ b/devel/py-omniorb/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libomniORB4.so:${PORTSDIR}/devel/omniORB
-RUN_DEPENDS=	omniidl:${PORTSDIR}/devel/omniORB
+LIB_DEPENDS=	libomniORB4.so:devel/omniORB
+RUN_DEPENDS=	omniidl:devel/omniORB
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/devel/omniORB:patch
+BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB:patch
 
 CONFLICTS=	py*-orbit-2* py${PYTHON_SUFFIX}-omniorb3-3*
 
diff --git a/devel/py-option_merge/Makefile b/devel/py-option_merge/Makefile
index 29df11ae5f91..05fd51367929 100644
--- a/devel/py-option_merge/Makefile
+++ b/devel/py-option_merge/Makefile
@@ -8,11 +8,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	Code to deeply merge multiple python dictionaries
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:${PORTSDIR}/devel/py-delfick_error	\
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:${PORTSDIR}/devel/py-noseofyeti	\
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error	\
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti	\
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-oslo.i18n/Makefile b/devel/py-oslo.i18n/Makefile
index 2e89cba4b94f..c6191c6b4c4a 100644
--- a/devel/py-oslo.i18n/Makefile
+++ b/devel/py-oslo.i18n/Makefile
@@ -9,9 +9,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Oslo i18n library
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/devel/py-oslo.serialization/Makefile b/devel/py-oslo.serialization/Makefile
index 4335da229eb5..ceb08e0de7a2 100644
--- a/devel/py-oslo.serialization/Makefile
+++ b/devel/py-oslo.serialization/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Oslo Serialization library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:${PORTSDIR}/devel/py-msgpack-python \
-		${PYTHON_PKGNAMEPREFIX}oslo.utils>0:${PORTSDIR}/devel/py-oslo.utils \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
+		${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/devel/py-oslo.utils/Makefile b/devel/py-oslo.utils/Makefile
index fd855453a5a7..fef905618df6 100644
--- a/devel/py-oslo.utils/Makefile
+++ b/devel/py-oslo.utils/Makefile
@@ -9,16 +9,16 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Oslo Utility library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>0:${PORTSDIR}/devel/py-debtcollector \
-		${PYTHON_PKGNAMEPREFIX}funcsigs>0:${PORTSDIR}/devel/py-funcsigs \
-		${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601 \
-		${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:${PORTSDIR}/devel/py-monotonic \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:${PORTSDIR}/net/py-netaddr \
-		${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:${PORTSDIR}/devel/py-oslo.i18n \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}debtcollector>0:devel/py-debtcollector \
+		${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \
+		${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic \
+		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
+		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 
diff --git a/devel/py-palm/Makefile b/devel/py-palm/Makefile
index a3e484332b81..999fec9a821f 100644
--- a/devel/py-palm/Makefile
+++ b/devel/py-palm/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fast Protocol Buffer library for Python
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:${PORTSDIR}/devel/py-protobuf
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simpleparse>0:${PORTSDIR}/devel/py-simpleparse
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pathlib/Makefile b/devel/py-pathlib/Makefile
index d832775d7df4..d81ad75e2220 100644
--- a/devel/py-pathlib/Makefile
+++ b/devel/py-pathlib/Makefile
@@ -17,7 +17,7 @@ USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/py-pathtools/Makefile b/devel/py-pathtools/Makefile
index 0a3e1ee1f306..6b11c5b3fdd3 100644
--- a/devel/py-pathtools/Makefile
+++ b/devel/py-pathtools/Makefile
@@ -20,7 +20,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 post-build:
diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 7a2a75a6d388..68daab41bb08 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python Build Reasonableness
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
 
 NO_ARCH=	yes
 
diff --git a/devel/py-pex/Makefile b/devel/py-pex/Makefile
index dcec0f0ea500..539916abc2a6 100644
--- a/devel/py-pex/Makefile
+++ b/devel/py-pex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PEX packaging toolchain
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:${PORTSDIR}/devel/py-wheel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-phabricator/Makefile b/devel/py-phabricator/Makefile
index 230442ef296c..6601315f331c 100644
--- a/devel/py-phabricator/Makefile
+++ b/devel/py-phabricator/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Phabricator API Bindings
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-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
+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
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pinocchio/Makefile b/devel/py-pinocchio/Makefile
index b6aeb5fe7ac4..3c5cd37efe3e 100644
--- a/devel/py-pinocchio/Makefile
+++ b/devel/py-pinocchio/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pinocchio plugins for the nose testing framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:${PORTSDIR}/devel/py-colorama
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 8830b604af42..8d3f653619cf 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -13,21 +13,21 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # Tests also need bzr, git, otherwise they fail
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:${PORTSDIR}/devel/py-pytest-capturelog \
-		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-timeout \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:${PORTSDIR}/devel/py-pytest-xdist \
-		${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:${PORTSDIR}/devel/py-scripttest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}pretend>0:${PORTSDIR}/devel/py-pretend \
-		${PYTHON_PKGNAMEPREFIX}freezegun>0:${PORTSDIR}/devel/py-freezegun \
-		git>0:${PORTSDIR}/devel/git \
-		bzr>0:${PORTSDIR}/devel/bzr
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog \
+		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist \
+		${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv \
+		${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend \
+		${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun \
+		git>0:devel/git \
+		bzr>0:devel/bzr
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_PORTDOCS=	*
 DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
 		PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
diff --git a/devel/py-plan/Makefile b/devel/py-plan/Makefile
index 389ef9032794..f461ae11c716 100644
--- a/devel/py-plan/Makefile
+++ b/devel/py-plan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python package for writing and deploying cron jobs
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=2.1:${PORTSDIR}/devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pluggy/Makefile b/devel/py-pluggy/Makefile
index 41af18db648c..10ea518232e2 100644
--- a/devel/py-pluggy/Makefile
+++ b/devel/py-pluggy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Plugin and hook calling mechanisms for Python
 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
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-positional/Makefile b/devel/py-positional/Makefile
index 729dced228b6..8482902db9f2 100644
--- a/devel/py-positional/Makefile
+++ b/devel/py-positional/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to enforce positional or key-word arguments
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:${PORTSDIR}/devel/py-pbr
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr
 
 NO_ARCH=	yes
 
diff --git a/devel/py-pretend/Makefile b/devel/py-pretend/Makefile
index edb5df3e6b4f..e9155d415e5f 100644
--- a/devel/py-pretend/Makefile
+++ b/devel/py-pretend/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library for stubbing in Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-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/devel/py-prioritized_methods/Makefile b/devel/py-prioritized_methods/Makefile
index a2df0afa8d44..81f390d99c44 100644
--- a/devel/py-prioritized_methods/Makefile
+++ b/devel/py-prioritized_methods/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Extension to PEAK-Rules to prioritize methods
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:${PORTSDIR}/devel/py-PEAK-Rules
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-prompt_toolkit/Makefile b/devel/py-prompt_toolkit/Makefile
index b69aad6d3cda..596f19f8f733 100644
--- a/devel/py-prompt_toolkit/Makefile
+++ b/devel/py-prompt_toolkit/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Library for building powerful interactive command lines in Python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:${PORTSDIR}/devel/py-wcwidth
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-protobuf/Makefile b/devel/py-protobuf/Makefile
index 207b364c2f38..df1db4901d35 100644
--- a/devel/py-protobuf/Makefile
+++ b/devel/py-protobuf/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Google protobuf Python Client Library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils \
-		protoc:${PORTSDIR}/devel/protobuf
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:${PORTSDIR}/devel/py-google-apputils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:devel/py-google-apputils \
+		protoc:devel/protobuf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}google-apputils>=0:devel/py-google-apputils
 
 DO_MAKE_TEST=	${PYTHON_CMD} ${PYDISTUTILS_SETUP}
 NO_ARCH=	yes
diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile
index 2a5d2e11d5df..73e7e4d0e78f 100644
--- a/devel/py-protocols-devel/Makefile
+++ b/devel/py-protocols-devel/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-1.0a0dev-r2302
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Protocol Definition, Declaration, and Adaptation for Python
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-ptrace/Makefile b/devel/py-ptrace/Makefile
index b5fd1a755b5e..7a522c50f0b3 100644
--- a/devel/py-ptrace/Makefile
+++ b/devel/py-ptrace/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python binding of ptrace
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distorm>0:${PORTSDIR}/devel/py-distorm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pudb/Makefile b/devel/py-pudb/Makefile
index 3c2304ab4a98..0e9de2700b89 100644
--- a/devel/py-pudb/Makefile
+++ b/devel/py-pudb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Full-screen, console-based Python debugger
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:${PORTSDIR}/devel/py-urwid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-py/Makefile b/devel/py-py/Makefile
index 7aea459c3e15..62c33484da63 100644
--- a/devel/py-py/Makefile
+++ b/devel/py-py/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library with cross-python path, ini-parsing, io, code, log facilities
 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
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pyasn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile
index e943594c8989..253a198ecc3c 100644
--- a/devel/py-pyasn1-modules/Makefile
+++ b/devel/py-pyasn1-modules/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collection of ASN.1 data structures for py-asn1
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1
 
 NO_ARCH=	yes
 USES=		python shebangfix
diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile
index 36262345aaed..ef61cc4bef30 100644
--- a/devel/py-pycallgraph/Makefile
+++ b/devel/py-pycallgraph/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python library that creates call graphs for Python programs
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS+=	dot:graphics/graphviz
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-pycmd/Makefile b/devel/py-pycmd/Makefile
index 2d4f2a40a1ca..0b2ed678506c 100644
--- a/devel/py-pycmd/Makefile
+++ b/devel/py-pycmd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tools for managing/searching Python related files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.9:${PORTSDIR}/devel/py-py
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-pydenticon/Makefile b/devel/py-pydenticon/Makefile
index 146075ef1b2e..e8178002ea89 100644
--- a/devel/py-pydenticon/Makefile
+++ b/devel/py-pydenticon/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Library for generating identicons - an enhanced port of Sigil
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pydoop/Makefile b/devel/py-pydoop/Makefile
index a667f647c60b..8b9a5b022bd7 100644
--- a/devel/py-pydoop/Makefile
+++ b/devel/py-pydoop/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python interface to Hadoop
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/yarn:${PORTSDIR}/devel/hadoop2
-RUN_DEPENDS=	${LOCALBASE}/bin/yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/bin/yarn:devel/hadoop2
+RUN_DEPENDS=	${LOCALBASE}/bin/yarn:devel/hadoop2
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pyev/Makefile b/devel/py-pyev/Makefile
index 5c342d768e09..342179305d76 100644
--- a/devel/py-pyev/Makefile
+++ b/devel/py-pyev/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python libev interface
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pygit2/Makefile b/devel/py-pygit2/Makefile
index d8cc03457359..22211cbc19a9 100644
--- a/devel/py-pygit2/Makefile
+++ b/devel/py-pygit2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python bindings for libgit2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 640f0944a3a2..f12557064798 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -22,6 +22,6 @@ MAKE_ENV+=	PYICU_INCLUDES="${PREFIX}/include" \
 		PYICU_CFLAGS="-w:-DPYICU_VER=\"${PORTVERSION}\"" \
 		PYICU_LFLAGS="-L${PREFIX}/lib"
 
-LIB_DEPENDS+=	libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicudata.so:devel/icu
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyinotify/Makefile b/devel/py-pyinotify/Makefile
index c79c824e4129..692143bd017c 100644
--- a/devel/py-pyinotify/Makefile
+++ b/devel/py-pyinotify/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python interface to (lib)inotify
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index 3b752c1d5a8a..f0ef7380c784 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -11,19 +11,19 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for KDE
 
-LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
-		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon \
-		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative
+LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:devel/py-qt4-designer \
+		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
+		${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:x11/py-qt4-opengl \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:databases/py-qt4-sql \
+		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:textproc/py-qt4-xml \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/phonon.so:multimedia/py-qt4-phonon \
+		${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:devel/py-qt4-declarative
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:devel/py-qt4-dbussupport
 
 USE_KDE4=	kdelibs kdeprefix nepomuk-core okular pimlibs \
 		akonadi automoc4 soprano
diff --git a/devel/py-pyke/Makefile b/devel/py-pyke/Makefile
index 2b7f2503d426..a27178a55210 100644
--- a/devel/py-pyke/Makefile
+++ b/devel/py-pyke/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Knowledge Engine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=2.3:${PORTSDIR}/devel/py-ply
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply
 
 USES=		python zip
 USE_PYTHON=	distutils
diff --git a/devel/py-pymarc/Makefile b/devel/py-pymarc/Makefile
index 06210c3564f9..ba886ac9a313 100644
--- a/devel/py-pymarc/Makefile
+++ b/devel/py-pymarc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Read Write And Modify MARC Bibliographic Data
 
 LICENSE=	BSD2CLAUSE
 
-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/devel/py-pymtbl/Makefile b/devel/py-pymtbl/Makefile
index 349d0fdef147..7563253fa8be 100644
--- a/devel/py-pymtbl/Makefile
+++ b/devel/py-pymtbl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python wrapper for devel/mtbl
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libmtbl.so:${PORTSDIR}/devel/mtbl
+LIB_DEPENDS=	libmtbl.so:devel/mtbl
 
 USE_PYTHON=	autoplist distutils
 USES=		pkgconfig python shebangfix uniquefiles:dirs
diff --git a/devel/py-pyopencl/Makefile b/devel/py-pyopencl/Makefile
index 10d3d438dbf0..5e16b0ac2ebd 100644
--- a/devel/py-pyopencl/Makefile
+++ b/devel/py-pyopencl/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Python wrapper for OpenCL
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:${PORTSDIR}/devel/opencl \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libOpenCL.so:${PORTSDIR}/devel/ocl-icd
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytools>0:${PORTSDIR}/devel/py-pytools \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako
+BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libOpenCL.so:devel/ocl-icd
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytools>0:devel/py-pytools \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako
 
 USE_PYTHON=	autoplist distutils
 USES=		python
diff --git a/devel/py-pyrfc3339/Makefile b/devel/py-pyrfc3339/Makefile
index 5f368e689a1b..0c63498694ad 100644
--- a/devel/py-pyrfc3339/Makefile
+++ b/devel/py-pyrfc3339/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Generate and parse RFC 3339 timestamps
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-pyro/Makefile b/devel/py-pyro/Makefile
index b231c7bc8be2..46954120125d 100644
--- a/devel/py-pyro/Makefile
+++ b/devel/py-pyro/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Distributed Object Middleware for Python(IPC/RPC)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serpent>=1.11:${PORTSDIR}/devel/py-serpent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serpent>=1.11:devel/py-serpent
 
 NO_ARCH=	yes
 USES=		dos2unix python
diff --git a/devel/py-pytest-cache/Makefile b/devel/py-pytest-cache/Makefile
index 5b990280b136..ccf61a2859fc 100644
--- a/devel/py-pytest-cache/Makefile
+++ b/devel/py-pytest-cache/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Pytest plugin with mechanisms for caching across test runs
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.2:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}execnet>=1.2:${PORTSDIR}/sysutils/py-execnet
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 OPTIONS_DEFINE=	TESTS
 
diff --git a/devel/py-pytest-capturelog/Makefile b/devel/py-pytest-capturelog/Makefile
index bb3e9dfa6f7e..23c7b39420b5 100644
--- a/devel/py-pytest-capturelog/Makefile
+++ b/devel/py-pytest-capturelog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Py.test plugin to capture log messages
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.1.1:${PORTSDIR}/devel/py-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytest-django/Makefile b/devel/py-pytest-django/Makefile
index 70b6476482be..7109012d8225 100644
--- a/devel/py-pytest-django/Makefile
+++ b/devel/py-pytest-django/Makefile
@@ -10,14 +10,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Django plugin for py.test
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:${PORTSDIR}/www/py-django18 \
-		${PYTHON_PKGNAMEPREFIX}django-configurations>=0:${PORTSDIR}/www/py-django-configurations \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:${PORTSDIR}/devel/py-pytest-xdist \
-		${PYTHON_PKGNAMEPREFIX}tox>=0:${PORTSDIR}/devel/py-tox \
-		${PYTHON_PKGNAMEPREFIX}wheel>=0:${PORTSDIR}/devel/py-wheel \
-		${PYTHON_PKGNAMEPREFIX}twine>=0:${PORTSDIR}/devel/py-twine \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:${PORTSDIR}/devel/py-setuptools_scm \
-		${PYTHON_PKGNAMEPREFIX}south>=0:${PORTSDIR}/databases/py-south
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \
+		${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist \
+		${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel \
+		${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm \
+		${PYTHON_PKGNAMEPREFIX}south>=0:databases/py-south
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/devel/py-pytest-localserver/Makefile b/devel/py-pytest-localserver/Makefile
index a3b81a0f05c3..089f82d0e3a6 100644
--- a/devel/py-pytest-localserver/Makefile
+++ b/devel/py-pytest-localserver/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Py.test Plugin to test server connections locally
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:${PORTSDIR}/www/py-werkzeug
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytest-runner/Makefile b/devel/py-pytest-runner/Makefile
index 790c4b2111dc..5594148e95b9 100644
--- a/devel/py-pytest-runner/Makefile
+++ b/devel/py-pytest-runner/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Test support for pytest runner in setup.py
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>=0:${PORTSDIR}/devel/py-hgtools
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>=0:devel/py-hgtools
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pytest-timeout/Makefile b/devel/py-pytest-timeout/Makefile
index 872b781acbb1..1aea318ea13f 100644
--- a/devel/py-pytest-timeout/Makefile
+++ b/devel/py-pytest-timeout/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pytest plugin to abort hanging tests
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:devel/py-pytest
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile
index 5f170dea02fb..8133b2efeddf 100644
--- a/devel/py-pytest-xdist/Makefile
+++ b/devel/py-pytest-xdist/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Py.test plugin for distributed testing and loop-on-failing modes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:${PORTSDIR}/devel/py-setuptools_scm
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}execnet>=1.1:${PORTSDIR}/sysutils/py-execnet \
-		${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.22:${PORTSDIR}/devel/py-py
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-pytest/Makefile b/devel/py-pytest/Makefile
index 6e0ad168946b..98f5d2d89add 100644
--- a/devel/py-pytest/Makefile
+++ b/devel/py-pytest/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Simple powerful testing with Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.29:${PORTSDIR}/devel/py-py
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:${PORTSDIR}/devel/py-pytest-xdist
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py>=1.4.29:devel/py-py
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-python-bugzilla/Makefile b/devel/py-python-bugzilla/Makefile
index 45457199bef4..b731239127f6 100644
--- a/devel/py-python-bugzilla/Makefile
+++ b/devel/py-python-bugzilla/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bugzilla XMLRPC access module
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-python-jenkins/Makefile b/devel/py-python-jenkins/Makefile
index ae55385f733c..2f6c20fc744c 100644
--- a/devel/py-python-jenkins/Makefile
+++ b/devel/py-python-jenkins/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python bindings for the remote Jenkins API
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:${PORTSDIR}/devel/py-pbr \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-python-pcre/Makefile b/devel/py-python-pcre/Makefile
index 59acafafe84a..a5f7f8515a20 100644
--- a/devel/py-python-pcre/Makefile
+++ b/devel/py-python-pcre/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python PCRE bindings
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pcre>=6.0:${PORTSDIR}/devel/pcre
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	pcre>=6.0:devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pytools/Makefile b/devel/py-pytools/Makefile
index e374851b8bb0..fead676c4a91 100644
--- a/devel/py-pytools/Makefile
+++ b/devel/py-pytools/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Collection of tools for Python
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:${PORTSDIR}/devel/py-appdirs \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \
+		${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 5a019c3f883c..7506e0940044 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Collection of mature utilities for Python programmers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:${PORTSDIR}/converters/zbase32
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:converters/zbase32
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-pyvisa-py/Makefile b/devel/py-pyvisa-py/Makefile
index ebfabd1219b8..79bd82d67a47 100644
--- a/devel/py-pyvisa-py/Makefile
+++ b/devel/py-pyvisa-py/Makefile
@@ -19,9 +19,9 @@ DRIVERS_DESC=	Additional modules
 OPTIONS_GROUP_DRIVERS=	SERIAL USB
 
 SERIAL_DESC=		Access to devices via RS-232
-SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial
+SERIAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial
 
 USB_DESC=		Access to devices via USB
-USB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>0:${PORTSDIR}/devel/py-usb
+USB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb
 
 .include <bsd.port.mk>
diff --git a/devel/py-pyvisa/Makefile b/devel/py-pyvisa/Makefile
index 77cb31972269..0ab779d0d42e 100644
--- a/devel/py-pyvisa/Makefile
+++ b/devel/py-pyvisa/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Python VISA bindings for GPIB, RS232, and USB instruments
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:${PORTSDIR}/devel/py-pyvisa-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:devel/py-pyvisa-py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hgrecco
@@ -19,7 +19,7 @@ USE_PYTHON=	autoplist concurrent distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt4-assistant/Makefile b/devel/py-qt4-assistant/Makefile
index 144fc86a3497..22451a5bf90f 100644
--- a/devel/py-qt4-assistant/Makefile
+++ b/devel/py-qt4-assistant/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtAssistant 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/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index 7a7b64ceb255..dc85de1c1ef3 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtCore 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.pre.mk>
diff --git a/devel/py-qt4-dbus/Makefile b/devel/py-qt4-dbus/Makefile
index d484f836ff82..293ddcf7407b 100644
--- a/devel/py-qt4-dbus/Makefile
+++ b/devel/py-qt4-dbus/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDBus 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/devel/py-qt4-dbussupport/Makefile b/devel/py-qt4-dbussupport/Makefile
index 0988077c9903..102b057aac9d 100644
--- a/devel/py-qt4-dbussupport/Makefile
+++ b/devel/py-qt4-dbussupport/Makefile
@@ -28,9 +28,9 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus
 .elif ${PYTHON_MAJOR_VER} == 3
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py3-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt4-declarative/Makefile b/devel/py-qt4-declarative/Makefile
index 1e91da6deed0..4570088ef23b 100644
--- a/devel/py-qt4-declarative/Makefile
+++ b/devel/py-qt4-declarative/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDeclarative 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/devel/py-qt4-designer/Makefile b/devel/py-qt4-designer/Makefile
index 6042dc1f0ed7..3ddb7b1f9ddd 100644
--- a/devel/py-qt4-designer/Makefile
+++ b/devel/py-qt4-designer/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDesigner 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/devel/py-qt4-help/Makefile b/devel/py-qt4-help/Makefile
index 4cfa3f87542c..306cfdc90ba8 100644
--- a/devel/py-qt4-help/Makefile
+++ b/devel/py-qt4-help/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtHelp 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/devel/py-qt4-qscintilla2/Makefile b/devel/py-qt4-qscintilla2/Makefile
index 8e3b0aed1bea..91affa7b776f 100644
--- a/devel/py-qt4-qscintilla2/Makefile
+++ b/devel/py-qt4-qscintilla2/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt4), QSci module
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 DESTDIRNAME=	INSTALL_ROOT
diff --git a/devel/py-qt4-script/Makefile b/devel/py-qt4-script/Makefile
index 356af8fe1c2b..6b14fba9774c 100644
--- a/devel/py-qt4-script/Makefile
+++ b/devel/py-qt4-script/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtScript 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/devel/py-qt4-scripttools/Makefile b/devel/py-qt4-scripttools/Makefile
index a17efdc970e6..b9cd16dc014f 100644
--- a/devel/py-qt4-scripttools/Makefile
+++ b/devel/py-qt4-scripttools/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtScriptTools 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/devel/py-qt4-test/Makefile b/devel/py-qt4-test/Makefile
index 4b0986a6fff8..d84981c26f89 100644
--- a/devel/py-qt4-test/Makefile
+++ b/devel/py-qt4-test/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtTest 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/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index 2fed8e4f2326..14ee561a9785 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtCore 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
 
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 98fabb912feb..96038d60cb24 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDBus 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/devel/py-qt5-dbussupport/Makefile b/devel/py-qt5-dbussupport/Makefile
index 893a1a05b491..d3442d8b5546 100644
--- a/devel/py-qt5-dbussupport/Makefile
+++ b/devel/py-qt5-dbussupport/Makefile
@@ -27,9 +27,9 @@ PLIST_FILES=	%%PYTHON_SITELIBDIR%%/dbus/mainloop/pyqt5.so
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus
 .elif ${PYTHON_MAJOR_VER} == 3
-PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py3-dbus
+PYDBUS=		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index f145d8d0975e..4ebc921d1b3b 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtDesigner 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/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index d37ee592c62d..b729f15da718 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python bindings for QScintilla2 (PyQt5), QSci module
 
-LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
 DESTDIRNAME=	INSTALL_ROOT
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index d391b9701804..17f319b33e17 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtTest 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/devel/py-rauth/Makefile b/devel/py-rauth/Makefile
index 463d5ec8c2e4..4370fb4bdaa5 100644
--- a/devel/py-rauth/Makefile
+++ b/devel/py-rauth/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Python library for OAuth 1.0/a, 2.0, and Ofly consumers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-rednose/Makefile b/devel/py-rednose/Makefile
index 494db5cab80f..f5e01d24c7c1 100644
--- a/devel/py-rednose/Makefile
+++ b/devel/py-rednose/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Coloured output for nosetests
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:${PORTSDIR}/devel/py-colorama \
-		${PYTHON_PKGNAMEPREFIX}termstyle>0:${PORTSDIR}/devel/py-termstyle
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama \
+		${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-repoze.tm2/Makefile b/devel/py-repoze.tm2/Makefile
index 785b5b71b77a..357acd3392eb 100644
--- a/devel/py-repoze.tm2/Makefile
+++ b/devel/py-repoze.tm2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Zope-like transaction manager via WSGI middleware
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=1.0.0:${PORTSDIR}/devel/py-transaction
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=1.0.0:devel/py-transaction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.what-pylons/Makefile b/devel/py-repoze.what-pylons/Makefile
index 9bd9dccb4fce..d58e1f272dc0 100644
--- a/devel/py-repoze.what-pylons/Makefile
+++ b/devel/py-repoze.what-pylons/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	The repoze.what v1 plugin for Pylons/TG2 integration
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:${PORTSDIR}/www/py-pylons \
-		${PYTHON_PKGNAMEPREFIX}repoze.what>=0:${PORTSDIR}/devel/py-repoze.what \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons \
+		${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.what/Makefile b/devel/py-repoze.what/Makefile
index 5fcc63f6700a..ede04a546eba 100644
--- a/devel/py-repoze.what/Makefile
+++ b/devel/py-repoze.what/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Authorization for WSGI applications
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:${PORTSDIR}/devel/py-repoze.who-testutil
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.who-friendlyform/Makefile b/devel/py-repoze.who-friendlyform/Makefile
index 64ea1eec8a0c..86c18bd1f85e 100644
--- a/devel/py-repoze.who-friendlyform/Makefile
+++ b/devel/py-repoze.who-friendlyform/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Collection of developer-friendly for repoze.who-powered
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}coverage>=0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-repoze.who-testutil/Makefile b/devel/py-repoze.who-testutil/Makefile
index f27812ce4c12..6ef32c5add4c 100644
--- a/devel/py-repoze.who-testutil/Makefile
+++ b/devel/py-repoze.who-testutil/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Test utilities for repoze.who-powered applications
 
 LICENSE=	BSD4CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:${PORTSDIR}/devel/py-repoze.who \
-		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:${PORTSDIR}/www/py-pastedeploy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who \
+		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.who/Makefile b/devel/py-repoze.who/Makefile
index 782730bf655c..32b0a9eae730 100644
--- a/devel/py-repoze.who/Makefile
+++ b/devel/py-repoze.who/Makefile
@@ -16,8 +16,8 @@ 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}webob>=0:${PORTSDIR}/www/py-webob \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-repoze.xmliter/Makefile b/devel/py-repoze.xmliter/Makefile
index 74dc817dd21d..e0fbd9775dad 100644
--- a/devel/py-repoze.xmliter/Makefile
+++ b/devel/py-repoze.xmliter/Makefile
@@ -14,8 +14,8 @@ LICENSE_NAME=	Repoze License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}future>0:${PORTSDIR}/devel/py-future
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-responses/Makefile b/devel/py-responses/Makefile
index 45f3cc03a8b7..4dc94779d389 100644
--- a/devel/py-responses/Makefile
+++ b/devel/py-responses/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Utility library for mocking out the requests Python library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.0.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}cookies>0:${PORTSDIR}/www/py-cookies
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.0.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}cookies>0:www/py-cookies
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-riak_pb/Makefile b/devel/py-riak_pb/Makefile
index ac80b85b9c85..78d722f49b5e 100644
--- a/devel/py-riak_pb/Makefile
+++ b/devel/py-riak_pb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Riak Protocol Buffers Messages
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:${PORTSDIR}/devel/py-protobuf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-robotframework-pabot/Makefile b/devel/py-robotframework-pabot/Makefile
index 4e6a84f5ed4f..c0f4943f0a28 100644
--- a/devel/py-robotframework-pabot/Makefile
+++ b/devel/py-robotframework-pabot/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Parallel executor for Robot Framework test cases
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
-		${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:${PORTSDIR}/devel/py-robotremoteserver
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \
+		${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver
 
 NO_ARCH=	yes
 USES=		python:-2.7
diff --git a/devel/py-robotframework-ride/Makefile b/devel/py-robotframework-ride/Makefile
index 8a5ef4ecf2b4..1301651e892c 100644
--- a/devel/py-robotframework-ride/Makefile
+++ b/devel/py-robotframework-ride/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Test data editor for Robot Framework
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
-		${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:${PORTSDIR}/devel/py-robotframework-selenium2library \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \
+		${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments
 
 NO_ARCH=	yes
 USES=		python:-2.7
diff --git a/devel/py-robotframework-selenium2library/Makefile b/devel/py-robotframework-selenium2library/Makefile
index 323918970470..1a9e6f812226 100644
--- a/devel/py-robotframework-selenium2library/Makefile
+++ b/devel/py-robotframework-selenium2library/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Web testing library for Robot Framework
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \
+		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-robotremoteserver/Makefile b/devel/py-robotremoteserver/Makefile
index 9ffa2926c48c..1fd851b458d3 100644
--- a/devel/py-robotremoteserver/Makefile
+++ b/devel/py-robotremoteserver/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python Remote Server for Robot Framework
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-roxlib/Makefile b/devel/py-roxlib/Makefile
index c93c372462bc..c34983ef3eed 100644
--- a/devel/py-roxlib/Makefile
+++ b/devel/py-roxlib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python libraries for ROX
 USES=		python tar:bzip2
 USE_GNOME=	pygtk2:run
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/devel/py-rq/Makefile b/devel/py-rq/Makefile
index 007d6b0d0f4e..6bc663125fe5 100644
--- a/devel/py-rq/Makefile
+++ b/devel/py-rq/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple library for creating background jobs, and processing them
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.7:${PORTSDIR}/databases/py-redis \
-		${PYTHON_PKGNAMEPREFIX}click>=4.1:${PORTSDIR}/devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis \
+		${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-rtree/Makefile b/devel/py-rtree/Makefile
index 1c4cb143f06b..f56d7264d815 100644
--- a/devel/py-rtree/Makefile
+++ b/devel/py-rtree/Makefile
@@ -13,7 +13,7 @@ COMMENT=	R-Tree Spatial Index For Python GIS
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS+=	${LOCALBASE}/include/spatialindex/SpatialIndex.h:${PORTSDIR}/devel/spatialindex
+BUILD_DEPENDS+=	${LOCALBASE}/include/spatialindex/SpatialIndex.h:devel/spatialindex
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index 3c78d6343626..a658f68fe960 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Rule-based Dispatching and Generic Functions
 LICENSE=	PSFL ZPL21
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:${PORTSDIR}/devel/py-extremes \
-		${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:${PORTSDIR}/devel/py-protocols-devel
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:devel/py-extremes \
+		${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:devel/py-protocols-devel
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-sanetime/Makefile b/devel/py-sanetime/Makefile
index b07db677ea6b..00912658aa9e 100644
--- a/devel/py-sanetime/Makefile
+++ b/devel/py-sanetime/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Sane date/time Python interface, with Django support
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2010:${PORTSDIR}/devel/py-pytz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2:devel/py-unittest2
 
 OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	Include tools for unit tests
diff --git a/devel/py-scripttest/Makefile b/devel/py-scripttest/Makefile
index 9fe6d09ec225..ef3cfa8380d9 100644
--- a/devel/py-scripttest/Makefile
+++ b/devel/py-scripttest/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Helper to test command-line scripts
 
 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/devel/py-selection/Makefile b/devel/py-selection/Makefile
index e227b88bbc29..80d135ab9b94 100644
--- a/devel/py-selection/Makefile
+++ b/devel/py-selection/Makefile
@@ -11,9 +11,9 @@ COMMENT=	API to extract content from HTML & XML documents
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}weblib>0:${PORTSDIR}/devel/py-weblib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-semantic_version/Makefile b/devel/py-semantic_version/Makefile
index f9470dbb8fd7..5d60ff846b27 100644
--- a/devel/py-semantic_version/Makefile
+++ b/devel/py-semantic_version/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python library provides a few tools to handle SemVer in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:${PORTSDIR}/www/py-django18
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18
 
 OPTIONS_DEFINE=	TESTS
 
diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 1e9cd7ab9234..4559a07ecc18 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -32,9 +32,9 @@ SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
 
 # These create dependency loops in redports/poudriere, because setuptools
 # is currently an explicit BUILD & RUN dependency in Uses/python.mk.
-#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+#TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 #.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-install:
diff --git a/devel/py-setuptools_darcs/Makefile b/devel/py-setuptools_darcs/Makefile
index 1ab0ec40e00d..6fe67b2ab5d3 100644
--- a/devel/py-setuptools_darcs/Makefile
+++ b/devel/py-setuptools_darcs/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Setuptools plugin for darcs
 
-BUILD_DEPENDS=		darcsver:${PORTSDIR}/devel/py-darcsver
+BUILD_DEPENDS=		darcsver:devel/py-darcsver
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile
index c6ce3ce00977..6cc58efb4a1e 100644
--- a/devel/py-shapely/Makefile
+++ b/devel/py-shapely/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python Package for Manipulation 2D Geospatial Geometry
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos
+LIB_DEPENDS=	libgeos_c.so:graphics/geos
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile
index e3a353a09d0c..c64589d4e566 100644
--- a/devel/py-simpy/Makefile
+++ b/devel/py-simpy/Makefile
@@ -21,7 +21,7 @@ TKINTER_DESC=	py-tkinter for plot
 
 PORTDOCS=	*
 
-TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/py-six/Makefile b/devel/py-six/Makefile
index f5d410dc691a..05108f2f6b3d 100644
--- a/devel/py-six/Makefile
+++ b/devel/py-six/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python 2 and 3 compatibility utilities
 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
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-snack/Makefile b/devel/py-snack/Makefile
index 91b68dc1fdd8..7b1c8665a649 100644
--- a/devel/py-snack/Makefile
+++ b/devel/py-snack/Makefile
@@ -14,9 +14,9 @@ LICENSE=	GPLv2
 
 BROKEN=		conflicts with devel/newt
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libnewt.so:${PORTSDIR}/devel/newt
+LIB_DEPENDS=	libslang.so:devel/libslang2 \
+		libpopt.so:devel/popt \
+		libnewt.so:devel/newt
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/py-snackwich/Makefile b/devel/py-snackwich/Makefile
index f95832e2c8a4..6f727525bab8 100644
--- a/devel/py-snackwich/Makefile
+++ b/devel/py-snackwich/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Configuration-based Console UI Framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snack>0:${PORTSDIR}/devel/py-snack
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snack>0:devel/py-snack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile
index e2b10a4e1095..7947e1efb857 100644
--- a/devel/py-spyder/Makefile
+++ b/devel/py-spyder/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Scientific PYthon Development EnviRonment, an alternative to IDLE
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
+		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
+		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network
 
 USES=		desktop-file-utils python
 USE_PYTHON=	autoplist distutils
@@ -48,22 +48,22 @@ SCIPY_DESC=	Signal/image processing
 SPHINX_DESC=	Rich text help on the Object Inspector
 SYMPY_DESC=	Symbolic mathematics in the IPython Console
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:${PORTSDIR}/textproc/py-sphinx
-IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=1.0:${PORTSDIR}/devel/ipython \
-	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:${PORTSDIR}/net/py-pyzmq
-JEDI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:${PORTSDIR}/devel/py-jedi
-MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:${PORTSDIR}/math/py-matplotlib
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx
+IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython \
+	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq
+JEDI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:devel/py-jedi
+MATPLOT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib
 NUMPY_RUN_DEPENDS=	${PYNUMPY}
-PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:${PORTSDIR}/math/py-pandas
-PEP8_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=0.6:${PORTSDIR}/devel/pep8
-PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:${PORTSDIR}/sysutils/py-psutil
-PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:${PORTSDIR}/devel/py-pyflakes
-PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments
-PYLINT_RUN_DEPENDS=	pylint${PYTHON_PKGNAMESUFFIX}>=0.25:${PORTSDIR}/devel/pylint
-ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:${PORTSDIR}/devel/py-rope
-SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
+PANDAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas
+PEP8_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8
+PSUTIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil
+PYFLAKES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes
+PYGMENTS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments
+PYLINT_RUN_DEPENDS=	pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint
+ROPE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope
+SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy
 SPHINX_RUN_DEPENDS=	${DOCS_BUILD_DEPENDS}
-SYMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:${PORTSDIR}/math/py-sympy
+SYMPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|'linux'|'${OPSYS:tl}'|" \
diff --git a/devel/py-sqlcc/Makefile b/devel/py-sqlcc/Makefile
index 884ea84869da..d7c2cdf357a3 100644
--- a/devel/py-sqlcc/Makefile
+++ b/devel/py-sqlcc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python SQL Command Composer
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pythk>=0:${PORTSDIR}/devel/pythk
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-statgrab/Makefile b/devel/py-statgrab/Makefile
index 8af0235f87de..87810e68a88a 100644
--- a/devel/py-statgrab/Makefile
+++ b/devel/py-statgrab/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Set of Python bindings for libstatgrab
 
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 USES=		pkgconfig python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 8e5cffc427d1..5dbeeab32186 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Manage dynamic plugins for Python applications
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.3.0:${PORTSDIR}/devel/py-pbr # <2.0
-RUN_DEPENDS=	${PKGNAMEPREFIX}argparse>=1.2.1:${PORTSDIR}/devel/py-argparse \
-		${PKGNAMEPREFIX}pbr>=1.3.0:${PORTSDIR}/devel/py-pbr \
-		${PKGNAMEPREFIX}six>=1.9.0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PKGNAMEPREFIX}pbr>=1.3.0:devel/py-pbr # <2.0
+RUN_DEPENDS=	${PKGNAMEPREFIX}argparse>=1.2.1:devel/py-argparse \
+		${PKGNAMEPREFIX}pbr>=1.3.0:devel/py-pbr \
+		${PKGNAMEPREFIX}six>=1.9.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-stsci.distutils/Makefile b/devel/py-stsci.distutils/Makefile
index 7ce846e5d65d..4a32abf121f6 100644
--- a/devel/py-stsci.distutils/Makefile
+++ b/devel/py-stsci.distutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Packaging utilities used by some of STScI's packages
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}d2to1>0:${PORTSDIR}/devel/py-d2to1
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index c04496d9d630..9159f5db1a3b 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for subversion
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+BUILD_DEPENDS+=	svn:devel/subversion
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		python
diff --git a/devel/py-sure/Makefile b/devel/py-sure/Makefile
index c5211103675a..a4c88430cd35 100644
--- a/devel/py-sure/Makefile
+++ b/devel/py-sure/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utility belt for automated testing in Python for Python
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python:2.7
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index 87b5501ff234..514243531649 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Hierarchical database for Python
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \
-		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:${PORTSDIR}/math/py-numexpr
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libucl.so:${PORTSDIR}/archivers/ucl
+		${LOCALBASE}/bin/cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+		liblzo2.so:archivers/lzo2 \
+		libucl.so:archivers/ucl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python
@@ -27,7 +27,7 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		PYREX EXAMPLES
 PYREX_DESC=		Use code generated by Pyrex to build
-PYREX_BUILD_DEPENDS=	pyrex>0:${PORTSDIR}/devel/pyrex
+PYREX_BUILD_DEPENDS=	pyrex>0:devel/pyrex
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py
diff --git a/devel/py-tarantool-queue/Makefile b/devel/py-tarantool-queue/Makefile
index 982ba1ba6294..40f70e940e8f 100644
--- a/devel/py-tarantool-queue/Makefile
+++ b/devel/py-tarantool-queue/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python bindings for Tarantool queue
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tarantool>=0:${PORTSDIR}/databases/py-tarantool \
-		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:${PORTSDIR}/devel/py-msgpack-python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tempora/Makefile b/devel/py-tempora/Makefile
index 90fde28d4d34..fa66723f6beb 100644
--- a/devel/py-tempora/Makefile
+++ b/devel/py-tempora/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Objects and routines pertaining to date and time
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tempstorage/Makefile b/devel/py-tempstorage/Makefile
index 012b60aaa966..a535fc2b1362 100644
--- a/devel/py-tempstorage/Makefile
+++ b/devel/py-tempstorage/Makefile
@@ -13,8 +13,8 @@ COMMENT=	RAM-based storage for ZODB
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-testtools/Makefile b/devel/py-testtools/Makefile
index dac5912590d2..190329401f04 100644
--- a/devel/py-testtools/Makefile
+++ b/devel/py-testtools/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Extensions to the Python library's unit testing framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:${PORTSDIR}/devel/py-extras
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:devel/py-extras
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/py-tinyarray/Makefile b/devel/py-tinyarray/Makefile
index eca2cb09ac64..e224be966e55 100644
--- a/devel/py-tinyarray/Makefile
+++ b/devel/py-tinyarray/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Arrays of numbers for Python, optimized for small sizes
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tox/Makefile b/devel/py-tox/Makefile
index cd6697ab330f..dd20fd6f06fb 100644
--- a/devel/py-tox/Makefile
+++ b/devel/py-tox/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Virtualenv-based automation of test activities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:${PORTSDIR}/devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:${PORTSDIR}/devel/py-py \
-		${PYTHON_PKGNAMEPREFIX}pluggy>0:${PORTSDIR}/devel/py-pluggy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv \
+		${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py \
+		${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:${PORTSDIR}/devel/py-tox \
-		${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-timeout
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
@@ -29,7 +29,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != 2.7 && ${PYTHON_VER} < 3.2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse
 .endif
 
 do-test:
diff --git a/devel/py-transaction/Makefile b/devel/py-transaction/Makefile
index 8e9d0c3816f9..3954fa44c953 100644
--- a/devel/py-transaction/Makefile
+++ b/devel/py-transaction/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Transaction management for Python
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-trollius/Makefile b/devel/py-trollius/Makefile
index a22d8dcaa8c6..4730f7e49da6 100644
--- a/devel/py-trollius/Makefile
+++ b/devel/py-trollius/Makefile
@@ -20,10 +20,10 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>0:${PORTSDIR}/devel/py-futures
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 .if ${PYTHON_REL} < 3300
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 .endif
 
diff --git a/devel/py-turbocheetah/Makefile b/devel/py-turbocheetah/Makefile
index eea6658b798e..ded1fc1030f2 100644
--- a/devel/py-turbocheetah/Makefile
+++ b/devel/py-turbocheetah/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	TurboGears plugin to support use of Cheetah templates
 
-RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah
+RUN_DEPENDS=	cheetah:devel/py-cheetah
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-turbojson/Makefile b/devel/py-turbojson/Makefile
index 6f646d082480..fce3c3772050 100644
--- a/devel/py-turbojson/Makefile
+++ b/devel/py-turbojson/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Python template plugin for TurboGears that supports json
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:${PORTSDIR}/devel/py-PEAK-Rules
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:${PORTSDIR}/devel/py-PEAK-Rules
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:devel/py-PEAK-Rules
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0:devel/py-PEAK-Rules
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-turbojson11/Makefile b/devel/py-turbojson11/Makefile
index 560aeddbd3f5..6a24c5e349ff 100644
--- a/devel/py-turbojson11/Makefile
+++ b/devel/py-turbojson11/Makefile
@@ -13,9 +13,9 @@ PKGNAMESUFFIX=	11
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin for TurboGears that supports json
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}RuleDispatch>=0.5.a0.r2306:${PORTSDIR}/devel/py-ruledispatch \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}RuleDispatch>=0.5.a0.r2306:devel/py-ruledispatch \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-turbokid/Makefile b/devel/py-turbokid/Makefile
index 9e922b6c14df..f75de7707f3e 100644
--- a/devel/py-turbokid/Makefile
+++ b/devel/py-turbokid/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin that supports Kid templates
 
-RUN_DEPENDS=	kid:${PORTSDIR}/devel/py-kid
+RUN_DEPENDS=	kid:devel/py-kid
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tw.forms/Makefile b/devel/py-tw.forms/Makefile
index 0a0ec528ed2e..1667c1b5d7ab 100644
--- a/devel/py-tw.forms/Makefile
+++ b/devel/py-tw.forms/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Web Widgets for building and validating forms
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:${PORTSDIR}/devel/py-ToscaWidgets \
-		${PYTHON_PKGNAMEPREFIX}formencode>=0:${PORTSDIR}/www/py-formencode
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:${PORTSDIR}/devel/py-ToscaWidgets \
-		${PYTHON_PKGNAMEPREFIX}formencode>=0:${PORTSDIR}/www/py-formencode
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \
+		${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \
+		${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-twine/Makefile b/devel/py-twine/Makefile
index 0579a9ca64a3..61a00b4fbcf7 100644
--- a/devel/py-twine/Makefile
+++ b/devel/py-twine/Makefile
@@ -10,11 +10,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Collection of utilities for interacting with PyPI
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clint>=0:${PORTSDIR}/devel/py-clint \
-		${PYTHON_PKGNAMEPREFIX}pkginfo>=0:${PORTSDIR}/sysutils/py-pkginfo \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:${PORTSDIR}/www/py-requests-toolbelt \
-		${PYTHON_PKGNAMEPREFIX}setuptools27>=0:${PORTSDIR}/devel/py-setuptools27
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint \
+		${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt \
+		${PYTHON_PKGNAMEPREFIX}setuptools27>=0:devel/py-setuptools27
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index ae7672156594..25ded442669b 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Asynchronous networking framework written in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils
diff --git a/devel/py-twisted152/Makefile b/devel/py-twisted152/Makefile
index f41695780156..ef8f5e9b97e0 100644
--- a/devel/py-twisted152/Makefile
+++ b/devel/py-twisted152/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Metaport of Twisted, an event-driven networking engine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedCore
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:devel/py-twistedCore
 
 USES=		metaport python:2
 
@@ -27,14 +27,14 @@ PAIR_DESC=	Twisted Pair can do low level TCP work
 RUNNER_DESC=	Process management
 WEB_DESC=	HTTP protocol
 WORDS_DESC=	Chat and Instant Messaging
-CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:${PORTSDIR}/security/py-twistedConch
-LORE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:${PORTSDIR}/textproc/py-twistedLore
-MAIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:${PORTSDIR}/mail/py-twistedMail
-NAMES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:${PORTSDIR}/dns/py-twistedNames
-NEWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:${PORTSDIR}/news/py-twistedNews
-PAIR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:${PORTSDIR}/net/py-twistedPair
-RUNNER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:${PORTSDIR}/devel/py-twistedRunner
-WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:${PORTSDIR}/www/py-twistedWeb
-WORDS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:${PORTSDIR}/net-im/py-twistedWords
+CONCH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:security/py-twistedConch
+LORE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:textproc/py-twistedLore
+MAIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:mail/py-twistedMail
+NAMES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:dns/py-twistedNames
+NEWS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:news/py-twistedNews
+PAIR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:net/py-twistedPair
+RUNNER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:devel/py-twistedRunner
+WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:www/py-twistedWeb
+WORDS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:net-im/py-twistedWords
 
 .include <bsd.port.mk>
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 5bf63f2ac709..0ef7ac821b57 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Asynchronous networking framework for Python (Core Module)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	VERIFY
 OPTIONS_DEFAULT=VERIFY
 
 VERIFY_DESC=		Server (SNI) and Service Verification Support (RFC6125+)
-VERIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}service_identity>=0:${PORTSDIR}/security/py-service_identity
+VERIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity
 
 # - Note that Twisted ships with some graphical examples and clients that
 #   require PyGNOME to run.  These are not central to the functioning of
diff --git a/devel/py-txaio/Makefile b/devel/py-txaio/Makefile
index 036885225b76..ea7e4e536b20 100644
--- a/devel/py-txaio/Makefile
+++ b/devel/py-txaio/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Compatibility API between asyncio/Twisted/Trollius
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-tzlocal/Makefile b/devel/py-tzlocal/Makefile
index a296b80c6c3c..9a3a75467651 100644
--- a/devel/py-tzlocal/Makefile
+++ b/devel/py-tzlocal/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Returns the tzinfo object for the local timezone
 
 LICENSE=	CC0-1.0
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 OPTIONS_DEFINE=		TEST
 OPTIONS_DEFAULT=	TEST
diff --git a/devel/py-ua_parser/Makefile b/devel/py-ua_parser/Makefile
index 9d5ae2a068d9..3c07bc6c20f8 100644
--- a/devel/py-ua_parser/Makefile
+++ b/devel/py-ua_parser/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python port of Browserscope's user agent parser
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
-RUN_DEPENDS=	${LOCALBASE}/share/ua_parser/regexes.yaml:${PORTSDIR}/devel/ua_parser-core \
-		${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml
+RUN_DEPENDS=	${LOCALBASE}/share/ua_parser/regexes.yaml:devel/ua_parser-core \
+		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile
index 48fea587130b..94120a9c69d8 100644
--- a/devel/py-unittest2/Makefile
+++ b/devel/py-unittest2/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	New features in unittest backported to Python 2.4+
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/devel/py-unpaddedbase64/Makefile b/devel/py-unpaddedbase64/Makefile
index 372f05236299..ed4920e99217 100644
--- a/devel/py-unpaddedbase64/Makefile
+++ b/devel/py-unpaddedbase64/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unpadded Base64
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-update_checker/Makefile b/devel/py-update_checker/Makefile
index dc002f4f5200..52a2095186cc 100644
--- a/devel/py-update_checker/Makefile
+++ b/devel/py-update_checker/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module that will check for package updates
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-urwidtrees/Makefile b/devel/py-urwidtrees/Makefile
index a4c436241a32..dfa14e502fb0 100644
--- a/devel/py-urwidtrees/Makefile
+++ b/devel/py-urwidtrees/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Tree widgets for py-urwid
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:${PORTSDIR}/devel/py-urwid
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:${PORTSDIR}/devel/py-urwid
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pazz
diff --git a/devel/py-user_agents/Makefile b/devel/py-user_agents/Makefile
index a1560380f666..97604073b486 100644
--- a/devel/py-user_agents/Makefile
+++ b/devel/py-user_agents/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:S/_/-/}-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Python library to identify devices using User-Agent string
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ua_parser/__init__.py:${PORTSDIR}/devel/py-ua_parser
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile
index 7852f010e9ea..bf482afc0850 100644
--- a/devel/py-vcrpy/Makefile
+++ b/devel/py-vcrpy/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Automatically mock HTTP interactions to simplify and speed up testing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}wrapt>0:${PORTSDIR}/devel/py-wrapt \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:${PORTSDIR}/devel/py-pytest-localserver
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -32,8 +32,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}contextlib2>0:${PORTSDIR}/devel/py-contextlib2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2
 .endif
 
 post-patch:
diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 7d3035d49794..dbe5d5495955 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Tool for creating isolated Python environments
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/devel/py-virtualenvwrapper/Makefile b/devel/py-virtualenvwrapper/Makefile
index 2ae8b1b84dd8..1864ebf9b284 100644
--- a/devel/py-virtualenvwrapper/Makefile
+++ b/devel/py-virtualenvwrapper/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Set of extensions to virtualenv
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:${PORTSDIR}/devel/py-pbr
-RUN_DEPENDS=	${PKGNAMEPREFIX}stevedore>0:${PORTSDIR}/devel/py-stevedore \
-		${PKGNAMEPREFIX}virtualenv>0:${PORTSDIR}/devel/py-virtualenv \
-		${PKGNAMEPREFIX}virtualenv-clone>0:${PORTSDIR}/devel/py-virtualenv-clone
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr
+RUN_DEPENDS=	${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \
+		${PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \
+		${PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:${PORTSDIR}/textproc/py-sphinxcontrib-bitbucket
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index ff9c1d6d3080..12af9e6b24a6 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Python API library to monitor file system events
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}argh>=0.24.1:${PORTSDIR}/devel/py-argh \
-		${PKGNAMEPREFIX}pathtools>=0.1.2:${PORTSDIR}/devel/py-pathtools \
-		${PKGNAMEPREFIX}yaml>=3.10:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PKGNAMEPREFIX}argh>=0.24.1:devel/py-argh \
+		${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \
+		${PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml
 
-DOCS_BUILD_DEPENDS=	${PKGNAMEPREFIX}pathtools>=0.1.2:${PORTSDIR}/devel/py-pathtools \
-		${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \
+		${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 GH_ACCOUNT=	gorakhargosh
diff --git a/devel/py-weblib/Makefile b/devel/py-weblib/Makefile
index 572cc103a08d..5086a8232794 100644
--- a/devel/py-weblib/Makefile
+++ b/devel/py-weblib/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Set of tools for web scraping projects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytils>0:${PORTSDIR}/russian/py-pytils \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}user_agent>0:${PORTSDIR}/www/py-user_agent
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile
index 5eed7f8e6e3a..f67e3bc5d230 100644
--- a/devel/py-wheel/Makefile
+++ b/devel/py-wheel/Makefile
@@ -16,12 +16,12 @@ LICENSE=	MIT
 OPTIONS_DEFINE=	PIP SIGNATURE
 
 PIP_DESC=	Use pip to install wheels
-PIP_RUN_DEPENDS=	pip:${PORTSDIR}/devel/py-pip
+PIP_RUN_DEPENDS=	pip:devel/py-pip
 
 SIGNATURE_DESC=	Enable digital signature of wheels
-SIGNATURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:${PORTSDIR}/devel/py-dirspec \
-			${PYTHON_PKGNAMEPREFIX}keyring>=1.3:${PORTSDIR}/security/py-keyring \
-			${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg
+SIGNATURE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec \
+			${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring \
+			${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-xattr/Makefile b/devel/py-xattr/Makefile
index f3fc2985c2ac..7cdfc4cb35cd 100644
--- a/devel/py-xattr/Makefile
+++ b/devel/py-xattr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python wrapper for extended filesystem attributes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/devel/py-xcaplib/Makefile b/devel/py-xcaplib/Makefile
index 8e2fa929f45f..e16752626c5b 100644
--- a/devel/py-xcaplib/Makefile
+++ b/devel/py-xcaplib/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Python XCAP client library
 LICENSE=	LGPL20 LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}application>=1.1.5:${PORTSDIR}/devel/py-application
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python twisted
diff --git a/devel/py-xmltodict/Makefile b/devel/py-xmltodict/Makefile
index 83008b75c3f5..0c0f4365d1d9 100644
--- a/devel/py-xmltodict/Makefile
+++ b/devel/py-xmltodict/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XML parser that returns python dictionaries
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index ddd3fec319e4..c642be0dcb76 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -33,7 +33,7 @@ PYDISTUTILS_SETUP+=		--with-libyaml
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS+=		--include-dirs=${LOCALBASE}/include \
 				--library-dirs=${LOCALBASE}/lib
-LIB_DEPENDS+=			libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS+=			libyaml.so:textproc/libyaml
 .else
 PYDISTUTILS_SETUP+=		--without-libyaml
 .endif
diff --git a/devel/py-yandex-money-sdk/Makefile b/devel/py-yandex-money-sdk/Makefile
index daa2f52e1d61..436ff2dffa15 100644
--- a/devel/py-yandex-money-sdk/Makefile
+++ b/devel/py-yandex-money-sdk/Makefile
@@ -11,9 +11,9 @@ COMMENT=	SDK yandex money API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.4.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}future>0:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-yum-metadata-parser/Makefile b/devel/py-yum-metadata-parser/Makefile
index 4eb7cb122b57..408ba3a925d0 100644
--- a/devel/py-yum-metadata-parser/Makefile
+++ b/devel/py-yum-metadata-parser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	afb@rpm5.org
 COMMENT=	Fast metadata parser for yum
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libsqlite3.so:databases/sqlite3 \
+		libglib-2.0.so:devel/glib20
 
 USES=		pkgconfig python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
index f23b27859f95..ff6e617fe6f3 100644
--- a/devel/py-z3c.autoinclude/Makefile
+++ b/devel/py-z3c.autoinclude/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Automatically include ZCML
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:${PORTSDIR}/devel/py-zc.buildout
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-z3c.batching/Makefile b/devel/py-z3c.batching/Makefile
index 045c4aa12bb6..bf87de645757 100644
--- a/devel/py-z3c.batching/Makefile
+++ b/devel/py-z3c.batching/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple sequence batching
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-z3c.caching/Makefile b/devel/py-z3c.caching/Makefile
index d0b24f907f6d..1194eca0c762 100644
--- a/devel/py-z3c.caching/Makefile
+++ b/devel/py-z3c.caching/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Caching infrastructure for web apps
 
 LICENSE=	ZPL21
 
-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.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-z3c.form/Makefile b/devel/py-z3c.form/Makefile
index f068cd7c47fb..aabbaece46a3 100644
--- a/devel/py-z3c.form/Makefile
+++ b/devel/py-z3c.form/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Advanced form and widget framework for Zope 3
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${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.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${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.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.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.site>0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${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.contentprovider>=0:devel/py-zope.contentprovider \
+		${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.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.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-z3c.formwidget.query/Makefile b/devel/py-z3c.formwidget.query/Makefile
index 2d8ddce742ef..62e46595caf0 100644
--- a/devel/py-z3c.formwidget.query/Makefile
+++ b/devel/py-z3c.formwidget.query/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Source query widget for z3c.form
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.form>=0:${PORTSDIR}/devel/py-z3c.form \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-z3c.zcmlhook/Makefile b/devel/py-z3c.zcmlhook/Makefile
index 9a55d461aa23..bf2f66e14d10 100644
--- a/devel/py-z3c.zcmlhook/Makefile
+++ b/devel/py-z3c.zcmlhook/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Easily hook into the ZCML processing machinery
 
 LICENSE=	ZPL21
 
-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.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.configuration>=0:devel/py-zope.configuration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zExceptions/Makefile b/devel/py-zExceptions/Makefile
index 501eba1b21ab..c058a561658b 100644
--- a/devel/py-zExceptions/Makefile
+++ b/devel/py-zExceptions/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Contains common exceptions used in Zope2
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zLOG/Makefile b/devel/py-zLOG/Makefile
index 6a3b3848e470..f6ea6e16ed71 100644
--- a/devel/py-zLOG/Makefile
+++ b/devel/py-zLOG/Makefile
@@ -13,7 +13,7 @@ COMMENT=	General logging facility
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:${PORTSDIR}/devel/py-zconfig
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/devel/py-zope.annotation/Makefile b/devel/py-zope.annotation/Makefile
index 78a20a8d155d..7cfcf43bccd4 100644
--- a/devel/py-zope.annotation/Makefile
+++ b/devel/py-zope.annotation/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Object annotation mechanism
 
 LICENSE=	ZPL21
 
-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.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.applicationcontrol/Makefile b/devel/py-zope.app.applicationcontrol/Makefile
index 4690757b2e54..eb832c0353cf 100644
--- a/devel/py-zope.app.applicationcontrol/Makefile
+++ b/devel/py-zope.app.applicationcontrol/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Zope application control
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.applicationcontrol \
-		${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.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \
+		${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.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.appsetup/Makefile b/devel/py-zope.app.appsetup/Makefile
index 57f5a739d7a7..e7f962bd3efa 100644
--- a/devel/py-zope.app.appsetup/Makefile
+++ b/devel/py-zope.app.appsetup/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Zope app setup helper
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.session>=0:${PORTSDIR}/security/py-zope.session \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.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.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.basicskin/Makefile b/devel/py-zope.app.basicskin/Makefile
index 1dcf999692d7..ea2aba0207ae 100644
--- a/devel/py-zope.app.basicskin/Makefile
+++ b/devel/py-zope.app.basicskin/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope ZMI Basic Skin
 
 LICENSE=	ZPL21
 
-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
+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
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.broken/Makefile b/devel/py-zope.app.broken/Makefile
index c6b12bab45c6..3efd2c5d3923 100644
--- a/devel/py-zope.app.broken/Makefile
+++ b/devel/py-zope.app.broken/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope Broken (ZODB) Object Support
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:${PORTSDIR}/devel/py-zope.broken \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.cache/Makefile b/devel/py-zope.app.cache/Makefile
index fd6135cb3c52..934cfb3839fd 100644
--- a/devel/py-zope.app.cache/Makefile
+++ b/devel/py-zope.app.cache/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Zope Caching Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:${PORTSDIR}/devel/py-zope.ramcache \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.component/Makefile b/devel/py-zope.app.component/Makefile
index 0e03164c396f..c55192ec4170 100644
--- a/devel/py-zope.app.component/Makefile
+++ b/devel/py-zope.app.component/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Local Zope Component Support
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:${PORTSDIR}/devel/py-zope.deprecation \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${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.publisher>=3.12.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.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${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.publisher>=3.12.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.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.container/Makefile b/devel/py-zope.app.container/Makefile
index 13695f66b300..f95520302c6d 100644
--- a/devel/py-zope.app.container/Makefile
+++ b/devel/py-zope.app.container/Makefile
@@ -13,24 +13,24 @@ COMMENT=	Zope Container
 
 LICENSE=	ZPL21
 
-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.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:${PORTSDIR}/devel/py-zope.copypastemove \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:${PORTSDIR}/devel/py-zope.dublincore \
-		${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.publisher>=3.12:${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.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher
+RUN_DEPENDS=	${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.copypastemove>=0:devel/py-zope.copypastemove \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore \
+		${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.publisher>=3.12: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.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.content/Makefile b/devel/py-zope.app.content/Makefile
index 3f864e0402ab..81cbd28ffe33 100644
--- a/devel/py-zope.app.content/Makefile
+++ b/devel/py-zope.app.content/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope Content Type
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \
+		${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
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.debug/Makefile b/devel/py-zope.app.debug/Makefile
index b8e6fc8b5264..e3c3bb5d5fa1 100644
--- a/devel/py-zope.app.debug/Makefile
+++ b/devel/py-zope.app.debug/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Zope Debug Mode
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.dependable/Makefile b/devel/py-zope.app.dependable/Makefile
index 3cf61e60e26e..1e6374b4d6be 100644
--- a/devel/py-zope.app.dependable/Makefile
+++ b/devel/py-zope.app.dependable/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Simple Dependency API
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${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.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${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.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.error/Makefile b/devel/py-zope.app.error/Makefile
index b9b344d03dd1..d5b98234e1f6 100644
--- a/devel/py-zope.app.error/Makefile
+++ b/devel/py-zope.app.error/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Error reporting utility management UI for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.exception/Makefile b/devel/py-zope.app.exception/Makefile
index c13e09308789..fbe4f8134cbf 100644
--- a/devel/py-zope.app.exception/Makefile
+++ b/devel/py-zope.app.exception/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope 3 exception views
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.folder/Makefile b/devel/py-zope.app.folder/Makefile
index 488b6d55a46c..94f45008688a 100644
--- a/devel/py-zope.app.folder/Makefile
+++ b/devel/py-zope.app.folder/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Folder Content Type for Zope 3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:${PORTSDIR}/devel/py-zope.app.content
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.form/Makefile b/devel/py-zope.app.form/Makefile
index dbfdd2244169..7a78fc72d7b7 100644
--- a/devel/py-zope.app.form/Makefile
+++ b/devel/py-zope.app.form/Makefile
@@ -13,21 +13,21 @@ COMMENT=	The Original Zope 3 Form Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.generations/Makefile b/devel/py-zope.app.generations/Makefile
index b8e13cf132de..1f00f8021cba 100644
--- a/devel/py-zope.app.generations/Makefile
+++ b/devel/py-zope.app.generations/Makefile
@@ -13,13 +13,13 @@ COMMENT=	ZMI UI for zope.generations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:${PORTSDIR}/devel/py-zope.app.renderer \
-		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.applicationcontrol \
-		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:${PORTSDIR}/devel/py-zope.generations \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer \
+		${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \
+		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.http/Makefile b/devel/py-zope.app.http/Makefile
index ccd44dadace2..f376df98f25f 100644
--- a/devel/py-zope.app.http/Makefile
+++ b/devel/py-zope.app.http/Makefile
@@ -13,10 +13,10 @@ COMMENT=	HTTP Behavior for the Zope Publisher
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:${PORTSDIR}/devel/py-zope.filerepresentation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.pagetemplate/Makefile b/devel/py-zope.app.pagetemplate/Makefile
index 93079e796027..6f136958b996 100644
--- a/devel/py-zope.app.pagetemplate/Makefile
+++ b/devel/py-zope.app.pagetemplate/Makefile
@@ -13,18 +13,18 @@ COMMENT=	PageTemplate integration for Zope 3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.publication/Makefile b/devel/py-zope.app.publication/Makefile
index eed93c45b44a..c2a89c68ddda 100644
--- a/devel/py-zope.app.publication/Makefile
+++ b/devel/py-zope.app.publication/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Zope publication
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.error>=0:${PORTSDIR}/devel/py-zope.error \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:${PORTSDIR}/devel/py-transaction
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.publisher/Makefile b/devel/py-zope.app.publisher/Makefile
index 65e308b2f988..9f3824eb8c34 100644
--- a/devel/py-zope.app.publisher/Makefile
+++ b/devel/py-zope.app.publisher/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Means for configuration of Zope 3 style views and resources
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${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.datetime>=0:${PORTSDIR}/devel/py-zope.datetime \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:${PORTSDIR}/devel/py-zope.ptresource \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${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.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary
+RUN_DEPENDS=	${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.datetime>=0:devel/py-zope.datetime \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12: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.componentvocabulary>=0:devel/py-zope.componentvocabulary
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.renderer/Makefile b/devel/py-zope.app.renderer/Makefile
index f641082e7f0f..0410ea86320f 100644
--- a/devel/py-zope.app.renderer/Makefile
+++ b/devel/py-zope.app.renderer/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Text Renderer Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.5:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}roman>=0:${PORTSDIR}/math/py-roman \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${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 \
-		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:${PORTSDIR}/textproc/py-zope.structuredtext
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${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 \
+		${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.rotterdam/Makefile b/devel/py-zope.app.rotterdam/Makefile
index 3bde5279b3fd..7cb933610d86 100644
--- a/devel/py-zope.app.rotterdam/Makefile
+++ b/devel/py-zope.app.rotterdam/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Zope 3 ZMI Skin
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:${PORTSDIR}/devel/py-zope.app.basicskin \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${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.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${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.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.schema/Makefile b/devel/py-zope.app.schema/Makefile
index ae6af56a82b5..0d16551462fd 100644
--- a/devel/py-zope.app.schema/Makefile
+++ b/devel/py-zope.app.schema/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Component Architecture based Vocabulary Registry
 
 LICENSE=	ZPL21
 
-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
+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
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.testing/Makefile b/devel/py-zope.app.testing/Makefile
index bdea14b5cde9..46d2701bab39 100644
--- a/devel/py-zope.app.testing/Makefile
+++ b/devel/py-zope.app.testing/Makefile
@@ -13,24 +13,24 @@ COMMENT=	Zope Application Testing Support
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:${PORTSDIR}/devel/py-zope.app.debug \
-		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:${PORTSDIR}/devel/py-zope.app.dependable \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=0:${PORTSDIR}/security/py-zope.password \
-		${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.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:${PORTSDIR}/devel/py-zope.testbrowser \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug \
+		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \
+		${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.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.zcmlfiles/Makefile b/devel/py-zope.app.zcmlfiles/Makefile
index d780e4ff9d31..6aed86432aee 100644
--- a/devel/py-zope.app.zcmlfiles/Makefile
+++ b/devel/py-zope.app.zcmlfiles/Makefile
@@ -13,42 +13,42 @@ COMMENT=	Zope application server ZCML files
 
 LICENSE=	ZPL21
 
-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.componentvocabulary>=0:${PORTSDIR}/devel/py-zope.componentvocabulary \
-		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:${PORTSDIR}/devel/py-zope.copypastemove \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.app.applicationcontrol \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:${PORTSDIR}/devel/py-zope.app.basicskin \
-		${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:${PORTSDIR}/devel/py-zope.app.broken \
-		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component \
-		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
-		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:${PORTSDIR}/devel/py-zope.app.content \
-		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:${PORTSDIR}/devel/py-zope.app.dependable \
-		${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:${PORTSDIR}/devel/py-zope.app.error \
-		${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:${PORTSDIR}/devel/py-zope.app.exception \
-		${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:${PORTSDIR}/devel/py-zope.app.folder \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:${PORTSDIR}/devel/py-zope.app.generations \
-		${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:${PORTSDIR}/devel/py-zope.app.http \
-		${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:${PORTSDIR}/textproc/py-zope.app.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:${PORTSDIR}/textproc/py-zope.app.locales \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:${PORTSDIR}/security/py-zope.app.principalannotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:${PORTSDIR}/devel/py-zope.app.publication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:${PORTSDIR}/devel/py-zope.app.rotterdam \
-		${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:${PORTSDIR}/devel/py-zope.app.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:${PORTSDIR}/security/py-zope.app.security \
-		${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:${PORTSDIR}/www/py-zope.app.wsgi \
-		${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:${PORTSDIR}/devel/py-zope.app.zopeappgenerations
+RUN_DEPENDS=	${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.copypastemove>=0:devel/py-zope.copypastemove \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \
+		${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken \
+		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \
+		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \
+		${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content \
+		${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \
+		${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error \
+		${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception \
+		${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations \
+		${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http \
+		${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam \
+		${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \
+		${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi \
+		${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.app.zopeappgenerations/Makefile b/devel/py-zope.app.zopeappgenerations/Makefile
index 64a1927a11dd..acfd2ff98553 100644
--- a/devel/py-zope.app.zopeappgenerations/Makefile
+++ b/devel/py-zope.app.zopeappgenerations/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Zope Application ZODB Update Generations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:${PORTSDIR}/security/py-zope.app.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component \
-		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:${PORTSDIR}/devel/py-zope.copypastemove \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:${PORTSDIR}/devel/py-zope.generations
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \
+		${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.applicationcontrol/Makefile b/devel/py-zope.applicationcontrol/Makefile
index fc6a499b1881..b5e87545b6a0 100644
--- a/devel/py-zope.applicationcontrol/Makefile
+++ b/devel/py-zope.applicationcontrol/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope applicationcontrol
 
 LICENSE=	ZPL21
 
-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.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
index 7d840d3e2dfc..a915fa0985da 100644
--- a/devel/py-zope.broken/Makefile
+++ b/devel/py-zope.broken/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zope Broken Object Interfaces
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.browser/Makefile b/devel/py-zope.browser/Makefile
index 49e8b69b2b7e..61f39ee1a12d 100644
--- a/devel/py-zope.browser/Makefile
+++ b/devel/py-zope.browser/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Shared Zope Toolkit browser components
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-zope.browsermenu/Makefile b/devel/py-zope.browsermenu/Makefile
index 33859ea2f8da..d4b6afd39c51 100644
--- a/devel/py-zope.browsermenu/Makefile
+++ b/devel/py-zope.browsermenu/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Browser menu implementation for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:${PORTSDIR}/devel/py-zope.pagetemplate
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.browserpage/Makefile b/devel/py-zope.browserpage/Makefile
index a9479619508d..92dad31eeb16 100644
--- a/devel/py-zope.browserpage/Makefile
+++ b/devel/py-zope.browserpage/Makefile
@@ -12,16 +12,16 @@ COMMENT=	ZCML directives for configuring browser views for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:${PORTSDIR}/devel/py-zope.browsermenu
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
index 421fe7656ef6..cb8e4d2ddc89 100644
--- a/devel/py-zope.browserresource/Makefile
+++ b/devel/py-zope.browserresource/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Browser resources implementation for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:${PORTSDIR}/devel/py-zope.contenttype \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.component/Makefile b/devel/py-zope.component/Makefile
index 352ebd8d34e5..9bf4fe36a274 100644
--- a/devel/py-zope.component/Makefile
+++ b/devel/py-zope.component/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Zope Component Architecture
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python
diff --git a/devel/py-zope.componentvocabulary/Makefile b/devel/py-zope.componentvocabulary/Makefile
index dcd593f4d334..44e5e11cccf1 100644
--- a/devel/py-zope.componentvocabulary/Makefile
+++ b/devel/py-zope.componentvocabulary/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope Component vocabularies
 
 LICENSE=	ZPL21
 
-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.security>=0:${PORTSDIR}/security/py-zope.security
+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.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.configuration/Makefile b/devel/py-zope.configuration/Makefile
index a5d77cbe0b67..46b56d944ce3 100644
--- a/devel/py-zope.configuration/Makefile
+++ b/devel/py-zope.configuration/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Zope Configuration Markup Language (ZCML)
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.container/Makefile b/devel/py-zope.container/Makefile
index 5afcee511614..a9856288b5a7 100644
--- a/devel/py-zope.container/Makefile
+++ b/devel/py-zope.container/Makefile
@@ -13,22 +13,22 @@ COMMENT=	Zope Container
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:${PORTSDIR}/devel/py-zope.dottedname \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:${PORTSDIR}/devel/py-zope.filerepresentation \
-		${PYTHON_PKGNAMEPREFIX}zope.size>=0:${PORTSDIR}/devel/py-zope.size \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:${PORTSDIR}/devel/py-zope.broken \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \
+		${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.contentprovider/Makefile b/devel/py-zope.contentprovider/Makefile
index 88984e1a0e84..3f676e8cc1ef 100644
--- a/devel/py-zope.contentprovider/Makefile
+++ b/devel/py-zope.contentprovider/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Content Provider Framework for Zope Templates
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.copy/Makefile b/devel/py-zope.copy/Makefile
index 6c8565a91b7a..dd31065afe5f 100644
--- a/devel/py-zope.copy/Makefile
+++ b/devel/py-zope.copy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pluggable object copying mechanism
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.copypastemove/Makefile b/devel/py-zope.copypastemove/Makefile
index c1e9b45c54fe..00afd8f66ee0 100644
--- a/devel/py-zope.copypastemove/Makefile
+++ b/devel/py-zope.copypastemove/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Copy, Paste, and Move support for content components
 
 LICENSE=	ZPL21
 
-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.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.copy>=0:${PORTSDIR}/devel/py-zope.copy \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${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
+RUN_DEPENDS=	${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.copy>=0:devel/py-zope.copy \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${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
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.deferredimport/Makefile b/devel/py-zope.deferredimport/Makefile
index cccb6a7c3e75..29d613c42d2b 100644
--- a/devel/py-zope.deferredimport/Makefile
+++ b/devel/py-zope.deferredimport/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Allows to import names that will be resolved when used in the code
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:${PORTSDIR}/net/py-zope.proxy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.dublincore/Makefile b/devel/py-zope.dublincore/Makefile
index f6e682c0fef6..be356f81f1a6 100644
--- a/devel/py-zope.dublincore/Makefile
+++ b/devel/py-zope.dublincore/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope Dublin Core implementation
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${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.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${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.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.error/Makefile b/devel/py-zope.error/Makefile
index 7c0afcb49144..9dd9a8ef83ed 100644
--- a/devel/py-zope.error/Makefile
+++ b/devel/py-zope.error/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Error reporting utility for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.exceptions/Makefile b/devel/py-zope.exceptions/Makefile
index 90722ad99a40..51042992f869 100644
--- a/devel/py-zope.exceptions/Makefile
+++ b/devel/py-zope.exceptions/Makefile
@@ -14,7 +14,7 @@ COMMENT=	General Zope Exceptions
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.filerepresentation/Makefile b/devel/py-zope.filerepresentation/Makefile
index 22dccef354f3..5b95fb891d72 100644
--- a/devel/py-zope.filerepresentation/Makefile
+++ b/devel/py-zope.filerepresentation/Makefile
@@ -13,8 +13,8 @@ COMMENT=	File-system Representation Interfaces
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.formlib/Makefile b/devel/py-zope.formlib/Makefile
index ce1a546876fa..49ecbe2fe7ef 100644
--- a/devel/py-zope.formlib/Makefile
+++ b/devel/py-zope.formlib/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Form generation and validation library for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${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.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:${PORTSDIR}/devel/py-zope.datetime
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${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.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.generations/Makefile b/devel/py-zope.generations/Makefile
index fe529d49fff5..18bc77c631de 100644
--- a/devel/py-zope.generations/Makefile
+++ b/devel/py-zope.generations/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope application schema generations
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${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.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime
+RUN_DEPENDS=	${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.processlifetime>=0:devel/py-zope.processlifetime
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.globalrequest/Makefile b/devel/py-zope.globalrequest/Makefile
index 37b89e21f8ce..64fd89e817fc 100644
--- a/devel/py-zope.globalrequest/Makefile
+++ b/devel/py-zope.globalrequest/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Global way of retrieving the currently active request
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-zope.i18n/Makefile b/devel/py-zope.i18n/Makefile
index fdfe7eb61ddb..9a1c31de880d 100644
--- a/devel/py-zope.i18n/Makefile
+++ b/devel/py-zope.i18n/Makefile
@@ -12,12 +12,12 @@ DIST_SUBDIR=	zope
 MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope Internationalization Support
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${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}zope.interface>=3.3.0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${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}zope.interface>=3.3.0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
 
 USES=		gettext python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-zope.lifecycleevent/Makefile b/devel/py-zope.lifecycleevent/Makefile
index eba20820681c..2a0815237007 100644
--- a/devel/py-zope.lifecycleevent/Makefile
+++ b/devel/py-zope.lifecycleevent/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Object life-cycle events
 
 LICENSE=	ZPL21
 
-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.event>=0:${PORTSDIR}/devel/py-zope.event
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.location/Makefile b/devel/py-zope.location/Makefile
index 9892814a7a00..cc76f43d8fbb 100644
--- a/devel/py-zope.location/Makefile
+++ b/devel/py-zope.location/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope Location
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:${PORTSDIR}/devel/py-zope.schema
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.minmax/Makefile b/devel/py-zope.minmax/Makefile
index ca1e0767142d..eb4de001cc65 100644
--- a/devel/py-zope.minmax/Makefile
+++ b/devel/py-zope.minmax/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Homogeneous values favoring maximum or minimum
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.pagetemplate/Makefile b/devel/py-zope.pagetemplate/Makefile
index 86c5c00d4e31..fe4ed2f62432 100644
--- a/devel/py-zope.pagetemplate/Makefile
+++ b/devel/py-zope.pagetemplate/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Zope Page Templates
 
 LICENSE=	ZPL21
 
-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.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:${PORTSDIR}/devel/py-zope.tales \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.processlifetime/Makefile b/devel/py-zope.processlifetime/Makefile
index bc9d7128f0d9..e497e4d74cd5 100644
--- a/devel/py-zope.processlifetime/Makefile
+++ b/devel/py-zope.processlifetime/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zope process lifetime events
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.ptresource/Makefile b/devel/py-zope.ptresource/Makefile
index 55c2a49d063b..3fe4a24a824a 100644
--- a/devel/py-zope.ptresource/Makefile
+++ b/devel/py-zope.ptresource/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Page template resource plugin for zope.browserresource
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:${PORTSDIR}/devel/py-zope.browserresource \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:${PORTSDIR}/devel/py-zope.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.publisher/Makefile b/devel/py-zope.publisher/Makefile
index b8b77c04fb7e..3b511de404c6 100644
--- a/devel/py-zope.publisher/Makefile
+++ b/devel/py-zope.publisher/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Publishes Python objects on the web
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-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.proxy>=0:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:${PORTSDIR}/devel/py-zope.contenttype \
-		${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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype \
+		${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
 
 USES=		python:2 zip
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py-zope.ramcache/Makefile b/devel/py-zope.ramcache/Makefile
index 23242e5ad376..4dde4dd4273f 100644
--- a/devel/py-zope.ramcache/Makefile
+++ b/devel/py-zope.ramcache/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Zope RAM Cache
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.schema/Makefile b/devel/py-zope.schema/Makefile
index 28b1aee514c9..7942d0a5a1ac 100644
--- a/devel/py-zope.schema/Makefile
+++ b/devel/py-zope.schema/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Zope Interface extension for defining data schemas
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.site/Makefile b/devel/py-zope.site/Makefile
index dd5ed8504b87..f4c8ce6d6bee 100644
--- a/devel/py-zope.site/Makefile
+++ b/devel/py-zope.site/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Local registries for zope component architecture
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.size/Makefile b/devel/py-zope.size/Makefile
index 36a06d00f2c7..65e862221d32 100644
--- a/devel/py-zope.size/Makefile
+++ b/devel/py-zope.size/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Interfaces and simple adapter that give the size of an object
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.tales/Makefile b/devel/py-zope.tales/Makefile
index 0bd588537aef..8836b048d491 100644
--- a/devel/py-zope.tales/Makefile
+++ b/devel/py-zope.tales/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Zope Template Application Language Expression Syntax (TALES)
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.testbrowser/Makefile b/devel/py-zope.testbrowser/Makefile
index 8027fd70a67f..065786bf7337 100644
--- a/devel/py-zope.testbrowser/Makefile
+++ b/devel/py-zope.testbrowser/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Programmable browser for functional black-box tests
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:${PORTSDIR}/www/py-mechanize \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}WebTest>=0:${PORTSDIR}/www/py-WebTest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.testing/Makefile b/devel/py-zope.testing/Makefile
index 53e92a822b6f..7c9300fd245d 100644
--- a/devel/py-zope.testing/Makefile
+++ b/devel/py-zope.testing/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Zope testing helpers
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.traversing/Makefile b/devel/py-zope.traversing/Makefile
index b64819be6bf7..638a5964c127 100644
--- a/devel/py-zope.traversing/Makefile
+++ b/devel/py-zope.traversing/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Resolving paths in the object hierarchy
 
 LICENSE=	ZPL21
 
-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.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${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.proxy>3.4.2:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-zope.viewlet/Makefile b/devel/py-zope.viewlet/Makefile
index f7f82831f182..c6463975d025 100644
--- a/devel/py-zope.viewlet/Makefile
+++ b/devel/py-zope.viewlet/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Zope Viewlets
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:${PORTSDIR}/devel/py-zope.browserpage \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:${PORTSDIR}/devel/py-zope.contentprovider \
-		${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.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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \
+		${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.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
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py3-Jinja2/Makefile b/devel/py3-Jinja2/Makefile
index 1070512d9f82..a6fabe993667 100644
--- a/devel/py3-Jinja2/Makefile
+++ b/devel/py3-Jinja2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Fast and easy to use stand-alone template engine
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py3-MarkupSafe
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:${PORTSDIR}/textproc/py3-MarkupSafe
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe
 
 NO_ARCH=	yes
 USES=		python:3
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	BABEL EXAMPLES
 OPTIONS_DEFAULT=	BABEL
 BABEL_DESC=		Enable Babel extension
 
-BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py3-babel
+BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
diff --git a/devel/py3-babel/Makefile b/devel/py3-babel/Makefile
index d68ab4f34485..10c551de8575 100644
--- a/devel/py3-babel/Makefile
+++ b/devel/py3-babel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Collection of tools for internationalizing Python applications
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py3-pytz
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz
 
 USES=		python:3
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/devel/py3-jsonschema/Makefile b/devel/py3-jsonschema/Makefile
index d3de67678939..aee47d418784 100644
--- a/devel/py3-jsonschema/Makefile
+++ b/devel/py3-jsonschema/Makefile
@@ -12,7 +12,7 @@ COMMENT=	JSON Schema validation for Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:${PORTSDIR}/devel/py3-vcversioner
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py3-vcversioner
 
 USES=		python:3
 USE_PYTHON=	autoplist distutils
diff --git a/devel/py3-libpeas/Makefile b/devel/py3-libpeas/Makefile
index dd2da3356167..cbbbcd8ed8f7 100644
--- a/devel/py3-libpeas/Makefile
+++ b/devel/py3-libpeas/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	libpeas Python 3 support
 
-LIB_DEPENDS+=	libpeas-1.0.so:${PORTSDIR}/devel/libpeas
+LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 
 LIBPEAS_SLAVE=	python3
 
diff --git a/devel/py_static_check/Makefile b/devel/py_static_check/Makefile
index cd161e4d86b7..fb541a9c906f 100644
--- a/devel/py_static_check/Makefile
+++ b/devel/py_static_check/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Statically check your python code
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:${PORTSDIR}/devel/py-pyflakes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index 80ac683e3e63..8e4cf5a1372a 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	dbus-python-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	Common files for the Python bindings for the D-BUS messaging system
 
-BUILD_DEPENDS=	dbus-glib>=0:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	dbus-glib>=0:devel/dbus-glib
 
 SLAVE_PORT?=	no
 
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	HTMLDOCS
 HTMLDOCS_DESC=	build html documentation
 HTMLDOCS_CONFIGURE_OFF=	--disable-html-docs
-HTMLDOCS_BUILD_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils
+HTMLDOCS_BUILD_DEPENDS=	rst2html:textproc/py-docutils
 
 .include <bsd.port.options.mk>
 
@@ -65,8 +65,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 .endif
 .else # slave is defined
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS+=	pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
+LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS+=	pydbus-common>=0:devel/pydbus-common
 USE_LDCONFIG=	yes
 .if ${SLAVE_PORT} == python2
 USES+=		python:2
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index 8aed6f1a3c6e..431fc747f3a3 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -36,7 +36,7 @@ MAKE_ARGS=	PYTHON_VERSION=${PYTHON_VER}
 .if ${SLAVE_PORT} == no
 PORTSCOUT?=	limitw:1,even
 
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 USES+=		gnome python:build
 USE_GNOME=	glib20:build introspection:build
 NO_BUILD=	yes
@@ -52,19 +52,19 @@ PORTSCOUT=	ignore:1
 
 USES+=		gnome
 USE_GNOME+=	glib20 introspection
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
-RUN_DEPENDS+=	pygobject3-common>=0:${PORTSDIR}/devel/pygobject3-common
+LIB_DEPENDS+=	libffi.so:devel/libffi
+RUN_DEPENDS+=	pygobject3-common>=0:devel/pygobject3-common
 
 .if ${SLAVE_PORT} == python2
 USES+=		python:2
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 .endif
 
 .if ${SLAVE_PORT} == python3
 USES+=		python:3
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo
 PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
 .endif
 
diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index 7c3b09b6d5db..0f7d99add73b 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Analyzes python source code looking for bugs and signs of poor quality
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=1.3.6:${PORTSDIR}/devel/py-astroid \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=1.3.6:devel/py-astroid \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils concurrent
 
 OPTIONS_DEFINE=	GUI
 
-GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 .include <bsd.port.mk>
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index 0903b7330438..f9e728fc0651 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python/Tkinter based source browser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL2.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index f646bed582f4..05716413b21e 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utilities for creating PySide applications
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:${PORTSDIR}/devel/pyside
-LIB_DEPENDS=	libshiboken-${PYTHON_VERSION}.so:${PORTSDIR}/devel/shiboken
-RUN_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:${PORTSDIR}/devel/pyside
+BUILD_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
+LIB_DEPENDS=	libshiboken-${PYTHON_VERSION}.so:devel/shiboken
+RUN_DEPENDS=	pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PySide
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index 86b7c85b50aa..b5d034977ced 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Python bindings for the Qt applications and UI framework
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libapiextractor.so:${PORTSDIR}/devel/apiextractor \
-		libgenrunner.so:${PORTSDIR}/devel/generatorrunner \
-		libshiboken-${PYTHON_VERSION}.so:${PORTSDIR}/devel/shiboken
+LIB_DEPENDS=	libapiextractor.so:devel/apiextractor \
+		libgenrunner.so:devel/generatorrunner \
+		libshiboken-${PYTHON_VERSION}.so:devel/shiboken
 
 CMAKE_ARGS+=	-DGL_H:FILEPATH="${LOCALBASE}/include/GL/gl.h" \
 		-DGL_INCLUDE_DIR:FILEPATH="${LOCALBASE}/include"
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index 86a6266ac7c2..5a123ae4111e 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Python binding for Subversion
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
-		libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion \
+		libneon.so:www/neon
 
 # Python3 ready
 USES=		python
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 86603810f1c7..2822378b85cc 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Qt interface for bzr
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4 \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
-RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BUILD_DEPENDS=	bzr:devel/bzr \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4 \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant
+RUN_DEPENDS=	bzr:devel/bzr
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/devel/qca/Makefile b/devel/qca/Makefile
index ca4409cfcb5c..447226a5617c 100644
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	KDE/stable/qca/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cross-platform crypto API for Qt 4
 
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		cmake:outsource tar:xz
 CMAKE_ARGS=	-DBUILD_PLUGINS=none -DBUILD_TESTS=no \
@@ -35,13 +35,13 @@ OPTIONS_DEFAULT=GNUPG OPENSSL
 OPTIONS_SUB=	yes
 
 GNUPG_CMAKE_ON=		-DWITH_gnupg_PLUGIN=yes
-GNUPG_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+GNUPG_RUN_DEPENDS=	gpg2:security/gnupg
 
 OPENSSL_CMAKE_ON=	-DWITH_ossl_PLUGIN=yes
 OPENSSL_USE=		OPENSSL=yes
 
 SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
-SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 post-patch:
 # Qt Network module is used for tests only
diff --git a/devel/qct/Makefile b/devel/qct/Makefile
index 6d0858b97dac..fbe689e5590e 100644
--- a/devel/qct/Makefile
+++ b/devel/qct/Makefile
@@ -13,8 +13,8 @@ COMMENT=	QCT GUI commit tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/qdevelop/Makefile b/devel/qdevelop/Makefile
index 761d8a650bc0..64d253de5d06 100644
--- a/devel/qdevelop/Makefile
+++ b/devel/qdevelop/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Development environment entirely dedicated to Qt 4
 
-RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
+RUN_DEPENDS=	exctags:devel/ctags
 
 USE_QT4=	gui sql network xml designer sql-sqlite3_run \
 		moc_build uic_build rcc_build
diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
index aac57890018b..7042a17b8cfd 100644
--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 .endif
 
 post-patch:
diff --git a/devel/qross/Makefile b/devel/qross/Makefile
index a1c8b19faa08..fd8ab3473922 100644
--- a/devel/qross/Makefile
+++ b/devel/qross/Makefile
@@ -24,7 +24,7 @@ OPTIONS_SUB=	yes
 PYTHON_DESC=		Python bindings
 PYTHON_CMAKE_ON=	-DENABLE_PYTHON:BOOL=true
 PYTHON_CMAKE_OFF=	-DENABLE_PYTHON:BOOL=false
-PYTHON_BUILD_DEPENDS=	sip:${PORTSDIR}/devel/py-sip
+PYTHON_BUILD_DEPENDS=	sip:devel/py-sip
 OPTIONS_DEFAULT=PYTHON
 
 post-extract:
diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile
index e56bbda75ef8..379d08cf5733 100644
--- a/devel/qscintilla2-designerplugin-qt5/Makefile
+++ b/devel/qscintilla2-designerplugin-qt5/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt5 Designer plugin for QScintilla2
 
-LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2-qt5/distinfo
 USE_GL=		gl
diff --git a/devel/qscintilla2-designerplugin/Makefile b/devel/qscintilla2-designerplugin/Makefile
index 9bce26e79bde..b546dd48097a 100644
--- a/devel/qscintilla2-designerplugin/Makefile
+++ b/devel/qscintilla2-designerplugin/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${QSCI2_DISTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 Designer plugin for QScintilla2
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 DISTINFO_FILE=	${.CURDIR:H}/qscintilla2/distinfo
 USES=		qmake pyqt:4
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 486ee0f3fe51..e3a6be5b62af 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USE_GNOME=	glib20
 USE_QT4=	qmake_build moc_build
diff --git a/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile
index 08965af41867..0ee09573f2d5 100644
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 graphical interface to D-Bus
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib dbus gui xml \
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index 6724b9a8a497..13f9cebb77a3 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		libpcre.so:devel/pcre
 
 USES=		execinfo
 USE_GNOME=	glib20
diff --git a/devel/quickcheck++/Makefile b/devel/quickcheck++/Makefile
index 55395c51777e..1fcf82d25aa2 100644
--- a/devel/quickcheck++/Makefile
+++ b/devel/quickcheck++/Makefile
@@ -26,7 +26,7 @@ DOXYGEN_DESC=	Build documentation with doxygen
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 PORTDOCS+=	html
 
 pre-install:
diff --git a/devel/quilt/Makefile b/devel/quilt/Makefile
index a0ccd005363a..74b69a4289a0 100644
--- a/devel/quilt/Makefile
+++ b/devel/quilt/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Collection of bash scripts to ease working with patch files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gcp:${PORTSDIR}/sysutils/coreutils \
-		gsed:${PORTSDIR}/textproc/gsed \
-		gpatch:${PORTSDIR}/devel/patch \
-		diffstat:${PORTSDIR}/textproc/diffstat \
-		gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	bash:shells/bash \
+		gcp:sysutils/coreutils \
+		gsed:textproc/gsed \
+		gpatch:devel/patch \
+		diffstat:textproc/diffstat \
+		gawk:lang/gawk
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		formail:${PORTSDIR}/mail/procmail
+		formail:mail/procmail
 
 USES=		desthack gmake perl5
 NO_ARCH=	yes
@@ -34,8 +34,8 @@ CONFIGURE_ARGS=	--with-sed=${LOCALBASE}/bin/gsed \
 
 PORTDOCS=	README README.MAIL quilt.pdf
 
-RPMBUILD_BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
-RPMBUILD_RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
+RPMBUILD_BUILD_DEPENDS=	rpm:archivers/rpm4
+RPMBUILD_RUN_DEPENDS=	rpm:archivers/rpm4
 RPMBUILD_CONFIGURE_OFF=	--without-rpmbuild
 
 NLS_USES=		gettext
diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index e13db8e21a18..8c1363a64c0e 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	DOCS EXAMPLES
 DOCS_CONFIGURE_ENABLE=	manual
 DOCS_USE=		TEX=latex:build
-DOCS_BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+DOCS_BUILD_DEPENDS=	fig2dev:print/transfig
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ragel/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 19da3d0cd4f1..ef0320f2e552 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Cross-platform GUI front-end for the Subversion revision system
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${LOCALBASE}/bin/svn:devel/subversion \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/VERSION:textproc/docbook-xsl
 
 USE_WX=		2.8
 WX_UNICODE=	yes
diff --git a/devel/rbenv/Makefile b/devel/rbenv/Makefile
index 1b11270f2d06..c534b6ef5ac5 100644
--- a/devel/rbenv/Makefile
+++ b/devel/rbenv/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Manage multiple versions of ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sstephenson
diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile
index 139e48a9fc95..ed89ca1e96f0 100644
--- a/devel/rbtools/Makefile
+++ b/devel/rbtools/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Set of client tools to use with Review Board
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 ORIGNAME=	RBTools
 
diff --git a/devel/rebar/Makefile b/devel/rebar/Makefile
index 01bbec99a2ac..972f64c9c51e 100644
--- a/devel/rebar/Makefile
+++ b/devel/rebar/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Build-tool for Erlang that follows OTP principles
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/escript:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	${LOCALBASE}/bin/escript:lang/erlang
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	BASH ZSH
diff --git a/devel/rebar3/Makefile b/devel/rebar3/Makefile
index 85c523db1c35..3edfd3fab589 100644
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Build tool for Erlang
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang \
-		${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
-RUN_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
+		${LOCALBASE}/bin/git:devel/git
+RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 OPTIONS_DEFINE=	BASH ZSH
 
diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index c93930faefd3..8434bc3ed515 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Complete regular expressions C++ solution
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/relx/Makefile b/devel/relx/Makefile
index 927692567c55..9d42c062a0d6 100644
--- a/devel/relx/Makefile
+++ b/devel/relx/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Sane, simple release creation for Erlang
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang \
-		rebar3>=0:${PORTSDIR}/devel/rebar3
+BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
+		rebar3>=0:devel/rebar3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/devel/roboctl/Makefile b/devel/roboctl/Makefile
index c46d1fb72da9..60611c562e5f 100644
--- a/devel/roboctl/Makefile
+++ b/devel/roboctl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	API and tools for communicating with Lego and Vex robots
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgamepad.a:${PORTSDIR}/devel/libgamepad
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgamepad.a:devel/libgamepad
 
 MAKE_ENV=	EXTRALIBS=-lbluetooth
 MAKE_FLAGS+=	PREFIX=${STAGEDIR}${PREFIX} \
@@ -23,7 +23,7 @@ USES=		tar:xz
 OPTIONS_DEFINE=	CUTECOM
 CUTECOM_DESC=	Install cutecom for Vex debugging
 
-CUTECOM_RUN_DEPENDS=	cutecom:${PORTSDIR}/comms/cutecom
+CUTECOM_RUN_DEPENDS=	cutecom:comms/cutecom
 
 pre-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} depend)
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 206600568194..667611efa456 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Interprocess communication library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	liblwp.so:${PORTSDIR}/devel/lwp
+LIB_DEPENDS=	liblwp.so:devel/lwp
 
 USES=		gmake libtool pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile
index fb2084611bbc..8010f3350c6a 100644
--- a/devel/rsvndump/Makefile
+++ b/devel/rsvndump/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Remote Subversion repository dumpfile generator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 OPTIONS_DEFINE=	DOCS NLS
 
@@ -20,8 +20,8 @@ CONFIGURE_ARGS=	--with-svn=${LOCALBASE}
 
 PLIST_FILES=	bin/rsvndump
 
-DOCS_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xmlto:${PORTSDIR}/textproc/xmlto
+DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			xmlto:textproc/xmlto
 DOCS_PLIST_FILES=	man/man1/rsvndump.1.gz
 DOCS_CONFIGURE_ENABLE=	man
 
diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile
index 7a4459f80719..ea05803b3464 100644
--- a/devel/ruby-build/Makefile
+++ b/devel/ruby-build/Makefile
@@ -11,14 +11,14 @@ COMMENT=	Compile and install different ruby versions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	autoconf>0:${PORTSDIR}/devel/autoconf \
-		curl:${PORTSDIR}/ftp/curl \
-		gmake:${PORTSDIR}/devel/gmake
+RUN_DEPENDS=	autoconf>0:devel/autoconf \
+		curl:ftp/curl \
+		gmake:devel/gmake
 
 OPTIONS_DEFINE=	RBENV
 RBENV_DESC=	Install rbenv for installation support
 OPTIONS_DEFAULT=	RBENV
-RBENV_RUN_DEPENDS=	rbenv:${PORTSDIR}/devel/rbenv
+RBENV_RUN_DEPENDS=	rbenv:devel/rbenv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sstephenson
diff --git a/devel/ruby-langscan/Makefile b/devel/ruby-langscan/Makefile
index 09cad1c08b85..92169ecc9ec6 100644
--- a/devel/ruby-langscan/Makefile
+++ b/devel/ruby-langscan/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Program analyzer for source code search engine
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-PPI>=0:${PORTSDIR}/textproc/p5-PPI
-BUILD_DEPENDS=	flex>=2.5.31:${PORTSDIR}/textproc/flex
+RUN_DEPENDS=	p5-PPI>=0:textproc/p5-PPI
+BUILD_DEPENDS=	flex>=2.5.31:textproc/flex
 
 BROKEN_RUBY21=	yes
 BROKEN_RUBY22=	yes
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index 7eca6a0c99c0..d7f2b6a4b249 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Ruby bindings for Qt
 
-LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5 \
+		libqscintilla2.so:devel/qscintilla2
 
 USE_KDE4=	kdeprefix smokeqt
 USE_QT4=	corelib dbus declarative gui network phonon script webkit xml \
diff --git a/devel/ruby-rbbr/Makefile b/devel/ruby-rbbr/Makefile
index 7519edc62474..e41568a2a2b3 100644
--- a/devel/ruby-rbbr/Makefile
+++ b/devel/ruby-rbbr/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	GTK+2-based Ruby module browser
 
-BUILD_DEPENDS=	rubygem-gettext>=0:${PORTSDIR}/devel/rubygem-gettext
-RUN_DEPENDS=	rubygem-gettext>=0:${PORTSDIR}/devel/rubygem-gettext \
-		rubygem-gtk2>=0:${PORTSDIR}/x11-toolkits/rubygem-gtk2
+BUILD_DEPENDS=	rubygem-gettext>=0:devel/rubygem-gettext
+RUN_DEPENDS=	rubygem-gettext>=0:devel/rubygem-gettext \
+		rubygem-gtk2>=0:x11-toolkits/rubygem-gtk2
 
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
diff --git a/devel/ruby-rbprof/Makefile b/devel/ruby-rbprof/Makefile
index dc6148592ef3..71a05e226265 100644
--- a/devel/ruby-rbprof/Makefile
+++ b/devel/ruby-rbprof/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Flexible Ruby profiler
 
 OPTIONS_DEFINE=	DOCS
 
-#RUN_DEPENDS=	${RUBY_SITELIBDIR}/runit/error.rb:${PORTSDIR}/devel/ruby-unit \
-#		${RUBY_SITELIBDIR}/aspectr.rb:${PORTSDIR}/devel/ruby-aspectr
+#RUN_DEPENDS=	${RUBY_SITELIBDIR}/runit/error.rb:devel/ruby-unit \
+#		${RUBY_SITELIBDIR}/aspectr.rb:devel/ruby-aspectr
 
 USE_RUBY=	yes
 
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
index f24fb5459289..25d97d4ce7ac 100644
--- a/devel/ruby-sdl/Makefile
+++ b/devel/ruby-sdl/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Ruby extension library to use SDL library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libSGE.so:${PORTSDIR}/devel/sdl_sge \
-		libSDLSKK.so:${PORTSDIR}/devel/sdlskk \
-		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
-RUN_DEPENDS=	rubygem-opengl>=0:${PORTSDIR}/graphics/rubygem-opengl
+LIB_DEPENDS=	libSGE.so:devel/sdl_sge \
+		libSDLSKK.so:devel/sdlskk \
+		libsmpeg.so:multimedia/smpeg
+RUN_DEPENDS=	rubygem-opengl>=0:graphics/rubygem-opengl
 
 USE_SDL=	mixer image ttf sdl
 USE_RUBY=	yes
diff --git a/devel/rubygem-actionpack-action_caching/Makefile b/devel/rubygem-actionpack-action_caching/Makefile
index 42b3803e38b3..eb938adcbc02 100644
--- a/devel/rubygem-actionpack-action_caching/Makefile
+++ b/devel/rubygem-actionpack-action_caching/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Action caching for Action Pack (removed from core in Rails 4.0)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-actionpack4>=4.0:${PORTSDIR}/www/rubygem-actionpack4
+RUN_DEPENDS=	rubygem-actionpack4>=4.0:www/rubygem-actionpack4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-actionview/Makefile b/devel/rubygem-actionview/Makefile
index c71d6510ca2c..d0d0858d4640 100644
--- a/devel/rubygem-actionview/Makefile
+++ b/devel/rubygem-actionview/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Rendering framework putting the V in MVC (part of Rails)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-builder32>=3.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-erubis>=2.7.0:${PORTSDIR}/www/rubygem-erubis \
-		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-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-builder32>=3.2:devel/rubygem-builder32 \
+		rubygem-erubis>=2.7.0:www/rubygem-erubis \
+		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/devel/rubygem-active_scaffold/Makefile b/devel/rubygem-active_scaffold/Makefile
index 0752d1d2b998..76d960592df6 100644
--- a/devel/rubygem-active_scaffold/Makefile
+++ b/devel/rubygem-active_scaffold/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gem to handle all CRUD user interface needs
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rails4>=3.2.22.2:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-rails4>=3.2.22.2:www/rubygem-rails4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-activejob/Makefile b/devel/rubygem-activejob/Makefile
index 2de7531ce20e..6aa0671f4870 100644
--- a/devel/rubygem-activejob/Makefile
+++ b/devel/rubygem-activejob/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Job class declarations for a variety of queueing backends
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-globalid>=0.3.0:${PORTSDIR}/databases/rubygem-globalid
+RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4 \
+		rubygem-globalid>=0.3.0:databases/rubygem-globalid
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-activemessaging/Makefile b/devel/rubygem-activemessaging/Makefile
index 0edde72932c2..fddb579edbac 100644
--- a/devel/rubygem-activemessaging/Makefile
+++ b/devel/rubygem-activemessaging/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Event-driven architecture for rails
 
-RUN_DEPENDS=	rubygem-activesupport>=2.3.11:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activesupport>=2.3.11:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-activesupport/Makefile b/devel/rubygem-activesupport/Makefile
index 18fc5f74c500..d358fb445dc4 100644
--- a/devel/rubygem-activesupport/Makefile
+++ b/devel/rubygem-activesupport/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Utility classes and extension that are required by Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-i18n>=0.6.4:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-i18n>=0.6.4:devel/rubygem-i18n \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-activesupport4/Makefile b/devel/rubygem-activesupport4/Makefile
index 42cab1eb0bb3..77d683810eac 100644
--- a/devel/rubygem-activesupport4/Makefile
+++ b/devel/rubygem-activesupport4/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Utility classes and extension that are required by Rails MVC Framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json \
-		rubygem-minitest>=5.1:${PORTSDIR}/devel/rubygem-minitest \
-		rubygem-thread_safe>=0.3:${PORTSDIR}/devel/rubygem-thread_safe \
-		rubygem-tzinfo>=1.1:${PORTSDIR}/devel/rubygem-tzinfo
+RUN_DEPENDS=	rubygem-i18n>=0.6.9:devel/rubygem-i18n \
+		rubygem-json>=1.7.7:devel/rubygem-json \
+		rubygem-minitest>=5.1:devel/rubygem-minitest \
+		rubygem-thread_safe>=0.3:devel/rubygem-thread_safe \
+		rubygem-tzinfo>=1.1:devel/rubygem-tzinfo
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-analogger/Makefile b/devel/rubygem-analogger/Makefile
index 745afecc64a4..85cec439f724 100644
--- a/devel/rubygem-analogger/Makefile
+++ b/devel/rubygem-analogger/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast, flexible, easy to use logging service for Ruby
 
 LICENSE=	RUBY
 
-RUN_DEPENDS=	rubygem-eventmachine>=0.0.0:${PORTSDIR}/devel/rubygem-eventmachine
+RUN_DEPENDS=	rubygem-eventmachine>=0.0.0:devel/rubygem-eventmachine
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-annoy/Makefile b/devel/rubygem-annoy/Makefile
index c276d1616f98..88492e0ef491 100644
--- a/devel/rubygem-annoy/Makefile
+++ b/devel/rubygem-annoy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Present the user with a simple question before a destructive action
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-highline>=1.5.0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=1.5.0:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-apipie-bindings/Makefile b/devel/rubygem-apipie-bindings/Makefile
index 82e05baba452..8acedba00b9d 100644
--- a/devel/rubygem-apipie-bindings/Makefile
+++ b/devel/rubygem-apipie-bindings/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Ruby bindings for API calls that are documented with Apipie
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.2.1:${PORTSDIR}/devel/rubygem-json \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth \
-		rubygem-rest-client>=1.6.5:${PORTSDIR}/www/rubygem-rest-client
+RUN_DEPENDS=	rubygem-json>=1.2.1:devel/rubygem-json \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth \
+		rubygem-rest-client>=1.6.5:www/rubygem-rest-client
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-app_config/Makefile b/devel/rubygem-app_config/Makefile
index adb7c9f8ef5c..ab6fdc1fdd43 100644
--- a/devel/rubygem-app_config/Makefile
+++ b/devel/rubygem-app_config/Makefile
@@ -15,8 +15,8 @@ OPTIONS_DEFAULT=SQLITE3
 MONGODB_DESC=	MongoDB backend support
 SQLITE3_DESC=	SQLite 3 backend support
 
-MONGODB_RUN_DEPENDS=	rubygem-mongo>=0:${PORTSDIR}/devel/rubygem-mongo
-SQLITE3_RUN_DEPENDS=	rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+MONGODB_RUN_DEPENDS=	rubygem-mongo>=0:devel/rubygem-mongo
+SQLITE3_RUN_DEPENDS=	rubygem-sqlite3>=0:databases/rubygem-sqlite3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-astrolabe/Makefile b/devel/rubygem-astrolabe/Makefile
index 1428a1468817..d4c5ffc75576 100644
--- a/devel/rubygem-astrolabe/Makefile
+++ b/devel/rubygem-astrolabe/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Object-oriented AST extension for rubygem-parser
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-parser>=2.2:${PORTSDIR}/devel/rubygem-parser
+RUN_DEPENDS=	rubygem-parser>=2.2:devel/rubygem-parser
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-atoulme-antwrap/Makefile b/devel/rubygem-atoulme-antwrap/Makefile
index b76dc43e5a92..c10642bc47f7 100644
--- a/devel/rubygem-atoulme-antwrap/Makefile
+++ b/devel/rubygem-atoulme-antwrap/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby wrapper for Apache Ant
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
-		rubygem-rjb>=1.0.3:${PORTSDIR}/java/rubygem-rjb
+RUN_DEPENDS=	ant:devel/apache-ant \
+		rubygem-rjb>=1.0.3:java/rubygem-rjb
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-authlogic/Makefile b/devel/rubygem-authlogic/Makefile
index 60920adfbbf1..dbdb86893481 100644
--- a/devel/rubygem-authlogic/Makefile
+++ b/devel/rubygem-authlogic/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Clean, simple, and unobtrusive Ruby authentication solution
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.2:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-activesupport4>=3.2:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-request_store>=1.0:${PORTSDIR}/devel/rubygem-request_store \
-		rubygem-scrypt>=1.2:${PORTSDIR}/security/rubygem-scrypt
+RUN_DEPENDS=	rubygem-activerecord4>=3.2:databases/rubygem-activerecord4 \
+		rubygem-activesupport4>=3.2:devel/rubygem-activesupport4 \
+		rubygem-request_store>=1.0:devel/rubygem-request_store \
+		rubygem-scrypt>=1.2:security/rubygem-scrypt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-axiom-types/Makefile b/devel/rubygem-axiom-types/Makefile
index b9257e9b46a1..f94687668a02 100644
--- a/devel/rubygem-axiom-types/Makefile
+++ b/devel/rubygem-axiom-types/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Abstract types for logic programming in Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.4:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-ice_nine>=0.11.0:${PORTSDIR}/devel/rubygem-ice_nine \
-		rubygem-thread_safe>=0.3.1:${PORTSDIR}/devel/rubygem-thread_safe
+RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.4:devel/rubygem-descendants_tracker \
+		rubygem-ice_nine>=0.11.0:devel/rubygem-ice_nine \
+		rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-benelux/Makefile b/devel/rubygem-benelux/Makefile
index 1a984de786fd..999292f41b56 100644
--- a/devel/rubygem-benelux/Makefile
+++ b/devel/rubygem-benelux/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Mad way to time Ruby codes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-attic>=0.5.3:${PORTSDIR}/devel/rubygem-attic \
-		rubygem-storable>=0.8.6:${PORTSDIR}/devel/rubygem-storable
+RUN_DEPENDS=	rubygem-attic>=0.5.3:devel/rubygem-attic \
+		rubygem-storable>=0.8.6:devel/rubygem-storable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-binding_of_caller/Makefile b/devel/rubygem-binding_of_caller/Makefile
index f4d35a86efd1..770a79239cc7 100644
--- a/devel/rubygem-binding_of_caller/Makefile
+++ b/devel/rubygem-binding_of_caller/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Retrieve the binding of a methods caller
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-debug_inspector>=0.0.1:${PORTSDIR}/devel/rubygem-debug_inspector
+RUN_DEPENDS=	rubygem-debug_inspector>=0.0.1:devel/rubygem-debug_inspector
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-blobstore_client/Makefile b/devel/rubygem-blobstore_client/Makefile
index ab68bfde3ca9..ca1d6bc40476 100644
--- a/devel/rubygem-blobstore_client/Makefile
+++ b/devel/rubygem-blobstore_client/Makefile
@@ -10,10 +10,10 @@ COMMENT=	BOSH blobstore client
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-aws-sdk-resources>=2.2.0:${PORTSDIR}/devel/rubygem-aws-sdk-resources \
-		rubygem-bosh_common>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-bosh_common \
-		rubygem-httpclient>=2.7.1:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-multi_json>=1.1:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-aws-sdk-resources>=2.2.0:devel/rubygem-aws-sdk-resources \
+		rubygem-bosh_common>=${PORTVERSION}:devel/rubygem-bosh_common \
+		rubygem-httpclient>=2.7.1:www/rubygem-httpclient \
+		rubygem-multi_json>=1.1:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bones/Makefile b/devel/rubygem-bones/Makefile
index 9db9431d44a9..5480979314e1 100644
--- a/devel/rubygem-bones/Makefile
+++ b/devel/rubygem-bones/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Tool to create new projects from code skeleton
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-little-plugger>=1.1:${PORTSDIR}/devel/rubygem-little-plugger \
-		rubygem-loquacious>=1.9:${PORTSDIR}/devel/rubygem-loquacious \
-		rubygem-rake>=10.0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-little-plugger>=1.1:devel/rubygem-little-plugger \
+		rubygem-loquacious>=1.9:devel/rubygem-loquacious \
+		rubygem-rake>=10.0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bosh-template/Makefile b/devel/rubygem-bosh-template/Makefile
index a9e4a750e72c..4e43c172b3b7 100644
--- a/devel/rubygem-bosh-template/Makefile
+++ b/devel/rubygem-bosh-template/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Renders bosh templates
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-semi_semantic>=1.1.0:${PORTSDIR}/devel/rubygem-semi_semantic
+RUN_DEPENDS=	rubygem-semi_semantic>=1.1.0:devel/rubygem-semi_semantic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bosh_common/Makefile b/devel/rubygem-bosh_common/Makefile
index 0982ebcb1ef6..bacac934b1d9 100644
--- a/devel/rubygem-bosh_common/Makefile
+++ b/devel/rubygem-bosh_common/Makefile
@@ -10,8 +10,8 @@ COMMENT=	BOSH common
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-logging>=1.8.2:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-semi_semantic>=1.1.0:${PORTSDIR}/devel/rubygem-semi_semantic
+RUN_DEPENDS=	rubygem-logging>=1.8.2:devel/rubygem-logging \
+		rubygem-semi_semantic>=1.1.0:devel/rubygem-semi_semantic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-bugspots/Makefile b/devel/rubygem-bugspots/Makefile
index eeeb406c8e01..085d2cf269cf 100644
--- a/devel/rubygem-bugspots/Makefile
+++ b/devel/rubygem-bugspots/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Bugspots - Bug Prediction Heuristic
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rainbow>=0:${PORTSDIR}/devel/rubygem-rainbow \
-		rubygem-rugged>=0.21.0:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-rainbow>=0:devel/rubygem-rainbow \
+		rubygem-rugged>=0.21.0:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cairo-gobject/Makefile b/devel/rubygem-cairo-gobject/Makefile
index 02eaa1fa7883..abebbe91ced4 100644
--- a/devel/rubygem-cairo-gobject/Makefile
+++ b/devel/rubygem-cairo-gobject/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for cairo-gobject
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-cairo>=0:${PORTSDIR}/graphics/rubygem-cairo \
-		rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-cairo>=0:graphics/rubygem-cairo \
+		rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-capybara/Makefile b/devel/rubygem-capybara/Makefile
index 8097e9391045..460f71efadce 100644
--- a/devel/rubygem-capybara/Makefile
+++ b/devel/rubygem-capybara/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Integration testing tool for rack based web applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-RUN_DEPENDS=	rubygem-addressable>=0:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-nokogiri>=1.3.3:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rack16>=1.0.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rack-test>=0.5.4:${PORTSDIR}/www/rubygem-rack-test \
-		rubygem-xpath>=2.0:${PORTSDIR}/devel/rubygem-xpath
+RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-nokogiri>=1.3.3:textproc/rubygem-nokogiri \
+		rubygem-rack16>=1.0.0:www/rubygem-rack16 \
+		rubygem-rack-test>=0.5.4:www/rubygem-rack-test \
+		rubygem-xpath>=2.0:devel/rubygem-xpath
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-essentials/Makefile b/devel/rubygem-celluloid-essentials/Makefile
index 1bedfa1e158c..8f603bcd12f9 100644
--- a/devel/rubygem-celluloid-essentials/Makefile
+++ b/devel/rubygem-celluloid-essentials/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Internally used tools, and superstructural dependencies of Celluloid
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-extras/Makefile b/devel/rubygem-celluloid-extras/Makefile
index 17cb3cc5a711..608bd3d4ecf0 100644
--- a/devel/rubygem-celluloid-extras/Makefile
+++ b/devel/rubygem-celluloid-extras/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Celluloid expansion, testing, and example classes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-fsm/Makefile b/devel/rubygem-celluloid-fsm/Makefile
index 5f240e51eedd..f20040ab7ec0 100644
--- a/devel/rubygem-celluloid-fsm/Makefile
+++ b/devel/rubygem-celluloid-fsm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple finite state machines with integrated Celluloid timeout support
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-io/Makefile b/devel/rubygem-celluloid-io/Makefile
index 530be2a6309f..4a3be64966ac 100644
--- a/devel/rubygem-celluloid-io/Makefile
+++ b/devel/rubygem-celluloid-io/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Evented IO for Celluloid actors
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-celluloid>=0.17.2:${PORTSDIR}/devel/rubygem-celluloid \
-		rubygem-nio4r>=1.1:${PORTSDIR}/devel/rubygem-nio4r \
-		rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-celluloid>=0.17.2:devel/rubygem-celluloid \
+		rubygem-nio4r>=1.1:devel/rubygem-nio4r \
+		rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-pool/Makefile b/devel/rubygem-celluloid-pool/Makefile
index 068579a892b1..44e61f99bdee 100644
--- a/devel/rubygem-celluloid-pool/Makefile
+++ b/devel/rubygem-celluloid-pool/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Actor pools for Celluloid
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid-supervision/Makefile b/devel/rubygem-celluloid-supervision/Makefile
index 43a5bfa1e80e..d36d8e68076b 100644
--- a/devel/rubygem-celluloid-supervision/Makefile
+++ b/devel/rubygem-celluloid-supervision/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Supervisors, supervision groups, and supervision trees for Celluloid
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-celluloid/Makefile b/devel/rubygem-celluloid/Makefile
index 387fbd6d18f3..9a3faa134685 100644
--- a/devel/rubygem-celluloid/Makefile
+++ b/devel/rubygem-celluloid/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Build concurrent programs out of concurrent objects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-celluloid-essentials>=0:${PORTSDIR}/devel/rubygem-celluloid-essentials \
-		rubygem-celluloid-extras>=0:${PORTSDIR}/devel/rubygem-celluloid-extras \
-		rubygem-celluloid-fsm>=0:${PORTSDIR}/devel/rubygem-celluloid-fsm \
-		rubygem-celluloid-pool>=0:${PORTSDIR}/devel/rubygem-celluloid-pool \
-		rubygem-celluloid-supervision>=0:${PORTSDIR}/devel/rubygem-celluloid-supervision \
-		rubygem-timers>=4.1.1:${PORTSDIR}/devel/rubygem-timers
+RUN_DEPENDS=	rubygem-celluloid-essentials>=0:devel/rubygem-celluloid-essentials \
+		rubygem-celluloid-extras>=0:devel/rubygem-celluloid-extras \
+		rubygem-celluloid-fsm>=0:devel/rubygem-celluloid-fsm \
+		rubygem-celluloid-pool>=0:devel/rubygem-celluloid-pool \
+		rubygem-celluloid-supervision>=0:devel/rubygem-celluloid-supervision \
+		rubygem-timers>=4.1.1:devel/rubygem-timers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-childprocess/Makefile b/devel/rubygem-childprocess/Makefile
index 1ea5015c088a..fd53538bf9ec 100644
--- a/devel/rubygem-childprocess/Makefile
+++ b/devel/rubygem-childprocess/Makefile
@@ -12,7 +12,7 @@ COMMENT=	External background process controller
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.11:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.0.11:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-classifier-reborn/Makefile b/devel/rubygem-classifier-reborn/Makefile
index 806f940517a6..cba9c597dd30 100644
--- a/devel/rubygem-classifier-reborn/Makefile
+++ b/devel/rubygem-classifier-reborn/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Classifier module for Bayesian and other types of classifications
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:${PORTSDIR}/devel/rubygem-fast-stemmer
+RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:devel/rubygem-fast-stemmer
 
 PLIST_FILES=	bin/bayes.rb bin/summarize.rb
 
diff --git a/devel/rubygem-classifier/Makefile b/devel/rubygem-classifier/Makefile
index b4950305c6d5..cc855e8851f5 100644
--- a/devel/rubygem-classifier/Makefile
+++ b/devel/rubygem-classifier/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Classifier module for Bayesian and other types of classifications
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:${PORTSDIR}/devel/rubygem-fast-stemmer
+RUN_DEPENDS=	rubygem-fast-stemmer>=1.0.0:devel/rubygem-fast-stemmer
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-climate_control/Makefile b/devel/rubygem-climate_control/Makefile
index e91bc8eb3404..2b6b1488ec3c 100644
--- a/devel/rubygem-climate_control/Makefile
+++ b/devel/rubygem-climate_control/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Modify your ENV
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport>=3.0:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activesupport>=3.0:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-cliprompt/Makefile b/devel/rubygem-cliprompt/Makefile
index 3c9980cbdb99..c28b8cf307ba 100644
--- a/devel/rubygem-cliprompt/Makefile
+++ b/devel/rubygem-cliprompt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Env aware lib for CLI prompt
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-paint>=1.0.0:${PORTSDIR}/devel/rubygem-paint
+RUN_DEPENDS=	rubygem-paint>=1.0.0:devel/rubygem-paint
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cloudfiles/Makefile b/devel/rubygem-cloudfiles/Makefile
index 166430fdbee0..cf6ecd2f09a9 100644
--- a/devel/rubygem-cloudfiles/Makefile
+++ b/devel/rubygem-cloudfiles/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby version of the Rackspace Cloud Files API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-cocaine/Makefile b/devel/rubygem-cocaine/Makefile
index da3839231fb8..02ea322e8bd1 100644
--- a/devel/rubygem-cocaine/Makefile
+++ b/devel/rubygem-cocaine/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small library for doing (command) lines
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-climate_control>=0.0.3:${PORTSDIR}/devel/rubygem-climate_control
+RUN_DEPENDS=	rubygem-climate_control>=0.0.3:devel/rubygem-climate_control
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-coercible/Makefile b/devel/rubygem-coercible/Makefile
index 9df05f25f7d7..a56a7667f345 100644
--- a/devel/rubygem-coercible/Makefile
+++ b/devel/rubygem-coercible/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby coercion library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.1:${PORTSDIR}/devel/rubygem-descendants_tracker
+RUN_DEPENDS=	rubygem-descendants_tracker>=0.0.1:devel/rubygem-descendants_tracker
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-coffee-rails/Makefile b/devel/rubygem-coffee-rails/Makefile
index 7d57153c0303..5e39f9090d36 100644
--- a/devel/rubygem-coffee-rails/Makefile
+++ b/devel/rubygem-coffee-rails/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Coffee Script adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-coffee-script>=2.2.0:${PORTSDIR}/devel/rubygem-coffee-script \
-		rubygem-railties>=3.2.10:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \
+		rubygem-railties>=3.2.10:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-coffee-rails4/Makefile b/devel/rubygem-coffee-rails4/Makefile
index 336cf4ce8086..cb7f81ed17c9 100644
--- a/devel/rubygem-coffee-rails4/Makefile
+++ b/devel/rubygem-coffee-rails4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Coffee Script adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-coffee-script>=2.2.0:${PORTSDIR}/devel/rubygem-coffee-script \
-		rubygem-railties4>=4.0.0:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS?=	rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \
+		rubygem-railties4>=4.0.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-coffee-script/Makefile b/devel/rubygem-coffee-script/Makefile
index 5b2d93a7df1b..faf311eaaf86 100644
--- a/devel/rubygem-coffee-script/Makefile
+++ b/devel/rubygem-coffee-script/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-coffee-script-source>=0:${PORTSDIR}/devel/rubygem-coffee-script-source \
-		rubygem-execjs>=0:${PORTSDIR}/devel/rubygem-execjs
+RUN_DEPENDS=	rubygem-coffee-script-source>=0:devel/rubygem-coffee-script-source \
+		rubygem-execjs>=0:devel/rubygem-execjs
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-commander/Makefile b/devel/rubygem-commander/Makefile
index 1dc74de9b7ee..aeaf14c43bba 100644
--- a/devel/rubygem-commander/Makefile
+++ b/devel/rubygem-commander/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Complete solution for Ruby command-line executables
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-highline>=1.7.2:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=1.7.2:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-concurrent-ruby-edge/Makefile b/devel/rubygem-concurrent-ruby-edge/Makefile
index c0d8af7f029c..62dae10241ab 100644
--- a/devel/rubygem-concurrent-ruby-edge/Makefile
+++ b/devel/rubygem-concurrent-ruby-edge/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bleeding edge features for concurrent-ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.1:${PORTSDIR}/devel/rubygem-concurrent-ruby
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.1:devel/rubygem-concurrent-ruby
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cool.io/Makefile b/devel/rubygem-cool.io/Makefile
index fb35482e95d8..2c507eae5a2d 100644
--- a/devel/rubygem-cool.io/Makefile
+++ b/devel/rubygem-cool.io/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gems for cool.io
 LICENSE=	MIT
 
 RUN_DEPENDS=	\
-	rubygem-iobuffer>=1.0.0:${PORTSDIR}/devel/rubygem-iobuffer
+	rubygem-iobuffer>=1.0.0:devel/rubygem-iobuffer
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-crack/Makefile b/devel/rubygem-crack/Makefile
index 8c5b646b78eb..277e03c387eb 100644
--- a/devel/rubygem-crack/Makefile
+++ b/devel/rubygem-crack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby Library of Simple JSON and XML Parsing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-safe_yaml>=1.0.0:${PORTSDIR}/devel/rubygem-safe_yaml
+RUN_DEPENDS=	rubygem-safe_yaml>=1.0.0:devel/rubygem-safe_yaml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cri/Makefile b/devel/rubygem-cri/Makefile
index 01899685c72a..0323a9de257b 100644
--- a/devel/rubygem-cri/Makefile
+++ b/devel/rubygem-cri/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Allows building easy-to-use commandline interfaces
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-colored>=1.2:${PORTSDIR}/textproc/rubygem-colored
+RUN_DEPENDS=	rubygem-colored>=1.2:textproc/rubygem-colored
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-cucumber-core/Makefile b/devel/rubygem-cucumber-core/Makefile
index 5854c25ee110..0c59b930b38a 100644
--- a/devel/rubygem-cucumber-core/Makefile
+++ b/devel/rubygem-cucumber-core/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Core library for the Cucumber BDD app
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gherkin>=3.2.0:${PORTSDIR}/textproc/rubygem-gherkin
+RUN_DEPENDS=	rubygem-gherkin>=3.2.0:textproc/rubygem-gherkin
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cucumber/Makefile b/devel/rubygem-cucumber/Makefile
index ecfb9700ee87..f1467f6e5054 100644
--- a/devel/rubygem-cucumber/Makefile
+++ b/devel/rubygem-cucumber/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Behaviour Driven Development with elegance and joy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=2.1.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-cucumber-core>=1.4.0:${PORTSDIR}/devel/rubygem-cucumber-core \
-		rubygem-cucumber-wire>=0.0.1:${PORTSDIR}/devel/rubygem-cucumber-wire \
-		rubygem-diff-lcs>=1.1.3:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-gherkin>=3.2.0:${PORTSDIR}/textproc/rubygem-gherkin \
-		rubygem-multi_json>=1.7.5:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-multi_test>=0.1.2:${PORTSDIR}/devel/rubygem-multi_test
+RUN_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
+		rubygem-cucumber-core>=1.4.0:devel/rubygem-cucumber-core \
+		rubygem-cucumber-wire>=0.0.1:devel/rubygem-cucumber-wire \
+		rubygem-diff-lcs>=1.1.3:textproc/rubygem-diff-lcs \
+		rubygem-gherkin>=3.2.0:textproc/rubygem-gherkin \
+		rubygem-multi_json>=1.7.5:devel/rubygem-multi_json \
+		rubygem-multi_test>=0.1.2:devel/rubygem-multi_test
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-cyoi/Makefile b/devel/rubygem-cyoi/Makefile
index 3dbd93888bb0..6160488b0dcb 100644
--- a/devel/rubygem-cyoi/Makefile
+++ b/devel/rubygem-cyoi/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Library to prompt for infrastructure and login credentials
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-fog>=0:${PORTSDIR}/devel/rubygem-fog \
-		rubygem-highline>=1.6:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-readwritesettings>=3.0:${PORTSDIR}/devel/rubygem-readwritesettings
+RUN_DEPENDS=	rubygem-fog>=0:devel/rubygem-fog \
+		rubygem-highline>=1.6:devel/rubygem-highline \
+		rubygem-readwritesettings>=3.0:devel/rubygem-readwritesettings
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-debugger-xml/Makefile b/devel/rubygem-debugger-xml/Makefile
index 9e093e73a550..d7a65e305fa7 100644
--- a/devel/rubygem-debugger-xml/Makefile
+++ b/devel/rubygem-debugger-xml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	XML interface for rubygem-debugger
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-builder32>=2.0.0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-byebug>=0:${PORTSDIR}/devel/rubygem-byebug
+RUN_DEPENDS=	rubygem-builder32>=2.0.0:devel/rubygem-builder32 \
+		rubygem-byebug>=0:devel/rubygem-byebug
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-deface/Makefile b/devel/rubygem-deface/Makefile
index a73add234e17..786bec9148c7 100644
--- a/devel/rubygem-deface/Makefile
+++ b/devel/rubygem-deface/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Customize ERB, Haml and Slim views in a Rails application
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-colorize>=0.5.8:${PORTSDIR}/devel/rubygem-colorize \
-		rubygem-nokogiri>=1.6.0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-polyglot>=0.3:${PORTSDIR}/devel/rubygem-polyglot \
-		rubygem-rails4>=3.1:${PORTSDIR}/www/rubygem-rails4
+RUN_DEPENDS=	rubygem-colorize>=0.5.8:devel/rubygem-colorize \
+		rubygem-nokogiri>=1.6.0:textproc/rubygem-nokogiri \
+		rubygem-polyglot>=0.3:devel/rubygem-polyglot \
+		rubygem-rails4>=3.1:www/rubygem-rails4
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-default_value_for/Makefile b/devel/rubygem-default_value_for/Makefile
index 9794779fe41d..4b1b8342120f 100644
--- a/devel/rubygem-default_value_for/Makefile
+++ b/devel/rubygem-default_value_for/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Define default values for ActiveRecord models in a declarative manner
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-delayed_job/Makefile b/devel/rubygem-delayed_job/Makefile
index 275a01ba7f9b..22dd0e4952ad 100644
--- a/devel/rubygem-delayed_job/Makefile
+++ b/devel/rubygem-delayed_job/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asynchronously executing longer tasks in the background
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-activesupport4>=3.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=3.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-delayer-deferred/Makefile b/devel/rubygem-delayer-deferred/Makefile
index fc4dfbd773cb..aa7219f3114f 100644
--- a/devel/rubygem-delayer-deferred/Makefile
+++ b/devel/rubygem-delayer-deferred/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Deferred for Delayer
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-delayer>=0:${PORTSDIR}/devel/rubygem-delayer
+RUN_DEPENDS=	rubygem-delayer>=0:devel/rubygem-delayer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-descendants_tracker/Makefile b/devel/rubygem-descendants_tracker/Makefile
index a435ab10bc7a..9b875e0fb6a8 100644
--- a/devel/rubygem-descendants_tracker/Makefile
+++ b/devel/rubygem-descendants_tracker/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Module that adds descendant tracking to a class
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:${PORTSDIR}/devel/rubygem-thread_safe
+RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-devise-async-rails4/Makefile b/devel/rubygem-devise-async-rails4/Makefile
index 1eb552af3190..9695d44f9cb1 100644
--- a/devel/rubygem-devise-async-rails4/Makefile
+++ b/devel/rubygem-devise-async-rails4/Makefile
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	-rails4
 
-RUN_DEPENDS=    rubygem-devise-rails4>=3.2:${PORTSDIR}/devel/rubygem-devise-rails4
+RUN_DEPENDS=    rubygem-devise-rails4>=3.2:devel/rubygem-devise-rails4
 
 MASTERDIR=	${.CURDIR}/../rubygem-devise-async
 
diff --git a/devel/rubygem-devise-async/Makefile b/devel/rubygem-devise-async/Makefile
index 2724f15bcbaa..1d0a643cad64 100644
--- a/devel/rubygem-devise-async/Makefile
+++ b/devel/rubygem-devise-async/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Send Devise emails in background
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS?=	rubygem-devise>=3.2:${PORTSDIR}/devel/rubygem-devise
+RUN_DEPENDS?=	rubygem-devise>=3.2:devel/rubygem-devise
 
 SLAVEDIRS=	devel/rubygem-devise-async-rails4
 
diff --git a/devel/rubygem-devise/Makefile b/devel/rubygem-devise/Makefile
index 4fefee5de619..0cc0aa0062ba 100644
--- a/devel/rubygem-devise/Makefile
+++ b/devel/rubygem-devise/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Flexible authentication solution for Rails with Warden
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-bcrypt>=3.0:${PORTSDIR}/security/rubygem-bcrypt \
-		rubygem-orm_adapter>=0.1:${PORTSDIR}/devel/rubygem-orm_adapter \
-		rubygem-thread_safe>=0.1:${PORTSDIR}/devel/rubygem-thread_safe \
-		rubygem-warden>=1.2.3:${PORTSDIR}/devel/rubygem-warden
+RUN_DEPENDS=	rubygem-bcrypt>=3.0:security/rubygem-bcrypt \
+		rubygem-orm_adapter>=0.1:devel/rubygem-orm_adapter \
+		rubygem-thread_safe>=0.1:devel/rubygem-thread_safe \
+		rubygem-warden>=1.2.3:devel/rubygem-warden
 
 NO_ARCH=	yes
 USE_RUBY=	yes
@@ -37,10 +37,10 @@ OPTIONS_DEFAULT=	RAILS3
 RAILS3_DESC=		Use Rails 3 as backend
 RAILS4_DESC=		Use Rails 4 as backend
 
-RAILS3_RUN_DEPENDS=	rubygem-railties>=3.2.6:${PORTSDIR}/www/rubygem-railties \
-			rubygem-responders-rails3>=0:${PORTSDIR}/www/rubygem-responders-rails3
-RAILS4_RUN_DEPENDS=	rubygem-railties4>=4.1.1:${PORTSDIR}/www/rubygem-railties4 \
-			rubygem-responders>=0:${PORTSDIR}/www/rubygem-responders
+RAILS3_RUN_DEPENDS=	rubygem-railties>=3.2.6:www/rubygem-railties \
+			rubygem-responders-rails3>=0:www/rubygem-responders-rails3
+RAILS4_RUN_DEPENDS=	rubygem-railties4>=4.1.1:www/rubygem-railties4 \
+			rubygem-responders>=0:www/rubygem-responders
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|, "test/rails_app/config/routes.rb"||' ${WRKSRC}/${PORTNAME}.gemspec
diff --git a/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index 38de9cdf0d8b..866a6be5e4e9 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple lightweight distributed issue tracker
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-trollop>=1.9:${PORTSDIR}/devel/rubygem-trollop
+RUN_DEPENDS=	rubygem-trollop>=1.9:devel/rubygem-trollop
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-dynflow/Makefile b/devel/rubygem-dynflow/Makefile
index aadbb36b7e02..cb7da8bff6e5 100644
--- a/devel/rubygem-dynflow/Makefile
+++ b/devel/rubygem-dynflow/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Ruby workflow/orchestration engine
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-algebrick>=0.7.0:${PORTSDIR}/devel/rubygem-algebrick \
-		rubygem-apipie-params>=0:${PORTSDIR}/devel/rubygem-apipie-params \
-		rubygem-concurrent-ruby>=1.0:${PORTSDIR}/devel/rubygem-concurrent-ruby \
-		rubygem-concurrent-ruby-edge>=0.2:${PORTSDIR}/devel/rubygem-concurrent-ruby-edge \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-sequel>=0:${PORTSDIR}/devel/rubygem-sequel
+RUN_DEPENDS=	rubygem-algebrick>=0.7.0:devel/rubygem-algebrick \
+		rubygem-apipie-params>=0:devel/rubygem-apipie-params \
+		rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
+		rubygem-concurrent-ruby-edge>=0.2:devel/rubygem-concurrent-ruby-edge \
+		rubygem-multi_json>=0:devel/rubygem-multi_json \
+		rubygem-sequel>=0:devel/rubygem-sequel
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-enumerize/Makefile b/devel/rubygem-enumerize/Makefile
index 07813cd054b6..08c88e16878a 100644
--- a/devel/rubygem-enumerize/Makefile
+++ b/devel/rubygem-enumerize/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper su
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=3.2:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=3.2:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-errand/Makefile b/devel/rubygem-errand/Makefile
index ddf444c29532..72d8e9da12ae 100644
--- a/devel/rubygem-errand/Makefile
+++ b/devel/rubygem-errand/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Ruby bindings for RRD
 
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		rubygem-rrd-ffi>=0.2.13:${PORTSDIR}/devel/rubygem-rrd-ffi
+RUN_DEPENDS=	rrdtool:databases/rrdtool \
+		rubygem-rrd-ffi>=0.2.13:devel/rubygem-rrd-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-execjs/Makefile b/devel/rubygem-execjs/Makefile
index 1562e657bc85..c49dfcf0b3bd 100644
--- a/devel/rubygem-execjs/Makefile
+++ b/devel/rubygem-execjs/Makefile
@@ -11,7 +11,7 @@ COMMENT=	ExecJS lets you run JavaScript code from Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	node:${PORTSDIR}/www/node
+RUN_DEPENDS=	node:www/node
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-faraday_middleware-multi_json/Makefile b/devel/rubygem-faraday_middleware-multi_json/Makefile
index d3ab0a485bc4..fcc0d73c14a4 100644
--- a/devel/rubygem-faraday_middleware-multi_json/Makefile
+++ b/devel/rubygem-faraday_middleware-multi_json/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Faraday response parser using MultiJson
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-faraday_middleware>0:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-multi_json>0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-faraday_middleware>0:www/rubygem-faraday_middleware \
+		rubygem-multi_json>0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fast_stack/Makefile b/devel/rubygem-fast_stack/Makefile
index 57fb37c8609f..4743c73755e0 100644
--- a/devel/rubygem-fast_stack/Makefile
+++ b/devel/rubygem-fast_stack/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fast method for collecting stack traces
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rake-compiler>=0:${PORTSDIR}/devel/rubygem-rake-compiler
+RUN_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake \
+		rubygem-rake-compiler>=0:devel/rubygem-rake-compiler
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-fast_xor/Makefile b/devel/rubygem-fast_xor/Makefile
index fabdd16bad4b..a2a1cc0bba1e 100644
--- a/devel/rubygem-fast_xor/Makefile
+++ b/devel/rubygem-fast_xor/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fast String XOR operator
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rake-compiler>=0:${PORTSDIR}/devel/rubygem-rake-compiler
+RUN_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake \
+		rubygem-rake-compiler>=0:devel/rubygem-rake-compiler
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ffi-compiler/Makefile b/devel/rubygem-ffi-compiler/Makefile
index 13d7ed77d994..6202752c49d8 100644
--- a/devel/rubygem-ffi-compiler/Makefile
+++ b/devel/rubygem-ffi-compiler/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby FFI library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.0:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ffi-yajl/Makefile b/devel/rubygem-ffi-yajl/Makefile
index ee65b4a15e31..708d636a2831 100644
--- a/devel/rubygem-ffi-yajl/Makefile
+++ b/devel/rubygem-ffi-yajl/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Ruby FFI wrapper around YAJL 2.x
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	yajl>=2.0.0:${PORTSDIR}/devel/yajl \
-		rubygem-ffi>=0:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-libyajl2>=1.0.0:${PORTSDIR}/devel/rubygem-libyajl2
+RUN_DEPENDS=	yajl>=2.0.0:devel/yajl \
+		rubygem-ffi>=0:devel/rubygem-ffi \
+		rubygem-libyajl2>=1.0.0:devel/rubygem-libyajl2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ffi/Makefile b/devel/rubygem-ffi/Makefile
index 47129fa4788a..4f5328b8df94 100644
--- a/devel/rubygem-ffi/Makefile
+++ b/devel/rubygem-ffi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Extension for dynamic libraries & binding functions
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-file-tail/Makefile b/devel/rubygem-file-tail/Makefile
index 93991d036957..4fac3f431ce7 100644
--- a/devel/rubygem-file-tail/Makefile
+++ b/devel/rubygem-file-tail/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby library that allows Ruby to 'tail' files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-tins>=1.0:${PORTSDIR}/devel/rubygem-tins
+RUN_DEPENDS=	rubygem-tins>=1.0:devel/rubygem-tins
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fluent-logger/Makefile b/devel/rubygem-fluent-logger/Makefile
index f017fb8b1e6c..a876fb3af902 100644
--- a/devel/rubygem-fluent-logger/Makefile
+++ b/devel/rubygem-fluent-logger/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Structured event logger for Ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack
+RUN_DEPENDS=	rubygem-msgpack>=0.5.4:devel/rubygem-msgpack
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fog-core/Makefile b/devel/rubygem-fog-core/Makefile
index 29f80829ab1c..f83d407ac076 100644
--- a/devel/rubygem-fog-core/Makefile
+++ b/devel/rubygem-fog-core/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Shared classes and tests for fog providers and services
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-excon>=0.45:${PORTSDIR}/devel/rubygem-excon \
-		rubygem-formatador>=0.2:${PORTSDIR}/devel/rubygem-formatador
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-excon>=0.45:devel/rubygem-excon \
+		rubygem-formatador>=0.2:devel/rubygem-formatador
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-fog-json/Makefile b/devel/rubygem-fog-json/Makefile
index 2d970923fb40..e366738eb7f3 100644
--- a/devel/rubygem-fog-json/Makefile
+++ b/devel/rubygem-fog-json/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extraction of the JSON parsing tools between providers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=1.0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-multi_json>=1.10:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-fog-core>=1.0:devel/rubygem-fog-core \
+		rubygem-multi_json>=1.10:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-font-awesome-rails-rails4/Makefile b/devel/rubygem-font-awesome-rails-rails4/Makefile
index 4383b6a3750a..55708ca9b450 100644
--- a/devel/rubygem-font-awesome-rails-rails4/Makefile
+++ b/devel/rubygem-font-awesome-rails-rails4/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT OFL11
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-railties4>=3.2:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-railties4>=3.2:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-font-awesome-rails/Makefile b/devel/rubygem-font-awesome-rails/Makefile
index 1f313468597e..37002b4c78fc 100644
--- a/devel/rubygem-font-awesome-rails/Makefile
+++ b/devel/rubygem-font-awesome-rails/Makefile
@@ -12,7 +12,7 @@ LICENSE=	MIT OFL11
 LICENSE_COMB=	dual
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-railties>=3.2:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-railties>=3.2:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-foreigner/Makefile b/devel/rubygem-foreigner/Makefile
index 2ee08bef7c9d..bff96b352867 100644
--- a/devel/rubygem-foreigner/Makefile
+++ b/devel/rubygem-foreigner/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Adds foreign key helpers to migrations
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.0.0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=3.0.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-foreman/Makefile b/devel/rubygem-foreman/Makefile
index 43153235a896..9edc21e47d6f 100644
--- a/devel/rubygem-foreman/Makefile
+++ b/devel/rubygem-foreman/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Process manager for applications with multiple components
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thor>=0.19.1:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-thor>=0.19.1:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-gemnasium-gitlab-service/Makefile b/devel/rubygem-gemnasium-gitlab-service/Makefile
index 9943c0bb6e0d..fea1f55a9f05 100644
--- a/devel/rubygem-gemnasium-gitlab-service/Makefile
+++ b/devel/rubygem-gemnasium-gitlab-service/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gemnasium support for GitLab projects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rugged>=0.21:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-rugged>=0.21:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-generator_spec-rails4/Makefile b/devel/rubygem-generator_spec-rails4/Makefile
index 6fb49990299a..535063d6dc44 100644
--- a/devel/rubygem-generator_spec-rails4/Makefile
+++ b/devel/rubygem-generator_spec-rails4/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Test Rails generators with RSpec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-railties4>=4.1.4:${PORTSDIR}/www/rubygem-railties4
+RUN_DEPENDS=	rubygem-activerecord4>=4.1.4:databases/rubygem-activerecord4 \
+		rubygem-railties4>=4.1.4:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-generator_spec/Makefile b/devel/rubygem-generator_spec/Makefile
index 56b5acb1d67e..2e3e7b440540 100644
--- a/devel/rubygem-generator_spec/Makefile
+++ b/devel/rubygem-generator_spec/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Test Rails generators with RSpec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord>=3.0.0:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-activerecord>=3.0.0:databases/rubygem-activerecord \
+		rubygem-railties>=3.0.0:www/rubygem-railties
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index 5281306381d9..9cd0dab4478e 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby implementation of the gettext library
 LICENSE=	RUBY LGPL3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-locale>=2.0.5:${PORTSDIR}/devel/rubygem-locale \
-		rubygem-text>=1.3.0:${PORTSDIR}/textproc/rubygem-text
+RUN_DEPENDS=	rubygem-locale>=2.0.5:devel/rubygem-locale \
+		rubygem-text>=1.3.0:textproc/rubygem-text
 
 USES=	shebangfix
 NO_ARCH=	yes
diff --git a/devel/rubygem-gh/Makefile b/devel/rubygem-gh/Makefile
index 6549dde0e9d5..e123673949b9 100644
--- a/devel/rubygem-gh/Makefile
+++ b/devel/rubygem-gh/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Multi-layer client for the GitHub API v3
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=0:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-backports>=0:${PORTSDIR}/devel/rubygem-backports \
-		rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-net-http-persistent>=2.7:${PORTSDIR}/www/rubygem-net-http-persistent \
-		rubygem-net-http-pipeline>=0:${PORTSDIR}/www/rubygem-net-http-pipeline
+RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable \
+		rubygem-backports>=0:devel/rubygem-backports \
+		rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-net-http-persistent>=2.7:www/rubygem-net-http-persistent \
+		rubygem-net-http-pipeline>=0:www/rubygem-net-http-pipeline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gio2/Makefile b/devel/rubygem-gio2/Makefile
index e9d120fc9a3f..dce1a43818e9 100644
--- a/devel/rubygem-gio2/Makefile
+++ b/devel/rubygem-gio2/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for GLib2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2 \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-git/Makefile b/devel/rubygem-git/Makefile
index 9af3d325a3e3..ac50a84138cb 100644
--- a/devel/rubygem-git/Makefile
+++ b/devel/rubygem-git/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby wrapper library around git(1)
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git>=1.6:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git>=1.6:devel/git
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-github_api/Makefile b/devel/rubygem-github_api/Makefile
index 29f9769f184e..4a449475492f 100644
--- a/devel/rubygem-github_api/Makefile
+++ b/devel/rubygem-github_api/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Wrapper that supports all of the GitHub API v3 methods
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-addressable>=2.4.0:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-descendants_tracker>=0.0.4:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-faraday>=0.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-hashie>=3.4:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-multi_json>=1.7.5:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-oauth2>=0:${PORTSDIR}/net/rubygem-oauth2
+RUN_DEPENDS=	rubygem-addressable>=2.4.0:www/rubygem-addressable \
+		rubygem-descendants_tracker>=0.0.4:devel/rubygem-descendants_tracker \
+		rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-hashie>=3.4:devel/rubygem-hashie \
+		rubygem-multi_json>=1.7.5:devel/rubygem-multi_json \
+		rubygem-oauth2>=0:net/rubygem-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gitlab-pygments.rb/Makefile b/devel/rubygem-gitlab-pygments.rb/Makefile
index 696ac0556a3d..db5623da1efc 100644
--- a/devel/rubygem-gitlab-pygments.rb/Makefile
+++ b/devel/rubygem-gitlab-pygments.rb/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Exposes the pygments syntax highlighter to Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
-		rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
+		rubygem-yajl-ruby>=1.1.0:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-gitlab_git/Makefile b/devel/rubygem-gitlab_git/Makefile
index ff86feb15c40..65b94670e727 100644
--- a/devel/rubygem-gitlab_git/Makefile
+++ b/devel/rubygem-gitlab_git/Makefile
@@ -11,10 +11,10 @@ COMMENT=	GitLab wrapper around git objects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-charlock_holmes>=0.7.3:${PORTSDIR}/textproc/rubygem-charlock_holmes \
-		rubygem-github-linguist>=4.7.0:${PORTSDIR}/textproc/rubygem-github-linguist \
-		rubygem-rugged>=0.24.0:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
+		rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
+		rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
+		rubygem-rugged>=0.24.0:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-glib2/Makefile b/devel/rubygem-glib2/Makefile
index 14e938468c7f..c155e38ec540 100644
--- a/devel/rubygem-glib2/Makefile
+++ b/devel/rubygem-glib2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for GLib2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-pkg-config>=0:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	rubygem-pkg-config>=0:devel/rubygem-pkg-config
 
 USE_GNOME=	glib20
 USE_RUBY=	yes
diff --git a/devel/rubygem-gobject-introspection/Makefile b/devel/rubygem-gobject-introspection/Makefile
index 61cedf64f6eb..81d806b37304 100644
--- a/devel/rubygem-gobject-introspection/Makefile
+++ b/devel/rubygem-gobject-introspection/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for GObjectIntrospection
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_GNOME=	introspection
 USE_RUBY=	yes
diff --git a/devel/rubygem-grape-entity/Makefile b/devel/rubygem-grape-entity/Makefile
index fd0e6e89438d..82de25f3c075 100644
--- a/devel/rubygem-grape-entity/Makefile
+++ b/devel/rubygem-grape-entity/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Entities - a simple Facade to use with your models and API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-multi_json>=1.3.2:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-multi_json>=1.3.2:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-grape-swagger/Makefile b/devel/rubygem-grape-swagger/Makefile
index a22d5ecb0db0..9f919f7ddf05 100644
--- a/devel/rubygem-grape-swagger/Makefile
+++ b/devel/rubygem-grape-swagger/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Documentation tool for grape APIs
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-grape>=0.8.0:${PORTSDIR}/devel/rubygem-grape \
-		rubygem-grape-entity>=0:${PORTSDIR}/devel/rubygem-grape-entity
+RUN_DEPENDS=	rubygem-grape>=0.8.0:devel/rubygem-grape \
+		rubygem-grape-entity>=0:devel/rubygem-grape-entity
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-grape/Makefile b/devel/rubygem-grape/Makefile
index ccb5e5eef003..4fbb6b40ebe1 100644
--- a/devel/rubygem-grape/Makefile
+++ b/devel/rubygem-grape/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Framework for rapid API development with great conventions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-hashie>=2.1.0:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-multi_json>=1.3.2:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-multi_xml>=0.5.2:${PORTSDIR}/textproc/rubygem-multi_xml \
-		rubygem-rack16>=1.3.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-rack-accept>=0:${PORTSDIR}/www/rubygem-rack-accept \
-		rubygem-rack-mount>=0:${PORTSDIR}/www/rubygem-rack-mount\
-		rubygem-virtus>=1.0.0:${PORTSDIR}/devel/rubygem-virtus
+RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-hashie>=2.1.0:devel/rubygem-hashie \
+		rubygem-multi_json>=1.3.2:devel/rubygem-multi_json \
+		rubygem-multi_xml>=0.5.2:textproc/rubygem-multi_xml \
+		rubygem-rack16>=1.3.0:www/rubygem-rack16 \
+		rubygem-rack-accept>=0:www/rubygem-rack-accept \
+		rubygem-rack-mount>=0:www/rubygem-rack-mount\
+		rubygem-virtus>=1.0.0:devel/rubygem-virtus
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-grit/Makefile b/devel/rubygem-grit/Makefile
index 82098ac6f17c..355230abfa5d 100644
--- a/devel/rubygem-grit/Makefile
+++ b/devel/rubygem-grit/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Object-oriented ruby library to access git repositories
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.1:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-mime-types1>=1.15:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn
+RUN_DEPENDS=	rubygem-diff-lcs>=1.1:textproc/rubygem-diff-lcs \
+		rubygem-mime-types1>=1.15:misc/rubygem-mime-types1 \
+		rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-gyoku/Makefile b/devel/rubygem-gyoku/Makefile
index 464ce6c5d6d4..6b96441a30f2 100644
--- a/devel/rubygem-gyoku/Makefile
+++ b/devel/rubygem-gyoku/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for translating Ruby hashes to XML
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=2.1.2:${PORTSDIR}/devel/rubygem-builder32
+RUN_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-hoe/Makefile b/devel/rubygem-hoe/Makefile
index 54c7a049a570..244c6e86ad14 100644
--- a/devel/rubygem-hoe/Makefile
+++ b/devel/rubygem-hoe/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple rake/rubygems helper for project Rakefiles
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rake>=0.8:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-rake>=0.8:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-io-like/Makefile b/devel/rubygem-io-like/Makefile
index 2d1f3562f209..d1ab453ff856 100644
--- a/devel/rubygem-io-like/Makefile
+++ b/devel/rubygem-io-like/Makefile
@@ -13,8 +13,8 @@ COMMENT=	The interface of IO objects to classes providing a few simple methods
 LICENSE=	RUBY
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+BUILD_DEPENDS=	${RUBYGEMBIN}:devel/ruby-gems
+RUN_DEPENDS=	${RUBYGEMBIN}:devel/ruby-gems
 
 USE_RUBY=	yes
 USE_RAKE=	yes
@@ -56,7 +56,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-ruby-1.9-temp
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	rubygem-allison>=0:${PORTSDIR}/devel/rubygem-allison
+DOCS_BUILD_DEPENDS=	rubygem-allison>=0:devel/rubygem-allison
 DOCS_VARS_OFF=		RUBYGEM_ARGS+=--no-rdoc
 
 post-patch:
diff --git a/devel/rubygem-jammit/Makefile b/devel/rubygem-jammit/Makefile
index 31abbbe2568c..76f752a0083b 100644
--- a/devel/rubygem-jammit/Makefile
+++ b/devel/rubygem-jammit/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Industrial strength asset packaging library for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-cssmin>=1.0:${PORTSDIR}/textproc/rubygem-cssmin \
-		rubygem-jsmin>=1.0:${PORTSDIR}/textproc/rubygem-jsmin
+RUN_DEPENDS=	rubygem-cssmin>=1.0:textproc/rubygem-cssmin \
+		rubygem-jsmin>=1.0:textproc/rubygem-jsmin
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jbuilder/Makefile b/devel/rubygem-jbuilder/Makefile
index 3948418839bf..8d6c391c75d6 100644
--- a/devel/rubygem-jbuilder/Makefile
+++ b/devel/rubygem-jbuilder/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Create JSON structures via a Builder-style DSL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-activesupport4>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-multi_json>=1.2:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS?=	rubygem-activesupport4>=3.0.0:devel/rubygem-activesupport4 \
+		rubygem-multi_json>=1.2:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jekyll-coffeescript/Makefile b/devel/rubygem-jekyll-coffeescript/Makefile
index 349631164c05..4ef501f50d2d 100644
--- a/devel/rubygem-jekyll-coffeescript/Makefile
+++ b/devel/rubygem-jekyll-coffeescript/Makefile
@@ -11,7 +11,7 @@ COMMENT=	CoffeeScript converter for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-coffee-script>=2.2:${PORTSDIR}/devel/rubygem-coffee-script
+RUN_DEPENDS=	rubygem-coffee-script>=2.2:devel/rubygem-coffee-script
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jeweler/Makefile b/devel/rubygem-jeweler/Makefile
index 4d7cc666c14e..b1e5c5b00a30 100644
--- a/devel/rubygem-jeweler/Makefile
+++ b/devel/rubygem-jeweler/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Simple and opinionated helper for creating Rubygem projects
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-bundler>=1.0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-git>=1.2.5:${PORTSDIR}/devel/rubygem-git \
-		rubygem-github_api>=0:${PORTSDIR}/devel/rubygem-github_api \
-		rubygem-highline>=1.6.15:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-nokogiri>=1.5.10:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
+		rubygem-bundler>=1.0:sysutils/rubygem-bundler \
+		rubygem-git>=1.2.5:devel/rubygem-git \
+		rubygem-github_api>=0:devel/rubygem-github_api \
+		rubygem-highline>=1.6.15:devel/rubygem-highline \
+		rubygem-nokogiri>=1.5.10:textproc/rubygem-nokogiri \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-jquery-ui-themes/Makefile b/devel/rubygem-jquery-ui-themes/Makefile
index 48be2125315e..e36508b9056a 100644
--- a/devel/rubygem-jquery-ui-themes/Makefile
+++ b/devel/rubygem-jquery-ui-themes/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows inclusion of pre-built jquery themes without editing
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-httparty>=0:${PORTSDIR}/www/rubygem-httparty
+RUN_DEPENDS=	rubygem-httparty>=0:www/rubygem-httparty
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-kafo/Makefile b/devel/rubygem-kafo/Makefile
index 6b0dd33b6922..d2d8e7533aac 100644
--- a/devel/rubygem-kafo/Makefile
+++ b/devel/rubygem-kafo/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Ruby framework to create installers
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed \
-		rubygem-ansi>=0:${PORTSDIR}/devel/rubygem-ansi \
-		rubygem-clamp>=0.6.2:${PORTSDIR}/devel/rubygem-clamp \
-		rubygem-highline>=1.6.21:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-kafo_parsers>=0:${PORTSDIR}/devel/rubygem-kafo_parsers \
-		rubygem-kafo_wizards>=0:${PORTSDIR}/devel/rubygem-kafo_wizards \
-		rubygem-logging>=0:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-powerbar>=0:${PORTSDIR}/devel/rubygem-powerbar
+RUN_DEPENDS=	gsed:textproc/gsed \
+		rubygem-ansi>=0:devel/rubygem-ansi \
+		rubygem-clamp>=0.6.2:devel/rubygem-clamp \
+		rubygem-highline>=1.6.21:devel/rubygem-highline \
+		rubygem-kafo_parsers>=0:devel/rubygem-kafo_parsers \
+		rubygem-kafo_wizards>=0:devel/rubygem-kafo_wizards \
+		rubygem-logging>=0:devel/rubygem-logging \
+		rubygem-powerbar>=0:devel/rubygem-powerbar
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-kafo_parsers/Makefile b/devel/rubygem-kafo_parsers/Makefile
index 15ad87835b5f..c438e60d6f94 100644
--- a/devel/rubygem-kafo_parsers/Makefile
+++ b/devel/rubygem-kafo_parsers/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Parser for puppet modules
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	puppet:${PORTSDIR}/sysutils/puppet38
+RUN_DEPENDS=	puppet:sysutils/puppet38
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-kafo_wizards/Makefile b/devel/rubygem-kafo_wizards/Makefile
index 8220ead54711..981badf75713 100644
--- a/devel/rubygem-kafo_wizards/Makefile
+++ b/devel/rubygem-kafo_wizards/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Create wizard like interfaces in terminal applications
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=0:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-launchy/Makefile b/devel/rubygem-launchy/Makefile
index 20e762d7ede2..53a65df6a9a3 100644
--- a/devel/rubygem-launchy/Makefile
+++ b/devel/rubygem-launchy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Helper class for launching cross-platform applications
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-launchy22/Makefile b/devel/rubygem-launchy22/Makefile
index adbf01fb0c4d..d30c2a05a813 100644
--- a/devel/rubygem-launchy22/Makefile
+++ b/devel/rubygem-launchy22/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Helper class for launching cross-platform applications
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-librarian/Makefile b/devel/rubygem-librarian/Makefile
index 39db36777376..57fc34bc82f9 100644
--- a/devel/rubygem-librarian/Makefile
+++ b/devel/rubygem-librarian/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Ruby framework for writing bundlers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}highline>=0:${PORTSDIR}/devel/rubygem-highline \
-		${PKGNAMEPREFIX}thor>=0.15:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	${PKGNAMEPREFIX}highline>=0:devel/rubygem-highline \
+		${PKGNAMEPREFIX}thor>=0.15:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-librarianp/Makefile b/devel/rubygem-librarianp/Makefile
index 71d36942b03c..52c3c23c4c6d 100644
--- a/devel/rubygem-librarianp/Makefile
+++ b/devel/rubygem-librarianp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby framework for writing bundlers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-thor>=0.15:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-thor>=0.15:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-licensee/Makefile b/devel/rubygem-licensee/Makefile
index 3a06de11d810..0a415ea6d91f 100644
--- a/devel/rubygem-licensee/Makefile
+++ b/devel/rubygem-licensee/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Detects under what license a project is distributed
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rugged>=0.23:${PORTSDIR}/devel/rubygem-rugged
+RUN_DEPENDS=	rubygem-rugged>=0.23:devel/rubygem-rugged
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-listen/Makefile b/devel/rubygem-listen/Makefile
index 40356248366a..77f1a76349dc 100644
--- a/devel/rubygem-listen/Makefile
+++ b/devel/rubygem-listen/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Listen to file modifications and notify about the changes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-rb-fsevent>=0.9.3:${PORTSDIR}/devel/rubygem-rb-fsevent \
-		rubygem-rb-inotify>=0.9.7:${PORTSDIR}/devel/rubygem-rb-inotify \
-		rubygem-rb-kqueue>=0.2:${PORTSDIR}/devel/rubygem-rb-kqueue
+RUN_DEPENDS=	rubygem-rb-fsevent>=0.9.3:devel/rubygem-rb-fsevent \
+		rubygem-rb-inotify>=0.9.7:devel/rubygem-rb-inotify \
+		rubygem-rb-kqueue>=0.2:devel/rubygem-rb-kqueue
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-logging/Makefile b/devel/rubygem-logging/Makefile
index a8e24a259ff0..f059f0deb610 100644
--- a/devel/rubygem-logging/Makefile
+++ b/devel/rubygem-logging/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Logging library based on Java's log4j
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-little-plugger>=1.1.3:${PORTSDIR}/devel/rubygem-little-plugger \
-		rubygem-multi_json>=1.8.4:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-little-plugger>=1.1.3:devel/rubygem-little-plugger \
+		rubygem-multi_json>=1.8.4:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-main/Makefile b/devel/rubygem-main/Makefile
index 1904cde48829..3bede5bd6fbd 100644
--- a/devel/rubygem-main/Makefile
+++ b/devel/rubygem-main/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Class Factory and Dsl for Generating Command Line Programs
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-arrayfields>=4.7.4:${PORTSDIR}/devel/rubygem-arrayfields \
-		rubygem-chronic>=0.6.2:${PORTSDIR}/devel/rubygem-chronic \
-		rubygem-fattr>=2.2.0:${PORTSDIR}/devel/rubygem-fattr \
-		rubygem-map>=5.1.0:${PORTSDIR}/devel/rubygem-map
+RUN_DEPENDS=	rubygem-arrayfields>=4.7.4:devel/rubygem-arrayfields \
+		rubygem-chronic>=0.6.2:devel/rubygem-chronic \
+		rubygem-fattr>=2.2.0:devel/rubygem-fattr \
+		rubygem-map>=5.1.0:devel/rubygem-map
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-memoizable/Makefile b/devel/rubygem-memoizable/Makefile
index df1a8e0ed998..555c74f2aaa1 100644
--- a/devel/rubygem-memoizable/Makefile
+++ b/devel/rubygem-memoizable/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Memoize method return values
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:${PORTSDIR}/devel/rubygem-thread_safe
+RUN_DEPENDS=	rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-memoize/Makefile b/devel/rubygem-memoize/Makefile
index a83308f589dc..0b68add6e20f 100644
--- a/devel/rubygem-memoize/Makefile
+++ b/devel/rubygem-memoize/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Speeds up methods at the cost of memory (or disk space)
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-test-unit>=2.0.2:${PORTSDIR}/devel/rubygem-test-unit
+RUN_DEPENDS=	rubygem-test-unit>=2.0.2:devel/rubygem-test-unit
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-message_bus/Makefile b/devel/rubygem-message_bus/Makefile
index a25ba88f4fe9..5d083009ba3b 100644
--- a/devel/rubygem-message_bus/Makefile
+++ b/devel/rubygem-message_bus/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Message bus for rack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-rack16>=1.1.3:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-redis>=0:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-rack16>=1.1.3:www/rubygem-rack16 \
+		rubygem-redis>=0:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-mixlib-authentication/Makefile b/devel/rubygem-mixlib-authentication/Makefile
index 8523d4e2f9c8..e1360a7b64d3 100644
--- a/devel/rubygem-mixlib-authentication/Makefile
+++ b/devel/rubygem-mixlib-authentication/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	Mixes in simple per-request authentication
 
-RUN_DEPENDS=	rubygem-mixlib-log>=0:${PORTSDIR}/devel/rubygem-mixlib-log
+RUN_DEPENDS=	rubygem-mixlib-log>=0:devel/rubygem-mixlib-log
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-mocha/Makefile b/devel/rubygem-mocha/Makefile
index 4420b774ff41..376bed14112a 100644
--- a/devel/rubygem-mocha/Makefile
+++ b/devel/rubygem-mocha/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for mocking and stubbing syntax like JMock and SchMock
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-metaclass>=0:${PORTSDIR}/devel/rubygem-metaclass
+RUN_DEPENDS=	rubygem-metaclass>=0:devel/rubygem-metaclass
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-mongo/Makefile b/devel/rubygem-mongo/Makefile
index c9e53c214be3..80e8125df69e 100644
--- a/devel/rubygem-mongo/Makefile
+++ b/devel/rubygem-mongo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby driver for MongoDB
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-bson1>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-bson1
+RUN_DEPENDS=	rubygem-bson1>=${PORTVERSION}:devel/rubygem-bson1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-multi_json/Makefile b/devel/rubygem-multi_json/Makefile
index 18d03c3bbf6b..bf6e6b838a7a 100644
--- a/devel/rubygem-multi_json/Makefile
+++ b/devel/rubygem-multi_json/Makefile
@@ -23,8 +23,8 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-JSON_RUN_DEPENDS=	rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
-JSON_PURE_RUN_DEPENDS=	rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
-YAJL_RUBY_RUN_DEPENDS=	rubygem-yajl-ruby>=0:${PORTSDIR}/devel/rubygem-yajl-ruby
+JSON_RUN_DEPENDS=	rubygem-json>=0:devel/rubygem-json
+JSON_PURE_RUN_DEPENDS=	rubygem-json_pure>=0:devel/rubygem-json_pure
+YAJL_RUBY_RUN_DEPENDS=	rubygem-yajl-ruby>=0:devel/rubygem-yajl-ruby
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-newrelic-grape/Makefile b/devel/rubygem-newrelic-grape/Makefile
index 06f04f53fb27..a4bfe0091488 100644
--- a/devel/rubygem-newrelic-grape/Makefile
+++ b/devel/rubygem-newrelic-grape/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Newrelic instrument for grape
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS?=	rubygem-grape>=0:${PORTSDIR}/devel/rubygem-grape \
-		rubygem-newrelic_rpm>=0:${PORTSDIR}/devel/rubygem-newrelic_rpm
+RUN_DEPENDS?=	rubygem-grape>=0:devel/rubygem-grape \
+		rubygem-newrelic_rpm>=0:devel/rubygem-newrelic_rpm
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-nice-ffi/Makefile b/devel/rubygem-nice-ffi/Makefile
index e5ada75d4983..e27f9ff51893 100644
--- a/devel/rubygem-nice-ffi/Makefile
+++ b/devel/rubygem-nice-ffi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Convenience layer atop Ruby-FFI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ffi>=0.5.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=0.5.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-notiffany/Makefile b/devel/rubygem-notiffany/Makefile
index a3ceae3ea2aa..30622363cefe 100644
--- a/devel/rubygem-notiffany/Makefile
+++ b/devel/rubygem-notiffany/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Single wrapper for most popular notification libraries
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-nenv>=0.1:${PORTSDIR}/devel/rubygem-nenv \
-		rubygem-shellany>=0:${PORTSDIR}/sysutils/rubygem-shellany
+RUN_DEPENDS=	rubygem-nenv>=0.1:devel/rubygem-nenv \
+		rubygem-shellany>=0:sysutils/rubygem-shellany
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-octopress-hooks/Makefile b/devel/rubygem-octopress-hooks/Makefile
index 3b8caddd6ccd..40a4a28b11c2 100644
--- a/devel/rubygem-octopress-hooks/Makefile
+++ b/devel/rubygem-octopress-hooks/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows access to Jekyll data at different internal processing stages
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=2.0:${PORTSDIR}/www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll>=2.0:www/rubygem-jekyll
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-omniauth_crowd/Makefile b/devel/rubygem-omniauth_crowd/Makefile
index 6e3fa6d7cdeb..66863635bb3d 100644
--- a/devel/rubygem-omniauth_crowd/Makefile
+++ b/devel/rubygem-omniauth_crowd/Makefile
@@ -11,9 +11,9 @@ COMMENT=	OmniAuth provider for Atlassian Crowds REST API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS?=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-nokogiri>=1.4.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS?=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri \
+		rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-open3_backport/Makefile b/devel/rubygem-open3_backport/Makefile
index f3a04e49fc66..5f079ddf1569 100644
--- a/devel/rubygem-open3_backport/Makefile
+++ b/devel/rubygem-open3_backport/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Backport of Ruby 1.9's Open3 methods for Ruby 1.8
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}open4>=1.3:${PORTSDIR}/devel/rubygem-open4
+RUN_DEPENDS=	${PKGNAMEPREFIX}open4>=1.3:devel/rubygem-open4
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-p4ruby/Makefile b/devel/rubygem-p4ruby/Makefile
index 4c5f1d084cd1..26b6a033e29b 100644
--- a/devel/rubygem-p4ruby/Makefile
+++ b/devel/rubygem-p4ruby/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Ruby bindings for the Perforce API
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/perforce/libclient.a:${PORTSDIR}/devel/p4api
+BUILD_DEPENDS+=	${LOCALBASE}/lib/perforce/libclient.a:devel/p4api
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
diff --git a/devel/rubygem-paperclip/Makefile b/devel/rubygem-paperclip/Makefile
index c9ebcf9c28c4..2392c03b364a 100644
--- a/devel/rubygem-paperclip/Makefile
+++ b/devel/rubygem-paperclip/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Easy upload management for ActiveRecord
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=3.2.0:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-activesupport4>=3.2.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-cocaine>=0.5.5:${PORTSDIR}/devel/rubygem-cocaine \
-		rubygem-mimemagic>=0.3.0:${PORTSDIR}/misc/rubygem-mimemagic \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types
+RUN_DEPENDS=	rubygem-activemodel4>=3.2.0:databases/rubygem-activemodel4 \
+		rubygem-activesupport4>=3.2.0:devel/rubygem-activesupport4 \
+		rubygem-cocaine>=0.5.5:devel/rubygem-cocaine \
+		rubygem-mimemagic>=0.3.0:misc/rubygem-mimemagic \
+		rubygem-mime-types>=0:misc/rubygem-mime-types
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-parser/Makefile b/devel/rubygem-parser/Makefile
index b0bee54e7276..e25638a250a2 100644
--- a/devel/rubygem-parser/Makefile
+++ b/devel/rubygem-parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby parser written in pure Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-ast>=2.2:${PORTSDIR}/devel/rubygem-ast
+RUN_DEPENDS=	rubygem-ast>=2.2:devel/rubygem-ast
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-pluggaloid/Makefile b/devel/rubygem-pluggaloid/Makefile
index a185953acf5e..7cbaa2a37f7b 100644
--- a/devel/rubygem-pluggaloid/Makefile
+++ b/devel/rubygem-pluggaloid/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extensible plugin system for mikutter
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-delayer>=0:${PORTSDIR}/devel/rubygem-delayer \
-		rubygem-instance_storage>=1.0.0:${PORTSDIR}/devel/rubygem-instance_storage
+RUN_DEPENDS=	rubygem-delayer>=0:devel/rubygem-delayer \
+		rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-polyamorous/Makefile b/devel/rubygem-polyamorous/Makefile
index 308b3f0b4d87..7b873bef9d59 100644
--- a/devel/rubygem-polyamorous/Makefile
+++ b/devel/rubygem-polyamorous/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extraction of shared code from the Active Record Hackery gems
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.0:${PORTSDIR}/databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=3.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-popen4/Makefile b/devel/rubygem-popen4/Makefile
index 91b59e4e6e7c..70a6bced7e58 100644
--- a/devel/rubygem-popen4/Makefile
+++ b/devel/rubygem-popen4/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Cross platform API for managing child processes
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-open4>=0.4.0:${PORTSDIR}/devel/rubygem-open4 \
-		rubygem-platform>=0.4.0:${PORTSDIR}/devel/rubygem-platform
+RUN_DEPENDS=	rubygem-open4>=0.4.0:devel/rubygem-open4 \
+		rubygem-platform>=0.4.0:devel/rubygem-platform
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-powerbar/Makefile b/devel/rubygem-powerbar/Makefile
index 1312ede5b140..f5bdeb50b5b8 100644
--- a/devel/rubygem-powerbar/Makefile
+++ b/devel/rubygem-powerbar/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Progressbar library for Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hashie>=1.1.0:${PORTSDIR}/devel/rubygem-hashie
+RUN_DEPENDS=	rubygem-hashie>=1.1.0:devel/rubygem-hashie
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-protected_attributes/Makefile b/devel/rubygem-protected_attributes/Makefile
index 8db1bf9044bd..4d1f00965d0e 100644
--- a/devel/rubygem-protected_attributes/Makefile
+++ b/devel/rubygem-protected_attributes/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Protect attributes from mass assignment
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.0.1:${PORTSDIR}/databases/rubygem-activemodel4
+RUN_DEPENDS=	rubygem-activemodel4>=4.0.1:databases/rubygem-activemodel4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-prototype-rails/Makefile b/devel/rubygem-prototype-rails/Makefile
index e891806e468b..f972b0a83ac0 100644
--- a/devel/rubygem-prototype-rails/Makefile
+++ b/devel/rubygem-prototype-rails/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Provides Prototype, Scriptaculous, and RJS for Rails
 
-RUN_DEPENDS=	rubygem-rails>=3.2.0:${PORTSDIR}/www/rubygem-rails
+RUN_DEPENDS=	rubygem-rails>=3.2.0:www/rubygem-rails
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-pry-rails/Makefile b/devel/rubygem-pry-rails/Makefile
index b676a176dde2..5a7e2891afa3 100644
--- a/devel/rubygem-pry-rails/Makefile
+++ b/devel/rubygem-pry-rails/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Use Pry as your rails console
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	rubygem-pry>=0.9.10:${PORTSDIR}/devel/rubygem-pry
+RUN_DEPENDS=	rubygem-pry>=0.9.10:devel/rubygem-pry
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-pry-remote-em/Makefile b/devel/rubygem-pry-remote-em/Makefile
index b820b3cdecad..4fdf557c79f8 100644
--- a/devel/rubygem-pry-remote-em/Makefile
+++ b/devel/rubygem-pry-remote-em/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Connect to Pry remotely using EventMachine
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-eventmachine>=0:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-pry>=0.9:${PORTSDIR}/devel/rubygem-pry
+RUN_DEPENDS=	rubygem-eventmachine>=0:devel/rubygem-eventmachine \
+		rubygem-highline>=0:devel/rubygem-highline \
+		rubygem-pry>=0.9:devel/rubygem-pry
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-pry/Makefile b/devel/rubygem-pry/Makefile
index dabd5b9c89b5..aea16b9e73cb 100644
--- a/devel/rubygem-pry/Makefile
+++ b/devel/rubygem-pry/Makefile
@@ -13,9 +13,9 @@ COMMENT=	IRB alternative and runtime developer console
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-coderay>=1.1.0:${PORTSDIR}/textproc/rubygem-coderay \
-		rubygem-method_source>=0.8.1:${PORTSDIR}/devel/rubygem-method_source \
-		rubygem-slop3>=3.4.0:${PORTSDIR}/devel/rubygem-slop3
+RUN_DEPENDS=	rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
+		rubygem-method_source>=0.8.1:devel/rubygem-method_source \
+		rubygem-slop3>=3.4.0:devel/rubygem-slop3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ptreloaded/Makefile b/devel/rubygem-ptreloaded/Makefile
index ac446acb27d3..b19a5cdd7ef6 100644
--- a/devel/rubygem-ptreloaded/Makefile
+++ b/devel/rubygem-ptreloaded/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	ParseTreeReloaded-${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Reimplementation of ParseTree using RubyInlineAcceleration
 
-RUN_DEPENDS=	rubygem-rubyinlineaccel>=0.0.1:${PORTSDIR}/devel/rubygem-rubyinlineaccel
+RUN_DEPENDS=	rubygem-rubyinlineaccel>=0.0.1:devel/rubygem-rubyinlineaccel
 
 LICENSE=	GPLv2
 
diff --git a/devel/rubygem-pygments.rb/Makefile b/devel/rubygem-pygments.rb/Makefile
index a7b874f864fa..daba1b41e770 100644
--- a/devel/rubygem-pygments.rb/Makefile
+++ b/devel/rubygem-pygments.rb/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Exposes the pygments syntax highlighter to Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
-		rubygem-yajl-ruby>=1.2.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
+		rubygem-yajl-ruby>=1.2.0:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rack-mini-profiler/Makefile b/devel/rubygem-rack-mini-profiler/Makefile
index f449395eed0e..f12c72f93b0f 100644
--- a/devel/rubygem-rack-mini-profiler/Makefile
+++ b/devel/rubygem-rack-mini-profiler/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Profiles loading speed for rack applications
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rack16>=1.2.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-rack16>=1.2.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rack-raw-upload/Makefile b/devel/rubygem-rack-raw-upload/Makefile
index 6e94e59dea80..5ef98bd96c4f 100644
--- a/devel/rubygem-rack-raw-upload/Makefile
+++ b/devel/rubygem-rack-raw-upload/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Converts mimetype of application/octet-stream into normal form input
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rails-deprecated_sanitizer/Makefile b/devel/rubygem-rails-deprecated_sanitizer/Makefile
index e63de668ebdf..b4f74b6cbaac 100644
--- a/devel/rubygem-rails-deprecated_sanitizer/Makefile
+++ b/devel/rubygem-rails-deprecated_sanitizer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Deprecated sanitizer API extracted from Action View
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.2.1:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=4.2.1:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rails-observers/Makefile b/devel/rubygem-rails-observers/Makefile
index 962ef21f680d..9eb29d8fc92f 100644
--- a/devel/rubygem-rails-observers/Makefile
+++ b/devel/rubygem-rails-observers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Observer classes for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.0:${PORTSDIR}/databases/rubygem-activemodel4
+RUN_DEPENDS=	rubygem-activemodel4>=4.0:databases/rubygem-activemodel4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rake-compiler/Makefile b/devel/rubygem-rake-compiler/Makefile
index 9b065bf7b4fb..bf438d5a7e6f 100644
--- a/devel/rubygem-rake-compiler/Makefile
+++ b/devel/rubygem-rake-compiler/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Build and package Ruby extensions (C, Java) using Rake
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ransack/Makefile b/devel/rubygem-ransack/Makefile
index 3102f87828ab..bebb2aa44fbe 100644
--- a/devel/rubygem-ransack/Makefile
+++ b/devel/rubygem-ransack/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Successor to the MetaSearch gem
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=3.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activerecord4>=3.0:${PORTSDIR}/databases/rubygem-activerecord4 \
-		rubygem-activesupport4>=3.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-i18n>=0:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-polyamorous>=1.2:${PORTSDIR}/devel/rubygem-polyamorous
+RUN_DEPENDS=	rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
+		rubygem-activerecord4>=3.0:databases/rubygem-activerecord4 \
+		rubygem-activesupport4>=3.0:devel/rubygem-activesupport4 \
+		rubygem-i18n>=0:devel/rubygem-i18n \
+		rubygem-polyamorous>=1.2:devel/rubygem-polyamorous
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rash/Makefile b/devel/rubygem-rash/Makefile
index 84cd44017077..02ff096ef19f 100644
--- a/devel/rubygem-rash/Makefile
+++ b/devel/rubygem-rash/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple extension to Hashie::Mash for rubyfied keys
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-hashie>=2.0.0:${PORTSDIR}/devel/rubygem-hashie
+RUN_DEPENDS=	rubygem-hashie>=2.0.0:devel/rubygem-hashie
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rb-inotify/Makefile b/devel/rubygem-rb-inotify/Makefile
index 643dc1f1cd08..f47f838c0bf3 100644
--- a/devel/rubygem-rb-inotify/Makefile
+++ b/devel/rubygem-rb-inotify/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby wrapper for libinotify, using ffi
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
-RUN_DEPENDS=	rubygem-ffi>=0.5.0:${PORTSDIR}/devel/rubygem-ffi
+LIB_DEPENDS=	libinotify.so:devel/libinotify
+RUN_DEPENDS=	rubygem-ffi>=0.5.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rb-kqueue/Makefile b/devel/rubygem-rb-kqueue/Makefile
index 25e170acb0fb..bd2ecacb2f4f 100644
--- a/devel/rubygem-rb-kqueue/Makefile
+++ b/devel/rubygem-rb-kqueue/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby wrapper for BSD kqueue, using FFI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ffi>=0.5.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=0.5.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rbtrace/Makefile b/devel/rubygem-rbtrace/Makefile
index 511bebe9f5aa..1415d96fe652 100644
--- a/devel/rubygem-rbtrace/Makefile
+++ b/devel/rubygem-rbtrace/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Shows method calls inside another ruby process in real time
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-xRUN_DEPENDS=	rubygem-ffi>=1.0.6:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-msgpack>=0.4.3:${PORTSDIR}/devel/rubygem-msgpack \
-		rubygem-trollop>=1.16.2:${PORTSDIR}/devel/rubygem-trollop
+xRUN_DEPENDS=	rubygem-ffi>=1.0.6:devel/rubygem-ffi \
+		rubygem-msgpack>=0.4.3:devel/rubygem-msgpack \
+		rubygem-trollop>=1.16.2:devel/rubygem-trollop
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile
index 57461f6b28c1..3239a3e41421 100644
--- a/devel/rubygem-rdoc/Makefile
+++ b/devel/rubygem-rdoc/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.rdoc
 
-RUN_DEPENDS=	rubygem-json>=1.4:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.4:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rdoc3/Makefile b/devel/rubygem-rdoc3/Makefile
index e05a12a47e1f..3e8b30becd79 100644
--- a/devel/rubygem-rdoc3/Makefile
+++ b/devel/rubygem-rdoc3/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.rdoc
 
-RUN_DEPENDS=	rubygem-json>=1.4:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.4:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-redis-activesupport/Makefile b/devel/rubygem-redis-activesupport/Makefile
index 0fd6b93165e4..1ab1ce106dd7 100644
--- a/devel/rubygem-redis-activesupport/Makefile
+++ b/devel/rubygem-redis-activesupport/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Redis store for ActiveSupport::Cache
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=3:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-redis-store>=1.1.0:${PORTSDIR}/devel/rubygem-redis-store
+RUN_DEPENDS=	rubygem-activesupport4>=3:devel/rubygem-activesupport4 \
+		rubygem-redis-store>=1.1.0:devel/rubygem-redis-store
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-redis-store/Makefile b/devel/rubygem-redis-store/Makefile
index 0866dcab7421..5253497fe57f 100644
--- a/devel/rubygem-redis-store/Makefile
+++ b/devel/rubygem-redis-store/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Namespaced Redis stores for Ruby web frameworks
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-redis>=2.2:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rgl/Makefile b/devel/rubygem-rgl/Makefile
index 2702b81a5271..b2c009e68809 100644
--- a/devel/rubygem-rgl/Makefile
+++ b/devel/rubygem-rgl/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Framework for graph datastructures and algorithms implemented in Ruby
 
-RUN_DEPENDS=	rubygem-algorithms>=0.6.1:${PORTSDIR}/devel/rubygem-algorithms \
-		rubygem-stream>=0.5.0:${PORTSDIR}/devel/rubygem-stream
+RUN_DEPENDS=	rubygem-algorithms>=0.6.1:devel/rubygem-algorithms \
+		rubygem-stream>=0.5.0:devel/rubygem-stream
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rodzilla/Makefile b/devel/rubygem-rodzilla/Makefile
index d6d18dccf098..de2adddaf9aa 100644
--- a/devel/rubygem-rodzilla/Makefile
+++ b/devel/rubygem-rodzilla/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bugzilla API Client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-httparty>=0.12.0:${PORTSDIR}/www/rubygem-httparty
+RUN_DEPENDS=	rubygem-httparty>=0.12.0:www/rubygem-httparty
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rrd-ffi/Makefile b/devel/rubygem-rrd-ffi/Makefile
index 01d21f684f06..9f00054ea243 100644
--- a/devel/rubygem-rrd-ffi/Makefile
+++ b/devel/rubygem-rrd-ffi/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Ruby bindings for RRD functions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
-		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-ffi>=0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rrdtool:databases/rrdtool \
+		rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-ffi>=0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rspec-core/Makefile b/devel/rubygem-rspec-core/Makefile
index 4ae79c33db58..3f46ed038d47 100644
--- a/devel/rubygem-rspec-core/Makefile
+++ b/devel/rubygem-rspec-core/Makefile
@@ -12,7 +12,7 @@ COMMENT=	RSpec Core provides the structure for writing executable examples
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rspec-support>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec-expectations/Makefile b/devel/rubygem-rspec-expectations/Makefile
index 6b5db5554cc1..c39423dbc5bb 100644
--- a/devel/rubygem-rspec-expectations/Makefile
+++ b/devel/rubygem-rspec-expectations/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Rspec-expectations adds should and should_not to every object
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-rspec-support>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:textproc/rubygem-diff-lcs \
+		rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec-mocks/Makefile b/devel/rubygem-rspec-mocks/Makefile
index 6748144c1ebe..64c780187dde 100644
--- a/devel/rubygem-rspec-mocks/Makefile
+++ b/devel/rubygem-rspec-mocks/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Rspec-mocks provides a test-double framework for rspec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-rspec-support>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-diff-lcs>=1.2.0:textproc/rubygem-diff-lcs \
+		rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec-rails/Makefile b/devel/rubygem-rspec-rails/Makefile
index 2ec85540bc14..347eea9ae73c 100644
--- a/devel/rubygem-rspec-rails/Makefile
+++ b/devel/rubygem-rspec-rails/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Testing framework for Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/License.md
 
-RUN_DEPENDS=	rubygem-actionpack4>=3.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=3.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-railties4>=3.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-rspec-core>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-core \
-		rubygem-rspec-expectations>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-expectations \
-		rubygem-rspec-mocks>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-mocks \
-		rubygem-rspec-support>=${PORTVERSION:R}.0:${PORTSDIR}/devel/rubygem-rspec-support
+RUN_DEPENDS=	rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=3.0:devel/rubygem-activesupport4 \
+		rubygem-railties4>=3.0:www/rubygem-railties4 \
+		rubygem-rspec-core>=${PORTVERSION:R}.0:devel/rubygem-rspec-core \
+		rubygem-rspec-expectations>=${PORTVERSION:R}.0:devel/rubygem-rspec-expectations \
+		rubygem-rspec-mocks>=${PORTVERSION:R}.0:devel/rubygem-rspec-mocks \
+		rubygem-rspec-support>=${PORTVERSION:R}.0:devel/rubygem-rspec-support
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rspec/Makefile b/devel/rubygem-rspec/Makefile
index 1e1925ebe437..8b59377b1c68 100644
--- a/devel/rubygem-rspec/Makefile
+++ b/devel/rubygem-rspec/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Behaviour Driven Development in Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-rspec-core>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-core \
-		rubygem-rspec-expectations>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-expectations \
-		rubygem-rspec-mocks>=${PORTVERSION:R}:${PORTSDIR}/devel/rubygem-rspec-mocks
+RUN_DEPENDS=	rubygem-rspec-core>=${PORTVERSION:R}:devel/rubygem-rspec-core \
+		rubygem-rspec-expectations>=${PORTVERSION:R}:devel/rubygem-rspec-expectations \
+		rubygem-rspec-mocks>=${PORTVERSION:R}:devel/rubygem-rspec-mocks
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rubigen/Makefile b/devel/rubygem-rubigen/Makefile
index 307a12f9f74c..741b72176534 100644
--- a/devel/rubygem-rubigen/Makefile
+++ b/devel/rubygem-rubigen/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby generic generator framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activesupport>=2.3.5:${PORTSDIR}/devel/rubygem-activesupport
+RUN_DEPENDS=	rubygem-activesupport>=2.3.5:devel/rubygem-activesupport
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-ruby-atmos-pure/Makefile b/devel/rubygem-ruby-atmos-pure/Makefile
index 7d96dd71ba3f..7e81a3c166c7 100644
--- a/devel/rubygem-ruby-atmos-pure/Makefile
+++ b/devel/rubygem-ruby-atmos-pure/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Client library for EMC Atmos REST API
 
-RUN_DEPENDS=	rubygem-log4r>=1.1.9:${PORTSDIR}/sysutils/rubygem-log4r \
-		rubygem-ruby-hmac>=0.4.0:${PORTSDIR}/security/rubygem-ruby-hmac
+RUN_DEPENDS=	rubygem-log4r>=1.1.9:sysutils/rubygem-log4r \
+		rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby-bugzilla/Makefile b/devel/rubygem-ruby-bugzilla/Makefile
index 7f41cd862094..ec401d3b6e7b 100644
--- a/devel/rubygem-ruby-bugzilla/Makefile
+++ b/devel/rubygem-ruby-bugzilla/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Access to Bugzilla through WebService APIs in Ruby
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-gruff>=0:${PORTSDIR}/graphics/rubygem-gruff \
-		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-gruff>=0:graphics/rubygem-gruff \
+		rubygem-highline>=0:devel/rubygem-highline
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby-fogbugz/Makefile b/devel/rubygem-ruby-fogbugz/Makefile
index 1bc1c51f69a7..a576d7ea2af9 100644
--- a/devel/rubygem-ruby-fogbugz/Makefile
+++ b/devel/rubygem-ruby-fogbugz/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Simple Ruby wrapper for the Fogbugz XML API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-crack>=0.4:${PORTSDIR}/devel/rubygem-crack
+RUN_DEPENDS=	rubygem-crack>=0.4:devel/rubygem-crack
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby-libvirt/Makefile b/devel/rubygem-ruby-libvirt/Makefile
index b562350a08ae..448970ebb4f4 100644
--- a/devel/rubygem-ruby-libvirt/Makefile
+++ b/devel/rubygem-ruby-libvirt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby bindings for libvirt
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS=	libvirt.so:devel/libvirt
 
 USES=		pkgconfig
 
diff --git a/devel/rubygem-ruby-sdl-ffi/Makefile b/devel/rubygem-ruby-sdl-ffi/Makefile
index 89e3a5d7fb7c..1b8b40ffc911 100644
--- a/devel/rubygem-ruby-sdl-ffi/Makefile
+++ b/devel/rubygem-ruby-sdl-ffi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Low-level binding to SDL and related libraries using Ruby-FFI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-nice-ffi>=0.2:${PORTSDIR}/devel/rubygem-nice-ffi
+RUN_DEPENDS=	rubygem-nice-ffi>=0.2:devel/rubygem-nice-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-ruby2ruby/Makefile b/devel/rubygem-ruby2ruby/Makefile
index ffec9cf86296..112c7d569cfc 100644
--- a/devel/rubygem-ruby2ruby/Makefile
+++ b/devel/rubygem-ruby2ruby/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Pure ruby code generator easily from ParseTree's Sexps # '
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ruby_parser>=3.1:${PORTSDIR}/devel/rubygem-ruby_parser \
-		rubygem-sexp_processor>=4.0:${PORTSDIR}/devel/rubygem-sexp_processor
+RUN_DEPENDS=	rubygem-ruby_parser>=3.1:devel/rubygem-ruby_parser \
+		rubygem-sexp_processor>=4.0:devel/rubygem-sexp_processor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruby_parser/Makefile b/devel/rubygem-ruby_parser/Makefile
index 9686802a1a94..27f711a9f38a 100644
--- a/devel/rubygem-ruby_parser/Makefile
+++ b/devel/rubygem-ruby_parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby parser written in pure ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sexp_processor>=4.1:${PORTSDIR}/devel/rubygem-sexp_processor
+RUN_DEPENDS=	rubygem-sexp_processor>=4.1:devel/rubygem-sexp_processor
 
 USES=		shebangfix
 USE_RUBY=	yes
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
index 038913e2c146..e108533d1ce0 100644
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Game-development extension and library for the ruby language
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	rubygem-ruby-sdl-ffi>=0.1.0:${PORTSDIR}/devel/rubygem-ruby-sdl-ffi
+RUN_DEPENDS=	rubygem-ruby-sdl-ffi>=0.1.0:devel/rubygem-ruby-sdl-ffi
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rubygems-mirror/Makefile b/devel/rubygem-rubygems-mirror/Makefile
index d4c7832975f5..7e612971cb6e 100644
--- a/devel/rubygem-rubygems-mirror/Makefile
+++ b/devel/rubygem-rubygems-mirror/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Mirror rubygems
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-http-persistent>=2.9:${PORTSDIR}/www/rubygem-net-http-persistent
+RUN_DEPENDS=	rubygem-net-http-persistent>=2.9:www/rubygem-net-http-persistent
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rubygems-test/Makefile b/devel/rubygem-rubygems-test/Makefile
index fd66a5c8811e..0a9c24860706 100644
--- a/devel/rubygem-rubygems-test/Makefile
+++ b/devel/rubygem-rubygems-test/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Run automated tests
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rake>=0.8.7:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-rake>=0.8.7:devel/rubygem-rake
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-rubyinline/Makefile b/devel/rubygem-rubyinline/Makefile
index 08db5f3da6b5..6bcb1a58e7db 100644
--- a/devel/rubygem-rubyinline/Makefile
+++ b/devel/rubygem-rubyinline/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Inline::C allows you to embed C/Ruby directly in ruby scripts
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-zentest>=4.3:${PORTSDIR}/devel/rubygem-zentest
+RUN_DEPENDS=	rubygem-zentest>=4.3:devel/rubygem-zentest
 
 GEM_NAME=	${DISTNAME}
 
diff --git a/devel/rubygem-rubyinlineaccel/Makefile b/devel/rubygem-rubyinlineaccel/Makefile
index bea2c1c792b3..49d9a148e6b0 100644
--- a/devel/rubygem-rubyinlineaccel/Makefile
+++ b/devel/rubygem-rubyinlineaccel/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	RubyInlineAcceleration-${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Extension to RubyInline
 
-RUN_DEPENDS=	rubygem-rubyinline>=3.6.3:${PORTSDIR}/devel/rubygem-rubyinline
+RUN_DEPENDS=	rubygem-rubyinline>=3.6.3:devel/rubygem-rubyinline
 
 LICENSE=	GPLv2
 
diff --git a/devel/rubygem-rubytree/Makefile b/devel/rubygem-rubytree/Makefile
index 03c5c4a9c685..f0caa6c87864 100644
--- a/devel/rubygem-rubytree/Makefile
+++ b/devel/rubygem-rubytree/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Implementation of the Tree data structure for the Ruby
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-json>=1.8:${PORTSDIR}/devel/rubygem-json \
-		rubygem-structured_warnings>=0.2:${PORTSDIR}/devel/rubygem-structured_warnings
+RUN_DEPENDS=	rubygem-json>=1.8:devel/rubygem-json \
+		rubygem-structured_warnings>=0.2:devel/rubygem-structured_warnings
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile
index 3acc8833d2bf..a27fee6af7a3 100644
--- a/devel/rubygem-rugged/Makefile
+++ b/devel/rubygem-rugged/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Rugged is a Ruby binding to the libgit2 linkable library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake \
-		libgit2>=${PORTVERSION:R}:${PORTSDIR}/devel/libgit2
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	cmake:devel/cmake \
+		libgit2>=${PORTVERSION:R}:devel/libgit2
+LIB_DEPENDS=	libgit2.so:devel/libgit2
 
 CONFIGURE_ARGS=	--use-system-libraries
 USE_RUBY=	yes
diff --git a/devel/rubygem-ruport/Makefile b/devel/rubygem-ruport/Makefile
index c3f6f23306f4..ed879c7759bb 100644
--- a/devel/rubygem-ruport/Makefile
+++ b/devel/rubygem-ruport/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Ruby Reports (Ruport) is an extensible reporting system
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-fastercsv>=0:${PORTSDIR}/devel/rubygem-fastercsv \
-		rubygem-pdf-writer>=1.1.8:${PORTSDIR}/print/rubygem-pdf-writer
+RUN_DEPENDS=	rubygem-fastercsv>=0:devel/rubygem-fastercsv \
+		rubygem-pdf-writer>=1.1.8:print/rubygem-pdf-writer
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-sdoc/Makefile b/devel/rubygem-sdoc/Makefile
index 151a0c7fa4dc..88d49b967d16 100644
--- a/devel/rubygem-sdoc/Makefile
+++ b/devel/rubygem-sdoc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Create rdoc html with javascript search index
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-json>=1.7.7:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.7.7:devel/rubygem-json
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-sentry-raven/Makefile b/devel/rubygem-sentry-raven/Makefile
index fd411686dc99..15c40b367d9c 100644
--- a/devel/rubygem-sentry-raven/Makefile
+++ b/devel/rubygem-sentry-raven/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Client interface for the Sentry error logger
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-faraday>=0.7.6:${PORTSDIR}/www/rubygem-faraday
+RUN_DEPENDS=	rubygem-faraday>=0.7.6:www/rubygem-faraday
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-shoulda-matchers/Makefile b/devel/rubygem-shoulda-matchers/Makefile
index 0da13108351b..4c609ab69849 100644
--- a/devel/rubygem-shoulda-matchers/Makefile
+++ b/devel/rubygem-shoulda-matchers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Making tests easy on the fingers and eyes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.0.0:${PORTSDIR}/devel/rubygem-activesupport4
+RUN_DEPENDS=	rubygem-activesupport4>=4.0.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-shoulda/Makefile b/devel/rubygem-shoulda/Makefile
index 9497415e88d0..c52abbbb1e3d 100644
--- a/devel/rubygem-shoulda/Makefile
+++ b/devel/rubygem-shoulda/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Making tests easy on the fingers and eyes
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-shoulda-context>=1.0.1:${PORTSDIR}/devel/rubygem-shoulda-context \
-		rubygem-shoulda-matchers>=1.4.1:${PORTSDIR}/devel/rubygem-shoulda-matchers
+RUN_DEPENDS=	rubygem-shoulda-context>=1.0.1:devel/rubygem-shoulda-context \
+		rubygem-shoulda-matchers>=1.4.1:devel/rubygem-shoulda-matchers
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidekiq-cron/Makefile b/devel/rubygem-sidekiq-cron/Makefile
index 25305cfa6642..b725d68d1701 100644
--- a/devel/rubygem-sidekiq-cron/Makefile
+++ b/devel/rubygem-sidekiq-cron/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Enables to set jobs to be run in specified time (using CRON notation)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-redis-namespace>=1.5.2:${PORTSDIR}/databases/rubygem-redis-namespace \
-		rubygem-rufus-scheduler>=2.0.24:${PORTSDIR}/devel/rubygem-rufus-scheduler \
-		rubygem-sidekiq>=4.0.0:${PORTSDIR}/devel/rubygem-sidekiq
+RUN_DEPENDS=	rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
+		rubygem-rufus-scheduler>=2.0.24:devel/rubygem-rufus-scheduler \
+		rubygem-sidekiq>=4.0.0:devel/rubygem-sidekiq
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidekiq/Makefile b/devel/rubygem-sidekiq/Makefile
index caf0c53961bd..7ca5df7e59f7 100644
--- a/devel/rubygem-sidekiq/Makefile
+++ b/devel/rubygem-sidekiq/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Simple, efficient background processing for Ruby
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.0:${PORTSDIR}/devel/rubygem-concurrent-ruby \
-		rubygem-connection_pool>=2.2:${PORTSDIR}/net/rubygem-connection_pool \
-		rubygem-redis>=3.2.1:${PORTSDIR}/databases/rubygem-redis
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.0:devel/rubygem-concurrent-ruby \
+		rubygem-connection_pool>=2.2:net/rubygem-connection_pool \
+		rubygem-redis>=3.2.1:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sidetiq/Makefile b/devel/rubygem-sidetiq/Makefile
index 9e1579a80d6c..50830bdaa1fb 100644
--- a/devel/rubygem-sidetiq/Makefile
+++ b/devel/rubygem-sidetiq/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Recurring jobs for Sidekiq
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-celluloid>=0.17.3:${PORTSDIR}/devel/rubygem-celluloid \
-		rubygem-ice_cube>=0.13.2:${PORTSDIR}/devel/rubygem-ice_cube \
-		rubygem-sidekiq>=4.0.0:${PORTSDIR}/devel/rubygem-sidekiq
+RUN_DEPENDS=	rubygem-celluloid>=0.17.3:devel/rubygem-celluloid \
+		rubygem-ice_cube>=0.13.2:devel/rubygem-ice_cube \
+		rubygem-sidekiq>=4.0.0:devel/rubygem-sidekiq
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-simple_form/Makefile b/devel/rubygem-simple_form/Makefile
index 9d35b8343ac9..611371339c5c 100644
--- a/devel/rubygem-simple_form/Makefile
+++ b/devel/rubygem-simple_form/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Forms made easy
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=4:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-actionpack4>=4:${PORTSDIR}/www/rubygem-actionpack4
+RUN_DEPENDS=	rubygem-activemodel4>=4:databases/rubygem-activemodel4 \
+		rubygem-actionpack4>=4:www/rubygem-actionpack4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-simplecov/Makefile b/devel/rubygem-simplecov/Makefile
index 99b49b746c43..34416dfee21d 100644
--- a/devel/rubygem-simplecov/Makefile
+++ b/devel/rubygem-simplecov/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Powerful configuration library and automatic merging of coverage across
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-docile>=1.1.0:${PORTSDIR}/devel/rubygem-docile \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-simplecov-html>=0.8.0:${PORTSDIR}/textproc/rubygem-simplecov-html
+RUN_DEPENDS=	rubygem-docile>=1.1.0:devel/rubygem-docile \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-simplecov-html>=0.8.0:textproc/rubygem-simplecov-html
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-slim/Makefile b/devel/rubygem-slim/Makefile
index ddefb1787228..df284e361582 100644
--- a/devel/rubygem-slim/Makefile
+++ b/devel/rubygem-slim/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Template language whose goal is reduce the syntax to essential parts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-temple>=0.7.3:${PORTSDIR}/devel/rubygem-temple \
-		rubygem-tilt>=1.3.3:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-temple>=0.7.3:devel/rubygem-temple \
+		rubygem-tilt>=1.3.3:devel/rubygem-tilt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-soap4r/Makefile b/devel/rubygem-soap4r/Makefile
index 35bd71784bc1..ccaa1b6fc102 100644
--- a/devel/rubygem-soap4r/Makefile
+++ b/devel/rubygem-soap4r/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby implementation of SOAP 1.1
 LICENSE=	GPLv2 GPLv3 RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	rubygem-httpclient>=2.1.1:${PORTSDIR}/www/rubygem-httpclient
+RUN_DEPENDS=	rubygem-httpclient>=2.1.1:www/rubygem-httpclient
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-sprockets-helpers/Makefile b/devel/rubygem-sprockets-helpers/Makefile
index e5fff33c4197..cd3d3d85dd43 100644
--- a/devel/rubygem-sprockets-helpers/Makefile
+++ b/devel/rubygem-sprockets-helpers/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asset path helpers for Sprockets 2.x applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-sprockets3>=2.2:${PORTSDIR}/devel/rubygem-sprockets3
+RUN_DEPENDS=	rubygem-sprockets3>=2.2:devel/rubygem-sprockets3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets-rails/Makefile b/devel/rubygem-sprockets-rails/Makefile
index c5f137da253a..63134fc28f06 100644
--- a/devel/rubygem-sprockets-rails/Makefile
+++ b/devel/rubygem-sprockets-rails/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Sprockets Rails integration
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-actionpack4>=4.0:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-activesupport4>=4.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-sprockets3>=3.0.0:${PORTSDIR}/devel/rubygem-sprockets3
+RUN_DEPENDS?=	rubygem-actionpack4>=4.0:www/rubygem-actionpack4 \
+		rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
+		rubygem-sprockets3>=3.0.0:devel/rubygem-sprockets3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets-sass/Makefile b/devel/rubygem-sprockets-sass/Makefile
index 960b1eb85a80..b356303c1c8d 100644
--- a/devel/rubygem-sprockets-sass/Makefile
+++ b/devel/rubygem-sprockets-sass/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Implements a sprockets-aware sass importer
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sprockets>=2.0:${PORTSDIR}/devel/rubygem-sprockets \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-sprockets>=2.0:devel/rubygem-sprockets \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets/Makefile b/devel/rubygem-sprockets/Makefile
index 19a77818a12b..803eeea3d165 100644
--- a/devel/rubygem-sprockets/Makefile
+++ b/devel/rubygem-sprockets/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDIR}/devel/rubygem-hike \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-hike>=1.2:devel/rubygem-hike \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.0:www/rubygem-rack16 \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 CONFLICTS_INSTALL=	rubygem-sprockets211-[0-9]*
 
diff --git a/devel/rubygem-sprockets211/Makefile b/devel/rubygem-sprockets211/Makefile
index ea7854900f73..54ed7999237e 100644
--- a/devel/rubygem-sprockets211/Makefile
+++ b/devel/rubygem-sprockets211/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDIR}/devel/rubygem-hike \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-hike>=1.2:devel/rubygem-hike \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.0:www/rubygem-rack16 \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 CONFLICTS_INSTALL=	rubygem-sprockets-[0-9]*
 
diff --git a/devel/rubygem-sprockets22/Makefile b/devel/rubygem-sprockets22/Makefile
index 45fb8f65b082..696043e66914 100644
--- a/devel/rubygem-sprockets22/Makefile
+++ b/devel/rubygem-sprockets22/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDIR}/devel/rubygem-hike \
-		rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16 \
-		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
+RUN_DEPENDS=	rubygem-hike>=1.2:devel/rubygem-hike \
+		rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-rack16>=1.0:www/rubygem-rack16 \
+		rubygem-tilt1>=1.1:devel/rubygem-tilt1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-sprockets3/Makefile b/devel/rubygem-sprockets3/Makefile
index 807602918b01..149a036a28b1 100644
--- a/devel/rubygem-sprockets3/Makefile
+++ b/devel/rubygem-sprockets3/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Ruby library that preprocesses and concatenates JavaScript files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0:${PORTSDIR}/devel/rubygem-concurrent-ruby \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
+		rubygem-rack16>=1.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-statsd/Makefile b/devel/rubygem-statsd/Makefile
index ace37da1debd..dbe4bde244c0 100644
--- a/devel/rubygem-statsd/Makefile
+++ b/devel/rubygem-statsd/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby port of the statsd python and node.js tools
 
-RUN_DEPENDS=	rubygem-erubis>=2.6.6:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-eventmachine>=0.12.10:${PORTSDIR}/devel/rubygem-eventmachine \
-		rubygem-mongo>=1.2.4:${PORTSDIR}/devel/rubygem-mongo
+RUN_DEPENDS=	rubygem-erubis>=2.6.6:www/rubygem-erubis \
+		rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine \
+		rubygem-mongo>=1.2.4:devel/rubygem-mongo
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-stella/Makefile b/devel/rubygem-stella/Makefile
index 509fd3b383cf..e85990a2d5cc 100644
--- a/devel/rubygem-stella/Makefile
+++ b/devel/rubygem-stella/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Define realistic testplans and run them against your webapps
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-benelux>=0.6.1:${PORTSDIR}/devel/rubygem-benelux \
-		rubygem-drydock>=0.6.9:${PORTSDIR}/devel/rubygem-drydock \
-		rubygem-familia>=0.7.1:${PORTSDIR}/databases/rubygem-familia \
-		rubygem-gibbler>=0.8.9:${PORTSDIR}/devel/rubygem-gibbler \
-		rubygem-nokogiri>=1.4.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-public_suffix_service>=0.8.1:${PORTSDIR}/dns/rubygem-public_suffix_service \
-		rubygem-storable>=0.8.8:${PORTSDIR}/devel/rubygem-storable \
-		rubygem-sysinfo>=0.7.3:${PORTSDIR}/devel/rubygem-sysinfo \
-		rubygem-whois>=1.6.6:${PORTSDIR}/net/rubygem-whois \
-		rubygem-yajl-ruby>=0.7.9:${PORTSDIR}/devel/rubygem-yajl-ruby
+RUN_DEPENDS=	rubygem-benelux>=0.6.1:devel/rubygem-benelux \
+		rubygem-drydock>=0.6.9:devel/rubygem-drydock \
+		rubygem-familia>=0.7.1:databases/rubygem-familia \
+		rubygem-gibbler>=0.8.9:devel/rubygem-gibbler \
+		rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri \
+		rubygem-public_suffix_service>=0.8.1:dns/rubygem-public_suffix_service \
+		rubygem-storable>=0.8.8:devel/rubygem-storable \
+		rubygem-sysinfo>=0.7.3:devel/rubygem-sysinfo \
+		rubygem-whois>=1.6.6:net/rubygem-whois \
+		rubygem-yajl-ruby>=0.7.9:devel/rubygem-yajl-ruby
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-svn2git/Makefile b/devel/rubygem-svn2git/Makefile
index 663c59a75277..30eeb41c8a13 100644
--- a/devel/rubygem-svn2git/Makefile
+++ b/devel/rubygem-svn2git/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby utilities for exporting SVN repo to git
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git-subversion>0:${PORTSDIR}/devel/git-subversion
+RUN_DEPENDS=	git-subversion>0:devel/git-subversion
 
 CONFLICTS_INSTALL=	svn2git-[0-9]*
 
diff --git a/devel/rubygem-sysinfo/Makefile b/devel/rubygem-sysinfo/Makefile
index a2a20cc34f3d..bf2d92c1e274 100644
--- a/devel/rubygem-sysinfo/Makefile
+++ b/devel/rubygem-sysinfo/Makefile
@@ -12,8 +12,8 @@ COMMENT=	All your system-independent infoz in one handy class
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-drydock>=0:${PORTSDIR}/devel/rubygem-drydock \
-		rubygem-storable>=0:${PORTSDIR}/devel/rubygem-storable
+RUN_DEPENDS=	rubygem-drydock>=0:devel/rubygem-drydock \
+		rubygem-storable>=0:devel/rubygem-storable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-templater/Makefile b/devel/rubygem-templater/Makefile
index 387de19e658f..63d765b98a83 100644
--- a/devel/rubygem-templater/Makefile
+++ b/devel/rubygem-templater/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby code generation framework
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-extlib>=0.9.5:${PORTSDIR}/devel/rubygem-extlib \
-		rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-diff-lcs>=1.1.2:textproc/rubygem-diff-lcs \
+		rubygem-extlib>=0.9.5:devel/rubygem-extlib \
+		rubygem-highline>=1.4.0:devel/rubygem-highline
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-term-ansicolor/Makefile b/devel/rubygem-term-ansicolor/Makefile
index 837b6cd284d0..b385adda294c 100644
--- a/devel/rubygem-term-ansicolor/Makefile
+++ b/devel/rubygem-term-ansicolor/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Term::ANSIColor for Ruby
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-tins>=1.0:${PORTSDIR}/devel/rubygem-tins
+RUN_DEPENDS=	rubygem-tins>=1.0:devel/rubygem-tins
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-test-unit/Makefile b/devel/rubygem-test-unit/Makefile
index 3d4e18c4afac..5e940380be03 100644
--- a/devel/rubygem-test-unit/Makefile
+++ b/devel/rubygem-test-unit/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
 LICENSE_FILE_PSFL=	${WRKSRC}/PSFL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-power_assert>=0:${PORTSDIR}/devel/rubygem-power_assert
+RUN_DEPENDS=	rubygem-power_assert>=0:devel/rubygem-power_assert
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-thread_safe1/Makefile b/devel/rubygem-thread_safe1/Makefile
index 577d1a439914..2ba2544c8a2c 100644
--- a/devel/rubygem-thread_safe1/Makefile
+++ b/devel/rubygem-thread_safe1/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Thread-safe collections and utilities for Ruby
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-atomic>=0:${PORTSDIR}/devel/rubygem-atomic
+RUN_DEPENDS=	rubygem-atomic>=0:devel/rubygem-atomic
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-timers/Makefile b/devel/rubygem-timers/Makefile
index 5e02c2fe7045..6a1b8b6fd917 100644
--- a/devel/rubygem-timers/Makefile
+++ b/devel/rubygem-timers/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Pure Ruby one-shot and periodic timers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hitimes>=0:${PORTSDIR}/devel/rubygem-hitimes
+RUN_DEPENDS=	rubygem-hitimes>=0:devel/rubygem-hitimes
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-toml/Makefile b/devel/rubygem-toml/Makefile
index 3e0133d9f605..8aae19638a4b 100644
--- a/devel/rubygem-toml/Makefile
+++ b/devel/rubygem-toml/Makefile
@@ -12,7 +12,7 @@ COMMENT=	TOML parser
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-parslet>=1.5.0:${PORTSDIR}/textproc/rubygem-parslet
+RUN_DEPENDS=	rubygem-parslet>=1.5.0:textproc/rubygem-parslet
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-travis/Makefile b/devel/rubygem-travis/Makefile
index f2c9fe650e78..caedcff74b9c 100644
--- a/devel/rubygem-travis/Makefile
+++ b/devel/rubygem-travis/Makefile
@@ -12,14 +12,14 @@ COMMENT=	CLI and Ruby client library for Travis CI
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-backports>=0:${PORTSDIR}/devel/rubygem-backports \
-		rubygem-faraday>=0.9:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-faraday_middleware>=0.9.1:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-gh>=0.13:${PORTSDIR}/devel/rubygem-gh \
-		rubygem-highline>=1.6:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-launchy>=2.1:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-pusher-client>=0.4:${PORTSDIR}/www/rubygem-pusher-client \
-		rubygem-typhoeus>=0.6.8:${PORTSDIR}/www/rubygem-typhoeus
+RUN_DEPENDS=	rubygem-backports>=0:devel/rubygem-backports \
+		rubygem-faraday>=0.9:www/rubygem-faraday \
+		rubygem-faraday_middleware>=0.9.1:www/rubygem-faraday_middleware \
+		rubygem-gh>=0.13:devel/rubygem-gh \
+		rubygem-highline>=1.6:devel/rubygem-highline \
+		rubygem-launchy>=2.1:devel/rubygem-launchy \
+		rubygem-pusher-client>=0.4:www/rubygem-pusher-client \
+		rubygem-typhoeus>=0.6.8:www/rubygem-typhoeus
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-treetop/Makefile b/devel/rubygem-treetop/Makefile
index 31c66945eee1..53ed6981b471 100644
--- a/devel/rubygem-treetop/Makefile
+++ b/devel/rubygem-treetop/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby-based DSL for text parsing and interpretation
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-polyglot>=0.3:${PORTSDIR}/devel/rubygem-polyglot
+RUN_DEPENDS=	rubygem-polyglot>=0.3:devel/rubygem-polyglot
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-turn/Makefile b/devel/rubygem-turn/Makefile
index 76d63e65d39c..644aa1d98bd9 100644
--- a/devel/rubygem-turn/Makefile
+++ b/devel/rubygem-turn/Makefile
@@ -12,8 +12,8 @@ COMMENT=	New output format for Test::Unit
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-ansi>=0:${PORTSDIR}/devel/rubygem-ansi \
-		rubygem-minitest>=4:${PORTSDIR}/devel/rubygem-minitest
+RUN_DEPENDS=	rubygem-ansi>=0:devel/rubygem-ansi \
+		rubygem-minitest>=4:devel/rubygem-minitest
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index 8f9edf6a90c6..f1196a14e293 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Daylight-savings aware timezone support for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-thread_safe1>=0.1:${PORTSDIR}/devel/rubygem-thread_safe1
+RUN_DEPENDS=	rubygem-thread_safe1>=0.1:devel/rubygem-thread_safe1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-uuid/Makefile b/devel/rubygem-uuid/Makefile
index b8d21be60920..feb89540f0fe 100644
--- a/devel/rubygem-uuid/Makefile
+++ b/devel/rubygem-uuid/Makefile
@@ -11,7 +11,7 @@ COMMENT=	UUID Generator for Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-macaddr>=1.0:${PORTSDIR}/net/rubygem-macaddr
+RUN_DEPENDS=	rubygem-macaddr>=1.0:net/rubygem-macaddr
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-versionomy/Makefile b/devel/rubygem-versionomy/Makefile
index 2b29a4ad8cd1..2726c9ddeb9d 100644
--- a/devel/rubygem-versionomy/Makefile
+++ b/devel/rubygem-versionomy/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Generalized version number library for Ruby
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-blockenspiel>=0.5:${PORTSDIR}/devel/rubygem-blockenspiel
+RUN_DEPENDS=	rubygem-blockenspiel>=0.5:devel/rubygem-blockenspiel
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-virtus/Makefile b/devel/rubygem-virtus/Makefile
index 430dcfedda7b..84f62fde1fbb 100644
--- a/devel/rubygem-virtus/Makefile
+++ b/devel/rubygem-virtus/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Attributes on Steroids for Plain Old Ruby Objects
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-axiom-types>=0.1:${PORTSDIR}/devel/rubygem-axiom-types \
-		rubygem-coercible>=1.0:${PORTSDIR}/devel/rubygem-coercible \
-		rubygem-descendants_tracker>=0.0.3:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-equalizer>=0.0.9:${PORTSDIR}/devel/rubygem-equalizer
+RUN_DEPENDS=	rubygem-axiom-types>=0.1:devel/rubygem-axiom-types \
+		rubygem-coercible>=1.0:devel/rubygem-coercible \
+		rubygem-descendants_tracker>=0.0.3:devel/rubygem-descendants_tracker \
+		rubygem-equalizer>=0.0.9:devel/rubygem-equalizer
 
 NO_ARCH=	yes
 
diff --git a/devel/rubygem-warbler/Makefile b/devel/rubygem-warbler/Makefile
index f6289e1bd72f..ef332c5a7995 100644
--- a/devel/rubygem-warbler/Makefile
+++ b/devel/rubygem-warbler/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Constructor of .war files of Rails applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	jruby:${PORTSDIR}/lang/jruby \
-		rubygem-jruby-jars>=1.5.6:${PORTSDIR}/devel/rubygem-jruby-jars \
-		rubygem-jruby-rack>=1.1.1:${PORTSDIR}/www/rubygem-jruby-rack \
-		rubygem-rake>=0.9.6:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rubyzip>=0.9:${PORTSDIR}/archivers/rubygem-rubyzip
+RUN_DEPENDS=	jruby:lang/jruby \
+		rubygem-jruby-jars>=1.5.6:devel/rubygem-jruby-jars \
+		rubygem-jruby-rack>=1.1.1:www/rubygem-jruby-rack \
+		rubygem-rake>=0.9.6:devel/rubygem-rake \
+		rubygem-rubyzip>=0.9:archivers/rubygem-rubyzip
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-warden/Makefile b/devel/rubygem-warden/Makefile
index 943f0a4b7e38..6b4adf93679e 100644
--- a/devel/rubygem-warden/Makefile
+++ b/devel/rubygem-warden/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Rack middleware that provides authentication for rack applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-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/devel/rubygem-web-console/Makefile b/devel/rubygem-web-console/Makefile
index c661eb097cbe..b43881293518 100644
--- a/devel/rubygem-web-console/Makefile
+++ b/devel/rubygem-web-console/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Debugging tool for your Ruby on Rails applications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel4>=4.0:${PORTSDIR}/databases/rubygem-activemodel4 \
-		rubygem-binding_of_caller>=0.7.2:${PORTSDIR}/devel/rubygem-binding_of_caller \
-		rubygem-railties4>=4.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-sprockets-rails>=2.0:${PORTSDIR}/devel/rubygem-sprockets-rails
+RUN_DEPENDS=	rubygem-activemodel4>=4.0:databases/rubygem-activemodel4 \
+		rubygem-binding_of_caller>=0.7.2:devel/rubygem-binding_of_caller \
+		rubygem-railties4>=4.0:www/rubygem-railties4 \
+		rubygem-sprockets-rails>=2.0:devel/rubygem-sprockets-rails
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-webby/Makefile b/devel/rubygem-webby/Makefile
index 6f48f8e8244a..83a68df36679 100644
--- a/devel/rubygem-webby/Makefile
+++ b/devel/rubygem-webby/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Small website management system
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-bones>=2.5.0:${PORTSDIR}/devel/rubygem-bones \
-		rubygem-directory_watcher>=1.1.2:${PORTSDIR}/devel/rubygem-directory_watcher \
-		rubygem-hpricot>=0.6.0:${PORTSDIR}/www/rubygem-hpricot \
-		rubygem-launchy>=0.3.2:${PORTSDIR}/devel/rubygem-launchy \
-		rubygem-logging>=0.9.7:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-loquacious>=1.3.0:${PORTSDIR}/devel/rubygem-loquacious \
-		rubygem-rspec>=1.2.2:${PORTSDIR}/devel/rubygem-rspec
+RUN_DEPENDS=	rubygem-bones>=2.5.0:devel/rubygem-bones \
+		rubygem-directory_watcher>=1.1.2:devel/rubygem-directory_watcher \
+		rubygem-hpricot>=0.6.0:www/rubygem-hpricot \
+		rubygem-launchy>=0.3.2:devel/rubygem-launchy \
+		rubygem-logging>=0.9.7:devel/rubygem-logging \
+		rubygem-loquacious>=1.3.0:devel/rubygem-loquacious \
+		rubygem-rspec>=1.2.2:devel/rubygem-rspec
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-xpath/Makefile b/devel/rubygem-xpath/Makefile
index cb2102f5a6de..d27f1ba84516 100644
--- a/devel/rubygem-xpath/Makefile
+++ b/devel/rubygem-xpath/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DSL for generating XPath Expressions
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.3:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=1.3:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index 198441e6d145..385eeccf93b7 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	*
 OPTIONS_DEFINE=		DOCS PCRE SSL
 OPTIONS_DEFAULT=	SSL
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_ENABLE=	pcre
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_ENABLE=	ssl
diff --git a/devel/runsnakerun/Makefile b/devel/runsnakerun/Makefile
index 5627538c0075..ac044b82a46c 100644
--- a/devel/runsnakerun/Makefile
+++ b/devel/runsnakerun/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GUI Viewer for Python profiling runs
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SquareMap>0:${PORTSDIR}/x11-toolkits/py-SquareMap \
-		${PYTHON_PKGNAMEPREFIX}meliae>0:${PORTSDIR}/devel/py-meliae
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap \
+		${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 9e5ba96a2b51..fb9b881d6911 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Persistent VM library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	liblwp.so:${PORTSDIR}/devel/lwp
+LIB_DEPENDS=	liblwp.so:devel/lwp
 
 USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index feaddff4962d..854064639b99 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	bin/sbt \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MADVANCED}
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 PLIST_FILES+=	%%DATADIR%%/sbt \
 		%%DATADIR%%/sbt-launch-lib.bash
diff --git a/devel/scalatest/Makefile b/devel/scalatest/Makefile
index 2faab65a16aa..34b1f38fe9e3 100644
--- a/devel/scalatest/Makefile
+++ b/devel/scalatest/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Regression testing utility for use with the Scala Language
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	scala>=2.9.0:${PORTSDIR}/lang/scala
+RUN_DEPENDS=	scala>=2.9.0:lang/scala
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 7fe1da468075..a2bb5de70635 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Build tool alternative to make
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:devel/m4
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	script/scons
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 6c696c3abf92..26303613ce9c 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cross-platform multimedia development API
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		gmake iconv libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -41,18 +41,18 @@ OPTIONS_DEFAULT+=	VGL
 .endif
 
 AALIB_CONFIGURE_ENABLE=		video-aalib
-AALIB_LIB_DEPENDS=		libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
 ESOUND_USE=			GNOME=esound
 ESOUND_CONFIGURE_ENABLE=	esd esdtest
 NAS_CONFIGURE_ENABLE=		nas
-NAS_LIB_DEPENDS=		libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=		libaudio.so:audio/nas
 OPENGL_CONFIGURE_ENABLE=	video-opengl
 OPENGL_USE=			GL=yes
 OSS_CONFIGURE_ENABLE=		oss
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio
 SVGALIB_CONFIGURE_ENABLE=	video-svga
-SVGALIB_LIB_DEPENDS=		libvga.so:${PORTSDIR}/graphics/svgalib
+SVGALIB_LIB_DEPENDS=		libvga.so:graphics/svgalib
 VGL_CONFIGURE_ENABLE=		video-vgl
 X11_CONFIGURE_ENABLE=		video-x11
 X11_USE=			XORG=x11,xrender,xrandr,xextproto
diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index 159f694f0378..659c2b9968dc 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -107,7 +107,7 @@ SDL_VIDEO_CONFIGURE_ENABLE=	video
 IGNORE=	option ALSA requires SDL_AUDIO
 .endif
 CONFIGURE_ARGS+=	--enable-alsa --enable-alsa-shared
-LIB_DEPENDS+=		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=		libasound.so:audio/alsa-lib
 .else
 CONFIGURE_ARGS+=	--disable-alsa --disable-alsa-shared
 .endif
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=	--disable-esd --disable-esd-shared
 IGNORE=	option NAS requires SDL_AUDIO
 .endif
 CONFIGURE_ARGS+=	--enable-nas --enable-nas-shared
-LIB_DEPENDS+=		libaudio.so:${PORTSDIR}/audio/nas
+LIB_DEPENDS+=		libaudio.so:audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas --disable-nas-shared
 .endif
diff --git a/devel/sdl2pp/Makefile b/devel/sdl2pp/Makefile
index 44fc5c878a43..a952a2ff41c8 100644
--- a/devel/sdl2pp/Makefile
+++ b/devel/sdl2pp/Makefile
@@ -24,7 +24,7 @@ TEST_TARGET=	test
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doxygen
 DOXYGEN_IMPLIES=	DOCS
 
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index 90259b4530ab..45f95b7aed48 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -28,7 +28,7 @@ SDL_DESC=	Enable support for SDL_image
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
 MAKE_ARGS+=	USE_FT=y
 .else
 MAKE_ARGS+=	USE_FT=n
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 2c49e1c48efa..a1787dd2bd19 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://thor-f5.er.usgs.gov/sdts/sdtsxx/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for SDTS related development
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 DOS2UNIX_FILES=	sdts++/io/sio_Utils.cpp
 USES=		autoreconf bison dos2unix gmake libtool makeinfo
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index 9228cb1f39f6..c028ea386436 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	SFML-${PORTVERSION}-sources
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple and Fast Multimedia Library
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libfreetype.so:print/freetype2
 
 USES=		cmake dos2unix jpeg openal:al zip:infozip
 DOS2UNIX_FILES=	CMakeLists.txt
@@ -28,6 +28,6 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOXYGEN
 
 DOXYGEN_CMAKE_ON=	-DSFML_BUILD_DOC:BOOL=YES
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .include <bsd.port.mk>
diff --git a/devel/sfml1/Makefile b/devel/sfml1/Makefile
index 4f6726162364..5c4233ae6471 100644
--- a/devel/sfml1/Makefile
+++ b/devel/sfml1/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Simple and Fast Multimedia Library
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		gmake jpeg openal:al pkgconfig dos2unix
 DOS2UNIX_GLOB=	Makefile ResourcePtr.inl
diff --git a/devel/sgb/Makefile b/devel/sgb/Makefile
index d2db09447943..7fde401a2f62 100644
--- a/devel/sgb/Makefile
+++ b/devel/sgb/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	sgb-2009-08-10
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	The Stanford GraphBase: A Platform for Combinatorial Computing
 
-BUILD_DEPENDS=	ctangle:${PORTSDIR}/devel/cweb
+BUILD_DEPENDS=	ctangle:devel/cweb
 
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	lib tests
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 998b49d59001..502e8cf1fed9 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/shiboken/Makefile b/devel/shiboken/Makefile
index 85baeec40da9..8ee73af0329e 100644
--- a/devel/shiboken/Makefile
+++ b/devel/shiboken/Makefile
@@ -13,8 +13,8 @@ COMMENT=	C++ code generator for CPython extensions
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		PYTHON_VERSION=${PYTHON_VERSION}
@@ -39,7 +39,7 @@ CMAKE_ARGS=	-DNO_INSTALL_MANPAGES:BOOL="ON"
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 ALL_TARGET+=	doc
 post-install:
 	if [ -d ${WRKSRC}/doc/html ]; then \
diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile
index f1eedc1743b5..468a6080efa2 100644
--- a/devel/shmap/Makefile
+++ b/devel/shmap/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shared-memory-based hashmaps
 
-LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+LIB_DEPENDS=	libmm.so:devel/mm
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 721121ae718b..21c765761b57 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Toolkit for 3D games and simulations
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libosg.so:${PORTSDIR}/graphics/osg
+BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libosg.so:graphics/osg
 
 USE_XORG=	ice sm x11 xext xi xmu xt
 USE_GL=		gl glu glut
diff --git a/devel/simian/Makefile b/devel/simian/Makefile
index 82346ad5d869..6f0ed9e08c87 100644
--- a/devel/simian/Makefile
+++ b/devel/simian/Makefile
@@ -48,7 +48,7 @@ SUB_LIST+=	JAVA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMONO}
-RUN_DEPENDS+=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS+=	mono:lang/mono
 PLIST_SUB+=	MONO=""
 SUB_LIST+=	MONO=""
 .else
diff --git a/devel/simple_components/Makefile b/devel/simple_components/Makefile
index e66918f53df8..81e2598ed2c1 100644
--- a/devel/simple_components/Makefile
+++ b/devel/simple_components/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Ada Components
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada tar:tgz
 DEST=		${STAGEDIR}${PREFIX}
diff --git a/devel/smack/Makefile b/devel/smack/Makefile
index c2bad793856b..1bacac641e12 100644
--- a/devel/smack/Makefile
+++ b/devel/smack/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Low-level I/O storage library which packs data
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
-		libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
+		libsnappy.so:archivers/snappy
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zloidemon
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index 311a67f4975b..6e23de58e132 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	SMOKE bindings for Qt
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2 \
+		libqwt.so:x11-toolkits/qwt5
 
 USE_KDE4=	kdeprefix smokegen qimageblitz
 USE_QT4=	corelib dbus declarative designer_build gui help \
diff --git a/devel/sope/Makefile b/devel/sope/Makefile
index cfd90483d05a..d1d271ae013a 100644
--- a/devel/sope/Makefile
+++ b/devel/sope/Makefile
@@ -12,8 +12,8 @@ COMMENT=		Extensive set of GNUstep web application frameworks
 
 LICENSE=		LGPL20
 
-LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-			libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
+			libmemcached.so:databases/libmemcached
 
 WRKSRC=			${WRKDIR}/SOPE
 
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=		--with-gnustep --disable-debug --enable-strip
 LDAP_USE=	OPENLDAP=client
 PGSQL_USES=	pgsql
 MYSQL_USE=	MYSQL=client
-MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:${PORTSDIR}/databases/memcached
+MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure
diff --git a/devel/sope3/Makefile b/devel/sope3/Makefile
index 0b5d55d87dd8..9cf041b5fa82 100644
--- a/devel/sope3/Makefile
+++ b/devel/sope3/Makefile
@@ -12,8 +12,8 @@ COMMENT=		Extensive set of GNUstep web application frameworks
 
 LICENSE=		LGPL20
 
-LIB_DEPENDS=		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-			libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
+			libmemcached.so:databases/libmemcached
 
 WRKSRC=			${WRKDIR}/SOPE
 
@@ -41,7 +41,7 @@ CONFIGURE_ENV+=		CC="${CC}"
 LDAP_USE=	OPENLDAP=client
 PGSQL_USES=	pgsql
 MYSQL_USE=	MYSQL=client
-MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:${PORTSDIR}/databases/memcached
+MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached
 
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index f90aab551255..09740fd3c149 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Fast big data processing engine
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:${PORTSDIR}/devel/maven33 \
-		${LOCALBASE}/lib/libsnappyjava.so:${PORTSDIR}/archivers/snappy-java
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		yarn:${PORTSDIR}/devel/hadoop2
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 \
+		${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java
+RUN_DEPENDS=	bash:shells/bash \
+		yarn:devel/hadoop2
 
 USES=		python:2
 USE_JAVA=	yes
diff --git a/devel/spice-protocol/Makefile b/devel/spice-protocol/Makefile
index e950aeab884d..5cddbce38003 100644
--- a/devel/spice-protocol/Makefile
+++ b/devel/spice-protocol/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple Protocol for Independent Computing Environments
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig python tar:bzip2
diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index c89e96672941..1e47746c0d86 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Collection of powerful tools for manipulating EPROM load files
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		ghostscript libtool:build
 GNU_CONFIGURE=	yes
diff --git a/devel/statik/Makefile b/devel/statik/Makefile
index 208407cd4333..6e6e851dba1e 100644
--- a/devel/statik/Makefile
+++ b/devel/statik/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Embed static files into a Go executable
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 11536f4192b7..ed05c9721bbe 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Subversion repository activity report generator
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	subversion>=1.3:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	subversion>=1.3:devel/subversion
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 6b3676c28dd4..3abf0e5f434a 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Qt4 based multiplatform subversion client, diff & merge tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libsvn_client-1.so:devel/subversion
 
 CONFLICTS=	subcommander-1.*
 
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 22a45b13992c..5c6072fbaaf2 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -61,7 +61,7 @@ PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 44f781eaef58..65df3c8e3bbb 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -19,9 +19,9 @@ CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
 
-LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-			libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
+			libsqlite3.so:databases/sqlite3 \
+			libexpat.so:textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--without-swig \
 
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^9].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion
+LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion
 OPTIONS_NAME=		devel_subversion
 .endif
 
@@ -46,11 +46,11 @@ NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
-SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
-SERF_LIB_DEPENDS=		libserf-1.so:${PORTSDIR}/www/serf
+SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
diff --git a/devel/subversion18/Makefile b/devel/subversion18/Makefile
index f269310f262a..9ee9a9041431 100644
--- a/devel/subversion18/Makefile
+++ b/devel/subversion18/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC}
diff --git a/devel/subversion18/Makefile.common b/devel/subversion18/Makefile.common
index 62dfdfa927f9..4a55e5f0cb91 100644
--- a/devel/subversion18/Makefile.common
+++ b/devel/subversion18/Makefile.common
@@ -21,9 +21,9 @@ CPE_VENDOR=	apache
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]*
 
-LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
-			libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-			libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
+			libsqlite3.so:databases/sqlite3 \
+			libexpat.so:textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--without-swig \
 
 .if defined(SVN_BUILD_ADDONS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[^8].[0-9]*
-LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion18
+LIB_DEPENDS+=		libsvn_client-1.so:devel/subversion18
 OPTIONS_NAME=		devel_subversion18
 .endif
 
@@ -49,11 +49,11 @@ NLS_USES=			gettext
 
 SASL_CONFIGURE_OFF=		--without-sasl
 SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
-SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 SERF_CONFIGURE_OFF=		--without-serf
 SERF_CONFIGURE_ON=		--with-serf
-SERF_LIB_DEPENDS=		libserf-1.so:${PORTSDIR}/www/serf
+SERF_LIB_DEPENDS=		libserf-1.so:www/serf
 
 STATIC_CONFIGURE_ON=		--enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static"
 
diff --git a/devel/subversive/Makefile b/devel/subversive/Makefile
index 3bf83c11398d..f48533b3db9a 100644
--- a/devel/subversive/Makefile
+++ b/devel/subversive/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Eclipse plug-in that provides Subversion support
 
 LICENSE=	EPL
 
-RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse
+RUN_DEPENDS=	eclipse:java/eclipse
 
 CONNECTORS=	Subversive-connectors-allplatforms-4.0.2.I20140528-1700.zip
 
diff --git a/devel/svk/Makefile b/devel/svk/Makefile
index 1b0e61a3f907..5db619584d5b 100644
--- a/devel/svk/Makefile
+++ b/devel/svk/Makefile
@@ -15,40 +15,40 @@ COMMENT=	Distributed Version Control System
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Algorithm-Annotate>=0:${PORTSDIR}/devel/p5-Algorithm-Annotate \
-		p5-App-CLI>=0:${PORTSDIR}/devel/p5-App-CLI \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw \
-		p5-IO-Digest>=0:${PORTSDIR}/devel/p5-IO-Digest \
-		p5-IO-Pager>=0:${PORTSDIR}/devel/p5-IO-Pager \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Simple \
-		p5-Regexp-Shellish>=0:${PORTSDIR}/devel/p5-Regexp-Shellish \
-		p5-SVN-Mirror>=0:${PORTSDIR}/devel/p5-SVN-Mirror \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Algorithm-Diff>=1.1901:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Class-Autouse>=1.15:${PORTSDIR}/devel/p5-Class-Autouse \
-		p5-Data-Hierarchy>=0.30:${PORTSDIR}/devel/p5-Data-Hierarchy \
-		p5-Locale-Maketext-Lexicon>=0.62:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
-		p5-Locale-Maketext-Simple>=0.16:${PORTSDIR}/devel/p5-Locale-Maketext-Simple \
-		p5-Path-Class>=0.16:${PORTSDIR}/devel/p5-Path-Class \
-		p5-PerlIO-eol>=0.13:${PORTSDIR}/devel/p5-PerlIO-eol \
-		p5-PerlIO-gzip>=0.18:${PORTSDIR}/archivers/p5-PerlIO-gzip \
-		p5-PerlIO-via-Bzip2>=0.02:${PORTSDIR}/archivers/p5-PerlIO-via-Bzip2 \
-		p5-PerlIO-via-dynamic>=0.11:${PORTSDIR}/devel/p5-PerlIO-via-dynamic \
-		p5-PerlIO-via-symlink>=0.02:${PORTSDIR}/devel/p5-PerlIO-via-symlink \
-		p5-SVN-Dump>=0.04:${PORTSDIR}/devel/p5-SVN-Dump \
-		p5-SVN-Simple>=0.27:${PORTSDIR}/devel/p5-SVN-Simple \
-		p5-SVN-Mirror>=0.71:${PORTSDIR}/devel/p5-SVN-Mirror \
-		p5-Time-Progress>=0:${PORTSDIR}/devel/p5-Time-Progress \
-		p5-YAML-Syck>=0.60:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-subversion>=0:devel/p5-subversion \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Algorithm-Annotate>=0:devel/p5-Algorithm-Annotate \
+		p5-App-CLI>=0:devel/p5-App-CLI \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-FreezeThaw>=0:devel/p5-FreezeThaw \
+		p5-IO-Digest>=0:devel/p5-IO-Digest \
+		p5-IO-Pager>=0:devel/p5-IO-Pager \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes \
+		p5-Pod-Simple>=0:textproc/p5-Pod-Simple \
+		p5-Regexp-Shellish>=0:devel/p5-Regexp-Shellish \
+		p5-SVN-Mirror>=0:devel/p5-SVN-Mirror \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI>=0:net/p5-URI \
+		p5-Algorithm-Diff>=1.1901:devel/p5-Algorithm-Diff \
+		p5-Class-Autouse>=1.15:devel/p5-Class-Autouse \
+		p5-Data-Hierarchy>=0.30:devel/p5-Data-Hierarchy \
+		p5-Locale-Maketext-Lexicon>=0.62:devel/p5-Locale-Maketext-Lexicon \
+		p5-Locale-Maketext-Simple>=0.16:devel/p5-Locale-Maketext-Simple \
+		p5-Path-Class>=0.16:devel/p5-Path-Class \
+		p5-PerlIO-eol>=0.13:devel/p5-PerlIO-eol \
+		p5-PerlIO-gzip>=0.18:archivers/p5-PerlIO-gzip \
+		p5-PerlIO-via-Bzip2>=0.02:archivers/p5-PerlIO-via-Bzip2 \
+		p5-PerlIO-via-dynamic>=0.11:devel/p5-PerlIO-via-dynamic \
+		p5-PerlIO-via-symlink>=0.02:devel/p5-PerlIO-via-symlink \
+		p5-SVN-Dump>=0.04:devel/p5-SVN-Dump \
+		p5-SVN-Simple>=0.27:devel/p5-SVN-Simple \
+		p5-SVN-Mirror>=0.71:devel/p5-SVN-Mirror \
+		p5-Time-Progress>=0:devel/p5-Time-Progress \
+		p5-YAML-Syck>=0.60:textproc/p5-YAML-Syck \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/svn2git/Makefile b/devel/svn2git/Makefile
index 412813af6ea9..6988db16edeb 100644
--- a/devel/svn2git/Makefile
+++ b/devel/svn2git/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Imports svn repositories into git
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
-RUN_DEPENDS+=	git:${PORTSDIR}/devel/git \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
+RUN_DEPENDS+=	git:devel/git \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-subversion>=0:devel/p5-subversion
 
 USES=		qmake tar:xz
 USE_GITHUB=	yes
diff --git a/devel/svn_load_dirs/Makefile b/devel/svn_load_dirs/Makefile
index a72e4dade6f8..79c06e8e9705 100644
--- a/devel/svn_load_dirs/Makefile
+++ b/devel/svn_load_dirs/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Perl script to load directories into a Subversion repository
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI \
+		${LOCALBASE}/bin/svn:devel/subversion
 
 USES=		perl5
 
diff --git a/devel/svndelta/Makefile b/devel/svndelta/Makefile
index a8b16b86a043..d928d8120c64 100644
--- a/devel/svndelta/Makefile
+++ b/devel/svndelta/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Summarizes and manages differences between local files and Subversion
 
 BROKEN=		unfetchable
-RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	${LOCALBASE}/bin/svn:devel/subversion
 
 USE_RUBY=	yes
 NO_BUILD=	yes
diff --git a/devel/svntrac/Makefile b/devel/svntrac/Makefile
index e06245a37d1d..4981ce70b88f 100644
--- a/devel/svntrac/Makefile
+++ b/devel/svntrac/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 
 COMMENT=	Web-Based Bug And Patch-Set Tracking System For Subversion
 
-RUN_DEPENDS=	subversion>=0:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	subversion>=0:devel/subversion
 
 MASTERDIR=	${.CURDIR}/../cvstrac
 MAKE_ARGS=	APPNAME=svntrac
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 9dd9b304c126..edfc0ead7e0b 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generate wrappers for calling C/C++ code from other languages
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake lua:51
 
diff --git a/devel/swig30/Makefile b/devel/swig30/Makefile
index 810d9d0547f5..95f734f5fd21 100644
--- a/devel/swig30/Makefile
+++ b/devel/swig30/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generate wrappers for calling C/C++ code from other languages
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 2f47d1a49057..891977bcb356 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -11,17 +11,17 @@ COMMENT=	Vector based 2D animation package
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	etl>=0.04.19_1:${PORTSDIR}/devel/etl
-LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libmlt.so:${PORTSDIR}/multimedia/mlt \
-		libmng.so:${PORTSDIR}/graphics/libmng \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libdv.so:${PORTSDIR}/multimedia/libdv
+BUILD_DEPENDS=	etl>=0.04.19_1:devel/etl
+LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
+		libltdl.so:devel/libltdl \
+		libMagickWand-6.so:graphics/ImageMagick \
+		libIlmImf.so:graphics/OpenEXR \
+		libmlt.so:multimedia/mlt \
+		libmng.so:graphics/libmng \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libavcodec.so:multimedia/ffmpeg \
+		libdv.so:multimedia/libdv
 
 USES=		iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	cairo glibmm libxml++26
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 619e27364048..9000005a566f 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Migrates changesets between version control systems
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index a2491774d571..2ba09187e986 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -48,8 +48,8 @@ PLIST_FILES+=		include/pytalloc.h \
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES+=		include/talloc.h \
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 31937e670fd9..6c8080f55dbc 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Memchan${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Two new channel types for in-memory channels in TCL8
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/tcllib/doctools/pkgIndex.tcl:${PORTSDIR}/devel/tcllib
+BUILD_DEPENDS=	${LOCALBASE}/lib/tcllib/doctools/pkgIndex.tcl:devel/tcllib
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/devel/tcllauncher/Makefile b/devel/tcllauncher/Makefile
index 427ca00512bf..7d7ead7db342 100644
--- a/devel/tcllauncher/Makefile
+++ b/devel/tcllauncher/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Launcher program for Tcl applications
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libtclx8.4.so:${PORTSDIR}/lang/tclX
+LIB_DEPENDS=	libtclx8.4.so:lang/tclX
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
diff --git a/devel/tcllibc/Makefile b/devel/tcllibc/Makefile
index 854d25d03f7e..c1f684892af4 100644
--- a/devel/tcllibc/Makefile
+++ b/devel/tcllibc/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	c
 
 COMMENT=	Compiled implementations of some of the modules of Tcllib
 
-BUILD_DEPENDS=	critcl:${PORTSDIR}/devel/critcl
+BUILD_DEPENDS=	critcl:devel/critcl
 RUN_DEPENDS=	${PREFIX}/lib/tcllib/pkgIndex.tcl:${MASTERDIR}	# PREFIX, not LOCALBASE
 
 MASTERDIR=	${.CURDIR:H}/tcllib
diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile
index 1e7e8be9d4c7..56bb0e85bfdf 100644
--- a/devel/tclthread/Makefile
+++ b/devel/tclthread/Makefile
@@ -35,7 +35,7 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-gdbm
 .endif
 
diff --git a/devel/tclvfs/Makefile b/devel/tclvfs/Makefile
index 804c69c029ef..35a25c37fdcb 100644
--- a/devel/tclvfs/Makefile
+++ b/devel/tclvfs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tcl VirtualFileSystem layer
 
-LIB_DEPENDS=	libTrf2.1.4.so:${PORTSDIR}/devel/tcl-trf
+LIB_DEPENDS=	libTrf2.1.4.so:devel/tcl-trf
 
 USES+=		gmake tcl
 GNU_CONFIGURE=	yes
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 5b67bf32c10f..5533d7ff9d10 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	API for parsing XML documents using Tcl
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS?=	dtplite:${PORTSDIR}/devel/tcllib
+LIB_DEPENDS=	libxslt.so:textproc/libxslt
+RUN_DEPENDS?=	dtplite:devel/tcllib
 
 PORTDOCS=	README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \
 		tcldom.html tcldom.xml tclxml.css tclxml.html tclxml.xml \
diff --git a/devel/tesla/Makefile b/devel/tesla/Makefile
index 47b6b76ef496..d3e25a601aa8 100644
--- a/devel/tesla/Makefile
+++ b/devel/tesla/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Temporally Enhanced Security Logic Assertions
 
 USES=		cmake:outsource execinfo ninja
 
-BUILD_DEPENDS=	clang33:${PORTSDIR}/lang/clang33
-RUN_DEPENDS=	clang33:${PORTSDIR}/lang/clang33
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS=	clang33:lang/clang33
+RUN_DEPENDS=	clang33:lang/clang33
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CTSRD-TESLA
diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index e5167f7dddcf..b1e34dc6c815 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
 OPTIONS_DEFINE=		MANPAGES
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
-BUILD_DEPENDS+=		talloc>=2.1.5:${PORTSDIR}/devel/talloc
+BUILD_DEPENDS+=		talloc>=2.1.5:devel/talloc
 RUN_DEPENDS:=		${BUILD_DEPENDS}
 
 .include <bsd.port.options.mk>
@@ -50,8 +50,8 @@ PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/_tevent.so \
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 .endif
 
 PLIST_FILES+=		include/tevent.h \
diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile
index 2357adaf9707..d6e04e48c2cf 100644
--- a/devel/tex-web2c/Makefile
+++ b/devel/tex-web2c/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX implementation translating WEB to C
 
-LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libzzip.so:${PORTSDIR}/devel/zziplib \
-		libmpfr.so:${PORTSDIR}/math/mpfr
+LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
+		libpng.so:graphics/png \
+		libzzip.so:devel/zziplib \
+		libmpfr.so:math/mpfr
 
 USES=		pkgconfig libtool tar:xz
 USE_TEX=	kpathsea ptexenc
diff --git a/devel/thrift-c_glib/Makefile b/devel/thrift-c_glib/Makefile
index cd77805cc166..74e33d5104f1 100644
--- a/devel/thrift-c_glib/Makefile
+++ b/devel/thrift-c_glib/Makefile
@@ -16,7 +16,7 @@ PKGNAMESUFFIX=	-c_glib
 
 BUILDIR=	${WRKDIR}/${DISTNAME}/lib/c_glib
 
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 
 DISTINFO_FILE=	${.CURDIR}/../thrift/distinfo
 
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index 62fcb49c2e9e..921af9910cd4 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -15,8 +15,8 @@ COMMENT=	C++ interface to Thrift
 
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libevent.so:devel/libevent2
 
 USES=			autoreconf pkgconfig gmake compiler:c++11-lang libtool
 GNU_CONFIGURE=		yes
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 16991bbc891e..27cbc78be70d 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -24,9 +24,9 @@ OPTIONS_DEFAULT=	SVN
 GIT_DESC=	Git support
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+GIT_RUN_DEPENDS=	git:devel/git
 GIT_CONFIGURE_ENABLE=	git
-SVN_LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+SVN_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 SVN_CONFIGURE_ENABLE=	subversion
 OPTIONS_SUB=	yes
 
diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index f9598ae8a8a5..116da3a86846 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Text-mode interface for git
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	git:${PORTSDIR}/devel/git
+RUN_DEPENDS=	git:devel/git
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
@@ -26,8 +26,8 @@ PLIST_FILES=	bin/tig etc/tigrc
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
-MANPAGES_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			xmlto:textproc/xmlto
 MANPAGES_ALL_TARGET=	doc-man
 MANPAGES_INSTALL_TARGET=	install-doc-man
 MANPAGES_PLIST_FILES=	man/man1/tig.1.gz \
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 373742857726..d9e125e1e0b6 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tcl/Tk frontends to CVS and Subversion
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	tkdiff:${PORTSDIR}/textproc/tkdiff
+RUN_DEPENDS=	tkdiff:textproc/tkdiff
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/tkinspect/Makefile b/devel/tkinspect/Makefile
index f19116272e6c..4e551acf538c 100644
--- a/devel/tkinspect/Makefile
+++ b/devel/tkinspect/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=   SF/tkcon/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk program browser
 
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:x11-toolkits/tk84
 
 # this would do an interactive install:
 #do-install:
diff --git a/devel/tkmerge/Makefile b/devel/tkmerge/Makefile
index e8c0b2d0b835..02bafceba611 100644
--- a/devel/tkmerge/Makefile
+++ b/devel/tkmerge/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://immure.com/ports/tkmerge/
 MAINTAINER=	bob@immure.com
 COMMENT=	Tk script to aid in merging changes between two files
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/bwidget/label.tcl:${PORTSDIR}/x11-toolkits/bwidget
+RUN_DEPENDS+=	${LOCALBASE}/lib/bwidget/label.tcl:x11-toolkits/bwidget
 
 USES=		tk:run
 
diff --git a/devel/tkp4/Makefile b/devel/tkp4/Makefile
index 51c0c463b2ff..de4f88a07d19 100644
--- a/devel/tkp4/Makefile
+++ b/devel/tkp4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tcl/Tk frontends to Perforce's p4
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
+RUN_DEPENDS=	p4:devel/p4
 
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index f85b918ee21b..345b75e5a268 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -13,9 +13,9 @@ COMMENT=	The original arch source control management CLI written in C
 
 OPTIONS_DEFINE=	DOCS
 
-BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
-		gdiff:${PORTSDIR}/textproc/diffutils \
-		gtar:${PORTSDIR}/archivers/gtar
+BUILD_DEPENDS=	gpatch:devel/patch \
+		gdiff:textproc/diffutils \
+		gtar:archivers/gtar
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 73f31461df28..d4b84a648f17 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -12,18 +12,18 @@ COMMENT=	THg script from TortoiseHG
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.11.4:${PORTSDIR}/textproc/py-qt4-xml
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:${PORTSDIR}/devel/py-qt4-qscintilla2 \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		hg:${PORTSDIR}/devel/mercurial \
-		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:${PORTSDIR}/devel/py-iniparse \
-		pygmentize:${PORTSDIR}/textproc/py-pygments
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.11.4:textproc/py-qt4-xml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=4.11.4:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.9.1:devel/py-qt4-qscintilla2 \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=4.11.4:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.11.4:x11-toolkits/py-qt4-gui \
+		hg:devel/mercurial \
+		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse \
+		pygmentize:textproc/py-pygments
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
diff --git a/devel/trac-bitten/Makefile b/devel/trac-bitten/Makefile
index d60ab2bcdae2..d62cd0ade2c4 100644
--- a/devel/trac-bitten/Makefile
+++ b/devel/trac-bitten/Makefile
@@ -30,7 +30,7 @@ BITTEN_MASTER_DESC=	Build bitten master
 
 OPTIONS_DEFAULT=	BITTEN_MASTER
 
-BITTEN_MASTER_RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac
+BITTEN_MASTER_RUN_DEPENDS=	tracd:www/trac
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/devel/uatraits/Makefile b/devel/uatraits/Makefile
index 2c3e9b1dddcc..ef6d48eda03c 100644
--- a/devel/uatraits/Makefile
+++ b/devel/uatraits/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://people.freebsd.org/~demon/
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	User-Agent detection library
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libpcre.so:devel/pcre \
+		libxml2.so:textproc/libxml2
 
 USES=		autoreconf libtool pkgconfig python
 GNU_CONFIGURE=	yes
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 5980e02cf67c..c25bef177d00 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -38,7 +38,7 @@ post-patch:
 .endif
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS+=		${LOCALBASE}/bin/yasm:devel/yasm
 CONFIGURE_ENV+=		PYTHON="${PYTHON_CMD}" YASM="${LOCALBASE}/bin/yasm"
 USES+=			python:build
 
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 838db3ab73bd..117dcd6f9580 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	UML modeller for KDE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_GNOME=	libxml2 libxslt
diff --git a/devel/umlgraph/Makefile b/devel/umlgraph/Makefile
index b3b27f9c0923..2288b0737b4c 100644
--- a/devel/umlgraph/Makefile
+++ b/devel/umlgraph/Makefile
@@ -17,8 +17,8 @@ USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 
-BUILD_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		pic2plot:${PORTSDIR}/graphics/plotutils
+BUILD_DEPENDS=	dot:graphics/graphviz \
+		pic2plot:graphics/plotutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_FILES=	bin/umlgraph %%JAVAJARDIR%%/UmlGraph.jar
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 802586759fce..5090902b9f9f 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION}
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Graphical UI for multiple source code indent/format/beautify tools
 
-LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 USES=		dos2unix qmake shebangfix
 SHEBANG_FILES=	indenters/pindent.py \
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 96ab73471670..475cdde3f7dd 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libnotify.so:devel/libnotify
 
 USES=		execinfo gmake
 USE_XORG=	xft
diff --git a/devel/urjtag/Makefile b/devel/urjtag/Makefile
index 800aa9b48ce8..c413b8123bac 100644
--- a/devel/urjtag/Makefile
+++ b/devel/urjtag/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extended utility to work with JTAG-aware boards
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake readline shebangfix tar:bzip2
 SHEBANG_FILES=	src/bsdl2jtag
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=	FTDI USB
 OPTIONS_SUB=		yes
 
 FTDI_DESC=		FTDI-based USB JTAG adapters support
-FTDI_LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
+FTDI_LIB_DEPENDS=	libftdi.so:devel/libftdi
 FTDI_CONFIGURE_WITH=	libftdi
 
 JEDEC_DESC=		Experimental JEDEC flash detection
@@ -42,7 +42,7 @@ USB_CONFIGURE_ON=	--with-libusb=/usr
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 CONFIGURE_ENV+=	LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index dd8f3346b06d..4cdcb166c3ed 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -26,8 +26,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
 
-BUILD_DEPENDS+=		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl>=0:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=		MPI DOCS
 OPTIONS_DEFINE_amd64=	32BIT
@@ -37,7 +37,7 @@ OPTIONS_DEFAULT_amd64=	32BIT
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
-MPI_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
 OPTIONS_SUB=	yes
 USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index eb108524a924..04615821ee29 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -25,8 +25,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
 
-BUILD_DEPENDS+=		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl>=0:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=		MPI DOCS
 OPTIONS_DEFINE_amd64=	32BIT
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT_amd64=	32BIT
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
-MPI_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
 
 OPTIONS_SUB=	yes
 USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index 7d909bb81f1d..af45a899c1e5 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Configuration System for the STAGE Server
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/vera++/Makefile b/devel/vera++/Makefile
index 4ff3b2e4d635..897d535214e7 100644
--- a/devel/vera++/Makefile
+++ b/devel/vera++/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tool for verification of C++ source code
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 
 USES=		cmake:outsource tk
 
@@ -33,10 +33,10 @@ OPTIONS_DEFAULT=	LUA PYTHON
 
 PYTHON_CMAKE_OFF=	-DVERA_PYTHON:BOOL=OFF
 PYTHON_CMAKE_ON=	-DVERA_PYTHON:BOOL=ON
-PYTHON_LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 LUA_CMAKE_OFF=	-DVERA_LUA:BOOL=OFF
 LUA_CMAKE_ON=	-DVERA_LUA:BOOL=ON
-LUA_LIB_DEPENDS=	libluabind.so:${PORTSDIR}/devel/luabind
+LUA_LIB_DEPENDS=	libluabind.so:devel/luabind
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^add_subdirectory(doc/d' \
diff --git a/devel/visualparadigm/Makefile b/devel/visualparadigm/Makefile
index 5117575f8460..596008314cba 100644
--- a/devel/visualparadigm/Makefile
+++ b/devel/visualparadigm/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	Visual_Paradigm_CE_${PORTVERSION:C/\./_/g}_Unix_InstallFree
 MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Visual modeling tool for all kinds of UML diagrams
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libsqlitejdbc.so:${PORTSDIR}/java/sqlitejdbc
+RUN_DEPENDS=	${LOCALBASE}/lib/libsqlitejdbc.so:java/sqlitejdbc
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
diff --git a/devel/wandio/Makefile b/devel/wandio/Makefile
index ced23aee97d5..3df34d25b134 100644
--- a/devel/wandio/Makefile
+++ b/devel/wandio/Makefile
@@ -33,9 +33,9 @@ HTTP_DESC=	Support for reading files over HTTP
 ZLIB_CONFIGURE_WITH=	zlib
 BZIP2_CONFIGURE_WITH=	bzip2
 LZO_CONFIGURE_WITH=	lzo
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZMA_CONFIGURE_WITH=	lzma
 HTTP_CONFIGURE_WITH=	http
-HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+HTTP_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include <bsd.port.mk>
diff --git a/devel/winpdb/Makefile b/devel/winpdb/Makefile
index a85b47c2d065..7f5cf2245db3 100644
--- a/devel/winpdb/Makefile
+++ b/devel/winpdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced Python debugger
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/devel/xc3sprog/Makefile b/devel/xc3sprog/Makefile
index 4593bb8eb9d6..489802b162b3 100644
--- a/devel/xc3sprog/Makefile
+++ b/devel/xc3sprog/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	http://opsec.eu/src/xc3sprog/
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Free programmer for Xilinx Spartan S3E Starter Kit
 
-LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi
-RUN_DEPENDS=	${LOCALBASE}/sbin/fxload:${PORTSDIR}/misc/fxload
+LIB_DEPENDS=	libftdi.so:devel/libftdi
+RUN_DEPENDS=	${LOCALBASE}/sbin/fxload:misc/fxload
 
 USES=		tar:xz cmake
 ALL_TARGET=	xc3sprog
diff --git a/devel/xdg-user-dirs/Makefile b/devel/xdg-user-dirs/Makefile
index 5ac50e2e9c80..88ea5ebd2233 100644
--- a/devel/xdg-user-dirs/Makefile
+++ b/devel/xdg-user-dirs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://user-dirs.freedesktop.org/releases/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Tool to help manage personal user directories
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake iconv
diff --git a/devel/xdg-utils/Makefile b/devel/xdg-utils/Makefile
index fbde757b3703..497a133e00aa 100644
--- a/devel/xdg-utils/Makefile
+++ b/devel/xdg-utils/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://portland.freedesktop.org/download/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to allow all applications to integrate with the free desktop
 
-BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		xprop:${PORTSDIR}/x11/xprop \
-		xset:${PORTSDIR}/x11/xset
+BUILD_DEPENDS=	xmlto:textproc/xmlto
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		xprop:x11/xprop \
+		xset:x11/xset
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index fa8d1f1ca0be..eb12ed0dccff 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Xfce development tools
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		automake-1.15:${PORTSDIR}/devel/automake \
-		libtoolize:${PORTSDIR}/devel/libtool \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	autoconf-2.69:devel/autoconf \
+		automake-1.15:devel/automake \
+		libtoolize:devel/libtool \
+		bash:shells/bash
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
diff --git a/devel/xfce4-vala/Makefile b/devel/xfce4-vala/Makefile
index 6b4dff23b5c8..f3e59230c3d2 100644
--- a/devel/xfce4-vala/Makefile
+++ b/devel/xfce4-vala/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Vala binding for the Xfce core libraries
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	valac:lang/vala
 
 GNU_CONFIGURE=	yes
 USES=	pkgconfig gmake pathfix xfce tar:bzip2
diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index 5acec7cafcb1..3bffef9ad554 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES=	http://shibboleth.net/downloads/c++-opensaml/2.5.5/
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Low level XML support for SAML
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		liblog4shib.so:${PORTSDIR}/devel/log4shib \
-		libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
-		libxml-security-c.so:${PORTSDIR}/security/apache-xml-security-c
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		liblog4shib.so:devel/log4shib \
+		libxerces-c.so.3:textproc/xerces-c3 \
+		libxml-security-c.so:security/apache-xml-security-c
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-log4shib=${LOCALBASE} --with-openssl=${OPENSSLBASE} --with-curl=${LOCALBASE} --disable-doxygen-doc
diff --git a/devel/xsd/Makefile b/devel/xsd/Makefile
index cdeb8929dca6..3cdd93180229 100644
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@@ -16,12 +16,12 @@ LICENSE_NAME_FLOSSE=	FLOSS Exception
 LICENSE_FILE_FLOSSE=	${WRKSRC}/xsd/FLOSSE
 LICENSE_PERMS_FLOSSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/build-0.3/abspath.make:${PORTSDIR}/devel/build
+BUILD_DEPENDS=	${LOCALBASE}/include/build-0.3/abspath.make:devel/build
 # libxsd-frontend should come from a separate port as well, but at the moment
 # its distribution as a separate tarball is so poor that it does not even have
 # a `make install'.
-LIB_DEPENDS=	libcutl.so:${PORTSDIR}/devel/libcutl \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libcutl.so:devel/libcutl \
+		libxerces-c.so:textproc/xerces-c3
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/devel/yajl-tcl/Makefile b/devel/yajl-tcl/Makefile
index 467d1311ab3a..25eaaea393b6 100644
--- a/devel/yajl-tcl/Makefile
+++ b/devel/yajl-tcl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tcl bindings for Yet Another JSON Library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS=	libyajl.so:devel/yajl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile
index 4bf63ac74603..eb122e35f925 100644
--- a/devel/yaml-cpp/Makefile
+++ b/devel/yaml-cpp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	YAML parser and emitter in C++ matching the YAML 1.2 spec
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jbeder
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 40a4d81edb27..ba6f8d4ce8a2 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -10,11 +10,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/current
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Coordination Service for Distributed Applications
 
-RUN_DEPENDS=	slf4j>=1.7.5:${PORTSDIR}/devel/slf4j \
-		netty>=3.5.5:${PORTSDIR}/java/netty \
-		jline>=0.9.94:${PORTSDIR}/devel/jline \
-		log4j>=1.2.16:${PORTSDIR}/devel/log4j \
-		libzookeeper>=3.4.7:${PORTSDIR}/devel/libzookeeper
+RUN_DEPENDS=	slf4j>=1.7.5:devel/slf4j \
+		netty>=3.5.5:java/netty \
+		jline>=0.9.94:devel/jline \
+		log4j>=1.2.16:devel/log4j \
+		libzookeeper>=3.4.7:devel/libzookeeper
 
 USERS=	zookeeper
 GROUPS=	zookeeper
diff --git a/devel/zpu-gcc/Makefile b/devel/zpu-gcc/Makefile
index 304bba642313..233246cab56c 100644
--- a/devel/zpu-gcc/Makefile
+++ b/devel/zpu-gcc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ZPU gcc compiler
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/zpu/bin/zpu-elf-as:${PORTSDIR}/devel/zpu-binutils
+BUILD_DEPENDS=	${LOCALBASE}/zpu/bin/zpu-elf-as:devel/zpu-binutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/toolchain
diff --git a/devel/ztcl/Makefile b/devel/ztcl/Makefile
index 1091c232c494..a5c1919b6cf9 100644
--- a/devel/ztcl/Makefile
+++ b/devel/ztcl/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Zlib extension library for the Tcl
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libtclmore0.so:${PORTSDIR}/devel/tclmore
+LIB_DEPENDS=	libtclmore0.so:devel/tclmore
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 895c30a2207e..727bcc7bf444 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library to provide transparent read access to zipped files
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	zip:archivers/zip
 
 USES=		gmake libtool pathfix pkgconfig python:2,build tar:bzip2
 GNU_CONFIGURE=	yes