Remove ${PORTSDIR}/ from dependencies, categories r, s, t, and u.

With hat:	portmgr
Sponsored by:	Absolight

2099 files changed, 6833 insertions, 6833 deletions

diff --git a/russian/bugzilla44/Makefile b/russian/bugzilla44/Makefile
index d496ab6eb4c1..f1130bc50d26 100644
--- a/russian/bugzilla44/Makefile
+++ b/russian/bugzilla44/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	bugzilla-${PORTVERSION}-ru-20140422
 MAINTAINER=	bz-ports@FreeBSD.org
 COMMENT=	Russian localization for Bugzilla
 
-RUN_DEPENDS=	bugzilla44>=${PORTVERSION}:${PORTSDIR}/devel/bugzilla44
+RUN_DEPENDS=	bugzilla44>=${PORTVERSION}:devel/bugzilla44
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.ru
 
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
index 309f3508f8e2..afeb5e2d565c 100644
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Emulator of Elektronika RPN programmable calculator series
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
-		fpcres:${PORTSDIR}/lang/fpc-utils
+BUILD_DEPENDS=	lazbuild:editors/lazarus \
+		fpcres:lang/fpc-utils
 
 USE_FPC=	cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg x11
 
@@ -36,13 +36,13 @@ OPTIONS_DEFAULT=	GTK2 PORTAUDIO
 GTK2_DESC=	Build with GTK+ 2 interface
 QT4_DESC=	Build with Qt 4 interface
 
-GTK2_BUILD_DEPENDS=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+GTK2_BUILD_DEPENDS=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 GTK2_USE=		GNOME=gtk20 FPC=gtk2
 
-QT4_BUILD_DEPENDS=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
-QT4_LIB_DEPENDS=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+QT4_BUILD_DEPENDS=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
+QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
 
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 .include <bsd.port.options.mk>
 
diff --git a/russian/gd/Makefile b/russian/gd/Makefile
index 2f19e7bd9432..a1e03c6d7cb8 100644
--- a/russian/gd/Makefile
+++ b/russian/gd/Makefile
@@ -6,8 +6,8 @@ CATEGORIES=	russian
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graphics library for fast image creation with KOI8-U support
 
-FETCH_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/x11-fonts/geminifonts:fetch
-BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/x11-fonts/geminifonts:fetch
+FETCH_DEPENDS=  ${NONEXISTENT}:x11-fonts/geminifonts:fetch
+BUILD_DEPENDS=  ${NONEXISTENT}:x11-fonts/geminifonts:fetch
 GD_FONTS=	${DISTDIR}/x-koi8u.tgz koi6x10.bdf koi6x13.bdf \
 		koi10x16b.bdf koi9x15.bdf koi10x20.bdf
 
diff --git a/russian/p5-Convert-Cyrillic/Makefile b/russian/p5-Convert-Cyrillic/Makefile
index ba73afb7166e..ab35c4ac4f83 100644
--- a/russian/p5-Convert-Cyrillic/Makefile
+++ b/russian/p5-Convert-Cyrillic/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	cyrillic-${PORTVERSION}
 MAINTAINER=	pluknet@gmail.com
 COMMENT=	Routines for converting from one Cyrillic charset to another
 
-BUILD_DEPENDS=	p5-Unicode-Map8>=0:${PORTSDIR}/converters/p5-Unicode-Map8
+BUILD_DEPENDS=	p5-Unicode-Map8>=0:converters/p5-Unicode-Map8
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/russian/p5-Lingua-DetectCyrillic/Makefile b/russian/p5-Lingua-DetectCyrillic/Makefile
index 591fda2d93fa..0c734bb7f402 100644
--- a/russian/p5-Lingua-DetectCyrillic/Makefile
+++ b/russian/p5-Lingua-DetectCyrillic/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dliakh@ukr.net
 COMMENT=	Detects 7 Cyrillic codings as well as the language
 
-RUN_DEPENDS=	p5-Unicode-Map8>=0:${PORTSDIR}/converters/p5-Unicode-Map8 \
-		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
+RUN_DEPENDS=	p5-Unicode-Map8>=0:converters/p5-Unicode-Map8 \
+		p5-Unicode-String>=0:converters/p5-Unicode-String
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/russian/p5-Text-Hyphen-RU/Makefile b/russian/p5-Text-Hyphen-RU/Makefile
index 12e0286d25bd..db9738ea53b6 100644
--- a/russian/p5-Text-Hyphen-RU/Makefile
+++ b/russian/p5-Text-Hyphen-RU/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Determine positions for hyphens inside russian words
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-Text-Hyphen>=0:${PORTSDIR}/textproc/p5-Text-Hyphen
+BUILD_DEPENDS=	p5-Text-Hyphen>=0:textproc/p5-Text-Hyphen
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile
index d84aed2b8c2e..8f329c055687 100644
--- a/russian/p5-XML-Parser-encodings/Makefile
+++ b/russian/p5-XML-Parser-encodings/Makefile
@@ -10,11 +10,11 @@ DISTFILES=
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Additional Russian encodings for XML::Parser
 
-RUN_DEPENDS=	p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-XML-Parser>=2.40:textproc/p5-XML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-XML-Encoding>=0:${PORTSDIR}/textproc/p5-XML-Encoding \
-		${NONEXISTENT}:${PORTSDIR}/converters/iconv:extract \
-		${NONEXISTENT}:${PORTSDIR}/converters/iconv-extra:extract
+		p5-XML-Encoding>=0:textproc/p5-XML-Encoding \
+		${NONEXISTENT}:converters/iconv:extract \
+		${NONEXISTENT}:converters/iconv-extra:extract
 
 USES=		perl5
 NO_WRKSUBDIR=	YES
diff --git a/russian/rubygem-russian/Makefile b/russian/rubygem-russian/Makefile
index b871dbf8da3f..78cfaba1dd56 100644
--- a/russian/rubygem-russian/Makefile
+++ b/russian/rubygem-russian/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Russian language support for Ruby and Rails, based on I18n library
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-i18n>=0.5.0:${PORTSDIR}/devel/rubygem-i18n
+RUN_DEPENDS=	rubygem-i18n>=0.5.0:devel/rubygem-i18n
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index 5307df2aa3b6..e5312c14d30a 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Insight Toolkit
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo \
-		libgdcmCommon.so:${PORTSDIR}/devel/gdcm \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfftw.so:${PORTSDIR}/math/fftw \
-		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libturbojpeg.so:graphics/libjpeg-turbo \
+		libgdcmCommon.so:devel/gdcm \
+		libexpat.so:textproc/expat2 \
+		libfftw.so:math/fftw \
+		libhdf5.so:science/hdf5 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		cmake:outsource
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
diff --git a/science/R-cran-DCluster/Makefile b/science/R-cran-DCluster/Makefile
index acf461739698..1c72d7700061 100644
--- a/science/R-cran-DCluster/Makefile
+++ b/science/R-cran-DCluster/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Functions for the detection of spatial clusters of diseases
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-spdep>0:${PORTSDIR}/math/R-cran-spdep
+RUN_DEPENDS=	R-cran-spdep>0:math/R-cran-spdep
 
 USES=	cran:auto-plist
 
diff --git a/science/R-cran-Epi/Makefile b/science/R-cran-Epi/Makefile
index 1130a2fee5ab..31cf952817f7 100644
--- a/science/R-cran-Epi/Makefile
+++ b/science/R-cran-Epi/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Package for statistical analysis in epidemiology
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-cmprsk>0:${PORTSDIR}/science/R-cran-cmprsk \
-		R-cran-etm>0:${PORTSDIR}/science/R-cran-etm \
-		R-cran-plyr>0:${PORTSDIR}/devel/R-cran-plyr
+RUN_DEPENDS=	R-cran-cmprsk>0:science/R-cran-cmprsk \
+		R-cran-etm>0:science/R-cran-etm \
+		R-cran-plyr>0:devel/R-cran-plyr
 
 USES=	cran:auto-plist
 
diff --git a/science/afni/Makefile b/science/afni/Makefile
index 14254ed12663..f9bfdb597308 100644
--- a/science/afni/Makefile
+++ b/science/afni/Makefile
@@ -19,17 +19,17 @@ COMMENT=	Advanced Functional Neuro Imaging
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS=	libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
-		libR.so:${PORTSDIR}/math/R \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libnetcdff.so:${PORTSDIR}/science/netcdf-fortran \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libf2c.so:${PORTSDIR}/lang/f2c
-RUN_DEPENDS=	mpeg_encode:${PORTSDIR}/multimedia/mpeg_encode \
-		ppmtogif:${PORTSDIR}/graphics/netpbm \
-		endian:${PORTSDIR}/sysutils/endian \
-		qhull:${PORTSDIR}/math/qhull5
+BUILD_DEPENDS=	gm4:devel/m4
+LIB_DEPENDS=	libXm.so:x11-toolkits/open-motif \
+		libR.so:math/R \
+		libgsl.so:math/gsl \
+		libnetcdff.so:science/netcdf-fortran \
+		libxml2.so:textproc/libxml2 \
+		libf2c.so:lang/f2c
+RUN_DEPENDS=	mpeg_encode:multimedia/mpeg_encode \
+		ppmtogif:graphics/netpbm \
+		endian:sysutils/endian \
+		qhull:math/qhull5
 
 CONFLICTS=	im-[0-9]* \
 		nifticlib-[0-9]* \
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index 965055ba025c..9831e3226a7c 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Advanced molecular editor and viewer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	eigen2>2:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	libopenbabel.so:${PORTSDIR}/science/openbabel
+BUILD_DEPENDS=	eigen2>2:math/eigen2
+LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
 USES=		cmake desktop-file-utils pkgconfig tar:bzip2
 USE_GL=		glu gl
@@ -35,10 +35,10 @@ OPTIONS_SUB=	yes
 
 PYTHON_USES=		python:2
 PYTHON_BUILD_DEPENDS=	${PYNUMPY} \
-			${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
-PYTHON_LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+			${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip
+PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
-			${PYTHON_PKGNAMEPREFIX}sip>0:${PORTSDIR}/devel/py-sip
+			${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip
 PYTHON_CMAKE_ON=	-DENABLE_PYTHON=ON \
 			-DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION}
 PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=OFF
diff --git a/science/bddsolve/Makefile b/science/bddsolve/Makefile
index f89e303ed688..be88cfe6a2cb 100644
--- a/science/bddsolve/Makefile
+++ b/science/bddsolve/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	BDD-based satisfiability and reachability solver
 
-LIB_DEPENDS+=	libbdd.so:${PORTSDIR}/science/buddy \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS+=	libbdd.so:science/buddy \
+		libboost_program_options.so:devel/boost-libs
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/science/bodr/Makefile b/science/bodr/Makefile
index 56071d41b954..8d8888b41165 100644
--- a/science/bodr/Makefile
+++ b/science/bodr/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chemistry data like element and isotope properties, atomic radii, etc
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/science/brian/Makefile b/science/brian/Makefile
index 64240c490dc8..6fa2c5894e6e 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Clock-driven simulator for spiking neural networks
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:${PORTSDIR}/math/py-matplotlib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python zip
diff --git a/science/cdo/Makefile b/science/cdo/Makefile
index b7be329aaf38..a8f4cbab7a9f 100644
--- a/science/cdo/Makefile
+++ b/science/cdo/Makefile
@@ -39,25 +39,25 @@ USES=		gmake libtool pathfix
 
 CGRIBEX_CONFIGURE_OFF=	--without-cgribex
 CGRIBEX_CONFIGURE_ON=	--with-cgribex=${LOCALBASE}
-CGRIBEX_LIB_DEPENDS=	libcgribex.so:${PORTSDIR}/science/cgribex
+CGRIBEX_LIB_DEPENDS=	libcgribex.so:science/cgribex
 HDF5_CONFIGURE_OFF=	--without-hdf5
 HDF5_CONFIGURE_ON=	--with-hdf5=${LOCALBASE}
-HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 JASPER_CONFIGURE_OFF=	--without-jasper
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 NETCDF_CONFIGURE_OFF=	--without-netcdf
 NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}
-NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 PROJ_CONFIGURE_OFF=	--without-proj
 PROJ_CONFIGURE_ON=	--with-proj=${LOCALBASE}
-PROJ_LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj
+PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
 SZIP_CONFIGURE_OFF=	--without-szlib
 SZIP_CONFIGURE_ON=	--with-szlib=${LOCALBASE}
-SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
+SZIP_LIB_DEPENDS=	libsz.so:science/szip
 UDUNITS_CONFIGURE_OFF=	--without-udunits2
 UDUNITS_CONFIGURE_ON=	--with-udunits2=${LOCALBASE}
-UDUNITS_LIB_DEPENDS=	libudunits2.so:${PORTSDIR}/science/udunits
+UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 
 .include <bsd.port.pre.mk>
 
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index d8aecfec29db..ea7b26489b95 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFAULT=HDF5 TESTS TOOLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHDF5}
-LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5
+LIB_DEPENDS+=	libhdf5.so:science/hdf5
 CMAKE_ARGS+=	-DCGNS_ENABLE_HDF5:BOOL=TRUE -DHDF5_NEED_ZLIB:BOOL=TRUE	\
 		-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 PLIST_SUB=	HDF5=""
diff --git a/science/cgribex/Makefile b/science/cgribex/Makefile
index 02d384d0ab1d..d0a6b661eacc 100644
--- a/science/cgribex/Makefile
+++ b/science/cgribex/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight GRIBEX in C with portable Fortran interface
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
-		libsz.so:${PORTSDIR}/science/szip
+LIB_DEPENDS=	libjasper.so:graphics/jasper \
+		libsz.so:science/szip
 
 CONFIGURE_ARGS=	--with-jasper=${LOCALBASE} \
 		--with-szlib=${LOCALBASE}
diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile
index 2f894cf2864d..53179ad720fb 100644
--- a/science/chemical-mime-data/Makefile
+++ b/science/chemical-mime-data/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/chemical-mime/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Collection of chemical MIME types for UNIX desktops
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:${PORTSDIR}/graphics/librsvg2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/librsvg2
 
 USES=		gettext-tools gmake pkgconfig tar:bzip2 shared-mime-info
 USE_GNOME=	gnomemimedata intlhack libxslt:build
diff --git a/science/chemtool-devel/Makefile b/science/chemtool-devel/Makefile
index 4cbee98e48c4..67506aae82b6 100644
--- a/science/chemtool-devel/Makefile
+++ b/science/chemtool-devel/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	ct17a15
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Drawing organic molecules easily and store them (developer version)
 
-LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
-RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
+LIB_DEPENDS=	libEMF.so:graphics/libemf
+RUN_DEPENDS=	transfig:print/transfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.7alpha15/
 USE_GNOME=	gtk20
diff --git a/science/chemtool/Makefile b/science/chemtool/Makefile
index 823de2da6598..737a67df587b 100644
--- a/science/chemtool/Makefile
+++ b/science/chemtool/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://ruby.chemie.uni-freiburg.de/~martin/chemtool/
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Draw organic molecules easily and store them
 
-LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
-RUN_DEPENDS=	transfig:${PORTSDIR}/print/transfig
+LIB_DEPENDS=	libEMF.so:graphics/libemf
+RUN_DEPENDS=	transfig:print/transfig
 
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20
diff --git a/science/dlpoly-classic/Makefile b/science/dlpoly-classic/Makefile
index 8d69c2840975..f8c8e4ca08a0 100644
--- a/science/dlpoly-classic/Makefile
+++ b/science/dlpoly-classic/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	dl_class_${PORTVERSION}
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Molecular dynamics simulation package
 
-BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpif90:${PORTSDIR}/net/openmpi
-RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpif90:net/openmpi
+RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 
 OPTIONS_DEFINE=	GUI DOCS EXAMPLES
 OPTIONS_DEFAULT=	GUI
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index 22f89dc2ccfe..553535f67ff5 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Code_Saturne Preprocessor
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch
-LIB_DEPENDS=	libmed.so:${PORTSDIR}/french/med	\
-		libbft.so:${PORTSDIR}/science/bft	\
-		libhdf5.so:${PORTSDIR}/science/hdf5	\
-		libcgns.so:${PORTSDIR}/science/cgnslib
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libscotch.a:cad/scotch
+LIB_DEPENDS=	libmed.so:french/med	\
+		libbft.so:science/bft	\
+		libhdf5.so:science/hdf5	\
+		libcgns.so:science/cgnslib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -42,7 +42,7 @@ NLS_USES=	gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
 
 DOCS_USE=	TEX=tex:build
-DOCS_BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
+DOCS_BUILD_DEPENDS=	fig2dev:print/transfig
 
 .include <bsd.port.options.mk>
 
@@ -59,10 +59,10 @@ MAKE_JOBS_UNSAFE=yes
 
 .if exists(${LOCALBASE}/bin/graphchk)
 # The regular metis is present, so we cannot depend on metis-edf
-LIB_DEPENDS+=	libmetis.so.1:${PORTSDIR}/math/metis4
+LIB_DEPENDS+=	libmetis.so.1:math/metis4
 .else
 # Prefer metis-edf to avoid conflict with Code_Aster
-LIB_DEPENDS+=	libmetis.so.0:${PORTSDIR}/math/metis-edf
+LIB_DEPENDS+=	libmetis.so.0:math/metis-edf
 .endif
 
 pre-configure:
diff --git a/science/fisicalab/Makefile b/science/fisicalab/Makefile
index dda5c2bfd81f..4dfdf9cdc06c 100644
--- a/science/fisicalab/Makefile
+++ b/science/fisicalab/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Physics simulation program for educational use
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS+=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libgsl.so:math/gsl
 
 USES=		gnustep
 GNU_CONFIGURE=	yes
diff --git a/science/fvcom-mpi/Makefile b/science/fvcom-mpi/Makefile
index 4882999dc12a..3a2cb929cab5 100644
--- a/science/fvcom-mpi/Makefile
+++ b/science/fvcom-mpi/Makefile
@@ -8,7 +8,7 @@ MPIPREFIX=	mpi/openmpi/
 
 MAINTAINER=	bacon4000@gmail.com
 
-LIB_DEPENDS+=	libmpi.so:${PORTSDIR}/net/openmpi
+LIB_DEPENDS+=	libmpi.so:net/openmpi
 
 MASTERDIR=	${.CURDIR}/../fvcom
 
diff --git a/science/fvcom/Makefile b/science/fvcom/Makefile
index fc3ea906a283..318d2134cf6a 100644
--- a/science/fvcom/Makefile
+++ b/science/fvcom/Makefile
@@ -13,9 +13,9 @@ MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Unstructured Grid Finite Volume Coastal Ocean Model
 
 # Check netcdf lib for Fortran support!
-LIB_DEPENDS+=	libnetcdff.so:${PORTSDIR}/science/netcdf-fortran \
-		liblapack.so:${PORTSDIR}/math/lapack \
-		libblas.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libnetcdff.so:science/netcdf-fortran \
+		liblapack.so:math/lapack \
+		libblas.so:math/lapack
 
 USES=		fortran
 USE_GCC=	yes
diff --git a/science/fvm/Makefile b/science/fvm/Makefile
index ff8c89926952..c8d52fa5df93 100644
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Code_Saturne Finite Volume Mesh
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libmed.so:${PORTSDIR}/french/med	\
-		libbft.so:${PORTSDIR}/science/bft	\
-		libhdf5.so:${PORTSDIR}/science/hdf5	\
-		libcgns.so:${PORTSDIR}/science/cgnslib
+LIB_DEPENDS=	libmed.so:french/med	\
+		libbft.so:science/bft	\
+		libhdf5.so:science/hdf5	\
+		libcgns.so:science/cgnslib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -29,16 +29,16 @@ CONFIGURE_ARGS=	--with-bft=${LOCALBASE}	\
 INSTALL_TARGET=	install-strip
 
 .if defined(WITH_LAM)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/liblam.a:${PORTSDIR}/net/lam
-RUN_DEPENDS+=	${LOCALBASE}/bin/lamboot:${PORTSDIR}/net/lam
+BUILD_DEPENDS+=	${LOCALBASE}/lib/liblam.a:net/lam
+RUN_DEPENDS+=	${LOCALBASE}/bin/lamboot:net/lam
 CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}
 .elif defined(WITH_OPENMPI)
-BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}/mpi/openmpi
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:net/mpich2
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2
 CONFIGURE_ARGS+=	--with-mpi=${LOCALBASE}
 # Do not directly depend on Fortran, but FFLAGS needed to link with mpich2
 USES+=		fortran
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 5cb08b653749..a6508b33f752 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -10,13 +10,13 @@ DISTNAME=	gnome-chemistry-utils-${PORTVERSION}
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	C++ classes and Gtk3 widgets related to chemistry
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
-		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libopenbabel.so:${PORTSDIR}/science/openbabel \
-		libgoffice-0.10.so:${PORTSDIR}/devel/goffice010
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:${PORTSDIR}/science/bodr \
-		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:science/bodr \
+		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libopenbabel.so:science/openbabel \
+		libgoffice-0.10.so:devel/goffice010
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bodr.pc:science/bodr \
+		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
 PORTSCOUT=	limitw:1,even
 
@@ -52,7 +52,7 @@ XUL_CONFIGURE_OFF=--disable-mozilla-plugin
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNUMERIC} || exists(${LOCALBASE}/lib/libspreadsheet.so)
-LIB_DEPENDS+=	libspreadsheet.so:${PORTSDIR}/math/gnumeric
+LIB_DEPENDS+=	libspreadsheet.so:math/gnumeric
 PLIST_SUB+=	GNUMERIC=""
 .else
 PLIST_SUB+=	GNUMERIC="@comment "
diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index e5c583358436..dab4b57ac342 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Rather general finite element solver using mixed finite elements
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/README.txt
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl	\
-		liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS=	libgsl.so:math/gsl	\
+		liblapack.so:math/lapack
 
 USES=		fortran gmake tar:tgz cmake
 WANT_PERL=	yes
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index a82cd92d82ec..4b1eb4cfbb18 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Computational chemistry software package
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libmopac7.so:${PORTSDIR}/biology/mopac \
-		libghemical.so:${PORTSDIR}/science/libghemical \
-		liboglappth.so:${PORTSDIR}/science/liboglappth \
-		libmpqc.so:${PORTSDIR}/science/mpqc \
-		libopenbabel.so:${PORTSDIR}/science/openbabel \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libmopac7.so:biology/mopac \
+		libghemical.so:science/libghemical \
+		liboglappth.so:science/liboglappth \
+		libmpqc.so:science/mpqc \
+		libopenbabel.so:science/openbabel \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		fortran gettext gmake pathfix pkgconfig
 USE_GNOME=	gtk20 libglade2 intltool
diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile
index 2fbe5d861e78..f79da002a8cd 100644
--- a/science/ghmm/Makefile
+++ b/science/ghmm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	General Hidden Markov Model Library in C
 
 LICENSE=	GPLv3
 
-#BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+#BUILD_DEPENDS=	swig:devel/swig13
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index daae60a528be..041001405f1d 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -15,10 +15,10 @@ COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libplplot.so:${PORTSDIR}/math/plplot	\
-		libpng.so:${PORTSDIR}/graphics/png	\
-		libps.so:${PORTSDIR}/print/pslib	\
-		libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libplplot.so:math/plplot	\
+		libpng.so:graphics/png	\
+		libps.so:print/pslib	\
+		libgsl.so:math/gsl
 
 USE_WX=		2.8
 USE_XORG=	x11 sm ice xext
@@ -42,56 +42,56 @@ OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NET
 OPTIONS_DEFAULT=EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=	Eigen3 support (boost performance)
-EIGEN_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3
+EIGEN_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
-FFTW_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3		\
-			libfftw3f.so:${PORTSDIR}/math/fftw3-float
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
+			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GRAPHICSMAGICK_DESC=		Support GraphicsMagick
-GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick
+GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
-GRIB_LIB_DEPENDS=	libgrib_api.so:${PORTSDIR}/science/grib_api
+GRIB_LIB_DEPENDS=	libgrib_api.so:science/grib_api
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
-HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
-LIBPROJ4_LIB_DEPENDS=	libproj4.so:${PORTSDIR}/math/libproj4
+LIBPROJ4_LIB_DEPENDS=	libproj4.so:math/libproj4
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
 
-MPICH2_LIB_DEPENDS=	libmpich.so.8:${PORTSDIR}/net/mpich2
+MPICH2_LIB_DEPENDS=	libmpich.so.8:net/mpich2
 MPICH2_CMAKE_ON=	-DMPICH:BOOL=YES
 MPICH2_CMAKE_OFF=	-DMPICH:BOOL=NO
 
-NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
-			${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
+			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 # math/qhull conflicts with math/plplot
 #QHULL_DESC=		Enable Qhull support
-#QHULL_LIB_DEPENDS=	libqhull.so:${PORTSDIR}/math/qhull
+#QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
 #QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 #QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
-UDUNITS_LIB_DEPENDS=	libudunits2.so:${PORTSDIR}/science/udunits
+UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS:BOOL=NO
 
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 17afb15cfb48..2820811bc7f8 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GTK/GNOME-based genealogy program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:${PORTSDIR}/databases/py-bsddb \
-		${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:${PORTSDIR}/devel/py-pyicu
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \
+		${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:devel/py-pyicu
 
 NO_ARCH=	yes
 USE_BDB=	5+
@@ -34,11 +34,11 @@ ENCHANT_DESC=		Spellchecking support
 PYWEBKITGTK_DESC=	Use webkit backend for Geographic view
 EXIV_DESC=		Managing exiv metadata support
 
-ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
-EXIV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}exiv2>=0.1.3:${PORTSDIR}/graphics/py-exiv2
+ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant
+EXIV_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}exiv2>=0.1.3:graphics/py-exiv2
 GNOME_USE=		GNOME=pygnome2,gnomedocutils
-GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:${PORTSDIR}/graphics/py-pygraphviz
-PYWEBKITGTK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:${PORTSDIR}/www/py-webkitgtk
+GRAPHVIZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py-pygraphviz
+PYWEBKITGTK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk
 
 pre-extract:
 	@${ECHO_MSG} "=========================================================="
diff --git a/science/grib_api/Makefile b/science/grib_api/Makefile
index c374e8a2b30d..c34df1648845 100644
--- a/science/grib_api/Makefile
+++ b/science/grib_api/Makefile
@@ -12,8 +12,8 @@ COMMENT=	ECMWF API for WMO FM-92 GRIB messages
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libnetcdf.so:science/netcdf \
+		libpng.so:graphics/png
 
 OPTIONS_SINGLE=	JPEG
 OPTIONS_SINGLE_JPEG=	JASPER OPENJPEG
@@ -30,9 +30,9 @@ USES=		libtool pathfix
 PORTDATA=	*
 
 JASPER_CONFIGURE_ON=	--with-jasper=${LOCALBASE}
-JASPER_LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper
+JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 OPENJPEG_CONFIGURE_ON=	--with-openjpeg=${LOCALBASE}
-OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/grib1to2 ${STAGEDIR}${PREFIX}/bin/grib1to2
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index 0f483857edb5..389184966855 100644
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Compute molecular dynamics
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	boost-libs>=1.44:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	boost-libs>=1.44:devel/boost-libs
 
 USES=		cmake fortran perl5 pkgconfig shebangfix
 SHEBANG_FILES=	admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh
@@ -36,18 +36,18 @@ ATLAS_CMAKE_ON=		-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so;${LOCAL
 ATLAS_CMAKE_OFF=	-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libblas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/liblapack.so"
 FLOAT_DESC=		Use single instead of double precision
-FLOAT_BUILD_DEPENDS=	fftw3>0:${PORTSDIR}/math/fftw3
-FLOAT_LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
-FLOAT_LIB_DEPENDS_OFF=	libfftw3.so:${PORTSDIR}/math/fftw3
+FLOAT_BUILD_DEPENDS=	fftw3>0:math/fftw3
+FLOAT_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
+FLOAT_LIB_DEPENDS_OFF=	libfftw3.so:math/fftw3
 FLOAT_CMAKE_ON=		-DGMX_DOUBLE:BOOL=OFF
 FLOAT_CMAKE_OFF=	-DGMX_DOUBLE:BOOL=ON
-MPICH2_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPICH2_LIB_DEPENDS=	libmpich.so:net/mpich2
 MPICH2_CMAKE_ON=	-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/bin/mpicc"
 OPENMP_USES=		compiler:openmp
 OPENMP_CMAKE_ON=	-DGMX_CXX11:BOOL=OFF
 OPENMP_CMAKE_OFF=	-DGMX_OPENMP:BOOL=OFF
-OPENMPI_BUILD_DEPENDS=	openmpi>0:${PORTSDIR}/net/openmpi
-OPENMPI_RUN_DEPENDS=	openmpi>0:${PORTSDIR}/net/openmpi
+OPENMPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
+OPENMPI_RUN_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_CMAKE_ON=	-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicc"
 SIMD_CMAKE_OFF=		-DGMX_SIMD:STRING="None"
 X11_USE=		XORG=xext,x11
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index 4fb9afeab6b4..89b480229f71 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Gtk2 based SPM data visualization and analysis tool
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libminizip.so:${PORTSDIR}/archivers/minizip \
-		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libminizip.so:archivers/minizip \
+		libcfitsio.so:astro/cfitsio \
+		libIlmImf.so:graphics/OpenEXR \
+		libfftw3.so:math/fftw3 \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		shared-mime-info tar:xz
@@ -48,7 +48,7 @@ PYTHON_CONFIGURE_WITH=	gtksourceview python
 RUBY_USE=		ruby=yes
 RUBY_CONFIGURE_WITH=	ruby
 UNIQUE_DESC=		Remote control backend support
-UNIQUE_LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+UNIQUE_LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
 UNIQUE_CONFIGURE_WITH=	unique
 
 post-patch:
diff --git a/science/h5utils/Makefile b/science/h5utils/Makefile
index 0e3d1a2ec968..0bc90da9019b 100644
--- a/science/h5utils/Makefile
+++ b/science/h5utils/Makefile
@@ -17,9 +17,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 GNU_CONFIGURE=	YES
 CFLAGS +=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -lpthread
 
-BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libmatheval.so:${PORTSDIR}/devel/libmatheval
+BUILD_DEPENDS+=	gawk:lang/gawk
+LIB_DEPENDS+=	libhdf5.so:science/hdf5 \
+		libpng.so:graphics/png \
+		libmatheval.so:devel/libmatheval
 
 .include <bsd.port.mk>
diff --git a/science/harminv/Makefile b/science/harminv/Makefile
index 471190506679..1b25370b178f 100644
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@@ -19,6 +19,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 USE_LDCONFIG=	yes
 
-LIB_DEPENDS+=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+LIB_DEPENDS+=	libguile-2.0.so:lang/guile2
 
 .include <bsd.port.mk>
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index 3e35575a61f2..a1c3b289089a 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF/releases/HDF${PORTVERSION}/src/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
 
-LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
+LIB_DEPENDS=	libsz.so:science/szip
 
 CONFLICTS_INSTALL=	netcdf-4.[0-9]*
 
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index a4a821b79534..d4ae97cb768f 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -48,7 +48,7 @@ FORTRAN_CONFIGURE_OFF=	--disable-fortran --disable-fortran2003
 FORTRAN_CONFIGURE_ON=	--enable-fortran --enable-fortran2003
 FORTRAN_USES=		fortran
 SZIP_CONFIGURE_ON=	--with-szlib=${LOCALBASE}
-SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
+SZIP_LIB_DEPENDS=	libsz.so:science/szip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/config/gnu-flags
diff --git a/science/jstrack/Makefile b/science/jstrack/Makefile
index eb5cf0b5096d..5d41826aa070 100644
--- a/science/jstrack/Makefile
+++ b/science/jstrack/Makefile
@@ -16,8 +16,8 @@ LICENSE_TEXT=	It is and always will be free, and [Jim Graham] wrote it...\
 		so don't charge money for it, and don't claim that you wrote it
 LICENSE_PERMS=	dist-sell pkg-sell auto-accept
 
-LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
+LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
+RUN_DEPENDS=	dtplite:devel/tcllib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		tk:85
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index 311fceced680..2cfe427f8ef8 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Periodic table of elements for KDE 4
 
-LIB_DEPENDS=	libopenbabel.so:${PORTSDIR}/science/openbabel \
-		libavogadro.so:${PORTSDIR}/science/avogadro
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
-		${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 \
-		${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
-		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:${PORTSDIR}/science/chemical-mime-data
+LIB_DEPENDS=	libopenbabel.so:science/openbabel \
+		libavogadro.so:science/avogadro
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2 \
+		${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
+		${LOCALBASE}/lib/ocaml/facile/facile.a:math/facile \
+		${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/chemical-mime-data.pc:science/chemical-mime-data
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource pkgconfig tar:xz
diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index a345ee0acc64..b312252a28bb 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	Kst-${DISTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 USES=		cmake:outsource pkgconfig
 _USE_QT4=	gui xml designer svg linguisttools_build \
@@ -31,13 +31,13 @@ OPTIONS_DEFAULT=	QT4
 OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
-FITS_LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 
 MATLAB_DESC=	Support for data in MATLAB format
-MATLAB_LIB_DEPENDS=	libmatio.so:${PORTSDIR}/math/matio
+MATLAB_LIB_DEPENDS=	libmatio.so:math/matio
 
 NETCDF_DESC=	Support for data in NetCDF format (broken)
-NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_IGNORE=	does not support NetCDF 4
 
 TOOLKIT_DESC=	Qt toolkit
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index 4ee7811b04d8..59fa41a8679f 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Control Language Library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
@@ -24,7 +24,7 @@ BROKEN_sparc64=	does not build
 OPTIONS_DEFINE=	NLOPT DOCS EXAMPLES
 NLOPT_DESC=	Use NLopt, an external NonLinear OPTimizer
 
-NLOPT_LIB_DEPENDS=	libnlopt.so:${PORTSDIR}/math/nlopt
+NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/science/libghemical/Makefile b/science/libghemical/Makefile
index 42209e291639..906c04597733 100644
--- a/science/libghemical/Makefile
+++ b/science/libghemical/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES=	http://bioinformatics.org/ghemical/download/release20111012/	\
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support libraries of science/ghemical port
 
-BUILD_DEPENDS=	obabel:${PORTSDIR}/science/openbabel \
-		intltool-update:${PORTSDIR}/textproc/intltool \
-		ld:${PORTSDIR}/devel/binutils
-LIB_DEPENDS=	libmpqc.so:${PORTSDIR}/science/mpqc \
-		libf2c.so:${PORTSDIR}/lang/f2c
+BUILD_DEPENDS=	obabel:science/openbabel \
+		intltool-update:textproc/intltool \
+		ld:devel/binutils
+LIB_DEPENDS=	libmpqc.so:science/mpqc \
+		libf2c.so:lang/f2c
 
 USES=		fortran gettext gmake pathfix pkgconfig libtool
 USE_GL=		gl
diff --git a/science/libkml/Makefile b/science/libkml/Makefile
index a1345e3007a8..99d7226f4fd0 100644
--- a/science/libkml/Makefile
+++ b/science/libkml/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library for parse, generate, and operate on KML
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl \
-		${LOCALBASE}/include/expat.h:${PORTSDIR}/textproc/expat2
-LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
+BUILD_DEPENDS=	curl-config:ftp/curl \
+		${LOCALBASE}/include/expat.h:textproc/expat2
+LIB_DEPENDS=	liburiparser.so:net/uriparser
 
 OPTIONS_DEFINE=	SWIG
 
@@ -27,7 +27,7 @@ USES=		autoreconf gmake libtool localbase
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
-SWIG_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+SWIG_BUILD_DEPENDS=	swig:devel/swig13
 SWIG_CONFIGURE_OFF=	--disable-swig
 
 post-patch:
diff --git a/science/libxc/Makefile b/science/libxc/Makefile
index 340ad73c0022..be1435b65170 100644
--- a/science/libxc/Makefile
+++ b/science/libxc/Makefile
@@ -26,7 +26,7 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000034
-LIB_DEPENDS+=	libml.so:${PORTSDIR}/math/ldouble
+LIB_DEPENDS+=	libml.so:math/ldouble
 LDFLAGS+=	-lml
 .endif
 
diff --git a/science/massxpert/Makefile b/science/massxpert/Makefile
index fc1363190702..cfba8e0c135b 100644
--- a/science/massxpert/Makefile
+++ b/science/massxpert/Makefile
@@ -12,12 +12,12 @@ COMMENT=	massXpert software for (bio)chemists
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GCC=	any
 USES=		cmake gettext tar:bzip2
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index 0be44fdf1988..a58f475fe280 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -12,8 +12,8 @@ COMMENT=	MultiBody Dynamics analysis system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack \
-		libumfpack.so:${PORTSDIR}/math/suitesparse
+LIB_DEPENDS=	libarpack.so:math/arpack \
+		libumfpack.so:math/suitesparse
 
 GNU_CONFIGURE=	yes
 USES=		fortran gmake libtool
@@ -52,7 +52,7 @@ BROKEN=		Does not compile on powerpc
 .endif
 
 .if ${PORT_OPTIONS:MMPI}
-LIB_DEPENDS+=	libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	libmpich.so:net/mpich2
 CONFIGURE_ARGS+=	--with-mpi=yes --enable-schur
 CPPFLAGS+=	-I${LOCALBASE}/include
 . if ! ${PORT_OPTIONS:MMETIS}
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=	--with-mpi=no
 .endif
 
 .if ${PORT_OPTIONS:MMETIS}
-LIB_DEPENDS+=	libmetis.so:${PORTSDIR}/math/metis4
+LIB_DEPENDS+=	libmetis.so:math/metis4
 CONFIGURE_ARGS+=	--with-metis=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/metis
 .else
@@ -71,15 +71,15 @@ CONFIGURE_ARGS+=	--with-metis=no
 .endif
 
 .if ${PORT_OPTIONS:MCHACO}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libchaco.a:${PORTSDIR}/math/chaco
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libchaco.a:math/chaco
 CONFIGURE_ARGS+=	--with-chaco=yes
 .else
 CONFIGURE_ARGS+=	--with-chaco=no
 .endif
 
 .if ${PORT_OPTIONS:MGINAC}
-LIB_DEPENDS+=	libmetis.so:${PORTSDIR}/math/metis4 \
-		libginac.so:${PORTSDIR}/math/GiNaC
+LIB_DEPENDS+=	libmetis.so:math/metis4 \
+		libginac.so:math/GiNaC
 CONFIGURE_ARGS+=	--with-ginac=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/metis
 .else
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	--with-ginac=no
 
 .if ${PORT_OPTIONS:MTCL}
 IGNORE=		you enabled Tcl-support, which is not implemented yet
-LIB_DEPENDS+=	libtcl84.so:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS+=	libtcl84.so:lang/tcl84
 CONFIGURE_ARGS+=	--with-tcl=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/tcl8.4
 .else
diff --git a/science/mcstas-comps/Makefile b/science/mcstas-comps/Makefile
index 32156ec621f0..0373937f23c8 100644
--- a/science/mcstas-comps/Makefile
+++ b/science/mcstas-comps/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Component Library for the McStas neutron ray tracing package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/mcstas/${PORTVERSION}/bin/mcstas:${PORTSDIR}/science/mcstas
+RUN_DEPENDS=	${LOCALBASE}/mcstas/${PORTVERSION}/bin/mcstas:science/mcstas
 
 USES=		cmake gmake
 # Apparently cmake does not generate an install/strip target if nothing
diff --git a/science/medit/Makefile b/science/medit/Makefile
index f2363ae3ec07..20cd3bf6da96 100644
--- a/science/medit/Makefile
+++ b/science/medit/Makefile
@@ -17,7 +17,7 @@ LICENSE_NAME=	Special grant
 LICENSE_TEXT=	Special grant from the author
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/include/cfortran.h:${PORTSDIR}/lang/cfortran
+BUILD_DEPENDS=	${LOCALBASE}/include/cfortran.h:lang/cfortran
 
 USE_XORG=	x11 xmu xext
 USE_GL=		glut
diff --git a/science/meep/Makefile b/science/meep/Makefile
index e419b2f0ef2a..cf8d125db62d 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	http://ab-initio.mit.edu/meep/
 MAINTAINER=	devel@stasyan.com
 COMMENT=	FDTD simulation software to model electromagnetic systems
 
-BUILD_DEPENDS=	harminv:${PORTSDIR}/science/harminv \
-		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2 \
-		libblas.so:${PORTSDIR}/math/blas \
-		libctl.so:${PORTSDIR}/science/libctl \
-		libhdf5.so:${PORTSDIR}/science/hdf5
-RUN_DEPENDS=	harminv:${PORTSDIR}/science/harminv
+BUILD_DEPENDS=	harminv:science/harminv \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
+		libblas.so:math/blas \
+		libctl.so:science/libctl \
+		libhdf5.so:science/hdf5
+RUN_DEPENDS=	harminv:science/harminv
 
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
@@ -49,14 +49,14 @@ PLIST_SUB+=		MPI="@comment " NOMPI=""
 .endif
 
 .if ${PORT_OPTIONS:MMPICH2}
-LIB_DEPENDS+=	libmpich.so.8:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	libmpich.so.8:net/mpich2
 CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/bin/mpicc
 CFLAGS+=	-I${LOCALBASE}/include
 .endif
 
 .if ${PORT_OPTIONS:MOPENMPI}
-BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
 CFLAGS+=	-I${LOCALBASE}/mpi/openmpi/include
 .endif
diff --git a/science/mei/Makefile b/science/mei/Makefile
index fbfe271b4c83..5916b5b3f5cc 100644
--- a/science/mei/Makefile
+++ b/science/mei/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Code_Saturne Mathematical Expression Interpreter
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libbft.so:${PORTSDIR}/science/bft
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+LIB_DEPENDS=	libbft.so:science/bft
+BUILD_DEPENDS=	swig:devel/swig13
 
 USES=		libtool python
 USE_LDCONFIG=	yes
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 8f2c01a34697..2e8445db4f0d 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Medical Imaging NetCDF
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libnetcdf.so:${PORTSDIR}/science/netcdf
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+		libnetcdf.so:science/netcdf
+RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BIC-MNI
diff --git a/science/mpb/Makefile b/science/mpb/Makefile
index 00ff1d4f847d..7915b427030e 100644
--- a/science/mpb/Makefile
+++ b/science/mpb/Makefile
@@ -12,11 +12,11 @@ COMMENT=	MIT Photonic-Bands
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw \
-		libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libctl.so:${PORTSDIR}/science/libctl \
-		libguile-2.0.so:${PORTSDIR}/lang/guile2
+BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libfftw.so:math/fftw \
+		libhdf5.so:science/hdf5 \
+		libctl.so:science/libctl \
+		libguile-2.0.so:lang/guile2
 
 OPTIONS_DEFINE=	ATLAS NLOPT
 ATLAS_DESC=	Use math/atlas instead of math/lapack
@@ -29,16 +29,16 @@ MAKE_JOBS_UNSAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NLOPT_LIB_DEPENDS=	libnlopt.so:${PORTSDIR}/math/nlopt
+NLOPT_LIB_DEPENDS=	libnlopt.so:math/nlopt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 CONFIGURE_ARGS+=	--with-lapack=-lalapack
 .else
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
-		liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas \
+		liblapack.so:math/lapack
 CONFIGURE_ARGS+=	--with-lapack=-llapack
 .endif
 
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index 4ce686aab203..eafc621243ff 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Massively Parallel Quantum Computing library and program
 
-LIB_DEPENDS=	libint.so:${PORTSDIR}/science/libint
+LIB_DEPENDS=	libint.so:science/libint
 
 GNU_CONFIGURE=	yes
 USES=		fortran gmake libtool perl5 shebangfix tar:bzip2
@@ -40,23 +40,23 @@ DOCS_DESC=		Generate html docs and manpages (heavy dependencies)
 MPICH_DESC=		Message-Passing Interface support
 OPTIFLAGS_DESC=		Build with optimized flags
 
-ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
-MPICH_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz \
-			${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
+ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:lang/icc
+MPICH_LIB_DEPENDS=	libmpich.so:net/mpich2
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz \
+			${LOCALBASE}/bin/gsed:textproc/gsed
 DOCS_USES=		execinfo
 DOCS_USE=		TEX=latex:build
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 1a41b513d2db..ae3839cd2612 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Code_Saturne Kernel
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4	\
-		cs_preprocess:${PORTSDIR}/science/ecs	\
-		pyrcc4:${PORTSDIR}/textproc/py-qt4-xml
-LIB_DEPENDS=	libfvm.so:${PORTSDIR}/science/fvm	\
-		libmei.so:${PORTSDIR}/science/mei
-RUN_DEPENDS=	xmgrace:${PORTSDIR}/math/grace	\
-		bash:${PORTSDIR}/shells/bash	\
-		xterm:${PORTSDIR}/x11/xterm	\
-		cs_preprocess:${PORTSDIR}/science/ecs
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4	\
+		cs_preprocess:science/ecs	\
+		pyrcc4:textproc/py-qt4-xml
+LIB_DEPENDS=	libfvm.so:science/fvm	\
+		libmei.so:science/mei
+RUN_DEPENDS=	xmgrace:math/grace	\
+		bash:shells/bash	\
+		xterm:x11/xterm	\
+		cs_preprocess:science/ecs
 
 USES=		fortran gettext gmake iconv libtool python shebangfix
 USE_GNOME=	libxml2
@@ -41,7 +41,7 @@ FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
 OPTIONS_DEFINE=		DOCS EXAMPLES BATCH
 BATCH_DESC=		Use Torque to submit batches
 BATCH_CONFIGURE_WITH=	batch=PBS
-BATCH_LIB_DEPENDS=	libtorque.so:${PORTSDIR}/sysutils/torque
+BATCH_LIB_DEPENDS=	libtorque.so:sysutils/torque
 
 OPTIONS_RADIO=	BLAS
 OPTIONS_RADIO_BLAS=	REFERENCE ATLAS
@@ -75,30 +75,30 @@ BIN_DATAS=	Makefile SaturneGUI autovalid.xml cs_profile lance lance.help	\
 
 .if defined(WITH_LAM)
 MPI_HOME=	${LOCALBASE}
-BUILD_DEPENDS+=	${MPI_HOME}/lib/liblam.a:${PORTSDIR}/net/lam
-RUN_DEPENDS+=	${MPI_HOME}/bin/lamboot:${PORTSDIR}/net/lam
+BUILD_DEPENDS+=	${MPI_HOME}/lib/liblam.a:net/lam
+RUN_DEPENDS+=	${MPI_HOME}/bin/lamboot:net/lam
 MPI_LIBS=	-lmpi -llam
 .elif defined(WITH_OPENMPI)
 MPI_HOME=	${LOCALBASE}/mpi/openmpi
-BUILD_DEPENDS+=	${MPI_HOME}/bin/mpicc:${PORTSDIR}/net/openmpi
-RUN_DEPENDS+=	${MPI_HOME}/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${MPI_HOME}/bin/mpicc:net/openmpi
+RUN_DEPENDS+=	${MPI_HOME}/bin/mpirun:net/openmpi
 MPI_LIBS=	-lmpi -lorte -lopal
 .else
 MPI_HOME=	${LOCALBASE}
-BUILD_DEPENDS+=	${MPI_HOME}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${MPI_HOME}/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS+=	${MPI_HOME}/bin/mpicc:net/mpich2
+RUN_DEPENDS+=	${MPI_HOME}/bin/mpirun:net/mpich2
 MPI_LIBS=	-lmpich -lmpl -lpthread
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	tex:build
-BUILD_DEPENDS+=	fig2dev:${PORTSDIR}/print/transfig
+BUILD_DEPENDS+=	fig2dev:print/transfig
 ALL_TARGET=	all pdf
 INSTALL_TARGET=	install install-pdf
 DOCS=		AUTHORS COMPATIBILITY ChangeLog README
 .endif
 
-RUN_DEPENDS+=	xpdf:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS+=	xpdf:graphics/xpdf
 
 pre-everything::
 	@${ECHO_MSG}
diff --git a/science/netcdf-cxx/Makefile b/science/netcdf-cxx/Makefile
index 275c45395a73..14305ce7826f 100644
--- a/science/netcdf-cxx/Makefile
+++ b/science/netcdf-cxx/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	science
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C++ library for machine-independent, array-oriented data access
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 CONFLICTS=	netcdf-3.* netcdf-4.[0-2].*
 
diff --git a/science/netcdf-fortran/Makefile b/science/netcdf-fortran/Makefile
index e5f95e8fc5cc..6e404a49cff3 100644
--- a/science/netcdf-fortran/Makefile
+++ b/science/netcdf-fortran/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	science
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fortran library for machine-independent, array-oriented data access
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
 
 CONFLICTS=	netcdf-ftn-[0-9]* netcdf3-ftn-[0-9]*
 
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index fc2f998fc2d1..befec72f8408 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C library for machine-independent, array-oriented data access
 
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+LIB_DEPENDS=	libhdf5.so:science/hdf5
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* netcdf-3.[0-9]* netcdf3-3.[0-9]*
 
@@ -30,12 +30,12 @@ USE_LDCONFIG=	yes
 USES=		libtool localbase ncurses pathfix pkgconfig:run
 
 DAP_CONFIGURE_ENABLE=	dap
-DAP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DAP_LIB_DEPENDS=	libcurl.so:ftp/curl
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_PORTDOCS=	*
-SZIP_LIB_DEPENDS=	libsz.so:${PORTSDIR}/science/szip
+SZIP_LIB_DEPENDS=	libsz.so:science/szip
 SZIP_LIBS=		-lsz
 
 post-patch:
diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile
index ee9320a46da4..81abb3110261 100644
--- a/science/openbabel/Makefile
+++ b/science/openbabel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Chemistry file translation program
 
-BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:${PORTSDIR}/math/eigen3
+BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3
 
 CONFLICTS_INSTALL=	babel-*
 
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=	yes
 
 CAIRO_DESC=	PNG support via cairo library
-CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_USES=	pkgconfig
 
 PYTHON_USES=	python
diff --git a/science/orthanc-dicomweb/Makefile b/science/orthanc-dicomweb/Makefile
index 2d5ac1d56fa7..8b38b4f4b257 100644
--- a/science/orthanc-dicomweb/Makefile
+++ b/science/orthanc-dicomweb/Makefile
@@ -14,18 +14,18 @@ COMMENT=	WADO and DICOMweb support for Orthanc
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:${PORTSDIR}/science/orthanc \
-		gtest-config:${PORTSDIR}/devel/googletest
-LIB_DEPENDS=	libgdcmCommon.so:${PORTSDIR}/devel/gdcm \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libboost_locale.so:${PORTSDIR}/devel/boost-libs \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libpugixml.so:${PORTSDIR}/textproc/pugixml
+BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc \
+		gtest-config:devel/googletest
+LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
+		libboost_filesystem.so:devel/boost-libs \
+		libboost_thread.so:devel/boost-libs \
+		libboost_system.so:devel/boost-libs \
+		libboost_date_time.so:devel/boost-libs \
+		libboost_regex.so:devel/boost-libs \
+		libboost_locale.so:devel/boost-libs \
+		libjsoncpp.so:devel/jsoncpp \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libpugixml.so:textproc/pugixml
 
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile
index 1b6fb6de09af..6a736bc10f72 100644
--- a/science/orthanc-postgresql/Makefile
+++ b/science/orthanc-postgresql/Makefile
@@ -14,9 +14,9 @@ COMMENT=	PostgreSQL plugin for Orthanc
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	orthanc>=0.9.4:${PORTSDIR}/science/orthanc
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp
+BUILD_DEPENDS=	orthanc>=0.9.4:science/orthanc
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libjsoncpp.so:devel/jsoncpp
 
 ## UnitTests require running PostgreSQL server, so it's pointless to build/run them
 CMAKE_ARGS=	-DBUILD_UNIT_TESTS=OFF
diff --git a/science/orthanc-webviewer/Makefile b/science/orthanc-webviewer/Makefile
index 4fdc75610ef8..27d7be8c8e97 100644
--- a/science/orthanc-webviewer/Makefile
+++ b/science/orthanc-webviewer/Makefile
@@ -20,15 +20,15 @@ COMMENT=	Web viewer plugin for Orthanc
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:${PORTSDIR}/science/orthanc \
-		gtest-config:${PORTSDIR}/devel/googletest
-LIB_DEPENDS=	libgdcmCommon.so:${PORTSDIR}/devel/gdcm \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc \
+		gtest-config:devel/googletest
+LIB_DEPENDS=	libgdcmCommon.so:devel/gdcm \
+		libboost_system.so:devel/boost-libs \
+		libboost_thread.so:devel/boost-libs \
+		libboost_filesystem.so:devel/boost-libs \
+		libjsoncpp.so:devel/jsoncpp \
+		libsqlite3.so:databases/sqlite3 \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile
index bba0052e6e9a..3675ee246f42 100644
--- a/science/orthanc/Makefile
+++ b/science/orthanc/Makefile
@@ -17,21 +17,21 @@ COMMENT=	RESTful DICOM server for healthcare and medical research
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtest-config:${PORTSDIR}/devel/googletest
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libboost_locale.so:${PORTSDIR}/devel/boost-libs \
-		libdcmdsig.so:${PORTSDIR}/devel/dcmtk \
-		libcharls.so:${PORTSDIR}/devel/dcmtk \
-		libdcmjpls.so:${PORTSDIR}/devel/dcmtk \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libpugixml.so:${PORTSDIR}/textproc/pugixml
+BUILD_DEPENDS=	gtest-config:devel/googletest
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libjsoncpp.so:devel/jsoncpp \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libboost_filesystem.so:devel/boost-libs \
+		libboost_thread.so:devel/boost-libs \
+		libboost_system.so:devel/boost-libs \
+		libboost_date_time.so:devel/boost-libs \
+		libboost_regex.so:devel/boost-libs \
+		libboost_locale.so:devel/boost-libs \
+		libdcmdsig.so:devel/dcmtk \
+		libcharls.so:devel/dcmtk \
+		libdcmjpls.so:devel/dcmtk \
+		libsqlite3.so:databases/sqlite3 \
+		libpugixml.so:textproc/pugixml
 
 CMAKE_ARGS=	-DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
 		-DDCMTK_DIR="${LOCALBASE}" \
diff --git a/science/p5-Algorithm-SVMLight/Makefile b/science/p5-Algorithm-SVMLight/Makefile
index 2e0f52f0d1f0..2643413f4090 100644
--- a/science/p5-Algorithm-SVMLight/Makefile
+++ b/science/p5-Algorithm-SVMLight/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to SVMLight Machine-Learning Package
 
-BUILD_DEPENDS=	svmlight>=6.01_2:${PORTSDIR}/science/svmlight
-LIB_DEPENDS=	libsvmlight.so:${PORTSDIR}/science/svmlight
+BUILD_DEPENDS=	svmlight>=6.01_2:science/svmlight
+LIB_DEPENDS=	libsvmlight.so:science/svmlight
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/science/p5-Chemistry-3DBuilder/Makefile b/science/p5-Chemistry-3DBuilder/Makefile
index 3641f22f740f..46d9d5511c49 100644
--- a/science/p5-Chemistry-3DBuilder/Makefile
+++ b/science/p5-Chemistry-3DBuilder/Makefile
@@ -12,18 +12,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generate 3D coordinates from a connection table
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		p5-Math-VectorReal>=0:${PORTSDIR}/math/p5-Math-VectorReal
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		p5-Math-VectorReal>=0:${PORTSDIR}/math/p5-Math-VectorReal
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-InternalCoords>=0:science/p5-Chemistry-InternalCoords \
+		p5-Math-VectorReal>=0:math/p5-Math-VectorReal
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-InternalCoords>=0:science/p5-Chemistry-InternalCoords \
+		p5-Math-VectorReal>=0:math/p5-Math-VectorReal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-Bond-Find/Makefile b/science/p5-Chemistry-Bond-Find/Makefile
index 370e2f666400..e9b77a028a56 100644
--- a/science/p5-Chemistry-Bond-Find/Makefile
+++ b/science/p5-Chemistry-Bond-Find/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Detect bonds in a molecule and assign formal bond orders
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-Canonicalize/Makefile b/science/p5-Chemistry-Canonicalize/Makefile
index 71b627b087f6..deba784b022a 100644
--- a/science/p5-Chemistry-Canonicalize/Makefile
+++ b/science/p5-Chemistry-Canonicalize/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Number the atoms in a molecule in a unique way
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-File-MDLMol/Makefile b/science/p5-Chemistry-File-MDLMol/Makefile
index 3593e153e4f5..83fe6e8ec9de 100644
--- a/science/p5-Chemistry-File-MDLMol/Makefile
+++ b/science/p5-Chemistry-File-MDLMol/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	MDL molfile reader/write
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-File-Mopac/Makefile b/science/p5-Chemistry-File-Mopac/Makefile
index dd4fb03ea6e7..f3b589cd1cbf 100644
--- a/science/p5-Chemistry-File-Mopac/Makefile
+++ b/science/p5-Chemistry-File-Mopac/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	MOPAC 6 input file reader/writer
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-InternalCoords>=0:science/p5-Chemistry-InternalCoords
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-InternalCoords>=0:science/p5-Chemistry-InternalCoords
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-File-PDB/Makefile b/science/p5-Chemistry-File-PDB/Makefile
index d68b6ce9b6ff..6f9629d8d4d6 100644
--- a/science/p5-Chemistry-File-PDB/Makefile
+++ b/science/p5-Chemistry-File-PDB/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to read and write PDB files
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0.37:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-MacroMol>=0.06:${PORTSDIR}/science/p5-Chemistry-MacroMol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0.37:science/p5-Chemistry-Mol \
+		p5-Chemistry-MacroMol>=0.06:science/p5-Chemistry-MacroMol
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/science/p5-Chemistry-File-SLN/Makefile b/science/p5-Chemistry-File-SLN/Makefile
index dfc5b9a7ade1..01d704e9724a 100644
--- a/science/p5-Chemistry-File-SLN/Makefile
+++ b/science/p5-Chemistry-File-SLN/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SLN linear notation parser/writer
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-File-SMARTS/Makefile b/science/p5-Chemistry-File-SMARTS/Makefile
index 0c2b4c6f4efd..559d62ca16b1 100644
--- a/science/p5-Chemistry-File-SMARTS/Makefile
+++ b/science/p5-Chemistry-File-SMARTS/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SMARTS chemical substructure pattern linear notation parser
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-File-SMILES/Makefile b/science/p5-Chemistry-File-SMILES/Makefile
index ce502ee6fbee..69333a9ed939 100644
--- a/science/p5-Chemistry-File-SMILES/Makefile
+++ b/science/p5-Chemistry-File-SMILES/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	SMILES linear notation parser/writer
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	write.pl
diff --git a/science/p5-Chemistry-File-VRML/Makefile b/science/p5-Chemistry-File-VRML/Makefile
index ebbea0770a22..4b3ec3c93a20 100644
--- a/science/p5-Chemistry-File-VRML/Makefile
+++ b/science/p5-Chemistry-File-VRML/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generate VRML models for molecules
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-File-XYZ/Makefile b/science/p5-Chemistry-File-XYZ/Makefile
index ba4642f5acec..5f25a80fba4a 100644
--- a/science/p5-Chemistry-File-XYZ/Makefile
+++ b/science/p5-Chemistry-File-XYZ/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	XYZ molecule format reader/writer
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-FormulaPattern/Makefile b/science/p5-Chemistry-FormulaPattern/Makefile
index 828f6fba9fcb..3e967dd8b8e0 100644
--- a/science/p5-Chemistry-FormulaPattern/Makefile
+++ b/science/p5-Chemistry-FormulaPattern/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Match molecule by formula
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-InternalCoords/Makefile b/science/p5-Chemistry-InternalCoords/Makefile
index bfa405943e05..00ee4e0cb0e9 100644
--- a/science/p5-Chemistry-InternalCoords/Makefile
+++ b/science/p5-Chemistry-InternalCoords/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Represent the position of an atom using internal coordinates
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-MacroMol/Makefile b/science/p5-Chemistry-MacroMol/Makefile
index 0c488e246f6c..993e1a290e16 100644
--- a/science/p5-Chemistry-MacroMol/Makefile
+++ b/science/p5-Chemistry-MacroMol/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl toolkit to describe macromolecules
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0.37:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0.37:science/p5-Chemistry-Mol
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/science/p5-Chemistry-MidasPattern/Makefile b/science/p5-Chemistry-MidasPattern/Makefile
index 67e4d9ad08e1..e9e3b2de3b41 100644
--- a/science/p5-Chemistry-MidasPattern/Makefile
+++ b/science/p5-Chemistry-MidasPattern/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Select atoms in macromolecules
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-PDB>=0:science/p5-Chemistry-File-PDB \
+		p5-Chemistry-MacroMol>=0:science/p5-Chemistry-MacroMol \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-PDB>=0:science/p5-Chemistry-File-PDB \
+		p5-Chemistry-MacroMol>=0:science/p5-Chemistry-MacroMol \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-Mok/Makefile b/science/p5-Chemistry-Mok/Makefile
index 8e66b9e2aa01..00f6962779ec 100644
--- a/science/p5-Chemistry-Mok/Makefile
+++ b/science/p5-Chemistry-Mok/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Molecular awk interpreter
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-Mol/Makefile b/science/p5-Chemistry-Mol/Makefile
index b8d1b13ffa39..b9afe93aeead 100644
--- a/science/p5-Chemistry-Mol/Makefile
+++ b/science/p5-Chemistry-Mol/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl toolkit to describe molecules
 
-BUILD_DEPENDS=	p5-Math-VectorReal>=1.02:${PORTSDIR}/math/p5-Math-VectorReal
+BUILD_DEPENDS=	p5-Math-VectorReal>=1.02:math/p5-Math-VectorReal
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/science/p5-Chemistry-Pattern/Makefile b/science/p5-Chemistry-Pattern/Makefile
index 3ecd055f5f3c..623e012ef980 100644
--- a/science/p5-Chemistry-Pattern/Makefile
+++ b/science/p5-Chemistry-Pattern/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Chemical substructure pattern matching
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-Reaction/Makefile b/science/p5-Chemistry-Reaction/Makefile
index 2e28b7e84003..df9c56bc1a99 100644
--- a/science/p5-Chemistry-Reaction/Makefile
+++ b/science/p5-Chemistry-Reaction/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Represent a ring as a substructure of a molecule
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Statistics-Regression>=0:math/p5-Statistics-Regression \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Statistics-Regression>=0:math/p5-Statistics-Regression \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Chemistry-Ring/Makefile b/science/p5-Chemistry-Ring/Makefile
index 917ad9a5aa1a..73b28821afa3 100644
--- a/science/p5-Chemistry-Ring/Makefile
+++ b/science/p5-Chemistry-Ring/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Represent a ring as a substructure of a molecule
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
-RUN_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Statistics-Regression>=0:math/p5-Statistics-Regression
+RUN_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Statistics-Regression>=0:math/p5-Statistics-Regression
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/p5-Geo-Coordinates-Converter-iArea/Makefile b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
index 248e713dfc01..4a8281a0a2b8 100644
--- a/science/p5-Geo-Coordinates-Converter-iArea/Makefile
+++ b/science/p5-Geo-Coordinates-Converter-iArea/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Some utility functions around iArea
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CDB_File>=0.96:${PORTSDIR}/databases/p5-CDB_File \
-		p5-File-ShareDir>=1.02:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Geo-Coordinates-Converter>=0.09:${PORTSDIR}/science/p5-Geo-Coordinates-Converter
+BUILD_DEPENDS=	p5-CDB_File>=0.96:databases/p5-CDB_File \
+		p5-File-ShareDir>=1.02:devel/p5-File-ShareDir \
+		p5-Geo-Coordinates-Converter>=0.09:science/p5-Geo-Coordinates-Converter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/science/p5-Geo-Coordinates-Converter/Makefile b/science/p5-Geo-Coordinates-Converter/Makefile
index 1e626acee792..19159e95651c 100644
--- a/science/p5-Geo-Coordinates-Converter/Makefile
+++ b/science/p5-Geo-Coordinates-Converter/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Simple converter of geo coordinates
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-String-CamelCase>0:${PORTSDIR}/textproc/p5-String-CamelCase \
-		p5-YAML>0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+		p5-String-CamelCase>0:textproc/p5-String-CamelCase \
+		p5-YAML>0:textproc/p5-YAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-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/science/p5-Geo-WebService-Elevation-USGS/Makefile b/science/p5-Geo-WebService-Elevation-USGS/Makefile
index a11aa201834c..1bff46ca808f 100644
--- a/science/p5-Geo-WebService-Elevation-USGS/Makefile
+++ b/science/p5-Geo-WebService-Elevation-USGS/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension for elevation queries against USGS web services
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	limit:^[0-9\.]*$$
diff --git a/science/p5-Mcstas-Tools/Makefile b/science/p5-Mcstas-Tools/Makefile
index ddcb561ea0ac..a1be901bf0e2 100644
--- a/science/p5-Mcstas-Tools/Makefile
+++ b/science/p5-Mcstas-Tools/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl based tools for the McStas neutron ray tracing package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Tk>0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-PGPLOT>=2.21:${PORTSDIR}/graphics/p5-PGPLOT	\
-		PDL>0:${PORTSDIR}/math/PDL \
-		${LOCALBASE}/bin/mcstas:${PORTSDIR}/science/mcstas
+RUN_DEPENDS=	p5-Tk>0:x11-toolkits/p5-Tk \
+		p5-PGPLOT>=2.21:graphics/p5-PGPLOT	\
+		PDL>0:math/PDL \
+		${LOCALBASE}/bin/mcstas:science/mcstas
 
 USES=		cmake gmake perl5
 CMAKE_ARGS=	-Denable_mcstas=1
diff --git a/science/p5-PerlMol/Makefile b/science/p5-PerlMol/Makefile
index bd6d96b664c5..cab9c47dd60b 100644
--- a/science/p5-PerlMol/Makefile
+++ b/science/p5-PerlMol/Makefile
@@ -12,52 +12,52 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl modules for molecular chemistry
 
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-Isotope>=0:${PORTSDIR}/science/p5-Chemistry-Isotope \
-		p5-Chemistry-3DBuilder>=0:${PORTSDIR}/science/p5-Chemistry-3DBuilder \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		p5-Chemistry-File-XYZ>=0:${PORTSDIR}/science/p5-Chemistry-File-XYZ \
-		p5-Chemistry-File-VRML>=0:${PORTSDIR}/science/p5-Chemistry-File-VRML \
-		p5-Chemistry-File-SLN>=0:${PORTSDIR}/science/p5-Chemistry-File-SLN \
-		p5-Chemistry-File-Mopac>=0:${PORTSDIR}/science/p5-Chemistry-File-Mopac \
-		p5-Chemistry-File-MDLMol>=0:${PORTSDIR}/science/p5-Chemistry-File-MDLMol \
-		p5-Chemistry-Reaction>=0:${PORTSDIR}/science/p5-Chemistry-Reaction \
-		p5-Chemistry-FormulaPattern>=0:${PORTSDIR}/science/p5-Chemistry-FormulaPattern \
-		p5-Chemistry-MidasPattern>=0:${PORTSDIR}/science/p5-Chemistry-MidasPattern \
-		p5-Chemistry-Mok>=0:${PORTSDIR}/science/p5-Chemistry-Mok \
-		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
-BUILD_DEPENDS=	p5-Chemistry-Mol>=0:${PORTSDIR}/science/p5-Chemistry-Mol \
-		p5-Chemistry-MacroMol>=0:${PORTSDIR}/science/p5-Chemistry-MacroMol \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-Chemistry-File-SMILES>=0:${PORTSDIR}/science/p5-Chemistry-File-SMILES \
-		p5-Chemistry-File-SMARTS>=0:${PORTSDIR}/science/p5-Chemistry-File-SMARTS \
-		p5-Chemistry-InternalCoords>=0:${PORTSDIR}/science/p5-Chemistry-InternalCoords \
-		p5-Chemistry-Pattern>=0:${PORTSDIR}/science/p5-Chemistry-Pattern \
-		p5-Chemistry-Ring>=0:${PORTSDIR}/science/p5-Chemistry-Ring \
-		p5-Chemistry-Isotope>=0:${PORTSDIR}/science/p5-Chemistry-Isotope \
-		p5-Chemistry-3DBuilder>=0:${PORTSDIR}/science/p5-Chemistry-3DBuilder \
-		p5-Chemistry-Bond-Find>=0:${PORTSDIR}/science/p5-Chemistry-Bond-Find \
-		p5-Chemistry-Canonicalize>=0:${PORTSDIR}/science/p5-Chemistry-Canonicalize \
-		p5-Chemistry-File-PDB>=0:${PORTSDIR}/science/p5-Chemistry-File-PDB \
-		p5-Chemistry-File-XYZ>=0:${PORTSDIR}/science/p5-Chemistry-File-XYZ \
-		p5-Chemistry-File-VRML>=0:${PORTSDIR}/science/p5-Chemistry-File-VRML \
-		p5-Chemistry-File-SLN>=0:${PORTSDIR}/science/p5-Chemistry-File-SLN \
-		p5-Chemistry-File-Mopac>=0:${PORTSDIR}/science/p5-Chemistry-File-Mopac \
-		p5-Chemistry-File-MDLMol>=0:${PORTSDIR}/science/p5-Chemistry-File-MDLMol \
-		p5-Chemistry-Reaction>=0:${PORTSDIR}/science/p5-Chemistry-Reaction \
-		p5-Chemistry-FormulaPattern>=0:${PORTSDIR}/science/p5-Chemistry-FormulaPattern \
-		p5-Chemistry-MidasPattern>=0:${PORTSDIR}/science/p5-Chemistry-MidasPattern \
-		p5-Chemistry-Mok>=0:${PORTSDIR}/science/p5-Chemistry-Mok \
-		p5-Statistics-Regression>=0:${PORTSDIR}/math/p5-Statistics-Regression
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-MacroMol>=0:science/p5-Chemistry-MacroMol \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-InternalCoords>=0:science/p5-Chemistry-InternalCoords \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-Isotope>=0:science/p5-Chemistry-Isotope \
+		p5-Chemistry-3DBuilder>=0:science/p5-Chemistry-3DBuilder \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-File-PDB>=0:science/p5-Chemistry-File-PDB \
+		p5-Chemistry-File-XYZ>=0:science/p5-Chemistry-File-XYZ \
+		p5-Chemistry-File-VRML>=0:science/p5-Chemistry-File-VRML \
+		p5-Chemistry-File-SLN>=0:science/p5-Chemistry-File-SLN \
+		p5-Chemistry-File-Mopac>=0:science/p5-Chemistry-File-Mopac \
+		p5-Chemistry-File-MDLMol>=0:science/p5-Chemistry-File-MDLMol \
+		p5-Chemistry-Reaction>=0:science/p5-Chemistry-Reaction \
+		p5-Chemistry-FormulaPattern>=0:science/p5-Chemistry-FormulaPattern \
+		p5-Chemistry-MidasPattern>=0:science/p5-Chemistry-MidasPattern \
+		p5-Chemistry-Mok>=0:science/p5-Chemistry-Mok \
+		p5-Statistics-Regression>=0:math/p5-Statistics-Regression
+BUILD_DEPENDS=	p5-Chemistry-Mol>=0:science/p5-Chemistry-Mol \
+		p5-Chemistry-MacroMol>=0:science/p5-Chemistry-MacroMol \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-Chemistry-File-SMILES>=0:science/p5-Chemistry-File-SMILES \
+		p5-Chemistry-File-SMARTS>=0:science/p5-Chemistry-File-SMARTS \
+		p5-Chemistry-InternalCoords>=0:science/p5-Chemistry-InternalCoords \
+		p5-Chemistry-Pattern>=0:science/p5-Chemistry-Pattern \
+		p5-Chemistry-Ring>=0:science/p5-Chemistry-Ring \
+		p5-Chemistry-Isotope>=0:science/p5-Chemistry-Isotope \
+		p5-Chemistry-3DBuilder>=0:science/p5-Chemistry-3DBuilder \
+		p5-Chemistry-Bond-Find>=0:science/p5-Chemistry-Bond-Find \
+		p5-Chemistry-Canonicalize>=0:science/p5-Chemistry-Canonicalize \
+		p5-Chemistry-File-PDB>=0:science/p5-Chemistry-File-PDB \
+		p5-Chemistry-File-XYZ>=0:science/p5-Chemistry-File-XYZ \
+		p5-Chemistry-File-VRML>=0:science/p5-Chemistry-File-VRML \
+		p5-Chemistry-File-SLN>=0:science/p5-Chemistry-File-SLN \
+		p5-Chemistry-File-Mopac>=0:science/p5-Chemistry-File-Mopac \
+		p5-Chemistry-File-MDLMol>=0:science/p5-Chemistry-File-MDLMol \
+		p5-Chemistry-Reaction>=0:science/p5-Chemistry-Reaction \
+		p5-Chemistry-FormulaPattern>=0:science/p5-Chemistry-FormulaPattern \
+		p5-Chemistry-MidasPattern>=0:science/p5-Chemistry-MidasPattern \
+		p5-Chemistry-Mok>=0:science/p5-Chemistry-Mok \
+		p5-Statistics-Regression>=0:math/p5-Statistics-Regression
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 2ed717afe55c..bdbdb984b254 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -16,20 +16,20 @@ LICENSE_NAME=	ParaView_License
 LICENSE_FILE=	${PATCH_WRKSRC}/License_v1.2.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		liborc-0.4.so:${PORTSDIR}/devel/orc \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libffi.so:${PORTSDIR}/devel/libffi \
-		libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
-		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libjbig.so:graphics/jbigkit \
+		liborc-0.4.so:devel/orc \
+		libpcre.so:devel/pcre \
+		libffi.so:devel/libffi \
+		libdrm.so:graphics/libdrm \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	bash:shells/bash	\
+		${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib
 
 CONFLICTS_BUILD=	protobuf*
 
@@ -86,14 +86,14 @@ WRKSRC=		${WRKDIR}/ParaView-v${PORTVERSION}-source
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOSMESA}
-LIB_DEPENDS+=	libOSMesa32.so:${PORTSDIR}/graphics/libosmesa
+LIB_DEPENDS+=	libOSMesa32.so:graphics/libosmesa
 CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
 		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so
 .endif
 
 .if ${PORT_OPTIONS:MGL2PS}
-LIB_DEPENDS+=	libgl2ps.so:${PORTSDIR}/print/gl2ps
+LIB_DEPENDS+=	libgl2ps.so:print/gl2ps
 CMAKE_ARGS+=	-DVTK_USE_GL2PS:BOOL=ON
 PLIST_SUB+=	GL2PS=""
 .else
diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index 871c09ead4e5..f8decdabf9cc 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -28,9 +28,9 @@ USES=		fortran gmake perl5 tar:bzip2
 PORTDOCS=	COPYRIGHT INSTALL README
 
 MPICH2_CONFIGURE_ON=	--with-mpi=${LOCALBASE}
-MPICH2_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPICH2_LIB_DEPENDS=	libmpich.so:net/mpich2
 OPENMPI_CONFIGURE_ON=	--with-mpi=${LOCALBASE}/mpi/openmpi
-OPENMPI_LIB_DEPENDS=	libmpi.so:${PORTSDIR}/net/openmpi
+OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e '/$$(INSTALL.*$$(...DIR)/ s|$$(...DIR)|$$(DESTDIR)&|'
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index a1ba131e10e2..de333cd1a5ae 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -10,13 +10,13 @@ COMMENT=	Psychophysics toolkit for Python
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}pandas>0:${PORTSDIR}/math/py-pandas \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}openpyxl>0:${PORTSDIR}/textproc/py-openpyxl \
-		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \
+		${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl \
+		dejavu>0:x11-fonts/dejavu \
 		${PYGAME} \
 		${PYNUMPY}
 
@@ -42,7 +42,7 @@ OPTIONS_DEFINE_i386=	PYGLET
 OPTIONS_DEFAULT_i386=	PYGLET
 
 PYGLET_DESC=		Drawing support via Pyglet
-PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:${PORTSDIR}/graphics/py-pyglet
+PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet
 
 .include <bsd.port.options.mk>
 
diff --git a/science/pulseview/Makefile b/science/pulseview/Makefile
index 579eb15f74a4..51c8e19bd678 100644
--- a/science/pulseview/Makefile
+++ b/science/pulseview/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GUI client that supports various hardware logic analyzers
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libsigrok.so:${PORTSDIR}/devel/libsigrok \
-		libsigrokdecode.so:${PORTSDIR}/devel/libsigrokdecode
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libsigrok.so:devel/libsigrok \
+		libsigrokdecode.so:devel/libsigrokdecode
 
 USES=		cmake gmake pkgconfig
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
diff --git a/science/py-cdo/Makefile b/science/py-cdo/Makefile
index 94dfecb749a2..17faf14cee47 100644
--- a/science/py-cdo/Makefile
+++ b/science/py-cdo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python binding to CDO (Climate Data Operators)
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	cdo:${PORTSDIR}/science/cdo
+RUN_DEPENDS=	cdo:science/cdo
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/science/py-h5py/Makefile b/science/py-h5py/Makefile
index 7c30a053e09e..f4d8c225545e 100644
--- a/science/py-h5py/Makefile
+++ b/science/py-h5py/Makefile
@@ -13,12 +13,12 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/licenses/license.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		cython:${PORTSDIR}/lang/cython \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:${PORTSDIR}/devel/py-pkgconfig
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+		cython:lang/cython \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig
+LIB_DEPENDS=	libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USE_GITHUB=	yes
 
diff --git a/science/py-hcluster/Makefile b/science/py-hcluster/Makefile
index 9f6e11574f79..0a0021bf11d9 100644
--- a/science/py-hcluster/Makefile
+++ b/science/py-hcluster/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index 2662c64a36a3..0e307980617f 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -25,9 +25,9 @@ LIBSVM_DESC=	Provide the LibSVMClassifier node
 PP_DESC=	Provide the Parallel Python PPScheduler
 SCIPY_DESC=	Instal SciPy versions of eigensolver, FFT and convolution
 
-LIBSVM_RUN_DEPENDS=	libsvm>2.91:${PORTSDIR}/science/libsvm \
-			libsvm-python>2.91:${PORTSDIR}/science/libsvm-python
-PP_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pp>0:${PORTSDIR}/devel/py-pp
-SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:${PORTSDIR}/science/py-scipy
+LIBSVM_RUN_DEPENDS=	libsvm>2.91:science/libsvm \
+			libsvm-python>2.91:science/libsvm-python
+PP_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pp>0:devel/py-pp
+SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy
 
 .include <bsd.port.mk>
diff --git a/science/py-mlpy/Makefile b/science/py-mlpy/Makefile
index 3743998c6181..dc362ead1933 100644
--- a/science/py-mlpy/Makefile
+++ b/science/py-mlpy/Makefile
@@ -14,9 +14,9 @@ COMMENT=	High performance Python package for predictive modeling
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		cython>0:${PORTSDIR}/lang/cython
+		cython>0:lang/cython
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core
diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index 4923cdec5c94..3ed46c92f7d7 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Python Interface to the NetCDF Library (versions 3 and 4)
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5 \
-		libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+		libnetcdf.so:science/netcdf
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/science/py-obspy/Makefile b/science/py-obspy/Makefile
index 0a8bc37c1703..c5ba0ee3f929 100644
--- a/science/py-obspy/Makefile
+++ b/science/py-obspy/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Python framework for seismological observatories
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:${PORTSDIR}/science/py-scipy \
-		${PYTHON_PKGNAMEPREFIX}future>=0.12.4:${PORTSDIR}/devel/py-future \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:${PORTSDIR}/math/py-matplotlib \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:${PORTSDIR}/net/py-suds \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}decorator>=0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy
+		${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy \
+		${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python shebangfix zip
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index 6dd2fbc9b1fb..e2e081b0452e 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.2.1_2.10.1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-3.2.1_2.10.1
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Python scientific analysis package
diff --git a/science/py-pydap/Makefile b/science/py-pydap/Makefile
index fea548cbd334..19972e5210b8 100644
--- a/science/py-pydap/Makefile
+++ b/science/py-pydap/Makefile
@@ -18,13 +18,13 @@ BROKEN=		does not build
 DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2016-04-15
 
-BUILD_DEPENDS=	paver:${PORTSDIR}/devel/py-paver \
+BUILD_DEPENDS=	paver:devel/py-paver \
 		${PYNUMPY}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}Genshi>0:${PORTSDIR}/textproc/py-genshi \
-		${PYTHON_PKGNAMEPREFIX}Paste>0:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:${PORTSDIR}/www/py-pastedeploy \
-		${PYTHON_PKGNAMEPREFIX}PasteScript>0:${PORTSDIR}/www/py-pastescript \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}Genshi>0:textproc/py-genshi \
+		${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy \
+		${PYTHON_PKGNAMEPREFIX}PasteScript>0:www/py-pastescript \
 		${PYNUMPY}
 
 OPTIONS_DEFINE=	DOCS
@@ -37,9 +37,9 @@ PORTDOCS=	* .buildinfo
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-	${PYTHON_PKGNAMEPREFIX}coards>0:${PORTSDIR}/science/py-coards \
-	${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx \
+	${PYTHON_PKGNAMEPREFIX}coards>0:science/py-coards \
+	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments
 
 PYDISTUTILS_BUILD_TARGET+=	build_sphinx
 
diff --git a/science/py-pysal/Makefile b/science/py-pysal/Makefile
index 934fe44200f7..16d68cb33b4b 100644
--- a/science/py-pysal/Makefile
+++ b/science/py-pysal/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Cross-platform library of spatial analysis functions
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.3:${PORTSDIR}/math/py-numpy \
-		${PYTHON_PKGNAMEPREFIX}scipy>=0.7:${PORTSDIR}/science/py-scipy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.3:math/py-numpy \
+		${PYTHON_PKGNAMEPREFIX}scipy>=0.7:science/py-scipy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/science/py-pyteomics/Makefile b/science/py-pyteomics/Makefile
index f48b9b45ce08..a5b5c7e2c6cb 100644
--- a/science/py-pyteomics/Makefile
+++ b/science/py-pyteomics/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Python modules for proteomics data analysis
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:${PORTSDIR}/math/py-matplotlib \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib \
 		${PYNUMPY}
 
 USES=		python
diff --git a/science/py-scikit-fuzzy/Makefile b/science/py-scikit-fuzzy/Makefile
index 315a4f77802f..0007c1b7e584 100644
--- a/science/py-scikit-fuzzy/Makefile
+++ b/science/py-scikit-fuzzy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fuzzy logic toolkit for SciPy
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/scipy/version.py:${PORTSDIR}/science/py-scipy
+		${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/science/py-scikit-learn/Makefile b/science/py-scikit-learn/Makefile
index d96039990748..5164cbb33b7a 100644
--- a/science/py-scikit-learn/Makefile
+++ b/science/py-scikit-learn/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Machine learning algorithms for python
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/scipy/version.py:${PORTSDIR}/science/py-scipy
+		${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		fortran python
diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile
index 0bc869bd9a7d..e8b04465ac22 100644
--- a/science/py-scikit-sparse/Makefile
+++ b/science/py-scikit-sparse/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Sparse matrix package
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/scipy/version.py:${PORTSDIR}/science/py-scipy
+		${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-		cython>0:${PORTSDIR}/lang/cython
-LIB_DEPENDS=	libumfpack.so:${PORTSDIR}/math/suitesparse
+		cython>0:lang/cython
+LIB_DEPENDS=	libumfpack.so:math/suitesparse
 
 USES=		fortran python
 USE_PYTHON=	autoplist distutils
diff --git a/science/py-scimath/Makefile b/science/py-scimath/Makefile
index 27985dee99c0..41b84e61ff4f 100644
--- a/science/py-scimath/Makefile
+++ b/science/py-scimath/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Scientific and Mathematical calculations
 LICENSE=	BSD3CLAUSE LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:${PORTSDIR}/devel/py-traits \
-		${PYTHON_PKGNAMEPREFIX}numpy>=0:${PORTSDIR}/math/py-numpy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits \
+		${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index 3f2613a39068..92de96863ee9 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
-		swig:${PORTSDIR}/devel/swig13
+		swig:devel/swig13
 
 USES=		fortran python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/science/pybrain/Makefile b/science/pybrain/Makefile
index c3760a173217..db29fb0c58df 100644
--- a/science/pybrain/Makefile
+++ b/science/pybrain/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PyBrain is the swiss army knife for neural networking
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:${PORTSDIR}/science/py-scipy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy
 
 USE_GITHUB=	yes
 
diff --git a/science/pycdf/Makefile b/science/pycdf/Makefile
index f3f842962a96..dc05f010468e 100644
--- a/science/pycdf/Makefile
+++ b/science/pycdf/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-0.6-3b
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Interface to the Unidata NetCDF Library
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/science/qcl/Makefile b/science/qcl/Makefile
index 2e55b55212c7..a3016df539cf 100644
--- a/science/qcl/Makefile
+++ b/science/qcl/Makefile
@@ -19,7 +19,7 @@ PORTDATA=	*
 OPTIONS_DEFINE=		PLOTUTILS
 
 PLOTUTILS_DESC=		Plotting support via plotutils
-PLOTUTILS_LIB_DEPENDS=	libplotter.so:${PORTSDIR}/graphics/plotutils
+PLOTUTILS_LIB_DEPENDS=	libplotter.so:graphics/plotutils
 PLOTUTILS_CXXFLAGS=	-I${LOCALBASE}/include -DQCL_PLOT
 PLOTUTILS_LDFLAGS=	-L${LOCALBASE}/lib -lplotter
 
diff --git a/science/rubygem-cdo/Makefile b/science/rubygem-cdo/Makefile
index 42e564c7f339..8fb17a2cf481 100644
--- a/science/rubygem-cdo/Makefile
+++ b/science/rubygem-cdo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby binding to CDO (Climate Data Operators)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	cdo:${PORTSDIR}/science/cdo
+RUN_DEPENDS=	cdo:science/cdo
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/science/rubygem-ruby-dcl/Makefile b/science/rubygem-ruby-dcl/Makefile
index 2cb937d6d78f..598a00724298 100644
--- a/science/rubygem-ruby-dcl/Makefile
+++ b/science/rubygem-ruby-dcl/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Ruby interface to the scientific graphic library DCL
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	rubygem-narray>=0.5.5:${PORTSDIR}/math/rubygem-narray
-LIB_DEPENDS=	libcdcl.so:${PORTSDIR}/science/cdcl
-RUN_DEPENDS=	rubygem-narray>=0.5.5:${PORTSDIR}/math/rubygem-narray \
-		rubygem-narray_miss>0:${PORTSDIR}/math/rubygem-narray_miss
+BUILD_DEPENDS=	rubygem-narray>=0.5.5:math/rubygem-narray
+LIB_DEPENDS=	libcdcl.so:science/cdcl
+RUN_DEPENDS=	rubygem-narray>=0.5.5:math/rubygem-narray \
+		rubygem-narray_miss>0:math/rubygem-narray_miss
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/science/rubygem-ruby-netcdf/Makefile b/science/rubygem-ruby-netcdf/Makefile
index f894571c1b1a..1490b72633d7 100644
--- a/science/rubygem-ruby-netcdf/Makefile
+++ b/science/rubygem-ruby-netcdf/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to the NetCDF scientific IO library
 
-LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
-RUN_DEPENDS=	rubygem-narray>=0:${PORTSDIR}/math/rubygem-narray \
-		rubygem-narray_miss>=0:${PORTSDIR}/math/rubygem-narray_miss
+LIB_DEPENDS=	libnetcdf.so:science/netcdf
+RUN_DEPENDS=	rubygem-narray>=0:math/rubygem-narray \
+		rubygem-narray_miss>=0:math/rubygem-narray_miss
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/science/sigrok-cli/Makefile b/science/sigrok-cli/Makefile
index 50e4761b2acd..4b31aa417866 100644
--- a/science/sigrok-cli/Makefile
+++ b/science/sigrok-cli/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Framework for hardware logic analyzers, CLI client
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libserialport.so:${PORTSDIR}/devel/libserialport \
-		libsigrok.so:${PORTSDIR}/devel/libsigrok \
-		libsigrokdecode.so:${PORTSDIR}/devel/libsigrokdecode
+LIB_DEPENDS=	libserialport.so:devel/libserialport \
+		libsigrok.so:devel/libsigrok \
+		libsigrokdecode.so:devel/libsigrokdecode
 
 PLIST_FILES=	bin/sigrok-cli man/man1/sigrok-cli.1.gz
 
diff --git a/science/sigrok-firmware/Makefile b/science/sigrok-firmware/Makefile
index e79ba588d155..6c2ca6d75ada 100644
--- a/science/sigrok-firmware/Makefile
+++ b/science/sigrok-firmware/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	sigrok-
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Sigrok firmware
 
-RUN_DEPENDS=	parseelf.py:${PORTSDIR}/science/sigrok-firmware-utils \
-		${LOCALBASE}/share/sigrok-firmware/fx2lafw-cypress-fx2.fw:${PORTSDIR}/science/sigrok-firmware-fx2lafw
+RUN_DEPENDS=	parseelf.py:science/sigrok-firmware-utils \
+		${LOCALBASE}/share/sigrok-firmware/fx2lafw-cypress-fx2.fw:science/sigrok-firmware-fx2lafw
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uffejakobsen
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 16a24fee9e38..edf77d682e85 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -27,7 +27,7 @@ OPTIONS_SUB=			yes
 FORTRAN_CONFIGURE_ENABLE=	fortran
 FORTRAN_USES=			fortran
 
-HDF5_LIB_DEPENDS=		libhdf5.so:${PORTSDIR}/science/hdf5
+HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
 HDF5_CONFIGURE_ON=		--with-hdf5=${LOCALBASE}/include,${LOCALBASE}/lib
 HDF5_PLIST_SUB=			SUFX_HDF5="h5"
 HDF5_PLIST_SUB_OFF=		SUFX_HDF5=""
diff --git a/science/step/Makefile b/science/step/Makefile
index 5e7a7986e61b..43c98206b8d7 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -9,9 +9,9 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 interactive physics simulator
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate \
-		libgsl.so:${PORTSDIR}/math/gsl
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2
+LIB_DEPENDS=	libqalculate.so:math/libqalculate \
+		libgsl.so:math/gsl
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource pkgconfig tar:xz
diff --git a/science/udunits/Makefile b/science/udunits/Makefile
index 76e1275f1852..5b2ecee56b1b 100644
--- a/science/udunits/Makefile
+++ b/science/udunits/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/udunits/ \
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for manipulating units of physical quantities
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/science/v_sim/Makefile b/science/v_sim/Makefile
index 6c843fa97b1f..7d4cefbf8fa6 100644
--- a/science/v_sim/Makefile
+++ b/science/v_sim/Makefile
@@ -37,7 +37,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if !defined(WITHOUT_CDF)
-LIB_DEPENDS+=	libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE}
 PLIST_SUB+=	CDF=""
 .else
@@ -46,7 +46,7 @@ PLIST_SUB+=	CDF="@comment "
 .endif
 
 .if !defined(WITHOUT_BABEL)
-LIB_DEPENDS+=	libopenbabel.so:${PORTSDIR}/science/openbabel
+LIB_DEPENDS+=	libopenbabel.so:science/openbabel
 CONFIGURE_ARGS+=--with-openbabel
 PLIST_SUB+=	BABEL=""
 .else
diff --git a/science/veusz/Makefile b/science/veusz/Makefile
index 433706a86846..1ce5962234f3 100644
--- a/science/veusz/Makefile
+++ b/science/veusz/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Scientific plotting package
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:${PORTSDIR}/graphics/py-qt4-svg
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>0:graphics/py-qt4-svg
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/science/vmd/Makefile b/science/vmd/Makefile
index 8024bf887c95..89760f0f600f 100644
--- a/science/vmd/Makefile
+++ b/science/vmd/Makefile
@@ -15,12 +15,12 @@ DISTFILES=	${VMD_DIST} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Molecular visualization program
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
+BUILD_DEPENDS=	makedepend:devel/makedepend \
 		${PYNUMERIC}
-LIB_DEPENDS=	libtcl85.so:${PORTSDIR}/lang/tcl85 \
-		libtk85.so:${PORTSDIR}/x11-toolkits/tk85 \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libnetcdf.so:${PORTSDIR}/science/netcdf
+LIB_DEPENDS=	libtcl85.so:lang/tcl85 \
+		libtk85.so:x11-toolkits/tk85 \
+		libfltk.so:x11-toolkits/fltk \
+		libnetcdf.so:science/netcdf
 RUN_DEPENDS=	${PYNUMERIC}
 
 USES=		gmake perl5 python
diff --git a/security/R-cran-ROAuth/Makefile b/security/R-cran-ROAuth/Makefile
index ceadc767bd09..c622d247eaa4 100644
--- a/security/R-cran-ROAuth/Makefile
+++ b/security/R-cran-ROAuth/Makefile
@@ -11,8 +11,8 @@ COMMENT=	R interface for OAuth
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	R-cran-RCurl>0:${PORTSDIR}/ftp/R-cran-RCurl \
-		R-cran-digest>0:${PORTSDIR}/security/R-cran-digest
+RUN_DEPENDS=	R-cran-RCurl>0:ftp/R-cran-RCurl \
+		R-cran-digest>0:security/R-cran-digest
 
 USES=	cran:auto-plist
 
diff --git a/security/aespipe/Makefile b/security/aespipe/Makefile
index e5130c8a00df..632de33b099d 100644
--- a/security/aespipe/Makefile
+++ b/security/aespipe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	AES encrypting or decrypting pipe
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:security/gnupg
 
 USES=	tar:bzip2
 
diff --git a/security/afl/Makefile b/security/afl/Makefile
index 4ef6968f735e..a18e4b92dcab 100644
--- a/security/afl/Makefile
+++ b/security/afl/Makefile
@@ -25,9 +25,9 @@ OPTIONS_SUB=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Uses binary instrumentation
 
-LLVM_BUILD_DEPENDS=	clang37:${PORTSDIR}/devel/llvm37
-LLVM_RUN_DEPENDS=	clang37:${PORTSDIR}/devel/llvm37
-MINIMIZE_CORPUS_RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+LLVM_BUILD_DEPENDS=	clang37:devel/llvm37
+LLVM_RUN_DEPENDS=	clang37:devel/llvm37
+MINIMIZE_CORPUS_RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 .include <bsd.port.options.mk>
 
@@ -40,8 +40,8 @@ PLIST_SUB+=	LLVM_SUB=""
 
 .if ${ARCH} == "i386"
 # Clang i386 emits .cfi_sections which base as(1) doesn't understand
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .endif
 
 MAKE_ARGS=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
diff --git a/security/afterglow/Makefile b/security/afterglow/Makefile
index 9a3f8ffc7536..495199961372 100644
--- a/security/afterglow/Makefile
+++ b/security/afterglow/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Collection of graph-generating scripts
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL
 
-RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-IP-Anonymous>=0:${PORTSDIR}/net/p5-IP-Anonymous
+RUN_DEPENDS=	dot:graphics/graphviz \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-IP-Anonymous>=0:net/p5-IP-Anonymous
 
 USES=		shebangfix
 SHEBANG_FILES=	data/generate.pl \
diff --git a/security/aide/Makefile b/security/aide/Makefile
index ff71538c8131..12512fad0d39 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF \
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Replacement and extension for Tripwire
 
-LIB_DEPENDS=	libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmhash.so:security/mhash
 
 USES=		bison gmake
 
diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile
index 9351baeee75c..5bebf3ff0421 100644
--- a/security/aimsniff/Makefile
+++ b/security/aimsniff/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	SF/${PORTNAME}/AIM%20Sniff/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	AOL Instant Messenger Sniffing and Reading Tool
 
-RUN_DEPENDS=	p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap\
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket\
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI\
-		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String\
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon\
-		p5-Proc-Simple>=0:${PORTSDIR}/devel/p5-Proc-Simple\
-		p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog
+RUN_DEPENDS=	p5-Net-Pcap>=0:net/p5-Net-Pcap\
+		p5-NetPacket>=0:net/p5-NetPacket\
+		p5-DBI>=0:databases/p5-DBI\
+		p5-Unicode-String>=0:converters/p5-Unicode-String\
+		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon\
+		p5-Proc-Simple>=0:devel/p5-Proc-Simple\
+		p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog
 
 OPTIONS_DEFINE=	SUID_ROOT DOCS
 SUID_ROOT_DESC=	Install aimsniff with set-uid bit
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
index b175a5c40ab7..5e905563b60c 100644
--- a/security/amavis-stats/Makefile
+++ b/security/amavis-stats/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/feld
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Simple AMaViS statistics generator based on rrdtool
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS=	rrdtool>=0:databases/rrdtool
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index 6f927ccd0390..761b65d8d7e8 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	rx@rx.cz
 COMMENT=	Milter for amavisd-new
 
-RUN_DEPENDS=	amavisd:${PORTSDIR}/security/amavisd-new
+RUN_DEPENDS=	amavisd:security/amavisd-new
 
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index f841a75106b5..0eeb426ea193 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Mail scanner interface between mailer and content checkers
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Convert-TNEF>=0:${PORTSDIR}/converters/p5-Convert-TNEF \
-		p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
-		p5-Archive-Zip>=1.14:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Net-Server>=2.0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM \
-		p5-Net-LibIDN>=0:${PORTSDIR}/dns/p5-Net-LibIDN
+RUN_DEPENDS=	p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Convert-TNEF>=0:converters/p5-Convert-TNEF \
+		p5-Convert-UUlib>=1.08,1:converters/p5-Convert-UUlib \
+		p5-Archive-Zip>=1.14:archivers/p5-Archive-Zip \
+		p5-Net-Server>=2.0:net/p5-Net-Server \
+		p5-Mail-DKIM>=0.33:mail/p5-Mail-DKIM \
+		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN
 
 USES=		perl5 shebangfix tar:xz
 USE_PERL5=	run
@@ -95,56 +95,56 @@ PLIST_SUB+=	AMAVISUSER=${AMAVISUSER} \
 USE_RC_SUBR+=	amavisd
 
 .if ${PORT_OPTIONS:MIPV6}
-RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6
 .endif
 
 .if ${PORT_OPTIONS:MSNMP} && ${PORT_OPTIONS:MBDB}
 USE_RC_SUBR+=	amavisd-snmp
-RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS+=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
-RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+RUN_DEPENDS+=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS: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:MSASL}
-RUN_DEPENDS+=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+RUN_DEPENDS+=	p5-Authen-SASL>=0:security/p5-Authen-SASL
 .endif
 
 .if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+=	spamassassin>=0:${PORTSDIR}/mail/spamassassin
+RUN_DEPENDS+=	spamassassin>=0:mail/spamassassin
 .endif
 
 .if ${PORT_OPTIONS:MP0F}
-RUN_DEPENDS+=	${LOCALBASE}/bin/p0f:${PORTSDIR}/net-mgmt/p0f
+RUN_DEPENDS+=	${LOCALBASE}/bin/p0f:net-mgmt/p0f
 USE_RC_SUBR+=	amavis-p0fanalyzer
 .else
 AMAVIS_NOP0F=	"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MALTERMIME}
-RUN_DEPENDS+=	${LOCALBASE}/bin/altermime:${PORTSDIR}/mail/altermime
+RUN_DEPENDS+=	${LOCALBASE}/bin/altermime:mail/altermime
 .endif
 
 .if ${PORT_OPTIONS:MFILE}
 # security fix, file >= 4.21 needed
-RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
+RUN_DEPENDS+=	file>=4.21:sysutils/file
 .endif
 
 # archviers/rar is a 32-bit binary port, we don't want the install to fail
@@ -154,71 +154,71 @@ RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
 .if ${PORT_OPTIONS:MRAR}
 # support for archivers/rar is broken on ia64
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
-RUN_DEPENDS+=	${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
+RUN_DEPENDS+=	${LOCALBASE}/bin/rar:archivers/rar
 .else
 IGNORE=	archviers/rar is a 32-bit binary port and is not compatible with ${ARCH}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MUNRAR}
-RUN_DEPENDS+=	${LOCALBASE}/bin/unrar:${PORTSDIR}/archivers/unrar
+RUN_DEPENDS+=	${LOCALBASE}/bin/unrar:archivers/unrar
 .endif
 
 .if ${PORT_OPTIONS:MARJ}
-RUN_DEPENDS+=	${LOCALBASE}/bin/arj:${PORTSDIR}/archivers/arj
+RUN_DEPENDS+=	${LOCALBASE}/bin/arj:archivers/arj
 .endif
 
 .if ${PORT_OPTIONS:MUNARJ}
-RUN_DEPENDS+=	${LOCALBASE}/bin/unarj:${PORTSDIR}/archivers/unarj
+RUN_DEPENDS+=	${LOCALBASE}/bin/unarj:archivers/unarj
 .endif
 
 .if ${PORT_OPTIONS:MLHA}
-RUN_DEPENDS+=	${LOCALBASE}/bin/lha:${PORTSDIR}/archivers/lha
+RUN_DEPENDS+=	${LOCALBASE}/bin/lha:archivers/lha
 .endif
 
 .if ${PORT_OPTIONS:MARC}
-RUN_DEPENDS+=	${LOCALBASE}/bin/arc:${PORTSDIR}/archivers/arc
+RUN_DEPENDS+=	${LOCALBASE}/bin/arc:archivers/arc
 .endif
 
 .if ${PORT_OPTIONS:MNOMARCH}
-RUN_DEPENDS+=	${LOCALBASE}/bin/nomarch:${PORTSDIR}/archivers/nomarch
+RUN_DEPENDS+=	${LOCALBASE}/bin/nomarch:archivers/nomarch
 .endif
 
 .if ${PORT_OPTIONS:MCAB}
-RUN_DEPENDS+=	${LOCALBASE}/bin/cabextract:${PORTSDIR}/archivers/cabextract
+RUN_DEPENDS+=	${LOCALBASE}/bin/cabextract:archivers/cabextract
 .endif
 
 .if ${PORT_OPTIONS:MRPM}
-RUN_DEPENDS+=	${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+RUN_DEPENDS+=	${LOCALBASE}/bin/rpm2cpio.pl:archivers/rpm2cpio
 .endif
 
 .if ${PORT_OPTIONS:MZOO}
 # DOS condition in 2.10.1_2
-RUN_DEPENDS+=	zoo>=2.10.1_2:${PORTSDIR}/archivers/zoo
+RUN_DEPENDS+=	zoo>=2.10.1_2:archivers/zoo
 .endif
 
 .if ${PORT_OPTIONS:MUNZOO}
-RUN_DEPENDS+=	unzoo>=4.4_1:${PORTSDIR}/archivers/unzoo
+RUN_DEPENDS+=	unzoo>=4.4_1:archivers/unzoo
 .endif
 
 .if ${PORT_OPTIONS:MLZOP}
-RUN_DEPENDS+=	${LOCALBASE}/bin/lzop:${PORTSDIR}/archivers/lzop
+RUN_DEPENDS+=	${LOCALBASE}/bin/lzop:archivers/lzop
 .endif
 
 .if ${PORT_OPTIONS:MFREEZE}
-RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:${PORTSDIR}/archivers/freeze
+RUN_DEPENDS+=	${LOCALBASE}/bin/unfreeze:archivers/freeze
 .endif
 
 .if ${PORT_OPTIONS:MP7ZIP}
-RUN_DEPENDS+=	${LOCALBASE}/bin/7zr:${PORTSDIR}/archivers/p7zip
+RUN_DEPENDS+=	${LOCALBASE}/bin/7zr:archivers/p7zip
 .endif
 
 .if ${PORT_OPTIONS:MMSWORD}
-RUN_DEPENDS+=	${LOCALBASE}/bin/ripole:${PORTSDIR}/textproc/ripole
+RUN_DEPENDS+=	${LOCALBASE}/bin/ripole:textproc/ripole
 .endif
 
 .if ${PORT_OPTIONS:MTNEF}
-RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
+RUN_DEPENDS+=	${LOCALBASE}/bin/tnef:converters/tnef
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 6ea0679289ac..e6386ace43a9 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -15,7 +15,7 @@ LICENSE=	APACHE20
 
 USE_OPENSSL=	yes
 
-LIB_DEPENDS+=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS+=	libxerces-c.so.3:textproc/xerces-c3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-xerces=${LOCALBASE}
diff --git a/security/apg/Makefile b/security/apg/Makefile
index 3f1d532d1cf4..495a6838acdd 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -17,7 +17,7 @@ DOCS=		APG_TIPS pronun.txt rfc0972.txt rfc1750.txt
 
 OPTIONS_DEFINE=	CRACKLIB DOCS
 CRACKLIB_DESC=	CrackLib support for password quality
-CRACKLIB_LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+CRACKLIB_LIB_DEPENDS=	libcrack.so:security/cracklib
 CRACKLIB_MAKE_ARGS=	-DWITH_CRACKLIB
 
 post-extract:
diff --git a/security/arm/Makefile b/security/arm/Makefile
index f15999aa677f..45c46a421548 100644
--- a/security/arm/Makefile
+++ b/security/arm/Makefile
@@ -32,8 +32,8 @@ TOR_DESC=	Enable local tor support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOR}
-RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof \
-		tor:${PORTSDIR}/security/tor
+RUN_DEPENDS+=	lsof:sysutils/lsof \
+		tor:security/tor
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/security/arpCounterattack/Makefile b/security/arpCounterattack/Makefile
index 7aa49216f081..d3b1969f4328 100644
--- a/security/arpCounterattack/Makefile
+++ b/security/arpCounterattack/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://isis.poly.edu/~bk/${PORTNAME}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Detects and remedies ARP attacks
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
+LIB_DEPENDS=	libdnet.so:net/libdnet
 
 USES=		compiler:c++11-lib tar:tbz
 USE_CSTD=	c++11
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 45e66cc4fb24..4b5f72273c25 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES=	bin/authforce \
 
 OPTIONS_DEFINE=		CURL NLS
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/security/autossh/Makefile b/security/autossh/Makefile
index 8f9463cc047f..526aad48858f 100644
--- a/security/autossh/Makefile
+++ b/security/autossh/Makefile
@@ -19,6 +19,6 @@ OPTIONS_DEFINE=	DOCS SSH_PORTABLE
 SSH_PORTABLE_DESC=	Default to ports openssh (instead of base)
 
 SSH_PORTABLE_CONFIGURE_ENV=	ac_cv_path_ssh=${LOCALBASE}/bin/ssh
-SSH_PORTABLE_RUN_DEPENDS=	${LOCALBASE}/bin/ssh:${PORTSDIR}/security/openssh-portable
+SSH_PORTABLE_RUN_DEPENDS=	${LOCALBASE}/bin/ssh:security/openssh-portable
 
 .include <bsd.port.mk>
diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile
index 6544e4c3eeaf..aa9de1de5653 100644
--- a/security/axTLS/Makefile
+++ b/security/axTLS/Makefile
@@ -46,9 +46,9 @@ STAGE=		${WRKSRC}/_stage
 WITH_HTTP_PORT?=	80
 WITH_SSL_PORT?=		443
 
-PERL_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+PERL_BUILD_DEPENDS=	swig:devel/swig13
 PERL_USES=	perl5
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPTIONS_SUB=	yes
 PORTDOCS=	*
diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
index a17a380c81ec..12086a0bc2c2 100644
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -43,7 +43,7 @@ EXAMPLES=	SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql c
 
 64BIT_CONFIGURE_ENABLE=	64bit-gcc
 ARUBA_CONFIGURE_ENABLE=	aruba
-BRO_LIB_DEPENDS=	libbroccoli.so:${PORTSDIR}/security/broccoli
+BRO_LIB_DEPENDS=	libbroccoli.so:security/broccoli
 BRO_CONFIGURE_ON=	--with-broccoli=${LOCALBASE}/lib
 BRO_CONFIGURE_ENABLE=	bro
 GRE_CONFIGURE_ENABLE=	gre
@@ -54,7 +54,7 @@ MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_CONFIGURE_ON=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 MYSQL_SSL_CONFIGURE_ENABLE=	mysql-ssl-support
-ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_WITH=		odbc
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
@@ -63,7 +63,7 @@ TCL_USES=		tcl
 TCL_CONFIGURE_ON=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
 TCL_CONFIGURE_OFF=	--without-tcl
 WANT_PGSQL_VER=		92+
-PORT_PCAP_LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap
+PORT_PCAP_LIB_DEPENDS=	libpcap.so:net/libpcap
 PORT_PCAP_CONFIGURE_ON=	--with-libpcap-includes=${LOCALBASE}/include \
 			--with-libpcap-libraries=${LOCALBASE}/lib
 
diff --git a/security/base/Makefile b/security/base/Makefile
index a6b85b5a5e51..201e071b9cdf 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Basic Analysis and Security Engine - analyzing Snort alerts
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/GPL
 
-RUN_DEPENDS=	${ADODB_DIR}/adodb.inc.php:${PORTSDIR}/databases/adodb5 \
-		${LOCALBASE}/share/pear/Image/Graph.php:${PORTSDIR}/graphics/pear-Image_Graph \
-		${LOCALBASE}/share/pear/Mail.php:${PORTSDIR}/mail/pear-Mail \
-		${LOCALBASE}/share/pear/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
+RUN_DEPENDS=	${ADODB_DIR}/adodb.inc.php:databases/adodb5 \
+		${LOCALBASE}/share/pear/Image/Graph.php:graphics/pear-Image_Graph \
+		${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail \
+		${LOCALBASE}/share/pear/Mail/mime.php:mail/pear-Mail_Mime
 
 USE_PHP=	gd gettext pcre session zlib ctype
 
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	MYSQL PGSQL PDF DOCS
 MYSQL_USE=	MYSQL=yes PHP=mysql
 PGSQL_USES=	pgsql
 PGSQL_USE=	PHP=pgsql
-PDF_RUN_DEPENDS=${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf
+PDF_RUN_DEPENDS=${LOCALBASE}/share/fpdf/fpdf.php:print/fpdf
 
 do-build:
 	@${REINPLACE_CMD} -e 's,DBlib_path = "",DBlib_path = "${ADODB_DIR}",' \
diff --git a/security/bdc/Makefile b/security/bdc/Makefile
index 64b3825ef9ff..3420f2ce72f6 100644
--- a/security/bdc/Makefile
+++ b/security/bdc/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.2-fbsd${BDREL}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BitDefender Console Antivirus for FreeBSD
 
-LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libc.so.5:misc/compat5x
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/security/belier/Makefile b/security/belier/Makefile
index a87d6a608914..e7c60f9cb0bb 100644
--- a/security/belier/Makefile
+++ b/security/belier/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	romain.garbage@gmail.com
 COMMENT=	easily cross several machines with ssh
 
-RUN_DEPENDS=	expect>=5.42.1:${PORTSDIR}/lang/expect
+RUN_DEPENDS=	expect>=5.42.1:lang/expect
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/binwalk/Makefile b/security/binwalk/Makefile
index d117a23a117b..6a4f8f0c0049 100644
--- a/security/binwalk/Makefile
+++ b/security/binwalk/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	devttys0
 USE_PYTHON=	autoplist distutils
 
-RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip \
-		cabextract:${PORTSDIR}/archivers/cabextract
+RUN_DEPENDS=	7z:archivers/p7zip \
+		cabextract:archivers/cabextract
 
 .include <bsd.port.mk>
diff --git a/security/botan110/Makefile b/security/botan110/Makefile
index 30dc00830fe1..94f5328d5f9d 100644
--- a/security/botan110/Makefile
+++ b/security/botan110/Makefile
@@ -38,13 +38,13 @@ CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 CONFIGURE_ARGS+=--with-gnump
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
 .if ${PORT_OPTIONS:MECC}
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/tr1/memory.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/tr1/memory.hpp:devel/boost-libs
 CONFIGURE_ARGS+=--with-tr1-implementation=boost
 CXXFLAGS+=	-I${LOCALBASE}/include
 .else
diff --git a/security/bro/Makefile b/security/bro/Makefile
index bbc88b6341de..f1613d399ca3 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -11,9 +11,9 @@ COMMENT=	System for detecting network intruders in real-time
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison \
-		${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+BUILD_DEPENDS=	${LOCALBASE}/bin/bison:devel/bison \
+		${LOCALBASE}/bin/swig:devel/swig13
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 USES=		cmake:outsource compiler:c++11-lang perl5 python
 
@@ -69,7 +69,7 @@ OPTIONS_EXCLUDE=NLS DOCS
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MBROCCOLI}
-LIB_DEPENDS+=	libbroccoli.so:${PORTSDIR}/security/broccoli
+LIB_DEPENDS+=	libbroccoli.so:security/broccoli
 .endif
 
 .if ${PORT_OPTIONS:MBROCTL}
@@ -79,10 +79,10 @@ IGNORE=		the BROCTL option requires BROCCOLI
 .if empty(PORT_OPTIONS:MIPSUMDUMP)
 IGNORE=		the BROCTL option requires IPSUMDUMP
 .endif
-BUILD_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-RUN_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS+=	${LOCALBASE}/bin/bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+RUN_DEPENDS+=	${LOCALBASE}/bin/bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 PLIST_SUB+=	BROCTL=""
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-D INSTALL_BROCTL:BOOL=true
@@ -93,13 +93,13 @@ PLIST_SUB+=	BROCTL="@comment "
 
 .if ${PORT_OPTIONS:MBROKER}
 CMAKE_ARGS+=	-D ENABLE_BROKER:BOOL=true
-BUILD_DEPENDS+=	caf>=0.14.1:${PORTSDIR}/devel/caf
+BUILD_DEPENDS+=	caf>=0.14.1:devel/caf
 PLIST_SUB+=	BROKER=""
 
 .if ${OSVERSION} < 1001000
 # Bro 2.4 with BROKER requires caf, clang and libc++
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang++34:${PORTSDIR}/lang/clang34 \
-		${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang++34:lang/clang34 \
+		${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
 
 CXXFLAGS+=	-stdlib=libc++ -I${LOCALBASE}/include/c++/v1 -L${LOCALBASE}/lib
 CXX=		${LOCALBASE}/bin/clang++34
@@ -116,24 +116,24 @@ CMAKE_ARGS+=	-D ENABLE_DEBUG:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MLBL_HF}
-RUN_DEPENDS+=	${LOCALBASE}/bin/hf:${PORTSDIR}/sysutils/lbl-hf
+RUN_DEPENDS+=	${LOCALBASE}/bin/hf:sysutils/lbl-hf
 .endif
 
 .if ${PORT_OPTIONS:MLBL_CF}
-RUN_DEPENDS+=	${LOCALBASE}/bin/cf:${PORTSDIR}/sysutils/lbl-cf
+RUN_DEPENDS+=	${LOCALBASE}/bin/cf:sysutils/lbl-cf
 .endif
 
 .if ${PORT_OPTIONS:MPERFTOOLS}
 CMAKE_ARGS+=	-D ENABLE_PERFTOOLS:BOOL=true
-RUN_DEPENDS+=	${LOCALBASE}/bin/pprof:${PORTSDIR}/devel/google-perftools
+RUN_DEPENDS+=	${LOCALBASE}/bin/pprof:devel/google-perftools
 .else
 CMAKE_ARGS+=	-D ENABLE_PERFTOOLS:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MPORTS_SSL}
 CMAKE_ARGS+=	-D CMAKE_EXE_LINKER_FLAGS="${OPENSSL_LDFLAGS}"
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcrypto.so:${PORTSDIR}/security/openssl
-RUN_DEPENDS+=	${LOCALBASE}/lib/libcrypto.so:${PORTSDIR}/security/openssl
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcrypto.so:security/openssl
+RUN_DEPENDS+=	${LOCALBASE}/lib/libcrypto.so:security/openssl
 .else
 .if defined(WITH_OPENSSL_PORT)
 IGNORE=		the SSL option is requred when WITH_OPENSSL_PORT is enabled
@@ -141,8 +141,8 @@ IGNORE=		the SSL option is requred when WITH_OPENSSL_PORT is enabled
 .endif
 
 .if ${PORT_OPTIONS:MIPSUMDUMP}
-BUILD_DEPENDS+=	ipsumdump:${PORTSDIR}/net/ipsumdump
-RUN_DEPENDS+=	ipsumdump:${PORTSDIR}/net/ipsumdump
+BUILD_DEPENDS+=	ipsumdump:net/ipsumdump
+RUN_DEPENDS+=	ipsumdump:net/ipsumdump
 .endif
 
 post-install-BROCTL-on:
diff --git a/security/broccoli/Makefile b/security/broccoli/Makefile
index 507ed7f2471a..38906f47b3cf 100644
--- a/security/broccoli/Makefile
+++ b/security/broccoli/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Bro Client Communications Library
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison \
-		${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+BUILD_DEPENDS=	${LOCALBASE}/bin/bison:devel/bison \
+		${LOCALBASE}/bin/swig:devel/swig13
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 EXTRACT_AFTER_ARGS=	${DISTNAME}/aux/broccoli
 
diff --git a/security/bruteblock/Makefile b/security/bruteblock/Makefile
index 2a2168b5e59d..9a0415e7f1e8 100644
--- a/security/bruteblock/Makefile
+++ b/security/bruteblock/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://samm.kiev.ua/bruteblock/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Software for blocking bruteforce attacks with ipfw
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git a/security/bruteforceblocker/Makefile b/security/bruteforceblocker/Makefile
index b2f68a649a29..d2e6c1fc8893 100644
--- a/security/bruteforceblocker/Makefile
+++ b/security/bruteforceblocker/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	http://danger.rulez.sk/projects/bruteforceblocker/ \
 MAINTAINER=	danger@FreeBSD.org
 COMMENT=	Checks for SSH bruteforce and blocks given IPs
 
-RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-Sys-Hostname-Long>=0:${PORTSDIR}/sysutils/p5-Sys-Hostname-Long \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \
+		p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Net-DNS>=0:dns/p5-Net-DNS
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/security/bsmtrace/Makefile b/security/bsmtrace/Makefile
index f83f8dd585c5..5465eaf5e962 100644
--- a/security/bsmtrace/Makefile
+++ b/security/bsmtrace/Makefile
@@ -19,7 +19,7 @@ OPTIONS_DEFINE=	PCRE EXAMPLES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 MAKE_ENV+=	PCRE=1
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lpcre
diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
index cbfd2ca1377e..10a24a154b75 100644
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@@ -10,18 +10,18 @@ COMMENT=	Open framework for monitoring and auditing SSL certificates
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS?=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libevhtp.so:${PORTSDIR}/www/libevhtp \
-		libgtest.so:${PORTSDIR}/devel/googletest \
-		libgflags.so:${PORTSDIR}/devel/gflags \
-		libglog.so:${PORTSDIR}/devel/glog \
-		libgmock.so:${PORTSDIR}/devel/googlemock \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libleveldb.so:${PORTSDIR}/databases/leveldb \
-		libobjecthash.so:${PORTSDIR}/devel/objecthash \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS?=	libevent.so:devel/libevent2 \
+		libevhtp.so:www/libevhtp \
+		libgtest.so:devel/googletest \
+		libgflags.so:devel/gflags \
+		libglog.so:devel/glog \
+		libgmock.so:devel/googlemock \
+		libjson-c.so:devel/json-c \
+		libleveldb.so:databases/leveldb \
+		libobjecthash.so:devel/objecthash \
+		libprotobuf.so:devel/protobuf \
+		libsqlite3.so:databases/sqlite3 \
+		libtcmalloc.so:devel/google-perftools
 
 BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
 
diff --git a/security/cisco-torch/Makefile b/security/cisco-torch/Makefile
index 0b6d7687f384..d7922bdf0d1e 100644
--- a/security/cisco-torch/Makefile
+++ b/security/cisco-torch/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Mass Cisco Vulnerability Scanner
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Net-SSH2>=0:${PORTSDIR}/net/p5-Net-SSH2 \
-		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+RUN_DEPENDS=	p5-Net-Telnet>=0:net/p5-Net-Telnet \
+		p5-Net-SSH2>=0:net/p5-Net-SSH2 \
+		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${WRKSRC}/cisco-torch.pl
diff --git a/security/ckpass/Makefile b/security/ckpass/Makefile
index 4289dcf1e992..f870eb20d4c9 100644
--- a/security/ckpass/Makefile
+++ b/security/ckpass/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ncurses based password database client
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libkpass.so:${PORTSDIR}/security/libkpass
+LIB_DEPENDS=	libkpass.so:security/libkpass
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile
index a08a336f9d40..2830d9346724 100644
--- a/security/cl-md5-sbcl/Makefile
+++ b/security/cl-md5-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Native MD5 implementation in Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:${PORTSDIR}/security/cl-md5
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:${PORTSDIR}/security/cl-md5
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:security/cl-md5
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/md5/md5.asd:security/cl-md5
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index a566dc71e7e9..0b40456ffa76 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple virus filter wrapper for ClamAV
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	sigtool:${PORTSDIR}/security/clamav \
-		formail:${PORTSDIR}/mail/procmail
+BUILD_DEPENDS=	sigtool:security/clamav \
+		formail:mail/procmail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_FILES=	bin/clamassassin
diff --git a/security/clamav-unofficial-sigs/Makefile b/security/clamav-unofficial-sigs/Makefile
index 24f57950a5e9..3cfa6734508f 100644
--- a/security/clamav-unofficial-sigs/Makefile
+++ b/security/clamav-unofficial-sigs/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Update script for third-party ClamAV databases
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	clamscan:${PORTSDIR}/security/clamav \
-		rsync:${PORTSDIR}/net/rsync \
-		curl:${PORTSDIR}/ftp/curl \
-		gpg:${PORTSDIR}/security/gnupg \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	clamscan:security/clamav \
+		rsync:net/rsync \
+		curl:ftp/curl \
+		gpg:security/gnupg \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	extremeshok
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index eb28439f9fba..22bc89ff26f2 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Command line virus scanner written entirely in C
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
 		EXPERIMENTAL DOCS IPV6 DMG_XAR JSON PCRE
@@ -32,18 +32,18 @@ DMG_XAR_DESC=		Enable DMG and XAR archives support
 OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6 DMG_XAR \
 			JSON PCRE
 
-ARC_RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc
-ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
-LHA_RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
-UNZOO_RUN_DEPENDS=	unzoo:${PORTSDIR}/archivers/unzoo
-JSON_LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+ARC_RUN_DEPENDS=	arc:archivers/arc
+ARJ_RUN_DEPENDS=	arj:archivers/arj
+LHA_RUN_DEPENDS=	lha:archivers/lha
+UNZOO_RUN_DEPENDS=	unzoo:archivers/unzoo
+JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 UNRAR_CONFIGURE_ENABLE=	unrar
 MILTER_CONFIGURE_ENABLE=milter
 TESTS_CONFIGURE_ENABLE=	check
 JSON_CONFIGURE_WITH=	libjson
 PCRE_CONFIGURE_WITH=	pcre
-TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
+TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:devel/libcheck
 ICONV_CONFIGURE_ON=	--with-iconv
 ICONV_CONFIGURE_OFF=	--without-iconv
 ICONV_USES=		iconv
@@ -150,7 +150,7 @@ LDFLAGS+=	-lldap
 . endif
 
 . if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/libmilter
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:mail/libmilter
 CONFIGURE_ARGS+=--with-sendmail=${LOCALBASE}/sbin/sendmail
 LDFLAGS+=	-L${LOCALBASE}/lib
 . else
diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile
index 91d85edd297c..ed1777d1e56a 100644
--- a/security/clamcour/Makefile
+++ b/security/clamcour/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.becrux.com/pages/projects/clamcour/
 MAINTAINER=	bsd@dino.sk
 COMMENT=	ClamAV courier filter
 
-BUILD_DEPENDS=	courier-config:${PORTSDIR}/mail/courier
-LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+BUILD_DEPENDS=	courier-config:mail/courier
+LIB_DEPENDS=	libclamav.so:security/clamav
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index be3bc78cd8d0..ee815c0b17cc 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=		DOCS LOCAL_CLAMAV EXAMPLES
 OPTIONS_DEFAULT=	LOCAL_CLAMAV
 
 LOCAL_CLAMAV_DESC=		RUN_DEPEND on security/clamav
-LOCAL_CLAMAV_RUN_DEPENDS=	clamav>=0:${PORTSDIR}/security/clamav
+LOCAL_CLAMAV_RUN_DEPENDS=	clamav>=0:security/clamav
 LOCAL_CLAMAV_SUB_LIST=		CLAMD=clamd
 LOCAL_CLAMAV_SUB_LIST_OFF=	CLAMD=
 
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 1ed2af4f54bb..c52c7bc1072c 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -13,15 +13,15 @@ COMMENT=	GTK front-end for Clam Antivirus
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Config-Tiny>=2.12:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Date-Calc>=5.5.1:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-File-Find-Rule>=0.30:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Net-DNS>=0.65:${PORTSDIR}/dns/p5-Net-DNS \
-		clamscan:${PORTSDIR}/security/clamav \
-		p5-libwww>=5.822:${PORTSDIR}/www/p5-libwww \
-		zenity:${PORTSDIR}/x11/zenity \
-		p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Config-Tiny>=2.12:devel/p5-Config-Tiny \
+		p5-Date-Calc>=5.5.1:devel/p5-Date-Calc \
+		p5-File-Find-Rule>=0.30:devel/p5-File-Find-Rule \
+		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
+		p5-Net-DNS>=0.65:dns/p5-Net-DNS \
+		clamscan:security/clamav \
+		p5-libwww>=5.822:www/p5-libwww \
+		zenity:x11/zenity \
+		p5-Gtk2>=1.144:x11-toolkits/p5-Gtk2
 
 NO_BUILD=	yes
 USES=		gettext-runtime:run perl5 shebangfix
diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index 874cc7915136..c5f586078a08 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -12,27 +12,27 @@ COMMENT=	Controls multiple hosts simultaneously via xterms and ssh
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Trap>=0:${PORTSDIR}/devel/p5-Test-Trap \
-		p5-Module-Manifest>=0:${PORTSDIR}/devel/p5-Module-Manifest \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol \
-		p5-Sort-Naturally>=1:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		xterm:${PORTSDIR}/x11/xterm
-RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Sort-Naturally>=1:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		xterm:${PORTSDIR}/x11/xterm
-TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes
+BUILD_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Trap>=0:devel/p5-Test-Trap \
+		p5-Module-Manifest>=0:devel/p5-Module-Manifest \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Capture-Tiny>0:devel/p5-Capture-Tiny \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Tk>=0:x11-toolkits/p5-Tk \
+		p5-X11-Protocol>=0:x11/p5-X11-Protocol \
+		p5-Sort-Naturally>=1:textproc/p5-Sort-Naturally \
+		xterm:x11/xterm
+RUN_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk \
+		p5-X11-Protocol>=0:x11/p5-X11-Protocol \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Sort-Naturally>=1:textproc/p5-Sort-Naturally \
+		xterm:x11/xterm
+TEST_DEPENDS=	p5-CPAN-Changes>=0:devel/p5-CPAN-Changes
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 93ce91a8f7bb..07e75cdd2505 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	Meta-port for the courier authentication library
 CONFLICTS=	courier-0.45*
 
 .if !defined(PKGNAMESUFFIX)
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base
 
 NO_BUILD=	yes
 PATCHDIR=	/dev/null
@@ -30,8 +30,8 @@ OPTIONS_DEFINE+=	GDBM
 
 .else	# !defined(PKGNAMESUFFIX)
 
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
+LIB_DEPENDS+=	libltdl.so:devel/libltdl \
+		libcourier-unicode.so:devel/courier-unicode
 
 USES=		iconv gmake libtool perl5 tar:bzip2
 GNU_CONFIGURE=	yes
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+=--with-pipeprog=${WITH_AUTHPIPE_PROG}
 .endif
 
 .else
-RUN_DEPENDS+=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+RUN_DEPENDS+=	courierauthconfig:security/courier-authlib-base
 CONFIGURE_ARGS+=--without-base --without-authpam --without-authpipe
 REMOVE_SUBDIRS+=liblock liblog
 .endif
@@ -94,7 +94,7 @@ REMOVE_SUBDIRS+=liblock liblog
 .if ${AUTHMOD} == authuserdb
 .if ${PKGNAMESUFFIX} == -usergdbm
 CONFLICTS+=	${PORTNAME}-userdb-0.*
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 CONFIGURE_ARGS+=--with-db=gdbm
 .elif ${PKGNAMESUFFIX} == -userdb
 CONFLICTS+=	${PORTNAME}-usergdbm-0.*
@@ -133,7 +133,7 @@ CONFIGURE_ARGS+=--without-authpgsql
 .endif
 
 .if ${AUTHMOD} == authvchkpw
-BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:mail/vpopmail
 CONFIGURE_ARGS+=--with-authvchkpw
 .else
 CONFIGURE_ARGS+=--without-authvchkpw
diff --git a/security/courier-authlib/Makefile.dep b/security/courier-authlib/Makefile.dep
index 5238c4e7491d..f12ae7d209ea 100644
--- a/security/courier-authlib/Makefile.dep
+++ b/security/courier-authlib/Makefile.dep
@@ -11,21 +11,21 @@
 #.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MAUTH_LDAP}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:${PORTSDIR}/net/courier-authlib-ldap
+BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthldap.so:net/courier-authlib-ldap
 .endif
 .if ${PORT_OPTIONS:MAUTH_MYSQL}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthmysql.so:${PORTSDIR}/databases/courier-authlib-mysql
+BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthmysql.so:databases/courier-authlib-mysql
 .endif
 .if ${PORT_OPTIONS:MAUTH_PGSQL}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthpgsql.so:${PORTSDIR}/databases/courier-authlib-pgsql
+BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthpgsql.so:databases/courier-authlib-pgsql
 .endif
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthuserdb.so:${PORTSDIR}/databases/courier-authlib-usergdbm
+BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthuserdb.so:databases/courier-authlib-usergdbm
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthuserdb.so:${PORTSDIR}/databases/courier-authlib-userdb
+BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthuserdb.so:databases/courier-authlib-userdb
 .endif
 .endif
 .if ${PORT_OPTIONS:MAUTH_VCHKPW}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthvchkpw.so:${PORTSDIR}/mail/courier-authlib-vchkpw
+BUILD_DEPENDS+=	${LOCALBASE}/lib/courier-authlib/libauthvchkpw.so:mail/courier-authlib-vchkpw
 .endif
diff --git a/security/courierpassd/Makefile b/security/courierpassd/Makefile
index 32d3d7caa775..90c235578a31 100644
--- a/security/courierpassd/Makefile
+++ b/security/courierpassd/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.arda.homeunix.net/software-downloads/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	User authentication and password changing daemon utility
 
-BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base
 
 GNU_CONFIGURE=	yes
 USES=	gmake
diff --git a/security/courierpasswd/Makefile b/security/courierpasswd/Makefile
index ed936965f843..a9c4d61c228c 100644
--- a/security/courierpasswd/Makefile
+++ b/security/courierpasswd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.arda.homeunix.net/software-downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	User authentication and password changing utility
 
-LIB_DEPENDS=	libcourierauth.so:${PORTSDIR}/security/courier-authlib-base
+LIB_DEPENDS=	libcourierauth.so:security/courier-authlib-base
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/security/courieruserinfo/Makefile b/security/courieruserinfo/Makefile
index 8475dffb5fbf..e206c821787c 100644
--- a/security/courieruserinfo/Makefile
+++ b/security/courieruserinfo/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.arda.homeunix.net/software-downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	User account information retrieval utility
 
-BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/security/cp2fwb/Makefile b/security/cp2fwb/Makefile
index f312d2386112..d8f9c5c9d44d 100644
--- a/security/cp2fwb/Makefile
+++ b/security/cp2fwb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}uilder/${PORTNAME}uilder/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Checkpoint FW1 to Firewall Builder ruleset converter
 
-RUN_DEPENDS=	p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+RUN_DEPENDS=	p5-XML-Writer>=0:textproc/p5-XML-Writer
 
 PLIST_FILES=	bin/cp2fwbuilder
 USES=		perl5 shebangfix tar:tgz
diff --git a/security/crank/Makefile b/security/crank/Makefile
index 95c3a27bb361..01eb34fd87c2 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CRyptANalysis toolKit
 
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libguile.so:lang/guile
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index 4e9262aba352..6516a22e1d1a 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Credential Validation Modules
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libbg.so:${PORTSDIR}/devel/bglibs
+LIB_DEPENDS=	libbg.so:devel/bglibs
 
 CONFLICTS=	bglibs-1.00*
 
@@ -34,7 +34,7 @@ VCHKPW_DESC=	Compile cvm-vchkpw
 
 VCHKPW_ALL_TARGET=	cvm-vchkpw
 
-VCHKPW_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+VCHKPW_BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:mail/vpopmail
 
 do-configure:
 	${ECHO_CMD} "${PREFIX}"		> ${WRKSRC}/conf-home
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 34395ff2c58b..88b65df5ba24 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -5,7 +5,7 @@ PORTREVISION=	3
 
 COMMENT=	SASL authentication server for cyrus-sasl2
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 INSTALL_WRKSRC=	${WRKSRC}/saslauthd
 
@@ -36,7 +36,7 @@ BDB_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-bdb=${BDB_LIB_NAME}
 BDB1_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=ndbm
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--enable-auth-sasldb \
 			--with-dblib=gdbm \
 			--with-gdbm=${LOCALBASE}
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 147f14b9952b..3f4227ee8058 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -36,7 +36,7 @@ BDB_CONFIGURE_ON=	--with-dblib=berkeley \
 			--with-bdb-incdir=${BDB_INCLUDE_DIR} \
 			--with-bdb=${BDB_LIB_NAME}
 BDB1_CONFIGURE_ON=	--with-dblib=ndbm
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--with-dblib=gdbm \
 			--with-gdbm=${LOCALBASE}
 MYSQL_USE=		MYSQL=yes
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index 32c4b18785c6..0b589b4f3626 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -61,7 +61,7 @@ CYRUS_BUILD_TARGET?=	${PORTNAME}
 .if ${CYRUS_BUILD_TARGET} != "cyrus-sasl" && ${CYRUS_BUILD_TARGET} != "saslauthd"
 
 INSTALL_WRKSRC=	${WRKSRC}/plugins
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 USES=		libtool:build
 
 PLIST_FILES+=	lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 0b11ba20b4ed..e1dc8a5165da 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Client for managing and downloading certificate revocation lists
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libksba.so:${PORTSDIR}/security/libksba \
-		libpth.so:${PORTSDIR}/devel/pth
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error \
+		libksba.so:security/libksba \
+		libpth.so:devel/pth
 
 USES=		gmake iconv tar:bzip2
 USE_OPENLDAP=	yes
diff --git a/security/doorman/Makefile b/security/doorman/Makefile
index e572d33a7238..f7e42abde40b 100644
--- a/security/doorman/Makefile
+++ b/security/doorman/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Port knocking implementation, both daemon and client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
+BUILD_DEPENDS=	lsof:sysutils/lsof
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PATCH_STRIP=	-p1
diff --git a/security/doscan/Makefile b/security/doscan/Makefile
index 515a52dd98f6..b11fbb53cefb 100644
--- a/security/doscan/Makefile
+++ b/security/doscan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool to quickly scan your network for machines listening on a TCP port
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/security/dradis/Makefile b/security/dradis/Makefile
index 0d24d41fb264..39b1309581e0 100644
--- a/security/dradis/Makefile
+++ b/security/dradis/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Opensource framework to enable effective information gathering
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems \
-		${RUBY_SITELIBDIR}/wirble.rb:${PORTSDIR}/devel/ruby-wirble \
-		rubygem-rake>=0.8.7:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-rails>=3.0.5:${PORTSDIR}/www/rubygem-rails \
-		rubygem-activesupport>=3.0.2:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-bundler>=1.0.7:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-redcloth>=4.2.7:${PORTSDIR}/www/rubygem-redcloth \
-		rubygem-sqlite3>=1.3.2:${PORTSDIR}/databases/rubygem-sqlite3
+RUN_DEPENDS=	${LOCALBASE}/bin/gem:devel/ruby-gems \
+		${RUBY_SITELIBDIR}/wirble.rb:devel/ruby-wirble \
+		rubygem-rake>=0.8.7:devel/rubygem-rake \
+		rubygem-rails>=3.0.5:www/rubygem-rails \
+		rubygem-activesupport>=3.0.2:devel/rubygem-activesupport \
+		rubygem-bundler>=1.0.7:sysutils/rubygem-bundler \
+		rubygem-redcloth>=4.2.7:www/rubygem-redcloth \
+		rubygem-sqlite3>=1.3.2:databases/rubygem-sqlite3
 
 USE_RC_SUBR=	dradis
 SUB_FILES=	pkg-message
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index d9cc38ef14b0..7e0a2afce4a2 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Various sniffing utilities for penetration testing
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
+LIB_DEPENDS=	libnet.so:net/libnet
+BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:net/libnids
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
diff --git a/security/easypg/Makefile b/security/easypg/Makefile
index 31baf2f636b2..6f7954b323c3 100644
--- a/security/easypg/Makefile
+++ b/security/easypg/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	epg-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	EasyPG is yet another GnuPG interface for Emacs
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpg:security/gnupg1
 
 GNU_CONFIGURE=	yes
 USE_EMACS=	yes
diff --git a/security/engine_pkcs11/Makefile b/security/engine_pkcs11/Makefile
index 1470e770aab5..529929123589 100644
--- a/security/engine_pkcs11/Makefile
+++ b/security/engine_pkcs11/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Implementation of a PKCS\#11 engine for OpenSSL
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libp11.so:${PORTSDIR}/security/libp11
+LIB_DEPENDS=	libp11.so:security/libp11
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/security/esteidfirefoxplugin/Makefile b/security/esteidfirefoxplugin/Makefile
index 0c5d94b497d1..2fec881bd714 100644
--- a/security/esteidfirefoxplugin/Makefile
+++ b/security/esteidfirefoxplugin/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Digital signing with Estonian ID card in Firefox
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	opensc-tool:${PORTSDIR}/security/opensc \
-		pcscd:${PORTSDIR}/devel/pcsc-lite
+RUN_DEPENDS=	opensc-tool:security/opensc \
+		pcscd:devel/pcsc-lite
 
 USE_OPENSSL=	yes
 USE_GNOME=	gtk20
diff --git a/security/fastd-devel/Makefile b/security/fastd-devel/Makefile
index 7903b1af404f..4f1d9d14ea50 100644
--- a/security/fastd-devel/Makefile
+++ b/security/fastd-devel/Makefile
@@ -14,9 +14,9 @@ COMMENT=		Fast and Secure Tunnelling Daemon
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=		libjson-c.so:${PORTSDIR}/devel/json-c       \
-			libsodium.so:${PORTSDIR}/security/libsodium \
-			libuecc.so:${PORTSDIR}/security/libuecc
+LIB_DEPENDS=		libjson-c.so:devel/json-c       \
+			libsodium.so:security/libsodium \
+			libuecc.so:security/libuecc
 
 USES=			bison cmake:outsource pkgconfig tar
 
diff --git a/security/fastd/Makefile b/security/fastd/Makefile
index 585734c2c85a..435165786bd6 100644
--- a/security/fastd/Makefile
+++ b/security/fastd/Makefile
@@ -12,9 +12,9 @@ COMMENT=		Fast and Secure Tunnelling Daemon
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=		libjson-c.so:${PORTSDIR}/devel/json-c       \
-			libsodium.so:${PORTSDIR}/security/libsodium \
-			libuecc.so:${PORTSDIR}/security/libuecc
+LIB_DEPENDS=		libjson-c.so:devel/json-c       \
+			libsodium.so:security/libsodium \
+			libuecc.so:security/libuecc
 
 USES=			bison cmake:outsource pkgconfig tar
 
diff --git a/security/fiked/Makefile b/security/fiked/Makefile
index 60d1c644602d..14277fa7809d 100644
--- a/security/fiked/Makefile
+++ b/security/fiked/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fake IKE PSK+XAUTH daemon based on VPNC
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		gmake tar:bzip2
 
@@ -25,7 +25,7 @@ PORTDOCS=	README NEWS
 OPTIONS_DEFINE=	LIBNET DOCS
 OPTIONS_DEFAULT=LIBNET
 LIBNET_DESC=	Build with libnet support
-LIBNET_LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIBNET_LIB_DEPENDS=	libnet.so:net/libnet
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|=-g|=|' ${WRKSRC}/${MAKEFILE}
diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile
index 5b40ead73365..da1147d77dde 100644
--- a/security/firewalk/Makefile
+++ b/security/firewalk/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Remote firewall auditing tool
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libdnet.so:net/libdnet \
+		libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/fpm2/Makefile b/security/fpm2/Makefile
index 571827015684..62715b5bb0c4 100644
--- a/security/fpm2/Makefile
+++ b/security/fpm2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Program that allows you to securely store the passwords
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool
diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index b4d272c0c13f..23af3db7ae0a 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:C/_/-/}_${PORTVERSION}git.orig
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Demo and test application for libfprint
 
-LIB_DEPENDS=	libfprint.so:${PORTSDIR}/security/libfprint
+LIB_DEPENDS=	libfprint.so:security/libfprint
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf pkgconfig desktop-file-utils
diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
index 4eb254b8cec7..bc2500afb92f 100644
--- a/security/fprintd/Makefile
+++ b/security/fprintd/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Daemon that provides fingerprint scanning functionality over D-Bus
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfprint.so:${PORTSDIR}/security/libfprint \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libfprint.so:security/libfprint \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 GNU_CONFIGURE=	yes
 USES=		tar:xz gmake libtool pkgconfig
diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile
index ff171f285c09..ffb6a612d105 100644
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tool for intercepting, modifying, and rewriting egress traffic
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libdnet.so:net/libdnet \
+		libevent.so:devel/libevent2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libdnet=${LOCALBASE} \
diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index 7ff52f7f39db..d823dd1e52e7 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -63,7 +63,7 @@ XMAGIC_DESC=		XMagic support
 
 .include <bsd.port.pre.mk>
 
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
 
 STRIP_FILES=		${STAGEDIR}${PREFIX}/bin/ftimes
@@ -80,14 +80,14 @@ PLIST_SUB+=		DBM_TOOLS="@comment "
 .if ${PORT_OPTIONS:MDIG_TOOLS}
 PLIST_SUB+=		DIG_TOOLS=""
 CONFIGURE_ARGS+=	--with-dig-tools
-RUN_DEPENDS+=		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS+=		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 INSTALL_PERL5_LIBS=	yes
 .else
 PLIST_SUB+=		DIG_TOOLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFILE_HOOKS}
-LIB_DEPENDS+=		libklel.so:${PORTSDIR}/devel/libklel
+LIB_DEPENDS+=		libklel.so:devel/libklel
 CONFIGURE_ARGS+=	--enable-file-hooks --with-klel=${LOCALBASE} --with-perl=${LOCALBASE}/bin/perl
 .else
 PLIST_SUB+=		WITH_FILE_HOOKS="@comment "
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index 56ea95446d27..e1a53a8b98fb 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://tud.at/programm/fwanalog/
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Firewall log summarizer that uses Analog
 
-RUN_DEPENDS=	analog:${PORTSDIR}/www/analog
+RUN_DEPENDS=	analog:www/analog
 
 CONFFILES=	fwanalog-dom.tab \
 		fwanalog.analog.conf \
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 58b86a5e85b2..b901a1a16365 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -29,8 +29,8 @@ CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-[234].* \
 CONFLICTS=	fwbuilder-[234].* fwbuilder-devel-* \
 		libfwbuilder-[234].* libfwbuilder-devel-*
 .endif
-LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS=	libxslt.so:textproc/libxslt \
+		libnetsnmp.so:net-mgmt/net-snmp
 
 PLIST_SUB=	BUILD_VERSION=${DISTVERSION}.${BUILD}
 USE_QT4=	corelib \
@@ -68,7 +68,7 @@ PORTDOCS=	*
 
 .if  ${OSVERSION} >= 1000055
 # IMPORTANT: Newer versions of rcs will NOT work with fwbuilder.
-RUN_DEPENDS=	rcs:${PORTSDIR}/devel/rcs57
+RUN_DEPENDS=	rcs:devel/rcs57
 .endif
 
 .if empty(PORT_OPTIONS:MDOCS)
diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile
index 067fd1a6e976..2ad44a1ceef9 100644
--- a/security/fwknop/Makefile
+++ b/security/fwknop/Makefile
@@ -38,7 +38,7 @@ IPFW_CONFIGURE_WITH=	ipfw=/sbin/ipfw
 
 PF_CONFIGURE_WITH=	pf=/sbin/pfctl
 
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_WITH=	gpgme
 
 .include <bsd.port.mk>
diff --git a/security/gcr/Makefile b/security/gcr/Makefile
index 34ff14568cdf..ae3218ce42a6 100644
--- a/security/gcr/Makefile
+++ b/security/gcr/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for bits of crypto UI and parsing
 
-BUILD_DEPENDS=	gtk-doc>0:${PORTSDIR}/textproc/gtk-doc \
-		vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libp11-kit.so:${PORTSDIR}/security/p11-kit \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	gtk-doc>0:textproc/gtk-doc \
+		vapigen:lang/vala
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libtasn1.so:security/libtasn1 \
+		libp11-kit.so:security/p11-kit \
+		libgcrypt.so:security/libgcrypt
 
 CONFLICTS=	gnome-keyring-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/security/gnome-gpg/Makefile b/security/gnome-gpg/Makefile
index d1baa96b392b..356014a27045 100644
--- a/security/gnome-gpg/Makefile
+++ b/security/gnome-gpg/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Simple commandline wrapper around gpg for gnome-keyring
 
-BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
-RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpgv:security/gnupg1
+LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
+RUN_DEPENDS=	gpgv:security/gnupg1
 
 USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/security/gnome-keyring-sharp/Makefile b/security/gnome-keyring-sharp/Makefile
index ad3049b838aa..db988bf68d37 100644
--- a/security/gnome-keyring-sharp/Makefile
+++ b/security/gnome-keyring-sharp/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fully managed implementation of gnome-keyring
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus \
-		${LOCALBASE}/libdata/pkgconfig/gnome-keyring-1.pc:${PORTSDIR}/security/libgnome-keyring
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus \
+		${LOCALBASE}/libdata/pkgconfig/gnome-keyring-1.pc:security/libgnome-keyring
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index ebc9484c5e77..d3d07215e1b4 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -11,16 +11,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Program that keeps passwords and other secrets
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		gcr>=3.5.3:${PORTSDIR}/security/gcr
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libp11-kit.so:${PORTSDIR}/security/p11-kit \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		pinentry-gnome3:${PORTSDIR}/security/pinentry-gnome3
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		docbook-xsl>=0:textproc/docbook-xsl \
+		gcr>=3.5.3:security/gcr
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libgcr-3.so:security/gcr \
+		libtasn1.so:security/libtasn1 \
+		libp11-kit.so:security/p11-kit \
+		libgcrypt.so:security/libgcrypt
+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		pinentry-gnome3:security/pinentry-gnome3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile
index 4a84239180c8..4d2c219456c8 100644
--- a/security/gnomint/Makefile
+++ b/security/gnomint/Makefile
@@ -13,9 +13,9 @@ COMMENT=	X.509 Certification Authority management tool
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls \
+		libsqlite3.so:databases/sqlite3
 
 GNU_CONFIGURE=	yes
 USES=		gettext-tools gmake perl5 pkgconfig readline
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index d6f086b654bb..da82423bd53a 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -16,12 +16,12 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libksba.so:${PORTSDIR}/security/libksba \
-		libnpth.so:${PORTSDIR}/devel/npth
-BUILD_DEPENDS=	libgpg-error>=1.16:${PORTSDIR}/security/libgpg-error
-RUN_DEPENDS=	pinentry>0:${PORTSDIR}/security/pinentry
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgcrypt.so:security/libgcrypt \
+		libksba.so:security/libksba \
+		libnpth.so:devel/npth
+BUILD_DEPENDS=	libgpg-error>=1.16:security/libgpg-error
+RUN_DEPENDS=	pinentry>0:security/pinentry
 
 GNU_CONFIGURE=	YES
 USES=		cpe gmake iconv pkgconfig tar:bzip2
@@ -47,8 +47,8 @@ OPTIONS_SUB=		YES
 DOCS_CONFIGURE_ENABLE=	doc
 DOCS_INFO=		gnupg
 GNUTLS_CONFIGURE_ENABLE=gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-KDNS_LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+KDNS_LIB_DEPENDS=	libadns.so:dns/adns
 KDNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 54f96123b6f1..36f4edc4ecb0 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -71,7 +71,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CONFIGURE_ENV+=	_libcurl_config=${LOCALBASE}/bin/curl-config
diff --git a/security/gnupg20/Makefile b/security/gnupg20/Makefile
index 1e21175fb2ae..ca098264d596 100644
--- a/security/gnupg20/Makefile
+++ b/security/gnupg20/Makefile
@@ -17,12 +17,12 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libksba.so:${PORTSDIR}/security/libksba \
-		libpth.so:${PORTSDIR}/devel/pth
-BUILD_DEPENDS=	libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error
-RUN_DEPENDS=	pinentry>0:${PORTSDIR}/security/pinentry
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgcrypt.so:security/libgcrypt \
+		libksba.so:security/libksba \
+		libpth.so:devel/pth
+BUILD_DEPENDS=	libgpg-error>=1.11:security/libgpg-error
+RUN_DEPENDS=	pinentry>0:security/pinentry
 
 GNU_CONFIGURE=	YES
 USES=		cpe gmake iconv tar:bzip2
@@ -44,15 +44,15 @@ NO_OPTIONS_SORT=	YES
 OPTIONS_SUB=		YES
 
 DOCS_CONFIGURE_ENABLE=	doc
-GPGSM_RUN_DEPENDS=	dirmngr:${PORTSDIR}/security/dirmngr
+GPGSM_RUN_DEPENDS=	dirmngr:security/dirmngr
 GPGSM_CONFIGURE_ENABLE=	gpgsm
-KDNS_LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
+KDNS_LIB_DEPENDS=	libadns.so:dns/adns
 KDNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
 STD_SOCKET_CONFIGURE_ENABLE=	standard-socket
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ON=	--with-libcurl=${LOCALBASE}
 CURL_CONFIGURE_OFF=	--without-libcurl
 
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 36e3481fb87a..a9db54caca91 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -13,10 +13,10 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LESSER
 
-LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle \
-		libtasn1.so:${PORTSDIR}/security/libtasn1
-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
+LIB_DEPENDS=	libnettle.so:security/nettle \
+		libtasn1.so:security/libtasn1
+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=		cpe gmake iconv libtool makeinfo pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
@@ -41,22 +41,22 @@ CRYWRAP_IMPLIES=		IDN
 CRYWRAP_CONFIGURE_ENABLE=	crywrap
 
 DANE_DESC=		Certificate verification via DNSSEC
-DANE_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
+DANE_LIB_DEPENDS=	libunbound.so:dns/unbound
 DANE_CONFIGURE_ENABLE=	libdane
 
 IDN_CONFIGURE_WITH=	idn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 P11KIT_DESC=		PKCS\#11 and p11-kit support
 P11KIT_CONFIGURE_WITH=	p11-kit
-P11KIT_LIB_DEPENDS=	libp11-kit.so:${PORTSDIR}/security/p11-kit
+P11KIT_LIB_DEPENDS=	libp11-kit.so:security/p11-kit
 
 TPM_DESC=		TPM (trousers) support
 TPM_CONFIGURE_WITH=	tpm
-TPM_LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
+TPM_LIB_DEPENDS=	libtspi.so:security/trousers
 
 ZLIB_CONFIGURE_WITH=	zlib
 
diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index 07fbfc88dacb..0517154e91e4 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Password Gorilla is a cross-platform Password Manager
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	itcl>=3.4:${PORTSDIR}/lang/itcl \
-		wish:${PORTSDIR}/x11-toolkits/tk-wrapper
+RUN_DEPENDS=	itcl>=3.4:lang/itcl \
+		wish:x11-toolkits/tk-wrapper
 
 .include <bsd.port.options.mk>
 
diff --git a/security/govpn/Makefile b/security/govpn/Makefile
index 732819c1df2b..ce5597d54382 100644
--- a/security/govpn/Makefile
+++ b/security/govpn/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple secure, DPI-resistant VPN daemon
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 USES=		tar:xz
 MAKEFILE=	BSDmakefile
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index beb4b3eb152a..2cc7d2791cd2 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -12,10 +12,10 @@ COMMENT=	GTK2+ frontend for the GNU Privacy Guard
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgpgme.so:${PORTSDIR}/security/gpgme
-BUILD_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
-RUN_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgpgme.so:security/gpgme
+BUILD_DEPENDS=	gpgv2:security/gnupg
+RUN_DEPENDS=	gpgv2:security/gnupg
 
 USES=		gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index 3afa5341f6e4..6b1f0a0c8527 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Password manager for GNOME2
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
-		libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt \
+		libmhash.so:security/mhash
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -export-dynamic
diff --git a/security/gpgdir/Makefile b/security/gpgdir/Makefile
index 350bd6a34ccc..fb478649f7fd 100644
--- a/security/gpgdir/Makefile
+++ b/security/gpgdir/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Recursive directory encryption with GnuPG
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+		p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 1e0765de0a37..62c5314b00f2 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library to make access to GnuPG easier
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgpg-error.so:security/libgpg-error
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake libtool tar:bzip2
@@ -32,12 +32,12 @@ OPTIONS_SINGLE_GNUPG=	GNUPG1 GNUPG2
 OPTIONS_DEFAULT=	GNUPG2 UISERVER
 
 GNUPG1_DESC=		Build gpgme library for GnuPG 1.x
-GNUPG1_BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-GNUPG1_RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+GNUPG1_BUILD_DEPENDS=	gpgv:security/gnupg1
+GNUPG1_RUN_DEPENDS=	gpgv:security/gnupg1
 
 GNUPG2_DESC=		Build gpgme library for GnuPG 2.x
-GNUPG2_BUILD_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-GNUPG2_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+GNUPG2_BUILD_DEPENDS=	gpg2:security/gnupg
+GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
 
 UISERVER_DESC=			GnuPG UI server support
 UISERVER_CONFIGURE_ENABLE=	fd-passing
diff --git a/security/gputty/Makefile b/security/gputty/Makefile
index 5aceaf792fd6..89c88c5325a7 100644
--- a/security/gputty/Makefile
+++ b/security/gputty/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Frontend to the SSH client, using the Gtk+ toolkit
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem
 
 PLIST_FILES=	bin/gputty
 
diff --git a/security/greenbone-security-assistant/Makefile b/security/greenbone-security-assistant/Makefile
index 3d1b85eca73d..bc4b6f823a93 100644
--- a/security/greenbone-security-assistant/Makefile
+++ b/security/greenbone-security-assistant/Makefile
@@ -12,10 +12,10 @@ COMMENT=	OpenVAS web interface
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libopenvas_base.so:${PORTSDIR}/security/openvas-libraries \
-		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libopenvas_base.so:security/openvas-libraries \
+		libmicrohttpd.so:www/libmicrohttpd
 
 USES=		cmake:outsource gettext gnome pkgconfig
 USE_GNOME=	glib20 libxml2 libxslt
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index 4e3eed9b751b..89681f6246f3 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK application to securely store sensitive data
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libgringotts.so:${PORTSDIR}/security/libgringotts
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libgringotts.so:security/libgringotts
 
 USES=		gettext pkgconfig
 USE_GNOME=	gtk20
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index f2a873210054..fcdd83005c00 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU SASL Library
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libntlm.so:${PORTSDIR}/security/libntlm
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls \
+		libntlm.so:security/libntlm
 
 USES=		charsetfix pathfix perl5 pkgconfig libtool
 USE_PERL5=	build
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 1cfde3b106b7..9dea19cd9e97 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU Generic Security Service Library
 
-LIB_DEPENDS=	libshishi.so:${PORTSDIR}/security/shishi
+LIB_DEPENDS=	libshishi.so:security/shishi
 
 CONFLICTS=	heimdal-[0-9]*
 
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index fe9ad1b8d19c..6f679709c479 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	GTK+ passwords manager for system and network administrators
 
-RUN_DEPENDS+=	gpgv2:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	gpgv2:security/gnupg
 
 USES=		desktop-file-utils gettext gmake pkgconfig tar:xz
 USE_GNOME=	gtk20 intltool
diff --git a/security/hamachi/Makefile b/security/hamachi/Makefile
index 3f6a7dfc7e3e..fcc7f1c25fad 100644
--- a/security/hamachi/Makefile
+++ b/security/hamachi/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	linux-
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Fast, secure, simple VPN software with NAT-traversal
 
-PATCH_DEPENDS=	upx:${PORTSDIR}/archivers/upx
+PATCH_DEPENDS=	upx:archivers/upx
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 19703ed3b47e..b11657491ed8 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -84,7 +84,7 @@ KX509_DESC=		Enable kx509 support
 KX509_CONFIGURE_ENABLE=	kx509
 
 CRACKLIB_DESC=		Use CrackLib for password quality checking
-CRACKLIB_BUILD_DEPENDS=	${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
+CRACKLIB_BUILD_DEPENDS=	${LOCALBASE}/lib/libcrack.a:security/cracklib
 
 X11_DESC=		Build X11 utilies
 X11_USE=		XORG=x11,xt
diff --git a/security/hitch/Makefile b/security/hitch/Makefile
index 0830f0576c15..fd33d66ad230 100644
--- a/security/hitch/Makefile
+++ b/security/hitch/Makefile
@@ -12,7 +12,7 @@ COMMENT=		TLS proxy to forward connections to an unencrypted backend
 LICENSE=		BSD2CLAUSE
 
 BUILD_DEPENDS=		rst2man:textproc/py-docutils
-LIB_DEPENDS=		libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=		libev.so:devel/libev
 
 USERS=			nobody
 GROUPS=			nobody
diff --git a/security/honeybadger/Makefile b/security/honeybadger/Makefile
index 58a6e94b4a67..464f2e31e67d 100644
--- a/security/honeybadger/Makefile
+++ b/security/honeybadger/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	security
 MAINTAINER=	shawn.webb@hardenedbsd.org
 COMMENT=	Quantum Insert detector and 0-day catcher
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	david415:DEFAULT google:gp fatih:co mattn:gc,gi \
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 401131169605..0ea8aeb1d750 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -13,15 +13,15 @@ COMMENT=	HotSSH is an interface to Secure Shell, for GNOME and OpenSSH
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:${PORTSDIR}/devel/py-gobject \
-		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:${PORTSDIR}/devel/py-gobject \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:devel/py-gobject \
+		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:devel/py-gobject \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte
 
 USE_GNOME=	pygtk2 gnomedocutils libxslt glib20 intltool
 USES=		gettext python tar:bzip2 waf
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
index 3717fb81d74c..f1cd8ca8d074 100644
--- a/security/hs-gnutls/Makefile
+++ b/security/hs-gnutls/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 USE_CABAL=	monads-tf>=0.1.0
 
 USES=		pkgconfig
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 7114fa173bc8..fecfdf0e6288 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Brute force attack utility working on multiple network services
 
 LICENSE=	AGPLv3
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libpcre.so:devel/pcre \
+		libsasl2.so:security/cyrus-sasl2
 
 CONFLICTS_INSTALL=	hydra-web-[0-9]*
 
@@ -28,14 +28,14 @@ WANT_GNOME=	yes
 OPTIONS_DEFINE=	FIREBIRD SSH SVN X11
 OPTIONS_DEFAULT=SSH
 OPTIONS_EXCLUDE=NLS DOCS
-FIREBIRD_LIB_DEPENDS=	libfbclient.so:${PORTSDIR}/databases/firebird25-client
-SVN_LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+FIREBIRD_LIB_DEPENDS=	libfbclient.so:databases/firebird25-client
+SVN_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSH}
 CFLAGS+=	-I${LOCALBASE}/include
-LIB_DEPENDS+=	libssh.so.4:${PORTSDIR}/security/libssh
+LIB_DEPENDS+=	libssh.so.4:security/libssh
 .endif
 
 .if ${PORT_OPTIONS:MX11}
diff --git a/security/i2p/Makefile b/security/i2p/Makefile
index e1a72d35a98a..96fe523203a7 100644
--- a/security/i2p/Makefile
+++ b/security/i2p/Makefile
@@ -22,9 +22,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_DISTFILES=	i2psource_${PORTVERSION}${EXTRACT_SUFX}
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp
-LIB_DEPENDS=	libiconv.so:${PORTSDIR}/converters/libiconv
-RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:math/gmp
+LIB_DEPENDS=	libiconv.so:converters/libiconv
+RUN_DEPENDS=	unzip:archivers/unzip
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	i2p libwrapper.so library binary only available for i386 and amd64
diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index f97fa89392d3..8bec36d6327d 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	C++ implementation of I2P client
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 BROKEN_FreeBSD_9=	does not build
 
@@ -35,7 +35,7 @@ AESNI_CMAKE_OFF=-DWITH_AESNI=OFF
 UPNP_DESC=	Include support for UPnP client
 UPNP_CMAKE_ON=	-DWITH_UPNP=ON
 UPNP_CMAKE_OFF=	-DWITH_UPNP=OFF
-UPNP_LIB_DEPENDS=libminiupnpc.so:${PORTSDIR}/net/miniupnpc
+UPNP_LIB_DEPENDS=libminiupnpc.so:net/miniupnpc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/security/identify/Makefile b/security/identify/Makefile
index 57307f47784e..9c6abdb5db78 100644
--- a/security/identify/Makefile
+++ b/security/identify/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://ftp.nluug.nl/ftp/pub/pub/security/coast/daemons/pidentd/too
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client side ident protocol daemon wrapper
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
+BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:security/libident
 
 PORTDOCS=	README
 PLIST_FILES=	libexec/identify
diff --git a/security/ifd-slb_rf60/Makefile b/security/ifd-slb_rf60/Makefile
index f75d07c05fe1..895f2adfdbe4 100644
--- a/security/ifd-slb_rf60/Makefile
+++ b/security/ifd-slb_rf60/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PC/SC Lite driver for the Reflex 62 serial smart card reader
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USES=		gmake
 CFLAGS+=	-fPIC
diff --git a/security/ipfilter2dshield/Makefile b/security/ipfilter2dshield/Makefile
index 33ce177469bf..f703dd50e335 100644
--- a/security/ipfilter2dshield/Makefile
+++ b/security/ipfilter2dshield/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.txt
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Official DShield client for ipfilter firewall logs
 
-RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${DISTNAME}
diff --git a/security/ipguard/Makefile b/security/ipguard/Makefile
index 242329ee09c9..9333e39fdce0 100644
--- a/security/ipguard/Makefile
+++ b/security/ipguard/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool designed to protect LAN IP address space by ARP spoofing
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USE_RC_SUBR=	${PORTNAME}
 PORTDOCS=	COPYRIGHT NEWS README README.tcpdump README.log ethers.sample rfc826.txt
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 1e629af821cd..84b96dc7e91e 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -17,7 +17,7 @@ BROKEN=		requires IPsec support
 
 # If keynote is in use, bring the dependency
 .if defined(USE_KEYNOTE)
-BUILD_DEPENDS+=	keynote:${PORTSDIR}/security/keynote
+BUILD_DEPENDS+=	keynote:security/keynote
 .endif
 
 USES=		uidfix
diff --git a/security/isnprober/Makefile b/security/isnprober/Makefile
index 69323c3387b4..579a8fe777c3 100644
--- a/security/isnprober/Makefile
+++ b/security/isnprober/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.ubizen.com/tools/ \
 MAINTAINER=	onatan@gmail.com
 COMMENT=	PenTest tool for TCP Initial Sequence Numbers research
 
-RUN_DEPENDS=	p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP
+RUN_DEPENDS=	p5-Net-RawIP>=0:net/p5-Net-RawIP
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README
diff --git a/security/kc/Makefile b/security/kc/Makefile
index ed9082f8ce39..c6fa79d6d63a 100644
--- a/security/kc/Makefile
+++ b/security/kc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Console based password storing application
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libpcre.so:devel/pcre
 
 USES=		libedit pkgconfig uidfix
 USE_GITHUB=	yes
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index 906ac2cd977d..5615f54fcf5c 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple application for managing personal data
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 NO_ARCH=	yes
 
diff --git a/security/keepass/Makefile b/security/keepass/Makefile
index 0afdde6d9df5..68734eb28b8e 100644
--- a/security/keepass/Makefile
+++ b/security/keepass/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Light-weight and easy-to-use password manager
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	icotool:${PORTSDIR}/graphics/icoutils
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgdiplus.so:${PORTSDIR}/x11-toolkits/libgdiplus
+BUILD_DEPENDS=	icotool:graphics/icoutils
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgdiplus.so:x11-toolkits/libgdiplus
 
 EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
 
@@ -38,8 +38,8 @@ XSEL_DESC=	Use the xsel utility for clipboard copying
 
 OPTIONS_DEFAULT=	XDOTOOL XSEL
 
-XDOTOOL_RUN_DEPENDS=	xdotool:${PORTSDIR}/x11/xdotool
-XSEL_RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
+XDOTOOL_RUN_DEPENDS=	xdotool:x11/xdotool
+XSEL_RUN_DEPENDS=	xsel:x11/xsel-conrad
 
 do-build:
 	# Extract icons
diff --git a/security/keepassx2/Makefile b/security/keepassx2/Makefile
index 879f907af6ee..b75919a0a8a1 100644
--- a/security/keepassx2/Makefile
+++ b/security/keepassx2/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	eric@camachat.org
 COMMENT=	Cross Platform Password Manager
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 CONFLICTS_INSTALL=	keepassx-0.*
 
diff --git a/security/keybase/Makefile b/security/keybase/Makefile
index b68a0c0d1056..04f7745a5c86 100644
--- a/security/keybase/Makefile
+++ b/security/keybase/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Keybase.io client
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
-		node:${PORTSDIR}/www/node
+RUN_DEPENDS=	gpg:security/gnupg \
+		node:www/node
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 1afdf873d462..d5f1fd7aa621 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 PORTDOCS=	ChangeLog README.md
 
 .if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
-RUN_DEPENDS+=	ssh-agent:${PORTSDIR}/security/openssh-portable
+RUN_DEPENDS+=	ssh-agent:security/openssh-portable
 .endif
 
 post-patch:
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 965f71fc2e5a..a2654317cbc8 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Encryption tool for KDE
 
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg2:security/gnupg
 
 USE_KDE4=	kdeprefix automoc4 kdelibs pimlibs
 USES=		cmake:outsource tar:xz
diff --git a/security/kpcli/Makefile b/security/kpcli/Makefile
index 9deb90b77ec4..89cd69e76348 100644
--- a/security/kpcli/Makefile
+++ b/security/kpcli/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Command line interface to KeePassX and KeePass database files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Crypt-Rijndael>=1.08:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Sort-Naturally>=1.02:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-File-KeePass>=2.03:${PORTSDIR}/security/p5-File-KeePass \
-		p5-Term-ShellUI>=0.9:${PORTSDIR}/shells/p5-Term-ShellUI \
-		p5-ReadLine-Gnu>=1.19:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Data-Password>=0:${PORTSDIR}/security/p5-Data-Password \
-		p5-Clone>=0.31:${PORTSDIR}/devel/p5-Clone \
-		p5-Capture-Tiny>=0:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Clipboard>=0:${PORTSDIR}/x11/p5-Clipboard
+RUN_DEPENDS=	p5-Crypt-Rijndael>=1.08:security/p5-Crypt-Rijndael \
+		p5-Term-ReadKey>=2.30:devel/p5-Term-ReadKey \
+		p5-Sort-Naturally>=1.02:textproc/p5-Sort-Naturally \
+		p5-File-KeePass>=2.03:security/p5-File-KeePass \
+		p5-Term-ShellUI>=0.9:shells/p5-Term-ShellUI \
+		p5-ReadLine-Gnu>=1.19:devel/p5-ReadLine-Gnu \
+		p5-Data-Password>=0:security/p5-Data-Password \
+		p5-Clone>=0.31:devel/p5-Clone \
+		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-Clipboard>=0:x11/p5-Clipboard
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
@@ -30,8 +30,8 @@ PLIST_FILES=	bin/kpcli man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=		PWSAFE3
 PWSAFE3_DESC=		Password Safe V3 file importing
-PWSAFE3_BUILD_DEPENDS+=	p5-Crypt-PWSafe3>=1.21:${PORTSDIR}/security/p5-Crypt-PWSafe3
-PWSAFE3_RUN_DEPENDS+=	p5-Crypt-PWSafe3>=1.21:${PORTSDIR}/security/p5-Crypt-PWSafe3
+PWSAFE3_BUILD_DEPENDS+=	p5-Crypt-PWSafe3>=1.21:security/p5-Crypt-PWSafe3
+PWSAFE3_RUN_DEPENDS+=	p5-Crypt-PWSafe3>=1.21:security/p5-Crypt-PWSafe3
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index eb5d5aa6d193..a47d12402d2b 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=		.tar
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		Authentication system developed at MIT, successor to Kerberos IV
 
-BUILD_DEPENDS=		krb5-config:${PORTSDIR}/security/krb5
+BUILD_DEPENDS=		krb5-config:security/krb5
 
 CONFLICTS=		krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]*
 
@@ -47,24 +47,24 @@ KRB5_114_PORT_DESC=		Depend on security/krb5-114
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MKRB5_PORT}
-LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5
-RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5
+LIB_DEPENDS=		libkrb5support.so:security/krb5
+RUN_DEPENDS=		kinit:security/krb5
 .elif ${PORT_OPTIONS:MKRB5_112_PORT}
-LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5-112
-RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5-112
+LIB_DEPENDS=		libkrb5support.so:security/krb5-112
+RUN_DEPENDS=		kinit:security/krb5-112
 .elif ${PORT_OPTIONS:MKRB5_113_PORT}
-LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5-113
-RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5-113
+LIB_DEPENDS=		libkrb5support.so:security/krb5-113
+RUN_DEPENDS=		kinit:security/krb5-113
 .elif ${PORT_OPTIONS:MKRB5_114_PORT}
-LIB_DEPENDS=		libkrb5support.so:${PORTSDIR}/security/krb5-114
-RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5-113
+LIB_DEPENDS=		libkrb5support.so:security/krb5-114
+RUN_DEPENDS=		kinit:security/krb5-113
 .else
 BROKEN=			krb5 dependency not selected
 .endif
 
 .if ${PORT_OPTIONS:MKRB5_DOC}
-BUILD_DEPENDS+=		texi2dvi:${PORTSDIR}/print/texinfo \
-			dvips:${PORTSDIR}/print/dvipsk-tetex
+BUILD_DEPENDS+=		texi2dvi:print/texinfo \
+			dvips:print/dvipsk-tetex
 INFO=			krb5-admin krb5-install krb5-user
 .endif
 
diff --git a/security/lasso/Makefile b/security/lasso/Makefile
index 2aa856b3cb32..328b312045b6 100644
--- a/security/lasso/Makefile
+++ b/security/lasso/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Free Liberty Alliance Implementation
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xmlsec1:${PORTSDIR}/security/xmlsec1
+BUILD_DEPENDS=	xmlsec1:security/xmlsec1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cpe libtool pathfix pkgconfig
@@ -41,7 +41,7 @@ PLIST_SUB+=	PERL="@comment "
 CONFIGURE_ARGS+=	--enable-php5 \
 		--with-php5-config="${LOCALBASE}/bin/php-config"
 LDFLAGS+=	-L${LOCALBASE}/lib
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libexpat.so:textproc/expat2
 PLIST_SUB+=	PHP5=""
 USE_PHP=	yes
 USE_PHP_BUILD=	yes
diff --git a/security/lastpass-cli/Makefile b/security/lastpass-cli/Makefile
index 045e9851663d..b0a867a94a0e 100644
--- a/security/lastpass-cli/Makefile
+++ b/security/lastpass-cli/Makefile
@@ -12,7 +12,7 @@ COMMENT=	LastPass command line interface tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake pkgconfig
 USE_GNOME=	libxml2
@@ -30,15 +30,15 @@ PINENTRY_DESC=		Use pinentry for password entry
 XCLIP_DESC=		Use xclip for interacting with X11 clipboard
 XSEL_DESC=		Use xsel for interacting with X11 clipboard
 
-MANPAGES_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			xmlto:${PORTSDIR}/textproc/xmlto
+MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			xmlto:textproc/xmlto
 MANPAGES_ALL_TARGET=	all doc-man
 MANPAGES_INSTALL_TARGET=install install-doc
 MANPAGES_PLIST_FILES=	${MANPREFIX}/man/man1/lpass.1.gz
 
-PINENTRY_RUN_DEPENDS=	pinentry:${PORTSDIR}/security/pinentry
-XCLIP_RUN_DEPENDS=	xclip:${PORTSDIR}/x11/xclip
-XSEL_RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel
+PINENTRY_RUN_DEPENDS=	pinentry:security/pinentry
+XCLIP_RUN_DEPENDS=	xclip:x11/xclip
+XSEL_RUN_DEPENDS=	xsel:x11/xsel
 
 post-extract:
 	@${REINPLACE_CMD} -e 's/-Wno-language-extension-token//g' \
diff --git a/security/letsencrypt.sh/Makefile b/security/letsencrypt.sh/Makefile
index aaee5ffd440d..25bce68d7e9b 100644
--- a/security/letsencrypt.sh/Makefile
+++ b/security/letsencrypt.sh/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Pure BASH/ZSH Lets Encrypt client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	curl:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lukas2511
@@ -27,8 +27,8 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		shebangfix
 
-BASH_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-ZSH_RUN_DEPENDS=	zsh:${PORTSDIR}/shells/zsh
+BASH_RUN_DEPENDS=	bash:shells/bash
+ZSH_RUN_DEPENDS=	zsh:shells/zsh
 
 PERIODIC_DIRS=	etc/periodic/weekly
 PERIODIC_FILES=	000.letsencrypt.sh
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index 5eb50ac71561..b1498fe2dbd7 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	IPC library used by GnuPG and gpgme
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS=	libgpg-error.so:security/libgpg-error
 
 USES=		libtool tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/security/libbeid/Makefile b/security/libbeid/Makefile
index ec38115c176f..d83daf603d74 100644
--- a/security/libbeid/Makefile
+++ b/security/libbeid/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Belgian eID PKCS #11 module
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Fedict
diff --git a/security/libbzrtp/Makefile b/security/libbzrtp/Makefile
index a0d66687e59e..4aca0f985577 100644
--- a/security/libbzrtp/Makefile
+++ b/security/libbzrtp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ZRTP support library (RFC 6189)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --disable-strict \
diff --git a/security/libcryptui/Makefile b/security/libcryptui/Makefile
index 6b2c8fe21fc9..107d3848dd41 100644
--- a/security/libcryptui/Makefile
+++ b/security/libcryptui/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	seahorse>=3.0.0:${PORTSDIR}/security/seahorse \
-		gpg:${PORTSDIR}/security/gnupg
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
-RUN_DEPENDS=	seahorse>=3.0.0:${PORTSDIR}/security/seahorse \
-		gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS=	seahorse>=3.0.0:security/seahorse \
+		gpg:security/gnupg
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgnome-keyring.so:security/libgnome-keyring
+RUN_DEPENDS=	seahorse>=3.0.0:security/seahorse \
+		gpg:security/gnupg
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack gnomeprefix gtk30 introspection:build
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	NOTIFY
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	libnotify.so:devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
diff --git a/security/libecc/Makefile b/security/libecc/Makefile
index d654f737865f..d239934e6ff5 100644
--- a/security/libecc/Makefile
+++ b/security/libecc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	C++ Elliptic Curve Library
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index b409e1b6de43..04c41de7e714 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://people.freedesktop.org/~hadess/
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Library for fingerprint reader devices
 
-LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libnss3.so:${PORTSDIR}/security/nss
+LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick \
+		libnss3.so:security/nss
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig tar:xz
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index c79c5d55a52c..bcce006d0a1e 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -12,8 +12,8 @@ COMMENT=	General purpose crypto library based on code used in GnuPG
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
-RUN_DEPENDS=	libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error
+BUILD_DEPENDS=	libgpg-error>=1.8:security/libgpg-error
+RUN_DEPENDS=	libgpg-error>=1.8:security/libgpg-error
 
 USES=		cpe libtool makeinfo tar:bzip2
 CPE_VENDOR=	gnupg
diff --git a/security/libgnome-keyring/Makefile b/security/libgnome-keyring/Makefile
index c12283e855f6..6ebd6a5cffdc 100644
--- a/security/libgnome-keyring/Makefile
+++ b/security/libgnome-keyring/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Program that keeps passwords and other secrets
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libgcrypt.so:security/libgcrypt
 
 USE_GNOME=	glib20 gnomeprefix intlhack \
 		introspection:build
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 92251dd091f3..c16a1cb10e5d 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library for encapsulating/safekeeping data in encrypted/compressed form
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
-		libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt \
+		libmhash.so:security/mhash
 
 USES=		tar:bzip2 libtool
 GNU_CONFIGURE=	yes
diff --git a/security/libkpass/Makefile b/security/libkpass/Makefile
index 22e6785e002e..e94dd00dd265 100644
--- a/security/libkpass/Makefile
+++ b/security/libkpass/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for a reading/writing KeePass 1.x DB
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle
+LIB_DEPENDS=	libnettle.so:security/nettle
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 8baa100121c8..4acc6786f2a2 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -12,7 +12,7 @@ COMMENT=	KSBA is an X.509 Library
 LICENSE=	GPLv2 GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error
+LIB_DEPENDS=	libgpg-error.so:security/libgpg-error
 
 CONFIGURE_ARGS=	--enable-static
 INSTALL_TARGET=	install-strip
diff --git a/security/libotr/Makefile b/security/libotr/Makefile
index b2d91159b25e..00740d3f36f9 100644
--- a/security/libotr/Makefile
+++ b/security/libotr/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Portable OTR Messaging Library and toolkit
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgpg-error.so:security/libgpg-error \
+		libgcrypt.so:security/libgcrypt
 
 CONFLICTS=	libotr3-*
 
diff --git a/security/libotr3/Makefile b/security/libotr3/Makefile
index c5bf7a0a286d..cb534d11eb2a 100644
--- a/security/libotr3/Makefile
+++ b/security/libotr3/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Portable OTR Messaging Library and toolkit
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgpg-error.so:security/libgpg-error \
+		libgcrypt.so:security/libgcrypt
 
 CONFLICTS=	libotr-*
 
diff --git a/security/libp11/Makefile b/security/libp11/Makefile
index 9eeb0ce918f3..eb76971fcbfb 100644
--- a/security/libp11/Makefile
+++ b/security/libp11/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small layer on top of PKCS\#11 API
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 650f1a9ec5a7..f9cc108faadb 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Sensor support library from Prelude SIEM
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt
 
 OPTIONS_DEFINE=	DOCS PERL PYTHON
 OPTIONS_SUB=	yes
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index c6014ec82dcf..5be215e14ca3 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library to access Prelude IDMEF database
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	libprelude.so:security/libprelude
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/security/libpwquality/Makefile b/security/libpwquality/Makefile
index 538179cbff87..68ce809e7258 100644
--- a/security/libpwquality/Makefile
+++ b/security/libpwquality/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	https://fedorahosted.org/releases/l/i/libpwquality/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for generating random passwords and quality checking
 
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+LIB_DEPENDS=	libcrack.so:security/cracklib
 
 USES=		gettext gmake libtool pathfix tar:bzip2
 USE_GNOME=	intltool
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 PYTHON_USES=	python
-PYTHON_BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+PYTHON_BUILD_DEPENDS=	python:lang/python
 PYTHON_CONFIGURE_ENABLE=	python-bindings
 
 post-patch:
diff --git a/security/libsecret/Makefile b/security/libsecret/Makefile
index 073c20016054..8c90c4704672 100644
--- a/security/libsecret/Makefile
+++ b/security/libsecret/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Library to access the secret service API
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		vala:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
+		vala:lang/vala
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 libxslt:build intltool \
diff --git a/security/libsparkcrypto/Makefile b/security/libsparkcrypto/Makefile
index ab2f2325c72e..5a425ab876d2 100644
--- a/security/libsparkcrypto/Makefile
+++ b/security/libsparkcrypto/Makefile
@@ -28,7 +28,7 @@ MAKE_ENV+=	SPARKARCH=${SPARKARCH} \
 
 OPTIONS_DEFINE=		DOCS
 
-DOCS_BUILD_DEPENDS=	adabrowse:${PORTSDIR}/textproc/adabrowse
+DOCS_BUILD_DEPENDS=	adabrowse:textproc/adabrowse
 DOCS_MAKE_ENV_OFF=	NO_APIDOC=true
 
 post-patch:
diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index aa6596326120..6db66e282042 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -26,7 +26,7 @@ CMAKE_ARGS=	-DWITH_EXAMPLES:BOOL=OFF \
 		-DWITH_TESTING:BOOL=OFF \
 		-DWITH_ZLIB:BOOL=ON
 
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CMAKE_ON=	-DWITH_GCRYPT:BOOL=ON
 GCRYPT_CMAKE_OFF=	-DWITH_GCRYPT:BOOL=OFF
 
diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index dd4589e6c0cd..28a6ee26d4c8 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	ZLIB
 TRACE_DESC=	Enable debug packet traces
 
 TRACE_CONFIGURE_ENABLE=	debug
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ON=	--with-libgcrypt --without-openssl
 GCRYPT_CONFIGURE_OFF=	--without-libgcrypt --with-openssl
 GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/security/libtomcrypt/Makefile b/security/libtomcrypt/Makefile
index af1b0a845deb..a6200cb1b512 100644
--- a/security/libtomcrypt/Makefile
+++ b/security/libtomcrypt/Makefile
@@ -31,15 +31,15 @@ OPTIONS_DEFAULT=	LIBTOMMATH
 LIBTOMMATH_DESC=	Use LibTomMath
 TOMSFASTMATH_DESC=	Use TomsFastMath
 
-LIBTOMMATH_BUILD_DEPENDS=	${LOCALBASE}/include/tommath.h:${PORTSDIR}/math/libtommath
+LIBTOMMATH_BUILD_DEPENDS=	${LOCALBASE}/include/tommath.h:math/libtommath
 LIBTOMMATH_CFLAGS=		-DLTM_DESC
 LIBTOMMATH_VARS=		EXTRALIBS+=-ltommath
 
-LIBTOMSFASTMATH_BUILD_DEPENDS=	${LOCALBASE}/include/tfm.h:${PORTSDIR}/math/tomsfastmath
+LIBTOMSFASTMATH_BUILD_DEPENDS=	${LOCALBASE}/include/tfm.h:math/tomsfastmath
 LIBTOMSFASTMATH_CFLAGS=		-DTFM_DESC
 LIBTOMSFASTMATH_VARS=		EXTRALIBS+=-ltfm
 
-GMP_LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=		libgmp.so:math/gmp
 GMP_CFLAGS=			-DGMP_DESC
 GMP_VARS=			EXTRALIBS+=-lgmp
 
diff --git a/security/libuecc/Makefile b/security/libuecc/Makefile
index d17e7fe686c6..bb8c162cbe07 100644
--- a/security/libuecc/Makefile
+++ b/security/libuecc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Very small Elliptic Curve Cryptography library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USE_LDCONFIG=	yes
 
diff --git a/security/log2timeline/Makefile b/security/log2timeline/Makefile
index ad437a51ce25..499da8899d4b 100644
--- a/security/log2timeline/Makefile
+++ b/security/log2timeline/Makefile
@@ -14,28 +14,28 @@ COMMENT=	Log file parser for computer forensic investigations
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-Carp-Assert>=0:${PORTSDIR}/devel/p5-Carp-Assert \
-		p5-Data-Hexify>=0:${PORTSDIR}/devel/p5-Data-Hexify \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Mac-PropertyList>=0:${PORTSDIR}/devel/p5-Mac-PropertyList \
-		p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry \
-		p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket \
-		p5-Digest-CRC>=0:${PORTSDIR}/security/p5-Digest-CRC \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-File-Mork>=0:${PORTSDIR}/www/p5-File-Mork \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-Carp-Assert>=0:devel/p5-Carp-Assert \
+		p5-Data-Hexify>=0:devel/p5-Data-Hexify \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Mac-PropertyList>=0:devel/p5-Mac-PropertyList \
+		p5-Parse-Win32Registry>=0:devel/p5-Parse-Win32Registry \
+		p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
+		p5-Net-Pcap>=0:net/p5-Net-Pcap \
+		p5-NetPacket>=0:net/p5-NetPacket \
+		p5-Digest-CRC>=0:security/p5-Digest-CRC \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-File-Mork>=0:www/p5-File-Mork \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index dd9904530dbe..7c0314fdee8d 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Auditing tool for system logs on Unix boxes
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	mime-construct:${PORTSDIR}/mail/mime-construct \
-		lockfile:${PORTSDIR}/mail/procmail \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	mime-construct:mail/mime-construct \
+		lockfile:mail/procmail \
+		bash:shells/bash
 
 LOGCHECK_USER=	logcheck
 LOGCHECK_GROUP=	${LOGCHECK_USER}
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 0fdaa5d987dc..a7ec771aac03 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Secure (encrypted) remote shell compatible with ssh 2
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liboop.so:${PORTSDIR}/devel/liboop \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libnettle.so:${PORTSDIR}/security/nettle
+LIB_DEPENDS=	liboop.so:devel/liboop \
+		libgmp.so:math/gmp \
+		libnettle.so:security/nettle
 
 BROKEN=		does not build
 BROKEN_FreeBSD_9=	does not build
diff --git a/security/maia/Makefile b/security/maia/Makefile
index 51e0c911930c..ca5585cb3200 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -9,19 +9,19 @@ MASTER_SITES=	http://www.purplehat.org/downloads/maia/
 MAINTAINER=	ek@purplehat.org
 COMMENT=	Web-based management system based on amavisd-new and SpamAssassin
 
-RUN_DEPENDS=	p5-Unix-Syslog>=0.94:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-MIME-Tools>=4.116:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Convert-TNEF>=0.08:${PORTSDIR}/converters/p5-Convert-TNEF \
-		p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
-		p5-Net-CIDR-Lite>=0.18:${PORTSDIR}/net/p5-Net-CIDR-Lite \
-		p5-forks>=0.34:${PORTSDIR}/devel/p5-forks \
-		p5-Archive-Zip>=0.10:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-IO-stringy>=1.203:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-IO-Socket-INET6>=1.27:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Text-CSV>=1.02:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Data-UUID>=1.148:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Template-Toolkit>=2.13:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server
+RUN_DEPENDS=	p5-Unix-Syslog>=0.94:sysutils/p5-Unix-Syslog \
+		p5-MIME-Tools>=4.116:mail/p5-MIME-Tools \
+		p5-Convert-TNEF>=0.08:converters/p5-Convert-TNEF \
+		p5-Convert-UUlib>=1.08,1:converters/p5-Convert-UUlib \
+		p5-Net-CIDR-Lite>=0.18:net/p5-Net-CIDR-Lite \
+		p5-forks>=0.34:devel/p5-forks \
+		p5-Archive-Zip>=0.10:archivers/p5-Archive-Zip \
+		p5-IO-stringy>=1.203:devel/p5-IO-stringy \
+		p5-IO-Socket-INET6>=1.27:net/p5-IO-Socket-INET6 \
+		p5-Text-CSV>=1.02:textproc/p5-Text-CSV \
+		p5-Data-UUID>=1.148:devel/p5-Data-UUID \
+		p5-Template-Toolkit>=2.13:www/p5-Template-Toolkit \
+		p5-Net-Server>=0.93:net/p5-Net-Server
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 USES=		perl5 shebangfix
@@ -107,26 +107,26 @@ USE_PHP=	bcmath ctype dom gettext hash iconv imap json mbstring \
 		mcrypt pdo pdo_sqlite posix session simplexml sockets \
 		sqlite3 tokenizer xml wddx xmlreader xmlwriter xmlrpc
 
-RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime \
-		${PEAR_DIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode \
-		${PEAR_DIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEAR_DIR}/Pager/Pager.php:${PORTSDIR}/devel/pear-Pager \
-		${PEAR_DIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEAR_DIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP \
-		${PEAR_DIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
-		${PEAR_DIR}/HTMLPurifier.php:${PORTSDIR}/devel/pear-htmlpurifier \
-		${PEAR_DIR}/Net/IMAP.php:${PORTSDIR}/mail/pear-Net_IMAP \
-		${PEAR_DIR}/Net/POP3.php:${PORTSDIR}/net/pear-Net_POP3 \
-		${PEAR_DIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \
-		${PEAR_DIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color \
-		${PEAR_DIR}/Image/Canvas.php:${PORTSDIR}/graphics/pear-Image_Canvas \
-		${PEAR_DIR}/Image/Graph.php:${PORTSDIR}/graphics/pear-Image_Graph \
-		${PEAR_DIR}/Numbers/Roman.php:${PORTSDIR}/textproc/pear-Numbers_Roman \
-		${PEAR_DIR}/Numbers/Words.php:${PORTSDIR}/textproc/pear-Numbers_Words \
-		${PEAR_DIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \
-		${PEAR_DIR}/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql \
-		${LOCALBASE}/share/smarty/Smarty.class.php:${PORTSDIR}/www/smarty2 \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:${PORTSDIR}/security/pecl-scrypt
+RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime \
+		${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode \
+		${PEAR_DIR}/DB.php:databases/pear-DB \
+		${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager \
+		${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP \
+		${PEAR_DIR}/Log.php:sysutils/pear-Log \
+		${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier \
+		${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP \
+		${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3 \
+		${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL \
+		${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color \
+		${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas \
+		${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph \
+		${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman \
+		${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words \
+		${PEAR_DIR}/MDB2.php:databases/pear-MDB2 \
+		${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql \
+		${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt
 PLIST_SUB+=     WEBHOST=""
 .else
 PLIST_SUB+=     WEBHOST="@comment "
@@ -147,11 +147,11 @@ USE_PHP+=	pgsql
 .endif
 
 .if ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MMYSQLSERVER}
@@ -159,7 +159,7 @@ USE_MYSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MPGSQLSERVER}
@@ -172,66 +172,66 @@ BROKEN=Please run 'make config' again and choose only one version of Dovecot. Bo
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT}
-RUN_DEPENDS+=	dovecot:${PORTSDIR}/mail/dovecot
+RUN_DEPENDS+=	dovecot:mail/dovecot
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT2}
-RUN_DEPENDS+=	dovecot:${PORTSDIR}/mail/dovecot2
+RUN_DEPENDS+=	dovecot:mail/dovecot2
 .endif
 
 .if ${PORT_OPTIONS:MPOSTFIX}
-RUN_DEPENDS+=	postfix:${PORTSDIR}/mail/postfix
+RUN_DEPENDS+=	postfix:mail/postfix
 .endif
 
 .if ${PORT_OPTIONS:MPFA}
-RUN_DEPENDS+=	${LOCALBASE}/www/postfixadmin/config.inc.php:${PORTSDIR}/mail/postfixadmin
+RUN_DEPENDS+=	${LOCALBASE}/www/postfixadmin/config.inc.php:mail/postfixadmin
 .endif
 
 .if ${PORT_OPTIONS:MFUZZYOCR}
-RUN_DEPENDS+=	p5-FuzzyOcr-devel>=0:${PORTSDIR}/mail/p5-FuzzyOcr-devel
+RUN_DEPENDS+=	p5-FuzzyOcr-devel>=0:mail/p5-FuzzyOcr-devel
 .endif
 
 .if ${PORT_OPTIONS:MCLAMAV}
-RUN_DEPENDS+=	clamd:${PORTSDIR}/security/clamav
+RUN_DEPENDS+=	clamd:security/clamav
 .endif
 
 .if ${PORT_OPTIONS:MSPAMASSASSIN}
-RUN_DEPENDS+=	spamassassin>=0:${PORTSDIR}/mail/spamassassin
+RUN_DEPENDS+=	spamassassin>=0:mail/spamassassin
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
-RUN_DEPENDS+=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
+RUN_DEPENDS+=	p5-BerkeleyDB>=0:databases/p5-BerkeleyDB
 .endif
 
 .if ${PORT_OPTIONS:MALTERMIME}
-RUN_DEPENDS+=	altermime:${PORTSDIR}/mail/altermime
+RUN_DEPENDS+=	altermime:mail/altermime
 .endif
 
 .if ${PORT_OPTIONS:MCRYPT}
-RUN_DEPENDS+=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+RUN_DEPENDS+=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 .endif
 
 .if ${PORT_OPTIONS:MIPCOUNTRY}
-RUN_DEPENDS+=	p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
+RUN_DEPENDS+=	p5-IP-Country>=0:net/p5-IP-Country
 .endif
 
 .if ${PORT_OPTIONS:MDOMAINKEYS}
-RUN_DEPENDS+=	p5-Mail-DomainKeys>=0:${PORTSDIR}/mail/p5-Mail-DomainKeys
+RUN_DEPENDS+=	p5-Mail-DomainKeys>=0:mail/p5-Mail-DomainKeys
 .endif
 
 .if ${PORT_OPTIONS:MSPF}
-RUN_DEPENDS+=	p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
+RUN_DEPENDS+=	p5-Mail-SPF>=0:mail/p5-Mail-SPF
 .endif
 
 .if ${PORT_OPTIONS:MDKIM}
-RUN_DEPENDS+=	p5-Mail-DKIM>=0:${PORTSDIR}/mail/p5-Mail-DKIM
+RUN_DEPENDS+=	p5-Mail-DKIM>=0:mail/p5-Mail-DKIM
 .endif
 
 .if ${PORT_OPTIONS:MFILE}
 # security fix, file > 4.21 needed
-RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
+RUN_DEPENDS+=	file>=4.21:sysutils/file
 .endif
 
 # archviers/rar is a 32-bit binary port, we don't want the install to fail
@@ -239,64 +239,64 @@ RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
 # not suit rar.
 .if ${PORT_OPTIONS:MRAR}
 IA32_BINARY_PORT=	yes
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
+RUN_DEPENDS+=	rar:archivers/rar
 .endif
 
 .if ${PORT_OPTIONS:MUNRAR}
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
+RUN_DEPENDS+=	unrar:archivers/unrar
 .endif
 
 .if ${PORT_OPTIONS:MARJ}
-RUN_DEPENDS+=	arj:${PORTSDIR}/archivers/arj
+RUN_DEPENDS+=	arj:archivers/arj
 .endif
 
 .if ${PORT_OPTIONS:MUNARJ}
-RUN_DEPENDS+=	unarj:${PORTSDIR}/archivers/unarj
+RUN_DEPENDS+=	unarj:archivers/unarj
 .endif
 
 .if ${PORT_OPTIONS:MLHA}
-RUN_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
+RUN_DEPENDS+=	lha:archivers/lha
 .endif
 
 .if ${PORT_OPTIONS:MARC}
-RUN_DEPENDS+=	arc:${PORTSDIR}/archivers/arc
+RUN_DEPENDS+=	arc:archivers/arc
 .endif
 
 .if ${PORT_OPTIONS:MNOMARCH}
-RUN_DEPENDS+=	nomarch:${PORTSDIR}/archivers/nomarch
+RUN_DEPENDS+=	nomarch:archivers/nomarch
 .endif
 
 .if ${PORT_OPTIONS:MCAB}
-RUN_DEPENDS+=	cabextract:${PORTSDIR}/archivers/cabextract
+RUN_DEPENDS+=	cabextract:archivers/cabextract
 .endif
 
 .if ${PORT_OPTIONS:MRPM}
-RUN_DEPENDS+=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+RUN_DEPENDS+=	rpm2cpio.pl:archivers/rpm2cpio
 .endif
 
 .if ${PORT_OPTIONS:MZOO}
 # DOS condition in 2.10.1_2
-RUN_DEPENDS+=	zoo>=2.10.1_2:${PORTSDIR}/archivers/zoo
+RUN_DEPENDS+=	zoo>=2.10.1_2:archivers/zoo
 .endif
 
 .if ${PORT_OPTIONS:MUNZOO}
-RUN_DEPENDS+=	unzoo>=4.4_1:${PORTSDIR}/archivers/unzoo
+RUN_DEPENDS+=	unzoo>=4.4_1:archivers/unzoo
 .endif
 
 .if ${PORT_OPTIONS:MLZOP}
-RUN_DEPENDS+=	lzop:${PORTSDIR}/archivers/lzop
+RUN_DEPENDS+=	lzop:archivers/lzop
 .endif
 
 .if ${PORT_OPTIONS:MFREEZE}
-RUN_DEPENDS+=	unfreeze:${PORTSDIR}/archivers/freeze
+RUN_DEPENDS+=	unfreeze:archivers/freeze
 .endif
 
 .if ${PORT_OPTIONS:MP7ZIP}
-RUN_DEPENDS+=	7zr:${PORTSDIR}/archivers/p7zip
+RUN_DEPENDS+=	7zr:archivers/p7zip
 .endif
 
 .if ${PORT_OPTIONS:MTNEF}
-RUN_DEPENDS+=	tnef:${PORTSDIR}/converters/tnef
+RUN_DEPENDS+=	tnef:converters/tnef
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index 1a562ef70238..b3e765d11428 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Simple and intuitive web interface to manage amavisd-new quarantine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:${PORTSDIR}/security/amavisd-new \
-		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime \
-		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket \
-		${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode
+RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:security/amavisd-new \
+		${PEARDIR}/DB.php:databases/pear-DB \
+		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime \
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
+		${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode
 
 PEARDIR?=	${LOCALBASE}/share/pear
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
diff --git a/security/makepasswd/Makefile b/security/makepasswd/Makefile
index 328c4c855714..2dbf372db0f4 100644
--- a/security/makepasswd/Makefile
+++ b/security/makepasswd/Makefile
@@ -24,8 +24,8 @@ USE_PERL5=	run
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS+=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
+RUN_DEPENDS+=	p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Crypt-OpenSSL-Random>=0:security/p5-Crypt-OpenSSL-Random
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/security/massh/Makefile b/security/massh/Makefile
index f4d32346b7ad..82def177c595 100644
--- a/security/massh/Makefile
+++ b/security/massh/Makefile
@@ -16,8 +16,8 @@ BROKEN=		mismatch in distfile checksum
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		ambit:${PORTSDIR}/shells/ambit
+RUN_DEPENDS=	bash:shells/bash \
+		ambit:shells/ambit
 
 MASSHDIR?=	/var/spool/massh
 NO_BUILD=	yes
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 9e88a89e860e..23a8fde51dbb 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	SF/${PORTNAME}/MCrypt/${PORTVERSION} \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Replacement for crypt(1)
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
-		libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt \
+		libmhash.so:security/mhash
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/security/medusa/Makefile b/security/medusa/Makefile
index 2bb8b1c96a1e..4db5d911c796 100644
--- a/security/medusa/Makefile
+++ b/security/medusa/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Speedy, massively parallel, modular, login brute-forcer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIB_DEPENDS=	libssh2.so:security/libssh2
 
 BROKEN_ia64=	Does not build on ia64
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--enable-module-ncp=no --enable-module-afp=no
 OPTIONS_DEFINE=	SVN PGSQL DOCS
 OPTIONS_SUB=	yes
 
-SVN_LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
+SVN_LIB_DEPENDS=	libsvn_client-1.so:devel/subversion
 SVN_CFLAGS=		-I${LOCALBASE}/include/subversion-1 -I${LOCALBASE}/include/apr-1
 SVN_CONFIGURE_OFF=	--enable-module-svn=no
 
diff --git a/security/meek/Makefile b/security/meek/Makefile
index 5240372c84cf..4023efafa7a3 100644
--- a/security/meek/Makefile
+++ b/security/meek/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://c-s.li/ports/
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Pluggable transport proxy that relays through third-party server
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/git.torproject.org/pluggable-transports/goptlib.git.a:${PORTSDIR}/security/goptlib
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/git.torproject.org/pluggable-transports/goptlib.git.a:security/goptlib
 
 PLIST_FILES=	bin/meek-client bin/meek-server man/man1/meek-client.1.gz man/man1/meek-server.1.gz
 SUB_FILES=	pkg-message
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index d324732312ee..ce9fba2bcca4 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -12,28 +12,28 @@ COMMENT=	Exploit-Framework for Penetration-Testing
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
-		nmap:${PORTSDIR}/security/nmap \
-		rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-actionpack>=0:${PORTSDIR}/www/rubygem-actionpack \
-		rubygem-bcrypt>=0:${PORTSDIR}/security/rubygem-bcrypt \
-		rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-jsobfu>=0.2.0:${PORTSDIR}/www/rubygem-jsobfu \
-		rubygem-json>=0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-metasploit-concern>=0.4.0:${PORTSDIR}/security/rubygem-metasploit-concern \
-		rubygem-metasploit-model>=0.29.0:${PORTSDIR}/security/rubygem-metasploit-model \
-		rubygem-metasploit-payloads>=0.0.3:${PORTSDIR}/security/rubygem-metasploit-payloads \
-		rubygem-msgpack>=0:${PORTSDIR}/devel/rubygem-msgpack \
-		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-network_interface>=0.0.1:${PORTSDIR}/net/rubygem-network_interface \
-		rubygem-packetfu>=1.1.9:${PORTSDIR}/net/rubygem-packetfu \
-		rubygem-pcaprub>=0:${PORTSDIR}/net/rubygem-pcaprub \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-recog>=1.0:${PORTSDIR}/security/rubygem-recog \
-		rubygem-robots>=0:${PORTSDIR}/www/rubygem-robots \
-		rubygem-rubyzip>=1.1:${PORTSDIR}/archivers/rubygem-rubyzip \
-		rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3 \
-		rubygem-tzinfo03>=0:${PORTSDIR}/devel/rubygem-tzinfo03
+RUN_DEPENDS=	nasm:devel/nasm \
+		nmap:security/nmap \
+		rubygem-activesupport>=3.0.0:devel/rubygem-activesupport \
+		rubygem-actionpack>=0:www/rubygem-actionpack \
+		rubygem-bcrypt>=0:security/rubygem-bcrypt \
+		rubygem-bundler>=0:sysutils/rubygem-bundler \
+		rubygem-jsobfu>=0.2.0:www/rubygem-jsobfu \
+		rubygem-json>=0:devel/rubygem-json \
+		rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-concern \
+		rubygem-metasploit-model>=0.29.0:security/rubygem-metasploit-model \
+		rubygem-metasploit-payloads>=0.0.3:security/rubygem-metasploit-payloads \
+		rubygem-msgpack>=0:devel/rubygem-msgpack \
+		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
+		rubygem-network_interface>=0.0.1:net/rubygem-network_interface \
+		rubygem-packetfu>=1.1.9:net/rubygem-packetfu \
+		rubygem-pcaprub>=0:net/rubygem-pcaprub \
+		rubygem-railties>=3.0.0:www/rubygem-railties \
+		rubygem-recog>=1.0:security/rubygem-recog \
+		rubygem-robots>=0:www/rubygem-robots \
+		rubygem-rubyzip>=1.1:archivers/rubygem-rubyzip \
+		rubygem-sqlite3>=0:databases/rubygem-sqlite3 \
+		rubygem-tzinfo03>=0:devel/rubygem-tzinfo03
 
 SCRIPTS=	msfbinscan msfcli msfconsole msfd msfelfscan msfencode \
 		msfmachscan msfpayload msfpescan msfrop msfrpc msfrpcd msfvenom
@@ -61,10 +61,10 @@ OPTIONS_DEFINE=	DB
 OPTIONS_DEFAULT=DB
 DB_DESC=	Database support
 
-DB_RUN_DEPENDS=	rubygem-activerecord>=3.0.0:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-metasploit-credential>=0.14.5:${PORTSDIR}/security/rubygem-metasploit-credential \
-		rubygem-metasploit_data_models>=0.24.0,2:${PORTSDIR}/security/rubygem-metasploit_data_models \
-		rubygem-pg>=0.11:${PORTSDIR}/databases/rubygem-pg
+DB_RUN_DEPENDS=	rubygem-activerecord>=3.0.0:databases/rubygem-activerecord \
+		rubygem-metasploit-credential>=0.14.5:security/rubygem-metasploit-credential \
+		rubygem-metasploit_data_models>=0.24.0,2:security/rubygem-metasploit_data_models \
+		rubygem-pg>=0.11:databases/rubygem-pg
 
 post-patch:
 	${REINPLACE_CMD} 's,git ls-files,find . ! -type d | sed "s|^./||", ; \
diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index f2de0e3295ec..519bee93110b 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -12,11 +12,11 @@ DISTFILES=	${PORTNAME}_${DISTVERSION}.orig.tar.gz
 MAINTAINER=	anarcat@koumbit.org
 COMMENT=	Use the OpenPGP web of trust to verify ssh connections
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
-		lockfile:${PORTSDIR}/mail/procmail \
-		bash:${PORTSDIR}/shells/bash \
-		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	gpg:security/gnupg1 \
+		lockfile:mail/procmail \
+		bash:shells/bash \
+		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 USES=		shebangfix
 SHEBANG_FILES=	src/share/checkperms src/transitions/0.23 \
diff --git a/security/mussh/Makefile b/security/mussh/Makefile
index 7403a09980e9..e20fbab02924 100644
--- a/security/mussh/Makefile
+++ b/security/mussh/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for easily running the same commands on multiple hosts
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 7ca896b7659a..ddcd11745952 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Nessus Attack Scripting Language
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnessus.so:${PORTSDIR}/security/nessus-libraries
+LIB_DEPENDS=	libnessus.so:security/nessus-libraries
 
 DEPRECATED=	Abandoned, consider using OpenVAS
 EXPIRATION_DATE=2016-09-30
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 94d411ace567..c6bdd35eed86 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -16,9 +16,9 @@ DIST_SUBDIR=	nessus
 MAINTAINER=	udo.schweigert@siemens.com
 COMMENT=	Plugins for Nessus, the security scanner
 
-BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus
-RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:${PORTSDIR}/security/nessus \
-		nmap:${PORTSDIR}/security/nmap
+BUILD_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:security/nessus
+RUN_DEPENDS=	${LOCALBASE}/include/nessus/nessus-devel.h:security/nessus \
+		nmap:security/nmap
 
 DEPRECATED=	Abandoned, consider using OpenVAS
 EXPIRATION_DATE=2016-09-30
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 9c8536782d54..5e8ad97536f5 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Security scanner: looks for vulnerabilities in a given network
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnasl.so:${PORTSDIR}/security/nessus-libnasl
+LIB_DEPENDS=	libnasl.so:security/nessus-libnasl
 
 DEPRECATED=	Abandoned, consider using OpenVAS
 EXPIRATION_DATE=2016-09-30
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 718d16ef2a82..8db33ab2c21a 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Low-level cryptographic library
 LICENSE=	LGPL3 GPLv2+
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake makeinfo
 USE_OPENSSL=	yes
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 994e45ba4cc3..805bbe5fc304 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	SSLEAY DOCS
 OPTIONS_DEFAULT=SSLEAY
 SSLEAY_DESC=	Use NET::SSLeay for ssl scanning
-SSLEAY_RUN_DEPENDS=	p5-Net-SSLeay>0:${PORTSDIR}/security/p5-Net-SSLeay
+SSLEAY_RUN_DEPENDS=	p5-Net-SSLeay>0:security/p5-Net-SSLeay
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/security/nmapsi4/Makefile b/security/nmapsi4/Makefile
index e71a844c89cc..7db65fe4d04d 100644
--- a/security/nmapsi4/Makefile
+++ b/security/nmapsi4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GUI frontend for the nmap scanning utility
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	${LOCALBASE}/bin/nmap:security/nmap
 
 USES=		cmake tar:xz
 INSTALLS_ICONS=	yes
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 2b63833dc1f6..90c1342d7696 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RT
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		nspr>=4.12:${PORTSDIR}/devel/nspr \
-		sqlite3>=3.7.15:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	zip:archivers/zip \
+		nspr>=4.12:devel/nspr \
+		sqlite3>=3.7.15:databases/sqlite3
+LIB_DEPENDS=	libnspr4.so:devel/nspr \
+		libsqlite3.so:databases/sqlite3
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss
 
diff --git a/security/nss_compat_ossl/Makefile b/security/nss_compat_ossl/Makefile
index abe66418e3de..883edad3cb47 100644
--- a/security/nss_compat_ossl/Makefile
+++ b/security/nss_compat_ossl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Source-level compatibility library for OpenSSL to NSS porting
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr \
-		libnss3.so:${PORTSDIR}/security/nss
+LIB_DEPENDS=	libnspr4.so:devel/nspr \
+		libnss3.so:security/nss
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig libtool
diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index 3a72651e18e2..08b1da048c10 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -22,8 +22,8 @@ PSKC_DESC=	Portable Symmetric Key Container (RFC 6030) support
 
 PSKC_CONFIGURE_ENABLE=	pskc
 PSKC_CONFIGURE_ON=	--with-xml-prefix=${LOCALBASE}
-PSKC_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-			libxmlsec1.so:${PORTSDIR}/security/xmlsec1
+PSKC_LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+			libxmlsec1.so:security/xmlsec1
 
 DOCS=		AUTHORS ChangeLog NEWS README
 
diff --git a/security/obfsclient/Makefile b/security/obfsclient/Makefile
index 169a37630de9..647db6b2620d 100644
--- a/security/obfsclient/Makefile
+++ b/security/obfsclient/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	security
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Tor-managed pluggable transport client
 
-LIB_DEPENDS=	liballium-1.0.so:${PORTSDIR}/devel/liballium \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	liballium-1.0.so:devel/liballium \
+		libevent.so:devel/libevent2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yawning
diff --git a/security/obfsproxy/Makefile b/security/obfsproxy/Makefile
index abce958baeef..ac74f4a36efc 100644
--- a/security/obfsproxy/Makefile
+++ b/security/obfsproxy/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Pluggable transport proxy
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:${PORTSDIR}/security/py-pyptlib \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
 
 USE_PYTHON=	distutils
 USES=		python twisted
diff --git a/security/oinkmaster/Makefile b/security/oinkmaster/Makefile
index 9ef82c5f2c8d..06043f0f71bc 100644
--- a/security/oinkmaster/Makefile
+++ b/security/oinkmaster/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Help you update your snort rules after each update
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index a59fa78ef183..001d074257bf 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Open Crypto Development Kit
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig tar:bzip2
diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 9004ad56bb2d..aadee7be7447 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Client for Cisco's AnyConnect SSL VPN
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	vpnc-script:${PORTSDIR}/sysutils/vpnc-scripts
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
+RUN_DEPENDS=	vpnc-script:sysutils/vpnc-scripts
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \
@@ -30,11 +30,11 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	PROXY GNUTLS
 
 PROXY_DESC=		Automatic proxy configuration via libproxy
-PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+PROXY_LIB_DEPENDS=	libproxy.so:net/libproxy
 PROXY_CONFIGURE_WITH=	libproxy
 
 GNUTLS_DESC=		Use GnuTLS instead of OpenSSL (experimental)
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_USE_OFF=		OPENSSL=yes
 
diff --git a/security/opencryptoki/Makefile b/security/opencryptoki/Makefile
index 3fe976e9608a..078a97245f37 100644
--- a/security/opencryptoki/Makefile
+++ b/security/opencryptoki/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
+LIB_DEPENDS=	libtspi.so:security/trousers
 
 USES=		alias autoreconf gmake libtool tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
diff --git a/security/openct/Makefile b/security/openct/Makefile
index 72a606d2365b..16b5c625e03c 100644
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Middleware framework for smart card terminals
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	PCSC DOCS
 PCSC_DESC=	Enable PC/SC support
@@ -36,7 +36,7 @@ PORTEXAMPLES=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCSC}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 CONFIGURE_ARGS+=--enable-pcsc
 PLIST_SUB+=	PCSC=""
 .else
diff --git a/security/openpgpsdk/Makefile b/security/openpgpsdk/Makefile
index 84cf9eaa3495..37ce76cd4d1d 100644
--- a/security/openpgpsdk/Makefile
+++ b/security/openpgpsdk/Makefile
@@ -11,8 +11,8 @@ COMMENT=	OpenPGP SDK
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-LIB_DEPENDS=	libcunit.so:${PORTSDIR}/devel/cunit
+BUILD_DEPENDS=	gpg2:security/gnupg
+LIB_DEPENDS=	libcunit.so:devel/cunit
 
 USES=		perl5 shebangfix tar:tgz
 SHEBANG_FILES=	configure util/*.pl
diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile
index 1410bd0ff171..d806c6758fcb 100644
--- a/security/opensaml2/Makefile
+++ b/security/opensaml2/Makefile
@@ -10,12 +10,12 @@ DISTNAME=	opensaml-${PORTVERSION}
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Open source implementation of SAML2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		liblog4shib.so:${PORTSDIR}/devel/log4shib \
-		libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
-		libxmltooling.so:${PORTSDIR}/devel/xmltooling
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		liblog4shib.so:devel/log4shib \
+		libxerces-c.so:textproc/xerces-c3 \
+		libxmltooling.so:devel/xmltooling
 
-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} \
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 31d05c1a7d09..0f6ebc903e91 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -36,8 +36,8 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 CONFIGURE_ENV+=	XSLTPROC="${LOCALBASE}/bin/xsltproc"
 CONFIGURE_ARGS+=--with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook
 .else
@@ -53,12 +53,12 @@ PLIST_SUB+=	MANPAGES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENCT}
-LIB_DEPENDS+=	libopenct.so:${PORTSDIR}/security/openct
+LIB_DEPENDS+=	libopenct.so:security/openct
 CONFIGURE_ARGS+=--enable-openct
 .endif
 
 .if ${PORT_OPTIONS:MPCSC}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 .else
 CONFIGURE_ARGS+=--disable-pcsc
 .endif
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index c66f4367d302..1412c81347cc 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -50,7 +50,7 @@ OPTIONS_SUB=		yes
 TCP_WRAPPERS_EXTRA_PATCHES=${FILESDIR}/extra-patch-tcpwrappers
 
 LDNS_CONFIGURE_WITH=	ldns
-LDNS_LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+LDNS_LIB_DEPENDS=	libldns.so:dns/ldns
 LDNS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-ldns
 LDNS_CFLAGS=		-I${LOCALBASE}/include
 LDNS_CONFIGURE_ON=	--with-ldflags='-L${LOCALBASE}/lib'
@@ -70,8 +70,8 @@ SCTP_PATCHFILES=	${PORTNAME}-6.8p1-sctp-2573.patch.gz:-p1
 SCTP_CONFIGURE_WITH=	sctp
 SCTP_BROKEN=		SCTP does not apply with 7.2+
 
-MIT_LIB_DEPENDS=		libkrb5.so.3:${PORTSDIR}/security/krb5
-HEIMDAL_LIB_DEPENDS=		libkrb5.so.26:${PORTSDIR}/security/heimdal
+MIT_LIB_DEPENDS=		libkrb5.so.3:security/krb5
+HEIMDAL_LIB_DEPENDS=		libkrb5.so.26:security/heimdal
 
 PAM_CONFIGURE_WITH=	pam
 TCP_WRAPPERS_CONFIGURE_WITH=	tcp-wrappers
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 6640c589e9a5..473318137540 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -54,7 +54,7 @@ EXPCIPHERS_DESC?=	Include experimental ciphers
 EC_DESC?=	Optimize NIST elliptic curves
 MAN3_DESC?=	Install API manpages (section 3)
 
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for fetch
diff --git a/security/openssl_tpm_engine/Makefile b/security/openssl_tpm_engine/Makefile
index dccc565687e2..7971f9bc6eee 100644
--- a/security/openssl_tpm_engine/Makefile
+++ b/security/openssl_tpm_engine/Makefile
@@ -13,8 +13,8 @@ COMMENT=	OpenSSL TPM engine
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:${PORTSDIR}/security/trousers
-LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
+RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:security/trousers
+LIB_DEPENDS=	libtspi.so:security/trousers
 
 USES=		autoreconf gmake libtool
 USE_LDCONFIG=	yes
diff --git a/security/openvas-cli/Makefile b/security/openvas-cli/Makefile
index d23402b11292..62cd8f406827 100644
--- a/security/openvas-cli/Makefile
+++ b/security/openvas-cli/Makefile
@@ -12,8 +12,8 @@ COMMENT=	OpenVAS command-line interface and Nagios plugin
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libopenvas_base.so:${PORTSDIR}/security/openvas-libraries
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libopenvas_base.so:security/openvas-libraries
 
 CFLAGS+=	-Wno-missing-field-initializers
 USES=		cmake:outsource gnome pkgconfig
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index def0180058e8..59d4a4f83fa2 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -13,14 +13,14 @@ COMMENT=	OpenVAS libraries
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.GPLv2
 
-LIB_DEPENDS=	libhiredis.so:${PORTSDIR}/databases/hiredis \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libksba.so:${PORTSDIR}/security/libksba \
-		libssh.so:${PORTSDIR}/security/libssh
+LIB_DEPENDS=	libhiredis.so:databases/hiredis \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libnetsnmp.so:net-mgmt/net-snmp \
+		libgnutls.so:security/gnutls \
+		libgpgme.so:security/gpgme \
+		libgcrypt.so:security/libgcrypt \
+		libksba.so:security/libksba \
+		libssh.so:security/libssh
 
 USES=		bison cmake:outsource gnome pkgconfig
 USE_LDCONFIG=	yes
@@ -33,6 +33,6 @@ LDAP_CMAKE_OFF=	-DBUILD_WITHOUT_LDAP=1
 LDAP_USE=	OPENLDAP=yes
 
 RADIUS_CMAKE_ON=-DBUILD_WITH_RADIUS=1
-RADIUS_LIB_DEPENDS=	libfreeradius-client.so:${PORTSDIR}/net/freeradius-client
+RADIUS_LIB_DEPENDS=	libfreeradius-client.so:net/freeradius-client
 
 .include <bsd.port.mk>
diff --git a/security/openvas-manager/Makefile b/security/openvas-manager/Makefile
index 107f4ceda275..2198b8434bdc 100644
--- a/security/openvas-manager/Makefile
+++ b/security/openvas-manager/Makefile
@@ -12,10 +12,10 @@ COMMENT=	OpenVAS manager
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libopenvas_base.so:${PORTSDIR}/security/openvas-libraries
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgpgme.so:security/gpgme \
+		libgcrypt.so:security/libgcrypt \
+		libopenvas_base.so:security/openvas-libraries
 
 USES=		cmake:outsource execinfo gnome pkgconfig sqlite
 USE_GNOME=	glib20
diff --git a/security/openvas-scanner/Makefile b/security/openvas-scanner/Makefile
index 730b57b38119..273254c54d89 100644
--- a/security/openvas-scanner/Makefile
+++ b/security/openvas-scanner/Makefile
@@ -12,11 +12,11 @@ COMMENT=	OpenVAS scanner
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.GPLv2
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libopenvas_base.so:${PORTSDIR}/security/openvas-libraries
-RUN_DEPENDS=	redis-server:${PORTSDIR}/databases/redis \
-		curl:${PORTSDIR}/ftp/curl \
-		rsync:${PORTSDIR}/net/rsync
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libopenvas_base.so:security/openvas-libraries
+RUN_DEPENDS=	redis-server:databases/redis \
+		curl:ftp/curl \
+		rsync:net/rsync
 
 USES=		cmake:outsource execinfo gettext-runtime gnome pkgconfig
 USE_GNOME=	glib20
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index 1f87427fcec1..e56a5d80be32 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GUI frontend to openvpn
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	openvpn:${PORTSDIR}/security/openvpn
+RUN_DEPENDS=	openvpn:security/openvpn
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index d1a12fea9a5e..30bafaccfb12 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -14,9 +14,9 @@ COMMENT=	LDAP authentication plugin for OpenVPN
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c \
-		${NONEXISTENT}:${PORTSDIR}/security/openvpn:extract \
-		libcheck>=0:${PORTSDIR}/devel/libcheck
+BUILD_DEPENDS=	re2c:devel/re2c \
+		${NONEXISTENT}:security/openvpn:extract \
+		libcheck>=0:devel/libcheck
 
 USES=		objc tar:xz
 
diff --git a/security/openvpn-auth-radius/Makefile b/security/openvpn-auth-radius/Makefile
index cac00a1ac743..0dc3700d335e 100644
--- a/security/openvpn-auth-radius/Makefile
+++ b/security/openvpn-auth-radius/Makefile
@@ -14,8 +14,8 @@ COMMENT=	RADIUS authentication plugin for OpenVPN
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+RUN_DEPENDS=	${LOCALBASE}/sbin/openvpn:security/openvpn
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USES=		gmake
 MAKEFILE=	Makefile.bsd
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index 454a739dd284..9cc726ce9435 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -36,19 +36,19 @@ PKCS11_DESC=		Use security/pkcs11-helper
 EASYRSA_DESC=		Install security/easy-rsa RSA helper package
 POLARSSL_DESC=		SSL/TLS support via PolarSSL
 
-EASYRSA_RUN_DEPENDS=	easy-rsa>=0:${PORTSDIR}/security/easy-rsa
+EASYRSA_RUN_DEPENDS=	easy-rsa>=0:security/easy-rsa
 
-PKCS11_LIB_DEPENDS=	libpkcs11-helper.so:${PORTSDIR}/security/pkcs11-helper
+PKCS11_LIB_DEPENDS=	libpkcs11-helper.so:security/pkcs11-helper
 PKCS11_CONFIGURE_ENABLE=	pkcs11
 
 PW_SAVE_CONFIGURE_ENABLE=	password-save
 
-POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
 POLARSSL_CONFIGURE_ON=	--with-crypto-library=polarssl
 POLARSSL_USE_OFF=	openssl=yes
 POLARSSL_CONFIGURE_OFF+=--with-crypto-library=openssl
 
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_ENABLE=	lzo
 
 USE_RC_SUBR=	openvpn
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index a4861f7a09bd..2ff626823032 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -41,9 +41,9 @@ POLARSSL_DESC=		SSL/TLS via PolarSSL (mbedTLS) 1.3.8+ (not 2.x)
 TUNNELBLICK_DESC=	Tunnelblick XOR scramble patch (READ HELP!)
 X509ALTUSERNAME_DESC=	Enable --x509-username-field (OpenSSL only)
 
-EASYRSA_RUN_DEPENDS=	easy-rsa>=0:${PORTSDIR}/security/easy-rsa
+EASYRSA_RUN_DEPENDS=	easy-rsa>=0:security/easy-rsa
 
-PKCS11_LIB_DEPENDS=	libpkcs11-helper.so:${PORTSDIR}/security/pkcs11-helper
+PKCS11_LIB_DEPENDS=	libpkcs11-helper.so:security/pkcs11-helper
 PKCS11_CONFIGURE_ENABLE=	pkcs11
 
 TUNNELBLICK_EXTRA_PATCHES=	${FILESDIR}/extra-tunnelblick-openvpn_xorpatch
@@ -59,7 +59,7 @@ OPENSSL_CONFIGURE_ON=	--with-crypto-library=openssl
 # Pin the libmbedtls version because the 2.3.x port can't work with .so.10 or
 # newer from the security/mbedtls package. Upstream works in progress
 # for OpenVPN 2.4 to use mbedTLS 2.X.
-POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
 POLARSSL_CONFIGURE_ON=	--with-crypto-library=polarssl
 
 USE_RC_SUBR=		openvpn
@@ -71,7 +71,7 @@ SUB_FILES=		pkg-message openvpn-client
 CFLAGS+=		-DLOG_OPENVPN=${LOG_OPENVPN}
 .endif
 
-LIB_DEPENDS+=		liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS+=		liblzo2.so:archivers/lzo2
 
 PORTDOCS=		*
 PORTEXAMPLES=		*
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index 27fcd4282403..463a295296f5 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Windows password cracker based on rainbow tables
 LICENSE=	APACHE20 GPLv2
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-gui
 .endif
 
 .if ${PORT_OPTIONS:MGRAPH}
-LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS+=	libqwt.so:x11-toolkits/qwt5
 .else
 CONFIGURE_ARGS+=	--disable-graph
 .endif
diff --git a/security/orthrus/Makefile b/security/orthrus/Makefile
index 5ac41b9a5011..213c2077bfc2 100644
--- a/security/orthrus/Makefile
+++ b/security/orthrus/Makefile
@@ -14,7 +14,7 @@ COMMENT=	One-Time Password System (OTP) alternative to OPIE or S/Key
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
+LIB_DEPENDS=	libapr-1.so:devel/apr1
 
 USES=		iconv scons tar:bzip2
 MAKE_ARGS=	DEBUG=False --install-sandbox=${STAGEDIR}
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 05fa3588058c..08ce269d4980 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -26,7 +26,7 @@ CLI_DESC=	Management CLI
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+=	libreadline.so.6:${PORTSDIR}/devel/readline
+LIB_DEPENDS+=	libreadline.so.6:devel/readline
 .endif
 
 post-build-PRINTDB-on:
diff --git a/security/osslsigncode/Makefile b/security/osslsigncode/Makefile
index eb2fd4e6b0f4..73e4abe63949 100644
--- a/security/osslsigncode/Makefile
+++ b/security/osslsigncode/Makefile
@@ -18,10 +18,10 @@ USE_OPENSSL=	yes
 OPTIONS_DEFINE=		CURL GSF
 OPTIONS_DEFAULT=	CURL GSF
 CURL_CONFIGURE_WITH=	curl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 GSF_DESC?=		GSF support (enables signing of e.g. MSI files)
 GSF_CONFIGURE_WITH=	gsf
-GSF_LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
+GSF_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 
 post-patch:
 	${TOUCH} ${WRKSRC}/stamp-h1 ${WRKSRC}/config.h.in
diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile
index 257df33bde34..2e14d8986b2c 100644
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	http://p11-glue.freedesktop.org/releases/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Library for loading and enumerating of PKCS\#11 modules
 
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-LIB_DEPENDS=	libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libffi.so:${PORTSDIR}/devel/libffi
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
+		libffi.so:devel/libffi
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-debug=no \
diff --git a/security/p5-Apache-Htpasswd/Makefile b/security/p5-Apache-Htpasswd/Makefile
index 1bb341b8f666..d5a8eabaa4e5 100644
--- a/security/p5-Apache-Htpasswd/Makefile
+++ b/security/p5-Apache-Htpasswd/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Manage Unix crypt-style password file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Digest-SHA1>=2.0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Digest-SHA1>=2.0:security/p5-Digest-SHA1 \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-App-Genpass/Makefile b/security/p5-App-Genpass/Makefile
index 18ed1cf05ea2..1c1dbd506e22 100644
--- a/security/p5-App-Genpass/Makefile
+++ b/security/p5-App-Genpass/Makefile
@@ -15,15 +15,15 @@ COMMENT=	Quickly and easily create secure passwords
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-List-AllUtils>=0:${PORTSDIR}/devel/p5-List-AllUtils \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-MooX-Types-MooseLike>=0:${PORTSDIR}/devel/p5-MooX-Types-MooseLike \
-		p5-namespace-clean>=0.20:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Config-Any>=0:devel/p5-Config-Any \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-List-AllUtils>=0:devel/p5-List-AllUtils \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-MooX-Types-MooseLike>=0:devel/p5-MooX-Types-MooseLike \
+		p5-namespace-clean>=0.20:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/security/p5-App-TLSMe/Makefile b/security/p5-App-TLSMe/Makefile
index 002192708d9e..eb9d74372a08 100644
--- a/security/p5-App-TLSMe/Makefile
+++ b/security/p5-App-TLSMe/Makefile
@@ -12,11 +12,11 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for TLS/SSL tunnel
 
 RUN_DEPENDS=	\
-	p5-AnyEvent>=5.34:${PORTSDIR}/devel/p5-AnyEvent \
-	p5-Net-SSLeay>0:${PORTSDIR}/security/p5-Net-SSLeay \
-	p5-Proc-Pidfile>0:${PORTSDIR}/devel/p5-Proc-Pidfile
+	p5-AnyEvent>=5.34:devel/p5-AnyEvent \
+	p5-Net-SSLeay>0:security/p5-Net-SSLeay \
+	p5-Proc-Pidfile>0:devel/p5-Proc-Pidfile
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Auth-YubikeyDecrypter/Makefile b/security/p5-Auth-YubikeyDecrypter/Makefile
index 1a0569fa14a6..0fde3b705fbb 100644
--- a/security/p5-Auth-YubikeyDecrypter/Makefile
+++ b/security/p5-Auth-YubikeyDecrypter/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	Auth-Yubikey_Decrypter-${PORTVERSION}
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Decrypting the output from the yubikey token
 
-RUN_DEPENDS=	p5-Crypt-Rijndael>=1:${PORTSDIR}/security/p5-Crypt-Rijndael
+RUN_DEPENDS=	p5-Crypt-Rijndael>=1:security/p5-Crypt-Rijndael
 
 LICENSE=	GPLv2
 USES=		perl5
diff --git a/security/p5-AuthCAS/Makefile b/security/p5-AuthCAS/Makefile
index 0506f1384f1a..356d75e049fa 100644
--- a/security/p5-AuthCAS/Makefile
+++ b/security/p5-AuthCAS/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl API to Yale's Central Authentication System (CAS)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/security/p5-Authen-Bitcard/Makefile b/security/p5-Authen-Bitcard/Makefile
index 3c562803d403..194fa8fd2bb0 100644
--- a/security/p5-Authen-Bitcard/Makefile
+++ b/security/p5-Authen-Bitcard/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Bitcard authentication verification
 
-RUN_DEPENDS=	p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-JSON>=2.12:${PORTSDIR}/converters/p5-JSON \
-		p5-URI>=1.22:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-JSON>=2.12:converters/p5-JSON \
+		p5-URI>=1.22:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Authen-Captcha/Makefile b/security/p5-Authen-Captcha/Makefile
index b8572acd5103..4d39360fce88 100644
--- a/security/p5-Authen-Captcha/Makefile
+++ b/security/p5-Authen-Captcha/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl module to verify the human element in transactions
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-DecHpwd/Makefile b/security/p5-Authen-DecHpwd/Makefile
index 5e6f0e91d404..70d658564eec 100644
--- a/security/p5-Authen-DecHpwd/Makefile
+++ b/security/p5-Authen-DecHpwd/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl module for DEC VMS password hashing
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Integer>=0:${PORTSDIR}/devel/p5-Data-Integer \
-		p5-Digest-CRC>=0:${PORTSDIR}/security/p5-Digest-CRC \
-		p5-Scalar-String>=0:${PORTSDIR}/devel/p5-Scalar-String
+BUILD_DEPENDS=	p5-Data-Integer>=0:devel/p5-Data-Integer \
+		p5-Digest-CRC>=0:security/p5-Digest-CRC \
+		p5-Scalar-String>=0:devel/p5-Scalar-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Htpasswd/Makefile b/security/p5-Authen-Htpasswd/Makefile
index ffd7cf62c192..1b07d36d5e74 100644
--- a/security/p5-Authen-Htpasswd/Makefile
+++ b/security/p5-Authen-Htpasswd/Makefile
@@ -12,10 +12,10 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Authen::Htpasswd - interface to read and modify Apache .htpasswd files
 TAGS=		apache authentication pass password md5 sha1 crypto
 
-COMMON_DEPENDS=	p5-IO-LockedFile>=0:${PORTSDIR}/devel/p5-IO-LockedFile \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+COMMON_DEPENDS=	p5-IO-LockedFile>=0:devel/p5-IO-LockedFile \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/security/p5-Authen-Libwrap/Makefile b/security/p5-Authen-Libwrap/Makefile
index d869768fb2c6..62270ef2bf00 100644
--- a/security/p5-Authen-Libwrap/Makefile
+++ b/security/p5-Authen-Libwrap/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Authen::Libwrap - access to TCP Wrappers library
 
-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/security/p5-Authen-NTLM/Makefile b/security/p5-Authen-NTLM/Makefile
index e71a6e6fbee0..54f34f2aa18a 100644
--- a/security/p5-Authen-NTLM/Makefile
+++ b/security/p5-Authen-NTLM/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME:C/.*-//}-${PORTVERSION}
 MAINTAINER=	james@divide.org
 COMMENT=	Perl5 NTLM authentication module
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
-RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC
+BUILD_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC
+RUN_DEPENDS=	p5-Digest-HMAC>=0:security/p5-Digest-HMAC
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Authen-OATH/Makefile b/security/p5-Authen-OATH/Makefile
index 5ed2c0968ebf..331ccbadb113 100644
--- a/security/p5-Authen-OATH/Makefile
+++ b/security/p5-Authen-OATH/Makefile
@@ -15,9 +15,9 @@ COMMENT=	OATH one time passwords implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Digest-SHA1>0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Moose>0:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Digest-HMAC>0:security/p5-Digest-HMAC \
+		p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
+		p5-Moose>0:devel/p5-Moose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-PAAS/Makefile b/security/p5-Authen-PAAS/Makefile
index 3182d1081d38..31e83511afc1 100644
--- a/security/p5-Authen-PAAS/Makefile
+++ b/security/p5-Authen-PAAS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl Authentication & Authorization Service
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Config-Record>=1.1.0:${PORTSDIR}/devel/p5-Config-Record \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+BUILD_DEPENDS=	p5-Config-Record>=1.1.0:devel/p5-Config-Record \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Passphrase/Makefile b/security/p5-Authen-Passphrase/Makefile
index 59799114e145..5e587120c404 100644
--- a/security/p5-Authen-Passphrase/Makefile
+++ b/security/p5-Authen-Passphrase/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Perl module for handling hashed passwords/passphrases as objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-DecHpwd>=0:${PORTSDIR}/security/p5-Authen-DecHpwd \
-		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES \
-		p5-Crypt-Eksblowfish>=0:${PORTSDIR}/security/p5-Crypt-Eksblowfish \
-		p5-Crypt-MySQL>=0:${PORTSDIR}/security/p5-Crypt-MySQL \
-		p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Crypt-UnixCrypt_XS>=0:${PORTSDIR}/security/p5-Crypt-UnixCrypt_XS \
-		p5-Data-Entropy>=0:${PORTSDIR}/security/p5-Data-Entropy \
-		p5-Digest-MD4>=0:${PORTSDIR}/security/p5-Digest-MD4 \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
+BUILD_DEPENDS=	p5-Authen-DecHpwd>=0:security/p5-Authen-DecHpwd \
+		p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Crypt-DES>=0:security/p5-Crypt-DES \
+		p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
+		p5-Crypt-MySQL>=0:security/p5-Crypt-MySQL \
+		p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Crypt-UnixCrypt_XS>=0:security/p5-Crypt-UnixCrypt_XS \
+		p5-Data-Entropy>=0:security/p5-Data-Entropy \
+		p5-Digest-MD4>=0:security/p5-Digest-MD4 \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Params-Classify>=0:devel/p5-Params-Classify
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-PluggableCaptcha/Makefile b/security/p5-Authen-PluggableCaptcha/Makefile
index 66fab05172c2..f56a063c52ef 100644
--- a/security/p5-Authen-PluggableCaptcha/Makefile
+++ b/security/p5-Authen-PluggableCaptcha/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pluggable Captcha framework for Perl
 
-BUILD_DEPENDS=	p5-Number-Spell>=0:${PORTSDIR}/textproc/p5-Number-Spell \
-		p5-HTML-Email-Obfuscate>=0:${PORTSDIR}/security/p5-HTML-Email-Obfuscate
+BUILD_DEPENDS=	p5-Number-Spell>=0:textproc/p5-Number-Spell \
+		p5-HTML-Email-Obfuscate>=0:security/p5-HTML-Email-Obfuscate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 8d236c3834a9..14325194c13a 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl5 module to provide simple Radius client facilities
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Data-HexDump>=0.02:${PORTSDIR}/devel/p5-Data-HexDump
+RUN_DEPENDS=	p5-Data-HexDump>=0.02:devel/p5-Data-HexDump
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 #WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile
index 0a7a349fcb73..d5a26b916067 100644
--- a/security/p5-Authen-SASL-Cyrus/Makefile
+++ b/security/p5-Authen-SASL-Cyrus/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XS SASL Authentication
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-SASL-SASLprep/Makefile b/security/p5-Authen-SASL-SASLprep/Makefile
index adf531dbd99b..c74ff1433125 100644
--- a/security/p5-Authen-SASL-SASLprep/Makefile
+++ b/security/p5-Authen-SASL-SASLprep/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Stringprep Profile for User Names and Passwords (RFC 4013)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Unicode-Stringprep>=1:${PORTSDIR}/converters/p5-Unicode-Stringprep
+BUILD_DEPENDS=	p5-Unicode-Stringprep>=1:converters/p5-Unicode-Stringprep
 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
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/security/p5-Authen-SASL/Makefile b/security/p5-Authen-SASL/Makefile
index 78896355498f..53f4fc30f240 100644
--- a/security/p5-Authen-SASL/Makefile
+++ b/security/p5-Authen-SASL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module for SASL authentication
 
-RUN_DEPENDS=	p5-Digest-HMAC>0:${PORTSDIR}/security/p5-Digest-HMAC
+RUN_DEPENDS=	p5-Digest-HMAC>0:security/p5-Digest-HMAC
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 OPTIONS_DEFINE=	KERBEROS
@@ -21,7 +21,7 @@ USES=		perl5
 USE_PERL5=	configure
 CONFIGURE_ENV+=	AUTOMATED_TESTING=yes
 
-KERBEROS_BUILD_DEPENDS=	p5-GSSAPI>0:${PORTSDIR}/security/p5-GSSAPI
-KERBEROS_RUN_DEPENDS=	p5-GSSAPI>0:${PORTSDIR}/security/p5-GSSAPI
+KERBEROS_BUILD_DEPENDS=	p5-GSSAPI>0:security/p5-GSSAPI
+KERBEROS_RUN_DEPENDS=	p5-GSSAPI>0:security/p5-GSSAPI
 
 .include <bsd.port.mk>
diff --git a/security/p5-Authen-SCRAM/Makefile b/security/p5-Authen-SCRAM/Makefile
index a4de187f2367..bc5fedf5407e 100644
--- a/security/p5-Authen-SCRAM/Makefile
+++ b/security/p5-Authen-SCRAM/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Salted Challenge Response Authentication Mechanism (RFC 5802)
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Authen-SASL-SASLprep>=0:${PORTSDIR}/security/p5-Authen-SASL-SASLprep \
-		p5-Crypt-URandom>=0:${PORTSDIR}/security/p5-Crypt-URandom \
-		p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-PBKDF2-Tiny>=0.003:${PORTSDIR}/security/p5-PBKDF2-Tiny \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Authen-SASL-SASLprep>=0:security/p5-Authen-SASL-SASLprep \
+		p5-Crypt-URandom>=0:security/p5-Crypt-URandom \
+		p5-Moo>=1.001000:devel/p5-Moo \
+		p5-PBKDF2-Tiny>=0.003:security/p5-PBKDF2-Tiny \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/security/p5-Authen-Simple-DBI/Makefile b/security/p5-Authen-Simple-DBI/Makefile
index 24fe18a5dbbf..d6017d5596a3 100644
--- a/security/p5-Authen-Simple-DBI/Makefile
+++ b/security/p5-Authen-Simple-DBI/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple DBI authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-DBM/Makefile b/security/p5-Authen-Simple-DBM/Makefile
index 8e9c9b0f0f55..65fa0633a73e 100644
--- a/security/p5-Authen-Simple-DBM/Makefile
+++ b/security/p5-Authen-Simple-DBM/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple DBM authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-HTTP/Makefile b/security/p5-Authen-Simple-HTTP/Makefile
index 0d43813297d8..af294cbafe04 100644
--- a/security/p5-Authen-Simple-HTTP/Makefile
+++ b/security/p5-Authen-Simple-HTTP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple HTTP authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-Kerberos/Makefile b/security/p5-Authen-Simple-Kerberos/Makefile
index 72fde4f69cff..99ca3ad4c1f0 100644
--- a/security/p5-Authen-Simple-Kerberos/Makefile
+++ b/security/p5-Authen-Simple-Kerberos/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Simple Kerberos authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-Authen-Krb5-Simple>=0:${PORTSDIR}/security/p5-Authen-Krb5-Simple
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-Authen-Krb5-Simple>=0:security/p5-Authen-Krb5-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-LDAP/Makefile b/security/p5-Authen-Simple-LDAP/Makefile
index d36620c5c395..2a38ec3f3eb6 100644
--- a/security/p5-Authen-Simple-LDAP/Makefile
+++ b/security/p5-Authen-Simple-LDAP/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple LDAP authentication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Authen-Simple-Net/Makefile b/security/p5-Authen-Simple-Net/Makefile
index d9852d28658b..86d3d94fe96d 100644
--- a/security/p5-Authen-Simple-Net/Makefile
+++ b/security/p5-Authen-Simple-Net/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple authentication via FTP, POP3, or SMTP
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-PAM/Makefile b/security/p5-Authen-Simple-PAM/Makefile
index 84900890a18f..68212514e3ff 100644
--- a/security/p5-Authen-Simple-PAM/Makefile
+++ b/security/p5-Authen-Simple-PAM/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple PAM authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-Authen-PAM>=0:security/p5-Authen-PAM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-Passwd/Makefile b/security/p5-Authen-Simple-Passwd/Makefile
index 2e346b993736..c495cc1cd7b6 100644
--- a/security/p5-Authen-Simple-Passwd/Makefile
+++ b/security/p5-Authen-Simple-Passwd/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple Passwd authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-RADIUS/Makefile b/security/p5-Authen-Simple-RADIUS/Makefile
index 476eef664ef0..031a7a6175c7 100644
--- a/security/p5-Authen-Simple-RADIUS/Makefile
+++ b/security/p5-Authen-Simple-RADIUS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple RADIUS authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-Authen-Radius>=0:security/p5-Authen-Radius
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-SMB/Makefile b/security/p5-Authen-Simple-SMB/Makefile
index 10ee5b8f59c7..3db8bdd740a4 100644
--- a/security/p5-Authen-Simple-SMB/Makefile
+++ b/security/p5-Authen-Simple-SMB/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple SMB authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-Authen-Smb>=0:${PORTSDIR}/security/p5-Authen-Smb
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-Authen-Smb>=0:security/p5-Authen-Smb
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple-SSH/Makefile b/security/p5-Authen-Simple-SSH/Makefile
index 37edb9155653..2aa30dc992b8 100644
--- a/security/p5-Authen-Simple-SSH/Makefile
+++ b/security/p5-Authen-Simple-SSH/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple SSH authentication
 
-BUILD_DEPENDS=	p5-Authen-Simple>=0:${PORTSDIR}/security/p5-Authen-Simple \
-		p5-Net-SSH-Perl>=0:${PORTSDIR}/net/p5-Net-SSH-Perl
+BUILD_DEPENDS=	p5-Authen-Simple>=0:security/p5-Authen-Simple \
+		p5-Net-SSH-Perl>=0:net/p5-Net-SSH-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Authen-Simple/Makefile b/security/p5-Authen-Simple/Makefile
index c5f2924d9716..1a8ea2fa439e 100644
--- a/security/p5-Authen-Simple/Makefile
+++ b/security/p5-Authen-Simple/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Simple authentication framework
 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-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Params-Validate>=0:devel/p5-Params-Validate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index c29f3785fe5b..ed3ac976482c 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -14,10 +14,10 @@ COMMENT=	TypeKey authentication verification
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Module-Install>0:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Module-Install>0:devel/p5-Module-Install
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Business-PayPal-EWP/Makefile b/security/p5-Business-PayPal-EWP/Makefile
index 95601003e128..eee906c449d1 100644
--- a/security/p5-Business-PayPal-EWP/Makefile
+++ b/security/p5-Business-PayPal-EWP/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Perl extension for PayPal Encrypted Website Payments
 
-RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
-BUILD_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+RUN_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 USES=		dos2unix perl5
 USE_PERL5=	configure
diff --git a/security/p5-Bytes-Random-Secure/Makefile b/security/p5-Bytes-Random-Secure/Makefile
index 4d0f4c7e1e93..0ceff0ed81bc 100644
--- a/security/p5-Bytes-Random-Secure/Makefile
+++ b/security/p5-Bytes-Random-Secure/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Generate cryptographically-secure random bytes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-Random-Seed>=0:${PORTSDIR}/security/p5-Crypt-Random-Seed \
-		p5-Math-Random-ISAAC>=0:${PORTSDIR}/math/p5-Math-Random-ISAAC
+BUILD_DEPENDS=	p5-Crypt-Random-Seed>=0:security/p5-Crypt-Random-Seed \
+		p5-Math-Random-ISAAC>=0:math/p5-Math-Random-ISAAC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-CSP/Makefile b/security/p5-CSP/Makefile
index e5b0c64a71d2..787854800c8d 100644
--- a/security/p5-CSP/Makefile
+++ b/security/p5-CSP/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Perl tool for managing Certificate Authorities
 
-BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Term-Prompt>=0:${PORTSDIR}/devel/p5-Term-Prompt \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-Term-Prompt>=0:devel/p5-Term-Prompt \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-Blowfish/Makefile b/security/p5-Crypt-Blowfish/Makefile
index 156c87fa3560..25adaa917463 100644
--- a/security/p5-Crypt-Blowfish/Makefile
+++ b/security/p5-Crypt-Blowfish/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the Blowfish encryption alogorithm
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/a$//}
 USES=		perl5
diff --git a/security/p5-Crypt-CBCeasy/Makefile b/security/p5-Crypt-CBCeasy/Makefile
index 7d07d381c962..8b2d0dcf94f8 100644
--- a/security/p5-Crypt-CBCeasy/Makefile
+++ b/security/p5-Crypt-CBCeasy/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy things make really easy with Crypt::CBC
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-MD5>=0:${PORTSDIR}/security/p5-MD5
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-MD5>=0:security/p5-MD5
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -27,22 +27,22 @@ BLOWFISH_PP_DESC=	Build with Crypt::Blowfish_PP support
 TWOFISH2_DESC=		Build with Crypt::Twofish2 support
 RIJNDAEL_DESC=		Build with Crypt::Rijndael support
 
-DES_BUILD_DEPENDS=		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES
-DES_RUN_DEPENDS=		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES
+DES_BUILD_DEPENDS=		p5-Crypt-DES>=0:security/p5-Crypt-DES
+DES_RUN_DEPENDS=		p5-Crypt-DES>=0:security/p5-Crypt-DES
 
-IDEA_BUILD_DEPENDS=		p5-Crypt-IDEA>=0:${PORTSDIR}/security/p5-Crypt-IDEA
-IDEA_RUN_DEPENDS=		p5-Crypt-IDEA>=0:${PORTSDIR}/security/p5-Crypt-IDEA
+IDEA_BUILD_DEPENDS=		p5-Crypt-IDEA>=0:security/p5-Crypt-IDEA
+IDEA_RUN_DEPENDS=		p5-Crypt-IDEA>=0:security/p5-Crypt-IDEA
 
-BLOWFISH_BUILD_DEPENDS=		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish
-BLOWFISH_RUN_DEPENDS=		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish
+BLOWFISH_BUILD_DEPENDS=		p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish
+BLOWFISH_RUN_DEPENDS=		p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish
 
-BLOWFISH_PP_BUILD_DEPENDS=	p5-Crypt-Blowfish_PP>=0:${PORTSDIR}/security/p5-Crypt-Blowfish_PP
-BLOWFISH_PP_RUN_DEPENDS=	p5-Crypt-Blowfish_PP>=0:${PORTSDIR}/security/p5-Crypt-Blowfish_PP
+BLOWFISH_PP_BUILD_DEPENDS=	p5-Crypt-Blowfish_PP>=0:security/p5-Crypt-Blowfish_PP
+BLOWFISH_PP_RUN_DEPENDS=	p5-Crypt-Blowfish_PP>=0:security/p5-Crypt-Blowfish_PP
 
-TWOFISH2_BUILD_DEPENDS=		p5-Crypt-Twofish2>=0:${PORTSDIR}/security/p5-Crypt-Twofish2
-TWOFISH2_RUN_DEPENDS=		p5-Crypt-Twofish2>=0:${PORTSDIR}/security/p5-Crypt-Twofish2
+TWOFISH2_BUILD_DEPENDS=		p5-Crypt-Twofish2>=0:security/p5-Crypt-Twofish2
+TWOFISH2_RUN_DEPENDS=		p5-Crypt-Twofish2>=0:security/p5-Crypt-Twofish2
 
-RIJNDAEL_BUILD_DEPENDS=		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael
-RIJNDAEL_RUN_DEPENDS=		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael
+RIJNDAEL_BUILD_DEPENDS=		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael
+RIJNDAEL_RUN_DEPENDS=		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-CipherSaber/Makefile b/security/p5-Crypt-CipherSaber/Makefile
index 637ea8c7657d..42b9044c7820 100644
--- a/security/p5-Crypt-CipherSaber/Makefile
+++ b/security/p5-Crypt-CipherSaber/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module providing an OO interface to CipherSaber encryption
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warn>=0.30:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0.30:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-Cracklib/Makefile b/security/p5-Crypt-Cracklib/Makefile
index 99052aaa01bc..d1ff247a2787 100644
--- a/security/p5-Crypt-Cracklib/Makefile
+++ b/security/p5-Crypt-Cracklib/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl interface to Alec Muffet's cracklib library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
-TEST_DEPENDS=	p5-Pod-Coverage>=0.19:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+LIB_DEPENDS=	libcrack.so:security/cracklib
+TEST_DEPENDS=	p5-Pod-Coverage>=0.19:devel/p5-Pod-Coverage \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-Ctr/Makefile b/security/p5-Crypt-Ctr/Makefile
index e71ce6733501..08db65f82d19 100644
--- a/security/p5-Crypt-Ctr/Makefile
+++ b/security/p5-Crypt-Ctr/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for encrypting data in Counter Mode
 
-BUILD_DEPENDS=	p5-Crypt-CFB>=0:${PORTSDIR}/security/p5-Crypt-CFB
+BUILD_DEPENDS=	p5-Crypt-CFB>=0:security/p5-Crypt-CFB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index a6f884ed8b8f..5f6beea5aab8 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to DES block cipher
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index c6fd08588aca..0523ce29b34a 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to a implementing 3-DES EDE encryption and decryption
 
-BUILD_DEPENDS=	p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES
+BUILD_DEPENDS=	p5-Crypt-DES>=0:security/p5-Crypt-DES
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index e376e532f62e..dfc2de2ec350 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DSA signature and key generation
 
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Convert-PEM>=0:${PORTSDIR}/converters/p5-Convert-PEM \
-		p5-Data-Buffer>=0:${PORTSDIR}/misc/p5-Data-Buffer \
-		p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Convert-PEM>=0:converters/p5-Convert-PEM \
+		p5-Data-Buffer>=0:misc/p5-Data-Buffer \
+		p5-File-Which>=0.05:sysutils/p5-File-Which
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-Dining/Makefile b/security/p5-Crypt-Dining/Makefile
index a06d9454ab0a..28ae2dada0cf 100644
--- a/security/p5-Crypt-Dining/Makefile
+++ b/security/p5-Crypt-Dining/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The Dining Cryptographers' Protocol
 
-BUILD_DEPENDS=	p5-Crypt-Random>=0:${PORTSDIR}/security/p5-Crypt-Random \
-		p5-Net-Address-IPv4-Local>=0:${PORTSDIR}/net/p5-Net-Address-IPv4-Local
+BUILD_DEPENDS=	p5-Crypt-Random>=0:security/p5-Crypt-Random \
+		p5-Net-Address-IPv4-Local>=0:net/p5-Net-Address-IPv4-Local
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-Eksblowfish/Makefile b/security/p5-Crypt-Eksblowfish/Makefile
index cceba1730140..3f721b968447 100644
--- a/security/p5-Crypt-Eksblowfish/Makefile
+++ b/security/p5-Crypt-Eksblowfish/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for the Eksblowfish block cipher
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Mix>=0:${PORTSDIR}/devel/p5-Class-Mix
+BUILD_DEPENDS=	p5-Class-Mix>=0:devel/p5-Class-Mix
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-GCrypt/Makefile b/security/p5-Crypt-GCrypt/Makefile
index 27321e3bbe42..1116f5bf3ce7 100644
--- a/security/p5-Crypt-GCrypt/Makefile
+++ b/security/p5-Crypt-GCrypt/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl interface to the GNU Cryptographic library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USE_PERL5=	configure
 USES=		localbase perl5
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index 61b58b258d85..b81f6cec01c3 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for GnuPG
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-TimeDate>=1.20:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-TimeDate>=1.20:devel/p5-TimeDate
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-HCE_SHA/Makefile b/security/p5-Crypt-HCE_SHA/Makefile
index 4967f0a38110..be94d4b9d9a3 100644
--- a/security/p5-Crypt-HCE_SHA/Makefile
+++ b/security/p5-Crypt-HCE_SHA/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl5 interface to one way hash chaining block cipher
 
-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/security/p5-Crypt-Juniper/Makefile b/security/p5-Crypt-Juniper/Makefile
index a12fa6cac689..fd37db677ec8 100644
--- a/security/p5-Crypt-Juniper/Makefile
+++ b/security/p5-Crypt-Juniper/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Encrypt and decrypt Juniper $9$ secrets
 
-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/security/p5-Crypt-Lite/Makefile b/security/p5-Crypt-Lite/Makefile
index b4cea1fc4f48..bf0d0b525da1 100644
--- a/security/p5-Crypt-Lite/Makefile
+++ b/security/p5-Crypt-Lite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for a symmetric data encryption and decryption
 
-BUILD_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-MySQL/Makefile b/security/p5-Crypt-MySQL/Makefile
index 1ee070695e5a..f3ac13295559 100644
--- a/security/p5-Crypt-MySQL/Makefile
+++ b/security/p5-Crypt-MySQL/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension to compare MySQL passwords without libmysqlclient
 
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/security/p5-Crypt-OFB/Makefile b/security/p5-Crypt-OFB/Makefile
index c66ddb1f881f..76cf3dd0dd1f 100644
--- a/security/p5-Crypt-OFB/Makefile
+++ b/security/p5-Crypt-OFB/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Encrypt Data using OFB Mode
 
-BUILD_DEPENDS=	p5-Crypt-ECB>=0:${PORTSDIR}/security/p5-Crypt-ECB
+BUILD_DEPENDS=	p5-Crypt-ECB>=0:security/p5-Crypt-ECB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index 64de4f7fb142..f47f6386531d 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -12,20 +12,20 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Pure-Perl OpenPGP-compatible PGP implementation
 
 RUN_DEPENDS= \
-		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Crypt-CAST5_PP>=0:${PORTSDIR}/security/p5-Crypt-CAST5_PP \
-		p5-Crypt-DES_EDE3>=0:${PORTSDIR}/security/p5-Crypt-DES_EDE3 \
-		p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA \
-		p5-Crypt-IDEA>=0:${PORTSDIR}/security/p5-Crypt-IDEA \
-		p5-Crypt-RIPEMD160>=0:${PORTSDIR}/security/p5-Crypt-RIPEMD160 \
-		p5-Crypt-RSA>=0:${PORTSDIR}/security/p5-Crypt-RSA \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Crypt-Twofish>=0:${PORTSDIR}/security/p5-Crypt-Twofish \
-		p5-Data-Buffer>=0:${PORTSDIR}/misc/p5-Data-Buffer \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+		p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Crypt-CAST5_PP>=0:security/p5-Crypt-CAST5_PP \
+		p5-Crypt-DES_EDE3>=0:security/p5-Crypt-DES_EDE3 \
+		p5-Crypt-DSA>=0:security/p5-Crypt-DSA \
+		p5-Crypt-IDEA>=0:security/p5-Crypt-IDEA \
+		p5-Crypt-RIPEMD160>=0:security/p5-Crypt-RIPEMD160 \
+		p5-Crypt-RSA>=0:security/p5-Crypt-RSA \
+		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-Crypt-Twofish>=0:security/p5-Crypt-Twofish \
+		p5-Data-Buffer>=0:misc/p5-Data-Buffer \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-libwww>=0:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-OpenSSL-CA/Makefile b/security/p5-Crypt-OpenSSL-CA/Makefile
index a382f743f3b7..2aba6afa87aa 100644
--- a/security/p5-Crypt-OpenSSL-CA/Makefile
+++ b/security/p5-Crypt-OpenSSL-CA/Makefile
@@ -15,16 +15,16 @@ LICENSE_COMB=	dual
 
 # Note: The Devel::Mallinfo dependency doesn't work on FreeBSD; mallinfo()
 # is a GNU libc function.
-BUILD_DEPENDS=	p5-Convert-ASN1>=0.02:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-Devel-Leak>=0:${PORTSDIR}/devel/p5-Devel-Leak \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Inline>=0.40:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C \
-		p5-Net-SSLeay>=1.25:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Convert-ASN1>=0.02:converters/p5-Convert-ASN1 \
+		p5-Devel-Leak>=0:devel/p5-Devel-Leak \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Inline>=0.40:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C \
+		p5-Net-SSLeay>=1.25:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Group>=0:${PORTSDIR}/devel/p5-Test-Group \
-		p5-Test-Taint>=0:${PORTSDIR}/devel/p5-Test-Taint
+TEST_DEPENDS=	p5-Test-Group>=0:devel/p5-Test-Group \
+		p5-Test-Taint>=0:devel/p5-Test-Taint
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/security/p5-Crypt-OpenSSL-EC/Makefile b/security/p5-Crypt-OpenSSL-EC/Makefile
index 5f853560afe3..2d59829dbd3c 100644
--- a/security/p5-Crypt-OpenSSL-EC/Makefile
+++ b/security/p5-Crypt-OpenSSL-EC/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for OpenSSL EC (Elliptic Curves) library
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0.04:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0.04:security/p5-Crypt-OpenSSL-Bignum
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-OpenSSL-ECDSA/Makefile b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
index 7eeb074ef0ad..16e3eca4641f 100644
--- a/security/p5-Crypt-OpenSSL-ECDSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for OpenSSL ECDSA
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-EC>=0.05:${PORTSDIR}/security/p5-Crypt-OpenSSL-EC
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-EC>=0.05:security/p5-Crypt-OpenSSL-EC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index 933ecb5a30c3..f53cc14ccdea 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to RSA encode and decode strings using OpenSSL
 
-BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Bignum \
-		p5-Crypt-OpenSSL-Random>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-Random
+BUILD_DEPENDS=	p5-Crypt-OpenSSL-Bignum>=0:security/p5-Crypt-OpenSSL-Bignum \
+		p5-Crypt-OpenSSL-Random>=0:security/p5-Crypt-OpenSSL-Random
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-PBKDF2/Makefile b/security/p5-Crypt-PBKDF2/Makefile
index 504fa42c9cdf..a93b856ca92c 100644
--- a/security/p5-Crypt-PBKDF2/Makefile
+++ b/security/p5-Crypt-PBKDF2/Makefile
@@ -13,16 +13,16 @@ COMMENT=	PBKDF2 password hashing algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=1.01:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Digest-SHA3>=0.22:${PORTSDIR}/security/p5-Digest-SHA3 \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=2:${PORTSDIR}/devel/p5-Moo \
-		p5-Try-Tiny>=0.04:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-Type-Tiny>=0:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean \
-		p5-strictures>=2:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Digest-HMAC>=1.01:security/p5-Digest-HMAC \
+		p5-Digest-SHA3>=0.22:security/p5-Digest-SHA3 \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=2:devel/p5-Moo \
+		p5-Try-Tiny>=0.04:lang/p5-Try-Tiny \
+		p5-Type-Tiny>=0:devel/p5-Type-Tiny \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean \
+		p5-strictures>=2:devel/p5-strictures
 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/security/p5-Crypt-PGPSimple/Makefile b/security/p5-Crypt-PGPSimple/Makefile
index e7344b7198dc..fc17588793b7 100644
--- a/security/p5-Crypt-PGPSimple/Makefile
+++ b/security/p5-Crypt-PGPSimple/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Crypt::PGPSimple provides a simple object-oriented interface to PGP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${LOCALBASE}/bin/pgp:${PORTSDIR}/security/pgp
+RUN_DEPENDS=	${LOCALBASE}/bin/pgp:security/pgp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-PKCS10/Makefile b/security/p5-Crypt-PKCS10/Makefile
index 398660dac0d8..868bfb8b6c88 100644
--- a/security/p5-Crypt-PKCS10/Makefile
+++ b/security/p5-Crypt-PKCS10/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parse PKCS #10 certificate requests
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Convert-ASN1>=0.27:${PORTSDIR}/converters/p5-Convert-ASN1
+BUILD_DEPENDS=	p5-Convert-ASN1>=0.27:converters/p5-Convert-ASN1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-PWSafe3/Makefile b/security/p5-Crypt-PWSafe3/Makefile
index bc5c186de6ca..eece0e468887 100644
--- a/security/p5-Crypt-PWSafe3/Makefile
+++ b/security/p5-Crypt-PWSafe3/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Read and write Passwordsafe v3 files
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Digest-HMAC>=1.00:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-Crypt-CBC>=2.30:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-Crypt-ECB>=1.45:${PORTSDIR}/security/p5-Crypt-ECB \
-		p5-Crypt-Twofish>=2.14:${PORTSDIR}/security/p5-Crypt-Twofish \
-		p5-Crypt-Random>=1.25:${PORTSDIR}/security/p5-Crypt-Random \
-		p5-Data-UUID>=1.217:${PORTSDIR}/devel/p5-Data-UUID
+BUILD_DEPENDS=	p5-Digest-HMAC>=1.00:security/p5-Digest-HMAC \
+		p5-Crypt-CBC>=2.30:security/p5-Crypt-CBC \
+		p5-Crypt-ECB>=1.45:security/p5-Crypt-ECB \
+		p5-Crypt-Twofish>=2.14:security/p5-Crypt-Twofish \
+		p5-Crypt-Random>=1.25:security/p5-Crypt-Random \
+		p5-Data-UUID>=1.217:devel/p5-Data-UUID
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-Password-Util/Makefile b/security/p5-Crypt-Password-Util/Makefile
index f544e74126ca..ca94115e4a74 100644
--- a/security/p5-Crypt-Password-Util/Makefile
+++ b/security/p5-Crypt-Password-Util/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Bytes-Random-Secure>=0:${PORTSDIR}/security/p5-Bytes-Random-Secure
+BUILD_DEPENDS=	p5-Bytes-Random-Secure>=0:security/p5-Bytes-Random-Secure
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions
+TEST_DEPENDS=	p5-Sort-Versions>=0:devel/p5-Sort-Versions
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index 798ed8f5e107..7710eee5f01e 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provable Prime Number Generator suitable for Cryptographic Applications
 
-BUILD_DEPENDS=	p5-Crypt-Random>=0:${PORTSDIR}/security/p5-Crypt-Random \
-		p5-Math-Pari>=0:${PORTSDIR}/math/p5-Math-Pari
+BUILD_DEPENDS=	p5-Crypt-Random>=0:security/p5-Crypt-Random \
+		p5-Math-Pari>=0:math/p5-Math-Pari
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 17401179ad22..4af6e6c7e8dc 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -11,18 +11,18 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	RSA public-key cryptosystem
 
-RUN_DEPENDS=	p5-Class-Loader>=2.00:${PORTSDIR}/devel/p5-Class-Loader \
-		p5-Convert-ASCII-Armour>=0:${PORTSDIR}/converters/p5-Convert-ASCII-Armour \
-		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-Crypt-Primes>=0.38:${PORTSDIR}/security/p5-Crypt-Primes \
-		p5-Crypt-Random>=0.34:${PORTSDIR}/security/p5-Crypt-Random \
-		p5-Data-Buffer>=0:${PORTSDIR}/misc/p5-Data-Buffer \
-		p5-Digest-MD2>=0:${PORTSDIR}/security/p5-Digest-MD2 \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Math-Pari>=2.001804:${PORTSDIR}/math/p5-Math-Pari \
-		p5-Sort-Versions>=0:${PORTSDIR}/devel/p5-Sort-Versions \
-		p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Tie-EncryptedHash>=0:${PORTSDIR}/security/p5-Tie-EncryptedHash
+RUN_DEPENDS=	p5-Class-Loader>=2.00:devel/p5-Class-Loader \
+		p5-Convert-ASCII-Armour>=0:converters/p5-Convert-ASCII-Armour \
+		p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-Crypt-Primes>=0.38:security/p5-Crypt-Primes \
+		p5-Crypt-Random>=0.34:security/p5-Crypt-Random \
+		p5-Data-Buffer>=0:misc/p5-Data-Buffer \
+		p5-Digest-MD2>=0:security/p5-Digest-MD2 \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Math-Pari>=2.001804:math/p5-Math-Pari \
+		p5-Sort-Versions>=0:devel/p5-Sort-Versions \
+		p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Tie-EncryptedHash>=0:security/p5-Tie-EncryptedHash
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-Random-Seed/Makefile b/security/p5-Crypt-Random-Seed/Makefile
index ca50d524f32d..2f120d042411 100644
--- a/security/p5-Crypt-Random-Seed/Makefile
+++ b/security/p5-Crypt-Random-Seed/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Crypt-Random-TESHA2>=0:${PORTSDIR}/security/p5-Crypt-Random-TESHA2
+BUILD_DEPENDS=	p5-Crypt-Random-TESHA2>=0:security/p5-Crypt-Random-TESHA2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Crypt-Random-Source/Makefile b/security/p5-Crypt-Random-Source/Makefile
index a5b5ca613d59..5290f0e36f14 100644
--- a/security/p5-Crypt-Random-Source/Makefile
+++ b/security/p5-Crypt-Random-Source/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Get weak or strong random data from pluggable sources
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-Capture-Tiny>=0.08:${PORTSDIR}/devel/p5-Capture-Tiny \
-		p5-Module-Find>=0:${PORTSDIR}/devel/p5-Module-Find \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Type-Tiny>=1.000005:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-namespace-clean>=0.08:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Moo>=0:devel/p5-Moo \
+		p5-Capture-Tiny>=0.08:devel/p5-Capture-Tiny \
+		p5-Module-Find>=0:devel/p5-Module-Find \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny \
+		p5-namespace-clean>=0.08: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
@@ -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/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index 2daa917434fc..1fd157045b21 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Cryptographically Secure, True Random Number Generator
 
-BUILD_DEPENDS=	p5-Math-Pari>=0:${PORTSDIR}/math/p5-Math-Pari \
-		p5-Class-Loader>=0:${PORTSDIR}/devel/p5-Class-Loader
+BUILD_DEPENDS=	p5-Math-Pari>=0:math/p5-Math-Pari \
+		p5-Class-Loader>=0:devel/p5-Class-Loader
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index 84182311d305..469a8162bcfc 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl module that implements the Rijndael cipher
 
-BUILD_DEPENDS=	p5-Test-Manifest>1.14:${PORTSDIR}/devel/p5-Test-Manifest
+BUILD_DEPENDS=	p5-Test-Manifest>1.14:devel/p5-Test-Manifest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-SKey/Makefile b/security/p5-Crypt-SKey/Makefile
index 27dbae576ddc..5fc2f7daab07 100644
--- a/security/p5-Crypt-SKey/Makefile
+++ b/security/p5-Crypt-SKey/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl S/Key calculator
 
-BUILD_DEPENDS=	p5-Digest-MD4>=0:${PORTSDIR}/security/p5-Digest-MD4 \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Digest-MD4>=0:security/p5-Digest-MD4 \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-SMIME/Makefile b/security/p5-Crypt-SMIME/Makefile
index c1d7547e2cf3..cbe3c8605ce7 100644
--- a/security/p5-Crypt-SMIME/Makefile
+++ b/security/p5-Crypt-SMIME/Makefile
@@ -11,14 +11,14 @@ COMMENT=	S/MIME message signing, verification, encryption and decryption
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-ExtUtils-CChecker>=0:${PORTSDIR}/devel/p5-ExtUtils-CChecker \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-TEST_DEPENDS=	p5-Taint-Util>=0:${PORTSDIR}/devel/p5-Taint-Util \
-		p5-Test-Dependencies>=0:${PORTSDIR}/devel/p5-Test-Dependencies \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Taint>=0:${PORTSDIR}/devel/p5-Test-Taint
+BUILD_DEPENDS=	p5-ExtUtils-CChecker>=0:devel/p5-ExtUtils-CChecker \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
+TEST_DEPENDS=	p5-Taint-Util>=0:devel/p5-Taint-Util \
+		p5-Test-Dependencies>=0:devel/p5-Test-Dependencies \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Taint>=0:devel/p5-Test-Taint
 
 USES=		perl5
 USE_OPENSSL=	yes
diff --git a/security/p5-Crypt-SSLeay/Makefile b/security/p5-Crypt-SSLeay/Makefile
index 5db09fff2bf4..ecd4b64549a9 100644
--- a/security/p5-Crypt-SSLeay/Makefile
+++ b/security/p5-Crypt-SSLeay/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl5 interface to allow p5-libwww LWP to make https connections
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Path-Class>=0.26:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Try-Tiny>=0.19:${PORTSDIR}/lang/p5-Try-Tiny
-RUN_DEPENDS=	p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https
+BUILD_DEPENDS=	p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+		p5-Path-Class>=0.26:devel/p5-Path-Class \
+		p5-Try-Tiny>=0.19:lang/p5-Try-Tiny
+RUN_DEPENDS=	p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-Simple/Makefile b/security/p5-Crypt-Simple/Makefile
index 41441da53cf7..243da4c51a1f 100644
--- a/security/p5-Crypt-Simple/Makefile
+++ b/security/p5-Crypt-Simple/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	avk@vl.ru
 COMMENT=	Perl encrypt stuff simply
 
-RUN_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw
-BUILD_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-FreezeThaw>=0:${PORTSDIR}/devel/p5-FreezeThaw
+RUN_DEPENDS=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
+		p5-FreezeThaw>=0:devel/p5-FreezeThaw
+BUILD_DEPENDS=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
+		p5-FreezeThaw>=0:devel/p5-FreezeThaw
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-Sodium/Makefile b/security/p5-Crypt-Sodium/Makefile
index b705dddf61c3..73cbb68ff652 100644
--- a/security/p5-Crypt-Sodium/Makefile
+++ b/security/p5-Crypt-Sodium/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl bindings for portable NaCL (libsodium)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 CFLAGS+=	-I${LOCALBASE}/include
 USES=		perl5
diff --git a/security/p5-Crypt-Twofish_PP/Makefile b/security/p5-Crypt-Twofish_PP/Makefile
index 79e17d463048..3b84f2f7a80c 100644
--- a/security/p5-Crypt-Twofish_PP/Makefile
+++ b/security/p5-Crypt-Twofish_PP/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kostjnspb@yandex.ru
 COMMENT=	The Twofish Algorithm in Pure Perl
 
-BUILD_DEPENDS=	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl
+BUILD_DEPENDS=	p5-Locale-libintl>=0:devel/p5-Locale-libintl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-X509/Makefile b/security/p5-Crypt-X509/Makefile
index d78471da6a37..05b5e80e6b39 100644
--- a/security/p5-Crypt-X509/Makefile
+++ b/security/p5-Crypt-X509/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension to parse X.509 certificates
 
-BUILD_DEPENDS=	p5-Convert-ASN1>=0:${PORTSDIR}/converters/p5-Convert-ASN1
+BUILD_DEPENDS=	p5-Convert-ASN1>=0:converters/p5-Convert-ASN1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Crypt-XTEA/Makefile b/security/p5-Crypt-XTEA/Makefile
index ba3321a64f78..f6ede53bbd9d 100644
--- a/security/p5-Crypt-XTEA/Makefile
+++ b/security/p5-Crypt-XTEA/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Implementation of the eXtended Tiny Encryption Algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Scalar-Util-Numeric>=0.40:${PORTSDIR}/devel/p5-Scalar-Util-Numeric
+BUILD_DEPENDS=	p5-Scalar-Util-Numeric>=0.40:devel/p5-Scalar-Util-Numeric
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+TEST_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Crypt-xDBM_File/Makefile b/security/p5-Crypt-xDBM_File/Makefile
index 590b476a37a3..b2d22e122a07 100644
--- a/security/p5-Crypt-xDBM_File/Makefile
+++ b/security/p5-Crypt-xDBM_File/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module encrypt almost any kind of dbm file
 
-BUILD_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish
+BUILD_DEPENDS=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
index 9317eb991a34..fe9d4d92596f 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
+++ b/security/p5-Dancer-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Extensible authentication framework for Dancer apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>=1.3118:${PORTSDIR}/www/p5-Dancer \
-		p5-Dancer-Plugin-Auth-Extensible>=0:${PORTSDIR}/security/p5-Dancer-Plugin-Auth-Extensible \
-		p5-Dancer-Plugin-Passphrase>=0:${PORTSDIR}/security/p5-Dancer-Plugin-Passphrase \
-		p5-Dancer-Plugin-DBIC>=0:${PORTSDIR}/databases/p5-Dancer-Plugin-DBIC
+BUILD_DEPENDS=	p5-Dancer>=1.3118:www/p5-Dancer \
+		p5-Dancer-Plugin-Auth-Extensible>=0:security/p5-Dancer-Plugin-Auth-Extensible \
+		p5-Dancer-Plugin-Passphrase>=0:security/p5-Dancer-Plugin-Passphrase \
+		p5-Dancer-Plugin-DBIC>=0:databases/p5-Dancer-Plugin-DBIC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Dancer-Plugin-Auth-Extensible/Makefile b/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
index 61cdd2060571..20a63b39aa25 100644
--- a/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
+++ b/security/p5-Dancer-Plugin-Auth-Extensible/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Extensible authentication framework for Dancer apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SaltedHash>=0:${PORTSDIR}/security/p5-Crypt-SaltedHash \
-		p5-Dancer>=1.3118:${PORTSDIR}/www/p5-Dancer
+BUILD_DEPENDS=	p5-Crypt-SaltedHash>=0:security/p5-Crypt-SaltedHash \
+		p5-Dancer>=1.3118:www/p5-Dancer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -24,8 +24,8 @@ OPTIONS_DEFINE=	DPAEPD DPAEPU
 DPAEPD_DESC=	Extra dependencies for Provider::Database
 DPAEPU_DESC=	Extra dependencies for Provider::Unix
 
-DPAEPD_BUILD_DEPENDS=	p5-Dancer-Plugin-Database>=0:${PORTSDIR}/databases/p5-Dancer-Plugin-Database
-DPAEPU_BUILD_DEPENDS=	p5-Authen-Simple-PAM>=0:${PORTSDIR}/security/p5-Authen-Simple-PAM \
-			p5-Unix-Passwd-File>=0:${PORTSDIR}/security/p5-Unix-Passwd-File
+DPAEPD_BUILD_DEPENDS=	p5-Dancer-Plugin-Database>=0:databases/p5-Dancer-Plugin-Database
+DPAEPU_BUILD_DEPENDS=	p5-Authen-Simple-PAM>=0:security/p5-Authen-Simple-PAM \
+			p5-Unix-Passwd-File>=0:security/p5-Unix-Passwd-File
 
 .include <bsd.port.mk>
diff --git a/security/p5-Dancer-Plugin-Passphrase/Makefile b/security/p5-Dancer-Plugin-Passphrase/Makefile
index 77437faae756..9646b1db2ee6 100644
--- a/security/p5-Dancer-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer-Plugin-Passphrase/Makefile
@@ -15,14 +15,14 @@ COMMENT=	Passphrases and Passwords as objects for Dancer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer \
-		p5-Data-Entropy>=0.005:${PORTSDIR}/security/p5-Data-Entropy \
-		p5-Digest-Bcrypt>0:${PORTSDIR}/security/p5-Digest-Bcrypt \
-		p5-Digest-SHA>=5.74:${PORTSDIR}/security/p5-Digest-SHA
-RUN_DEPENDS=	p5-Dancer>0:${PORTSDIR}/www/p5-Dancer \
-		p5-Data-Entropy>=0.005:${PORTSDIR}/security/p5-Data-Entropy \
-		p5-Digest-Bcrypt>0:${PORTSDIR}/security/p5-Digest-Bcrypt \
-		p5-Digest-SHA>=5.74:${PORTSDIR}/security/p5-Digest-SHA
+BUILD_DEPENDS=	p5-Dancer>0:www/p5-Dancer \
+		p5-Data-Entropy>=0.005:security/p5-Data-Entropy \
+		p5-Digest-Bcrypt>0:security/p5-Digest-Bcrypt \
+		p5-Digest-SHA>=5.74:security/p5-Digest-SHA
+RUN_DEPENDS=	p5-Dancer>0:www/p5-Dancer \
+		p5-Data-Entropy>=0.005:security/p5-Data-Entropy \
+		p5-Digest-Bcrypt>0:security/p5-Digest-Bcrypt \
+		p5-Digest-SHA>=5.74:security/p5-Digest-SHA
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile
index e68d486ff563..6c87653a4e0e 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-DBIC/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Extensible authentication framework for Dancer2 apps using DBIC
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-Dancer2-Plugin-Auth-Extensible>=0.501:${PORTSDIR}/security/p5-Dancer2-Plugin-Auth-Extensible \
-		p5-Dancer2-Plugin-DBIC>=0:${PORTSDIR}/databases/p5-Dancer2-Plugin-DBIC \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase
+BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-Dancer2-Plugin-Auth-Extensible>=0.501:security/p5-Dancer2-Plugin-Auth-Extensible \
+		p5-Dancer2-Plugin-DBIC>=0:databases/p5-Dancer2-Plugin-DBIC \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-DateTime-Format-SQLite>=0:${PORTSDIR}/devel/p5-DateTime-Format-SQLite \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny
+TEST_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-DateTime-Format-SQLite>=0:devel/p5-DateTime-Format-SQLite \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
index ee63dbd8e682..1d266e1d06d4 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible-Provider-Usergroup/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Extensible authentication framework for Dancer2 apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer2>=0.159002:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Dancer2-Plugin-Auth-Extensible>=0.305:${PORTSDIR}/security/p5-Dancer2-Plugin-Auth-Extensible \
-		p5-Dancer2-Plugin-Passphrase>=3.0.2:${PORTSDIR}/security/p5-Dancer2-Plugin-Passphrase \
-		p5-Dancer2-Plugin-DBIC>=0.0008:${PORTSDIR}/databases/p5-Dancer2-Plugin-DBIC
+BUILD_DEPENDS=	p5-Dancer2>=0.159002:www/p5-Dancer2 \
+		p5-Dancer2-Plugin-Auth-Extensible>=0.305:security/p5-Dancer2-Plugin-Auth-Extensible \
+		p5-Dancer2-Plugin-Passphrase>=3.0.2:security/p5-Dancer2-Plugin-Passphrase \
+		p5-Dancer2-Plugin-DBIC>=0.0008:databases/p5-Dancer2-Plugin-DBIC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile b/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile
index 648b87644e63..8bbe0f145cd1 100644
--- a/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile
+++ b/security/p5-Dancer2-Plugin-Auth-Extensible/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Extensible authentication framework for Dancer2 apps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-SaltedHash>=0:${PORTSDIR}/security/p5-Crypt-SaltedHash \
-		p5-Session-Token>=0:${PORTSDIR}/security/p5-Session-Token \
-		p5-Dancer2>=0.166000:${PORTSDIR}/www/p5-Dancer2
+BUILD_DEPENDS=	p5-Crypt-SaltedHash>=0:security/p5-Crypt-SaltedHash \
+		p5-Session-Token>=0:security/p5-Session-Token \
+		p5-Dancer2>=0.166000:www/p5-Dancer2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
@@ -26,9 +26,9 @@ OPTIONS_DEFINE=	DPAEPD DPAEPU
 DPAEPD_DESC=	Extra dependencies for Provider::Database
 DPAEPU_DESC=	Extra dependencies for Provider::Unix
 
-DPAEPD_BUILD_DEPENDS=	p5-Dancer2-Plugin-Database>=0:${PORTSDIR}/databases/p5-Dancer2-Plugin-Database
-DPAEPU_BUILD_DEPENDS=	p5-Authen-Simple-PAM>=0:${PORTSDIR}/security/p5-Authen-Simple-PAM \
-			p5-Unix-Passwd-File>=0:${PORTSDIR}/security/p5-Unix-Passwd-File
+DPAEPD_BUILD_DEPENDS=	p5-Dancer2-Plugin-Database>=0:databases/p5-Dancer2-Plugin-Database
+DPAEPU_BUILD_DEPENDS=	p5-Authen-Simple-PAM>=0:security/p5-Authen-Simple-PAM \
+			p5-Unix-Passwd-File>=0:security/p5-Unix-Passwd-File
 
 # bin/generate-crypted-password belongs to D1 version
 post-patch:
diff --git a/security/p5-Dancer2-Plugin-Passphrase/Makefile b/security/p5-Dancer2-Plugin-Passphrase/Makefile
index 429f8e42b4a1..13edbd454148 100644
--- a/security/p5-Dancer2-Plugin-Passphrase/Makefile
+++ b/security/p5-Dancer2-Plugin-Passphrase/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Passphrases and Passwords as objects for Dancer2
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Dancer2>=0.164000:${PORTSDIR}/www/p5-Dancer2 \
-		p5-Data-Entropy>=0.005:${PORTSDIR}/security/p5-Data-Entropy \
-		p5-Digest-Bcrypt>0:${PORTSDIR}/security/p5-Digest-Bcrypt \
-		p5-Digest-SHA>=5.74:${PORTSDIR}/security/p5-Digest-SHA
+BUILD_DEPENDS=	p5-Dancer2>=0.164000:www/p5-Dancer2 \
+		p5-Data-Entropy>=0.005:security/p5-Data-Entropy \
+		p5-Digest-Bcrypt>0:security/p5-Digest-Bcrypt \
+		p5-Digest-SHA>=5.74:security/p5-Digest-SHA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Data-Entropy/Makefile b/security/p5-Data-Entropy/Makefile
index 9e10a41035a7..27f171a1c08c 100644
--- a/security/p5-Data-Entropy/Makefile
+++ b/security/p5-Data-Entropy/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Entropy (randomness) management
 
-RUN_DEPENDS=	p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Data-Float>=0.008:${PORTSDIR}/math/p5-Data-Float \
-		p5-HTTP-Lite>=0.22:${PORTSDIR}/www/p5-HTTP-Lite \
-		p5-Params-Classify>=0:${PORTSDIR}/devel/p5-Params-Classify
+RUN_DEPENDS=	p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-Data-Float>=0.008:math/p5-Data-Float \
+		p5-HTTP-Lite>=0.22:www/p5-HTTP-Lite \
+		p5-Params-Classify>=0:devel/p5-Params-Classify
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/security/p5-Digest-Adler32/Makefile b/security/p5-Digest-Adler32/Makefile
index e1acec4c5574..912301814559 100644
--- a/security/p5-Digest-Adler32/Makefile
+++ b/security/p5-Digest-Adler32/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension for Adler32 hash algorithm
 
-BUILD_DEPENDS=	p5-Digest>=0:${PORTSDIR}/security/p5-Digest
+BUILD_DEPENDS=	p5-Digest>=0:security/p5-Digest
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Digest-Bcrypt/Makefile b/security/p5-Digest-Bcrypt/Makefile
index 02f75e05de9a..3da58c8081de 100644
--- a/security/p5-Digest-Bcrypt/Makefile
+++ b/security/p5-Digest-Bcrypt/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Crypt-Eksblowfish>0:${PORTSDIR}/security/p5-Crypt-Eksblowfish
+BUILD_DEPENDS=	p5-Crypt-Eksblowfish>0:security/p5-Crypt-Eksblowfish
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Try-Tiny>=0.24:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>=0.24:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Digest-DMAC/Makefile b/security/p5-Digest-DMAC/Makefile
index fabc830dce5b..48d7d029a779 100644
--- a/security/p5-Digest-DMAC/Makefile
+++ b/security/p5-Digest-DMAC/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl5 interface to DMAC Double Message-Digest Algorithms
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Digest-EMAC/Makefile b/security/p5-Digest-EMAC/Makefile
index a78ea930c031..d9c45c0c79fc 100644
--- a/security/p5-Digest-EMAC/Makefile
+++ b/security/p5-Digest-EMAC/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl5 interface to EMAC Double Message-Digest Algorithms
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Digest-Haval256/Makefile b/security/p5-Digest-Haval256/Makefile
index 01c1ed3ca576..ab83c462243f 100644
--- a/security/p5-Digest-Haval256/Makefile
+++ b/security/p5-Digest-Haval256/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension for Haval256 hash algorithm
 
-BUILD_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Digest-MD5-File/Makefile b/security/p5-Digest-MD5-File/Makefile
index 8370a0e7097f..83486ae5e1b9 100644
--- a/security/p5-Digest-MD5-File/Makefile
+++ b/security/p5-Digest-MD5-File/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for getting MD5 sums for files and urls
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Digest-SHA/Makefile b/security/p5-Digest-SHA/Makefile
index 9742401d3b57..d0eaeafaa26d 100644
--- a/security/p5-Digest-SHA/Makefile
+++ b/security/p5-Digest-SHA/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for SHA-1/224/256/384/512
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Digest-SV1/Makefile b/security/p5-Digest-SV1/Makefile
index 615d1154781f..9919252e575e 100644
--- a/security/p5-Digest-SV1/Makefile
+++ b/security/p5-Digest-SV1/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Perl extension for SV1 hash algorithm
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Digest-Haval256>=0:${PORTSDIR}/security/p5-Digest-Haval256
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Digest-Haval256>=0:security/p5-Digest-Haval256
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/security/p5-Digest-Whirlpool/Makefile b/security/p5-Digest-Whirlpool/Makefile
index 498445f8a9e1..ace5500344b6 100644
--- a/security/p5-Digest-Whirlpool/Makefile
+++ b/security/p5-Digest-Whirlpool/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl extension for Whirlpool hash algorithm
 
-BUILD_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-File-KeePass-Agent/Makefile b/security/p5-File-KeePass-Agent/Makefile
index 34f577d0a997..f544761ea67c 100644
--- a/security/p5-File-KeePass-Agent/Makefile
+++ b/security/p5-File-KeePass-Agent/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Application agent for working with File::KeePass objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-KeePass>=2.03:${PORTSDIR}/security/p5-File-KeePass \
-		p5-Crypt-Rijndael>=1.0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-MIME-Base64>=1.0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-File-KeePass>=2.03:security/p5-File-KeePass \
+		p5-Crypt-Rijndael>=1.0:security/p5-Crypt-Rijndael \
+		p5-MIME-Base64>=1.0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-File-KeePass/Makefile b/security/p5-File-KeePass/Makefile
index d147a85369d4..e6461fd6531e 100644
--- a/security/p5-File-KeePass/Makefile
+++ b/security/p5-File-KeePass/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Interface to KeePassX, KeePass 1.x and 2.x database files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-Rijndael>=1.0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-MIME-Base64>=1.0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-Crypt-Rijndael>=1.0:security/p5-Crypt-Rijndael \
+		p5-MIME-Base64>=1.0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index e18a41e9d42e..6cc5e8deabcc 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for the clamav virus scanner
 
-BUILD_DEPENDS=	clamscan:${PORTSDIR}/security/clamav
+BUILD_DEPENDS=	clamscan:security/clamav
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index ba01528c1fbc..d003447fb25b 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Source filter for Cipher Block Chaining
 
-BUILD_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
-		p5-Crypt-Rijndael>=0:${PORTSDIR}/security/p5-Crypt-Rijndael \
-		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+BUILD_DEPENDS=	p5-Filter>=0:devel/p5-Filter \
+		p5-Crypt-Rijndael>=0:security/p5-Crypt-Rijndael \
+		p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_SUB=	EXAMPLESDIR="share/examples/${PORTNAME}"
diff --git a/security/p5-Filter-Crypto/Makefile b/security/p5-Filter-Crypto/Makefile
index 147eb1ec8d35..ea1e55b0cae0 100644
--- a/security/p5-Filter-Crypto/Makefile
+++ b/security/p5-Filter-Crypto/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Create runnable Perl files encrypted with OpenSSL libcrypto
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PAR-Packer>=0:${PORTSDIR}/devel/p5-PAR-Packer
+BUILD_DEPENDS=	p5-PAR-Packer>=0:devel/p5-PAR-Packer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 2f4c2bf09840..2b482faf475f 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl5 module for creating CAPTCHA security images
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	IMAGEMAGICK X11
@@ -30,11 +30,11 @@ USE_PERL5=	configure
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 .if ${PORT_OPTIONS:MX11}
-IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
-IMAGEMAGICK_RUN_DEPENDS=   ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick
+IMAGEMAGICK_RUN_DEPENDS=   ${LOCALBASE}/bin/convert:graphics/ImageMagick
 .else
-IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
-IMAGEMAGICK_RUN_DEPENDS=   ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
+IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick-nox11
+IMAGEMAGICK_RUN_DEPENDS=   ${LOCALBASE}/bin/convert:graphics/ImageMagick-nox11
 .endif
 .endif
 
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 778baf6271fa..73347ea3cc2e 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl module for interfacing with GnuPG
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg \
-		p5-MooX-HandlesVia>=0.04:${PORTSDIR}/devel/p5-MooX-HandlesVia \
-		p5-MooX-late>=0.14:${PORTSDIR}/devel/p5-MooX-late \
-		p5-Moo>=0.091011:${PORTSDIR}/devel/p5-Moo
+RUN_DEPENDS=	gpg2:security/gnupg \
+		p5-MooX-HandlesVia>=0.04:devel/p5-MooX-HandlesVia \
+		p5-MooX-late>=0.14:devel/p5-MooX-late \
+		p5-Moo>=0.091011:devel/p5-Moo
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-HTML-Email-Obfuscate/Makefile b/security/p5-HTML-Email-Obfuscate/Makefile
index 7f64de5232f9..8ee9748aa934 100644
--- a/security/p5-HTML-Email-Obfuscate/Makefile
+++ b/security/p5-HTML-Email-Obfuscate/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Obfuscates HTML email addresses that look normal
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-IO-Async-SSL/Makefile b/security/p5-IO-Async-SSL/Makefile
index 322c31c60ffe..1959179564be 100644
--- a/security/p5-IO-Async-SSL/Makefile
+++ b/security/p5-IO-Async-SSL/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Use SSL/TLS with IO::Async
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0.33:${PORTSDIR}/devel/p5-Future \
-		p5-IO-Async>=0.66:${PORTSDIR}/devel/p5-IO-Async\
-		p5-IO-Socket-SSL>=1.968:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-Future>=0.33:devel/p5-Future \
+		p5-IO-Async>=0.66:devel/p5-IO-Async\
+		p5-IO-Socket-SSL>=1.968:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		socat:${PORTSDIR}/net/socat
+TEST_DEPENDS=	p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		socat:net/socat
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index c41133f3d6db..dd076fc98e9a 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl5 interface to SSL sockets
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Net-SSLeay>=1.59:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Mozilla-CA>=20130114:${PORTSDIR}/www/p5-Mozilla-CA
+BUILD_DEPENDS=	p5-Net-SSLeay>=1.59:security/p5-Net-SSLeay \
+		p5-Mozilla-CA>=20130114:www/p5-Mozilla-CA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
@@ -30,10 +30,10 @@ PORTEXAMPLES=	*
 
 SHEBANG_FILES=	example/ssl_mitm.pl
 
-IDN_BUILD_DEPENDS=	p5-URI>=1.50:${PORTSDIR}/net/p5-URI
+IDN_BUILD_DEPENDS=	p5-URI>=1.50:net/p5-URI
 IDN_RUN_DEPENDS=	${IDN_BUILD_DEPENDS}
-IPV6_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.31:${PORTSDIR}/net/p5-IO-Socket-IP \
-			p5-Socket>=1.95:${PORTSDIR}/net/p5-Socket
+IPV6_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.31:net/p5-IO-Socket-IP \
+			p5-Socket>=1.95:net/p5-Socket
 IPV6_RUN_DEPENDS=	${IPV6_BUILD_DEPENDS}
 
 post-install:
diff --git a/security/p5-Mcrypt/Makefile b/security/p5-Mcrypt/Makefile
index 72c77c739a16..a9230488f802 100644
--- a/security/p5-Mcrypt/Makefile
+++ b/security/p5-Mcrypt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl extension for the Mcrypt cryptography library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt
 
 CONFIGURE_ENV=	MCRYPT_CPPFLAGS=${CPPFLAGS}
 USE_PERL5=	configure
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index f8171d6bfe34..7b6f10282a7e 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module signature file manipulation
 
 LICENSE=	CC0-1.0
 
-BUILD_DEPENDS=	p5-PAR-Dist>=0:${PORTSDIR}/devel/p5-PAR-Dist
+BUILD_DEPENDS=	p5-PAR-Dist>=0:devel/p5-PAR-Dist
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+TEST_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run
 
 CONFIGURE_ENV=	PERL_MM_USE_DEFAULT="yes"
 NO_ARCH=	yes
@@ -28,10 +28,10 @@ OPTIONS_MULTI_GPG=	GPG1 GPG2
 GPG1_DESC=	Use GnuPG version 1
 GPG2_DESC=	Use GnuPG version 2
 
-GPG1_BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+GPG1_BUILD_DEPENDS=	gpgv:security/gnupg1
 GPG1_RUN_DEPENDS=	${GPG1_BUILD_DEPENDS}
 
-GPG2_BUILD_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
+GPG2_BUILD_DEPENDS=	gpgv2:security/gnupg
 GPG2_RUN_DEPENDS=	${GPG2_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/security/p5-Net-Daemon-SSL/Makefile b/security/p5-Net-Daemon-SSL/Makefile
index 9330bded13ff..80a652bac158 100644
--- a/security/p5-Net-Daemon-SSL/Makefile
+++ b/security/p5-Net-Daemon-SSL/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl5 extension for portable daemons
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS+=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS+=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	p5-Net-Daemon>=0:net/p5-Net-Daemon \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-Net-Daemon>=0:net/p5-Net-Daemon \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 .include <bsd.port.mk>
diff --git a/security/p5-Net-OpenID-Common/Makefile b/security/p5-Net-OpenID-Common/Makefile
index f1497f02bcb3..da28d3faa5ac 100644
--- a/security/p5-Net-OpenID-Common/Makefile
+++ b/security/p5-Net-OpenID-Common/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Crypt-DH-GMP>=0:${PORTSDIR}/net/p5-Crypt-DH-GMP \
-		p5-Email-MIME-ContentType>=0:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-Crypt-DH-GMP>=0:net/p5-Crypt-DH-GMP \
+		p5-Email-MIME-ContentType>=0:mail/p5-Email-MIME-ContentType \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Net-OpenID-JanRain/Makefile b/security/p5-Net-OpenID-JanRain/Makefile
index 4f7030b87868..4ac8fd3e323a 100644
--- a/security/p5-Net-OpenID-JanRain/Makefile
+++ b/security/p5-Net-OpenID-JanRain/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OpenID JanRain and Consumer with JanRain API
 
-BUILD_DEPENDS=	p5-Crypt-DH>=0:${PORTSDIR}/security/p5-Crypt-DH \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-LWPx-ParanoidAgent>=0:${PORTSDIR}/www/p5-LWPx-ParanoidAgent \
-		p5-Net-Yadis>=0:${PORTSDIR}/net/p5-Net-Yadis \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-DH>=0:security/p5-Crypt-DH \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-LWPx-ParanoidAgent>=0:www/p5-LWPx-ParanoidAgent \
+		p5-Net-Yadis>=0:net/p5-Net-Yadis \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Net-OpenID-Server/Makefile b/security/p5-Net-OpenID-Server/Makefile
index 59134779feb0..a928dbe97a90 100644
--- a/security/p5-Net-OpenID-Server/Makefile
+++ b/security/p5-Net-OpenID-Server/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Reference implementation of OpenID server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-OpenID-Common>=1.11:${PORTSDIR}/security/p5-Net-OpenID-Common \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Net-OpenID-Common>=1.11:security/p5-Net-OpenID-Common \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INSTALL_TARGET=	pure_install
diff --git a/security/p5-Net-Radius-Server/Makefile b/security/p5-Net-Radius-Server/Makefile
index 2df562379199..8711cb871039 100644
--- a/security/p5-Net-Radius-Server/Makefile
+++ b/security/p5-Net-Radius-Server/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Framework for RADIUS Servers
 
-RUN_DEPENDS=	p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM \
-		p5-Class-Accessor>=0.27:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-Net-Radius>=1.52:${PORTSDIR}/net/p5-Net-Radius \
-		p5-Net-Server>=0.94:${PORTSDIR}/net/p5-Net-Server \
-		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Authen-PAM>=0:security/p5-Authen-PAM \
+		p5-Class-Accessor>=0.27:devel/p5-Class-Accessor \
+		p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-Net-Radius>=1.52:net/p5-Net-Radius \
+		p5-Net-Server>=0.94:net/p5-Net-Server \
+		p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index 739ac5e66b43..f7bf18460c5e 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for using SAML SSO
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libzxid.so:${PORTSDIR}/security/zxid
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libzxid.so:security/zxid
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/security/p5-Net-SSL-ExpireDate/Makefile b/security/p5-Net-SSL-ExpireDate/Makefile
index 093d67be0077..0860e3ac8bf6 100644
--- a/security/p5-Net-SSL-ExpireDate/Makefile
+++ b/security/p5-Net-SSL-ExpireDate/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Obtain expiration date of certificate
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Crypt-OpenSSL-X509>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-X509 \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Time-Duration-Parse>=0:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Crypt-OpenSSL-X509>=0:security/p5-Crypt-OpenSSL-X509 \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Time-Duration-Parse>=0:devel/p5-Time-Duration-Parse \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Net-SSLGlue/Makefile b/security/p5-Net-SSLGlue/Makefile
index 3f661288ab42..69fe0d17d655 100644
--- a/security/p5-Net-SSLGlue/Makefile
+++ b/security/p5-Net-SSLGlue/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Add/extend SSL support for common perl modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.190:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.190:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 7fac088cef7d..35c71bb15813 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl5 interface to SSL
 
 LICENSE=	OpenSSL
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
index f28ed571b109..12b721c59b5a 100644
--- a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
+++ b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Plain and login auth methods for Net::Server::Mail::ESMTP
 
-BUILD_DEPENDS=	p5-Net-Server-Mail>=0:${PORTSDIR}/mail/p5-Net-Server-Mail \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-Net-Server-Mail>=0:mail/p5-Net-Server-Mail \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Net-SinFP/Makefile b/security/p5-Net-SinFP/Makefile
index 33409c5d3737..c7ebb13c508c 100644
--- a/security/p5-Net-SinFP/Makefile
+++ b/security/p5-Net-SinFP/Makefile
@@ -30,10 +30,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 .if ${PORTNAME} == "Net-SinFP"
 PKGNAMEPREFIX=	p5-
 
-BUILD_DEPENDS+=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-DBIx-SQLite-Simple>=0.33:${PORTSDIR}/databases/p5-DBIx-SQLite-Simple \
-		p5-Net-Packet>=3.00:${PORTSDIR}/net/p5-Net-Packet \
-		p5-Net-Packet-Target>=1.00:${PORTSDIR}/net/p5-Net-Packet-Target
+BUILD_DEPENDS+=	p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-DBIx-SQLite-Simple>=0.33:databases/p5-DBIx-SQLite-Simple \
+		p5-Net-Packet>=3.00:net/p5-Net-Packet \
+		p5-Net-Packet-Target>=1.00:net/p5-Net-Packet-Target
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Nmap-Parser/Makefile b/security/p5-Nmap-Parser/Makefile
index f46b81186f9e..4cded0c448f8 100644
--- a/security/p5-Nmap-Parser/Makefile
+++ b/security/p5-Nmap-Parser/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Parse nmap scan data with perl
 
-BUILD_DEPENDS=	p5-XML-Twig>=3.16:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-Storable>=2:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS=	p5-XML-Twig>=3.16:textproc/p5-XML-Twig \
+		p5-Storable>=2:devel/p5-Storable
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		nmap:${PORTSDIR}/security/nmap
+		nmap:security/nmap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 7fdcc32f1eec..d84934d86d3b 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perform and manipulate nmap scans using perl
 
-BUILD_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-		p5-Class-Generate>=0:${PORTSDIR}/devel/p5-Class-Generate \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	nmap:security/nmap \
+		p5-Class-Generate>=0:devel/p5-Class-Generate \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-OpenCA-OpenSSL/Makefile b/security/p5-OpenCA-OpenSSL/Makefile
index 021f92dc3ea9..71c1ee21d16f 100644
--- a/security/p5-OpenCA-OpenSSL/Makefile
+++ b/security/p5-OpenCA-OpenSSL/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl crypto extension to OpenSSL
 
-BUILD_DEPENDS=	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-OpenCA-PKCS7/Makefile b/security/p5-OpenCA-PKCS7/Makefile
index 351e590a5368..54869b8ef477 100644
--- a/security/p5-OpenCA-PKCS7/Makefile
+++ b/security/p5-OpenCA-PKCS7/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for basic handling PKCS\#7 Signatures
 
-BUILD_DEPENDS=	p5-OpenCA-OpenSSL>=0:${PORTSDIR}/security/p5-OpenCA-OpenSSL \
-		p5-OpenCA-X509>=0:${PORTSDIR}/security/p5-OpenCA-X509 \
-		p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-OpenCA-OpenSSL>=0:security/p5-OpenCA-OpenSSL \
+		p5-OpenCA-X509>=0:security/p5-OpenCA-X509 \
+		p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.9.13
diff --git a/security/p5-OpenCA-REQ/Makefile b/security/p5-OpenCA-REQ/Makefile
index 6a69aa46d5c0..9d3ec6ffa8ae 100644
--- a/security/p5-OpenCA-REQ/Makefile
+++ b/security/p5-OpenCA-REQ/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to easily manage Cert REQUESTs
 
-BUILD_DEPENDS=	p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-OpenCA-X509/Makefile b/security/p5-OpenCA-X509/Makefile
index 8bc39a864b74..5591e9b35539 100644
--- a/security/p5-OpenCA-X509/Makefile
+++ b/security/p5-OpenCA-X509/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for handling X509 Certificates
 
-BUILD_DEPENDS=	p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 0c930aac7989..a9b121166c66 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -26,11 +26,11 @@ OPTIONS_SINGLE=	DEFAULTPGP
 OPTIONS_SINGLE_DEFAULTPGP=	GNUPG PGP2
 OPTIONS_DEFAULT=	GNUPG
 PGP2_DESC=	PGP2 support
-GNUPG_BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+GNUPG_BUILD_DEPENDS=	gpg:security/gnupg
 GNUPG_CONFIGURE_ON=	PGP=${LOCALBASE}/bin/gpg PGPSTYLE=GPG
-GNUPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-PGP2_BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+GNUPG_RUN_DEPENDS=	gpg:security/gnupg
+PGP2_BUILD_DEPENDS=	pgp:security/pgp
 PGP2_CONFIGURE_ON=	PGP=${LOCALBASE}/bin/pgp PGPSTYLE=PGP2
-PGP2_RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+PGP2_RUN_DEPENDS=	pgp:security/pgp
 
 .include <bsd.port.mk>
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 1eef688eb9f0..60c57d380ea1 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl5 module to work with PGP messages
 
-RUN_DEPENDS=	pgpin:${PORTSDIR}/security/pgpin
+RUN_DEPENDS=	pgpin:security/pgpin
 
 PORTSCOUT=	skipv:1.0
 
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index a6b22fc12515..a0ae9a8947f1 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Integrate SSL into POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-SSLeay>=1.36:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-POE>=1.267:${PORTSDIR}/devel/p5-POE \
-		p5-Task-Weaken>=1.03:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Net-SSLeay>=1.36:security/p5-Net-SSLeay \
+		p5-POE>=1.267:devel/p5-POE \
+		p5-Task-Weaken>=1.03:devel/p5-Task-Weaken
 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=	modbuildtiny
@@ -25,7 +25,7 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Parse-Snort/Makefile b/security/p5-Parse-Snort/Makefile
index 7b4516c7e9fd..f725623398c7 100644
--- a/security/p5-Parse-Snort/Makefile
+++ b/security/p5-Parse-Snort/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl module to parse and create Snort rules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	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/security/p5-PerlCryptLib/Makefile b/security/p5-PerlCryptLib/Makefile
index d2f3386cefd9..d652ce0cfe74 100644
--- a/security/p5-PerlCryptLib/Makefile
+++ b/security/p5-PerlCryptLib/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Peter Guttman cryptlib API
 
-LIB_DEPENDS=	libcl.so:${PORTSDIR}/security/cryptlib
+LIB_DEPENDS=	libcl.so:security/cryptlib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 3d034a1d5908..26ae2538180a 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the SHA1 algorithm
 
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Sudo/Makefile b/security/p5-Sudo/Makefile
index 16de09dfedb0..624f0b66f376 100644
--- a/security/p5-Sudo/Makefile
+++ b/security/p5-Sudo/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for running a command line sudo
 
-BUILD_DEPENDS=	p5-Term-ReadPassword>=0:${PORTSDIR}/devel/p5-Term-ReadPassword \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index 87f97d847ab1..84fe6f6fd5d1 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Hashes (and objects based on hashes) with encrypting fields
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES
+TEST_DEPENDS=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Crypt-DES>=0:security/p5-Crypt-DES
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Tree-Authz/Makefile b/security/p5-Tree-Authz/Makefile
index dec3289e946d..def1d50878f7 100644
--- a/security/p5-Tree-Authz/Makefile
+++ b/security/p5-Tree-Authz/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Role-Based Access Control authorization scheme
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number
 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/security/p5-Unix-Passwd-File/Makefile b/security/p5-Unix-Passwd-File/Makefile
index ff68309c87bc..8a6a114c0919 100644
--- a/security/p5-Unix-Passwd-File/Makefile
+++ b/security/p5-Unix-Passwd-File/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Manipulate passwd and group entries
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-Password-Util>=0.06:${PORTSDIR}/security/p5-Crypt-Password-Util \
-		p5-File-Flock-Retry>=0:${PORTSDIR}/devel/p5-File-Flock-Retry \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Any-IfLOG>=0:${PORTSDIR}/devel/p5-Log-Any-IfLOG
+BUILD_DEPENDS=	p5-Crypt-Password-Util>=0.06:security/p5-Crypt-Password-Util \
+		p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Log-Any-IfLOG>=0:devel/p5-Log-Any-IfLOG
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USES=		perl5
@@ -31,8 +31,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-experimental>=0:${PORTSDIR}/devel/p5-experimental
-RUN_DEPENDS+=	p5-experimental>=0:${PORTSDIR}/devel/p5-experimental
+BUILD_DEPENDS+=	p5-experimental>=0:devel/p5-experimental
+RUN_DEPENDS+=	p5-experimental>=0:devel/p5-experimental
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Yahoo-BBAuth/Makefile b/security/p5-Yahoo-BBAuth/Makefile
index 721a6d788a20..7620f6464d94 100644
--- a/security/p5-Yahoo-BBAuth/Makefile
+++ b/security/p5-Yahoo-BBAuth/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl interface to the Yahoo! Browser-Based Authentication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=5.6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=5.6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-dicewaregen/Makefile b/security/p5-dicewaregen/Makefile
index 5722da7958c6..c536251edc67 100644
--- a/security/p5-dicewaregen/Makefile
+++ b/security/p5-dicewaregen/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	graudeejs@gmail.com
 COMMENT=	Simple perl script to generate Diceware dictionaries for passwords
 
-LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 55ce83478e85..622d38d4d397 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -13,58 +13,58 @@ COMMENT=	Perl based trustcenter for PKI: universal server building block
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	\
-	bash:${PORTSDIR}/shells/bash \
-	openca-tools-forked>=1.4.0:${PORTSDIR}/security/openca-tools-forked \
-	p5-CGI-Fast>=2.10:${PORTSDIR}/www/p5-CGI-Fast \
-	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-	p5-CGI>=4.21:${PORTSDIR}/www/p5-CGI \
-	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std \
-	p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
-	p5-Config-Merge>=0:${PORTSDIR}/devel/p5-Config-Merge \
-	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
-	p5-Connector>=0:${PORTSDIR}/devel/p5-Connector \
-	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-	p5-Crypt-OpenSSL-AES>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-AES \
-	p5-Crypt-PKCS10>=1.3:${PORTSDIR}/security/p5-Crypt-PKCS10 \
-	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-	p5-DBD-Mock>=0:${PORTSDIR}/databases/p5-DBD-Mock \
-	p5-Data-Password>=0:${PORTSDIR}/security/p5-Data-Password \
-	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer \
-	p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-	p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite \
-	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-	p5-LWP-Protocol-connect>=0:${PORTSDIR}/www/p5-LWP-Protocol-connect \
-	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-	p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-	p5-Math-BigInt>=1.9993:${PORTSDIR}/math/p5-Math-BigInt \
-	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-	p5-Net-DNS>0.83:${PORTSDIR}/dns/p5-Net-DNS \
-	p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-	p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-	p5-Proc-SafeExec>=0:${PORTSDIR}/devel/p5-Proc-SafeExec \
-	p5-RT-Client-REST>=0:${PORTSDIR}/www/p5-RT-Client-REST \
-	p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-	p5-Switch>=0:${PORTSDIR}/lang/p5-Switch \
-	p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
-	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-	p5-Test-Prereq>=0:${PORTSDIR}/devel/p5-Test-Prereq \
-	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-Workflow>=0.31:${PORTSDIR}/devel/p5-Workflow \
-	p5-XML-Filter-XInclude>=0:${PORTSDIR}/textproc/p5-XML-Filter-XInclude \
-	p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-	p5-XML-Validator-Schema>=0:${PORTSDIR}/textproc/p5-XML-Validator-Schema \
-	p5-openxpki-i18n>=0.20.0.1:${PORTSDIR}/security/p5-openxpki-i18n \
-	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
+	bash:shells/bash \
+	openca-tools-forked>=1.4.0:security/openca-tools-forked \
+	p5-CGI-Fast>=2.10:www/p5-CGI-Fast \
+	p5-CGI-Session>=0:www/p5-CGI-Session \
+	p5-CGI>=4.21:www/p5-CGI \
+	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+	p5-Class-Std>=0:devel/p5-Class-Std \
+	p5-Config-GitLike>=0:devel/p5-Config-GitLike \
+	p5-Config-Merge>=0:devel/p5-Config-Merge \
+	p5-Config-Std>=0:devel/p5-Config-Std \
+	p5-Connector>=0:devel/p5-Connector \
+	p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+	p5-Crypt-OpenSSL-AES>=0:security/p5-Crypt-OpenSSL-AES \
+	p5-Crypt-PKCS10>=1.3:security/p5-Crypt-PKCS10 \
+	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+	p5-DBD-Mock>=0:databases/p5-DBD-Mock \
+	p5-Data-Password>=0:security/p5-Data-Password \
+	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+	p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+	p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite \
+	p5-JSON>=0:converters/p5-JSON \
+	p5-LWP-Protocol-connect>=0:www/p5-LWP-Protocol-connect \
+	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+	p5-Mail-RFC822-Address>=0:mail/p5-Mail-RFC822-Address \
+	p5-Math-BigInt>=1.9993:math/p5-Math-BigInt \
+	p5-Moose>=0:devel/p5-Moose \
+	p5-Net-DNS>0.83:dns/p5-Net-DNS \
+	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+	p5-Net-Server>=0:net/p5-Net-Server \
+	p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP \
+	p5-Path-Class>=0:devel/p5-Path-Class \
+	p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+	p5-Proc-SafeExec>=0:devel/p5-Proc-SafeExec \
+	p5-RT-Client-REST>=0:www/p5-RT-Client-REST \
+	p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+	p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+	p5-Switch>=0:lang/p5-Switch \
+	p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
+	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+	p5-Test-Pod>=0:devel/p5-Test-Pod \
+	p5-Test-Prereq>=0:devel/p5-Test-Prereq \
+	p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-Workflow>=0.31:devel/p5-Workflow \
+	p5-XML-Filter-XInclude>=0:textproc/p5-XML-Filter-XInclude \
+	p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+	p5-XML-Validator-Schema>=0:textproc/p5-XML-Validator-Schema \
+	p5-openxpki-i18n>=0.20.0.1:security/p5-openxpki-i18n \
+	p5-perl-ldap>=0:net/p5-perl-ldap \
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -90,8 +90,8 @@ GROUPS=	openxpki
 OPTIONS_DEFINE=	GRAPHVIZ DOCS EXAMPLES
 
 GRAPHVIZ_DESC=	With graphical visualization of workflows?
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-			imgsize:${PORTSDIR}/graphics/p5-Image-Size
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz \
+			imgsize:graphics/p5-Image-Size
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|..ENV{PERL} .vergen --format version.|"${PORTVERSION}"|g' ${WRKSRC}/Makefile.PL
diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile
index ec997b812845..ceec54ab06ea 100644
--- a/security/pam-pgsql/Makefile
+++ b/security/pam-pgsql/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PAM module for authenticating with PostgreSQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmhash.so:${PORTSDIR}/security/mhash \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libmhash.so:security/mhash \
+		libgcrypt.so:security/libgcrypt
 
 USES=		libtool pgsql
 GNU_CONFIGURE=	yes
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index d1ee036309a5..8a210ec585d5 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:C/_/-/}_${PORTVERSION}+git.orig
 MAINTAINER=	lichray@gmail.com
 COMMENT=	PAM module offering finger print authentication using libfprint
 
-LIB_DEPENDS=	libfprint.so:${PORTSDIR}/security/libfprint
+LIB_DEPENDS=	libfprint.so:security/libfprint
 
 USE_AUTOTOOLS=	autoconf automake
 AUTOMAKE_ARGS=	-a
diff --git a/security/pam_p11/Makefile b/security/pam_p11/Makefile
index 4cd21f1b1980..3595b885bbbf 100644
--- a/security/pam_p11/Makefile
+++ b/security/pam_p11/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PAM module using crypto tokens for auth
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libp11.so:${PORTSDIR}/security/libp11
+LIB_DEPENDS=	libp11.so:security/libp11
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/security/pam_yubico/Makefile b/security/pam_yubico/Makefile
index 761df074d08b..a6bd26b33fa0 100644
--- a/security/pam_yubico/Makefile
+++ b/security/pam_yubico/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PAM module for authenticating with a Yubico YubiKey
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libykclient.so:${PORTSDIR}/security/ykclient \
-		libyubikey.so:${PORTSDIR}/security/libyubikey
+LIB_DEPENDS=	libykclient.so:security/ykclient \
+		libyubikey.so:security/libyubikey
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig
@@ -27,7 +27,7 @@ CR_DESC=	Include Challenge/response support
 OPTIONS_DEFAULT=	CR
 
 CR_CONFIGURE_WITH=	cr
-CR_LIB_DEPENDS=	libykpers-1.so:${PORTSDIR}/security/ykpers
+CR_LIB_DEPENDS=	libykpers-1.so:security/ykpers
 CR_PLIST_FILES=	bin/ykpamcfg \
 		man/man1/ykpamcfg.1.gz
 
diff --git a/security/passivedns/Makefile b/security/passivedns/Makefile
index ef1a9a80e68e..32b50f5e8117 100644
--- a/security/passivedns/Makefile
+++ b/security/passivedns/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Network sniffer that logs DNS replies for use in passive DNS setups
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS=	libldns.so:dns/ldns
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gamelinux
diff --git a/security/pbc/Makefile b/security/pbc/Makefile
index 5978f62ae580..9e784fd35a13 100644
--- a/security/pbc/Makefile
+++ b/security/pbc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library of pairing-based cryptosystems
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		bison libtool
 GNU_CONFIGURE=	yes
diff --git a/security/pbnj/Makefile b/security/pbnj/Makefile
index d5330ff37981..03b83abf1776 100644
--- a/security/pbnj/Makefile
+++ b/security/pbnj/Makefile
@@ -10,15 +10,15 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of tools to monitor changes on a network
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-Nmap-Parser>=0:${PORTSDIR}/security/p5-Nmap-Parser \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-Nmap-Parser>=0:security/p5-Nmap-Parser \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Which>=0:sysutils/p5-File-Which
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		nmap:${PORTSDIR}/security/nmap
+		nmap:security/nmap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 1e4c900a14a1..98cdb7125fc7 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tools to test a PCSC driver, card, or reader
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS=	p5-PCSC-Card>=0:${PORTSDIR}/devel/p5-PCSC-Card \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
+RUN_DEPENDS=	p5-PCSC-Card>=0:devel/p5-PCSC-Card \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USES=		gmake pkgconfig
 
diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index bd6e70a282ba..9d405e8fa4b5 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -25,17 +25,17 @@ PEAR_FILE_SMBPASSWD_DESC=	PEAR::File_SMBPasswd support
 PEAR_SOAP_DESC=	PEAR::SOAP support
 PEAR_NET_VPOPMAILD_DESC=	PEAR::Net_Vpopmaild support
 
-PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log/syslog.php:${PORTSDIR}/sysutils/pear-Log
-PEAR_FILE_PASSWD_RUN_DEPENDS=	${PEARDIR}/File/Passwd.php:${PORTSDIR}/security/pear-File_Passwd
-PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
-PEAR_NET_POP3_RUN_DEPENDS=	${PEARDIR}/Net/POP3.php:${PORTSDIR}/net/pear-Net_POP3
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_AUTH_RADIUS_RUN_DEPENDS=	${PEARDIR}/Auth/RADIUS.php:${PORTSDIR}/net/pear-Auth_RADIUS
-PEAR_FILE_SMBPASSWD_RUN_DEPENDS=	${PEARDIR}/File/SMBPasswd.php:${PORTSDIR}/security/pear-File_SMBPasswd
-PEAR_SOAP_RUN_DEPENDS=	${PEARDIR}/SOAP/Base.php:${PORTSDIR}/net/pear-SOAP
-PEAR_NET_VPOPMAILD_RUN_DEPENDS=	${PEARDIR}/Net/Vpopmaild.php:${PORTSDIR}/net/pear-Net_Vpopmaild
+PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log/syslog.php:sysutils/pear-Log
+PEAR_FILE_PASSWD_RUN_DEPENDS=	${PEARDIR}/File/Passwd.php:security/pear-File_Passwd
+PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
+PEAR_NET_POP3_RUN_DEPENDS=	${PEARDIR}/Net/POP3.php:net/pear-Net_POP3
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_AUTH_RADIUS_RUN_DEPENDS=	${PEARDIR}/Auth/RADIUS.php:net/pear-Auth_RADIUS
+PEAR_FILE_SMBPASSWD_RUN_DEPENDS=	${PEARDIR}/File/SMBPasswd.php:security/pear-File_SMBPasswd
+PEAR_SOAP_RUN_DEPENDS=	${PEARDIR}/SOAP/Base.php:net/pear-SOAP
+PEAR_NET_VPOPMAILD_RUN_DEPENDS=	${PEARDIR}/Net/Vpopmaild.php:net/pear-Net_Vpopmaild
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Auth.php
diff --git a/security/pear-Auth_OpenID/Makefile b/security/pear-Auth_OpenID/Makefile
index 0812d06b5756..ce83bfa08c91 100644
--- a/security/pear-Auth_OpenID/Makefile
+++ b/security/pear-Auth_OpenID/Makefile
@@ -28,8 +28,8 @@ PEAR_DB_DESC=	Support SQL stores
 
 USE_PHP=	curl dom
 
-PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
 
 .include <bsd.port.options.mk>
 
diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index 0418cedf4dbd..95c31e665930 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR abstraction of various SASL mechanism responses
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-Auth>=0:${PORTSDIR}/security/pear-Auth
+BUILD_DEPENDS=	pear-Auth>=0:security/pear-Auth
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/pear-Crypt_GPG/Makefile b/security/pear-Crypt_GPG/Makefile
index 04ca86442186..5346d550345f 100644
--- a/security/pear-Crypt_GPG/Makefile
+++ b/security/pear-Crypt_GPG/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GNU Privacy Guard (GPG)
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.10:${PORTSDIR}/devel/pear-Console_CommandLine
+BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile
index a0b84d46873e..633814b9c80b 100644
--- a/security/pear-File_Passwd/Makefile
+++ b/security/pear-File_Passwd/Makefile
@@ -13,6 +13,6 @@ USES=	pear
 OPTIONS_DEFINE=	PEAR_CRYPT_CHAP
 PEAR_CRYPT_CHAP_DESC=	PEAR::Crypt_CHAP support
 
-PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
+PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
 
 .include <bsd.port.mk>
diff --git a/security/pear-File_SMBPasswd/Makefile b/security/pear-File_SMBPasswd/Makefile
index c752352e2f4d..cf257f7911f6 100644
--- a/security/pear-File_SMBPasswd/Makefile
+++ b/security/pear-File_SMBPasswd/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for managing SAMBA style password files
 
-BUILD_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
-RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
+BUILD_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
+RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
 
 USES=	pear
 USE_PHP=	mhash
diff --git a/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile
index b7f5021f348a..5aa0afb0add6 100644
--- a/security/pear-LiveUser/Makefile
+++ b/security/pear-LiveUser/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR user authentication and permission management framework
 
-BUILD_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
-RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
+BUILD_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
+RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
 
 PORTSCOUT=	skipv:0.61
 
@@ -23,11 +23,11 @@ PEAR_LOG_DESC=	PEAR::Log support
 PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
 PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_LOG_RUN_DEPENDS=	 ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
-PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_LOG_RUN_DEPENDS=	 ${PEARDIR}/Log/null.php:sysutils/pear-Log
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
+PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4
 
 .include <bsd.port.mk>
diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile
index 6ef365333747..4d5def0d6763 100644
--- a/security/pear-LiveUser_Admin/Makefile
+++ b/security/pear-LiveUser_Admin/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR user authentication and permission management framework
 
-BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:${PORTSDIR}/security/pear-LiveUser
-RUN_DEPENDS=	${PEARDIR}/LiveUser.php:${PORTSDIR}/security/pear-LiveUser
+BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser
+RUN_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser
 
 OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_LOG PEAR_XML_TREE PEAR_CRYPT_RC4
 
@@ -23,11 +23,11 @@ PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
 USES=	pear
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
-PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
+PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4
 
 .include <bsd.port.mk>
diff --git a/security/pecl-crack/Makefile b/security/pecl-crack/Makefile
index 4b1c4ac5f33e..a9081c98203f 100644
--- a/security/pecl-crack/Makefile
+++ b/security/pecl-crack/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to cracklib
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+LIB_DEPENDS=	libcrack.so:security/cracklib
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index 8418623cbc6d..761a816249b1 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL wrapper around the gpgme library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 CONFIGURE_ARGS=	--with-gnupg=${LOCALBASE}/include
 IGNORE_WITH_PHP=70
diff --git a/security/pecl-ssh2/Makefile b/security/pecl-ssh2/Makefile
index 271fc98b1ebf..e7371dbf0662 100644
--- a/security/pecl-ssh2/Makefile
+++ b/security/pecl-ssh2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PECL extension to the libssh2 library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIB_DEPENDS=	libssh2.so:security/libssh2
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/security/pev/Makefile b/security/pev/Makefile
index eb7f1cbd4738..f46891e1bb02 100644
--- a/security/pev/Makefile
+++ b/security/pev/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PE analysis toolkit
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/security/pgpgpg/Makefile b/security/pgpgpg/Makefile
index fdba7ac8fc87..37490f04d122 100644
--- a/security/pgpgpg/Makefile
+++ b/security/pgpgpg/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Wrapper for GnuPG to simulate PGP 2.6.x
 # if it can't find gpg.  RUN_DEPENDS is necessary to make the package
 # dependency register correctly.  Hence the apparent redundancy.
 
-BUILD_DEPENDS=	${PREFIX}/bin/gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	${PREFIX}/bin/gpgv:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	${PREFIX}/bin/gpgv:security/gnupg1
+RUN_DEPENDS=	${PREFIX}/bin/gpgv:security/gnupg1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gpg-path=${PREFIX}/bin/gpg
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 50275468db64..e449ee316388 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	perlfu@gmail.com
 COMMENT=	Encryption Plugin for the Pidgin instant messenger client
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple \
-		libnss3.so:${PORTSDIR}/security/nss
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin
+RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple \
+		libnss3.so:security/nss
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 500a90523906..6326d7552482 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -14,10 +14,10 @@ LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # explicitly use libotr.so.5 (see ports/186944)
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libotr.so.5:${PORTSDIR}/security/libotr \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libpurple.so:${PORTSDIR}/net-im/libpurple
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+LIB_DEPENDS=	libotr.so.5:security/libotr \
+		libgcrypt.so:security/libgcrypt \
+		libpurple.so:net-im/libpurple
 
 USES=		cpe gmake libtool pkgconfig
 CPE_VENDOR=	cypherpunks
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index b7ec53dcee55..a99dd6b40be5 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -26,23 +26,23 @@ FRONTEND_DESC=	Default frontend
 
 TTY_DESC=	Console version
 PINENTRY_TTY=	pinentry-tty
-TTY_RUN_DEPENDS=	${PINENTRY_TTY}:${PORTSDIR}/security/pinentry-tty
+TTY_RUN_DEPENDS=	${PINENTRY_TTY}:security/pinentry-tty
 
 NCURSES_DESC=	Curses frontend
 PINENTRY_NCURSES=	pinentry-curses
-NCURSES_RUN_DEPENDS=	${PINENTRY_NCURSES}:${PORTSDIR}/security/pinentry-curses
+NCURSES_RUN_DEPENDS=	${PINENTRY_NCURSES}:security/pinentry-curses
 
 GTK2_DESC=	Gtk+ 2 frontend
 PINENTRY_GTK2=	pinentry-gtk-2
-GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:${PORTSDIR}/security/pinentry-gtk2
+GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:security/pinentry-gtk2
 
 QT4_DESC=	Qt 4 frontend
 PINENTRY_QT4=	pinentry-qt
-QT4_RUN_DEPENDS=	${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4
+QT4_RUN_DEPENDS=	${PINENTRY_QT4}:security/pinentry-qt4
 
 GNOME3_DESC=	GNOME 3 frontend
 PINENTRY_GNOME3=	pinentry-gnome3
-GNOME3_RUN_DEPENDS=	${PINENTRY_GNOME3}:${PORTSDIR}/security/pinentry-gnome3
+GNOME3_RUN_DEPENDS=	${PINENTRY_GNOME3}:security/pinentry-gnome3
 
 .include <bsd.port.options.mk>
 
@@ -58,9 +58,9 @@ do-install:
 
 .else # !defined(PINENTRY_GUI)
 PKGNAMESUFFIX=	-${PINENTRY_GUI}
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libksba.so:${PORTSDIR}/security/libksba
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgcrypt.so:security/libgcrypt \
+		libksba.so:security/libksba
 
 USES+=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes
@@ -73,12 +73,12 @@ OPTIONS_DEFINE=	LIBSECRET
 
 LIBSECRET_DESC=	Saving the passphrase with libsecret
 LIBSECRET_CONFIGURE_ENABLE=	libsecret
-LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 
 .if ${PINENTRY_GUI} == "gnome3"
 OPTIONS_SLAVE=	LIBSECRET
 USE_GNOME+=	gtk20
-LIB_DEPENDS+=	libgcr-base-3.so:${PORTSDIR}/security/gcr
+LIB_DEPENDS+=	libgcr-base-3.so:security/gcr
 PLIST_FILES=	bin/pinentry-gnome3
 .else
 CONFIGURE_ARGS+=--disable-pinentry-gnome3
diff --git a/security/pond/Makefile b/security/pond/Makefile
index cd2ea62bda98..02f40eefff7a 100644
--- a/security/pond/Makefile
+++ b/security/pond/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Forward secure, asynchronous messenger
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:${PORTSDIR}/security/go.crypto \
-		${LOCALBASE}/${GO_LIBDIR}/github.com/golang/protobuf/proto.a:${PORTSDIR}/devel/goprotobuf \
-		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:${PORTSDIR}/net/go.net
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
-		libtspi.so:${PORTSDIR}/security/trousers
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/go.crypto \
+		${LOCALBASE}/${GO_LIBDIR}/github.com/golang/protobuf/proto.a:devel/goprotobuf \
+		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:net/go.net
+RUN_DEPENDS=	tor:security/tor
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell \
+		libtspi.so:security/trousers
 
 PLIST_FILES=	bin/pond-server bin/pond
 USE_GNOME=	gtk30
diff --git a/security/ppars/Makefile b/security/ppars/Makefile
index 27f48395619d..1491c841ee21 100644
--- a/security/ppars/Makefile
+++ b/security/ppars/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	ppars1@a1poweruser.com
 COMMENT=	Proactive Probing Abuse Reporting System
 
-RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
 
 USES=		perl5 shebangfix tar:bzip2
 NO_BUILD=	yes
diff --git a/security/proftpd-mod_clamav/Makefile b/security/proftpd-mod_clamav/Makefile
index 3dfd166b6e69..369497f151b4 100644
--- a/security/proftpd-mod_clamav/Makefile
+++ b/security/proftpd-mod_clamav/Makefile
@@ -19,7 +19,7 @@ MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 GH_TAGNAME=	v${DISTVERSION}
 GIT_REVISION=	f0cad45
 
-RUN_DEPENDS+=	clamd:${PORTSDIR}/security/clamav
+RUN_DEPENDS+=	clamd:security/clamav
 _PROFTPD_MODULE_DISTFILES=	mod_clamav-v0.13${EXTRACT_SUFX}:clamav
 _PROFTPD_MODULE_EXTRACT_ONLY= 	mod_clamav-v0.13${EXTRACT_SUFX}
 _PROFTPD_MODULE_MASTER_SITES=	https://codeload.github.com/jbenden/mod_clamav/legacy.tar.gz/${GH_TAGNAME}?dummy=/:clamav
diff --git a/security/pssh/Makefile b/security/pssh/Makefile
index 48f46b9d0214..3945ba9fd095 100644
--- a/security/pssh/Makefile
+++ b/security/pssh/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Parallel versions of the openssh tools
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index 1f97812b9ba6..7ba43522f692 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Console password management application based on gpg(me)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:security/gnupg1
 
 USES=		ncurses
 USE_GNOME=	libxml2
diff --git a/security/pwman3/Makefile b/security/pwman3/Makefile
index b135bce195a2..a1637ea016ea 100644
--- a/security/pwman3/Makefile
+++ b/security/pwman3/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	Pwman3-${PORTVERSION}
 MAINTAINER=	yarodin@gmail.com
 COMMENT=	Console password management application with sql storage
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-AccessControl/Makefile b/security/py-AccessControl/Makefile
index 56add7a616e6..867663162f22 100644
--- a/security/py-AccessControl/Makefile
+++ b/security/py-AccessControl/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Security framework for Zope2
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-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}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${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.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+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}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${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.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 USES=		python:2.7
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-Products.PlonePAS/Makefile b/security/py-Products.PlonePAS/Makefile
index 4aa40d577ec0..dc226e99224e 100644
--- a/security/py-Products.PlonePAS/Makefile
+++ b/security/py-Products.PlonePAS/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Adapts the PluggableAuthService for use by Plone
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.session>=0:${PORTSDIR}/security/py-plone.session \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/security/py-Products.PluggableAuthService/Makefile b/security/py-Products.PluggableAuthService/Makefile
index fc2ecdb4e91f..fb54937a0526 100644
--- a/security/py-Products.PluggableAuthService/Makefile
+++ b/security/py-Products.PluggableAuthService/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pluggable Zope2 authentication / authorization framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:${PORTSDIR}/devel/py-Products.PluginRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python:2 zope
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-SecretStorage/Makefile b/security/py-SecretStorage/Makefile
index 1d0b304625c1..ecbe206e3e18 100644
--- a/security/py-SecretStorage/Makefile
+++ b/security/py-SecretStorage/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Store passwords using the SecretService DBus API
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 NO_ARCH=	yes
 USES=		python
@@ -21,9 +21,9 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} > 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:${PORTSDIR}/devel/py3-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py3-dbus
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index ea8af18f8193..0e123568da64 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -13,18 +13,18 @@ COMMENT=	ACME protocol implementation in Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:${PORTSDIR}/net/py-ndg_httpsclient \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:${PORTSDIR}/devel/py-pyrfc3339 \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}werkzeug>0:${PORTSDIR}/www/py-werkzeug \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index a400747dcc77..8e641a59dbc1 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -14,7 +14,7 @@ COMMENT=	ForensicArtifacts.com Artifact Repository
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-borg.localrole/Makefile b/security/py-borg.localrole/Makefile
index 27ac4e82c340..1cf649c8c30e 100644
--- a/security/py-borg.localrole/Makefile
+++ b/security/py-borg.localrole/Makefile
@@ -13,16 +13,16 @@ COMMENT=	PAS plugin which can manage local roles via an adapter lookup
 
 LICENSE=	LGPL20
 
-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.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${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}Products.PlonePAS>=0:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${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.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}Products.PlonePAS>=0:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 905e2a6ac0cf..6d432d0580d8 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -19,7 +19,7 @@ BROKEN=		unfetchable
 DEPRECATED=	Not updated since 2008 by upstream and abandoned in favor of pyClamd (security/py-pyclamd)
 EXPIRATION_DATE=	2016-03-31
 
-LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	libclamav.so:security/clamav
 
 DIST_SUBDIR=	python
 USES=		python
diff --git a/security/py-cracklib/Makefile b/security/py-cracklib/Makefile
index 2bd53a4d41aa..e4ebac8668ab 100644
--- a/security/py-cracklib/Makefile
+++ b/security/py-cracklib/Makefile
@@ -6,7 +6,7 @@ COMMENT=	Python bindings for cracklib
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+LIB_DEPENDS=	libcrack.so:security/cracklib
 
 MASTERDIR=	${.CURDIR}/../cracklib
 BUILD_WRKSRC=	${WRKSRC}/python
diff --git a/security/py-crits/Makefile b/security/py-crits/Makefile
index ef98e2b9dcd2..92f961981d92 100644
--- a/security/py-crits/Makefile
+++ b/security/py-crits/Makefile
@@ -21,49 +21,49 @@ USE_PYTHON=		autoplist
 
 USE_APACHE_RUN=	22+
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre  \
-		libcurl.so:${PORTSDIR}/ftp/curl    \
-		libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS+=	libpcre.so:devel/pcre  \
+		libcurl.so:ftp/curl    \
+		libpcap.so:net/libpcap
 
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip     \
-		unrar:${PORTSDIR}/archivers/unrar  \
-		upx:${PORTSDIR}/archivers/upx	   \
-		zip:${PORTSDIR}/archivers/zip	   \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson  \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl             \
-		${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot         \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml               \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy                   \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib         \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml                    \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:${PORTSDIR}/devel/py-dateutil         \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto         \
-		mongodb>2.6.4:${PORTSDIR}/databases/mongodb                                \
-		${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:${PORTSDIR}/databases/pymongo        \
-		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:${PORTSDIR}/devel/py-defusedxml   \
-		${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:${PORTSDIR}/www/py-django16         \
-		${PYTHON_PKGNAMEPREFIX}django-tastypie16>0:${PORTSDIR}/www/py-django16-tastypie \
-		${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine16>=0.4.5:${PORTSDIR}/devel/py-django16-tastypie-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:${PORTSDIR}/security/py-pydeep          \
-		${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:${PORTSDIR}/devel/py-pefile      \
-		${PYTHON_PKGNAMEPREFIX}yara>=2.1.0:${PORTSDIR}/security/py-yara            \
-		${PYTHON_PKGNAMEPREFIX}pynids>=0.6.1:${PORTSDIR}/net/pynids                \
-		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson         \
-		${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp                 \
-		${PYTHON_PKGNAMEPREFIX}billiard>=2.7.3.19:${PORTSDIR}/devel/py-billiard    \
-		${PYTHON_PKGNAMEPREFIX}kombu>=2.5.4:${PORTSDIR}/net/py-kombu               \
-		${PYTHON_PKGNAMEPREFIX}celery>=3.0.12:${PORTSDIR}/devel/py-celery          \
-		${PYTHON_PKGNAMEPREFIX}requests1>=1.1.0_9:${PORTSDIR}/www/py-requests1     \
-		${PKGNAMEPREFIX}pillow>=2.4.0:${PORTSDIR}/graphics/py-pillow               \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:${PORTSDIR}/devel/py-pyparsing     \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.15:${PORTSDIR}/net/py-ldap                \
-		${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic                  \
-		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimeparse     \
-		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.5:${PORTSDIR}/security/py-cybox        \
-		${PYTHON_PKGNAMEPREFIX}stix>=1.1.1.0:${PORTSDIR}/security/py-stix          \
-		${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:${PORTSDIR}/www/mod_wsgi4
+RUN_DEPENDS+=	7z:archivers/p7zip     \
+		unrar:archivers/unrar  \
+		upx:archivers/upx	   \
+		zip:archivers/zip	   \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson  \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl             \
+		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot         \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml               \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy                   \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib         \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml                    \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil         \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto         \
+		mongodb>2.6.4:databases/mongodb                                \
+		${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:databases/pymongo        \
+		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:devel/py-defusedxml   \
+		${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:www/py-django16         \
+		${PYTHON_PKGNAMEPREFIX}django-tastypie16>0:www/py-django16-tastypie \
+		${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine16>=0.4.5:devel/py-django16-tastypie-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:security/py-pydeep          \
+		${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:devel/py-pefile      \
+		${PYTHON_PKGNAMEPREFIX}yara>=2.1.0:security/py-yara            \
+		${PYTHON_PKGNAMEPREFIX}pynids>=0.6.1:net/pynids                \
+		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson         \
+		${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:net/py-amqp                 \
+		${PYTHON_PKGNAMEPREFIX}billiard>=2.7.3.19:devel/py-billiard    \
+		${PYTHON_PKGNAMEPREFIX}kombu>=2.5.4:net/py-kombu               \
+		${PYTHON_PKGNAMEPREFIX}celery>=3.0.12:devel/py-celery          \
+		${PYTHON_PKGNAMEPREFIX}requests1>=1.1.0_9:www/py-requests1     \
+		${PKGNAMEPREFIX}pillow>=2.4.0:graphics/py-pillow               \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing     \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.15:net/py-ldap                \
+		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic                  \
+		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse     \
+		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.5:security/py-cybox        \
+		${PYTHON_PKGNAMEPREFIX}stix>=1.1.1.0:security/py-stix          \
+		${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:www/mod_wsgi4
 
 NO_BUILD=	YES
 
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 97fd2341e66c..6bfa1cd7d987 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Cryptographic recipes and primitives for Python developers
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:${PORTSDIR}/devel/py-cffi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:${PORTSDIR}/devel/py-cffi \
-		${PYTHON_PKGNAMEPREFIX}idna>=2.0:${PORTSDIR}/dns/py-idna
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \
+		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601
 
 USES=		python
 USE_OPENSSL=	yes
@@ -32,11 +32,11 @@ LDFLAGS+=	-L${OPENSSLLIB}
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>0:${PORTSDIR}/net/py-ipaddress
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress
 .endif
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 post-install:
diff --git a/security/py-cybox/Makefile b/security/py-cybox/Makefile
index 93dbbf5875e9..4d2895b9a3d5 100644
--- a/security/py-cybox/Makefile
+++ b/security/py-cybox/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python library for parsing, manipulating, and generating CybOX content
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile
index a0d6b1a5dc15..2b80c1238796 100644
--- a/security/py-dfvfs/Makefile
+++ b/security/py-dfvfs/Makefile
@@ -15,20 +15,20 @@ COMMENT=	Digital Forensics Virtual File System
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	libbde>=a:${PORTSDIR}/devel/libbde \
-		libewf>=0:${PORTSDIR}/devel/libewf \
-		libfsntfs>=e:${PORTSDIR}/devel/libfsntfs \
-		libqcow>=a:${PORTSDIR}/devel/libqcow \
-		libsigscan>=e:${PORTSDIR}/devel/libsigscan \
-		libsmdev>=a:${PORTSDIR}/devel/libsmdev \
-		libsmraw>=a:${PORTSDIR}/devel/libsmraw \
-		libvhdi>=e:${PORTSDIR}/devel/libvhdi \
-		libvmdk>=e:${PORTSDIR}/devel/libvmdk \
-		libvshadow>=0:${PORTSDIR}/devel/libvshadow \
-		${PYTHON_PKGNAMEPREFIX}construct>=0:${PORTSDIR}/devel/py-construct \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=0:${PORTSDIR}/devel/py-protobuf \
-		${PYTHON_PKGNAMEPREFIX}pytsk>=0:${PORTSDIR}/sysutils/py-pytsk \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	libbde>=a:devel/libbde \
+		libewf>=0:devel/libewf \
+		libfsntfs>=e:devel/libfsntfs \
+		libqcow>=a:devel/libqcow \
+		libsigscan>=e:devel/libsigscan \
+		libsmdev>=a:devel/libsmdev \
+		libsmraw>=a:devel/libsmraw \
+		libvhdi>=e:devel/libvhdi \
+		libvmdk>=e:devel/libvmdk \
+		libvshadow>=0:devel/libvshadow \
+		${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index fc192e58e455..83430b1bb011 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Scans log files and bans IP that makes too many password failures
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python shebangfix
 USE_GITHUB=	yes
diff --git a/security/py-flask-httpauth/Makefile b/security/py-flask-httpauth/Makefile
index 05fee223c561..4bcd0e7ac9af 100644
--- a/security/py-flask-httpauth/Makefile
+++ b/security/py-flask-httpauth/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Basic and Digest HTTP authentication for Flask routes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 9332511b8500..58237d3a6923 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python wrapper for GnuPG
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:${PORTSDIR}/sysutils/py-psutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile
index b2e1a9ff5163..58c8d5bf481c 100644
--- a/security/py-gnutls/Makefile
+++ b/security/py-gnutls/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python wrapper for the GNUTLS library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-gpsoauth/Makefile b/security/py-gpsoauth/Makefile
index 77a2a7cd0476..15f16a6fc70b 100644
--- a/security/py-gpsoauth/Makefile
+++ b/security/py-gpsoauth/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Python client library for Google Play Services OAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:${PORTSDIR}/net/py-ndg_httpsclient \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simon-weber
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index f5b305351c83..84b7d32bcc16 100644
--- a/security/py-itsdangerous/Makefile
+++ b/security/py-itsdangerous/Makefile
@@ -17,6 +17,6 @@ USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	JSON
 
-JSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:${PORTSDIR}/devel/py-simplejson
+JSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson
 
 .include <bsd.port.mk>
diff --git a/security/py-keyczar/Makefile b/security/py-keyczar/Makefile
index 119618cc3cdd..2022faa9d78a 100644
--- a/security/py-keyczar/Makefile
+++ b/security/py-keyczar/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Toolkit for safe and simple cryptography
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 5ce9b7b81a4e..4e9791a872e0 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Store and access your passwords safely
 
 LICENSE=	PSFL
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:devel/py-setuptools_scm
 
 NO_ARCH=	yes
 USES=		python
@@ -24,8 +24,8 @@ OPTIONS_DEFAULT=	KEYRINGS_ALT
 DBUS_DESC=		Install Python DBUS to support the kwallet backend
 SECRET_SERVICE_DESC=	Install SecretStorage to support the SecretService backend
 
-DBUS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
-KEYRINGS_ALT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:${PORTSDIR}/security/py-keyrings.alt
-SECRET_SERVICE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:${PORTSDIR}/security/py-SecretStorage
+DBUS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+KEYRINGS_ALT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt
+SECRET_SERVICE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage
 
 .include <bsd.port.mk>
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index 1d297be565b8..b90f00091118 100644
--- a/security/py-keyrings.alt/Makefile
+++ b/security/py-keyrings.alt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Alternate Python keyring implementations
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:devel/py-setuptools_scm
 
 NO_ARCH=	yes
 USES=		python
@@ -25,10 +25,10 @@ KDE_KWALLET_DESC=	Install KDE KWallet to support the kwallet backend
 KEYCZAR_DESC=		Install keyczar to support keyring encryption
 PYFS_DESC=		Install pyfilesystem to support the pyfs backend
 
-ENCRYPTED_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+ENCRYPTED_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto
 GNOME_KEYRING_USE=		GNOME=pygobject3
 KDE_KWALLET_USE=		KDE4=pykde4
-KEYCZAR_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:${PORTSDIR}/security/py-keyczar
-PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:${PORTSDIR}/devel/py-fs
+KEYCZAR_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar
+PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs
 
 .include <bsd.port.mk>
diff --git a/security/py-letsencrypt/Makefile b/security/py-letsencrypt/Makefile
index af042454ee01..5d64410fa51f 100644
--- a/security/py-letsencrypt/Makefile
+++ b/security/py-letsencrypt/Makefile
@@ -13,21 +13,21 @@ COMMENT=	Let's Encrypt client
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme==${PORTVERSION}:${PORTSDIR}/security/py-acme \
-		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:${PORTSDIR}/devel/py-configargparse \
-		${PYTHON_PKGNAMEPREFIX}configobj>0:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=0.7:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}parsedatetime>0:${PORTSDIR}/devel/py-parsedatetime \
-		${PYTHON_PKGNAMEPREFIX}psutil>=2.1.0:${PORTSDIR}/sysutils/py-psutil \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:${PORTSDIR}/devel/py-pyrfc3339 \
-		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:${PORTSDIR}/devel/py-python2-pythondialog \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme==${PORTVERSION}:security/py-acme \
+		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=0.7:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}parsedatetime>0:devel/py-parsedatetime \
+		${PYTHON_PKGNAMEPREFIX}psutil>=2.1.0:sysutils/py-psutil \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
+		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-libnacl/Makefile b/security/py-libnacl/Makefile
index ff7b73f63c77..643f583adbb4 100644
--- a/security/py-libnacl/Makefile
+++ b/security/py-libnacl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for libsodium/tweetnacl based on ctypes
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 1d5a2ffb8dcb..f427a08f8a50 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Crypto and SSL toolkit for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
+BUILD_DEPENDS=	swig3.0:devel/swig30
 
 PYDISTUTILS_BUILDARGS=	build_ext --openssl=${OPENSSLBASE} --swig=${LOCALBASE}/bin/swig3.0
 USE_OPENSSL=	yes
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 2cd5d8f0dbe8..4516483dc3c4 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Comprehensive Python interface to the mcrypt library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 6b50227fdcec..450e0616f10f 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python mhash module
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmhash.so:security/mhash
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-oauth2client/Makefile b/security/py-oauth2client/Makefile
index 8100fe21ae2c..2734fbce3625 100644
--- a/security/py-oauth2client/Makefile
+++ b/security/py-oauth2client/Makefile
@@ -12,11 +12,11 @@ COMMENT=	OAuth 2.0 client library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:${PORTSDIR}/devel/py-pyasn1-modules \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:${PORTSDIR}/www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:${PORTSDIR}/security/py-rsa \
-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \
+		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index 51599acbb5db..4d0978b6939b 100644
--- a/security/py-oauthlib/Makefile
+++ b/security/py-oauthlib/Makefile
@@ -13,10 +13,10 @@ COMMENT=	RFC-compliant implementation of the OAuth request-signing logic
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:${PORTSDIR}/www/py-pyjwt \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt \
+		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker
 
 OPTIONS_DEFINE=		RSA SIGNALS SIGNEDTOKEN
 OPTIONS_DEFAULT=	RSA SIGNALS SIGNEDTOKEN
@@ -25,10 +25,10 @@ RSA_DESC=		Enable RSA Support
 SIGNALS_DESC=		Enable signal support
 SIGNEDTOKEN_DESC=	Support for Signed Token
 
-RSA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography
-SIGNALS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker
-SIGNEDTOKEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography \
-				${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:${PORTSDIR}/www/py-pyjwt
+RSA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography
+SIGNALS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker
+SIGNEDTOKEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
+				${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -38,8 +38,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 post-extract:
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index 094503d0b8d6..4335ad3a5c60 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python interface to the OpenSSL library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index 25e9e479b724..33162ddf1c1f 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python SSH2 protocol library
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}ecdsa>0:${PORTSDIR}/security/py-ecdsa
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile
index 1d93935937be..2b08a28899e7 100644
--- a/security/py-passlib/Makefile
+++ b/security/py-passlib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python password hashing framework supporting over 30 schemes
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.1:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile
index 8dbe167bdf8b..fac69dc438ea 100644
--- a/security/py-plaso/Makefile
+++ b/security/py-plaso/Makefile
@@ -14,38 +14,38 @@ COMMENT=	Automatic creation of a super timeline
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	hachoir-core>=0:${PORTSDIR}/devel/hachoir-core \
-		hachoir-metadata>=0:${PORTSDIR}/sysutils/hachoir-metadata \
-		hachoir-parser>=0:${PORTSDIR}/devel/hachoir-parser \
-		libesedb>=e:${PORTSDIR}/devel/libesedb \
-		libevt>=a:${PORTSDIR}/devel/libevt \
-		libevtx>=a:${PORTSDIR}/devel/libevtx \
-		libfwsi>=e:${PORTSDIR}/devel/libfwsi \
-		liblnk>=0:${PORTSDIR}/devel/liblnk \
-		libmsiecf>=a:${PORTSDIR}/devel/libmsiecf \
-		libolecf>=a:${PORTSDIR}/devel/libolecf \
-		libregf>=a:${PORTSDIR}/devel/libregf \
-		${PYTHON_PKGNAMEPREFIX}artifacts>=0:${PORTSDIR}/security/py-artifacts \
-		${PYTHON_PKGNAMEPREFIX}bencode>=0:${PORTSDIR}/converters/py-bencode \
-		${PYTHON_PKGNAMEPREFIX}binplist>=0:${PORTSDIR}/devel/py-binplist \
-		${PYTHON_PKGNAMEPREFIX}construct>=0:${PORTSDIR}/devel/py-construct \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:${PORTSDIR}/security/py-dfvfs \
-		${PYTHON_PKGNAMEPREFIX}dpkt>=0:${PORTSDIR}/net/py-dpkt \
-		${PYTHON_PKGNAMEPREFIX}ipython>=0:${PORTSDIR}/devel/ipython \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}pefile>=0:${PORTSDIR}/devel/py-pefile \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=0:${PORTSDIR}/devel/py-protobuf \
-		${PYTHON_PKGNAMEPREFIX}psutil121>=0:${PORTSDIR}/sysutils/py-psutil121 \
-		${PYTHON_PKGNAMEPREFIX}pyelasticsearch>=0:${PORTSDIR}/textproc/py-pyelasticsearch \
-		${PYTHON_PKGNAMEPREFIX}pytsk>=0:${PORTSDIR}/sysutils/py-pytsk \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:${PORTSDIR}/net/py-pyzmq \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:${PORTSDIR}/textproc/py-xlsxwriter \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	hachoir-core>=0:devel/hachoir-core \
+		hachoir-metadata>=0:sysutils/hachoir-metadata \
+		hachoir-parser>=0:devel/hachoir-parser \
+		libesedb>=e:devel/libesedb \
+		libevt>=a:devel/libevt \
+		libevtx>=a:devel/libevtx \
+		libfwsi>=e:devel/libfwsi \
+		liblnk>=0:devel/liblnk \
+		libmsiecf>=a:devel/libmsiecf \
+		libolecf>=a:devel/libolecf \
+		libregf>=a:devel/libregf \
+		${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts \
+		${PYTHON_PKGNAMEPREFIX}bencode>=0:converters/py-bencode \
+		${PYTHON_PKGNAMEPREFIX}binplist>=0:devel/py-binplist \
+		${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs \
+		${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt \
+		${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
+		${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \
+		${PYTHON_PKGNAMEPREFIX}pyelasticsearch>=0:textproc/py-pyelasticsearch \
+		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/security/py-plone.app.openid/Makefile b/security/py-plone.app.openid/Makefile
index 6b9335ff17de..f7c485605738 100644
--- a/security/py-plone.app.openid/Makefile
+++ b/security/py-plone.app.openid/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Plone OpenID authentication support
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.openid>=0:${PORTSDIR}/security/py-plone.openid \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${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}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${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}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/security/py-plone.keyring/Makefile b/security/py-plone.keyring/Makefile
index 46bddd869184..4019ecdd7f21 100644
--- a/security/py-plone.keyring/Makefile
+++ b/security/py-plone.keyring/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Manage secrets
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-plone.openid/Makefile b/security/py-plone.openid/Makefile
index d90979ba0d60..a8a6bc18f0e9 100644
--- a/security/py-plone.openid/Makefile
+++ b/security/py-plone.openid/Makefile
@@ -13,11 +13,11 @@ COMMENT=	OpenID authentication support for PAS
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-openid>=0:${PORTSDIR}/security/py-python-openid \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/security/py-plone.protect/Makefile b/security/py-plone.protect/Makefile
index 28c79c6698b3..4179be79369d 100644
--- a/security/py-plone.protect/Makefile
+++ b/security/py-plone.protect/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Security for browser forms
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:${PORTSDIR}/security/py-plone.keyring \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/security/py-plone.session/Makefile b/security/py-plone.session/Makefile
index 0f5a715816db..e09d48804f97 100644
--- a/security/py-plone.session/Makefile
+++ b/security/py-plone.session/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Session based authentication for Zope
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.protect>=0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index a7dfad131b62..368ff6cd763b 100644
--- a/security/py-potr/Makefile
+++ b/security/py-potr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pure Python Off-The-Record encryption
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-pyaff4/Makefile b/security/py-pyaff4/Makefile
index fe3a7ea812f2..da9bc1ce7306 100644
--- a/security/py-pyaff4/Makefile
+++ b/security/py-pyaff4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python Advanced Forensic Format Version 4 library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:${PORTSDIR}/devel/py-intervaltree \
-		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:${PORTSDIR}/archivers/py-python-snappy \
-		${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:${PORTSDIR}/textproc/py-rdflib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \
+		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:archivers/py-python-snappy \
+		${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:textproc/py-rdflib
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile
index 87e3bffd14d2..a1fa4f46becd 100644
--- a/security/py-pycrypto/Makefile
+++ b/security/py-pycrypto/Makefile
@@ -23,7 +23,7 @@ GMP_DESC=		Use GMP for faster DSA/RSA operations
 GMP_CONFIGURE_WITH=	gmp
 GMP_CPPFLAGS=		-I${LOCALBASE}/include
 GMP_LDFLAGS=		-L${LOCALBASE}/lib
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 pre-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/setup.py
diff --git a/security/py-pycryptopp/Makefile b/security/py-pycryptopp/Makefile
index 8de478b8c29d..0340a0d3211b 100644
--- a/security/py-pycryptopp/Makefile
+++ b/security/py-pycryptopp/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python Wrappers for the Crypto++ Library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}darcsver>0:${PORTSDIR}/devel/py-darcsver \
-		${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:${PORTSDIR}/devel/py-setuptools_darcs
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver \
+		${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/security/py-pydeep/Makefile b/security/py-pydeep/Makefile
index 9b9c2315c6e2..3f3ccc0aa1a0 100644
--- a/security/py-pydeep/Makefile
+++ b/security/py-pydeep/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for ssdeep
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libfuzzy.so:${PORTSDIR}/security/ssdeep
+LIB_DEPENDS=	libfuzzy.so:security/ssdeep
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-pyelliptic/Makefile b/security/py-pyelliptic/Makefile
index 61d79bf4e2cd..e928fa3ab1b6 100644
--- a/security/py-pyelliptic/Makefile
+++ b/security/py-pyelliptic/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python OpenSSL wrapper
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yann2192
diff --git a/security/py-pymacaroons-pynacl/Makefile b/security/py-pymacaroons-pynacl/Makefile
index a275e01acca6..05c11bcd570b 100644
--- a/security/py-pymacaroons-pynacl/Makefile
+++ b/security/py-pymacaroons-pynacl/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Macaroon library for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:${PORTSDIR}/security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:${PORTSDIR}/devel/py-hypothesis \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=           python
 USE_GITHUB=	yes
diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile
index d88ccdf86260..6287d86c37f0 100644
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python interface to GPGME library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+BUILD_DEPENDS=	swig1.3:devel/swig13
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 USES=		gmake python:2
 USE_PYTHON=	distutils
diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile
index ed748d50635c..31251dafa603 100644
--- a/security/py-pynacl/Makefile
+++ b/security/py-pynacl/Makefile
@@ -15,10 +15,10 @@ COMMENT=	PyNaCl is a Python binding to the Networking and Cryptography library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile
index 2c67ddfb819b..22a9ffabadbb 100644
--- a/security/py-pysaml2/Makefile
+++ b/security/py-pysaml2/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Python implementation of SAML Version 2
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}requests>1.0.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}Paste>0:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>0:${PORTSDIR}/devel/py-repoze.who \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		xmlsec1:${PORTSDIR}/security/xmlsec1
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}responses>0:${PORTSDIR}/devel/py-responses
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		xmlsec1:security/xmlsec1
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-pyscard/Makefile b/security/py-pyscard/Makefile
index b8726382a978..3901e3edaa6b 100644
--- a/security/py-pyscard/Makefile
+++ b/security/py-pyscard/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Smartcard module for Python
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13 \
-		pcsc-lite>0:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS=	pcsc-lite>0:${PORTSDIR}/devel/pcsc-lite
+BUILD_DEPENDS=	swig1.3:devel/swig13 \
+		pcsc-lite>0:devel/pcsc-lite
+RUN_DEPENDS=	pcsc-lite>0:devel/pcsc-lite
 
 ## Python3 is supported
 USES=		python:2.7+
diff --git a/security/py-python-registry/Makefile b/security/py-python-registry/Makefile
index 14feb902c69e..b1fd19dd4631 100644
--- a/security/py-python-registry/Makefile
+++ b/security/py-python-registry/Makefile
@@ -28,7 +28,7 @@ PORTEXAMPLES=	*
 .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
 
 post-install:
diff --git a/security/py-python-social-auth/Makefile b/security/py-python-social-auth/Makefile
index fcf7ce7baed5..65eeeee4ad08 100644
--- a/security/py-python-social-auth/Makefile
+++ b/security/py-python-social-auth/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Python Social Auth is a social authentication/registration mechanism
 
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:${PORTSDIR}/security/py-python-openid \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:${PORTSDIR}/security/py-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:${PORTSDIR}/www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:${PORTSDIR}/www/py-pyjwt
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-rekall-core/Makefile b/security/py-rekall-core/Makefile
index 9f876d7808e9..9bf633a43fe4 100644
--- a/security/py-rekall-core/Makefile
+++ b/security/py-rekall-core/Makefile
@@ -12,18 +12,18 @@ COMMENT=	CORE component of the Rekall framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
-		${PYTHON_PKGNAMEPREFIX}acora>=1.8:${PORTSDIR}/textproc/py-acora \
-		${PYTHON_PKGNAMEPREFIX}PyAFF4>=0.17:${PORTSDIR}/security/py-pyaff4 \
-		${PYTHON_PKGNAMEPREFIX}capstone>=0:${PORTSDIR}/devel/py-capstone \
-		${PYTHON_PKGNAMEPREFIX}distorm>=0:${PORTSDIR}/devel/py-distorm \
-		${PYTHON_PKGNAMEPREFIX}efilter>=1438631774:${PORTSDIR}/devel/py-efilter \
-		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.0.4:${PORTSDIR}/devel/py-intervaltree \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.3.1:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.22:${PORTSDIR}/devel/py-pyelftools \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2012:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}yaml>=2.10:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:${PORTSDIR}/security/py-yara
+RUN_DEPENDS=	cabextract:archivers/cabextract \
+		${PYTHON_PKGNAMEPREFIX}acora>=1.8:textproc/py-acora \
+		${PYTHON_PKGNAMEPREFIX}PyAFF4>=0.17:security/py-pyaff4 \
+		${PYTHON_PKGNAMEPREFIX}capstone>=0:devel/py-capstone \
+		${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \
+		${PYTHON_PKGNAMEPREFIX}efilter>=1438631774:devel/py-efilter \
+		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.0.4:devel/py-intervaltree \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.3.1:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.22:devel/py-pyelftools \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}yaml>=2.10:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-rekall/Makefile b/security/py-rekall/Makefile
index 65fc331406da..a703637234bd 100644
--- a/security/py-rekall/Makefile
+++ b/security/py-rekall/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Memory forensics analysis framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:${PORTSDIR}/security/py-rekall-core \
-		${PYTHON_PKGNAMEPREFIX}rekall_gui>=1.4.0:${PORTSDIR}/security/py-rekall_gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:security/py-rekall-core \
+		${PYTHON_PKGNAMEPREFIX}rekall_gui>=1.4.0:security/py-rekall_gui
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-rekall_gui/Makefile b/security/py-rekall_gui/Makefile
index 27165340cade..e281e9c0a2d8 100644
--- a/security/py-rekall_gui/Makefile
+++ b/security/py-rekall_gui/Makefile
@@ -13,13 +13,13 @@ COMMENT=	GUI component of the Rekall framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codegen>=1.0:${PORTSDIR}/devel/py-codegen \
-		${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:${PORTSDIR}/www/py-flask-sockets \
-		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:${PORTSDIR}/www/py-gevent-websocket \
-		${PYTHON_PKGNAMEPREFIX}ipython>=3.0.0:${PORTSDIR}/devel/ipython \
-		${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:${PORTSDIR}/security/py-rekall-core
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codegen>=1.0:devel/py-codegen \
+		${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:www/py-flask-sockets \
+		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:www/py-gevent-websocket \
+		${PYTHON_PKGNAMEPREFIX}ipython>=3.0.0:devel/ipython \
+		${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:security/py-rekall-core
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	manuskript/static/bower_components/bootstrap/test-infra/uncached-npm-install.sh
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 5ac314d7c66f..4ceeb08f521b 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Kerberos authentication handler for python-requests
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>1.1.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:${PORTSDIR}/security/py-kerberos
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index df0802c2bb73..a9e02e4091bb 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pure-Python RSA implementation
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:${PORTSDIR}/devel/py-pyasn1
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-scrypt/Makefile b/security/py-scrypt/Makefile
index c73dee81ff75..e7f4cf0e060e 100644
--- a/security/py-scrypt/Makefile
+++ b/security/py-scrypt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bindings for the scrypt key derivation function library
 
 LICENSE=	BSD2CLAUSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index c75fc9e4ed7a..2bab7ac8a47e 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Service identity verification for pyOpenSSL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=15.2:${PORTSDIR}/devel/py-attrs \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.15:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:${PORTSDIR}/devel/py-pyasn1-modules \
-		${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:${PORTSDIR}/devel/py-characteristic
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules \
+		${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile
index 41672c6fd4b8..ff41765821b5 100644
--- a/security/py-signedjson/Makefile
+++ b/security/py-signedjson/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sign JSON with Ed25519 signatures
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:${PORTSDIR}/security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:${PORTSDIR}/devel/py-unpaddedbase64 \
-		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:${PORTSDIR}/devel/py-canonicaljson
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
+		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64 \
+		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/security/py-ssh/Makefile b/security/py-ssh/Makefile
index ad34ca20696d..cc6550a4f4e0 100644
--- a/security/py-ssh/Makefile
+++ b/security/py-ssh/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Python SSH2 protocol library
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-sslstrip/Makefile b/security/py-sslstrip/Makefile
index 978536ec6ac1..e541a5dbceac 100644
--- a/security/py-sslstrip/Makefile
+++ b/security/py-sslstrip/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	kitchetech@gmail.com
 COMMENT=	Python program for SSL stripping
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 USES=		python twisted:web
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-stix/Makefile b/security/py-stix/Makefile
index 4e11fd2b71f6..c0ca4da74e31 100644
--- a/security/py-stix/Makefile
+++ b/security/py-stix/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python library for parsing, manipulating, and generating STIX content
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.9:${PORTSDIR}/security/py-cybox
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.9:security/py-cybox
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index fdf7898030b8..e6c813775dc4 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SSH and SFTP protocol implementation with clients and servers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.0.9a:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.0.9a:devel/py-pyasn1
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-volatility/Makefile b/security/py-volatility/Makefile
index 55d2eb1b9c7b..01094ade6e6c 100644
--- a/security/py-volatility/Makefile
+++ b/security/py-volatility/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Advanced memory forensics framework
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}distorm>=0:${PORTSDIR}/devel/py-distorm \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:${PORTSDIR}/security/py-yara \
-		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:${PORTSDIR}/textproc/py-openpyxl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara \
+		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile
index 63d0229b0c32..a29d5a9ab74f 100644
--- a/security/py-xmlsec/Makefile
+++ b/security/py-xmlsec/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Python bindings for XML Security Library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxmlsec1.so:${PORTSDIR}/security/xmlsec1
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+LIB_DEPENDS=	libxmlsec1.so:security/xmlsec1
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/security/py-yara-editor/Makefile b/security/py-yara-editor/Makefile
index 2d25e6a43a60..d8c99bf09166 100644
--- a/security/py-yara-editor/Makefile
+++ b/security/py-yara-editor/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Editor for yara rules
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:${PORTSDIR}/security/py-yara
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile
index 4a9354531836..234122fa3c05 100644
--- a/security/py-yara/Makefile
+++ b/security/py-yara/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for yara
 USE_GITHUB=	yes
 GH_ACCOUNT=	plusvic
 
-LIB_DEPENDS=	libyara.so:${PORTSDIR}/security/yara
+LIB_DEPENDS=	libyara.so:security/yara
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.authentication/Makefile b/security/py-zope.app.authentication/Makefile
index e206ec24cdfa..803268f390e4 100644
--- a/security/py-zope.app.authentication/Makefile
+++ b/security/py-zope.app.authentication/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Principals and groups management for the pluggable authentication
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${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.formlib>=4.0.2:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:${PORTSDIR}/security/py-zope.password \
-		${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:${PORTSDIR}/security/py-zope.pluggableauth \
-		${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.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
-		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0: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.formlib>=4.0.2:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \
+		${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth \
+		${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.app.container>=0:devel/py-zope.app.container \
+		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.localpermission/Makefile b/security/py-zope.app.localpermission/Makefile
index 1d2cf7488943..5a1f334ee331 100644
--- a/security/py-zope.app.localpermission/Makefile
+++ b/security/py-zope.app.localpermission/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Local Persistent Permissions for zope.security
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${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.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${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.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.principalannotation/Makefile b/security/py-zope.app.principalannotation/Makefile
index 3ef2e0eeddf7..6bf8ce331a9f 100644
--- a/security/py-zope.app.principalannotation/Makefile
+++ b/security/py-zope.app.principalannotation/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Bootstrap subscriber and browser menu item for zope.principalannotation
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${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.principalannotation>=0:${PORTSDIR}/security/py-zope.principalannotation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${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.principalannotation>=0:security/py-zope.principalannotation
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.security/Makefile b/security/py-zope.app.security/Makefile
index 9053aa02dc31..fefaf856e045 100644
--- a/security/py-zope.app.security/Makefile
+++ b/security/py-zope.app.security/Makefile
@@ -13,18 +13,18 @@ COMMENT=	ZMI Views For Zope3 Security Components
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:${PORTSDIR}/security/py-zope.app.localpermission \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${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.principalregistry>=0:${PORTSDIR}/security/py-zope.principalregistry \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:${PORTSDIR}/security/py-zope.securitypolicy \
-		${PYTHON_PKGNAMEPREFIX}zope.login>=0:${PORTSDIR}/security/py-zope.login
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${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.principalregistry>=0:security/py-zope.principalregistry \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy \
+		${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.securitypolicy/Makefile b/security/py-zope.app.securitypolicy/Makefile
index 092a27d5ae93..9c71eecba148 100644
--- a/security/py-zope.app.securitypolicy/Makefile
+++ b/security/py-zope.app.securitypolicy/Makefile
@@ -13,21 +13,21 @@ COMMENT=	ZMI-based management views for zope.securitypolicy
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:${PORTSDIR}/security/py-zope.app.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:${PORTSDIR}/security/py-zope.app.security \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2:${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.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:${PORTSDIR}/security/py-zope.securitypolicy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2: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.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.authentication/Makefile b/security/py-zope.authentication/Makefile
index b826b2928ebf..0b46d99bb4be 100644
--- a/security/py-zope.authentication/Makefile
+++ b/security/py-zope.authentication/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Definition of authentication basics for the Zope Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.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.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.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 zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.login/Makefile b/security/py-zope.login/Makefile
index 1360369cb5b9..22890dcb9fcb 100644
--- a/security/py-zope.login/Makefile
+++ b/security/py-zope.login/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Login helpers for zope.publisher / authentication
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${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.authentication>=0:security/py-zope.authentication \
+		${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 zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.password/Makefile b/security/py-zope.password/Makefile
index 9cfc82447b09..f57d6aa8c9c9 100644
--- a/security/py-zope.password/Makefile
+++ b/security/py-zope.password/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Password encoding and checking utilities
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${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
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.pluggableauth/Makefile b/security/py-zope.pluggableauth/Makefile
index a492e9216c7d..a9b1c1d47f43 100644
--- a/security/py-zope.pluggableauth/Makefile
+++ b/security/py-zope.pluggableauth/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Pluggable Authentication Utility
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:${PORTSDIR}/security/py-zope.password \
-		${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.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.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \
+		${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.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/security/py-zope.principalannotation/Makefile b/security/py-zope.principalannotation/Makefile
index 0ca39d7a9524..832add9268da 100644
--- a/security/py-zope.principalannotation/Makefile
+++ b/security/py-zope.principalannotation/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Annotations for Zope Principals
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.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.site>=0:${PORTSDIR}/devel/py-zope.site
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.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.site>=0:devel/py-zope.site
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.principalregistry/Makefile b/security/py-zope.principalregistry/Makefile
index 482fd6b716af..2c02d3549788 100644
--- a/security/py-zope.principalregistry/Makefile
+++ b/security/py-zope.principalregistry/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Global principal registry component for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=0:${PORTSDIR}/security/py-zope.password \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.security/Makefile b/security/py-zope.security/Makefile
index eb6bcf67bcd9..64f4e14ba072 100644
--- a/security/py-zope.security/Makefile
+++ b/security/py-zope.security/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Zope Security Framework
 
 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.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+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.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.securitypolicy/Makefile b/security/py-zope.securitypolicy/Makefile
index 01b5678ac1db..80ce543eed74 100644
--- a/security/py-zope.securitypolicy/Makefile
+++ b/security/py-zope.securitypolicy/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Default security policy for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${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.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 \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:${PORTSDIR}/devel/py-zope.dublincore
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${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.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.session/Makefile b/security/py-zope.session/Makefile
index 92fc48ac8eb1..75f2c06e0865 100644
--- a/security/py-zope.session/Makefile
+++ b/security/py-zope.session/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Client identification and sessions for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${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.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:${PORTSDIR}/devel/py-zope.minmax
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${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.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index e38766c397ab..4719eb52bc49 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -42,7 +42,7 @@ PORTEXAMPLES=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCI}
-RUN_DEPENDS+=	${KMODDIR}/quantis.ko:${PORTSDIR}/security/quantis-kmod
+RUN_DEPENDS+=	${KMODDIR}/quantis.ko:security/quantis-kmod
 .else
 CMAKE_ARGS+=	-DDISABLE_QUANTIS_PCI=1
 .endif
@@ -69,7 +69,7 @@ PLIST_SUB+=	COMPAT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTOOL}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libboost_date_time.a:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libboost_date_time.a:devel/boost-libs
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 . if ${PORT_OPTIONS:MGUI}
diff --git a/security/rats/Makefile b/security/rats/Makefile
index 7878919cc781..bb6f337f4b51 100644
--- a/security/rats/Makefile
+++ b/security/rats/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Source code auditing tool
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/security/razorback-api/Makefile b/security/razorback-api/Makefile
index 2dc03d19d7d2..649cf301d034 100644
--- a/security/razorback-api/Makefile
+++ b/security/razorback-api/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Framework for an intelligence driven security solution - API
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libconfig.so:devel/libconfig \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libcurl.so:ftp/curl \
+		libjson-c.so:devel/json-c
 
 OPTIONS_DEFINE=	DEBUG ASSERT CNC_DEBUG STOMP_DEBUG
 
diff --git a/security/razorback-archiveInflate/Makefile b/security/razorback-archiveInflate/Makefile
index b8353695e6b8..74695583b062 100644
--- a/security/razorback-archiveInflate/Makefile
+++ b/security/razorback-archiveInflate/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Archive Inflator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-clamavNugget/Makefile b/security/razorback-clamavNugget/Makefile
index a376fb1c22f3..0fd1349a8646 100644
--- a/security/razorback-clamavNugget/Makefile
+++ b/security/razorback-clamavNugget/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Framework for an intelligence driven security - ClamAV Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libclamav.so:${PORTSDIR}/security/clamav
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libclamav.so:security/clamav
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 USES=		autoreconf libtool pkgconfig
 RB_LIBDIR?=	${PREFIX}/lib/razorback
diff --git a/security/razorback-dispatcher/Makefile b/security/razorback-dispatcher/Makefile
index cf39fc7f0788..5087391e5e0d 100644
--- a/security/razorback-dispatcher/Makefile
+++ b/security/razorback-dispatcher/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Dispatcher
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libmemcached.so:${PORTSDIR}/databases/libmemcached \
-		libcli.so:${PORTSDIR}/devel/libcli
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libmemcached.so:databases/libmemcached \
+		libcli.so:devel/libcli
 
 USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -41,7 +41,7 @@ DEBUG_CONFIGURE_ENABLE=	debug
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MACTIVEMQ}
-RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/activemq:${PORTSDIR}/net/activemq
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/activemq:net/activemq
 SUB_LIST=	ACTIVEMQ="activemq " ACTIVEMQ_LOC="local" \
 		ACTIVEMQ_LOCATION="in the ActiveMQ configuration directory:" \
 		ACTIVEMQ_CONFIG="${LOCALBASE}/etc/activemq/"
diff --git a/security/razorback-fileInject/Makefile b/security/razorback-fileInject/Makefile
index bb518f52dbe5..b462e75e4c42 100644
--- a/security/razorback-fileInject/Makefile
+++ b/security/razorback-fileInject/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Framework for an intelligence driven security - File Injector
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
 
 OPTIONS_DEFINE=	DEBUG ASSERT
 
diff --git a/security/razorback-fsMonitor/Makefile b/security/razorback-fsMonitor/Makefile
index ed55bec0ea6d..3bc1957ed6a1 100644
--- a/security/razorback-fsMonitor/Makefile
+++ b/security/razorback-fsMonitor/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Framework for an intelligence driven security - File System Monitor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libfam.so:${PORTSDIR}/devel/fam
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libfam.so:devel/fam
 
 USES=		autoreconf libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-fsWalk/Makefile b/security/razorback-fsWalk/Makefile
index 0415f47db214..3de8f78fed1d 100644
--- a/security/razorback-fsWalk/Makefile
+++ b/security/razorback-fsWalk/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Framework for an intelligence driven security - File System Walker
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig
diff --git a/security/razorback-masterNugget/Makefile b/security/razorback-masterNugget/Makefile
index 806b3fc6d6df..7916efd1d118 100644
--- a/security/razorback-masterNugget/Makefile
+++ b/security/razorback-masterNugget/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Framework for an intelligence driven security - Master Nugget
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
 
 USES=		autoreconf libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-officeCat/Makefile b/security/razorback-officeCat/Makefile
index aa534e2c31b5..d1f9332d9080 100644
--- a/security/razorback-officeCat/Makefile
+++ b/security/razorback-officeCat/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Framework for an intelligence driven security - OfficeCat Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
-		wine:${PORTSDIR}/emulators/wine
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
-		wine:${PORTSDIR}/emulators/wine
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget \
+		wine:emulators/wine
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget \
+		wine:emulators/wine
 
 USES=		autoreconf libtool pkgconfig
 
diff --git a/security/razorback-pdfFox/Makefile b/security/razorback-pdfFox/Makefile
index 38cffdabd8e0..c8ff92711b7d 100644
--- a/security/razorback-pdfFox/Makefile
+++ b/security/razorback-pdfFox/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - PDF Fox
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-scriptNugget/Makefile b/security/razorback-scriptNugget/Makefile
index ea267e67b904..68b22022b196 100644
--- a/security/razorback-scriptNugget/Makefile
+++ b/security/razorback-scriptNugget/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Framework for an intelligence driven security - Scripting Interface
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
-		rubygem-razorback-scriptNugget>=0.5.0:${PORTSDIR}/security/rubygem-razorback-scriptNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget \
+		rubygem-razorback-scriptNugget>=0.5.0:security/rubygem-razorback-scriptNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 USES=		autoreconf libtool pkgconfig
diff --git a/security/razorback-swfScanner/Makefile b/security/razorback-swfScanner/Makefile
index 0662c9308ec3..9d1217377039 100644
--- a/security/razorback-swfScanner/Makefile
+++ b/security/razorback-swfScanner/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - SWF Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-syslogNugget/Makefile b/security/razorback-syslogNugget/Makefile
index 49363b489c2c..c623a25a911d 100644
--- a/security/razorback-syslogNugget/Makefile
+++ b/security/razorback-syslogNugget/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Syslog Output
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 USES=		autoreconf libtool pkgconfig
 RB_LIBDIR?=	${PREFIX}/lib/razorback
diff --git a/security/razorback-virusTotal/Makefile b/security/razorback-virusTotal/Makefile
index 32f7916bc0d7..286c883a64d4 100644
--- a/security/razorback-virusTotal/Makefile
+++ b/security/razorback-virusTotal/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Virus Total Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-yaraNugget/Makefile b/security/razorback-yaraNugget/Makefile
index 7e25b5f9dcc6..3fa9a40352d9 100644
--- a/security/razorback-yaraNugget/Makefile
+++ b/security/razorback-yaraNugget/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Framework for an intelligence driven security - Yara Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libpcre.so:${PORTSDIR}/devel/pcre
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libpcre.so:devel/pcre
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/regripper/Makefile b/security/regripper/Makefile
index 50d44e05cc47..a92c62bd4f7b 100644
--- a/security/regripper/Makefile
+++ b/security/regripper/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tool for registry analysis in forensics examinations
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry
+RUN_DEPENDS=	p5-Parse-Win32Registry>=0:devel/p5-Parse-Win32Registry
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keydet89
diff --git a/security/reop/Makefile b/security/reop/Makefile
index 8859860078cc..f98908658449 100644
--- a/security/reop/Makefile
+++ b/security/reop/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	security
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Reasonable Expectation Of Privacy
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=		gmake
 USE_GITHUB=	yes
diff --git a/security/retranslator/Makefile b/security/retranslator/Makefile
index 2d66833cce56..0b50c588f2e3 100644
--- a/security/retranslator/Makefile
+++ b/security/retranslator/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-LIB_DEPENDS+=	libm.so:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS+=	libm.so:misc/compat6x
 
 do-configure:
 
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 1286369e25dd..67b7d95ec642 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Password manager for the GNOME 2 desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+LIB_DEPENDS=	libcrack.so:security/cracklib
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}cracklib>0:${PORTSDIR}/security/py-cracklib
+		${PYTHON_PKGNAMEPREFIX}cracklib>0:security/py-cracklib
 
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig python \
 		shared-mime-info shebangfix tar:bzip2
diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index fdaa1ba85c0f..fae6d5578468 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	LSOF NMAP DOCS
 OPTIONS_DEFAULT=LSOF
 
-RUN_DEPENDS+=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS+=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		${LOCALBASE}/bin/wget:ftp/wget
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	files/check_modules.pl files/filehashsha.pl \
@@ -26,8 +26,8 @@ SUB_FILES=	415.${PORTNAME}
 
 PORTDOCS=	ACKNOWLEDGMENTS CHANGELOG FAQ LICENSE README
 
-LSOF_RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
+LSOF_RUN_DEPENDS=	lsof:sysutils/lsof
+NMAP_RUN_DEPENDS=	nmap:security/nmap
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|{SHAREDIR}/man/man8|{PREFIX}/man/man8|g' \
diff --git a/security/ruby-password/Makefile b/security/ruby-password/Makefile
index 2cbdd40af3f2..4c18a996be98 100644
--- a/security/ruby-password/Makefile
+++ b/security/ruby-password/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby library to create, verify, and manipulate passwords
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
-RUN_DEPENDS=	rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios
+LIB_DEPENDS=	libcrack.so:security/cracklib
+RUN_DEPENDS=	rubygem-ruby-termios>=0:comms/rubygem-ruby-termios
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 1fee3582bed3..72eb15cfee40 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	TCP wrappers library for Ruby
 
-LIB_DEPENDS=	libident.so:${PORTSDIR}/security/libident
+LIB_DEPENDS=	libident.so:security/libident
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/security/rubygem-bcrypt-ruby/Makefile b/security/rubygem-bcrypt-ruby/Makefile
index 5da50b7b0547..e21a6ee1f5ff 100644
--- a/security/rubygem-bcrypt-ruby/Makefile
+++ b/security/rubygem-bcrypt-ruby/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Sophisticated and secure hash algorithm for passwords
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-bcrypt>=3.1.3:${PORTSDIR}/security/rubygem-bcrypt
+RUN_DEPENDS=	rubygem-bcrypt>=3.1.3:security/rubygem-bcrypt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-devise-two-factor/Makefile b/security/rubygem-devise-two-factor/Makefile
index f84c8757f7fe..89c72ad83d5f 100644
--- a/security/rubygem-devise-two-factor/Makefile
+++ b/security/rubygem-devise-two-factor/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Barebones two-factor authentication with Devise
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-attr_encrypted>=1.3:${PORTSDIR}/security/rubygem-attr_encrypted \
-		rubygem-devise-rails4>=3.5:${PORTSDIR}/devel/rubygem-devise-rails4 \
-		rubygem-railties4>=0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-rotp>=2.0:${PORTSDIR}/devel/rubygem-rotp
+RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \
+		rubygem-devise-rails4>=3.5:devel/rubygem-devise-rails4 \
+		rubygem-railties4>=0:www/rubygem-railties4 \
+		rubygem-rotp>=2.0:devel/rubygem-rotp
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-doorkeeper/Makefile b/security/rubygem-doorkeeper/Makefile
index fbe34533d281..8b2da8ee4c7c 100644
--- a/security/rubygem-doorkeeper/Makefile
+++ b/security/rubygem-doorkeeper/Makefile
@@ -19,8 +19,8 @@ RAILTIES4_DESC=	Use Railties 4
 
 OPTIONS_DEFAULT=	RAILTIES4
 
-RAILTIES_RUN_DEPENDS=	rubygem-railties>=3.2:${PORTSDIR}/www/rubygem-railties
-RAILTIES4_RUN_DEPENDS=	rubygem-railties4>=4.0:${PORTSDIR}/www/rubygem-railties4
+RAILTIES_RUN_DEPENDS=	rubygem-railties>=3.2:www/rubygem-railties
+RAILTIES4_RUN_DEPENDS=	rubygem-railties4>=4.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-gpgr/Makefile b/security/rubygem-gpgr/Makefile
index bbf5d506f4c1..f61fb7fc1e47 100644
--- a/security/rubygem-gpgr/Makefile
+++ b/security/rubygem-gpgr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Very light interface to the command-line GPG tool
 
 LICENSE=	RUBY
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:security/gnupg
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-gssapi/Makefile b/security/rubygem-gssapi/Makefile
index df9c16216f83..62d56d38c472 100644
--- a/security/rubygem-gssapi/Makefile
+++ b/security/rubygem-gssapi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby FFI Library wrapper for GSSAPI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ffi>=1.9.3:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.9.3:devel/rubygem-ffi
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-jugyo-twitter_oauth/Makefile b/security/rubygem-jugyo-twitter_oauth/Makefile
index 5c481cd9432b..1b9fc7203cf9 100644
--- a/security/rubygem-jugyo-twitter_oauth/Makefile
+++ b/security/rubygem-jugyo-twitter_oauth/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fork of Twitter OAuth REST API client library for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.1.9:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-oauth>=0.4.1:${PORTSDIR}/net/rubygem-oauth
+RUN_DEPENDS=	rubygem-json>=1.1.9:devel/rubygem-json \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-oauth>=0.4.1:net/rubygem-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-metasploit-concern/Makefile b/security/rubygem-metasploit-concern/Makefile
index 7e8320c8500b..8022ee037c66 100644
--- a/security/rubygem-metasploit-concern/Makefile
+++ b/security/rubygem-metasploit-concern/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Automatically include Modules from app/concerns
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-activesupport>=3.0.0:devel/rubygem-activesupport \
+		rubygem-railties>=3.0.0:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-metasploit-credential/Makefile b/security/rubygem-metasploit-credential/Makefile
index 299b686e6429..e6d92b2c41a1 100644
--- a/security/rubygem-metasploit-credential/Makefile
+++ b/security/rubygem-metasploit-credential/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Credential models for metasploit-framework and Metasploit Pro
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-metasploit-concern>=0.4.0:${PORTSDIR}/security/rubygem-metasploit-concern \
-		rubygem-metasploit_data_models>=0.24.0,2:${PORTSDIR}/security/rubygem-metasploit_data_models \
-		rubygem-metasploit-model>=0.29.0:${PORTSDIR}/security/rubygem-metasploit-model \
-		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-rubyntlm>=0:${PORTSDIR}/net/rubygem-rubyntlm \
-		rubygem-rubyzip>=1.1:${PORTSDIR}/archivers/rubygem-rubyzip
+RUN_DEPENDS=	rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-concern \
+		rubygem-metasploit_data_models>=0.24.0,2:security/rubygem-metasploit_data_models \
+		rubygem-metasploit-model>=0.29.0:security/rubygem-metasploit-model \
+		rubygem-pg>=0:databases/rubygem-pg \
+		rubygem-railties>=3.0.0:www/rubygem-railties \
+		rubygem-rubyntlm>=0:net/rubygem-rubyntlm \
+		rubygem-rubyzip>=1.1:archivers/rubygem-rubyzip
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-metasploit-model/Makefile b/security/rubygem-metasploit-model/Makefile
index ee75b1773cb6..68c2aafa178c 100644
--- a/security/rubygem-metasploit-model/Makefile
+++ b/security/rubygem-metasploit-model/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Metasploit Model Mixins and Validators
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-railties>=3.0.0:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-metasploit_data_models/Makefile b/security/rubygem-metasploit_data_models/Makefile
index c6bafda24674..a160231614ac 100644
--- a/security/rubygem-metasploit_data_models/Makefile
+++ b/security/rubygem-metasploit_data_models/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Database layer for Metasploit
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord>=3.2.13:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-arel-helpers>=0:${PORTSDIR}/databases/rubygem-arel-helpers \
-		rubygem-metasploit-concern>=0.4.0:${PORTSDIR}/security/rubygem-metasploit-concern \
-		rubygem-metasploit-model>=0.29.0:${PORTSDIR}/security/rubygem-metasploit-model \
-		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-recog>=1.0:${PORTSDIR}/security/rubygem-recog
+RUN_DEPENDS=	rubygem-activerecord>=3.2.13:databases/rubygem-activerecord \
+		rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-arel-helpers>=0:databases/rubygem-arel-helpers \
+		rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-concern \
+		rubygem-metasploit-model>=0.29.0:security/rubygem-metasploit-model \
+		rubygem-pg>=0:databases/rubygem-pg \
+		rubygem-railties>=3.0.0:www/rubygem-railties \
+		rubygem-recog>=1.0:security/rubygem-recog
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-scp/Makefile b/security/rubygem-net-scp/Makefile
index 82d3460a96a6..702413d34ad5 100644
--- a/security/rubygem-net-scp/Makefile
+++ b/security/rubygem-net-scp/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Non-interactive SCP processing
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index 32dc9d9da186..f726097ac03f 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Implementation of the SFTP client protocol
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-ssh-gateway/Makefile b/security/rubygem-net-ssh-gateway/Makefile
index 9249d96abe55..d4718cb25769 100644
--- a/security/rubygem-net-ssh-gateway/Makefile
+++ b/security/rubygem-net-ssh-gateway/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Establish Net::SSH connections through firewalls
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-ssh-multi/Makefile b/security/rubygem-net-ssh-multi/Makefile
index c6231da1813b..8206dd38d324 100644
--- a/security/rubygem-net-ssh-multi/Makefile
+++ b/security/rubygem-net-ssh-multi/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SSH connection multiplexing library for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-net-ssh-gateway>=1.2.0:${PORTSDIR}/security/rubygem-net-ssh-gateway
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh \
+		rubygem-net-ssh-gateway>=1.2.0:security/rubygem-net-ssh-gateway
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index a32d53b2908b..ab0239d259dd 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -24,6 +24,6 @@ RUBYGEM_AUTOPLIST=	yes
 USES=		shebangfix
 SHEBANG_FILES=	support/ssh_tunnel_bug.rb
 
-PROMPT_PASSPHRASES_RUN_DEPENDS=	rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios
+PROMPT_PASSPHRASES_RUN_DEPENDS=	rubygem-ruby-termios>=0:comms/rubygem-ruby-termios
 
 .include <bsd.port.mk>
diff --git a/security/rubygem-nmap-parser/Makefile b/security/rubygem-nmap-parser/Makefile
index e2b8020eb212..157c22ff391d 100644
--- a/security/rubygem-nmap-parser/Makefile
+++ b/security/rubygem-nmap-parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby interface to Nmap scan data
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	nmap:security/nmap
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-omniauth-bitbucket/Makefile b/security/rubygem-omniauth-bitbucket/Makefile
index b1ed6b401f17..6575a2b3501f 100644
--- a/security/rubygem-omniauth-bitbucket/Makefile
+++ b/security/rubygem-omniauth-bitbucket/Makefile
@@ -10,9 +10,9 @@ COMMENT=	OmniAuth strategy for Bitbucket
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-multi_json>=1.7:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-omniauth>=1.1:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth>=1.0:${PORTSDIR}/net/rubygem-omniauth-oauth
+RUN_DEPENDS=	rubygem-multi_json>=1.7:devel/rubygem-multi_json \
+		rubygem-omniauth>=1.1:security/rubygem-omniauth \
+		rubygem-omniauth-oauth>=1.0:net/rubygem-omniauth-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-cas3/Makefile b/security/rubygem-omniauth-cas3/Makefile
index 82a95884166a..9d3db1bce7e2 100644
--- a/security/rubygem-omniauth-cas3/Makefile
+++ b/security/rubygem-omniauth-cas3/Makefile
@@ -12,9 +12,9 @@ COMMENT=	CAS 3.0 Strategy for OmniAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-nokogiri>=1.6.6:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-omniauth>=1.2:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable \
+		rubygem-nokogiri>=1.6.6:textproc/rubygem-nokogiri \
+		rubygem-omniauth>=1.2:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-gitlab/Makefile b/security/rubygem-omniauth-gitlab/Makefile
index a891cd1eafc4..51882c45998c 100644
--- a/security/rubygem-omniauth-gitlab/Makefile
+++ b/security/rubygem-omniauth-gitlab/Makefile
@@ -11,8 +11,8 @@ COMMENT=	OmniAuth strategy for GitLab
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth2>=1.0:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
+		rubygem-omniauth-oauth2>=1.0:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-multipassword/Makefile b/security/rubygem-omniauth-multipassword/Makefile
index b747e6bcab39..60f73fb96687 100644
--- a/security/rubygem-omniauth-multipassword/Makefile
+++ b/security/rubygem-omniauth-multipassword/Makefile
@@ -11,7 +11,7 @@ COMMENT=	OmniAuth strategy using different passwort strategies
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-omniauth-saml/Makefile b/security/rubygem-omniauth-saml/Makefile
index 7783ca7e3ee7..3d80dcb39dd9 100644
--- a/security/rubygem-omniauth-saml/Makefile
+++ b/security/rubygem-omniauth-saml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	OmniAuth strategy for SAML
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-omniauth>=1.3:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-ruby-saml>=1.1.1:${PORTSDIR}/security/rubygem-ruby-saml
+RUN_DEPENDS=	rubygem-omniauth>=1.3:security/rubygem-omniauth \
+		rubygem-ruby-saml>=1.1.1:security/rubygem-ruby-saml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-shibboleth/Makefile b/security/rubygem-omniauth-shibboleth/Makefile
index 0dbd531e2544..1945fa59e21c 100644
--- a/security/rubygem-omniauth-shibboleth/Makefile
+++ b/security/rubygem-omniauth-shibboleth/Makefile
@@ -10,7 +10,7 @@ COMMENT=	OmniAuth Shibboleth strategies for OmniAuth 1.x
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth/Makefile b/security/rubygem-omniauth/Makefile
index cb0af0d0c05f..67020a53b1af 100644
--- a/security/rubygem-omniauth/Makefile
+++ b/security/rubygem-omniauth/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Generalized Rack framework for multiple-provider authentication
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-hashie>=1.2:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-hashie>=1.2:devel/rubygem-hashie \
+		rubygem-rack16>=1.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-rack-oauth2/Makefile b/security/rubygem-rack-oauth2/Makefile
index 25dc263fd88c..5061be5b17db 100644
--- a/security/rubygem-rack-oauth2/Makefile
+++ b/security/rubygem-rack-oauth2/Makefile
@@ -11,11 +11,11 @@ COMMENT=	OAuth 2.0 Server & Client Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=2.3:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-attr_required>=0.0.5:${PORTSDIR}/devel/rubygem-attr_required \
-		rubygem-httpclient>=2.4:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-multi_json>=1.3.6:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.1:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-activesupport4>=2.3:devel/rubygem-activesupport4 \
+		rubygem-attr_required>=0.0.5:devel/rubygem-attr_required \
+		rubygem-httpclient>=2.4:www/rubygem-httpclient \
+		rubygem-multi_json>=1.3.6:devel/rubygem-multi_json \
+		rubygem-rack16>=1.1:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-recog/Makefile b/security/rubygem-recog/Makefile
index 73951b5f1273..4132a5abe703 100644
--- a/security/rubygem-recog/Makefile
+++ b/security/rubygem-recog/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Framework for fingerprinting products
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=0:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/security/rubygem-ruby-saml/Makefile b/security/rubygem-ruby-saml/Makefile
index 3d28473033ca..220b6009fbf5 100644
--- a/security/rubygem-ruby-saml/Makefile
+++ b/security/rubygem-ruby-saml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SAML toolkit for Ruby on Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.5.10:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-uuid>=2.3:${PORTSDIR}/devel/rubygem-uuid
+RUN_DEPENDS=	rubygem-nokogiri>=1.5.10:textproc/rubygem-nokogiri \
+		rubygem-uuid>=2.3:devel/rubygem-uuid
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-scrypt/Makefile b/security/rubygem-scrypt/Makefile
index bd3dfe401109..288ec0baecf1 100644
--- a/security/rubygem-scrypt/Makefile
+++ b/security/rubygem-scrypt/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Scrypt key derivation function
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-ffi-compiler>=0.0.2:${PORTSDIR}/devel/rubygem-ffi-compiler \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-ffi-compiler>=0.0.2:devel/rubygem-ffi-compiler \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-sshkit/Makefile b/security/rubygem-sshkit/Makefile
index bd6cf1dd2f5f..2b39df0900bc 100644
--- a/security/rubygem-sshkit/Makefile
+++ b/security/rubygem-sshkit/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Toolkit for remotely running commands on groups of servers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-net-scp>=1.1.2:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-ssh>=2.8.0:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-scp>=1.1.2:security/rubygem-net-scp \
+		rubygem-net-ssh>=2.8.0:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-twitter_oauth/Makefile b/security/rubygem-twitter_oauth/Makefile
index f9c7e99d0a00..a35290689d48 100644
--- a/security/rubygem-twitter_oauth/Makefile
+++ b/security/rubygem-twitter_oauth/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Twitter OAuth REST API client library for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.8.0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth
+RUN_DEPENDS=	rubygem-json>=1.8.0:devel/rubygem-json \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/samba-virusfilter/Makefile b/security/samba-virusfilter/Makefile
index f0921ed6095a..4a2991e5fb30 100644
--- a/security/samba-virusfilter/Makefile
+++ b/security/samba-virusfilter/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	GHC
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	On-access anti-virus filter for Samba
 
-PATCH_DEPENDS=	smbclient:${PORTSDIR}/net/${SAMBA_PORT}
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${SAMBA_PORT}:configure
-RUN_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
+PATCH_DEPENDS=	smbclient:net/${SAMBA_PORT}
+BUILD_DEPENDS=	${NONEXISTENT}:net/${SAMBA_PORT}:configure
+RUN_DEPENDS=	ksh:shells/pdksh
 
 GNU_CONFIGURE=	yes
 USES=		gmake shebangfix tar:bzip2
diff --git a/security/sasp/Makefile b/security/sasp/Makefile
index b71afc7d656c..77b7b138e997 100644
--- a/security/sasp/Makefile
+++ b/security/sasp/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	LOCAL/ahze \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool that permits to use a gateway whatever IP we have
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	sbin/sasp
diff --git a/security/scamp/Makefile b/security/scamp/Makefile
index 7fd5e395c453..37325f90f9ca 100644
--- a/security/scamp/Makefile
+++ b/security/scamp/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Download & Install additional definition files for Clamav
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	bash>=4.2.42:${PORTSDIR}/shells/bash \
-		clamav>=0.97.8:${PORTSDIR}/security/clamav \
-		gnupg>=2.0.19:${PORTSDIR}/security/gnupg \
-		rsync>=3.0.9:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	bash>=4.2.42:shells/bash \
+		clamav>=0.97.8:security/clamav \
+		gnupg>=2.0.19:security/gnupg \
+		rsync>=3.0.9:net/rsync
 
 .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
-RUN_DEPENDS+=	wget>=1.14:${PORTSDIR}/ftp/wget
+RUN_DEPENDS+=	wget>=1.14:ftp/wget
 .else
-RUN_DEPENDS+=	curl>=7.24.0_2:${PORTSDIR}/ftp/curl
+RUN_DEPENDS+=	curl>=7.24.0_2:ftp/curl
 .endif
 
 NO_BUILD=	yes
diff --git a/security/scanlogd/Makefile b/security/scanlogd/Makefile
index b31591170a65..2017b231f72a 100644
--- a/security/scanlogd/Makefile
+++ b/security/scanlogd/Makefile
@@ -32,8 +32,8 @@ NIDS_DESC=	Use net/libnet for packet capture
 PCAP_BASE_ALL_TARGET=	libpcap
 
 NIDS_ALL_TARGET=	libnids
-NIDS_BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
-NIDS_LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+NIDS_BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:net/libnids
+NIDS_LIB_DEPENDS=	libnet.so:net/libnet
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scanlogd ${STAGEDIR}${PREFIX}/bin
diff --git a/security/scanssh/Makefile b/security/scanssh/Makefile
index bb6f04bfdb94..08c0d523ecc8 100644
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.monkey.org/~provos/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scans networks for open proxies, SSH, web, and SMTP servers
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libdnet.so:net/libdnet \
+		libevent.so:devel/libevent2
 
 GNU_CONFIGURE=	YES
 PLIST_FILES=	bin/scanssh man/man1/scanssh.1.gz
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index d81d01281bf2..1d06bf4a1901 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -10,14 +10,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	gnupg>=2.1.4:${PORTSDIR}/security/gnupg \
-		valac:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	gnupg>=2.1.4:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS=	gnupg>=2.1.4:security/gnupg \
+		valac:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libgcr-3.so:security/gcr \
+		libsecret-1.so:security/libsecret \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	gnupg>=2.1.4:security/gnupg
 
 PORTSCOUT=	limitw:1,even
 
@@ -42,6 +42,6 @@ LDAP_USE=	OPENLDAP=yes
 LDAP_DESC=	LDAP keyserver support (for gpg)
 AVAHI_DESC=	DNS-SD key sharing
 AVAHI_CONFIGURE_ENABLE=	sharing
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 .include <bsd.port.mk>
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index cafa19fd4540..b0d1d2de84b7 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Elliptic Curve Crypto Utility for Reliable Encryption
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USE_GCC=	any
 
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 4a46c93006a8..fe953d6da3d6 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GUI for managing and running ssh and related utilities
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
+RUN_DEPENDS=	ssh-askpass:security/openssh-askpass
 
 WRKSRC=		${WRKDIR}/usr/local
 NO_BUILD=	yes
diff --git a/security/sectok/Makefile b/security/sectok/Makefile
index d3cc082b8936..47430307a6c5 100644
--- a/security/sectok/Makefile
+++ b/security/sectok/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ISO 7816 Smartcard Utility
 
-LIB_DEPENDS=	libsectok.so:${PORTSDIR}/security/libsectok
+LIB_DEPENDS=	libsectok.so:security/libsectok
 
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/security/sguil/Makefile b/security/sguil/Makefile
index fb45f462e7c2..25ca1297f838 100644
--- a/security/sguil/Makefile
+++ b/security/sguil/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Sguil is a network security monitoring program
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	tcltls>=0:${PORTSDIR}/devel/tcltls \
-		${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX
+RUN_DEPENDS=	tcltls>=0:devel/tcltls \
+		${LOCALBASE}/lib/tclx8.4/tclx.tcl:lang/tclX
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bammv
@@ -39,19 +39,19 @@ SANCP_SENSOR_DESC=	Include sancp sensor
 WIRESHARK_DESC=		Install wireshark
 
 CLIENT_USES=		tk:wrapper
-SERVER_RUN_DEPENDS=	p0f:${PORTSDIR}/net-mgmt/p0f \
-	                tcpflow:${PORTSDIR}/net/tcpflow \
-	                dtplite:${PORTSDIR}/devel/tcllib
-CLIENT_RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib \
-			iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets \
-			gpg2:${PORTSDIR}/security/gnupg
-SENSOR_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2-sguil
-MYSQL_LIB_DEPENDS=	mysqltcl>=3.052:${PORTSDIR}/databases/mysqltcl
-AUDIO_RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
-SANCP_RUN_DEPENDS=	sancp:${PORTSDIR}/security/sancp
-WIRESHARK_RUN_DEPENDS=	wireshark:${PORTSDIR}/net/wireshark
-PADS_SENSOR_RUN_DEPENDS=	pads:${PORTSDIR}/net-mgmt/pads
-SANCP_SENSOR_RUN_DEPENDS=	sancp:${PORTSDIR}/security/sancp
+SERVER_RUN_DEPENDS=	p0f:net-mgmt/p0f \
+	                tcpflow:net/tcpflow \
+	                dtplite:devel/tcllib
+CLIENT_RUN_DEPENDS=	dtplite:devel/tcllib \
+			iwidgets>0:x11-toolkits/iwidgets \
+			gpg2:security/gnupg
+SENSOR_RUN_DEPENDS=	barnyard2:security/barnyard2-sguil
+MYSQL_LIB_DEPENDS=	mysqltcl>=3.052:databases/mysqltcl
+AUDIO_RUN_DEPENDS=	festival:audio/festival
+SANCP_RUN_DEPENDS=	sancp:security/sancp
+WIRESHARK_RUN_DEPENDS=	wireshark:net/wireshark
+PADS_SENSOR_RUN_DEPENDS=	pads:net-mgmt/pads
+SANCP_SENSOR_RUN_DEPENDS=	sancp:security/sancp
 
 NO_BUILD=	yes
 TCL_VER=	8.5
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 42cbf6f76dd2..60538f3f7152 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libsaml.so.8:${PORTSDIR}/security/opensaml2 libodbc.so:${PORTSDIR}/databases/unixODBC
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
+LIB_DEPENDS=	libsaml.so.8:security/opensaml2 libodbc.so:${PORTSDIR}/databases/unixODBC
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 8000eb457e0f..b32fcf793f18 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free implementation of the Kerberos 5 network security system
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libtasn1.so:security/libtasn1 \
+		libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls
 
 USES=		iconv libtool makeinfo pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index 0f1baa6cbd32..1b251619a62a 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -11,17 +11,17 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Various OpenPGP related tools
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
-		p5-Net-IDN-Encode>=0:${PORTSDIR}/textproc/p5-Net-IDN-Encode \
-		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Convert-Recode>=0:${PORTSDIR}/converters/p5-Convert-Recode \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	gpg:security/gnupg \
+		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
+		p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Convert-Recode>=0:converters/p5-Convert-Recode \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-GD>=0:graphics/p5-GD
 
 CONFLICTS_INSTALL=sig2dot-[0-9]* springgraph-[0-9]*
 
diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 376dd0ca8a13..55a6d4e8ed66 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -18,10 +18,10 @@ LICENSE_FILE_GPLR=	${WRKSRC}/doc/LICENSE.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/doc/GPL.txt
 LICENSE_PERMS_GPLR=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libfixbuf.so:${PORTSDIR}/net/libfixbuf
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
+		libfixbuf.so:net/libfixbuf
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools
diff --git a/security/sinfp/Makefile b/security/sinfp/Makefile
index 9a1ac5bb1eed..47a0d45c5c32 100644
--- a/security/sinfp/Makefile
+++ b/security/sinfp/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Full operating system stack fingerprinting suite
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Net-SinFP>=2.02:${PORTSDIR}/security/p5-Net-SinFP
+BUILD_DEPENDS=	p5-Net-SinFP>=2.02:security/p5-Net-SinFP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST=		""
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index 6b26ccf9fdef..a495ecf20011 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fully automated, active web application security reconnaissance tool
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libpcre.so:devel/pcre
 
 USES=		gmake tar:tgz
 USE_OPENSSL=	yes
diff --git a/security/smtpscan/Makefile b/security/smtpscan/Makefile
index 2617e8bc5b82..4248f5033143 100644
--- a/security/smtpscan/Makefile
+++ b/security/smtpscan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Remote SMTP server version detector
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 1708ba48aae1..d623767f5a0c 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -17,10 +17,10 @@ COMMENT=	Lightweight network intrusion detection system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libdnet.so:${PORTSDIR}/net/libdnet
-BUILD_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
-RUN_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libdnet.so:net/libdnet
+BUILD_DEPENDS=	daq>=2.0.0:net/daq
+RUN_DEPENDS=	daq>=2.0.0:net/daq
 
 OPTIONS_DEFINE=		IPV6 GRE HA NORMALIZER DOCS APPID \
 			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \
@@ -62,9 +62,9 @@ APPID_CONFIGURE_ENABLE=		open-appid
 HA_CONFIGURE_ENABLE=		ha
 FILEINSPECT_CONFIGURE_ENABLE=	file-inspect
 
-BARNYARD_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2
-PULLEDPORK_RUN_DEPENDS=	pulledpork.pl:${PORTSDIR}/security/pulledpork
-APPID_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+BARNYARD_RUN_DEPENDS=	barnyard2:security/barnyard2
+PULLEDPORK_RUN_DEPENDS=	pulledpork.pl:security/pulledpork
+APPID_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 APPID_CONFIGURE_ENV+=	luajit_CFLAGS="-I${LOCALBASE}/include/luajit-2.0" \
 			luajit_LIBS="-L${LOCALBASE}/lib -lluajit-5.1"
 
diff --git a/security/snortreport/Makefile b/security/snortreport/Makefile
index 3180a08b7987..e212725abb77 100644
--- a/security/snortreport/Makefile
+++ b/security/snortreport/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=		BARNYARD JPGRAPH MYSQL PGSQL DOCS
 BARNYARD_DESC=		Depend on Barnyard2
 JPGRAPH_DESC=		Graphical charting
 
-BARNYARD_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2
-JPGRAPH_RUN_DEPENDS=	${LOCALBASE}/share/jpgraph/jpgraph.php:${PORTSDIR}/graphics/jpgraph2
+BARNYARD_RUN_DEPENDS=	barnyard2:security/barnyard2
+JPGRAPH_RUN_DEPENDS=	${LOCALBASE}/share/jpgraph/jpgraph.php:graphics/jpgraph2
 .include <bsd.port.options.mk>
 
 NO_BUILD=	yes
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index a2144d50abe0..1fbcb6eb79f5 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Generate HTML report summaries from snort incident alerts
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	snortsnarf.pl
diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index 4d1e545504e9..e1362d6e5feb 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+		libsqlite3.so:databases/sqlite3
 
 GNU_CONFIGURE=	yes
 # !!!!!!!!!!!!
diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index ef6cd5a1889c..a519524e3411 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
@@ -33,7 +33,7 @@ CRYP_BOTAN_DESC=	Build with Botan crypto library
 OPTIONS_DEFAULT=	CRYP_OPEN
 
 CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
-CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
+CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
 CRYP_OPEN_USE=		openssl=yes
 CRYP_OPEN_VARS=		WITH_OPENSSL_PORT=yes
 CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
diff --git a/security/spass/Makefile b/security/spass/Makefile
index 03bbf4e22dc7..00bab937fc97 100644
--- a/security/spass/Makefile
+++ b/security/spass/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Secure password generator with a true random number generator
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libboost_program_options.so:devel/boost-libs
 
 BROKEN_sparc64=	cannot link with boost
 
diff --git a/security/spike-proxy/Makefile b/security/spike-proxy/Makefile
index 0a6af93bb575..95a9e1dca230 100644
--- a/security/spike-proxy/Makefile
+++ b/security/spike-proxy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool looking for vulnerabilities in web applications
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 USES=		python shebangfix tar:tgz
 SHEBANG_FILES=	*.py
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index f9809fca35e9..6fe131d768e8 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web proxy to detect malware
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	CLAMAV
 CLAMAV_DESC=	Enable CLAMAV support
@@ -20,7 +20,7 @@ CLAMAV_DESC=	Enable CLAMAV support
 USE_RC_SUBR=	spybye
 GNU_CONFIGURE=	yes
 
-CLAMAV_LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLAMAV_CONFIGURE_ON=	--with-libclamav=${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/sqlmap/Makefile b/security/sqlmap/Makefile
index fa0ddb3496d5..fea2122c2ed4 100644
--- a/security/sqlmap/Makefile
+++ b/security/sqlmap/Makefile
@@ -26,7 +26,7 @@ MSF_DESC=	Enable Metasploit Framework integration
 .include <bsd.port.options.mk>
 
 .if  ${PORT_OPTIONS:MMSF}
-RUN_DEPENDS+=	${LOCALBASE}/bin/msfcli:${PORTSDIR}/security/metasploit
+RUN_DEPENDS+=	${LOCALBASE}/bin/msfcli:security/metasploit
 .endif
 
 post-patch:
diff --git a/security/sqlninja/Makefile b/security/sqlninja/Makefile
index b47a60d4705f..0ed5c225fe04 100644
--- a/security/sqlninja/Makefile
+++ b/security/sqlninja/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Sql Server exploit toolkit
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-Pcap>=0:net/p5-Net-Pcap \
+		p5-Net-RawIP>=0:net/p5-Net-RawIP \
+		p5-NetPacket>=0:net/p5-NetPacket
 
 USES=		perl5 tar:tgz
 NO_BUILD=	yes
diff --git a/security/sshblock/Makefile b/security/sshblock/Makefile
index cd372d962684..9a0e2610b234 100644
--- a/security/sshblock/Makefile
+++ b/security/sshblock/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Block abusive SSH login attempts
 
-RUN_DEPENDS=	p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	p5-File-Tail>=0:devel/p5-File-Tail
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index 85e2be5d2208..3540786bba6c 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Checks for SSH/FTP bruteforce and blocks given IPs
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-IPC-Shareable>=0:${PORTSDIR}/devel/p5-IPC-Shareable \
-		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
+RUN_DEPENDS=	p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \
+		p5-IPC-Shareable>=0:devel/p5-IPC-Shareable \
+		p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/security/ssl-admin/Makefile b/security/ssl-admin/Makefile
index 9a83e68cad8d..dc08e8540b28 100644
--- a/security/ssl-admin/Makefile
+++ b/security/ssl-admin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	OpenSSL certificate manager with OpenVPN support
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	zip:archivers/zip
 
 USES=		perl5 shebangfix tar:xz
 SHEBANG_FILES=	ssl-admin
diff --git a/security/sslsplit/Makefile b/security/sslsplit/Makefile
index 363316b049e3..9ca53b0d2875 100644
--- a/security/sslsplit/Makefile
+++ b/security/sslsplit/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://mirror.roe.ch/rel/sslsplit/
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Transparent and scalable SSL/TLS interception
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		gmake pkgconfig tar:bzip2
 MAKEFILE=	GNUmakefile
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 67b99d0867d2..03b922934f7c 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -14,25 +14,25 @@ COMMENT=	System Security Services Daemon
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libtalloc.so:${PORTSDIR}/devel/talloc \
-		libtevent.so:${PORTSDIR}/devel/tevent \
-		libtdb.so:${PORTSDIR}/databases/tdb \
-		libldb.so:${PORTSDIR}/databases/ldb \
-		libcares.so:${PORTSDIR}/dns/c-ares \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdhash.so:${PORTSDIR}/devel/ding-libs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libunistring.so:${PORTSDIR}/devel/libunistring \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libinotify.so:${PORTSDIR}/devel/libinotify
-BUILD_DEPENDS=	xmlcatalog:${PORTSDIR}/textproc/libxml2 \
-		docbook-xsl>=1:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr \
-		krb5>=1.10:${PORTSDIR}/security/krb5 \
-		nsupdate:${PORTSDIR}/dns/bind99
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libtalloc.so:devel/talloc \
+		libtevent.so:devel/tevent \
+		libtdb.so:databases/tdb \
+		libldb.so:databases/ldb \
+		libcares.so:dns/c-ares \
+		libdbus-1.so:devel/dbus \
+		libdhash.so:devel/ding-libs \
+		libpcre.so:devel/pcre \
+		libunistring.so:devel/libunistring \
+		libnss3.so:security/nss \
+		libsasl2.so:security/cyrus-sasl2 \
+		libinotify.so:devel/libinotify
+BUILD_DEPENDS=	xmlcatalog:textproc/libxml2 \
+		docbook-xsl>=1:textproc/docbook-xsl \
+		xsltproc:textproc/libxslt \
+		xmlcatmgr:textproc/xmlcatmgr \
+		krb5>=1.10:security/krb5 \
+		nsupdate:dns/bind99
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-selinux=no --with-semanage=no \
@@ -71,7 +71,7 @@ OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=	yes
 
 SMB_DESC=		Install IPA and AD providers (requires Samba4)
-SMB_BUILD_DEPENDS=	samba41>=4.1.0:${PORTSDIR}/net/samba41
+SMB_BUILD_DEPENDS=	samba41>=4.1.0:net/samba41
 SMB_CONFIGURE_WITH=	samba
 
 .include <bsd.port.options.mk>
diff --git a/security/ssss/Makefile b/security/ssss/Makefile
index 877cd6380978..3994eaa55f64 100644
--- a/security/ssss/Makefile
+++ b/security/ssss/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://point-at-infinity.org/ssss/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Shamir's Secret Sharing Scheme
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 PLIST_FILES=	bin/ssss-combine bin/ssss-split man/man1/ssss.1.gz
 
diff --git a/security/sst/Makefile b/security/sst/Makefile
index 7836c68e784b..70471e7d33e5 100644
--- a/security/sst/Makefile
+++ b/security/sst/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Simple SSL tunneling tool (uses netcat)
 
 .if !exists(/usr/bin/nc)
-RUN_DEPENDS=	netcat:${PORTSDIR}/net/netcat
+RUN_DEPENDS=	netcat:net/netcat
 .endif
 
 MAKEFILE=	${FILESDIR}/Makefile
diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index 576887f0363c..bddeb45ebbc9 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFAULT=	X11
 
 OPTIONS_SUB=	yes
 
-X11_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+X11_LIB_DEPENDS=	libevent.so:devel/libevent2
 X11_USE=	gnome=gtk12
 X11_CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
 
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index a8fa03f9d97d..06014a69d8ac 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Steganography tool to hide data in binary files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
-		libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt \
+		libmhash.so:security/mhash
 
 USES=		gmake jpeg libtool:build perl5
 GNU_CONFIGURE=	yes
diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index c913a6573f6f..9c5bf04e92a2 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Software Token for UNIX compatible with RSA SecurID
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtomcrypt.so:${PORTSDIR}/security/libtomcrypt
+LIB_DEPENDS=	libtomcrypt.so:security/libtomcrypt
 
 OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index 6e544cc32893..18b57c4c4411 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -73,9 +73,9 @@ VSTR_DESC=	Use devel/vstr printf hooks
 
 # Extra options
 CURL_CONFIGURE_ON=	--enable-curl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 EAPAKA3GPP2_CONFIGURE_ON=	--enable-eap-aka --enable-eap-aka-3gpp2
-EAPAKA3GPP2_LIB_DEPENDS=libgmp.so:${PORTSDIR}/math/gmp
+EAPAKA3GPP2_LIB_DEPENDS=libgmp.so:math/gmp
 EAPDYNAMIC_CONFIGURE_ON=--enable-eap-dynamic
 EAPRADIUS_CONFIGURE_ON=	--enable-eap-radius
 EAPSIMFILE_CONFIGURE_ON=--enable-eap-sim --enable-eap-sim-file
@@ -88,17 +88,17 @@ LDAP_CONFIGURE_ON=	--enable-ldap
 LDAP_USE=		OPENLDAP=yes
 MYSQL_CONFIGURE_ON=	--enable-mysql
 MYSQL_USE=		MYSQL=yes
-SMP_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+SMP_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 SMP_CONFIGURE_ON=	--enable-smp
 SWANCTL_CONFIGURE_ON=	--enable-swanctl
 SWANCTL_IMPLIES=	VICI
 SQLITE_CONFIGURE_ON=	--enable-sqlite
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
 PKI_CONFIGURE_OFF=	--disable-pki
 SCEP_CONFIGURE_OFF=	--disable-scepclient
 UNBOUND_CONFIGURE_ON=	--enable-unbound
-UNBOUND_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
+UNBOUND_LIB_DEPENDS=	libunbound.so:dns/unbound
 UNITY_CONFIGURE_ON=	--enable-unity
 VICI_CONFIGURE_ON=	--enable-vici
 XAUTH_CONFIGURE_ON=	--enable-xauth-eap --enable-xauth-generic
diff --git a/security/stud/Makefile b/security/stud/Makefile
index 50336c18e4b9..5d4dd50310e3 100644
--- a/security/stud/Makefile
+++ b/security/stud/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Scalable TLS Unwrapping Daemon
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 USES=		gmake
 USE_GITHUB=	yes
diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile
index 571939bb1820..633230e67724 100644
--- a/security/subversion-gnome-keyring/Makefile
+++ b/security/subversion-gnome-keyring/Makefile
@@ -18,7 +18,7 @@ SVN_BUILD_ADDONS=	yes
 
 .include "${MASTERDIR}/Makefile.common"
 
-LIB_DEPENDS+=		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+=		libgnome-keyring.so:security/libgnome-keyring
 
 CONFIGURE_ARGS+=	--with-gnome-keyring
 
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 4d3b9944a423..82280c071547 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -71,7 +71,7 @@ AUDIT_CONFIGURE_WITH=	bsm-audit
 OPIE_CONFIGURE_ON=	--with-opie
 OPIE_CONFIGURE_OFF=	--with-pam
 SSSD_CONFIGURE_ON=	--with-sssd
-SSSD_RUN_DEPENDS=	sssd:${PORTSDIR}/security/sssd
+SSSD_RUN_DEPENDS=	sssd:security/sssd
 
 .include <bsd.port.options.mk>
 
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index edeebcf92dac..3609e34823d6 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -13,9 +13,9 @@ COMMENT=	High Performance Network IDS, IPS and Security Monitoring engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libnet.so:${PORTSDIR}/net/libnet \
-		libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libnet.so:net/libnet \
+		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -50,10 +50,10 @@ PRELUDE_DESC=		Prelude support for NIDS alerts
 SC_DESC=		Suricata socket client (suricatasc)
 TESTS_DESC=		Unit tests in suricata binary
 
-GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_ON=		--enable-geoip
 
-HTP_PORT_LIB_DEPENDS=		libhtp.so:${PORTSDIR}/devel/libhtp
+HTP_PORT_LIB_DEPENDS=		libhtp.so:devel/libhtp
 HTP_PORT_CONFIGURE_ON=		--enable-non-bundled-htp
 HTP_PORT_CONFIGURE_OFF=		--enable-bundled-htp
 HTP_PORT_CONFLICTS_INSTALL_OFF=	libhtp-[0-9]* libhtp-suricata
@@ -61,7 +61,7 @@ HTP_PORT_USES_OFF=		iconv:translit
 
 IPFW_CONFIGURE_ON=		--enable-ipfw
 
-JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
+JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
 JSON_CONFIGURE_ON=		--with-libjansson-includes=${LOCALBASE}/include \
 				--with-libjansson-libraries=${LOCALBASE}/lib
 
@@ -70,11 +70,11 @@ LUA_CONFIGURE_ON=		--enable-lua \
 				--with-liblua-includes=${LUA_INCDIR} \
 				--with-liblua-libraries=${LUA_LIBDIR}
 
-LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUAJIT_CONFIGURE_ON=		--enable-luajit
 
-NSS_LIB_DEPENDS=		libnss3.so:${PORTSDIR}/security/nss \
-				libnspr4.so:${PORTSDIR}/devel/nspr
+NSS_LIB_DEPENDS=		libnss3.so:security/nss \
+				libnspr4.so:devel/nspr
 NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
 				--with-libnss-libraries=${LOCALBASE}/lib \
 				--with-libnspr-libraries=${LOCALBASE}/lib \
@@ -82,13 +82,13 @@ NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
 
 NETMAP_CONFIGURE_ENABLE=	netmap
 
-PORTS_PCAP_LIB_DEPENDS=		libpcap.so:${PORTSDIR}/net/libpcap
+PORTS_PCAP_LIB_DEPENDS=		libpcap.so:net/libpcap
 PORTS_PCAP_CONFIGURE_ON=	--with-libpcap-includes=${LOCALBASE}/include \
 				--with-libpcap-libraries=${LOCALBASE}/lib
 PORTS_PCAP_CONFIGURE_OFF=	--with-libpcap-includes=/usr/include \
 				--with-libpcap-libraries=/usr/lib
 
-PRELUDE_LIB_DEPENDS=		libprelude.so:${PORTSDIR}/security/libprelude
+PRELUDE_LIB_DEPENDS=		libprelude.so:security/libprelude
 PRELUDE_CONFIGURE_ENABLE=	prelude
 PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
 
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index d927f0101d48..0027fe34b3e5 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	The Simple WATCHer and filter
 
 BUILD_DEPENDS=	\
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-	p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-Date-Manip>=0:devel/p5-Date-Manip \
+	p5-Date-Calc>=0:devel/p5-Date-Calc \
+	p5-File-Tail>=0:devel/p5-File-Tail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/tclgpg/Makefile b/security/tclgpg/Makefile
index 3af4926a18fe..fa6c5a292980 100644
--- a/security/tclgpg/Makefile
+++ b/security/tclgpg/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tcl interface to GNU Privacy Guard with interface similar to TclGPGME
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	dtplite:devel/tcllib
+RUN_DEPENDS=	gpg:security/gnupg1
 
 USES=		autoreconf gmake tcl
 GNU_CONFIGURE=	yes
diff --git a/security/tclsasl/Makefile b/security/tclsasl/Makefile
index 9b24c7a18ab9..69f94bbb76ea 100644
--- a/security/tclsasl/Makefile
+++ b/security/tclsasl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://beepcore-tcl.sourceforge.net/
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Tcl interface to the Cyrus SASLv2 library
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 USES=		tcl libtool tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 837b841f2c1a..9b14a5cf8e20 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Virtual Private Network (VPN) daemon
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 USES=		cpe makeinfo
 CPE_VENDOR=	tinc-vpn
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index d36a5131aee1..333719718e24 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Simple graphical interface to manage a small Certification Authority
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		zip:${PORTSDIR}/archivers/zip \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		zip:archivers/zip \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USES=		perl5 tar:xz shebangfix
 USE_OPENSSL=	yes
diff --git a/security/tmux-cssh/Makefile b/security/tmux-cssh/Makefile
index a864c6a0cf91..efebcc1fbe4b 100644
--- a/security/tmux-cssh/Makefile
+++ b/security/tmux-cssh/Makefile
@@ -10,7 +10,7 @@ COMMENT=	ClusterSSH features using tmux, but not X11
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	${LOCALBASE}/bin/tmux:${PORTSDIR}/sysutils/tmux
+RUN_DEPENDS=	${LOCALBASE}/bin/tmux:sysutils/tmux
 
 NO_BUILD=	YES
 
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index e8cba5fcd951..e6b32f95b284 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
@@ -81,7 +81,7 @@ TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=		libevent.so:devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
@@ -91,9 +91,9 @@ TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
-LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 146c04a300d5..90efb63716fd 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
@@ -78,7 +78,7 @@ TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=		libevent.so:devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
@@ -88,9 +88,9 @@ TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
-LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index 3ee259b06cae..e240f2487f8b 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -15,10 +15,10 @@ LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
-BUILD_DEPENDS=	pkcsconf:${PORTSDIR}/security/opencryptoki
-RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:${PORTSDIR}/security/trousers \
-		${LOCALBASE}/lib/pkcs11/libopencryptoki.so:${PORTSDIR}/security/opencryptoki
+LIB_DEPENDS=	libtspi.so:security/trousers
+BUILD_DEPENDS=	pkcsconf:security/opencryptoki
+RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:security/trousers \
+		${LOCALBASE}/lib/pkcs11/libopencryptoki.so:security/opencryptoki
 
 USES=		gettext gmake iconv libtool
 USE_LDCONFIG=	YES
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index 7f5a80d0453b..f54ac2c9214f 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -12,7 +12,7 @@ COMMENT=	TPM Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
+LIB_DEPENDS=	libtspi.so:security/trousers
 
 USES=		qmake
 USE_QT4=	gui moc_build rcc_build uic_build
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index d14826c6adba..13637364a582 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -42,7 +42,7 @@ DEBUG_CONFIGURE_ENABLE=	debug
 
 .if ${PORT_OPTIONS:MEMULATOR}
 PKGNAMESUFFIX+=	-no_tddl
-LIB_DEPENDS+=	libtddl.so:${PORTSDIR}/emulators/tpm-emulator
+LIB_DEPENDS+=	libtddl.so:emulators/tpm-emulator
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src-tcs-Makefile.am \
 		${FILESDIR}/extra-patch-src-tcsd-Makefile.am \
diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile
index a34b284705b7..8f778d9c18c7 100644
--- a/security/truecrypt/Makefile
+++ b/security/truecrypt/Makefile
@@ -18,8 +18,8 @@ EXTRACT_ONLY=	${TC_SRCFILE} wxWidgets-${WX_VER}.tar.bz2
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Free open-source disk encryption software
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
+BUILD_DEPENDS=	nasm:devel/nasm
+RUN_DEPENDS=	sudo:security/sudo
 
 WRKSRC=		${WRKDIR}/truecrypt-${PORTVERSION}-source
 
diff --git a/security/tsshbatch/Makefile b/security/tsshbatch/Makefile
index 9ba567627c92..331499182245 100644
--- a/security/tsshbatch/Makefile
+++ b/security/tsshbatch/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	tsshbatch
 LICENSE_FILE=	${WRKSRC}/tsshbatch-license.txt
 LICENSE_PERMS=	auto-accept
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko
 
 USES=		python:run
 NO_ARCH=	yes
diff --git a/security/umit/Makefile b/security/umit/Makefile
index 3157c3993a9e..e8ca3c5fc2c7 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Nmap frontend developed with Python and PyGTK
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${LOCALBASE}/bin/nmap:security/nmap
 
 NO_ARCH=	yes
 
@@ -31,7 +31,7 @@ DESKTOP_ENTRIES="Umit" "GUI frontend for Nmap security/port scanner" "umit" \
 
 OPTIONS_DEFINE=		DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/security/unicornscan/Makefile b/security/unicornscan/Makefile
index aafdf96ece3f..57a9eb3b0b9e 100644
--- a/security/unicornscan/Makefile
+++ b/security/unicornscan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asynchronous TCP and UDP port scanner
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USES=		gmake
 CFLAGS+=	-DWITH_LONGOPTS
diff --git a/security/unssh/Makefile b/security/unssh/Makefile
index 9c8473035f93..7e0cf8e077b4 100644
--- a/security/unssh/Makefile
+++ b/security/unssh/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.semprixd.com/shares/ports/
 MAINTAINER=	semprix@gmx.com
 COMMENT=	Fast way to delete entries from OpenSSH known_hosts file
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		shebangfix
 NO_BUILD=	yes
diff --git a/security/vault/Makefile b/security/vault/Makefile
index 45eabb55d99b..736970245b01 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tool for securely accessing secrets
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index f52e4ee7b2d2..1e32181ce85b 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Forensics tool to examine Thumbs.db files
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index 8fe75ad835e5..f159e7a86b84 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -31,7 +31,7 @@ ROOTPWD_DESC=	Enable unlock using root password
 ROOTPWD_CONFIGURE_ENABLE=	root-password
 VLOCKSCRIPTS_DESC=	Install sample hook scripts
 CACASAVER_DESC=	Enable libcaca screensaver
-CACASAVER_BUILD_DEPENDS=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+CACASAVER_BUILD_DEPENDS=	${LOCALBASE}/lib/libcaca.a:graphics/libcaca
 
 # Default scripts/modules
 VLOCKSCRIPTS=
diff --git a/security/vm-to-tor/Makefile b/security/vm-to-tor/Makefile
index 2153dff00f12..1a681a851ef1 100644
--- a/security/vm-to-tor/Makefile
+++ b/security/vm-to-tor/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Connect virtual machines to the tor network
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor \
-		tiny-dhcp-server:${PORTSDIR}/net/tiny-network-utilities
+RUN_DEPENDS=	tor:security/tor \
+		tiny-dhcp-server:net/tiny-network-utilities
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yurivict
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 72e26eebfe32..9629a8d51f60 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	vpnc-script:${PORTSDIR}/sysutils/vpnc-scripts
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+RUN_DEPENDS=	vpnc-script:sysutils/vpnc-scripts
 
 USES=		shebangfix gmake perl5
 USE_PERL5=	build
diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index ec3d13e350b4..98070b6de363 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Vulnerability and eXposure Markup Language DTD
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr \
-		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:${PORTSDIR}/textproc/xhtml-modularization \
-		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:${PORTSDIR}/textproc/xhtml-basic
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr \
+		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:textproc/xhtml-modularization \
+		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:textproc/xhtml-basic
 
 USES=		python:run
 
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index 4339eaa0b27b..99882ef9eb51 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -12,18 +12,18 @@ COMMENT=	Web Application Attack and Audit Framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}soappy>=0:${PORTSDIR}/net/py-soappy \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}fpconst>0:${PORTSDIR}/math/py-fpconst \
-		${PYTHON_PKGNAMEPREFIX}nltk>0:${PORTSDIR}/textproc/py-nltk \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst \
+		${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk \
 		${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}pdf>0:${PORTSDIR}/print/py-pdf \
-		scapy>0:${PORTSDIR}/net/scapy \
-		${PYTHON_PKGNAMEPREFIX}wordnet>0:${PORTSDIR}/textproc/py-wordnet \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+		${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf \
+		scapy>0:net/scapy \
+		${PYTHON_PKGNAMEPREFIX}wordnet>0:textproc/py-wordnet \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -32,7 +32,7 @@ USES=		gettext python tar:bzip2
 OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
-GUI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>0:${PORTSDIR}/graphics/py-graphviz
+GUI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz
 GUI_USE=	GNOME=pygtk2
 
 .include <bsd.port.options.mk>
diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
index 6e38c5923d1e..c9aba0fc2f25 100644
--- a/security/wapiti/Makefile
+++ b/security/wapiti/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wapiti is a vulnerability scanner for web applications
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/webshag/Makefile b/security/webshag/Makefile
index d964bb30725b..cd6c789e2a1f 100644
--- a/security/webshag/Makefile
+++ b/security/webshag/Makefile
@@ -25,7 +25,7 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNMAP}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+BUILD_DEPENDS+=	${LOCALBASE}/bin/nmap:security/nmap
 .endif
 
 .if ${PORT_OPTIONS:MWXGTK}
diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index 1ba36f26305b..d2d5fa27521c 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -90,7 +90,7 @@ TNC_DESC=		Trusted Network Connect
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSIM} || ${PORT_OPTIONS:MAKA} || ${PORT_OPTIONS:MAKA_PRIME}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 CFLAGS+=	-I${LOCALBASE}/include/PCSC
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
diff --git a/security/xca/Makefile b/security/xca/Makefile
index 284638f2cad7..ae989b779919 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphical certification authority
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		desktop-file-utils gmake localbase pkgconfig shared-mime-info
 USE_OPENSSL=	yes
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index 6e9982db4994..c8def9db1c8a 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	${PORTNAME}-src-${DISTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java library for XML Signature and Encryption
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/xalan.jar:textproc/xalan-j
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 LICENSE=	APACHE20
 
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index bd5939726c52..edbd4c21339f 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	XML Security Library
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	DOCS GNUTLS NSS
 OPTIONS_SUB=	yes
 GNUTLS_DESC=		Enable GNUTLS support
 GNUTLS_CONFIGURE_WITH=	gnutls="${LOCALBASE}"
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 NSS_DESC=		Enable Mozilla's NSS support
 NSS_CONFIGURE_WITH=	nss="${LOCALBASE}" nspr="${LOCALBASE}"
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index 238679045d84..ac5b099e0a05 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.yersinia.net/download/
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 .if !defined(WITHOUT_GTK)
 .if exists(${LOCALBASE}/include/gtk-2.0/gtk/gtk.h)
diff --git a/security/ykclient/Makefile b/security/ykclient/Makefile
index 721ed2ff6940..0b7b699ae486 100644
--- a/security/ykclient/Makefile
+++ b/security/ykclient/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Yubico C client library
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl \
-		help2man:${PORTSDIR}/misc/help2man
+LIB_DEPENDS=	libcurl.so:ftp/curl
+BUILD_DEPENDS=	curl-config:ftp/curl \
+		help2man:misc/help2man
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig
diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile
index 69b1f1394499..1f1df7d7f8ac 100644
--- a/security/ykpers/Makefile
+++ b/security/ykpers/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Library and tool for personalization of Yubico's YubiKey
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libyubikey.so:${PORTSDIR}/security/libyubikey
+LIB_DEPENDS=	libyubikey.so:security/libyubikey
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/yubikey-personalization-gui/Makefile b/security/yubikey-personalization-gui/Makefile
index d30c28354e44..c3ee5601bf70 100644
--- a/security/yubikey-personalization-gui/Makefile
+++ b/security/yubikey-personalization-gui/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Graphical YubiKey personalization tool
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libykpers-1.so:${PORTSDIR}/security/ykpers
+LIB_DEPENDS=	libykpers-1.so:security/ykpers
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yubico
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index b39498149111..e8d2fcc5ea19 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -18,8 +18,8 @@ COMMENT=	GUI frontend for the Nmap scanning utility
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	nmap:security/nmap \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
diff --git a/security/zxid/Makefile b/security/zxid/Makefile
index 4cc086312c7e..853a2710c6b8 100644
--- a/security/zxid/Makefile
+++ b/security/zxid/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	End2End Trust Architecture (e2eta) Software Copying
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	# none
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake localbase tar:tgz
 USE_OPENSSL=	yes
diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile
index ba3a745e0b2d..e4f467f6b036 100644
--- a/shells/44bsd-csh/Makefile
+++ b/shells/44bsd-csh/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/cy
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The traditional 4.4BSD /bin/csh C-shell
 
-BUILD_DEPENDS=	rcs:${PORTSDIR}/devel/rcs57
+BUILD_DEPENDS=	rcs:devel/rcs57
 
 USES=		tar:bzip2
 NO_WRKSUBDIR=	yes
diff --git a/shells/ambit/Makefile b/shells/ambit/Makefile
index 602f3ec07baa..3c38c6eee15f 100644
--- a/shells/ambit/Makefile
+++ b/shells/ambit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extended bash brace expansion to expand hostnames or commands
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		tar:tgz
 AMBITDIR?=	/var/spool/${PORTNAME}
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 66aa80d8c0c9..a11f55eb71fb 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Programmable completion library for Bash
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USE_AUTOTOOLS=	aclocal automake
 GNU_CONFIGURE=	yes
diff --git a/shells/p5-Bash-Completion/Makefile b/shells/p5-Bash-Completion/Makefile
index fa9b720e5e61..bf4b237911d4 100644
--- a/shells/p5-Bash-Completion/Makefile
+++ b/shells/p5-Bash-Completion/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Extensible system to provide bash completion
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Module-Load>=0.22:${PORTSDIR}/devel/p5-Module-Load
+BUILD_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Module-Load>=0.22:devel/p5-Module-Load
 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
 USE_PERL5=	configure
diff --git a/shells/p5-Shell-Perl/Makefile b/shells/p5-Shell-Perl/Makefile
index 2dd993a75571..0384076e51fc 100644
--- a/shells/p5-Shell-Perl/Makefile
+++ b/shells/p5-Shell-Perl/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	smatsui@karashi.org
 COMMENT=	Read-eval-print loop in Perl
 
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Data-Dump-Streamer>=0:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir
-BUILD_DEPENDS=	p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Expect>=0:${PORTSDIR}/devel/p5-Test-Expect
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Data-Dump-Streamer>=0:devel/p5-Data-Dump-Streamer \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir
+BUILD_DEPENDS=	p5-Test-Script>=0:devel/p5-Test-Script \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+		p5-Test-Expect>=0:devel/p5-Test-Expect
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/shells/p5-Term-Bash-Completion-Generator/Makefile b/shells/p5-Term-Bash-Completion-Generator/Makefile
index 8d73afcfbf23..8ff505938ecc 100644
--- a/shells/p5-Term-Bash-Completion-Generator/Makefile
+++ b/shells/p5-Term-Bash-Completion-Generator/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Generate bash completion scripts
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Tree-Trie>=0:${PORTSDIR}/devel/p5-Tree-Trie \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Test-Block>=0:${PORTSDIR}/devel/p5-Test-Block \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Tree-Trie>=0:devel/p5-Tree-Trie \
+		p5-Test-Warn>=0:devel/p5-Test-Warn \
+		p5-Test-Block>=0:devel/p5-Test-Block \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/shells/p5-Term-ShellUI/Makefile b/shells/p5-Term-ShellUI/Makefile
index 60d28f6dda0d..b29f6b95c8cf 100644
--- a/shells/p5-Term-ShellUI/Makefile
+++ b/shells/p5-Term-ShellUI/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fully-featured shell-like command line environment
 
-BUILD_DEPENDS=	p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu
+BUILD_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index a8b7597b893e..b0c5537c228c 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	CPAN:GREGOR
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	New shell made entirely out of a Perl script
 
-RUN_DEPENDS=	${SITE_PERL}/Term/ReadLine/Perl.pm:${PORTSDIR}/devel/p5-Term-ReadLine-Perl
+RUN_DEPENDS=	${SITE_PERL}/Term/ReadLine/Perl.pm:devel/p5-Term-ReadLine-Perl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index 73ea5573b907..450df45ab204 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -20,7 +20,7 @@ CPE_VENDOR=	pizzashack
 USE_CSTD=	gnu89
 OPTIONS_DEFINE=	RDIST RSYNC3
 RDIST_DESC=	rdist support
-RDIST_RUN_DEPENDS=	rdist6:${PORTSDIR}/net/rdist6
+RDIST_RUN_DEPENDS=	rdist6:net/rdist6
 RDIST_CONFIGURE_ON=	--with-rdist=${LOCALBASE}/bin/rdist6
 
 RSYNC3_DESC=		rsync3 support (Debian patch)
diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile
index 07789365dd94..91eb7f7492d1 100644
--- a/shells/viewglob/Makefile
+++ b/shells/viewglob/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ add-on to bash and zsh
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		pkgconfig
 USE_XORG=	x11
diff --git a/shells/vshnu/Makefile b/shells/vshnu/Makefile
index 05010aaa65e1..76cf36337747 100644
--- a/shells/vshnu/Makefile
+++ b/shells/vshnu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.cs.indiana.edu/~kinzler/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	New Visual Shell
 
-BUILD_DEPENDS=	p5-Term-Screen>=0:${PORTSDIR}/devel/p5-Term-Screen
+BUILD_DEPENDS=	p5-Term-Screen>=0:devel/p5-Term-Screen
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix tar:tgz
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index cd233595b06e..9747a6d15eb8 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -68,9 +68,9 @@ PORTEXAMPLES=	zlogin zshenv zshrc
 OPTIONS_SUB=	yes
 
 DOCS_DISTFILES=		${DISTNAME}-doc${EXTRACT_SUFX}:doc
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ENABLE=	gdbm
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_ENABLE=	pcre
 MEM_CONFIGURE_ENABLE=	zsh-mem
 SECURE_FREE_CONFIGURE_ENABLE=	zsh-secure-free
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index d52f4b748f60..3a4be3510350 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Enhanced Printer Spooler
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 USES=		gmake
 USE_OPENSSL=	yes
diff --git a/sysutils/LPRngTool/Makefile b/sysutils/LPRngTool/Makefile
index 32ea8975f5df..25c02d9cbd62 100644
--- a/sysutils/LPRngTool/Makefile
+++ b/sysutils/LPRngTool/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Configuration Tool for LPRng
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	a2ps:${PORTSDIR}/print/a2ps \
-		mpage:${PORTSDIR}/print/mpage
+BUILD_DEPENDS=	a2ps:print/a2ps \
+		mpage:print/mpage
 
 USES=		ghostscript:build tar:tgz tk
 GNU_CONFIGURE=	yes
diff --git a/sysutils/abgx360/Makefile b/sysutils/abgx360/Makefile
index e220ddc9d1aa..418f457db820 100644
--- a/sysutils/abgx360/Makefile
+++ b/sysutils/abgx360/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://abgx360.xecuter.com/dl/ \
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Verify and repair Xbox 360 backup images
 
-BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	curl:ftp/curl
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/abgx360gui/Makefile b/sysutils/abgx360gui/Makefile
index 38d54148c10d..321ff1db34ef 100644
--- a/sysutils/abgx360gui/Makefile
+++ b/sysutils/abgx360gui/Makefile
@@ -15,8 +15,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	wxWidgets frontend for abgx360
 
-RUN_DEPENDS=	abgx360:${PORTSDIR}/sysutils/abgx360 \
-		xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS=	abgx360:sysutils/abgx360 \
+		xterm:x11/xterm
 
 PLIST_FILES=	bin/abgx360gui \
 		share/pixmaps/abgx360-256.png
diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index a36552d052f7..814fda54fd03 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -12,8 +12,8 @@ COMMENT=	D-Bus interface for user account query and manipulation
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-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
 
 USE_GNOME=	glib20 intlhack introspection:build libxslt
 USES=		cpe gettext gmake libtool pathfix pkgconfig tar:xz
diff --git a/sysutils/acts/Makefile b/sysutils/acts/Makefile
index 61e0701e5711..270f269c7a30 100644
--- a/sysutils/acts/Makefile
+++ b/sysutils/acts/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	sysutils archivers
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Another Calendar-based Tarsnap Script
 
-RUN_DEPENDS=	tarsnap>=0:${PORTSDIR}/sysutils/tarsnap
+RUN_DEPENDS=	tarsnap>=0:sysutils/tarsnap
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	alexjurkiewicz
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index 6ebdb8e42165..6787dcd645ba 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Advanced Forensics Format library and utilities
 
 LICENSE=	BSD4CLAUSE
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sshock
diff --git a/sysutils/aimage/Makefile b/sysutils/aimage/Makefile
index 21a008da2e30..68cb1b7c72b9 100644
--- a/sysutils/aimage/Makefile
+++ b/sysutils/aimage/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Advanced Disk Imager
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libafflib.so:${PORTSDIR}/sysutils/afflib
+LIB_DEPENDS=	libafflib.so:sysutils/afflib
 
 USE_OPENSSL=	yes
 USES=		gmake
diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index 74429cdd71df..b4b072d69fcf 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -22,7 +22,7 @@ MEGARC_DESC=	Install LSI megarc binary port
 # We may want this for periodic script and to actually be able
 # to fix something in case amrstat reports degraded RAID.
 .if ${PORT_OPTIONS:MMEGARC}
-RUN_DEPENDS+=	${LOCALBASE}/sbin/megarc:${PORTSDIR}/sysutils/megarc
+RUN_DEPENDS+=	${LOCALBASE}/sbin/megarc:sysutils/megarc
 .endif
 
 ALL_TARGET=	${PORTNAME}
diff --git a/sysutils/amtc/Makefile b/sysutils/amtc/Makefile
index de2060448704..918d4646309b 100644
--- a/sysutils/amtc/Makefile
+++ b/sysutils/amtc/Makefile
@@ -12,9 +12,9 @@ LICENSE_NAME=	Creative Commons Attribution 3.0 Unported
 LICENSE_TEXT=	http://creativecommons.org/licenses/by/3.0/
 LICENSE_PERMS=	auto-accept pkg-sell pkg-mirror dist-sell dist-mirror
 
-BUILD_DEPENDS=	xxd:${PORTSDIR}/editors/vim-lite
-LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	xxd:editors/vim-lite
+LIB_DEPENDS+=	libgcrypt.so:security/libgcrypt \
+		libcurl.so:ftp/curl
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index 1954435ea8f8..dee2406e939d 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Radically simple IT automation
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
 
 NO_ARCH=	yes
 USES=		cpe python:2 shebangfix
@@ -42,7 +42,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES NETADDR
 OPTIONS_DEFAULT=NETADDR
 
 NETADDR_DESC=	Dependency on py-netaddr for ipaddr() filter
-NETADDR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netaddr>0:${PORTSDIR}/net/py-netaddr
+NETADDR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr
 
 post-patch:
 .for f in bin/* docs/man/man1/* examples/* lib/ansible/*.py \
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index c9b04ed7a11f..b3733de86155 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -18,13 +18,13 @@ PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 OPTIONS_DEFINE=	ADNS FAM PCRE
 ADNS_DESC=	Asynchronous-capable DNS support
 
-ADNS_LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
+ADNS_LIB_DEPENDS=	libadns.so:dns/adns
 ADNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
 
-FAM_LIB_DEPENDS=	libfam.so:${PORTSDIR}/devel/fam
+FAM_LIB_DEPENDS=	libfam.so:devel/fam
 FAM_CONFIGURE_ON=	--with-fam=${LOCALBASE}
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_COFNIGURE_ON=	--with-pcre=${LOCALBASE}
 
 post-patch:
diff --git a/sysutils/apcpwr/Makefile b/sysutils/apcpwr/Makefile
index af2b67c73435..f38a83d51e0e 100644
--- a/sysutils/apcpwr/Makefile
+++ b/sysutils/apcpwr/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=		LOCAL/jwd
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Control APC 9211 MasterSwitchs via snmp
 
-RUN_DEPENDS=	snmpwalk:${PORTSDIR}/net-mgmt/net-snmp
+RUN_DEPENDS=	snmpwalk:net-mgmt/net-snmp
 
 USES=		shebangfix
 SHEBANG_FILES=	apcpwr.pl
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 09b60711bf07..a85e2eec77f2 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -53,7 +53,7 @@ CLIENT_ONLY_CONFIGURE_ON=	--enable-net \
 				--disable-snmp --disable-test --disable-pcnet
 CGI_CONFIGURE_ENABLE=		cgi
 CGI_CONFIGURE_ON=		--with-cgi-bin=${ETCDIR}/cgi
-CGI_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+CGI_LIB_DEPENDS=		libgd.so:graphics/gd
 GAPCMON_CONFIGURE_ENABLE=	gapcmon
 GAPCMON_USE=			GNOME=gconf2
 GAPCMON_CONFLICTS=		gapcmon-[0-9]*
@@ -62,7 +62,7 @@ USB_CONFIGURE_ENABLE=		usb
 SNMP_DRV_CONFIGURE_ENABLE=	snmp
 MODBUS_CONFIGURE_ENABLE=	modbus
 SNMP_DRV_OLD_CONFIGURE_ENABLE=	net-snmp
-SNMP_DRV_OLD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_DRV_OLD_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 TCP_WRAPPERS_CONFIGURE_WITH=	libwrap=yes
 TEST_DRV_CONFIGURE_ENABLE=	test
 
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index 52e87bb34670..eae675a8eb4c 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -11,12 +11,12 @@ DISTNAME=	apt_0.6.46.4-0.1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Advanced front-end for dpkg
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/lib/libpub.a:${PORTSDIR}/devel/publib
+BUILD_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/lib/libpub.a:devel/publib
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		dpkg:${PORTSDIR}/archivers/dpkg \
-		gpg:${PORTSDIR}/security/gnupg1
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+		dpkg:archivers/dpkg \
+		gpg:security/gnupg1
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		gettext iconv gmake shebangfix
diff --git a/sysutils/arcconf/Makefile b/sysutils/arcconf/Makefile
index d32212689537..1e606d6dc2fc 100644
--- a/sysutils/arcconf/Makefile
+++ b/sysutils/arcconf/Makefile
@@ -42,7 +42,7 @@ DIST_EXT=	_x64
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 # use the 9 i386 version for 10 i386
 DIST_OSVER=	9
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 .endif
 .endif
 
diff --git a/sysutils/asusoled/Makefile b/sysutils/asusoled/Makefile
index 92b34364de9b..84c385f8642b 100644
--- a/sysutils/asusoled/Makefile
+++ b/sysutils/asusoled/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utility for ASUS USB OLED Display
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${FONTDIR}/TTF/luxisr.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf
+RUN_DEPENDS=	${FONTDIR}/TTF/luxisr.ttf:x11-fonts/font-bh-ttf
 
 USE_SDL=	image sdl ttf
 USE_RC_SUBR=	asusoled oled_clock
diff --git a/sysutils/atitvout/Makefile b/sysutils/atitvout/Makefile
index f469c8d6c138..e99a771ecbe2 100644
--- a/sysutils/atitvout/Makefile
+++ b/sysutils/atitvout/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Toggle TV Out on Mach64 graphics cards
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liblrmi.so:${PORTSDIR}/devel/lrmi
+LIB_DEPENDS=	liblrmi.so:devel/lrmi
 
 WRKSRC=		${WRKDIR}/atitvout
 MAKEFILE=	Makefile.bsd
diff --git a/sysutils/autojump/Makefile b/sysutils/autojump/Makefile
index 9cb76e1b95a9..c00c8a2663fa 100644
--- a/sysutils/autojump/Makefile
+++ b/sysutils/autojump/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool that acts as a complement to cd
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 NO_BUILD=	yes
 USES=		python:run
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/autojump \
 OPTIONS_DEFINE=		ZSH
 OPTIONS_DEFAULT=	ZSH
 
-ZSH_RUN_DEPENDS=	zsh:${PORTSDIR}/shells/zsh
+ZSH_RUN_DEPENDS=	zsh:shells/zsh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_j
 
 post-patch:
diff --git a/sysutils/automount/Makefile b/sysutils/automount/Makefile
index abbc5a4461ff..f9e0874eac25 100644
--- a/sysutils/automount/Makefile
+++ b/sysutils/automount/Makefile
@@ -21,11 +21,11 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=		NTFS3G EXT4 EXFAT
 OPTIONS_DEFAULT=	NTFS3G EXT4
 NTFS3G_DESC=		Enable NTFS write support with ntfs-3g over FUSE
-NTFS3G_RUN_DEPENDS=	fusefs-ntfs>=0:${PORTSDIR}/sysutils/fusefs-ntfs
+NTFS3G_RUN_DEPENDS=	fusefs-ntfs>=0:sysutils/fusefs-ntfs
 EXT4_DESC=		Support EXT4 filesystem
-EXT4_RUN_DEPENDS=	fusefs-ext4fuse>=0:${PORTSDIR}/sysutils/fusefs-ext4fuse
+EXT4_RUN_DEPENDS=	fusefs-ext4fuse>=0:sysutils/fusefs-ext4fuse
 EXFAT_DESC=		Support Microsoft exFAT filesystem
-EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:${PORTSDIR}/sysutils/fusefs-exfat
+EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:sysutils/fusefs-exfat
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/automount             ${STAGEDIR}${PREFIX}/sbin
diff --git a/sysutils/autopsy/Makefile b/sysutils/autopsy/Makefile
index a68319595279..76e5991c38f5 100644
--- a/sysutils/autopsy/Makefile
+++ b/sysutils/autopsy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web-based (graphical) interface to The Sleuth Kit
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ifind:${PORTSDIR}/sysutils/sleuthkit
+BUILD_DEPENDS=	${LOCALBASE}/bin/ifind:sysutils/sleuthkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index 7540142e6ddf..1445ae3a0664 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Virtual File System library
 LICENSE=	LGPL20 GPLv2
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		libtool pkgconfig tar:bz2 shebangfix perl5
 USE_PERL5=	run
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 01ff937f3a9d..52800d8c1d39 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -9,11 +9,11 @@ COMMENT=	The Microsoft Azure Linux Agent
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		sudo:${PORTSDIR}/security/sudo \
-		bash:${PORTSDIR}/shells/bash \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:${PORTSDIR}/devel/py-pyasn1 \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	python:lang/python \
+		sudo:security/sudo \
+		bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 NO_BUILD=	yes
 USES=		python:2
diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile
index 2b6ce7b6651c..41cb4cdb3ee4 100644
--- a/sysutils/backuppc-devel/Makefile
+++ b/sysutils/backuppc-devel/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Multi-platform backup to disk-based storage
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing \
-		p5-BackupPC-XS>=0.30:${PORTSDIR}/sysutils/p5-BackupPC-XS
+RUN_DEPENDS=	p5-File-Listing>=0:sysutils/p5-File-Listing \
+		p5-BackupPC-XS>=0.30:sysutils/p5-BackupPC-XS
 
 CONFLICTS=	backuppc-[0-9]*
 
@@ -53,22 +53,22 @@ XML_RSS_DESC=		Perl extension to manage RSS files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MARCHIVE_ZIP}
-RUN_DEPENDS+=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip
+RUN_DEPENDS+=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip
 .endif
 .if ${PORT_OPTIONS:MRSYNC_BPC}
-RUN_DEPENDS+=	rsync-bpc>=3.0.9.3:${PORTSDIR}/net/rsync-bpc
+RUN_DEPENDS+=	rsync-bpc>=3.0.9.3:net/rsync-bpc
 .endif
 .if ${PORT_OPTIONS:MNMBLOOKUP}
-RUN_DEPENDS+=	nmblookup:${PORTSDIR}/net/samba-nmblookup
+RUN_DEPENDS+=	nmblookup:net/samba-nmblookup
 .endif
 .if ${PORT_OPTIONS:MRRDTOOL}
-RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS+=	rrdtool:databases/rrdtool
 .endif
 .if ${PORT_OPTIONS:MSMBCLIENT}
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
+RUN_DEPENDS+=	smbclient:net/samba-smbclient
 .endif
 .if ${PORT_OPTIONS:MXML_RSS}
-RUN_DEPENDS+=	p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS
+RUN_DEPENDS+=	p5-XML-RSS>=0:textproc/p5-XML-RSS
 .endif
 
 pre-patch:
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index cd3af31a0a1e..1dbeb86c5ab0 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Multi-platform backup to disk-based storage
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing
+RUN_DEPENDS=	p5-File-Listing>=0:sysutils/p5-File-Listing
 
 CONFLICTS=	backuppc-devel-[0-9]*
 
@@ -56,29 +56,29 @@ XML_RSS_DESC=		Perl extension to manage RSS files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MARCHIVE_ZIP}
-RUN_DEPENDS+=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip
+RUN_DEPENDS+=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip
 .endif
 .if ${PORT_OPTIONS:MCOMPRESS_ZLIB}
-RUN_DEPENDS+=	p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress
+RUN_DEPENDS+=	p5-IO-Compress>=0:archivers/p5-IO-Compress
 .endif
 .if ${PORT_OPTIONS:MFILE_RSYNCP}
-RUN_DEPENDS+=	p5-File-RsyncP>=0:${PORTSDIR}/net/p5-File-RsyncP
+RUN_DEPENDS+=	p5-File-RsyncP>=0:net/p5-File-RsyncP
 .endif
 .if ${PORT_OPTIONS:MNMBLOOKUP}
-RUN_DEPENDS+=	nmblookup:${PORTSDIR}/net/samba-nmblookup
+RUN_DEPENDS+=	nmblookup:net/samba-nmblookup
 .endif
 .if ${PORT_OPTIONS:MRRDTOOL}
-RUN_DEPENDS+=	rrdtool:${PORTSDIR}/databases/rrdtool
+RUN_DEPENDS+=	rrdtool:databases/rrdtool
 .endif
 .if ${PORT_OPTIONS:MRRD_GRAPHS} || ${PORT_OPTIONS:MRRDTOOL}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bin-BackupPC \
 		${FILESDIR}/extra-patch-lib-BackupPC-CGI-GeneralInfo.pm
 .endif
 .if ${PORT_OPTIONS:MSMBCLIENT}
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-smbclient
+RUN_DEPENDS+=	smbclient:net/samba-smbclient
 .endif
 .if ${PORT_OPTIONS:MXML_RSS}
-RUN_DEPENDS+=	p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS
+RUN_DEPENDS+=	p5-XML-RSS>=0:textproc/p5-XML-RSS
 .endif
 
 pre-patch:
diff --git a/sysutils/bacula-bat/Makefile b/sysutils/bacula-bat/Makefile
index 3427d664550c..daf04f36a6bb 100644
--- a/sysutils/bacula-bat/Makefile
+++ b/sysutils/bacula-bat/Makefile
@@ -6,8 +6,8 @@ PKGNAMESUFFIX=	-bat
 
 COMMENT=	Network backup solution (GUI)
 
-LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libbac.so:${PORTSDIR}/sysutils/bacula-client
+LIB_DEPENDS+=	libqwt.so:x11-toolkits/qwt5 \
+		libbac.so:sysutils/bacula-client
 
 USES=		pkgconfig
 USE_QT4=	qmake_build uic_build moc_build rcc_build
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 580bc820370c..d42b272104dd 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -19,7 +19,7 @@ USE_OPENSSL=	yes
 
 CONFLICTS?=	bacula5-server-*
 
-LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 
 USERS=		bacula
 GROUPS=		${USERS}
@@ -43,7 +43,7 @@ PYTHON_USES=		python
 PYTHON_CONFIGURE_ON=	--with-python=yes
 
 .if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+=	libbac-${DISTVERSION}.so:${PORTSDIR}/sysutils/bacula-client
+LIB_DEPENDS+=	libbac-${DISTVERSION}.so:sysutils/bacula-client
 USE_RC_SUBR?=	bacula-dir bacula-sd
 .endif
 
@@ -114,11 +114,11 @@ CONFFILES=		sd dir
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_USE=		MYSQL=yes
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
 PGSQL_USES=		pgsql
 
-MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/bacula5-bat/Makefile b/sysutils/bacula5-bat/Makefile
index e176d8bf4d9f..57b4d59d01f6 100644
--- a/sysutils/bacula5-bat/Makefile
+++ b/sysutils/bacula5-bat/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	5
 
 COMMENT=	Network backup solution (GUI)
 
-LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libbac.so:${PORTSDIR}/sysutils/bacula5-client
+LIB_DEPENDS+=	libqwt.so:x11-toolkits/qwt5 \
+		libbac.so:sysutils/bacula5-client
 
 CONFLICTS=	bacula-bat-*
 
diff --git a/sysutils/bacula5-server/Makefile b/sysutils/bacula5-server/Makefile
index 65478123e04b..b8d021f33c3a 100644
--- a/sysutils/bacula5-server/Makefile
+++ b/sysutils/bacula5-server/Makefile
@@ -18,7 +18,7 @@ python_OLD_CMD=	@PYTHON@
 
 CONFLICTS?=	bacula-server-*
 
-LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 
 USERS=		bacula
 GROUPS=		${USERS}
@@ -45,7 +45,7 @@ PYTHON_USES=		python
 PYTHON_CONFIGURE_ON=	--with-python=yes
 
 .if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+=	libbac.so:${PORTSDIR}/sysutils/bacula5-client
+LIB_DEPENDS+=	libbac.so:sysutils/bacula5-client
 USE_RC_SUBR?=	bacula-dir bacula-sd
 .endif
 
@@ -116,11 +116,11 @@ CONFFILES=		sd dir
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_USE=	MYSQL=yes
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
 PGSQL_USES=	pgsql
 
-MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile
index 735c9ce4eb20..2663d9d6e67d 100644
--- a/sysutils/baloo/Makefile
+++ b/sysutils/baloo/Makefile
@@ -12,8 +12,8 @@ COMMENT=	KDE framework for searching and managing user metadata
 
 CONFLICTS_INSTALL=	kde-runtime-4.12.*
 
-LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core \
-		libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libxapian.so:databases/xapian-core \
+		libqjson.so:devel/qjson
 
 USE_KDE4=	kdeprefix akonadi automoc4 kdelibs kfilemetadata \
 		pimlibs
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index 464933fc27bd..c7ea5269173f 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -13,11 +13,11 @@ COMMENT=	BAMF Application Matching Framework
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala \
-	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:${PORTSDIR}/textproc/py-libxml2 \
-	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:${PORTSDIR}/textproc/py-libxslt
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	vapigen:lang/vala \
+	${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2 \
+	${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
+	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		pkgconfig gmake pathfix libtool python:2
 GNU_CONFIGURE=	yes
diff --git a/sysutils/bareos-bat/Makefile b/sysutils/bareos-bat/Makefile
index 60bf6a9507da..fb7cab5c5311 100644
--- a/sysutils/bareos-bat/Makefile
+++ b/sysutils/bareos-bat/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	0
 
 COMMENT=	Backup archiving recovery open sourced (GUI)
 
-LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libbareos.so:${PORTSDIR}/sysutils/bareos-client
+LIB_DEPENDS+=	libqwt.so:x11-toolkits/qwt5 \
+		libbareos.so:sysutils/bareos-client
 
 CONFLICTS=	bacula*-bat-*
 
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index c4ebc62b1d33..eacb87f26a6c 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -18,8 +18,8 @@ USES+=		libtool:keepla pkgconfig
 
 CONFLICTS?=	bacula*-server-*
 
-LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
+		libjansson.so:devel/jansson
 
 USERS=		bareos
 GROUPS=		${USERS}
@@ -57,7 +57,7 @@ PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
 
 .if !defined(WITH_CLIENT_ONLY)
-LIB_DEPENDS+=	libbareos.so:${PORTSDIR}/sysutils/bareos-client
+LIB_DEPENDS+=	libbareos.so:sysutils/bareos-client
 USE_RC_SUBR?=	bareos-dir bareos-sd
 .endif
 
@@ -137,11 +137,11 @@ CONFFILES=		sd dir
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_USE=	MYSQL=yes
 SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CONFIGURE_ON=	--with-postgresql=yes
 PGSQL_USES=	pgsql
 
-MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/bhyve-rc/Makefile b/sysutils/bhyve-rc/Makefile
index b56851563350..c0cc3f54f7cc 100644
--- a/sysutils/bhyve-rc/Makefile
+++ b/sysutils/bhyve-rc/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	freebsd@grem.de
 COMMENT=	FreeBSD RC script for starting bhyve guests in tmux
 
-RUN_DEPENDS=	tmux:${PORTSDIR}/sysutils/tmux
+RUN_DEPENDS=	tmux:sysutils/tmux
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/sysutils/bontmia/Makefile b/sysutils/bontmia/Makefile
index 3a93300a172f..9227f7001dc6 100644
--- a/sysutils/bontmia/Makefile
+++ b/sysutils/bontmia/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small tool for incremental backups over network
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 2f6a4427b24e..2cdf0e701c69 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -11,12 +11,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libtotem-plparser.so:multimedia/totem-pl-parser \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
+RUN_DEPENDS=	growisofs:sysutils/dvd+rw-tools \
+		cdrdao:sysutils/cdrdao
 
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		shared-mime-info tar:xz
@@ -42,8 +42,8 @@ NAUTILUS_DESC=	Build nautilus extension
 LIBBURNIA_DESC=	Build libburnia plug-ins
 NAUTILUS_USE=	GNOME=nautilus3
 NAUTILUS_CONFIGURE_ENABLE=	nautilus
-LIBBURNIA_LIB_DEPENDS=	libburn.so:${PORTSDIR}/devel/libburn \
-			libisofs.so:${PORTSDIR}/devel/libisofs
+LIBBURNIA_LIB_DEPENDS=	libburn.so:devel/libburn \
+			libisofs.so:devel/libisofs
 LIBBURNIA_CONFIGURE_ENABLE=	libburnia
 
 PLIST_SUB=	FULL_VERSION=${PORTVERSION}
diff --git a/sysutils/bsdploy/Makefile b/sysutils/bsdploy/Makefile
index 8c97eb8d57fd..b202a716f8f6 100644
--- a/sysutils/bsdploy/Makefile
+++ b/sysutils/bsdploy/Makefile
@@ -9,20 +9,20 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Container Management for FreeBSD Jails
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}pyliblzma>0:${PORTSDIR}/archivers/py-pyliblzma \
-		${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:${PORTSDIR}/sysutils/py-ploy \
-		${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:${PORTSDIR}/sysutils/py-ploy_ansible \
-		${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:${PORTSDIR}/sysutils/py-ploy_ezjail \
-		${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:${PORTSDIR}/sysutils/py-ploy_fabric
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma \
+		${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
+		${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible \
+		${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail \
+		${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric
 
 OPTIONS_DEFINE=		EC2
 OPTIONS_DEFAULT=	EC2
 
 EC2_DESC=		Support Amazon Web Services EC2 hosts
-EC2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:${PORTSDIR}/sysutils/py-ploy_ec2
+EC2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2
 
 USES=			python:-2.7 zip
 USE_PYTHON=		autoplist distutils
diff --git a/sysutils/bsdstats/Makefile b/sysutils/bsdstats/Makefile
index 3498815f1eee..71b53c0e0583 100644
--- a/sysutils/bsdstats/Makefile
+++ b/sysutils/bsdstats/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	bin/bsdstats-send \
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTOR}
-RUN_DEPENDS+=	tor:${PORTSDIR}/security/tor
+RUN_DEPENDS+=	tor:security/tor
 .endif
 
 pre-install:
diff --git a/sysutils/btsixad/Makefile b/sysutils/btsixad/Makefile
index efa26942c39f..e205324f2d00 100644
--- a/sysutils/btsixad/Makefile
+++ b/sysutils/btsixad/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Driver for Sixaxis gamepad connected over Bluetooth
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcuse4bsd.so:${PORTSDIR}/multimedia/cuse4bsd-kmod
+LIB_DEPENDS=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
 
 USES=		uidfix
 
diff --git a/sysutils/bulk_extractor/Makefile b/sysutils/bulk_extractor/Makefile
index 6ad459a8fb47..42cbd30bbc95 100644
--- a/sysutils/bulk_extractor/Makefile
+++ b/sysutils/bulk_extractor/Makefile
@@ -13,10 +13,10 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		sqlite
-LIB_DEPENDS=	libafflib.so:${PORTSDIR}/sysutils/afflib \
-		libewf.so:${PORTSDIR}/devel/libewf \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libafflib.so:sysutils/afflib \
+		libewf.so:devel/libewf \
+		libexiv2.so:graphics/exiv2 \
+		libexpat.so:textproc/expat2
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -36,7 +36,7 @@ BEVIEWER_PLIST_FILES=	bin/BEViewer bin/BEViewer.jar
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 CONFIGURE_ENV=	LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index 37225d1a8f33..942a0077fae1 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Network backup and restore program
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:${PORTSDIR}/devel/uthash
-LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync1
+BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
+LIB_DEPENDS=	librsync.so:net/librsync1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grke
diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 0623ab2b1a17..572060dc3eb3 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Busybox for FreeBSD
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	gsed:textproc/gsed
 
 CONFLICTS_INSTALL=	busybox-unstable-*
 
diff --git a/sysutils/byobu/Makefile b/sysutils/byobu/Makefile
index f45ecb634d40..f56dd26a523c 100644
--- a/sysutils/byobu/Makefile
+++ b/sysutils/byobu/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Profile and configuration utilities for GNU Screen
 
-RUN_DEPENDS=	screen:${PORTSDIR}/sysutils/screen \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	screen:sysutils/screen \
+		bash:shells/bash
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf python shebangfix
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 95502048109c..a744b54ff7e7 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -12,10 +12,10 @@ COMMENT=	GTK search utility
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	\
-	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:${PORTSDIR}/devel/py-python-distutils-extra \
-	${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect \
-	${PYTHON_PKGNAMEPREFIX}gobject3>=0:${PORTSDIR}/devel/py-gobject3 \
-	gksu:${PORTSDIR}/sysutils/gksu
+	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \
+	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \
+	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3 \
+	gksu:sysutils/gksu
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		python
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index 0bb39ff5064c..2b7fd6bbdeed 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Yet another FreeBSD Jail and Bhyve Management Utility
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		sudo:${PORTSDIR}/security/sudo \
-		sqlite3:${PORTSDIR}/databases/sqlite3
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS=	rsync:net/rsync \
+		sudo:security/sudo \
+		sqlite3:databases/sqlite3
+LIB_DEPENDS=	libssh2.so:security/libssh2 \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	olevole
@@ -37,7 +37,7 @@ IGNORE=	does not support FreeBSD versions < 10.0
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-LIB_DEPENDS+=	libxo.so:${PORTSDIR}/devel/libxo
+LIB_DEPENDS+=	libxo.so:devel/libxo
 .endif
 
 do-install:
diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile
index 9a304160a4b3..0b6dc62bff38 100644
--- a/sysutils/ccze/Makefile
+++ b/sysutils/ccze/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast log colorizer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index e1706dd29729..cde5ca310838 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}-1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple but full-featured backup/restore perl scripts (uses gnu tar)
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/eject:${PORTSDIR}/sysutils/eject \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	${LOCALBASE}/sbin/eject:sysutils/eject \
+		cdrecord:sysutils/cdrtools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 953dd01513c0..9a34fefb7483 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -16,9 +16,9 @@ LICENSE=	GPLv2
 USES=		alias gmake tar:bzip2
 GNU_CONFIGURE=	yes
 
-MP3OGG_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
-			libmad.so:${PORTSDIR}/audio/libmad \
-			libvorbis.so:${PORTSDIR}/audio/libvorbis
+MP3OGG_LIB_DEPENDS=	libao.so:audio/libao \
+			libmad.so:audio/libmad \
+			libvorbis.so:audio/libvorbis
 
 .if ${PORTNAME} == "cdrdao"
 OPTIONS_DEFINE=		DOCS TOC2MP3 MP3OGG
@@ -35,14 +35,14 @@ USES+=			pkgconfig shared-mime-info
 WANT_GNOME=		yes
 GCONF_SCHEMAS=		gcdmaster.schemas
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS} \
-			libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
-RUN_DEPENDS+=		${LOCALBASE}/bin/cdrdao:${PORTSDIR}/sysutils/cdrdao \
-			${LOCALBASE}/share/mime/packages/freedesktop.org.xml:${PORTSDIR}/misc/shared-mime-info
+			libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26
+RUN_DEPENDS+=		${LOCALBASE}/bin/cdrdao:sysutils/cdrdao \
+			${LOCALBASE}/share/mime/packages/freedesktop.org.xml:misc/shared-mime-info
 CONFIGURE_ARGS+=	--with-lame=no
 .else
 CONFIGURE_ARGS+=	--with-xdao=no
 .if ${PORT_OPTIONS:MTOC2MP3}
-LIB_DEPENDS+=		libmp3lame.so:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=		libmp3lame.so:audio/lame
 CONFIGURE_ARGS+=	--with-lame-include=${LOCALBASE}/include \
 			--with-lame-lib=${LOCALBASE}/lib
 PLIST_SUB+=		TOC2MP3=""
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index bc0c5f301df8..a28cd9dba105 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://cdrkit.org/releases/ \
 MAINTAINER=	jharris@widomaker.com
 COMMENT?=	Command-line CD/DVD writing suite
 
-RUN_DEPENDS?=	${PORTNAME}-genisoimage>0:${PORTSDIR}/sysutils/genisoimage
+RUN_DEPENDS?=	${PORTNAME}-genisoimage>0:sysutils/genisoimage
 
 USES=		cmake iconv perl5 shebangfix
 USE_PERL5=	run
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 3d96f98b1b06..776d8d344b95 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -65,13 +65,13 @@ RSCSI_DESC=	Build rscsi suid root remote SCSI access daemon
 
 .if ${PORT_OPTIONS:MCDDA2MP3}
 PLIST_SUB+=	CDDA2MP3=""
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+RUN_DEPENDS+=	lame:audio/lame
 .else
 PLIST_SUB+=	CDDA2MP3="@comment "
 .endif
 .if ${PORT_OPTIONS:MCDDA2OGG}
 PLIST_SUB+=	CDDA2OGG=""
-RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
+RUN_DEPENDS+=	oggenc:audio/vorbis-tools
 .else
 PLIST_SUB+=	CDDA2OGG="@comment "
 .endif
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 6fe55c60077b..3395bf799511 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -64,13 +64,13 @@ RSCSI_DESC=	Build rscsi suid root remote SCSI access daemon
 
 .if ${PORT_OPTIONS:MCDDA2MP3}
 PLIST_SUB+=	CDDA2MP3=""
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+RUN_DEPENDS+=	lame:audio/lame
 .else
 PLIST_SUB+=	CDDA2MP3="@comment "
 .endif
 .if ${PORT_OPTIONS:MCDDA2OGG}
 PLIST_SUB+=	CDDA2OGG=""
-RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
+RUN_DEPENDS+=	oggenc:audio/vorbis-tools
 .else
 PLIST_SUB+=	CDDA2OGG="@comment "
 .endif
diff --git a/sysutils/cfengine-masterfiles36/Makefile b/sysutils/cfengine-masterfiles36/Makefile
index 2284953f420c..5599e218d203 100644
--- a/sysutils/cfengine-masterfiles36/Makefile
+++ b/sysutils/cfengine-masterfiles36/Makefile
@@ -19,7 +19,7 @@ CPE_VENDOR=	gnu
 PKGNAMESUFFIX=	36
 .endif
 
-RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX}
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
diff --git a/sysutils/cfengine-masterfiles37/Makefile b/sysutils/cfengine-masterfiles37/Makefile
index b9a1ec1a4dd4..23444bd4caa3 100644
--- a/sysutils/cfengine-masterfiles37/Makefile
+++ b/sysutils/cfengine-masterfiles37/Makefile
@@ -19,7 +19,7 @@ CPE_VENDOR=	gnu
 PKGNAMESUFFIX=	37
 .endif
 
-RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX}
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
diff --git a/sysutils/cfengine-masterfiles38/Makefile b/sysutils/cfengine-masterfiles38/Makefile
index 0b6195cfc238..83f3599f318b 100644
--- a/sysutils/cfengine-masterfiles38/Makefile
+++ b/sysutils/cfengine-masterfiles38/Makefile
@@ -19,7 +19,7 @@ CPE_VENDOR=	gnu
 PKGNAMESUFFIX=	38
 .endif
 
-RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX}
+RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile
index 5a2c615fbaf6..b44675f1e758 100644
--- a/sysutils/cfengine32/Makefile
+++ b/sysutils/cfengine32/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=	cfengine-[2]* cfengine-3.[3-9]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		cpe libtool
 USE_BDB=	48+
diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile
index d39339fbe08a..d07b90a607aa 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--enable-fhs
 CFLAGS+=	-Wno-error=implicit-function-declaration
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 OPTIONS_SINGLE=	DB
@@ -52,12 +52,12 @@ post-patch:
 
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MQDBM}
 CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
-LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -68,13 +68,13 @@ CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-LIB_DEPENDS+=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+LIB_DEPENDS+=		libmysqlclient.so:${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:devel/libvirt
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index 5dd18b707a07..4263a05ac88a 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--with-pcre=${LOCALBASE} \
 		--enable-fhs
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 OPTIONS_SINGLE=	BACKEND
@@ -55,12 +55,12 @@ LIBVIRT_DESC=	Enable libvirt compatibility
 
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MQDBM}
 CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
-LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -71,13 +71,13 @@ CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-LIB_DEPENDS+=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+LIB_DEPENDS+=		libmysqlclient.so:${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:devel/libvirt
 .endif
 
 post-patch:
diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
index 92f2f3e386af..79db3109dc7f 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	35
@@ -56,12 +56,12 @@ OPTIONS_DEFAULT=TOKYOCABINET
 
 .if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
 .endif
 
 .if ${PORT_OPTIONS:MQDBM}
 CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
-LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -72,13 +72,13 @@ CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-LIB_DEPENDS+=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+LIB_DEPENDS+=		libmysqlclient.so:${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
 .if ${PORT_OPTIONS:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
-LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+LIB_DEPENDS+=		libvirt.so:devel/libvirt
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile
index 2d7a9307b90b..57485f479d1b 100644
--- a/sysutils/cfengine36/Makefile
+++ b/sysutils/cfengine36/Makefile
@@ -48,8 +48,8 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--enable-fhs
 INSTALL_TARGET=	install-strip
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		liblmdb.so:${PORTSDIR}/databases/lmdb
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 
@@ -58,10 +58,10 @@ PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}
 
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
-MYSQL_LIB_DEPENDS=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+MYSQL_LIB_DEPENDS=		libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 
 LIBVIRT_CONFIGURE_ON=	--with-libvirt=${LOCALBASE}
-LIBVIRT_LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+LIBVIRT_LIB_DEPENDS+=		libvirt.so:devel/libvirt
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile
index 17f53959bd04..e8e506100801 100644
--- a/sysutils/cfengine37/Makefile
+++ b/sysutils/cfengine37/Makefile
@@ -47,8 +47,8 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--enable-fhs
 INSTALL_TARGET=	install-strip
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		liblmdb.so:${PORTSDIR}/databases/lmdb
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 
@@ -57,10 +57,10 @@ PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}
 
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
-MYSQL_LIB_DEPENDS=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+MYSQL_LIB_DEPENDS=		libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 
 LIBVIRT_CONFIGURE_ON=	--with-libvirt=${LOCALBASE}
-LIBVIRT_LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+LIBVIRT_LIB_DEPENDS+=		libvirt.so:devel/libvirt
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile
index 10b2aea4c28e..a4ed6dcb067b 100644
--- a/sysutils/cfengine38/Makefile
+++ b/sysutils/cfengine38/Makefile
@@ -47,8 +47,8 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--enable-fhs
 INSTALL_TARGET=	install-strip
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		liblmdb.so:${PORTSDIR}/databases/lmdb
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		liblmdb.so:databases/lmdb
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 
@@ -57,10 +57,10 @@ PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}
 
 MYSQL_USE=		MYSQL=yes
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}
-MYSQL_LIB_DEPENDS=		libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT}
+MYSQL_LIB_DEPENDS=		libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 
 LIBVIRT_CONFIGURE_ON=	--with-libvirt=${LOCALBASE}
-LIBVIRT_LIB_DEPENDS+=		libvirt.so:${PORTSDIR}/devel/libvirt
+LIBVIRT_LIB_DEPENDS+=		libvirt.so:devel/libvirt
 
 .include <bsd.port.mk>
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index ab6d91d6c8e5..6115c149cb6d 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -13,30 +13,30 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for Cinnamon
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libcheese.so:${PORTSDIR}/multimedia/cheese \
-		libcaribou.so:${PORTSDIR}/accessibility/caribou \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libmuffin.so:${PORTSDIR}/x11-wm/muffin \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
-		libgnomekbdui.so:${PORTSDIR}/x11/libgnomekbd \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
-		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libcinnamon-menu-3.so:${PORTSDIR}/x11/cinnamon-menus \
-		libgjs.so:${PORTSDIR}/lang/gjs
-RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
-		cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		cinnamon-settings-daemon>=0:sysutils/cinnamon-settings-daemon \
+		gnome-autogen.sh:devel/gnome-common
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libupower-glib.so:sysutils/upower \
+		libcheese.so:multimedia/cheese \
+		libcaribou.so:accessibility/caribou \
+		libgtop-2.0.so:devel/libgtop \
+		libmuffin.so:x11-wm/muffin \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libtelepathy-logger.so:net-im/telepathy-logger \
+		libgnomekbdui.so:x11/libgnomekbd \
+		libfolks.so:net-im/folks \
+		libpulse.so:audio/pulseaudio \
+		libcroco-0.6.so:textproc/libcroco \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libclutter-glx-1.0.so:graphics/clutter \
+		libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libcinnamon-menu-3.so:x11/cinnamon-menus \
+		libgjs.so:lang/gjs
+RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
+		cinnamon-settings-daemon>=0:sysutils/cinnamon-settings-daemon \
+		ca_root_nss>=0:security/ca_root_nss \
+		py*-lxml>=0:devel/py-lxml
 
 USES=		autoreconf gettext gmake libtool pathfix \
 		python:2 pkgconfig
@@ -58,7 +58,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CUPS
 OPTIONS_DEFAULT=CUPS
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 
 MISSING_PNG=timezone_8.5.png timezone_8.5_dim.png
 .for i in ${MISSING_PNG}
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index cb185e689e80..d268dd3077ab 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -10,22 +10,22 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 settings daemon
 
-BUILD_DEPENDS=	cinnamon-session:${PORTSDIR}/x11/cinnamon-session \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libcolord.so:${PORTSDIR}/graphics/colord \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	cinnamon-session:${PORTSDIR}/x11/cinnamon-session \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	cinnamon-session:x11/cinnamon-session \
+		gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libibus-1.0.so:textproc/ibus \
+		libdbus-1.so:devel/dbus \
+		libcolord.so:graphics/colord \
+		liblcms2.so:graphics/lcms2 \
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libpulse.so:audio/pulseaudio \
+		libgdbm.so:databases/gdbm \
+		libnotify.so:devel/libnotify
+RUN_DEPENDS=	cinnamon-session:x11/cinnamon-session \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake libtool pathfix \
 		pkgconfig tar:xz
@@ -65,9 +65,9 @@ OPTIONS_DEFINE=	CUPS SMARTCARD
 OPTIONS_DEFAULT=CUPS SMARTCARD
 SMARTCARD_DESC=	Smartcard support
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
-SMARTCARD_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+SMARTCARD_LIB_DEPENDS=	libnss3.so:security/nss
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
diff --git a/sysutils/ck4up/Makefile b/sysutils/ck4up/Makefile
index 63a37a8c6e5a..88f697538c07 100644
--- a/sysutils/ck4up/Makefile
+++ b/sysutils/ck4up/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://jue.li/crux/ck4up/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Checks http and ftp sites for updates
 
-RUN_DEPENDS=	${RUBY_ARCHLIBDIR}/gdbm.so:${PORTSDIR}/databases/ruby-gdbm
+RUN_DEPENDS=	${RUBY_ARCHLIBDIR}/gdbm.so:databases/ruby-gdbm
 
 NO_BUILD=	yes
 USE_RUBY=	yes
diff --git a/sysutils/clockspeed/Makefile b/sysutils/clockspeed/Makefile
index 61e9ecd25094..8438bcf2dfa7 100644
--- a/sysutils/clockspeed/Makefile
+++ b/sysutils/clockspeed/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://cr.yp.to/clockspeed/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Uses a hardware tick counter to compensate for deviant system clock
 
-LIB_DEPENDS=	libtai.so:${PORTSDIR}/devel/libtai
+LIB_DEPENDS=	libtai.so:devel/libtai
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile
index f093ffd15c86..86dcfc1ea4f6 100644
--- a/sysutils/cloudabi-utils/Makefile
+++ b/sysutils/cloudabi-utils/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utilities for running CloudABI programs
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
diff --git a/sysutils/clsync/Makefile b/sysutils/clsync/Makefile
index 5e65e3e517cb..919ff8b652f0 100644
--- a/sysutils/clsync/Makefile
+++ b/sysutils/clsync/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Live file sync daemon based on inotify, written in GNU C
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf compiler:features execinfo gmake libtool pkgconfig
diff --git a/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile
index 54c3ca99c6db..44a5f305a310 100644
--- a/sysutils/cluster-glue/Makefile
+++ b/sysutils/cluster-glue/Makefile
@@ -15,9 +15,9 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libnet.so:net/libnet
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-fatal-warnings \
@@ -42,23 +42,23 @@ OPTIONS_SUB=		yes
 
 DRAC3_CONFIGURE_OFF=	ac_cv_header_curl_curl_h=no
 DRAC3_DESC=		Dell DRAC III support
-DRAC3_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+DRAC3_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 HPI_CONFIGURE_OFF=	ac_cv_header_openhpi_SaHpi_h=no
 HPI_DESC=		SAF Hardware Platform Interface support
-HPI_LIB_DEPENDS=	libopenhpi.so:${PORTSDIR}/sysutils/openhpi
+HPI_LIB_DEPENDS=	libopenhpi.so:sysutils/openhpi
 
 IPMI_CONFIGURE_ENABLE=	ipmilan
 IPMI_DESC=		Intelligent Platform Management Interface support
-IPMI_LIB_DEPENDS=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
-MANPAGES_BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-			help2man:${PORTSDIR}/misc/help2man \
-			xsltproc:${PORTSDIR}/textproc/libxslt
+MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			help2man:misc/help2man \
+			xsltproc:textproc/libxslt
 MANPAGES_CONFIGURE_ENABLE=doc
 
 SNMP_CONFIGURE_ENABLE=	snmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index 1041695ada24..4fc0aab2bc5a 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Robust log colorizer
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+RUN_DEPENDS=	p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	raszi
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index a8c5f283f3d6..2633ea416fc6 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -13,10 +13,10 @@ COMMENT=	High-throughput computing on distributively owned resources
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
-LIB_DEPENDS+=	libkrb5support.so:${PORTSDIR}/security/krb5 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs
+LIB_DEPENDS+=	libkrb5support.so:security/krb5 \
+		libpcre.so:devel/pcre \
+		libcurl.so:ftp/curl \
+		libboost_python.so:devel/boost-python-libs
 
 WRKSRC=		${WRKDIR}/condor-${PORTVERSION}
 USE_LDCONFIG=	yes
diff --git a/sysutils/confman/Makefile b/sysutils/confman/Makefile
index df1d2605a2fa..f05a4347b9cd 100644
--- a/sysutils/confman/Makefile
+++ b/sysutils/confman/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.timesinks.net/distfiles/
 MAINTAINER=	ccowart@timesinks.net
 COMMENT=	Revision controlled configuration manager
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		svn:${PORTSDIR}/devel/subversion \
-		sudo:${PORTSDIR}/security/sudo \
-		greadlink:${PORTSDIR}/sysutils/coreutils \
-		wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	bash:shells/bash \
+		svn:devel/subversion \
+		sudo:security/sudo \
+		greadlink:sysutils/coreutils \
+		wget:ftp/wget
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index b791d9f077c5..1ac72576a95c 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -43,25 +43,25 @@ ARGB_CONFIGURE_ENABLE=	argb
 
 AUDACIOUS_DESC=		Control Audacious sound player
 AUDACIOUS_CONFIGURE_ENABLE=audacious
-AUDACIOUS_LIB_DEPENDS=	libaudclient.so:${PORTSDIR}/multimedia/audacious
+AUDACIOUS_LIB_DEPENDS=	libaudclient.so:multimedia/audacious
 
 DOUBLE_BUFFER_DESC=	Enable X11 double buffering
 DOUBLE_BUFFER_CONFIGURE_ENABLE=double-buffer
 
 INOTIFY_DESC=		Monitor file changes via Inotify
 INOTIFY_CONFIGURE_ENABLE=inotify
-INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 LUA_CAIRO_DESC=		Lua-Cairo binding
 LUA_CAIRO_CONFIGURE_ENABLE=lua-cairo
-LUA_CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+LUA_CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 LUA_IMLIB2_DESC=	Lua-Imlib2 binding
 LUA_IMLIB2_CONFIGURE_ENABLE=lua-imlib2
 
 METAR_DESC=		Display METAR weather reports
 METAR_CONFIGURE_ENABLE=	weather-metar
-METAR_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+METAR_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 MOC_DESC=		Control MOC (Music On Console)
 MOC_CONFIGURE_ENABLE=	moc
@@ -75,20 +75,20 @@ NCURSES_CONFIGURE_ENABLE=ncurses
 RSS_DESC=		Display RSS feeds
 RSS_CONFIGURE_ENABLE=	rss
 RSS_USE=		GNOME=glib20
-RSS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-			libxml2.so:${PORTSDIR}/textproc/libxml2
+RSS_LIB_DEPENDS=	libcurl.so:ftp/curl \
+			libxml2.so:textproc/libxml2
 
 XFT_CONFIGURE_ENABLE=	xft
-XFT_LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
+XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 
 XMMS2_DESC=		Control XMMS2 media player
 XMMS2_CONFIGURE_ENABLE=	xmms2
-XMMS2_LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
+XMMS2_LIB_DEPENDS=	libxmmsclient.so:audio/xmms2
 
 XOAP_DESC=		Display XOAP weather reports
 XOAP_CONFIGURE_ENABLE=	weather-xoap
-XOAP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-			libxml2.so:${PORTSDIR}/textproc/libxml2
+XOAP_LIB_DEPENDS=	libcurl.so:ftp/curl \
+			libxml2.so:textproc/libxml2
 
 .include <bsd.port.options.mk>
 
@@ -102,7 +102,7 @@ EXAMPLE_CONF_FILE=	${WRKSRC}/data/conky_no_x11.conf
 .endif
 
 .if ${PORT_OPTIONS:MIMLIB2} || ${PORT_OPTIONS:MLUA_IMLIB2}
-LIB_DEPENDS+=		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=		libImlib2.so:graphics/imlib2
 CONFIGURE_ARGS+=	--enable-imlib2
 .else
 CONFIGURE_ARGS+=	--disable-imlib2
@@ -116,7 +116,7 @@ CONFIGURE_ARGS+=	--disable-lua
 .endif
 
 .if ${PORT_OPTIONS:MLUA_CAIRO} || ${PORT_OPTIONS:MLUA_IMLIB2}
-LIB_DEPENDS+=		libtolua++-5.1.so:${PORTSDIR}/lang/tolua++
+LIB_DEPENDS+=		libtolua++-5.1.so:lang/tolua++
 .endif
 
 post-patch:
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 798bbb37566e..de5abfdc2f15 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for defining and tracking users
 
-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
 
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 0dcb01257eea..32792ee5a47b 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Service discovery and configuration made easy
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USES=		compiler
 
diff --git a/sysutils/contractor/Makefile b/sysutils/contractor/Makefile
index 6e2773fb91dc..319e3acae9af 100644
--- a/sysutils/contractor/Makefile
+++ b/sysutils/contractor/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Desktop-wide extension service
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee
 
 USE_GCC=	yes
 USES=	cmake pkgconfig
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index 4b9638510ee7..547a6170054f 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=		.Z
 MAINTAINER=		sjroz@verizon.net
 COMMENT=		Program that is used to duplicate magtapes
 
-EXTRACT_DEPENDS=	gunshar:${PORTSDIR}/archivers/sharutils
+EXTRACT_DEPENDS=	gunshar:archivers/sharutils
 
 NO_WRKSUBDIR=		yes
 
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 94cef7703572..6dafe753f2a6 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 GMP_CONFIGURE_WITH=	gmp
 
 post-build:
diff --git a/sysutils/createrepo/Makefile b/sysutils/createrepo/Makefile
index 9cbec811ee16..5206107fe022 100644
--- a/sysutils/createrepo/Makefile
+++ b/sysutils/createrepo/Makefile
@@ -11,16 +11,16 @@ COMMENT=	Utility to create and manage RPM metadata repositories
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sqlitecachec.py:${PORTSDIR}/devel/py-yum-metadata-parser \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:${PORTSDIR}/www/py-urlgrabber \
-		${PYTHON_SITELIBDIR}/yum/__init__.py:${PORTSDIR}/sysutils/yum \
-		${PYTHON_SITELIBDIR}/deltarpm.py:${PORTSDIR}/sysutils/deltarpm
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \
+		${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber \
+		${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum \
+		${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm
 
 USES=		gmake python shebangfix
 SHEBANG_FILES=	*.py */*.py Makefile
 
-BUILD_DEPENDS+=	ginstall:${PORTSDIR}/sysutils/coreutils
+BUILD_DEPENDS+=	ginstall:sysutils/coreutils
 GINSTALL=	ginstall
 
 MAKE_ARGS=	MAKE=${MAKE_CMD} INSTALL="${GINSTALL} -p -v" PYTHON=${PYTHON_CMD} \
diff --git a/sysutils/curly/Makefile b/sysutils/curly/Makefile
index 6cedfa981c87..c06b4d0c4267 100644
--- a/sysutils/curly/Makefile
+++ b/sysutils/curly/Makefile
@@ -14,8 +14,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Generalize listed filenames to csh-extended glob patterns
 
-BUILD_DEPENDS=	makeme:${PORTSDIR}/devel/msrc0 \
-		mkcmd:${PORTSDIR}/devel/mkcmd
+BUILD_DEPENDS=	makeme:devel/msrc0 \
+		mkcmd:devel/mkcmd
 
 MAKE_FLAGS=
 MAKEFILE=
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index f5c22637c04e..1c1d0f46f27d 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -33,12 +33,12 @@ BZIP2_CONFIGURE_OFF=	--disable-libbz2-linking
 LZMA_CONFIGURE_OFF=	--disable-libxz-linking
 GPGME_DESC=		gpgme for asymetric crypto algorithms
 GPGME_CONFIGURE_OFF=	--disable-gpgme-linking
-GPGME_LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_IMPLIES=		GCRYPT
 GCRYPT_CONFIGURE_OFF=	--disable-libgcrypt-linking
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 LZO_DESC=		Support lzo compression via liblzo2
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_OFF=	--disable-liblzo2-linking
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/sysutils/dateutils/Makefile b/sysutils/dateutils/Makefile
index 861006816758..5cdd0e46a7db 100644
--- a/sysutils/dateutils/Makefile
+++ b/sysutils/dateutils/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Command line utilities for working with dates
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		tar:xz
 GNU_CONFIGURE=	yes
diff --git a/sysutils/ddrescue/Makefile b/sysutils/ddrescue/Makefile
index 6978691ec410..bb8e84a750eb 100644
--- a/sysutils/ddrescue/Makefile
+++ b/sysutils/ddrescue/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Data recovery tool
 
 LICENSE=	GPLv3
 
-EXTRACT_DEPENDS=lzip:${PORTSDIR}/archivers/lzip
+EXTRACT_DEPENDS=lzip:archivers/lzip
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile
index f6e7034a1ca6..760bbf72e21e 100644
--- a/sysutils/debootstrap/Makefile
+++ b/sysutils/debootstrap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Install Debian base system into a directory
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/debian/copyright
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
diff --git a/sysutils/deltarpm/Makefile b/sysutils/deltarpm/Makefile
index 98cabad09429..38e7e0b658c5 100644
--- a/sysutils/deltarpm/Makefile
+++ b/sysutils/deltarpm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool that generates delta RPMs
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	librpm.so:${PORTSDIR}/archivers/rpm4
+LIB_DEPENDS=	librpm.so:archivers/rpm4
 
 USES=		gmake python shebangfix tar:bz2
 SHEBANG_FILES=	drpmsync
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index c35684987ccc..6c64fcc2526f 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -14,9 +14,9 @@ DISTFILES+=	${DISTNAME}.tar.gz ${BZIP2_102_SOURCE}:bzip2102src ${BZIP2_103_SOURC
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Source delta update program
 
-RUN_DEPENDS=	bdelta:${PORTSDIR}/misc/bdelta \
-		xdelta:${PORTSDIR}/misc/xdelta \
-		gzip>=1:${PORTSDIR}/archivers/gzip
+RUN_DEPENDS=	bdelta:misc/bdelta \
+		xdelta:misc/xdelta \
+		gzip>=1:archivers/gzip
 
 BZIP2_102_SOURCE=	bzip2-${BZIP2_102}.tar.gz
 BZIP2_103_SOURCE=	bzip2-${BZIP2_103}.tar.gz
diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile
index a473eea44c5e..97efb6565096 100644
--- a/sysutils/desktop-installer/Makefile
+++ b/sysutils/desktop-installer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Quickly configure a FreeBSD desktop system
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	auto-admin>=0.3.6:${PORTSDIR}/sysutils/auto-admin
+RUN_DEPENDS=	auto-admin>=0.3.6:sysutils/auto-admin
 
 USES=		tar:xz
 
diff --git a/sysutils/direnv/Makefile b/sysutils/direnv/Makefile
index 51188aee2cfb..64de21fa9f5d 100644
--- a/sysutils/direnv/Makefile
+++ b/sysutils/direnv/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Environment variable manager for your shell
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zimbatm
diff --git a/sysutils/dirvish/Makefile b/sysutils/dirvish/Makefile
index 56d906c90e24..c5221347409d 100644
--- a/sysutils/dirvish/Makefile
+++ b/sysutils/dirvish/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.dirvish.org/
 MAINTAINER=	tarkhil@over.ru
 COMMENT=	Network backup system based off of rsync
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
-		p5-Time-Period>=0:${PORTSDIR}/devel/p5-Time-Period \
-		rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules \
+		p5-Time-Period>=0:devel/p5-Time-Period \
+		rsync:net/rsync
 
 MAN5S=		dirvish.conf.5
 MAN8S=		dirvish.8 dirvish-expire.8 dirvish-locate.8 dirvish-runall.8
diff --git a/sysutils/disktool/Makefile b/sysutils/disktool/Makefile
index 8a7e9e5ebf6c..8da5a83a3e2d 100644
--- a/sysutils/disktool/Makefile
+++ b/sysutils/disktool/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	disktool-2.0c
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	XView sysadmin tool for monitoring diskfull situations
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 4ce9148e3308..d694e9fbc2c0 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mount UPnP A/V Media
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
+LIB_DEPENDS=	libupnp.so:devel/upnp
 
 PLIST_FILES=	bin/${PORTNAME}
 GNU_CONFIGURE=	yes
diff --git a/sysutils/docker-freebsd/Makefile b/sysutils/docker-freebsd/Makefile
index 8d6d4d17bf09..60ce6d2b11d5 100644
--- a/sysutils/docker-freebsd/Makefile
+++ b/sysutils/docker-freebsd/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Docker containment system
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.4:${PORTSDIR}/lang/go \
-		bash:${PORTSDIR}/shells/bash \
-		sqlite3:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	go>=1.4:${PORTSDIR}/lang/go \
-		bash:${PORTSDIR}/shells/bash \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	go>=1.4:lang/go \
+		bash:shells/bash \
+		sqlite3:databases/sqlite3
+RUN_DEPENDS=	go>=1.4:lang/go \
+		bash:shells/bash \
+		sqlite3:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kvasdopil
diff --git a/sysutils/dsbmc/Makefile b/sysutils/dsbmc/Makefile
index 6de071ced5c0..f86b17c746d9 100644
--- a/sysutils/dsbmc/Makefile
+++ b/sysutils/dsbmc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GTK+ client for DSBMD that lets you mount media, and more
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/dsbmd:${PORTSDIR}/sysutils/dsbmd
+RUN_DEPENDS=	${LOCALBASE}/libexec/dsbmd:sysutils/dsbmd
 
 USES=		tar:tgz pkgconfig
 USE_GNOME=	gtk20
diff --git a/sysutils/du2ps/Makefile b/sysutils/du2ps/Makefile
index d3d0aea2a582..c59700ab9027 100644
--- a/sysutils/du2ps/Makefile
+++ b/sysutils/du2ps/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Filter for converting output of du to PostScript file
 
 # Nkf is required for just converting character code of japanese manual
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+BUILD_DEPENDS=	nkf:japanese/nkf
 
 USES=		tar:tgz
 ALL_TARGET=	# empty
diff --git a/sysutils/dunst/Makefile b/sysutils/dunst/Makefile
index b57e409ad04a..7e8effb39193 100644
--- a/sysutils/dunst/Makefile
+++ b/sysutils/dunst/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Lightweight notification daemon
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libpango-1.0.so:${PORTSDIR}/x11-toolkits/pango \
-		libxdg-basedir.so:${PORTSDIR}/x11/libxdg-basedir
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libdbus-1.so:devel/dbus \
+		libfreetype.so:print/freetype2 \
+		libnotify.so:devel/libnotify \
+		libpango-1.0.so:x11-toolkits/pango \
+		libxdg-basedir.so:x11/libxdg-basedir
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	knopwob
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index f8639159af08..57cbd3e0b253 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download
 MAINTAINER=	jase@FreeBSD.org
 COMMENT=	Backup tool that uses librsync and GnuPG
 
-LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile
+LIB_DEPENDS=	librsync.so:net/librsync
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
@@ -37,18 +37,18 @@ PEXPECT_DESC=		Install pexpect and use ssh binaries
 
 PORTDOCS=	CHANGELOG COPYING README README-REPO README-LOG
 
-CLOUDFILES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudfiles>0:${PORTSDIR}/net/py-cloudfiles
-FTP_RUN_DEPENDS=	ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3
-FTPS_RUN_DEPENDS=	lftp>=3.7.15:${PORTSDIR}/ftp/lftp
-GDOCS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
-GIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>0:${PORTSDIR}/devel/py-gobject \
-					dbus>0:${PORTSDIR}/devel/dbus
-GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:${PORTSDIR}/security/gnupg1
-GNUPG2_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
+CLOUDFILES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cloudfiles>0:net/py-cloudfiles
+FTP_RUN_DEPENDS=	ncftp>=3.2.2:ftp/ncftp3
+FTPS_RUN_DEPENDS=	lftp>=3.7.15:ftp/lftp
+GDOCS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata
+GIO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject \
+					dbus>0:devel/dbus
+GNUPG_RUN_DEPENDS=	gnupg1>=1.4.7:security/gnupg1
+GNUPG2_RUN_DEPENDS=	gpg2:security/gnupg
 NLS_USES=		gettext
-PARAMIKO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko
-PEXPECT_RUN_DEPENDS=	pexpect:${PORTSDIR}/misc/py-pexpect
-S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}boto>=1.6b:${PORTSDIR}/devel/py-boto
+PARAMIKO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko
+PEXPECT_RUN_DEPENDS=	pexpect:misc/py-pexpect
+S3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/duply/Makefile b/sysutils/duply/Makefile
index 6d30596e416c..9b8ff2f15334 100644
--- a/sysutils/duply/Makefile
+++ b/sysutils/duply/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Shell front end for the duplicity backup tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/gpl-2.0.txt
 
-RUN_DEPENDS=	duplicity:${PORTSDIR}/sysutils/duplicity \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	duplicity:sysutils/duplicity \
+		bash:shells/bash
 
 USES=		python
 
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 9844f480f5ae..b9fbf1f22e9d 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -14,8 +14,8 @@ COMMENT=	DVD burning software
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 
 # On some systems, among them one 900044 i386, the do-build-invoked
 # "make" will just do nothing for reasons not yet found, as of
diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index b0ca137db75c..bef4692b6cc9 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Backup content from DVD to hard disk
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/sysutils/dvdisaster/Makefile b/sysutils/dvdisaster/Makefile
index be7c5deb402c..a8571db34d94 100644
--- a/sysutils/dvdisaster/Makefile
+++ b/sysutils/dvdisaster/Makefile
@@ -11,7 +11,7 @@ COMMENT=	CD/DVD error recovery tool
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 MAKEFILE=	GNUmakefile
 
@@ -42,7 +42,7 @@ DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
 
 MEMDEBUG_CONFIGURE_ON=	-with-memdebug=yes
 
-EFENCE_LIB_DEPENDS=	libefence.so.0:${PORTSDIR}/devel/ElectricFence
+EFENCE_LIB_DEPENDS=	libefence.so.0:devel/ElectricFence
 EFENCE_CONFIGURE_ON=	-with-efence=yes
 
 NLS_USES=	gettext
diff --git a/sysutils/dvdvideo/Makefile b/sysutils/dvdvideo/Makefile
index 5acbeb009b6c..ce1eb11772e9 100644
--- a/sysutils/dvdvideo/Makefile
+++ b/sysutils/dvdvideo/Makefile
@@ -23,6 +23,6 @@ OPTIONS_DEFINE=	DVDCSS
 OPTIONS_DEFAULT=	DVDCSS
 .endif
 # DVDCSS version hardcoded in dvdvideo/libdvdcss.py
-DVDCSS_LIB_DEPENDS=	libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss
+DVDCSS_LIB_DEPENDS=	libdvdcss.so.2:multimedia/libdvdcss
 
 .include <bsd.port.mk>
diff --git a/sysutils/envconsul/Makefile b/sysutils/envconsul/Makefile
index 90b4a7d4fdcb..3f52e72bd936 100644
--- a/sysutils/envconsul/Makefile
+++ b/sysutils/envconsul/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Populate values from Consul into a process environment
 LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	armon:gometrics,goradix aws:awssdkgo coreos:etcd fatih:structs \
diff --git a/sysutils/epazote/Makefile b/sysutils/epazote/Makefile
index f7c93b626231..61583a27f73a 100644
--- a/sysutils/epazote/Makefile
+++ b/sysutils/epazote/Makefile
@@ -10,7 +10,7 @@ COMMENT=        Automated microservices supervisor
 LICENSE=        BSD3CLAUSE
 LICENSE_FILE=   ${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=  go>=1.6:${PORTSDIR}/lang/go
+BUILD_DEPENDS=  go>=1.6:lang/go
 
 USES=           compiler
 
diff --git a/sysutils/exfat-utils/Makefile b/sysutils/exfat-utils/Makefile
index 0838b143153c..be7a1e40827b 100644
--- a/sysutils/exfat-utils/Makefile
+++ b/sysutils/exfat-utils/Makefile
@@ -15,7 +15,7 @@ LICENSE_TEXT=	Requires license from Microsoft, please see \
 		http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exFATFileSystem.aspx
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
-LIB_DEPENDS=	libublio.so:${PORTSDIR}/devel/libublio
+LIB_DEPENDS=	libublio.so:devel/libublio
 
 PROJECTHOST=	exfat
 
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index a0185018280d..fa0e1b321a10 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SFJP/${PORTNAME}/2166
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Partition-selectable boot loader for IBM-PC/AT compatibles
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index 40d2a3225148..650d8a9df442 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Cross-platform library for retrieving facts from OS
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libyaml-cpp.so:devel/yaml-cpp
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
diff --git a/sysutils/farbot/Makefile b/sysutils/farbot/Makefile
index 292a3311aa61..bb95c7e6e19b 100644
--- a/sysutils/farbot/Makefile
+++ b/sysutils/farbot/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	farbot-1.0-beta2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeBSD Automated Release Bot
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:${PORTSDIR}/devel/py-zconfig
+BUILD_DEPENDS=	${LOCALBASE}/bin/zconfig:devel/py-zconfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/sysutils/feather/Makefile b/sysutils/feather/Makefile
index 8d8a39562a1e..3bdb6f68e67e 100644
--- a/sysutils/feather/Makefile
+++ b/sysutils/feather/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python script for managing tarsnap backups
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
-		tarsnap>=0:${PORTSDIR}/sysutils/tarsnap
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
+		tarsnap>=0:sysutils/tarsnap
 
 USES=		python
 NO_BUILD=	yes
diff --git a/sysutils/filedupe/Makefile b/sysutils/filedupe/Makefile
index f34319d29b0d..d26d83c6d4e7 100644
--- a/sysutils/filedupe/Makefile
+++ b/sysutils/filedupe/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://sammy.net/~sammy/hacks/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility for quickly finding duplicate files
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 PLIST_FILES=	bin/filedupe
 
diff --git a/sysutils/fileschanged/Makefile b/sysutils/fileschanged/Makefile
index aeb0b9ef87a0..ea3e33b003a7 100644
--- a/sysutils/fileschanged/Makefile
+++ b/sysutils/fileschanged/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility that reports when files have been altered
 
-LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+LIB_DEPENDS=	libargp.so:devel/argp-standalone
+BUILD_DEPENDS=	help2man:misc/help2man
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index 65c31e89e1b2..5920ec96851f 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utility for reading, writing, verifying, and erasing flash ROM chips
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpci.so:${PORTSDIR}/devel/libpci
+LIB_DEPENDS=	libpci.so:devel/libpci
 
 OPTIONS_DEFINE=		BUSPIRATE DMIDECODE DOCS FTDI
 OPTIONS_DEFAULT=	DMIDECODE FTDI
@@ -40,9 +40,9 @@ PLIST_FILES=	bin/${PORTNAME} \
 
 BUSPIRATE_MAKE_ENV=	CONFIG_BUSPIRATE_SPI=yes
 
-DMIDECODE_RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+DMIDECODE_RUN_DEPENDS+=	dmidecode:sysutils/dmidecode
 
-FTDI_LIB_DEPENDS=	libftdi1.so:${PORTSDIR}/devel/libftdi1
+FTDI_LIB_DEPENDS=	libftdi1.so:devel/libftdi1
 FTDI_USES=		pkgconfig
 
 do-install:
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index 3727c71a55cd..f8adbfe8aa89 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl-based flexible backup system that can use dump/afio/cpio/tar
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS=	gtar:archivers/gtar
 
 USES=		perl5
 MAKE_ARGS=	PERLPATH=${PERL} CONFFILE=${PREFIX}/etc/flexbackup.conf
@@ -27,10 +27,10 @@ BUFFER_DESC=	Enable buffer support
 MBUFFER_DESC=	Enable mbuffer support
 ZIP_DESC=	Enable zip support
 
-AFIO_RUN_DEPENDS=	afio:${PORTSDIR}/sysutils/afio
-BUFFER_RUN_DEPENDS=	buffer:${PORTSDIR}/misc/buffer
-MBUFFER_RUN_DEPENDS=	mbuffer:${PORTSDIR}/misc/mbuffer
-ZIP_RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+AFIO_RUN_DEPENDS=	afio:sysutils/afio
+BUFFER_RUN_DEPENDS=	buffer:misc/buffer
+MBUFFER_RUN_DEPENDS=	mbuffer:misc/mbuffer
+ZIP_RUN_DEPENDS=	zip:archivers/zip
 
 DOCLIST=	CHANGES CREDITS README TODO faq.html
 
diff --git a/sysutils/flyback/Makefile b/sysutils/flyback/Makefile
index f4b646a61a6f..5e2c57dbe255 100644
--- a/sysutils/flyback/Makefile
+++ b/sysutils/flyback/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Backup frontend like Apple's Time Machine
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/sysutils/fpart/Makefile b/sysutils/fpart/Makefile
index e02175efed44..187a54f0c2e4 100644
--- a/sysutils/fpart/Makefile
+++ b/sysutils/fpart/Makefile
@@ -22,8 +22,8 @@ PORTDOCS=	Changelog README TODO
 OPTIONS_DEFINE=	FPSYNC
 OPTIONS_DEFAULT=	FPSYNC
 FPSYNC_DESC=	Install fpsync tool
-FPSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-			sudo:${PORTSDIR}/security/sudo
+FPSYNC_RUN_DEPENDS=	rsync:net/rsync \
+			sudo:security/sudo
 FPSYNC_PLIST_FILES=	bin/fpsync man/man1/fpsync.1.gz
 
 post-install:
diff --git a/sysutils/freecolor/Makefile b/sysutils/freecolor/Makefile
index 673eb9350c95..f198ea8620b2 100644
--- a/sysutils/freecolor/Makefile
+++ b/sysutils/freecolor/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.rkeene.org/files/oss/freecolor/
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Displays free memory as a bargraph
 
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
diff --git a/sysutils/freefilesync/Makefile b/sysutils/freefilesync/Makefile
index f337c604bee3..6b1a3c9157a0 100644
--- a/sysutils/freefilesync/Makefile
+++ b/sysutils/freefilesync/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Backup software to synchronize files and folders
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:${PORTSDIR}/textproc/zenxml
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libnotify.so:devel/libnotify
 
 WRKSRC=		${WRKDIR}/FreeFileSync/Source
 DOS2UNIX_WRKSRC=${WRKDIR}
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index c490e968d095..24ef631b8c83 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library and tools to support IPMI-capable hardware
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libargp.so:devel/argp-standalone \
+		libgcrypt.so:security/libgcrypt
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	invokes i386 asm
diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index ae74014cfbdb..d27a7035f90c 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Yet another cool answer to the system-on-cd question
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
index 34cf538617f9..9b26f0d4929e 100644
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -69,37 +69,37 @@ NLS_DESC=	Enable NLS support (required for webFTP frontend)
 
 OPTIONS_DEFAULT=	APACHE MYSQLS POSTFIX DOVECOT PROFTPD WEBALIZER MYSQLS PCNTL NLS
 
-POSTFIX_RUN_DEPENDS=	postfix:${PORTSDIR}/mail/postfix
+POSTFIX_RUN_DEPENDS=	postfix:mail/postfix
 
-EXIM_RUN_DEPENDS=	exim:${PORTSDIR}/mail/exim
+EXIM_RUN_DEPENDS=	exim:mail/exim
 
-DKIM_RUN_DEPENDS=	opendkim:${PORTSDIR}/mail/opendkim
+DKIM_RUN_DEPENDS=	opendkim:mail/opendkim
 
-DOVECOT_RUN_DEPENDS=	dovecot>1:${PORTSDIR}/mail/dovecot
+DOVECOT_RUN_DEPENDS=	dovecot>1:mail/dovecot
 
-DOVECOT2_RUN_DEPENDS=	dovecot2>=2:${PORTSDIR}/mail/dovecot2
+DOVECOT2_RUN_DEPENDS=	dovecot2>=2:mail/dovecot2
 
-COURIER_RUN_DEPENDS=	courier:${PORTSDIR}/mail/courier
+COURIER_RUN_DEPENDS=	courier:mail/courier
 
-PROFTPD_RUN_DEPENDS=	${LOCALBASE}/libexec/proftpd/mod_sql_mysql.so:${PORTSDIR}/databases/proftpd-mod_sql_mysql
+PROFTPD_RUN_DEPENDS=	${LOCALBASE}/libexec/proftpd/mod_sql_mysql.so:databases/proftpd-mod_sql_mysql
 
-PUREFTPD_RUN_DEPENDS=	pure-ftpd:${PORTSDIR}/ftp/pure-ftpd
+PUREFTPD_RUN_DEPENDS=	pure-ftpd:ftp/pure-ftpd
 
-POWERDNS_RUN_DEPENDS=	powerdns:${PORTSDIR}/dns/powerdns
+POWERDNS_RUN_DEPENDS=	powerdns:dns/powerdns
 
-ISCDNS_RUN_DEPENDS=	bind>=9.9.0.0:${PORTSDIR}/dns/bind99
+ISCDNS_RUN_DEPENDS=	bind>=9.9.0.0:dns/bind99
 
-LIBNSS_RUN_DEPENDS=	${LOCALBASE}/lib/nss_mysql.so:${PORTSDIR}/net/libnss-mysql
+LIBNSS_RUN_DEPENDS=	${LOCALBASE}/lib/nss_mysql.so:net/libnss-mysql
 
-WEBALIZER_RUN_DEPENDS=	webalizer:${PORTSDIR}/www/webalizer
+WEBALIZER_RUN_DEPENDS=	webalizer:www/webalizer
 
-AWSTATS_RUN_DEPENDS=	awstats>=6.8:${PORTSDIR}/www/awstats
+AWSTATS_RUN_DEPENDS=	awstats>=6.8:www/awstats
 
-LOGROTATE_RUN_DEPENDS=	logrotate:${PORTSDIR}/sysutils/logrotate
+LOGROTATE_RUN_DEPENDS=	logrotate:sysutils/logrotate
 
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 
-NGINX_RUN_DEPENDS=	nginx:${PORTSDIR}/www/nginx
+NGINX_RUN_DEPENDS=	nginx:www/nginx
 
 APACHE_USE=	yes
 
diff --git a/sysutils/fsbackup/Makefile b/sysutils/fsbackup/Makefile
index 75895f281613..7e9b4a18d242 100644
--- a/sysutils/fsbackup/Makefile
+++ b/sysutils/fsbackup/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	fsbackup-1.2pl1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	File system backup and synchronization utility
 
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	contrib/*.pl \
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 7522af96a9e3..8e551f1de8ca 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Useful tool to find duplicate files
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpuzzle.so:${PORTSDIR}/graphics/libpuzzle
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+		libpcre.so:devel/pcre \
+		libpuzzle.so:graphics/libpuzzle
 
 USES=		autoreconf libarchive tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index 75e9d45b8ebe..0d7442a20b7b 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Encrypted filesystem for FUSE
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libglib-2.0.so:devel/glib20
 
 GNU_CONFIGURE=	yes
 USES=		fuse pkgconfig
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index d750a24f126d..8e3058429f4c 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mount remote ftp directories
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		fuse pkgconfig
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 4404f9e85a05..007c966ffcc9 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Encrypted pass-through FUSE filesystem
 
-LIB_DEPENDS=	librlog.so:${PORTSDIR}/devel/rlog \
-		libboost_serialization.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	librlog.so:devel/rlog \
+		libboost_serialization.so:devel/boost-libs
 
 BROKEN_sparc64=	cannot link with boost
 
diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile
index c9248aa2fafa..ff34e929654f 100644
--- a/sysutils/fusefs-exfat/Makefile
+++ b/sysutils/fusefs-exfat/Makefile
@@ -17,7 +17,7 @@ LICENSE_TEXT=	Requires license from Microsoft, please see \
 		http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exFATFileSystem.aspx
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
-LIB_DEPENDS=	libublio.so:${PORTSDIR}/devel/libublio
+LIB_DEPENDS=	libublio.so:devel/libublio
 
 USES=		fuse iconv scons
 
diff --git a/sysutils/fusefs-ifuse/Makefile b/sysutils/fusefs-ifuse/Makefile
index de76686c06ef..28fa190c4ee1 100644
--- a/sysutils/fusefs-ifuse/Makefile
+++ b/sysutils/fusefs-ifuse/Makefile
@@ -13,9 +13,9 @@ COMMENT=	FUSE-based filesystem for mounting iOS devices over USB
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
-		libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
-RUN_DEPENDS=	usbmuxd:${PORTSDIR}/comms/usbmuxd
+LIB_DEPENDS=	libplist.so:devel/libplist \
+		libimobiledevice.so:comms/libimobiledevice
+RUN_DEPENDS=	usbmuxd:comms/usbmuxd
 
 USE_GNOME=	glib20
 USES=		fuse pkgconfig tar:bzip2
diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile
index e5b502ba17ae..18479e648112 100644
--- a/sysutils/fusefs-kmod/Makefile
+++ b/sysutils/fusefs-kmod/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/
 MAINTAINER=	dpejesh@yahoo.com
 COMMENT=	FUSE kernel module
 
-BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
+BUILD_DEPENDS=	fusefs-libs>2.4.1:sysutils/fusefs-libs
 
 ONLY_FOR_ARCHS=	amd64 i386
 
diff --git a/sysutils/fusefs-lkl/Makefile b/sysutils/fusefs-lkl/Makefile
index f9e616b03575..b73369f888b6 100644
--- a/sysutils/fusefs-lkl/Makefile
+++ b/sysutils/fusefs-lkl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Full-featured Linux BTRFS, Ext4, XFS as a FUSE module
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gnubc>0:${PORTSDIR}/math/gnubc
+BUILD_DEPENDS=	gnubc>0:math/gnubc
 
 USES=		fuse gmake python:build shebangfix
 SHEBANG_FILES=	../../arch/lkl/scripts/headers_install.py
diff --git a/sysutils/fusefs-mp3fs/Makefile b/sysutils/fusefs-mp3fs/Makefile
index f6de6fa1cd76..c8d3165dba89 100644
--- a/sysutils/fusefs-mp3fs/Makefile
+++ b/sysutils/fusefs-mp3fs/Makefile
@@ -14,9 +14,9 @@ COMMENT=	FUSE-based filesystem for transcoding flac to mp3 on the fly
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libFLAC.so:audio/flac \
+		libid3tag.so:audio/libid3tag
 
 FETCH_CMD=	fetch -Fpr
 
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index dec29d79cef9..b8b0aa1b4934 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -41,7 +41,7 @@ CFLAGS+=	-DUSE_LOCK
 
 .if ${PORT_OPTIONS:MUBLIO}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ublio
-LIB_DEPENDS+=	libublio.so:${PORTSDIR}/devel/libublio
+LIB_DEPENDS+=	libublio.so:devel/libublio
 CFLAGS+=	-DUSE_UBLIO
 .endif
 
diff --git a/sysutils/fusefs-pod/Makefile b/sysutils/fusefs-pod/Makefile
index 566be8411818..f58219d0fccf 100644
--- a/sysutils/fusefs-pod/Makefile
+++ b/sysutils/fusefs-pod/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	fusepod-${PORTVERSION}
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FUSE-based filesystem for iPod
 
-LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod\
-		libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libgpod.so:audio/libgpod\
+		libtag.so:audio/taglib
 
 USES=		fuse pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 07414b64ddf0..9d4275300aa6 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Mount rar archives as filesystem
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar4
+LIB_DEPENDS=	libunrar.so:archivers/libunrar4
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index 362f1f33604a..9ac9450ed910 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -12,8 +12,8 @@ COMMENT=	FUSE-based file system backed by Amazon S3
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libxml2.so:textproc/libxml2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	s3fs-fuse
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index ca757b94cdfd..a2f36b6521a3 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Mount smb shares (Fuse filesystem)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 
 OPTIONS_DEFINE=	DOCS GNOME_KEYRING
 OPTIONS_DEFAULT=GNOME_KEYRING
 
 GNOME_KEYRING_DESC=		Build with gnome-keyring support
 GNOME_KEYRING_CONFIGURE_WITH=	gnome-keyring
-GNOME_KEYRING_LIB_DEPENDS=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+GNOME_KEYRING_LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index fbc5753238e0..e7396accaf46 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mount remote WebDAV directories with Fuse
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 GNU_CONFIGURE=	yes
 USES=		fuse pkgconfig
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index 2d0d93b2ca07..c7a20e1c0a86 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mount mediawikis
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	py*-fusefs>=0.2:${PORTSDIR}/devel/py-fusefs
+RUN_DEPENDS=	py*-fusefs>=0.2:devel/py-fusefs
 
 USES=		fuse python
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/fusefs-zip/Makefile b/sysutils/fusefs-zip/Makefile
index 72b6dd097a02..998b72691a52 100644
--- a/sysutils/fusefs-zip/Makefile
+++ b/sysutils/fusefs-zip/Makefile
@@ -11,8 +11,8 @@ COMMENT=	FUSE filesystem to mount ZIP archives with write support
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libzip.so:${PORTSDIR}/archivers/libzip
-BUILD_DEPENDS=	libzip>=0.11.1:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libzip.so:archivers/libzip
+BUILD_DEPENDS=	libzip>=0.11.1:archivers/libzip
 
 USES=		gmake fuse pkgconfig
 
diff --git a/sysutils/gai-leds/Makefile b/sysutils/gai-leds/Makefile
index 96fb58a5bd4e..bb4150cae124 100644
--- a/sysutils/gai-leds/Makefile
+++ b/sysutils/gai-leds/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GAI applet that displays the keyboard status leds
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgai.so:${PORTSDIR}/x11-toolkits/gai
+LIB_DEPENDS=	libgai.so:x11-toolkits/gai
 
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig tar:bzip2
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 9f68647b6f6e..afd2b51c8e47 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Ganglia cluster monitor, monitoring daemon
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
-		libconfuse.so:${PORTSDIR}/devel/libconfuse \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libapr-1.so:devel/apr1 \
+		libconfuse.so:devel/libconfuse \
+		libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	GMETAD
 OPTIONS_DEFAULT=	GMETAD
@@ -50,7 +50,7 @@ USE_RC_SUBR=	gmond
 .if ${PORT_OPTIONS:MGMETAD}
 USE_RC_SUBR+=	gmetad
 
-LIB_DEPENDS+=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS+=	librrd.so:databases/rrdtool
 CONFIGURE_ARGS+=	--with-gmetad
 PLIST_SUB+=	GMETAD=""
 SUB_LIST+=	GMETAD=""
diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index 4ee08c2ab454..133b6526fe97 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ganglia cluster monitor, web frontend
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/gmetad:${PORTSDIR}/sysutils/ganglia-monitor-core
+RUN_DEPENDS=	${LOCALBASE}/sbin/gmetad:sysutils/ganglia-monitor-core
 
 USE_PHP=	filter gd xml
 NO_BUILD=	YES
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 4c04c3faedf0..8a6e4c198835 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GTK+ frontend for mkisofs and cdrecord
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	cdlabelgen:${PORTSDIR}/print/cdlabelgen \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	cdlabelgen:print/cdlabelgen \
+		cdrecord:sysutils/cdrtools
 
 USES=		gettext perl5
 USE_PERL5=	build
diff --git a/sysutils/gdisk/Makefile b/sysutils/gdisk/Makefile
index 925db36b5ed2..7730b374d682 100644
--- a/sysutils/gdisk/Makefile
+++ b/sysutils/gdisk/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GPT fdisk
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libpopt.so:devel/popt
 
 WRKSRC=		${WRKDIR}/gptfdisk-${PORTVERSION}
 
@@ -36,11 +36,11 @@ PROGRAM_LIST=	fixparts gdisk sgdisk
 
 .if ${PORT_OPTIONS:MCGDISK}
 PROGRAM_LIST+=	cgdisk
-LIB_DEPENDS+=	libncurses.so:${PORTSDIR}/devel/ncurses
+LIB_DEPENDS+=	libncurses.so:devel/ncurses
 .endif
 
 .if ${PORT_OPTIONS:MUTF16}
-LIB_DEPENDS+=	libicuuc.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	libicuuc.so:devel/icu
 .endif
 
 post-patch:
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index aa5ff273a00d..7b2ac8912325 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Graphical disk map Utility
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gettext gmake pathfix perl5 pkgconfig
 USE_PERL5=	build
diff --git a/sysutils/geomWatch/Makefile b/sysutils/geomWatch/Makefile
index 0148134918f6..e80aaa6a7cdc 100644
--- a/sysutils/geomWatch/Makefile
+++ b/sysutils/geomWatch/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	spawk@acm.poly.edu
 COMMENT=	Watches for and e-mails admins about GEOM/ZFS state changes
 
-LIB_DEPENDS=	libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS=	libesmtp.so:mail/libesmtp
 
 USES=		tar:tbz
 
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index 56b7a5beed6c..1659f1b9b053 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://tinkering.hambrew.net/geomgui/ \
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	Viewer for kernel geom layer
 
-LIB_DEPENDS=	libgvc.so:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS=	libgvc.so:graphics/graphviz
 
 USE_GNOME=	gtk20 librsvg2
 USES=		iconv pkgconfig libtool tar:bzip2
diff --git a/sysutils/getdelta/Makefile b/sysutils/getdelta/Makefile
index d776b3b98ef3..a1ef546ce250 100644
--- a/sysutils/getdelta/Makefile
+++ b/sysutils/getdelta/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Script for reducing bandwidth load while upgrading ports disfiles
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	deltup>=0.4.4:${PORTSDIR}/sysutils/deltup \
-		wget:${PORTSDIR}/ftp/wget \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	deltup>=0.4.4:sysutils/deltup \
+		wget:ftp/wget \
+		bash:shells/bash
 
 USES=		tar:bzip2
 NO_WRKSUBDIR=	yes
diff --git a/sysutils/gigolo/Makefile b/sysutils/gigolo/Makefile
index 10270ed1f02d..54902eaa334d 100644
--- a/sysutils/gigolo/Makefile
+++ b/sysutils/gigolo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Frontend to easily manage filesystem connections
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gmake fuse pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	cairo gtk20 gvfs intlhack
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index 0333173b0649..1ad0b075edaf 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Plugin to GKrellM that displays the current CPU frequencies
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gkrellm.pc:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gkrellm.pc:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 8b2c7405b281..62184c24965c 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GKrellM Leds for CapsLock, NumLock, and ScrollLock
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		gmake libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index e60293112d97..beb05828fa17 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://freenet-homepage.de/thomas-steinke/ \
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Gkrellm2 plugin which shows the system load as a flame
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/${PORTNAME}.so
 
diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile
index 7543bc1358c6..a4a61481e341 100644
--- a/sysutils/gkrellflynn/Makefile
+++ b/sysutils/gkrellflynn/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tiny system load meter for gkrellm
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/sysutils/gkrellm-trayicons/Makefile b/sysutils/gkrellm-trayicons/Makefile
index 30db9e697393..e70a9a8ea94b 100644
--- a/sysutils/gkrellm-trayicons/Makefile
+++ b/sysutils/gkrellm-trayicons/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM2 plugin to display definable icons as notifiers or launchers
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 5264ef865966..f9ed7bf3f750 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -27,7 +27,7 @@ CLIENT_USE=		GNOME=gtk20 XORG=sm,x11
 CLIENT_USE_OFF=		GNOME=glib20
 CLIENT_VARS_OFF=	BUILD_WRKSRC=${WRKSRC}/server \
 			INSTALL_WRKSRC=${WRKSRC}/server
-NTLM_LIB_DEPENDS=	libntlm.so:${PORTSDIR}/security/libntlm
+NTLM_LIB_DEPENDS=	libntlm.so:security/libntlm
 NTLM_VARS_OFF=		MAKE_ENV+=without-ntlm=1
 
 .include <bsd.port.options.mk>
diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index da238ba837f5..47f80fd00696 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gkrellmd:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	gkrellmd:sysutils/gkrellm2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/sysutils/gksu/Makefile b/sysutils/gksu/Makefile
index 4bf9829fdd52..0afb780aa549 100644
--- a/sysutils/gksu/Makefile
+++ b/sysutils/gksu/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://people.debian.org/~kov/gksu/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical frontend to su
 
-LIB_DEPENDS=	libgksu2.so:${PORTSDIR}/sysutils/libgksu \
-		libnautilus-extension.so:${PORTSDIR}/x11-fm/nautilus \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS=	libgksu2.so:sysutils/libgksu \
+		libnautilus-extension.so:x11-fm/nautilus \
+		libgnome-keyring.so:security/libgnome-keyring
 
 USES=		gettext-tools gmake libtool pathfix pkgconfig
 USE_GNOME=	gconf2 gnomeprefix gtk20 intlhack
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 664fe5d3e5d2..76365c9597f8 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -11,30 +11,30 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 3 project
 
-BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
-		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		iso-codes>=0:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
-		libcolord.so:${PORTSDIR}/graphics/colord \
-		libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libsocialweb.so:${PORTSDIR}/www/libsocialweb \
-		libpwquality.so:${PORTSDIR}/security/libpwquality \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgrilo-0.2.so:${PORTSDIR}/net/grilo \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
-RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
-		gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
-		gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		apg:${PORTSDIR}/security/apg \
-		gcm-calibrate:${PORTSDIR}/graphics/gnome-color-manager
+BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
+		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
+		docbook-xsl>=0:textproc/docbook-xsl \
+		iso-codes>=0:misc/iso-codes
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libupower-glib.so:sysutils/upower \
+		libaccountsservice.so:sysutils/accountsservice \
+		libcolord.so:graphics/colord \
+		libcolord-gtk.so:graphics/colord-gtk \
+		libibus-1.0.so:textproc/ibus \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libsocialweb.so:www/libsocialweb \
+		libpwquality.so:security/libpwquality \
+		libgtop-2.0.so:devel/libgtop \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgrilo-0.2.so:net/grilo \
+		libpolkit-gobject-1.so:sysutils/polkit
+RUN_DEPENDS=	gnome-eject:sysutils/gnome-mount \
+		gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
+		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
+		iso-codes>=0:misc/iso-codes \
+		glxinfo:graphics/mesa-demos \
+		apg:security/apg \
+		gcm-calibrate:graphics/gnome-color-manager
 
 CONFLICTS=	gnome-media-2.[0-9]*
 PORTSCOUT=	limitw:1,even
@@ -58,10 +58,10 @@ OPTIONS_DEFINE_i386=	CHEESE
 OPTIONS_DEFAULT_i386=	CHEESE
 OPTIONS_DEFINE_amd64=	CHEESE
 OPTIONS_DEFAULT_amd64=	CHEESE
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
-			libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+CUPS_LIB_DEPENDS=	libcups.so:print/cups \
+			libsmbclient.so:net/samba-libsmbclient
 CUPS_CONFIGURE_ENABLE=	cups
-CHEESE_LIB_DEPENDS=	libcheese.so:${PORTSDIR}/multimedia/cheese
+CHEESE_LIB_DEPENDS=	libcheese.so:multimedia/cheese
 CHEESE_CONFIGURE_WITH=	cheese
 
 .include <bsd.port.options.mk>
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
index 6e5f37bb6fac..2089190af175 100644
--- a/sysutils/gnome-device-manager/Makefile
+++ b/sysutils/gnome-device-manager/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	HAL device manager for the GNOME Desktop
 
-LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS=	libhal.so:sysutils/hal
 
 USES=		gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	intlhack libgnomeui gnomedocutils
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 77501f6512bf..219b89e652ca 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Front-end to mount, umount, and eject using HAL
 
-LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome
+LIB_DEPENDS=	libhal.so:sysutils/hal \
+		libnotify.so:devel/libnotify \
+		libgnome-keyring.so:security/libgnome-keyring
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:sysutils/policykit-gnome
 
 USE_GNOME=	gnomeprefix intlhack gconf2 gtk20
 USES=		alias gettext gmake pathfix pkgconfig
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index b37810dbc391..c5d59386a1ce 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Power management system for the GNOME Desktop
 
-LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 
 PORTSCOUT=	limitw:1,even
 
@@ -30,8 +30,8 @@ OPTIONS_DEFINE=	MANPAGES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+BUILD_DEPENDS+=	docbook2html:textproc/docbook-utils \
+		docbook-sgml>0:textproc/docbook-sgml
 PLIST_SUB+=	MAN=""
 .else
 PLIST_SUB+=	MAN="@comment "
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 4289cff4431c..6412bb618a0c 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -17,8 +17,8 @@ OPTIONS_DEFINE=	APPLET NLS
 OPTIONS_DEFAULT=	APPLET
 OPTIONS_SUB=	yes
 
-BUILD_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
-RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+BUILD_DEPENDS=	yelp:x11/yelp
+RUN_DEPENDS=	yelp:x11/yelp
 
 USES=		gmake pathfix python
 USE_GNOME=	gnomeprefix pygnome2 gnomedocutils intltool
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 8967087367dd..82f62c7cb0a4 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -11,24 +11,24 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 settings daemon
 
-BUILD_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
-		geoclue>=0:${PORTSDIR}/net/geoclue \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libcolord.so:${PORTSDIR}/graphics/colord \
-		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libgweather-3.so:${PORTSDIR}/net/libgweather
-RUN_DEPENDS=	gnome-session>=0:${PORTSDIR}/x11/gnome-session \
-		geoclue>=0:${PORTSDIR}/net/geoclue \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-session>=0:x11/gnome-session \
+		geoclue>=0:net/geoclue \
+		docbook-xsl>=0:textproc/docbook-xsl \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libibus-1.0.so:textproc/ibus \
+		libdbus-1.so:devel/dbus \
+		libcolord.so:graphics/colord \
+		liblcms2.so:graphics/lcms2 \
+		libpulse.so:audio/pulseaudio \
+		libgdbm.so:databases/gdbm \
+		libnotify.so:devel/libnotify \
+		libgeocode-glib.so:net/geocode-glib \
+		libgweather-3.so:net/libgweather
+RUN_DEPENDS=	gnome-session>=0:x11/gnome-session \
+		geoclue>=0:net/geoclue \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
@@ -52,9 +52,9 @@ OPTIONS_DEFINE=	CUPS SMARTCARD
 OPTIONS_DEFAULT=CUPS SMARTCARD
 SMARTCARD_DESC=	Smartcard support
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
-SMARTCARD_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+SMARTCARD_LIB_DEPENDS=	libnss3.so:security/nss
 
 GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.peripherals.gschema.xml \
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 86e50cb7375a..4a67dd0769b3 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 system monitor program
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index f4149c806c42..490d0cad27ea 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Real-time Apache web log analyzer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/gosa/Makefile b/sysutils/gosa/Makefile
index fcc5d287340d..6244ec042c09 100644
--- a/sysutils/gosa/Makefile
+++ b/sysutils/gosa/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Web Based LDAP Administration Program
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Crypt-SmbHash>=0.12:${PORTSDIR}/security/p5-Crypt-SmbHash \
-		pecl-imagick>=2.2.2:${PORTSDIR}/graphics/pecl-imagick
+RUN_DEPENDS=	p5-Crypt-SmbHash>=0.12:security/p5-Crypt-SmbHash \
+		pecl-imagick>=2.2.2:graphics/pecl-imagick
 
 USES=		tar:bzip2
 USE_PHP=	gettext iconv imap ldap mbstring mhash mysql pcre posix \
diff --git a/sysutils/graffer/Makefile b/sysutils/graffer/Makefile
index 19d79b5576b7..8bebfee289c8 100644
--- a/sysutils/graffer/Makefile
+++ b/sysutils/graffer/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://chaosophia.net/downloads/graffer/ \
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	Utility to render graphical statistics
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		jpeg
 
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index 0784166be01e..9402b6ffe872 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://graveman.tuxfamily.org/sources/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another GTK2 frontend for cdrecord, mkisofs, readcd, and sox
 
-LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
-BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+LIB_DEPENDS=	libmng.so:graphics/libmng
+BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
@@ -22,13 +22,13 @@ LIBS+=		-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	MP3 OGG DVD
 DVD_DESC=	DVD+RW support
-MP3_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-			libid3tag.so:${PORTSDIR}/audio/libid3tag
-MP3_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+MP3_LIB_DEPENDS=	libmad.so:audio/libmad \
+			libid3tag.so:audio/libid3tag
+MP3_RUN_DEPENDS=	sox:audio/sox
 MP3_CONFIGURE_OFF=	--disable-mp3
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-			libvorbis.so:${PORTSDIR}/audio/libvorbis
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg \
+			libvorbis.so:audio/libvorbis
 OGG_CONFIGURE_OFF=	--disable-ogg
-DVD_RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+DVD_RUN_DEPENDS=	growisofs:sysutils/dvd+rw-tools
 
 .include <bsd.port.mk>
diff --git a/sysutils/grok/Makefile b/sysutils/grok/Makefile
index 15ffb201b0cd..1a90978aee0e 100644
--- a/sysutils/grok/Makefile
+++ b/sysutils/grok/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Expert system for real-time log analysis
 
 OPTIONS_DEFINE=	DOCS
 
-BUILD_DEPENDS=	gperf>=3.0.3:${PORTSDIR}/devel/gperf
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libevent.so:${PORTSDIR}/devel/libevent2 \
-		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+BUILD_DEPENDS=	gperf>=3.0.3:devel/gperf
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libevent.so:devel/libevent2 \
+		libtokyocabinet.so:databases/tokyocabinet
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_ENV+=	GPERF=${LOCALBASE}/bin/gperf \
diff --git a/sysutils/grub2-bhyve/Makefile b/sysutils/grub2-bhyve/Makefile
index 87f47890b9b8..c087d4a23aa2 100644
--- a/sysutils/grub2-bhyve/Makefile
+++ b/sysutils/grub2-bhyve/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Grub-emu loader for bhyve
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		help2man:misc/help2man
 
 ONLY_FOR_ARCHS=	amd64
 SSP_UNSAFE=	yes
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index dbbf9826dbed..419946503f56 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Multiboot EFI boot loader
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mformat:${PORTSDIR}/emulators/mtools \
-		${LOCALBASE}/bin/grub-mkrescue:${PORTSDIR}/sysutils/grub2-pcbsd
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		help2man:${PORTSDIR}/misc/help2man
+RUN_DEPENDS=	${LOCALBASE}/bin/mformat:emulators/mtools \
+		${LOCALBASE}/bin/grub-mkrescue:sysutils/grub2-pcbsd
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		${LOCALBASE}/bin/bash:shells/bash \
+		help2man:misc/help2man
 
 WRKSRC=		${WRKDIR}/grub-${PORTVERSION}
 SSP_UNSAFE=	yes
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 9fdbfd4f11fb..a5c9b87ca908 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Multiboot boot loader
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		${LOCALBASE}/bin/bash:shells/bash \
+		help2man:misc/help2man
 
 WRKSRC=		${WRKDIR}/grub-2.02
 CONFLICTS=	grub-0* grub2-2*
@@ -52,9 +52,9 @@ EFIEMU=		"@comment "
 PLIST_SUB+=	EFIEMU=${EFIEMU}
 
 .if ${PORT_OPTIONS:MMKFONT}
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
+BUILD_DEPENDS+=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \
+		${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
 MAN1+=		grub-mkfont.1
 CONFIGURE_ARGS+=	--enable-grub-mkfont
 .else
@@ -65,7 +65,7 @@ MKFONT=		"@comment "
 PLIST_SUB+=	MKFONT=${MKFONT}
 
 .if ${PORT_OPTIONS:MFUSE}
-LIB_DEPENDS+=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
 CONFIGURE_ARGS+=	--enable-grub-mount
 .else
 CONFIGURE_ARGS+=	--disable-grub-mount
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 67eb49c5d77e..b8c65ea220ec 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Multiboot boot loader
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		help2man:misc/help2man
 
 CONFLICTS=	grub-0*
 SSP_UNSAFE=	yes
@@ -38,11 +38,11 @@ MKFONT_DESC=	Build grub-mkfont (require freetype2)
 FUSE_DESC=	Build grub-mount (require FUSE)
 
 MKFONT_CONFIGURE_ENABLE=	grub-mkfont
-MKFONT_LIB_DEPENDS=		libfreetype.so:${PORTSDIR}/print/freetype2
-MKFONT_BUILD_DEPENDS=		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
+MKFONT_LIB_DEPENDS=		libfreetype.so:print/freetype2
+MKFONT_BUILD_DEPENDS=		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 FUSE_CONFIGURE_ENABLE=		grub-mount
-FUSE_LIB_DEPENDS=		libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+FUSE_LIB_DEPENDS=		libfuse.so:sysutils/fusefs-libs
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index e57f1f8bd968..e4aa4fbf18d3 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://artificialtime.com/${PORTNAME}/
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Graphical user interface for smartmontools
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		smartctl:${PORTSDIR}/sysutils/smartmontools
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
+RUN_DEPENDS=	bash:shells/bash \
+		smartctl:sysutils/smartmontools
 
 USES=		pkgconfig tar:bzip2 libtool
 INSTALLS_ICONS=	yes
diff --git a/sysutils/hachoir-metadata/Makefile b/sysutils/hachoir-metadata/Makefile
index a2d944be25f2..42a8ed6bb46d 100644
--- a/sysutils/hachoir-metadata/Makefile
+++ b/sysutils/hachoir-metadata/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Extract metadata from files
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/sysutils/hachoir-subfile/Makefile b/sysutils/hachoir-subfile/Makefile
index 43b8a56dfbd6..cc7cfd2157bf 100644
--- a/sysutils/hachoir-subfile/Makefile
+++ b/sysutils/hachoir-subfile/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Find subfiles in any binary stream
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser \
-		${PYTHON_SITELIBDIR}/hachoir_regex/__init__.py:${PORTSDIR}/devel/hachoir-regex
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser \
+		${PYTHON_SITELIBDIR}/hachoir_regex/__init__.py:devel/hachoir-regex
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/sysutils/hachoir-urwid/Makefile b/sysutils/hachoir-urwid/Makefile
index 20be8a072f58..08617f2c541e 100644
--- a/sysutils/hachoir-urwid/Makefile
+++ b/sysutils/hachoir-urwid/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Binary file explorer
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser \
-		${PYTHON_SITELIBDIR}/urwid/__init__.py:${PORTSDIR}/devel/py-urwid
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser \
+		${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/sysutils/hachoir-wx/Makefile b/sysutils/hachoir-wx/Makefile
index 49463554ae77..6dc43bc2d27e 100644
--- a/sysutils/hachoir-wx/Makefile
+++ b/sysutils/hachoir-wx/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Hachoir GUI
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:${PORTSDIR}/devel/hachoir-parser
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index 60df5906d1bb..3f92a5508c18 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional FDI files to further classify HAL devices
 
-LIB_PC_DEPENDS=	hal.pc:${PORTSDIR}/sysutils/hal
+LIB_PC_DEPENDS=	hal.pc:sysutils/hal
 
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 09d32cccb432..539fecb14e3d 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -11,12 +11,12 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Hardware Abstraction Layer for simplifying device access
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 # keep shlib version, to prevent confusion with polkit-* from sysutils/polkit
-LIB_DEPENDS=	libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
-		libvolume_id.so:${PORTSDIR}/devel/libvolume_id \
-		libck-connector.so:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+LIB_DEPENDS=	libpolkit.so.2:sysutils/policykit \
+		libvolume_id.so:devel/libvolume_id \
+		libck-connector.so:sysutils/consolekit
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 USES=		gettext gmake libtool:keepla pathfix pkgconfig python shebangfix
 USE_GNOME=	intlhack
@@ -71,7 +71,7 @@ FIXED_MOUNTPOINTS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-tools_hal-storage-mount
 .include <bsd.port.pre.mk>
 
 .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
-RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+RUN_DEPENDS+=	dmidecode:sysutils/dmidecode
 .endif
 
 post-patch:
diff --git a/sysutils/hardlink/Makefile b/sysutils/hardlink/Makefile
index 74699f4df268..cc705e8a26d4 100644
--- a/sysutils/hardlink/Makefile
+++ b/sysutils/hardlink/Makefile
@@ -24,7 +24,7 @@ PORTSCOUT=	limit:(?<!~rc[0-9])$$
 OPTIONS_DEFINE=	PCRE
 OPTIONS_DEFAULT=PCRE
 
-PCRE_LIB_DEPENDS=	libpcreposix.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcreposix.so:devel/pcre
 PCRE_MAKE_ENV_OFF=	ENABLE=
 
 do-install:
diff --git a/sysutils/hatop/Makefile b/sysutils/hatop/Makefile
index 8e66f9d3e024..d7d2855dee46 100644
--- a/sysutils/hatop/Makefile
+++ b/sysutils/hatop/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Interactive real-time monitoring tool for the HAProxy unix socket
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/haproxy:${PORTSDIR}/net/haproxy
+RUN_DEPENDS=	${LOCALBASE}/sbin/haproxy:net/haproxy
 
 USES=		python
 NO_BUILD=	yes
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index cf8db3741e08..83750bfe0930 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -16,12 +16,12 @@ COMMENT=	Subsystem for High-Availability Clustering
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libnet.so:${PORTSDIR}/net/libnet \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libgnutls.so:security/gnutls \
+		libnet.so:net/libnet \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libxml2.so:textproc/libxml2
+BUILD_DEPENDS=	bison:devel/bison
 
 USES=		autoreconf cpe gettext gmake libtool perl5 pkgconfig python tar:bzip2 \
 		shebangfix
@@ -66,14 +66,14 @@ LDIRECTORD_DESC=	Enable Linux Director Daemon
 APCSNMP_DESC=		Enable APC SNMP Stonith Device
 DRAC3_DESC=		Enable Dell DRACIII Stonith Device
 
-APCSNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-DRAC3_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+APCSNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+DRAC3_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMGMT}
-BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13
-RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2
+BUILD_DEPENDS+=		swig:devel/swig13
+RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
 PLIST_SUB+=		MGMT=""
 .else
 CONFIGURE_ARGS+=	--disable-mgmt
@@ -81,8 +81,8 @@ PLIST_SUB+=		MGMT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDIRECTORD}
-RUN_DEPENDS+=		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-			p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS+=		p5-libwww>=0:www/p5-libwww \
+			p5-Mail-Tools>=0:mail/p5-Mail-Tools
 USES+=			perl5
 USE_PERL5=		run
 PLIST_SUB+=		LDIRECTORD=""
diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile
index 910aaf1e7bc8..32acedd157ec 100644
--- a/sysutils/heirloom/Makefile
+++ b/sysutils/heirloom/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Collection of standard Unix utilities
 
-BUILD_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
+BUILD_DEPENDS=	ksh:shells/pdksh
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake tar:bzip2
diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index ca25b966cfbb..c7085ae4dee5 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -12,9 +12,9 @@ LICENSE=	BSD2CLAUSE
 
 # gb 0.4 includes FreeBSD-specific fixes that this port requires
 #   https://github.com/constabulary/gb/issues/506
-BUILD_DEPENDS=	go>=1.5:${PORTSDIR}/lang/go \
-		gb>=0.4:${PORTSDIR}/devel/gb \
-		${LOCALBASE}/lib/libucl.a:${PORTSDIR}/textproc/libucl
+BUILD_DEPENDS=	go>=1.5:lang/go \
+		gb>=0.4:devel/gb \
+		${LOCALBASE}/lib/libucl.a:textproc/libucl
 
 USES=		compiler:c++11-lang
 USE_GITHUB=	yes
diff --git a/sysutils/hfsexplorer/Makefile b/sysutils/hfsexplorer/Makefile
index 7339ff2d27a2..d2af544789d0 100644
--- a/sysutils/hfsexplorer/Makefile
+++ b/sysutils/hfsexplorer/Makefile
@@ -11,7 +11,7 @@ COMMENT=	HFSExplorer read Mac-formatted harddisks and disk images
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
+BUILD_DEPENDS=	ant:devel/apache-ant
 
 DESKTOP_ENTRIES="hfsexplorer" "reader Mac-formatted harddisk" \
 		"${DATADIR}/res/icon.png" "${PORTNAME}" \
diff --git a/sysutils/hourglass/Makefile b/sysutils/hourglass/Makefile
index 81b7406dfac3..010758e67aae 100644
--- a/sysutils/hourglass/Makefile
+++ b/sysutils/hourglass/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.cs.utah.edu/~regehr/hourglass/
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Real-time application to learn how CPU scheduling works
 
-RUN_DEPENDS=	jgraph:${PORTSDIR}/graphics/jgraph
+RUN_DEPENDS=	jgraph:graphics/jgraph
 
 ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
diff --git a/sysutils/hpacucli/Makefile b/sysutils/hpacucli/Makefile
index 5cf191cabeeb..1b316d59cffc 100644
--- a/sysutils/hpacucli/Makefile
+++ b/sysutils/hpacucli/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	LOCAL/brooks
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HP configuration utility for Smart Array RAID cards
 
-RUN_DEPENDS=	compat4x-i386>0:${PORTSDIR}/misc/compat4x \
-		compat5x-${ARCH}>0:${PORTSDIR}/misc/compat5x
+RUN_DEPENDS=	compat4x-i386>0:misc/compat4x \
+		compat5x-${ARCH}>0:misc/compat5x
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/sysutils/hploscripts/Makefile b/sysutils/hploscripts/Makefile
index 71ee3ee84b14..bf0b318b6420 100644
--- a/sysutils/hploscripts/Makefile
+++ b/sysutils/hploscripts/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	HP Lights-Out management perl scripts
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.19:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.19:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		shebangfix perl5
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 1bf84d77aebc..ac05da0c673d 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Better top(1) - interactive process viewer
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
+RUN_DEPENDS=	lsof:sysutils/lsof
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/inotify-tools/Makefile b/sysutils/inotify-tools/Makefile
index 49a822a9399c..321458c8679c 100644
--- a/sysutils/inotify-tools/Makefile
+++ b/sysutils/inotify-tools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command-line utilities to watch for file events
 
 LICENSE=	AGPLv3
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvoicilas
diff --git a/sysutils/ipfs-go/Makefile b/sysutils/ipfs-go/Makefile
index 193f1cb4190f..a7ef335590df 100644
--- a/sysutils/ipfs-go/Makefile
+++ b/sysutils/ipfs-go/Makefile
@@ -10,7 +10,7 @@ COMMENT=	IPFS implementation in Go
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USES=		gmake
 
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 1fefbd7598be..a58dab92bda2 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--disable-intf-open
 
 DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
 
-FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:${PORTSDIR}/sysutils/freeipmi
+FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 FREEIPMI_CPPFLAGS=	-I${LOCALBASE}/include
 FREEIPMI_LDFLAGS=	-L${LOCALBASE}/lib
 FREEIPMI_CONFIGURE_ENABLE=	intf-free
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index 9424db9925cf..73fd851e442c 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	IP Subnet Calculator
 
-BUILD_DEPENDS=	${PRIPS_WRKSRC}/prips.o:${PORTSDIR}/sysutils/prips:build
+BUILD_DEPENDS=	${PRIPS_WRKSRC}/prips.o:sysutils/prips:build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
diff --git a/sysutils/isomaster/Makefile b/sysutils/isomaster/Makefile
index 2c70490a76e8..122579b2fe03 100644
--- a/sysutils/isomaster/Makefile
+++ b/sysutils/isomaster/Makefile
@@ -11,8 +11,8 @@ COMMENT=	GTK2 (bootable) CD ISO Image editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libiniparser.so:${PORTSDIR}/devel/iniparser
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libiniparser.so:devel/iniparser
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/sysutils/isomd5sum/Makefile b/sysutils/isomd5sum/Makefile
index 839427514ce0..421f37dd8eea 100644
--- a/sysutils/isomd5sum/Makefile
+++ b/sysutils/isomd5sum/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Implanting and checking checksums within an ISO9660 image
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		gmake python tar:bzip2
 
diff --git a/sysutils/istatd/Makefile b/sysutils/istatd/Makefile
index 7a05fa573988..9b0f74257b1a 100644
--- a/sysutils/istatd/Makefile
+++ b/sysutils/istatd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Daemon for iStat iPhone application
 
 LICENSE=    BSD3CLAUSE
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USE_GITHUB= yes
 GH_ACCOUNT= tiwilliam
diff --git a/sysutils/jadm/Makefile b/sysutils/jadm/Makefile
index de48616d853c..f86ea295b044 100644
--- a/sysutils/jadm/Makefile
+++ b/sysutils/jadm/Makefile
@@ -12,14 +12,14 @@ COMMENT=	FreeBSD jail framework with zfs, vnet and jail.conf support
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:${PORTSDIR}/devel/py-tabulate \
-		${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:${PORTSDIR}/net/py-ipaddress
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:${PORTSDIR}/devel/py-tabulate \
-		${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:${PORTSDIR}/net/py-ipaddress
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \
+		${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \
+		${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/sysutils/jailadmin/Makefile b/sysutils/jailadmin/Makefile
index 5c8f2564cc82..1718620dec81 100644
--- a/sysutils/jailadmin/Makefile
+++ b/sysutils/jailadmin/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	INSTALL README
 PLIST_FILES=	etc/jailadmin.conf.sample etc/rc.d/zzz-jail.sh \
 		sbin/jailadmin ${SITE_PERL_REL}/Jail.pm
 
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_PLIST_FILES=	sbin/jail-snmp sbin/jail-snmp-persist share/snmp/mibs/JAIL-MIB.txt
 
 do-install:
diff --git a/sysutils/jfbterm/Makefile b/sysutils/jfbterm/Makefile
index 9d3a28e8bf68..e0dc93915574 100644
--- a/sysutils/jfbterm/Makefile
+++ b/sysutils/jfbterm/Makefile
@@ -57,9 +57,9 @@ MAKE_ENV+=	WITHOUT_ICONV=
 
 .if ${PORT_OPTIONS:MPNG}
 . if !defined(NO_SHARED)
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 . else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libpng.a:graphics/png
 . endif
 .else
 MAKE_ENV+=	WITHOUT_PNG=
@@ -89,7 +89,7 @@ TERMCAP_DEL_RECORD=	${DO_NADA}
 .endif
 
 .if ${PORT_OPTIONS:MUNIFONT}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
 .endif
 
 post-extract:	.SILENT
diff --git a/sysutils/jps/Makefile b/sysutils/jps/Makefile
index 243d648832a2..71cf67a47580 100644
--- a/sysutils/jps/Makefile
+++ b/sysutils/jps/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://ext.by/jps/
 MAINTAINER=	pavel@ext.by
 COMMENT=	Wrapper to ps(1) that maps pids to jails
 
-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 shebangfix
diff --git a/sysutils/jtop/Makefile b/sysutils/jtop/Makefile
index be6f1faf3eb0..7fc9a5bab9fc 100644
--- a/sysutils/jtop/Makefile
+++ b/sysutils/jtop/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://ext.by/jtop/
 MAINTAINER=	pavel@ext.by
 COMMENT=	Wrapper to top(1) that maps pids to jails
 
-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 shebangfix
diff --git a/sysutils/jx/Makefile b/sysutils/jx/Makefile
index 02c0276d460e..dea6aff34be3 100644
--- a/sysutils/jx/Makefile
+++ b/sysutils/jx/Makefile
@@ -21,7 +21,7 @@ CONFIG_DESC=	Enable custom config (recuire Config::General)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCONFIG}
-RUN_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General
+RUN_DEPENDS=	p5-Config-General>=0:devel/p5-Config-General
 PLIST_FILES+=	etc/${PORTNAME}.cfg.sample
 .endif
 
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 8f930cdcf3d8..7d1fe5b477a8 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -11,10 +11,10 @@ DISTFILES=	${DISTNAME}a${EXTRACT_SUFX}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE CD/DVD writing suite
 
-LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
-BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+LIB_DEPENDS=	libcdda_paranoia.so:audio/cdparanoia \
+		libsamplerate.so:audio/libsamplerate
+RUN_DEPENDS=	cdrecord:sysutils/cdrtools
+BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USES=		cmake gettext pkgconfig shared-mime-info tar:xz
 CMAKE_ARGS=	-DK3B_BUILD_K3BSETUP:BOOL=OFF \
@@ -33,66 +33,66 @@ NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes # FFMPEG FLAC MAD MUSEPACK SNDFILE VORBIS_ENC VORBIS_DEC LIBDVDREAD TAGLIB
 
 CDRDAO_DESC=		Burning: cdrdao
-CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
+CDRDAO_RUN_DEPENDS=	cdrdao:sysutils/cdrdao
 
 DVDPLUSRW_DESC=		Burning: DVD+RW tools (DVD+/-R(W))
-DVDPLUSRW_RUN_DEPENDS=	dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools
+DVDPLUSRW_RUN_DEPENDS=	dvd+rw-format:sysutils/dvd+rw-tools
 
 EMOVIX_DESC=		Burning: eMovix (bootable video CDs)
-EMOVIX_RUN_DEPENDS=	mkmovixiso:${PORTSDIR}/multimedia/emovix
+EMOVIX_RUN_DEPENDS=	mkmovixiso:multimedia/emovix
 
 VCDIMAGER_DESC=		Burning: VCDImager (video CDs)
-VCDIMAGER_RUN_DEPENDS=	vcdxrip:${PORTSDIR}/multimedia/vcdimager
+VCDIMAGER_RUN_DEPENDS=	vcdxrip:multimedia/vcdimager
 
 FFMPEG_DESC=		Decoder: various (multimedia/ffmpeg)
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_OFF=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=OFF
 
 FLAC_DESC=		Decoder: FLAC (audio/flac)
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_OFF=		-DK3B_BUILD_FLAC_DECODER_PLUGIN:BOOL=OFF
 
 MAD_DESC=		Decoder: MP3 (audio/libmad)
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CMAKE_OFF=		-DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF
 
 MUSEPACK_DESC=		Decoder: Musepack (audio/musepack)
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
 MUSEPACK_CMAKE_ON=	-DMUSE_INCLUDE_DIR:STRING="${LOCALBASE}/include"
 MUSEPACK_CMAKE_OFF=	-DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF
 
 SNDFILE_DESC=		Decoder: various (audio/libsndfile)
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_ARGS=	-DK3B_BUILD_SNDFILE_DECODER_PLUGIN:BOOL=OFF
 
 VORBIS_DEC_DESC=	Decoder: Ogg Vorbis
-VORBIS_DEC_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+VORBIS_DEC_LIB_DEPENDS=	libogg.so:audio/libogg
 VORBIS_DEC_CMAKE_OFF=	-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN:BOOL=OFF
 
 LAME_DESC=		Encoder: MP3 (audio/lame)
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_OFF=		-DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=OFF
 
 SOX_DESC=		Encoder: various (audio/sox)
-SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+SOX_RUN_DEPENDS=	sox:audio/sox
 SOX_CMAKE_OFF=		-DK3B_BUILD_SOX_ENCODER_PLUGIN:BOOL=OFF
 
 VORBIS_ENC_DESC=	Encoder: Ogg Vorbis
-VORBIS_ENC_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+VORBIS_ENC_LIB_DEPENDS=	libogg.so:audio/libogg
 VORBIS_ENC_CMAKE_OFF=	-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN:BOOL=OFF
 
 LIBDVDREAD_DESC=	Misc: libdvdread (video DVD ripping)
-LIBDVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIBDVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 LIBDVDREAD_CMAKE_OFF=	-DK3B_ENABLE_DVD_RIPPING:BOOL=OFF
 
 NORMALIZE_DESC=		Misc: normalize (adjust audio to a std. level)
-NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
+NORMALIZE_RUN_DEPENDS=	normalize:audio/normalize
 
 TAGLIB_DESC=		Misc: TagLib (reading/writing audio metadata)
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_OFF=	-DK3B_ENABLE_TAGLIB:BOOL=OFF
 
 TRANSCODE_DESC=		Misc: Transcode (DVD ripping)
-TRANSCODE_RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode
+TRANSCODE_RUN_DEPENDS=	transcode:multimedia/transcode
 
 .include <bsd.port.mk>
diff --git a/sysutils/kcm-polkit-kde/Makefile b/sysutils/kcm-polkit-kde/Makefile
index e1152d45deb8..7fb682c3f3cc 100644
--- a/sysutils/kcm-polkit-kde/Makefile
+++ b/sysutils/kcm-polkit-kde/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-kcmodules-1-${PORTDATE}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Polkit-KDE configuration module
 
-LIB_DEPENDS=	libpolkit-qt-agent-1.so:${PORTSDIR}/sysutils/polkit-qt
-RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde
+LIB_DEPENDS=	libpolkit-qt-agent-1.so:sysutils/polkit-qt
+RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	dbus xml moc_build qmake_build rcc_build uic_build
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index ef5153e8de99..022cff5b2f04 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -14,12 +14,12 @@ OPTIONS_DEFINE=	KCRON KSYSTEMLOG KUSER
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 KCRON_DESC=		Task scheduler
-KCRON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_cron.so:${PORTSDIR}/sysutils/kcron
+KCRON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_cron.so:sysutils/kcron
 
 KSYSTEMLOG_DESC=	System log viewer
-KSYSTEMLOG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ksystemlog:${PORTSDIR}/sysutils/ksystemlog
+KSYSTEMLOG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ksystemlog:sysutils/ksystemlog
 
 KUSER_DESC=		User management application
-KUSER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuser:${PORTSDIR}/sysutils/kuser
+KUSER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuser:sysutils/kuser
 
 .include <bsd.port.mk>
diff --git a/sysutils/keyboard-daemon/Makefile b/sysutils/keyboard-daemon/Makefile
index ec479f2eb185..1387f90e1021 100644
--- a/sysutils/keyboard-daemon/Makefile
+++ b/sysutils/keyboard-daemon/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Listens on a keyboard device and executes commands on keypresses
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcfu.so:${PORTSDIR}/devel/libcfu
+LIB_DEPENDS=	libcfu.so:devel/libcfu
 
 USES=		tar:bzip2
 
diff --git a/sysutils/kfilemetadata/Makefile b/sysutils/kfilemetadata/Makefile
index d8f801fd21dd..8339abdc6668 100644
--- a/sysutils/kfilemetadata/Makefile
+++ b/sysutils/kfilemetadata/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library for extracting file metadata
 
-LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-		libepub.so:${PORTSDIR}/textproc/ebook-tools \
-		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
+LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
+		libtag.so:audio/taglib \
+		libexiv2.so:graphics/exiv2 \
+		libswscale.so:multimedia/ffmpeg \
+		libepub.so:textproc/ebook-tools \
+		libqmobipocket.so:graphics/kdegraphics4-mobipocket
 
 USE_KDE4=	kdeprefix automoc4 kdelibs
 USES=		cmake:outsource tar:xz
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index a2dc5e2259e6..643c1ff77c0c 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Visual client for UPS system NUT
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqimageblitz.so:${PORTSDIR}/x11/qimageblitz
+LIB_DEPENDS=	libqimageblitz.so:x11/qimageblitz
 
 CONFLICTS=	knutclient-0.*
 
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 3d6ca869147a..c1ea9dadea3f 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	SF/${PORTNAME}/KDE4%20${PORTNAME}-stable/${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Powerful batch file renamer for KDE
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libpodofo.so:${PORTSDIR}/graphics/podofo
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libexiv2.so:graphics/exiv2 \
+		libpodofo.so:graphics/podofo
 
 USES=		cmake:outsource gettext tar:bzip2
 USE_KDE4=	kdeprefix kdelibs automoc4
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 734f800af0bc..0878fa947d79 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -36,13 +36,13 @@ SERDISP_DESC=	Build drivers using serdisplib
 OPTIONS_DEFAULT=USB FREETYPE
 NO_OPTIONS_SORT=yes
 
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype
 
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	libpng
 
-SERDISP_LIB_DEPENDS=	libserdisp.so:${PORTSDIR}/devel/serdisplib
+SERDISP_LIB_DEPENDS=	libserdisp.so:devel/serdisplib
 SERDISP_CFLAGS=		-I${LOCALBASE}/include
 SERDISP_LDFLAGS=	-L${LOCALBASE}/lib
 SERDISP_CPPFLAGS=	-I${LOCALBASE}/include
@@ -97,7 +97,7 @@ LCDPROC_DRIVERS+=IOWarrior \
 		shuttleVFD
 
 . if ${PORT_OPTIONS:MFTDI}
-LIB_DEPENDS+=		libftdi.so:${PORTSDIR}/devel/libftdi
+LIB_DEPENDS+=		libftdi.so:devel/libftdi
 PLIST_SUB+=		FTDI=""
 LCDPROC_DRIVERS+=i2500vfd \
 		lis \
@@ -108,7 +108,7 @@ PLIST_SUB+=		FTDI="@comment "
 . endif
 
 . if ${PORT_OPTIONS:MHID}
-LIB_DEPENDS+=		libhid.so:${PORTSDIR}/devel/libhid
+LIB_DEPENDS+=		libhid.so:devel/libhid
 PLIST_SUB+=		HID=""
 LCDPROC_DRIVERS+=mdm166a
 . else
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 32f553d46b1a..7439a919b6cb 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Webfrontend for managing accounts stored in an OpenLDAP server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Quota>=0:sysutils/p5-Quota \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index 75623447e874..de36f9d5bbb3 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool to update LDAP entries with a text editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		gmake iconv pkgconfig
 USE_OPENLDAP=	yes
diff --git a/sysutils/ledit/Makefile b/sysutils/ledit/Makefile
index 1a40aeb149d6..3118d4e63908 100644
--- a/sysutils/ledit/Makefile
+++ b/sysutils/ledit/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Line editor to be used with interactive commands
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	camlp5r:${PORTSDIR}/devel/ocaml-camlp5
+BUILD_DEPENDS=	camlp5r:devel/ocaml-camlp5
 
 USES=		gmake tar:tgz
 USE_OCAML=	yes
diff --git a/sysutils/libcdio-paranoia/Makefile b/sysutils/libcdio-paranoia/Makefile
index 130ddac874b8..dad80d76b6a1 100644
--- a/sysutils/libcdio-paranoia/Makefile
+++ b/sysutils/libcdio-paranoia/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Read audio from the CDROM directly as data
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING-LGPL
 
-LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 
 USES=	pathfix tar:bzip2 gmake pkgconfig libtool perl5
 GNU_CONFIGURE=	yes
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index efd565bde7d7..71b41b57185e 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Compact Disc Input and Control Library
 
-LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
+LIB_DEPENDS=	libcddb.so:audio/libcddb
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 6bda17e62adf..fae954a18356 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	http://people.debian.org/~kov/gksu/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library providing su and sudo functionality
 
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libglade-2.0.so:${PORTSDIR}/devel/libglade2 \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	xauth:${PORTSDIR}/x11/xauth \
-		sudo:${PORTSDIR}/security/sudo
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
+		libglade-2.0.so:devel/libglade2 \
+		libgnome-keyring.so:security/libgnome-keyring \
+		libstartup-notification-1.so:x11/startup-notification
+RUN_DEPENDS=	xauth:x11/xauth \
+		sudo:security/sudo
 
 USES=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	glib20 gconf2 intltool
diff --git a/sysutils/life-preserver/Makefile b/sysutils/life-preserver/Makefile
index a727bca10204..2eaeac38c12c 100644
--- a/sysutils/life-preserver/Makefile
+++ b/sysutils/life-preserver/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PC-BSD Life Preserver Utility
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh \
-		stunnel:${PORTSDIR}/security/stunnel
+RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:sysutils/pcbsd-libsh \
+		stunnel:security/stunnel
 
 WRKSRC_SUBDIR=	src-sh/lpreserver
 USES=		pkgconfig tar:xz
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index a35a1dc8b894..2eec0a6a6d99 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Default plugins for lineakd
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liblineak.so:${PORTSDIR}/sysutils/lineakd
+LIB_DEPENDS=	liblineak.so:sysutils/lineakd
 
 USES=		gmake libtool
 USE_XORG=	x11 xext xt xtst xfixes
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index 400695f6d2de..bc6dce8172c6 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Xosd-plugin for lineakd
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd \
-		liblineak.so:${PORTSDIR}/sysutils/lineakd
+LIB_DEPENDS=	libxosd.so:misc/xosd \
+		liblineak.so:sysutils/lineakd
 
 USES=		gmake libtool
 USE_LDCONFIG=	yes
diff --git a/sysutils/linux-crashplan/Makefile b/sysutils/linux-crashplan/Makefile
index 5e0577936695..e01eae65f180 100644
--- a/sysutils/linux-crashplan/Makefile
+++ b/sysutils/linux-crashplan/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	CrashPlan_${DISTVERSION}_Linux
 MAINTAINER=	subtil@gmail.com
 COMMENT=	Backs up data to remote servers or hard drives
 
-RUN_DEPENDS=	linux-sun-jre17>=0:${PORTSDIR}/java/linux-sun-jre17 \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	linux-sun-jre17>=0:java/linux-sun-jre17 \
+		bash:shells/bash
 
 WRKSRC=		${WRKDIR}/crashplan-install
 
diff --git a/sysutils/livecd/Makefile b/sysutils/livecd/Makefile
index c2996cfe339d..22f519e57ac6 100644
--- a/sysutils/livecd/Makefile
+++ b/sysutils/livecd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.primeirospassos.org/
 MAINTAINER=	ebrandi.home@uol.com.br
 COMMENT=	Tool Set to create custom FreeBSD LiveCD
 
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 
 NO_BUILD=	yes
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
diff --git a/sysutils/lmon/Makefile b/sysutils/lmon/Makefile
index aa5c0fd5cfa9..b4d48298e0ef 100644
--- a/sysutils/lmon/Makefile
+++ b/sysutils/lmon/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Near-realtime log monitoring tool, sends alerts on hits and misses
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \
-		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Mail-Sendmail>=0:mail/p5-Mail-Sendmail \
+		p5-File-Tail>=0:devel/p5-File-Tail
 
 USES=		perl5 shebangfix tar:tgz
 SHEBANG_FILES=	control.pl lmon.pl
diff --git a/sysutils/lnav/Makefile b/sysutils/lnav/Makefile
index bf6143a5133e..f43b77c54c49 100644
--- a/sysutils/lnav/Makefile
+++ b/sysutils/lnav/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Terminal based log file navigator
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpcre.a:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tstack
diff --git a/sysutils/log_analysis/Makefile b/sysutils/log_analysis/Makefile
index 40b6a62a0a31..c1c3bead718d 100644
--- a/sysutils/log_analysis/Makefile
+++ b/sysutils/log_analysis/Makefile
@@ -25,7 +25,7 @@ PLIST_FILES=	bin/log_analysis \
 
 OPTIONS_DEFINE=	DOCS EXAMPLES TK
 
-TK_RUN_DEPENDS=	p5-Tk>0:${PORTSDIR}/x11-toolkits/p5-Tk
+TK_RUN_DEPENDS=	p5-Tk>0:x11-toolkits/p5-Tk
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index b85bef2cdf5c..b19ac44a4336 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Daemon to rotate, compress, remove, and mail system log files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USE_GITHUB=	yes
 
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index 21bbbab1c34a..de68d98e8c03 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Website access log visualization tool
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libftgl.so:${PORTSDIR}/graphics/ftgl \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libftgl.so:graphics/ftgl \
+		libpng.so:graphics/png \
+		libpcre.so:devel/pcre
 
 GNU_CONFIGURE=	yes
 USES=		jpeg pkgconfig
diff --git a/sysutils/logstash-forwarder/Makefile b/sysutils/logstash-forwarder/Makefile
index eaa85013db9b..fad75905a209 100644
--- a/sysutils/logstash-forwarder/Makefile
+++ b/sysutils/logstash-forwarder/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Collect logs locally in preparation for processing elsewhere!
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elasticsearch
diff --git a/sysutils/logstash/Makefile b/sysutils/logstash/Makefile
index fb080e97f9cc..2b884d6f97e2 100644
--- a/sysutils/logstash/Makefile
+++ b/sysutils/logstash/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool for managing events and logs
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		cpe
 CPE_VENDOR=	elasticsearch
diff --git a/sysutils/logwatch/Makefile b/sysutils/logwatch/Makefile
index 858a9bfbbe75..19448f7e02b2 100644
--- a/sysutils/logwatch/Makefile
+++ b/sysutils/logwatch/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Log file analysis program
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
index f6696cd792ff..c30e768252ec 100644
--- a/sysutils/luckybackup/Makefile
+++ b/sysutils/luckybackup/Makefile
@@ -11,7 +11,7 @@ COMMENT=	QT4 frontend to the backup utility rsync
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES=		qmake
 USE_QT4=	gui network moc_build rcc_build uic_build
diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile
index 4cd647cee649..b012152b03f7 100644
--- a/sysutils/lxterminal/Makefile
+++ b/sysutils/lxterminal/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Lightweight terminal emulator from the LXDE project
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libvte.so:${PORTSDIR}/x11-toolkits/vte
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+LIB_DEPENDS=	libvte.so:x11-toolkits/vte
 
 USES=		gmake iconv pkgconfig
 USE_GNOME=	gtk20 intlhack
diff --git a/sysutils/massadmin/Makefile b/sysutils/massadmin/Makefile
index 3f0497c95374..f16dd1d986da 100644
--- a/sysutils/massadmin/Makefile
+++ b/sysutils/massadmin/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Send system commands to a group of remote servers simultaneously
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Expect>=1.21:${PORTSDIR}/lang/p5-Expect \
-		p5-Net-Telnet>=3.03:${PORTSDIR}/net/p5-Net-Telnet \
-		p5-Net-Ping>=2.36:${PORTSDIR}/net/p5-Net-Ping \
-		p5-Proc-Queue>=1.23:${PORTSDIR}/devel/p5-Proc-Queue \
-		p5-IO-Tty>=1.08:${PORTSDIR}/devel/p5-IO-Tty
+RUN_DEPENDS=	p5-Expect>=1.21:lang/p5-Expect \
+		p5-Net-Telnet>=3.03:net/p5-Net-Telnet \
+		p5-Net-Ping>=2.36:net/p5-Net-Ping \
+		p5-Proc-Queue>=1.23:devel/p5-Proc-Queue \
+		p5-IO-Tty>=1.08:devel/p5-IO-Tty
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile
index 89c20d1b3b25..3666ac9a3296 100644
--- a/sysutils/mate-control-center/Makefile
+++ b/sysutils/mate-control-center/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for MATE project
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
-		libxklavier.so:${PORTSDIR}/x11/libxklavier \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libunique-1.0.so:x11-toolkits/unique \
+		libxklavier.so:x11/libxklavier \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/sysutils/mate-polkit/Makefile b/sysutils/mate-polkit/Makefile
index 30d04ffde91d..1c8893a1e596 100644
--- a/sysutils/mate-polkit/Makefile
+++ b/sysutils/mate-polkit/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE frontend to the PolicKit framework
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit \
+		libaccountsservice.so:sysutils/accountsservice
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/sysutils/mate-power-manager/Makefile b/sysutils/mate-power-manager/Makefile
index dbfcff38e308..57b73990b82e 100644
--- a/sysutils/mate-power-manager/Makefile
+++ b/sysutils/mate-power-manager/Makefile
@@ -10,17 +10,17 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Power management system for the MATE Desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
-RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit \
-		gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		gnome-keyring>=3.0.0:security/gnome-keyring
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libunique-1.0.so:x11-toolkits/unique \
+		libupower-glib.so:sysutils/upower \
+		libnotify.so:devel/libnotify \
+		libgnome-keyring.so:security/libgnome-keyring
+RUN_DEPENDS=	pkexec:sysutils/polkit \
+		gnome-keyring>=3.0.0:security/gnome-keyring
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/sysutils/mate-settings-daemon/Makefile b/sysutils/mate-settings-daemon/Makefile
index 4d77b6796a48..3562c92bd32b 100644
--- a/sysutils/mate-settings-daemon/Makefile
+++ b/sysutils/mate-settings-daemon/Makefile
@@ -10,14 +10,14 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE settings daemon
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libxklavier.so:${PORTSDIR}/x11/libxklavier \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libxklavier.so:x11/libxklavier \
+		libnss3.so:security/nss \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libnotify.so:devel/libnotify
+RUN_DEPENDS=	xrdb:x11/xrdb
 
 PORTSCOUT=	limitw:1,even
 
@@ -62,6 +62,6 @@ OPTIONS_DEFINE=	PULSEAUDIO
 OPTIONS_SUB=	yes
 
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
 .include <bsd.port.mk>
diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index 3c091daa7278..dbeb340ceca8 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE system monitor program
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
+		libdbus-glib-1.so:devel/dbus-glib
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/sysutils/mcollective-actionpolicy-auth/Makefile b/sysutils/mcollective-actionpolicy-auth/Makefile
index 1b5b96fe2241..edba787f94c4 100644
--- a/sysutils/mcollective-actionpolicy-auth/Makefile
+++ b/sysutils/mcollective-actionpolicy-auth/Makefile
@@ -9,7 +9,7 @@ COMMENT=	MCollective Authorization plugin allowing fine grained ACLs
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS=	mcollective>=2:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective-nettest-agent/Makefile b/sysutils/mcollective-nettest-agent/Makefile
index 849e0048a481..c17b8a9a6d2e 100644
--- a/sysutils/mcollective-nettest-agent/Makefile
+++ b/sysutils/mcollective-nettest-agent/Makefile
@@ -6,8 +6,8 @@ COMMENT=	MCollective agent to test ICMP and TCP connectivity
 
 # See MASTERDIR for MAINTAINER.
 
-RUN_DEPENDS=	mcollective-nettest-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-nettest-common \
-		rubygem-net-ping>=1:${PORTSDIR}/net/rubygem-net-ping
+RUN_DEPENDS=	mcollective-nettest-common>=${PORTVERSION}:sysutils/mcollective-nettest-common \
+		rubygem-net-ping>=1:net/rubygem-net-ping
 
 MASTERDIR=	${.CURDIR}/../mcollective-nettest-common
 
diff --git a/sysutils/mcollective-nettest-client/Makefile b/sysutils/mcollective-nettest-client/Makefile
index 4aff4c02af80..461e539b65b8 100644
--- a/sysutils/mcollective-nettest-client/Makefile
+++ b/sysutils/mcollective-nettest-client/Makefile
@@ -6,7 +6,7 @@ COMMENT=	MCollective client to test ICMP and TCP connectivity
 
 # See MASTERDIR for MAINTAINER.
 
-RUN_DEPENDS=	mcollective-nettest-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-nettest-common
+RUN_DEPENDS=	mcollective-nettest-common>=${PORTVERSION}:sysutils/mcollective-nettest-common
 
 MASTERDIR=	${.CURDIR}/../mcollective-nettest-common
 
diff --git a/sysutils/mcollective-nettest-common/Makefile b/sysutils/mcollective-nettest-common/Makefile
index f2294deb0285..cfda310d69c4 100644
--- a/sysutils/mcollective-nettest-common/Makefile
+++ b/sysutils/mcollective-nettest-common/Makefile
@@ -9,7 +9,7 @@ COMMENT?=	MCollective common files to test ICMP and TCP connectivity
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS?=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS?=	mcollective>=2:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective-nrpe-agent/Makefile b/sysutils/mcollective-nrpe-agent/Makefile
index cf6563c17cca..c40c4aa4843e 100644
--- a/sysutils/mcollective-nrpe-agent/Makefile
+++ b/sysutils/mcollective-nrpe-agent/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	MCollective NRPE agent plugin
 
-RUN_DEPENDS=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS=	mcollective>=2:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective-puppet-agent/Makefile b/sysutils/mcollective-puppet-agent/Makefile
index 60390ea19656..9a12be294fe5 100644
--- a/sysutils/mcollective-puppet-agent/Makefile
+++ b/sysutils/mcollective-puppet-agent/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	anes@anes.su
 COMMENT=	Puppet agent manager for mcollective
 
-RUN_DEPENDS=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS=	mcollective>=2:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective-service-agent/Makefile b/sysutils/mcollective-service-agent/Makefile
index 57832d30e35a..6f9c663e2b2f 100644
--- a/sysutils/mcollective-service-agent/Makefile
+++ b/sysutils/mcollective-service-agent/Makefile
@@ -6,7 +6,7 @@ COMMENT=	MCollective agent to manage the OS Services
 
 # See MASTERDIR for MAINTAINER.
 
-RUN_DEPENDS=	mcollective-service-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-service-common
+RUN_DEPENDS=	mcollective-service-common>=${PORTVERSION}:sysutils/mcollective-service-common
 
 MASTERDIR=	${.CURDIR}/../mcollective-service-common
 
diff --git a/sysutils/mcollective-service-client/Makefile b/sysutils/mcollective-service-client/Makefile
index 3ffe5f88e631..135d184eb2f5 100644
--- a/sysutils/mcollective-service-client/Makefile
+++ b/sysutils/mcollective-service-client/Makefile
@@ -6,7 +6,7 @@ COMMENT=	MCollective client to manage the OS Services
 
 # See MASTERDIR for MAINTAINER.
 
-RUN_DEPENDS=	mcollective-service-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-service-common
+RUN_DEPENDS=	mcollective-service-common>=${PORTVERSION}:sysutils/mcollective-service-common
 
 MASTERDIR=	${.CURDIR}/../mcollective-service-common
 
diff --git a/sysutils/mcollective-service-common/Makefile b/sysutils/mcollective-service-common/Makefile
index 6070d4bc8991..4fd04f0a50c0 100644
--- a/sysutils/mcollective-service-common/Makefile
+++ b/sysutils/mcollective-service-common/Makefile
@@ -9,7 +9,7 @@ COMMENT?=	MCollective common files to manage the OS Services
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS?=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS?=	mcollective>=2:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective-shell-agent/Makefile b/sysutils/mcollective-shell-agent/Makefile
index bce87aca36e4..f10da9994cad 100644
--- a/sysutils/mcollective-shell-agent/Makefile
+++ b/sysutils/mcollective-shell-agent/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MCollective shell agent plugin
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	mcollective>=2.2.4:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS=	mcollective>=2.2.4:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective-shell-client/Makefile b/sysutils/mcollective-shell-client/Makefile
index e497c3708d10..045c03cb5b6a 100644
--- a/sysutils/mcollective-shell-client/Makefile
+++ b/sysutils/mcollective-shell-client/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MCollective shell client plugin
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	mcollective>=2.2.4:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS=	mcollective>=2.2.4:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index 69fe8a2b414c..fdd23aa153fd 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Modern scalable datacenter orchestration framework
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-stomp>=0:${PORTSDIR}/devel/rubygem-stomp
+RUN_DEPENDS=	rubygem-stomp>=0:devel/rubygem-stomp
 
 NO_BUILD=	yes
 USE_RUBY=	yes
diff --git a/sysutils/mcron/Makefile b/sysutils/mcron/Makefile
index 9df1ccbb8a63..b4f0fe50fb82 100644
--- a/sysutils/mcron/Makefile
+++ b/sysutils/mcron/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	100% compatible replacement for Vixie cron
 
-RUN_DEPENDS=	guile2>=2.0:${PORTSDIR}/lang/guile2
+RUN_DEPENDS=	guile2>=2.0:lang/guile2
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		pkgconfig
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile
index 72bbdb7d271a..6dd69d7052f4 100644
--- a/sysutils/memtest86+/Makefile
+++ b/sysutils/memtest86+/Makefile
@@ -42,7 +42,7 @@ SUB_LIST+=	BOOT_DIR=${BOOT_DIR}
 .endif
 
 .if ${PORT_OPTIONS:MISO}
-BUILD_DEPENDS+=	mkisofs:${PORTSDIR}/sysutils/cdrtools
+BUILD_DEPENDS+=	mkisofs:sysutils/cdrtools
 ALL_TARGET+=	iso
 .endif
 
diff --git a/sysutils/metalog/Makefile b/sysutils/metalog/Makefile
index b74358237f97..00c824c1f15e 100644
--- a/sysutils/metalog/Makefile
+++ b/sysutils/metalog/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Modern syslogd replacement with PCRE support
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		pkgconfig tar:xz
 USE_RC_SUBR=	${PORTNAME}
diff --git a/sysutils/mnrpes/Makefile b/sysutils/mnrpes/Makefile
index 8d4d9b6b759c..978da1586f82 100644
--- a/sysutils/mnrpes/Makefile
+++ b/sysutils/mnrpes/Makefile
@@ -9,8 +9,8 @@ COMMENT=	MCollective and Rufus scheduler wrapper
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	mcollective>=2:${PORTSDIR}/sysutils/mcollective \
-		rubygem-rufus-scheduler>=0.1:${PORTSDIR}/devel/rubygem-rufus-scheduler
+RUN_DEPENDS=	mcollective>=2:sysutils/mcollective \
+		rubygem-rufus-scheduler>=0.1:devel/rubygem-rufus-scheduler
 
 USE_RUBY=	yes
 USE_GITHUB=	yes
diff --git a/sysutils/modules/Makefile b/sysutils/modules/Makefile
index e59718cbd960..eb8bf7ff23e3 100644
--- a/sysutils/modules/Makefile
+++ b/sysutils/modules/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Dynamic modification of a user environment
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS=	libtcl84.so:lang/tcl84
 
 TCL_DVER?=	8.4
 TCL_VER=	${TCL_DVER:S/.//}
diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile
index 43fd31d1917c..9047f809b14c 100644
--- a/sysutils/monitorix/Makefile
+++ b/sysutils/monitorix/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Web based monitoring system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	librrd.so:${PORTSDIR}/databases/rrdtool
-RUN_DEPENDS=	p5-ParallelUA>=0:${PORTSDIR}/www/p5-ParallelUA \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General
+LIB_DEPENDS=	librrd.so:databases/rrdtool
+RUN_DEPENDS=	p5-ParallelUA>=0:www/p5-ParallelUA \
+		p5-CGI>=0:www/p5-CGI \
+		p5-libwww>=0:www/p5-libwww \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-Config-General>=0:devel/p5-Config-General
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/sysutils/moosefs-master/Makefile b/sysutils/moosefs-master/Makefile
index 218d58fb032c..8edf56704477 100644
--- a/sysutils/moosefs-master/Makefile
+++ b/sysutils/moosefs-master/Makefile
@@ -49,7 +49,7 @@ PKGMESSAGE=		${WRKDIR}/pkg-message-cgiserv
 PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
 CONFIGURE_ARGS+=	--enable-mfscgiserv \
 			--with-mfscgiserv-dir=${MFS_CGISERVDIR}
-RUN_DEPENDS=		moosefs-cgi>0:${PORTSDIR}/sysutils/moosefs-cgi
+RUN_DEPENDS=		moosefs-cgi>0:sysutils/moosefs-cgi
 .else
 CONFIGURE_ARGS+=	--disable-mfscgiserv
 .endif
diff --git a/sysutils/moreutils/Makefile b/sysutils/moreutils/Makefile
index 546677d1f908..0dda991590f1 100644
--- a/sysutils/moreutils/Makefile
+++ b/sysutils/moreutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Additional Unix utilities
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index 665c9dc5aa2b..94f1ad0432f1 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pager (like less) which has support for windows and binary files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS=	libslang.so:devel/libslang2
 
 USES=		tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index 9cd87906d244..1620d39eacd5 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windowmaker application, Resembles wmmount with extra functionality
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
+BUILD_DEPENDS=	${LOCALBASE}/lib/libWINGs.a:x11-wm/windowmaker
 
 USES=		gettext
 USE_GNOME=	gtk12 glib12
diff --git a/sysutils/mountsmb2/Makefile b/sysutils/mountsmb2/Makefile
index 05564390e824..ba8a36dd4d56 100644
--- a/sysutils/mountsmb2/Makefile
+++ b/sysutils/mountsmb2/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/lippe
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SMB/CIFS shares mounting scripts to do it at login
 
-RUN_DEPENDS=	nbtscan:${PORTSDIR}/net-mgmt/nbtscan \
-		sudo:${PORTSDIR}/security/sudo
+RUN_DEPENDS=	nbtscan:net-mgmt/nbtscan \
+		sudo:security/sudo
 
 USES=		tar:bzip2
 NO_BUILD=	yes
diff --git a/sysutils/mpiexec/Makefile b/sysutils/mpiexec/Makefile
index fd984c08156d..d6eeba6776a0 100644
--- a/sysutils/mpiexec/Makefile
+++ b/sysutils/mpiexec/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 CONFLICTS=	mpich2-1.2.*
 
-LIB_DEPENDS=	libtorque.so:${PORTSDIR}/sysutils/torque
+LIB_DEPENDS=	libtorque.so:sysutils/torque
 
 USES=		gmake tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile
index 4efb924c04ce..754850bb4db2 100644
--- a/sysutils/mtpfs/Makefile
+++ b/sysutils/mtpfs/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://www.adebenham.com/files/mtp/
 MAINTAINER=	john@pcbsd.org
 COMMENT=	MTP device filesystem
 
-LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp \
-		libid3.so:${PORTSDIR}/audio/id3lib \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	libmtp.so:multimedia/libmtp \
+		libid3.so:audio/id3lib \
+		libid3tag.so:audio/libid3tag \
+		libmad.so:audio/libmad
 
 USES=		fuse pkgconfig
 USE_GNOME=	glib20
diff --git a/sysutils/munin-common/Makefile b/sysutils/munin-common/Makefile
index b41bc1e6189f..4027e8baf66c 100644
--- a/sysutils/munin-common/Makefile
+++ b/sysutils/munin-common/Makefile
@@ -11,9 +11,9 @@ PKGNAMESUFFIX=	-common
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Common components between a munin node and server
 
-BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
-RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
+RUN_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 USES=		gmake perl5 cpe
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index c82b134d58a7..54e33894b395 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -11,36 +11,36 @@ PKGNAMESUFFIX=	-master
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Collector part of Munin
 
-BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
-		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
-		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced
-RUN_DEPENDS=	munin-common>=0:${PORTSDIR}/sysutils/munin-common \
-		rrdtool>=0:${PORTSDIR}/databases/rrdtool \
-		p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Text-Balanced>=0:${PORTSDIR}/textproc/p5-Text-Balanced \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
+BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
+		munin-common>=0:sysutils/munin-common \
+		rrdtool>=0:databases/rrdtool \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-CGI>=0:www/p5-CGI \
+		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Text-Balanced>=0:textproc/p5-Text-Balanced
+RUN_DEPENDS=	munin-common>=0:sysutils/munin-common \
+		rrdtool>=0:databases/rrdtool \
+		p5-CGI>=0:www/p5-CGI \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-HTML-Template>=0:www/p5-HTML-Template \
+		p5-IO-Socket-INET6>=0:net/p5-IO-Socket-INET6 \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Text-Balanced>=0:textproc/p5-Text-Balanced \
+		p5-URI>=0:net/p5-URI \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-FCGI>=0:www/p5-FCGI
 
 USES=		gmake perl5 cpe
 
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index e84dcb40ddb8..38cc4594f163 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -11,18 +11,18 @@ PKGNAMESUFFIX=	-node
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Node-specific part of Munin
 
-BUILD_DEPENDS=	p5-Module-Build>=0:${PORTSDIR}/devel/p5-Module-Build \
-		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
-		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
-		munin-common>=0:${PORTSDIR}/sysutils/munin-common \
-		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-		p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	p5-Module-Build>=0:devel/p5-Module-Build \
+		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
+		munin-common>=0:sysutils/munin-common \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		bash:shells/bash
+RUN_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-DateTime-HiRes>=0:devel/p5-DateTime-HiRes \
+		munin-common>=0:sysutils/munin-common \
+		p5-Net-Server>=0:net/p5-Net-Server \
+		p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \
+		p5-libwww>=0:www/p5-libwww \
+		bash:shells/bash
 
 USES=		gmake perl5 shebangfix cpe
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -43,12 +43,12 @@ SNMP_DESC=	Include SNMP plugins
 PERL_DESC=	Include all Perl modules (adds dependencies)
 JAVA_DESC=	Include JAVA plugins
 
-SNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-PERL_RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+SNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+SNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+PERL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 JAVA_USE=	java=yes
 JAVA_INSTALL_TARGET=	install-plugins-java
 JAVA_BUILD=	yes
diff --git a/sysutils/mybashburn/Makefile b/sysutils/mybashburn/Makefile
index 82e11f76c7eb..ef342ce26f23 100644
--- a/sysutils/mybashburn/Makefile
+++ b/sysutils/mybashburn/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Ncurses CD burning bash script
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		cdialog:${PORTSDIR}/devel/cdialog \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	bash:shells/bash \
+		cdialog:devel/cdialog \
+		cdrecord:sysutils/cdrtools
 
 NO_BUILD=	yes
 NO_ARCH=	yes
@@ -31,15 +31,15 @@ EJECT_DESC=	Ejecting the CD/DVD drive
 NORMALIZE_DESC=	An audio file volume normalizer
 SUDO_DESC=	To allow non-privileged users to burn CD's
 
-CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
-DVDTOOLS_RUN_DEPENDS=	dvd+rw-mediainfo:${PORTSDIR}/sysutils/dvd+rw-tools
-EJECT_RUN_DEPENDS=	eject:${PORTSDIR}/sysutils/eject
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
-SUDO_RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
-VORBIS_RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
+CDRDAO_RUN_DEPENDS=	cdrdao:sysutils/cdrdao
+DVDTOOLS_RUN_DEPENDS=	dvd+rw-mediainfo:sysutils/dvd+rw-tools
+EJECT_RUN_DEPENDS=	eject:sysutils/eject
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+MPG123_RUN_DEPENDS=	mpg123:audio/mpg123
+NORMALIZE_RUN_DEPENDS=	normalize:audio/normalize
+SUDO_RUN_DEPENDS=	sudo:security/sudo
+VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/|${PREFIX}/etc/|; \
diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile
index 239f56b56769..49479950e508 100644
--- a/sysutils/namefix/Makefile
+++ b/sysutils/namefix/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Batch file renamer
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag \
-		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Tk-JComboBox>=0:${PORTSDIR}/x11-toolkits/p5-Tk-JComboBox \
-		p5-Tk-DynaTabFrame>=0:${PORTSDIR}/x11-toolkits/p5-Tk-DynaTabFrame
+RUN_DEPENDS=	p5-MP3-Tag>=0:audio/p5-MP3-Tag \
+		p5-Tk>=0:x11-toolkits/p5-Tk \
+		p5-Tk-JComboBox>=0:x11-toolkits/p5-Tk-JComboBox \
+		p5-Tk-DynaTabFrame>=0:x11-toolkits/p5-Tk-DynaTabFrame
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.pl
 NO_BUILD=	yes
diff --git a/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index 57136816dc29..aa81465aa292 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Displays battery life and CPU frequency with an OSD
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS=	libxosd.so:misc/xosd
 
 PLIST_FILES=	bin/nbosd
 PORTDOCS=	*
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index e28bd548db3c..78c338ad9e2d 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Core Nepomuk system libraries and services for KDE
 
-LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-		libepub.so:${PORTSDIR}/textproc/ebook-tools \
-		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
+LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
+		libtag.so:audio/taglib \
+		libexiv2.so:graphics/exiv2 \
+		libswscale.so:multimedia/ffmpeg \
+		libepub.so:textproc/ebook-tools \
+		libqmobipocket.so:graphics/kdegraphics4-mobipocket
 
 USE_KDE4=	kdeprefix automoc4 baloo kdelibs kfilemetadata \
 		ontologies soprano
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index d775f3588746..6a392e2d2aaf 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Background browser and setter for X windows
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
-		hicolor-icon-theme>0:${PORTSDIR}/misc/hicolor-icon-theme
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	gnome-icon-theme>0:misc/gnome-icon-theme \
+		hicolor-icon-theme>0:misc/hicolor-icon-theme
 
 OPTIONS_DEFINE=	XINERAMA
 OPTIONS_DEFAULT=XINERAMA
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index 0a01b4f502cb..77c73e607423 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -62,14 +62,14 @@ CFLAGS+=	-DUSE_LOCK
 .endif
 
 .if ${PORT_OPTIONS:MUUID}
-LIB_DEPENDS+=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
 CONFIGURE_ARGS+=--enable-uuid
 .else
 CONFIGURE_ARGS+=--disable-uuid
 .endif
 
 .if ${PORT_OPTIONS:MUBLIO}
-LIB_DEPENDS+=	libublio.so:${PORTSDIR}/devel/libublio
+LIB_DEPENDS+=	libublio.so:devel/libublio
 CFLAGS+=	-DUSE_UBLIO
 .else
 pre-everything::
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 5e1c75652b13..979fc6e2a613 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -62,7 +62,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--with-dev
 
 .if ${PORT_OPTIONS:MCGI}
-LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:graphics/gd
 CGIDIR?=	${PREFIX}/www/cgi-bin/${PORTNAME}
 CGIDIR_REL?=	${CGIDIR:S,^${PREFIX}/,,}
 CONFIGURE_ARGS+=	--with-cgi --with-cgipath=${CGIDIR} \
@@ -95,7 +95,7 @@ PLIST_SUB+=	NUT_USB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--with-snmp
 PLIST_SUB+=	NUT_SNMP=""
 .else
@@ -104,7 +104,7 @@ PLIST_SUB+=	NUT_SNMP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	libneon.so:www/neon
 CONFIGURE_ARGS+=	--with-neonxml
 PLIST_SUB+=	NUT_NEON=""
 .else
@@ -114,7 +114,7 @@ PLIST_SUB+=	NUT_NEON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPDU}
-LIB_DEPENDS+=	libpowerman.so:${PORTSDIR}/sysutils/powerman
+LIB_DEPENDS+=	libpowerman.so:sysutils/powerman
 CONFIGURE_ARGS+=	--with-powerman
 PLIST_SUB+=	NUT_PDU=""
 .else
@@ -123,24 +123,24 @@ PLIST_SUB+=	NUT_PDU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MBASH}
-BUILD_DEPENDS+=	${LOCALBASE}/share/bash-completion/bash_completion.sh:${PORTSDIR}/shells/bash-completion
-RUN_DEPENDS+=	${LOCALBASE}/share/bash-completion/bash_completion.sh:${PORTSDIR}/shells/bash-completion
+BUILD_DEPENDS+=	${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
+RUN_DEPENDS+=	${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
 PLIST_SUB+=	BASH=""
 .else
 PLIST_SUB+=	BASH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-BUILD_DEPENDS+=	${LOCALBASE}/include/avahi-ui/avahi-ui.h:${PORTSDIR}/net/avahi-header
-BUILD_DEPENDS+=	avahi-daemon:${PORTSDIR}/net/avahi-app
-RUN_DEPENDS+=	avahi-daemon:${PORTSDIR}/net/avahi-app
+BUILD_DEPENDS+=	${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
+BUILD_DEPENDS+=	avahi-daemon:net/avahi-app
+RUN_DEPENDS+=	avahi-daemon:net/avahi-app
 CONFIGURE_ARGS+=	--with-avahi
 .else
 CONFIGURE_ARGS+=	--without-avahi
 .endif
 
 .if ${PORT_OPTIONS:MFREEIPMI}
-LIB_DEPENDS+=	libfreeipmi.so:${PORTSDIR}/sysutils/freeipmi
+LIB_DEPENDS+=	libfreeipmi.so:sysutils/freeipmi
 CONFIGURE_ARGS+=	--with-freeipmi
 PLIST_SUB+=	NUT_FREEIPMI=""
 .else
@@ -149,7 +149,7 @@ PLIST_SUB+=	NUT_FREEIPMI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIPMIPSU}
-LIB_DEPENDS+=	libfreeipmi.so:${PORTSDIR}/sysutils/freeipmi
+LIB_DEPENDS+=	libfreeipmi.so:sysutils/freeipmi
 CONFIGURE_ARGS+=	--with-ipmi
 PLIST_SUB+=	NUT_IPMIPSU=""
 .else
diff --git a/sysutils/openhpi/Makefile b/sysutils/openhpi/Makefile
index b79847ebad15..5bedf16b8c6b 100644
--- a/sysutils/openhpi/Makefile
+++ b/sysutils/openhpi/Makefile
@@ -14,9 +14,9 @@ LICENSE_NAME=	OpenHPI license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libnetsnmp.so:net-mgmt/net-snmp \
+		libgcrypt.so:security/libgcrypt
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 2c3248c3044e..69c9ad7120b3 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Complex IPMI management software
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -44,7 +44,7 @@ PORT_OPTIONS+=	GDBM
 
 .if ${PORT_OPTIONS:MSNMP}
 PORT_OPTIONS+=		SSL
-LIB_DEPENDS+=		libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=		libnetsnmp.so:net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--with-ucdsnmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-ucdsnmp=no
@@ -60,8 +60,8 @@ CONFIGURE_ARGS+=	--with-openssl=no
 .if ${PORT_OPTIONS:MTKINTER}
 USES+=			python
 WITH_PYTHON=		yes
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-			${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:${PORTSDIR}/x11-toolkits/tix
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+			${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:x11-toolkits/tix
 CONFIGURE_ARGS+=	--with-tkinter
 PLIST_SUB+=		TKINTER=""
 .else
@@ -82,7 +82,7 @@ PLIST_SUB+=		PERL="@comment "
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=			python
 CONFIGURE_ARGS+=	--with-python --with-swig ac_cv_path_pythonprog=${PYTHON_CMD}
-BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13
+BUILD_DEPENDS+=		swig:devel/swig13
 PLIST_SUB+=		PYTHON=""
 .else
 CONFIGURE_ARGS+=	--with-python=no --with-swig=no
@@ -101,7 +101,7 @@ PLIST_SUB+=		TCL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		libgdbm.so:databases/gdbm
 .endif
 
 .if ${PORT_OPTIONS:MGLIB12}
diff --git a/sysutils/ori/Makefile b/sysutils/ori/Makefile
index 0f1bea738c32..ded99cb5d316 100644
--- a/sysutils/ori/Makefile
+++ b/sysutils/ori/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://cdn.bitbucket.org/orifs/ori/downloads/
 MAINTAINER=	mashti@cs.stanford.edu
 COMMENT=	Ori distributed file system
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-		libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libevent.so:devel/libevent2 \
+		libboost_date_time.so:devel/boost-libs
 
 USES=		execinfo fuse pkgconfig scons tar:xz
 USE_OPENSSL=	yes
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index f2dc32a995af..a06bb593909d 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -10,23 +10,23 @@ COMMENT=	SQL powered OS instrumentation, monitoring, and analytics
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	snappy>0:${PORTSDIR}/archivers/snappy \
-		rocksdb>0:${PORTSDIR}/databases/rocksdb \
-		thrift>0:${PORTSDIR}/devel/thrift \
-		thrift-cpp>0:${PORTSDIR}/devel/thrift-cpp \
-		bash>0:${PORTSDIR}/shells/bash \
-		yara>0:${PORTSDIR}/security/yara \
-		doxygen:${PORTSDIR}/devel/doxygen \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}psutil>0:${PORTSDIR}/sysutils/py-psutil \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}pexpect>0:${PORTSDIR}/misc/py-pexpect \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2  \
-		${PYTHON_PKGNAMEPREFIX}thrift>0:${PORTSDIR}/devel/py-thrift \
-		${PYTHON_PKGNAMEPREFIX}pip>0:${PORTSDIR}/devel/py-pip
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libgflags.so:${PORTSDIR}/devel/gflags \
-		libicuuc.so:${PORTSDIR}/devel/icu
+BUILD_DEPENDS=	snappy>0:archivers/snappy \
+		rocksdb>0:databases/rocksdb \
+		thrift>0:devel/thrift \
+		thrift-cpp>0:devel/thrift-cpp \
+		bash>0:shells/bash \
+		yara>0:security/yara \
+		doxygen:devel/doxygen \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2  \
+		${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift \
+		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		libgflags.so:devel/gflags \
+		libicuuc.so:devel/icu
 
 USES=		cmake:outsource gmake libtool python:build compiler:c++11-lib
 CONFIGURE_ENV+=	OSQUERY_BUILD_VERSION="${PORTVERSION}" HOME="${WRKDIR}" \
diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index f52fe37902ee..8743c1ce56fe 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Object oriented perl interface to jail(2)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0.44:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0.44:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0.44:devel/p5-Inline \
+		p5-Inline-C>=0.44:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/sysutils/p5-BSD-Process/Makefile b/sysutils/p5-BSD-Process/Makefile
index 42b285baa24a..b2076c54d798 100644
--- a/sysutils/p5-BSD-Process/Makefile
+++ b/sysutils/p5-BSD-Process/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Information about running processes on BSD platforms
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/sysutils/p5-Brackup/Makefile b/sysutils/p5-Brackup/Makefile
index 40dad81b31ed..9f16bf0364f6 100644
--- a/sysutils/p5-Brackup/Makefile
+++ b/sysutils/p5-Brackup/Makefile
@@ -12,15 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Flexible backup tool
 
-BUILD_DEPENDS=	p5-DBD-SQLite>0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-		p5-DateTime-Format-ISO8601>0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Digest-SHA1>0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Fuse>0:${PORTSDIR}/sysutils/p5-Fuse \
-		p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Net-Amazon-S3>0:${PORTSDIR}/net/p5-Net-Amazon-S3 \
-		p5-Net-SFTP>0:${PORTSDIR}/net/p5-Net-SFTP \
-		p5-String-Escape>0:${PORTSDIR}/textproc/p5-String-Escape
+BUILD_DEPENDS=	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
+		p5-DBI>0:databases/p5-DBI \
+		p5-DateTime-Format-ISO8601>0:devel/p5-DateTime-Format-ISO8601 \
+		p5-Digest-SHA1>0:security/p5-Digest-SHA1 \
+		p5-Fuse>0:sysutils/p5-Fuse \
+		p5-IO-stringy>0:devel/p5-IO-stringy \
+		p5-Net-Amazon-S3>0:net/p5-Net-Amazon-S3 \
+		p5-Net-SFTP>0:net/p5-Net-SFTP \
+		p5-String-Escape>0:textproc/p5-String-Escape
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-File-Listing/Makefile b/sysutils/p5-File-Listing/Makefile
index 50283e043512..a4ed513996d9 100644
--- a/sysutils/p5-File-Listing/Makefile
+++ b/sysutils/p5-File-Listing/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Parse directory listings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date
+BUILD_DEPENDS=	p5-HTTP-Date>=6:www/p5-HTTP-Date
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	p5-libwww-5*
diff --git a/sysutils/p5-File-Stat-ModeString/Makefile b/sysutils/p5-File-Stat-ModeString/Makefile
index b589ce481517..8a0c07713ff1 100644
--- a/sysutils/p5-File-Stat-ModeString/Makefile
+++ b/sysutils/p5-File-Stat-ModeString/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts file stat(2) mode to/from string representation
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-File-Stat-Bits>0:${PORTSDIR}/sysutils/p5-File-Stat-Bits
+BUILD_DEPENDS=	p5-File-Stat-Bits>0:sysutils/p5-File-Stat-Bits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-Filesys-DiskUsage/Makefile b/sysutils/p5-Filesys-DiskUsage/Makefile
index 937b8c687b1a..aa51be62a036 100644
--- a/sysutils/p5-Filesys-DiskUsage/Makefile
+++ b/sysutils/p5-Filesys-DiskUsage/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl equivalent of du(1)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index e26d4021236a..5b243ac53809 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Simple way to write filesystems in Perl using FUSE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Fuse>=0:${PORTSDIR}/sysutils/p5-Fuse
+BUILD_DEPENDS=	p5-Fuse>=0:sysutils/p5-Fuse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/sysutils/p5-Log-Syslog-Fast/Makefile b/sysutils/p5-Log-Syslog-Fast/Makefile
index 2579e921b562..511c03f42f17 100644
--- a/sysutils/p5-Log-Syslog-Fast/Makefile
+++ b/sysutils/p5-Log-Syslog-Fast/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Send syslog messages over TCP, UDP, or UNIX sockets
 
-RUN_DEPENDS=	p5-IO-Socket-IP>=0.19:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Log-Syslog-Constants>-1.01:${PORTSDIR}/sysutils/p5-Log-Syslog-Constants
-BUILD_DEPENDS=	p5-IO-Socket-IP>=0.19:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Log-Syslog-Constants>-1.01:${PORTSDIR}/sysutils/p5-Log-Syslog-Constants
+RUN_DEPENDS=	p5-IO-Socket-IP>=0.19:net/p5-IO-Socket-IP \
+		p5-Log-Syslog-Constants>-1.01:sysutils/p5-Log-Syslog-Constants
+BUILD_DEPENDS=	p5-IO-Socket-IP>=0.19:net/p5-IO-Socket-IP \
+		p5-Log-Syslog-Constants>-1.01:sysutils/p5-Log-Syslog-Constants
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/p5-MogileFS-Client/Makefile b/sysutils/p5-MogileFS-Client/Makefile
index 3606ed88c871..5917ea6a16c5 100644
--- a/sysutils/p5-MogileFS-Client/Makefile
+++ b/sysutils/p5-MogileFS-Client/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Client library for the MogileFS distributed file system
 
-BUILD_DEPENDS=	p5-IO-stringy>=2.102:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-IO-stringy>=2.102:devel/p5-IO-stringy \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-MogileFS-Network/Makefile b/sysutils/p5-MogileFS-Network/Makefile
index 8d217cac45d7..ee148641cc79 100644
--- a/sysutils/p5-MogileFS-Network/Makefile
+++ b/sysutils/p5-MogileFS-Network/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Network awareness and extensions for p5-MogileFS-Server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-Net-Patricia>=0:${PORTSDIR}/net/p5-Net-Patricia \
-		p5-MogileFS-Server>=2.50:${PORTSDIR}/sysutils/p5-MogileFS-Server
+BUILD_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
+		p5-Net-Patricia>=0:net/p5-Net-Patricia \
+		p5-MogileFS-Server>=2.50:sysutils/p5-MogileFS-Server
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-MogileFS-Server/Makefile b/sysutils/p5-MogileFS-Server/Makefile
index e10bcd07936c..46e63d839825 100644
--- a/sysutils/p5-MogileFS-Server/Makefile
+++ b/sysutils/p5-MogileFS-Server/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	MogileFS (distributed filesystem) server
 
-BUILD_DEPENDS=	p5-Danga-Socket>=1.56:${PORTSDIR}/devel/p5-Danga-Socket \
-		p5-DBD-SQLite>=1.13:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-IO-AIO>=0:${PORTSDIR}/devel/p5-IO-AIO \
-		p5-MogileFS-Client>=0:${PORTSDIR}/sysutils/p5-MogileFS-Client \
-		p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
-		p5-Perlbal>=1.79:${PORTSDIR}/www/perlbal \
-		p5-Sys-Syscall>=0.22:${PORTSDIR}/devel/p5-Sys-Syscall \
-		p5-Sys-Syslog>=0:${PORTSDIR}/sysutils/p5-Sys-Syslog
+BUILD_DEPENDS=	p5-Danga-Socket>=1.56:devel/p5-Danga-Socket \
+		p5-DBD-SQLite>=1.13:databases/p5-DBD-SQLite \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-IO-AIO>=0:devel/p5-IO-AIO \
+		p5-MogileFS-Client>=0:sysutils/p5-MogileFS-Client \
+		p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \
+		p5-Perlbal>=1.79:www/perlbal \
+		p5-Sys-Syscall>=0.22:devel/p5-Sys-Syscall \
+		p5-Sys-Syslog>=0:sysutils/p5-Sys-Syslog
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-MogileFS-Utils/Makefile b/sysutils/p5-MogileFS-Utils/Makefile
index 495b0237d0d3..56c59f24aed8 100644
--- a/sysutils/p5-MogileFS-Utils/Makefile
+++ b/sysutils/p5-MogileFS-Utils/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	MogileFS tools
 
-BUILD_DEPENDS=	p5-MogileFS-Client>=1.16:${PORTSDIR}/sysutils/p5-MogileFS-Client \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-MogileFS-Client>=1.16:sysutils/p5-MogileFS-Client \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-Monitor-Simple/Makefile b/sysutils/p5-Monitor-Simple/Makefile
index 6ca5a472883d..d59f285b7356 100644
--- a/sysutils/p5-Monitor-Simple/Makefile
+++ b/sysutils/p5-Monitor-Simple/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Simple monitoring of applications and services
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-CaptureOutput>=0:${PORTSDIR}/devel/p5-IO-CaptureOutput \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-IO-CaptureOutput>=0:devel/p5-IO-CaptureOutput \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-File-Which>=0:sysutils/p5-File-Which
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile b/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
index f5f0029c1aed..250675f5572e 100644
--- a/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
+++ b/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Automatically handles the home OU for when adding/removing users
 
-RUN_DEPENDS=	p5-Plugtools>=0:${PORTSDIR}/sysutils/p5-Plugtools
+RUN_DEPENDS=	p5-Plugtools>=0:sysutils/p5-Plugtools
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/p5-Plugtools/Makefile b/sysutils/p5-Plugtools/Makefile
index cb5eea9a16da..bea45e7c3cad 100644
--- a/sysutils/p5-Plugtools/Makefile
+++ b/sysutils/p5-Plugtools/Makefile
@@ -12,15 +12,15 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Manages POSIX users in LDAP and is extensible via a plugin system
 
-RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
-		p5-Sys-User-UIDhelper>=0:${PORTSDIR}/sysutils/p5-Sys-User-UIDhelper \
-		p5-Sys-Group-GIDhelper>=0:${PORTSDIR}/sysutils/p5-Sys-Group-GIDhelper \
-		p5-Net-LDAP-posixAccount>=0:${PORTSDIR}/net/p5-Net-LDAP-posixAccount \
-		p5-Net-LDAP-posixGroup>=0:${PORTSDIR}/net/p5-Net-LDAP-posixGroup \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		p5-File-BaseDir>=0:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-Config-IniHash>=0:${PORTSDIR}/devel/p5-Config-IniHash
+RUN_DEPENDS=	p5-perl-ldap>=0:net/p5-perl-ldap \
+		p5-Sys-User-UIDhelper>=0:sysutils/p5-Sys-User-UIDhelper \
+		p5-Sys-Group-GIDhelper>=0:sysutils/p5-Sys-Group-GIDhelper \
+		p5-Net-LDAP-posixAccount>=0:net/p5-Net-LDAP-posixAccount \
+		p5-Net-LDAP-posixGroup>=0:net/p5-Net-LDAP-posixGroup \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		p5-File-BaseDir>=0:devel/p5-File-BaseDir \
+		p5-Config-IniHash>=0:devel/p5-Config-IniHash
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	bin/*
diff --git a/sysutils/p5-Proclet/Makefile b/sysutils/p5-Proclet/Makefile
index 7e59d0b59f78..774864bc7561 100644
--- a/sysutils/p5-Proclet/Makefile
+++ b/sysutils/p5-Proclet/Makefile
@@ -15,21 +15,21 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Validator>0:${PORTSDIR}/devel/p5-Data-Validator \
-	p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
-	p5-Getopt-Compact-WithCmd>=0.20:${PORTSDIR}/devel/p5-Getopt-Compact-WithCmd \
-	p5-Log-Minimal>=0.14:${PORTSDIR}/devel/p5-Log-Minimal \
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-	p5-Parallel-Prefork>=0.13:${PORTSDIR}/devel/p5-Parallel-Prefork \
-	p5-String-ShellQuote>0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-	p5-YAML-LibYAML>=0.38:${PORTSDIR}/textproc/p5-YAML-LibYAML \
-	p5-Time-Crontab>=0.01:${PORTSDIR}/devel/p5-Time-Crontab
+	p5-Data-Validator>0:devel/p5-Data-Validator \
+	p5-File-Which>=1.09:sysutils/p5-File-Which \
+	p5-Getopt-Compact-WithCmd>=0.20:devel/p5-Getopt-Compact-WithCmd \
+	p5-Log-Minimal>=0.14:devel/p5-Log-Minimal \
+	p5-Mouse>0:devel/p5-Mouse \
+	p5-Parallel-Prefork>=0.13:devel/p5-Parallel-Prefork \
+	p5-String-ShellQuote>0:textproc/p5-String-ShellQuote \
+	p5-YAML-LibYAML>=0.38:textproc/p5-YAML-LibYAML \
+	p5-Time-Crontab>=0.01:devel/p5-Time-Crontab
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Parallel-Scoreboard>0:${PORTSDIR}/devel/p5-Parallel-Scoreboard \
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Capture-Tiny>0:${PORTSDIR}/devel/p5-Capture-Tiny \
-	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils
+	p5-Parallel-Scoreboard>0:devel/p5-Parallel-Scoreboard \
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Capture-Tiny>0:devel/p5-Capture-Tiny \
+	p5-List-MoreUtils>0:lang/p5-List-MoreUtils
 
 USES=	perl5
 USE_PERL5=	modbuild
diff --git a/sysutils/p5-Rex/Makefile b/sysutils/p5-Rex/Makefile
index 4faacf548b46..b05fd35aac82 100644
--- a/sysutils/p5-Rex/Makefile
+++ b/sysutils/p5-Rex/Makefile
@@ -14,27 +14,27 @@ COMMENT=	Perl framework for automation and systems administration
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	\
-	p5-Devel-Caller>=0:${PORTSDIR}/devel/p5-Devel-Caller \
-	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-	p5-Hash-Merge>=0:${PORTSDIR}/textproc/p5-Hash-Merge \
-	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-	p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
-	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-	p5-Text-Glob>=0:${PORTSDIR}/textproc/p5-Text-Glob \
-	p5-URI>0:${PORTSDIR}/net/p5-URI \
-	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-	p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect \
-	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-	p5-Net-SSH2>=0:${PORTSDIR}/net/p5-Net-SSH2 \
-	p5-Net-OpenSSH>=0:${PORTSDIR}/net/p5-Net-OpenSSH \
-	p5-Net-SFTP-Foreign>=0:${PORTSDIR}/net/p5-Net-SFTP-Foreign
+	p5-Devel-Caller>=0:devel/p5-Devel-Caller \
+	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+	p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
+	p5-IO-String>=0:devel/p5-IO-String \
+	p5-JSON-XS>=0:converters/p5-JSON-XS \
+	p5-libwww>=0:www/p5-libwww \
+	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+	p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally \
+	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+	p5-Text-Glob>=0:textproc/p5-Text-Glob \
+	p5-URI>0:net/p5-URI \
+	p5-XML-Simple>=0:textproc/p5-XML-Simple \
+	p5-YAML>=0:textproc/p5-YAML \
+	p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+	p5-Expect>=0:lang/p5-Expect \
+	p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+	p5-HTTP-Date>=0:www/p5-HTTP-Date \
+	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+	p5-Net-SSH2>=0:net/p5-Net-SSH2 \
+	p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \
+	p5-Net-SFTP-Foreign>=0:net/p5-Net-SFTP-Foreign
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/sysutils/p5-Schedule-Cron-Events/Makefile b/sysutils/p5-Schedule-Cron-Events/Makefile
index 6dfda2606ee3..8fbf40002f7a 100644
--- a/sysutils/p5-Schedule-Cron-Events/Makefile
+++ b/sysutils/p5-Schedule-Cron-Events/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Take a line from a crontab and find out when events will occur
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Set-Crontab>=0:${PORTSDIR}/devel/p5-Set-Crontab
+BUILD_DEPENDS=	p5-Set-Crontab>=0:devel/p5-Set-Crontab
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index 915c8ef085e1..7a4f29e3919c 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Schedule::Cron - cron-like scheduler for Perl subroutines
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-Schedule-Load/Makefile b/sysutils/p5-Schedule-Load/Makefile
index d2aaaf4a485e..7b431579446a 100644
--- a/sysutils/p5-Schedule-Load/Makefile
+++ b/sysutils/p5-Schedule-Load/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Load distribution and status across multiple host machines
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Proc-ProcessTable>=0.40:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Unix-Processors>=2.02:${PORTSDIR}/sysutils/p5-Unix-Processors \
-		p5-IPC-Locker>=1.41:${PORTSDIR}/devel/p5-IPC-Locker
+RUN_DEPENDS=	p5-Proc-ProcessTable>=0.40:devel/p5-Proc-ProcessTable \
+		p5-Unix-Processors>=2.02:sysutils/p5-Unix-Processors \
+		p5-IPC-Locker>=1.41:devel/p5-IPC-Locker
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/sysutils/p5-Sys-Filesystem/Makefile b/sysutils/p5-Sys-Filesystem/Makefile
index eeea50def38e..112347215ec3 100644
--- a/sysutils/p5-Sys-Filesystem/Makefile
+++ b/sysutils/p5-Sys-Filesystem/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module to Retrieve list of filesystems and their properties
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	p5-Params-Util>=1.0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-IPC-Cmd>=0.80:${PORTSDIR}/devel/p5-IPC-Cmd \
-		p5-Module-Pluggable>=4.8:${PORTSDIR}/devel/p5-Module-Pluggable
+RUN_DEPENDS=	p5-Params-Util>=1.0:devel/p5-Params-Util \
+		p5-IPC-Cmd>=0.80:devel/p5-IPC-Cmd \
+		p5-Module-Pluggable>=4.8:devel/p5-Module-Pluggable
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-Sysadm-Install/Makefile b/sysutils/p5-Sysadm-Install/Makefile
index e6f5ad6f01af..23203206d7cb 100644
--- a/sysutils/p5-Sysadm-Install/Makefile
+++ b/sysutils/p5-Sysadm-Install/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Typical installation tasks for system administrators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Expect>=0:${PORTSDIR}/lang/p5-Expect \
-		p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Log-Log4perl>=1.28:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-Expect>=0:lang/p5-Expect \
+		p5-File-Which>=1.09:sysutils/p5-File-Which \
+		p5-Log-Log4perl>=1.28:devel/p5-Log-Log4perl \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/sysutils/p5-Tail-Stat/Makefile b/sysutils/p5-Tail-Stat/Makefile
index 2507fdd054ef..43f3a9451a31 100644
--- a/sysutils/p5-Tail-Stat/Makefile
+++ b/sysutils/p5-Tail-Stat/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Real-time log statistics server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Log-Dispatch>=2.26:${PORTSDIR}/devel/p5-Log-Dispatch \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-Pid-File-Flock>=0:${PORTSDIR}/devel/p5-Pid-File-Flock \
-		p5-Sys-Syslog>=0.16:${PORTSDIR}/sysutils/p5-Sys-Syslog \
-		p5-Tie-Hash-Indexed>=0:${PORTSDIR}/devel/p5-Tie-Hash-Indexed
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Log-Dispatch>=2.26:devel/p5-Log-Dispatch \
+		p5-POE>=0:devel/p5-POE \
+		p5-Pid-File-Flock>=0:devel/p5-Pid-File-Flock \
+		p5-Sys-Syslog>=0.16:sysutils/p5-Sys-Syslog \
+		p5-Tie-Hash-Indexed>=0:devel/p5-Tie-Hash-Indexed
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-TCP>=0:${PORTSDIR}/devel/p5-Test-TCP
+TEST_DEPENDS=	p5-Test-TCP>=0:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/p5-Ubic/Makefile b/sysutils/p5-Ubic/Makefile
index ea3b1b227bda..5ed296b748b8 100644
--- a/sysutils/p5-Ubic/Makefile
+++ b/sysutils/p5-Ubic/Makefile
@@ -14,16 +14,16 @@ COMMENT=	Flexible perl-based service manager
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
+TEST_DEPENDS=	p5-Test-Class>=0:devel/p5-Test-Class \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/p5-Unix-Lsof/Makefile b/sysutils/p5-Unix-Lsof/Makefile
index 438c6b4ab899..438818896655 100644
--- a/sysutils/p5-Unix-Lsof/Makefile
+++ b/sysutils/p5-Unix-Lsof/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gjvc@gjvc.com
 COMMENT=	Unix::Lsof -- a wrapper to the Unix lsof utility
 
-BUILD_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
-RUN_DEPENDS=	p5-IPC-Run3>=0:${PORTSDIR}/devel/p5-IPC-Run3
+BUILD_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3
+RUN_DEPENDS=	p5-IPC-Run3>=0:devel/p5-IPC-Run3
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/sysutils/p5-ZConf-Cron/Makefile b/sysutils/p5-ZConf-Cron/Makefile
index 88d8036004ff..d37768cc6165 100644
--- a/sysutils/p5-ZConf-Cron/Makefile
+++ b/sysutils/p5-ZConf-Cron/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Handles storing cron tabs in ZConf
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-ZConf-GUI>=0:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf
-RUN_DEPENDS:=	p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-ZConf-GUI>=0:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf
+BUILD_DEPENDS=	p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-ZConf-GUI>=0:devel/p5-ZConf-GUI \
+		p5-ZConf>=0:net/p5-ZConf
+RUN_DEPENDS:=	p5-DateTime-Event-Cron>=0:devel/p5-DateTime-Event-Cron \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-ZConf-GUI>=0:devel/p5-ZConf-GUI \
+		p5-ZConf>=0:net/p5-ZConf
 
 NO_ARCH=	yes
 USES=		perl5 shebangfix
diff --git a/sysutils/p5-arclog/Makefile b/sysutils/p5-arclog/Makefile
index a20123af186c..6914e90feb0e 100644
--- a/sysutils/p5-arclog/Makefile
+++ b/sysutils/p5-arclog/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Archive the log files monthly
 
-RUN_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-File-MMagic>=0:devel/p5-File-MMagic \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/p5-reslog/Makefile b/sysutils/p5-reslog/Makefile
index a69fdc472bf3..089380d4345f 100644
--- a/sysutils/p5-reslog/Makefile
+++ b/sysutils/p5-reslog/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Reverse-resolve IP in Apache log files
 
-RUN_DEPENDS=	p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
+RUN_DEPENDS=	p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \
+		p5-File-MMagic>=0:devel/p5-File-MMagic \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 04a4c221cb53..924392a700f6 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Tool for creating machine images
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mitchellh:DEFAULT,cli,gofs,govnc,iochan,mapstructure \
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index 8046916abbff..c8a81a7e5f0a 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Package manager from ArchLinux
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libarchive.so.13:archivers/libarchive
 
 USES=		gmake libtool perl5 pkgconfig shebangfix
 SHEBANG_FILES=	${WRKSRC}/scripts/makepkg-template.pl.in
@@ -45,14 +45,14 @@ GPGME_DESC=	Use GPGME for PGP signature verification
 
 .if ${PORT_OPTIONS:MCURL}
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 .else
 CONFIGURE_ARGS+=--without-libcurl
 .endif
 
 .if ${PORT_OPTIONS:MGPGME}
 CONFIGURE_ARGS+=--with-gpgme
-LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS+=	libgpgme.so:security/gpgme
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/sysutils/pam_mount/Makefile b/sysutils/pam_mount/Makefile
index 79ed2d4e9038..64372658f90e 100644
--- a/sysutils/pam_mount/Makefile
+++ b/sysutils/pam_mount/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PAM module that can mount volumes for a user session
 LICENSE=	LGPL21 GPLv2
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libHX.so:${PORTSDIR}/lang/libhx
+LIB_DEPENDS=	libHX.so:lang/libhx
 
 USES=		pkgconfig libtool perl5 tar:xz
 USE_GNOME=	libxml2
diff --git a/sysutils/panicmail/Makefile b/sysutils/panicmail/Makefile
index f91f13c697da..a14e7fa55db9 100644
--- a/sysutils/panicmail/Makefile
+++ b/sysutils/panicmail/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Automatically report kernel panics
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	pkesh:${PORTSDIR}/security/pkesh
+RUN_DEPENDS=	pkesh:security/pkesh
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile
index 7907e5579813..bf87c732fa93 100644
--- a/sysutils/parallel/Makefile
+++ b/sysutils/parallel/Makefile
@@ -35,6 +35,6 @@ PORTDOCS=	niceload.html niceload.pdf niceload.texi \
 
 SHEBANG_FILES=	src/niceload src/sql
 
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/pod2texi:${PORTSDIR}/print/texinfo
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/pod2texi:print/texinfo
 
 .include <bsd.port.mk>
diff --git a/sysutils/password-store/Makefile b/sysutils/password-store/Makefile
index 5f6337125030..c8d5253b8eba 100644
--- a/sysutils/password-store/Makefile
+++ b/sysutils/password-store/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Stores, retrieves, generates, and synchronizes passwords securely
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		getopt>=0:${PORTSDIR}/misc/getopt \
-		gnupg>=2:${PORTSDIR}/security/gnupg \
-		pwgen>=0:${PORTSDIR}/sysutils/pwgen \
-		tree>=1.7:${PORTSDIR}/sysutils/tree
+RUN_DEPENDS=	bash:shells/bash \
+		getopt>=0:misc/getopt \
+		gnupg>=2:security/gnupg \
+		pwgen>=0:sysutils/pwgen \
+		tree>=1.7:sysutils/tree
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -28,9 +28,9 @@ GIT_DESC=		Enable git storage
 XCLIP_DESC=		Enable xclip feature
 CONTRIB_DESC=		Include shell completions, import scripts, related projects
 
-GIT_RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
-XCLIP_RUN_DEPENDS=	base64>=0:${PORTSDIR}/converters/base64 \
-			xclip>=0:${PORTSDIR}/x11/xclip
+GIT_RUN_DEPENDS=	git>=0:devel/git
+XCLIP_RUN_DEPENDS=	base64>=0:converters/base64 \
+			xclip>=0:x11/xclip
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/pbi-manager/Makefile b/sysutils/pbi-manager/Makefile
index 8ad9b5b77c09..d963ec1f9eae 100644
--- a/sysutils/pbi-manager/Makefile
+++ b/sysutils/pbi-manager/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PBI management utilities
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh
+RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:sysutils/pcbsd-libsh
 
 WRKSRC_SUBDIR=	src-sh/pbi-manager
 USES=		pkgconfig tar:xz
diff --git a/sysutils/pcbsd-appweb/Makefile b/sysutils/pcbsd-appweb/Makefile
index 1eff6607a9c9..c4359ef0ab72 100644
--- a/sysutils/pcbsd-appweb/Makefile
+++ b/sysutils/pcbsd-appweb/Makefile
@@ -10,10 +10,10 @@ COMMENT=	PC-BSD Web Interface
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	syscache:${PORTSDIR}/sysutils/pcbsd-syscache \
-		pbi:${PORTSDIR}/sysutils/pbi-manager \
-		warden:${PORTSDIR}/sysutils/warden \
-		nginx:${PORTSDIR}/www/nginx
+RUN_DEPENDS=	syscache:sysutils/pcbsd-syscache \
+		pbi:sysutils/pbi-manager \
+		warden:sysutils/warden \
+		nginx:www/nginx
 
 IGNORE_WITH_PHP=5 54
 USE_PHP=	filter gd json session
diff --git a/sysutils/pcbsd-utils-qt5/Makefile b/sysutils/pcbsd-utils-qt5/Makefile
index 9f43d67a468e..0ca223319d8a 100644
--- a/sysutils/pcbsd-utils-qt5/Makefile
+++ b/sysutils/pcbsd-utils-qt5/Makefile
@@ -11,18 +11,18 @@ COMMENT=	PC-BSD Qt5 Utilities
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}sphinx-intl>=0:${PORTSDIR}/textproc/py-sphinx-intl \
-		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-httpdomain>=0:${PORTSDIR}/textproc/py-sphinxcontrib-httpdomain \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:${PORTSDIR}/textproc/py-sphinx_rtd_theme \
-		${PYTHON_PKGNAMEPREFIX}alabaster>=0:${PORTSDIR}/textproc/py-alabaster \
-		tex-formats>=0:${PORTSDIR}/print/tex-formats \
-		tex-dvipsk>=0:${PORTSDIR}/print/tex-dvipsk
-RUN_DEPENDS=	pc-updatemanager:${PORTSDIR}/sysutils/pcbsd-utils \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
-		cdda2wav:${PORTSDIR}/sysutils/cdrtools
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5
+BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}sphinx-intl>=0:textproc/py-sphinx-intl \
+		${PYTHON_PKGNAMEPREFIX}sphinxcontrib-httpdomain>=0:textproc/py-sphinxcontrib-httpdomain \
+		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:textproc/py-sphinx_rtd_theme \
+		${PYTHON_PKGNAMEPREFIX}alabaster>=0:textproc/py-alabaster \
+		tex-formats>=0:print/tex-formats \
+		tex-dvipsk>=0:print/tex-dvipsk
+RUN_DEPENDS=	pc-updatemanager:sysutils/pcbsd-utils \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \
+		cdda2wav:sysutils/cdrtools
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpoppler-qt5.so:graphics/poppler-qt5
 
 CONFLICTS?=	pcbsd-utils-qt4-[0-9]*
 
diff --git a/sysutils/pcbsd-utils/Makefile b/sysutils/pcbsd-utils/Makefile
index e2d60ebb0b73..53f3bd55b74e 100644
--- a/sysutils/pcbsd-utils/Makefile
+++ b/sysutils/pcbsd-utils/Makefile
@@ -10,9 +10,9 @@ COMMENT=	PC-BSD Command-Line Utilities
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	sipcalc:${PORTSDIR}/net-mgmt/sipcalc \
-		eject:${PORTSDIR}/sysutils/eject \
-		unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=	sipcalc:net-mgmt/sipcalc \
+		eject:sysutils/eject \
+		unzip:archivers/unzip
 
 WRKSRC_SUBDIR=	src-sh/pcbsd-utils
 USE_QT5=	core network buildtools qmake
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 9eab1ba13a86..8c1555ee294f 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -14,8 +14,8 @@ COMMENT=	PCI configuration utilities
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpci.so:${PORTSDIR}/devel/libpci
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+LIB_DEPENDS=	libpci.so:devel/libpci
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 ALL_TARGET=	lspci lspci.8 setpci setpci.8
 CPPFLAGS+=	-fPIC
diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index 9989754c432c..681b89615535 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -25,7 +25,7 @@ DSHGROUPS_CONFIGURE_WITH=	dshgroups
 NETGROUP_DESC=		NIS Netgroup support
 NETGROUP_CONFIGURE_WITH=netgroup
 READLINE_CONFIGURE_WITH=readline
-READLINE_LIB_DEPENDS=	libreadline.so.6:${PORTSDIR}/devel/readline
+READLINE_LIB_DEPENDS=	libreadline.so.6:devel/readline
 RSH_DESC=		RSH support
 RSH_CONFIGURE_WITH=	rsh
 SSH_CONFIGURE_WITH=	ssh
diff --git a/sysutils/pear-Cache/Makefile b/sysutils/pear-Cache/Makefile
index b2b9e6d128f3..616f33cbeb2a 100644
--- a/sysutils/pear-Cache/Makefile
+++ b/sysutils/pear-Cache/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	sysutils www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR framework for caching of arbitrary data
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
 
 USES=	pear
 
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index 509fa3154285..6ae977069281 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -19,9 +19,9 @@ PEAR_MDB2_DESC=	PEAR::MDB2 support
 PEAR_MAIL_DESC=	PEAR::Mail support
 PHP_SQLITE_DESC=	PHP sqlite support (php5 only)
 
-PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
+PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail
 PHP_SQLITE_USE=	PHP=sqlite
 
 .include <bsd.port.mk>
diff --git a/sysutils/pear-Translation2/Makefile b/sysutils/pear-Translation2/Makefile
index 51499ddbbfe4..bedd80952cb0 100644
--- a/sysutils/pear-Translation2/Makefile
+++ b/sysutils/pear-Translation2/Makefile
@@ -25,13 +25,13 @@ PEAR_FILE_GETTEXT_DESC=	PEAR::File_Gettext support
 PEAR_I18NV2_DESC=	PEAR::I18Nv2 support
 PEAR_XML_SERIALIZER_DESC=	PEAR::XML_Serializer support
 
-PEAR_CACHE_LITE_RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_DB_DATAOBJECT_RUN_DEPENDS=	${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
-PEAR_I18NV2_RUN_DEPENDS=	${PEARDIR}/File/I18Nv2.php:${PORTSDIR}/sysutils/pear-I18Nv2
-PEAR_XML_SERIALIZER_RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+PEAR_CACHE_LITE_RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_DB_DATAOBJECT_RUN_DEPENDS=	${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext
+PEAR_I18NV2_RUN_DEPENDS=	${PEARDIR}/File/I18Nv2.php:sysutils/pear-I18Nv2
+PEAR_XML_SERIALIZER_RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
 
 .include <bsd.port.mk>
diff --git a/sysutils/pecl-mogilefs/Makefile b/sysutils/pecl-mogilefs/Makefile
index 49044fa2ecfa..6a6836453f94 100644
--- a/sysutils/pecl-mogilefs/Makefile
+++ b/sysutils/pecl-mogilefs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP client library to communicate with the MogileFS storage
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 USE_PHP=	yes
 USE_PHP_BUILD=	spl
diff --git a/sysutils/pesign/Makefile b/sysutils/pesign/Makefile
index b8399098cd09..461b83ae702b 100644
--- a/sysutils/pesign/Makefile
+++ b/sysutils/pesign/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Signing utility for UEFI secure boot
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libefivar.so:${PORTSDIR}/devel/efivar \
-		libnspr4.so:${PORTSDIR}/devel/nspr \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libefivar.so:devel/efivar \
+		libnspr4.so:devel/nspr \
+		libnss3.so:security/nss \
+		libpopt.so:devel/popt \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 USE_GCC=	yes
 USE_GITHUB=	yes
diff --git a/sysutils/pflogx/Makefile b/sysutils/pflogx/Makefile
index 563fc36a159d..a2a871c6d5d9 100644
--- a/sysutils/pflogx/Makefile
+++ b/sysutils/pflogx/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 OPTIONS_DEFINE=	EXPAT DOCS EXAMPLES
 
 EXPAT_DESC=		Ability to merge new events (require expat)
-EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXPAT_MAKE_ARGS=	-DWITH_EXPAT \
 			EXPAT_INCLUDEDIR=${LOCALBASE}/include \
 			EXPAT_LIBDIR=${LOCALBASE}/lib
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 21300d9bc2c8..cfb4eb30e178 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.benzedrine.cx/
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Utility to render graphical statistics for pf
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 MAKE_ARGS=	"LD_GD=gd"
 MAKE_ENV+=	__MAKE_CONF=/dev/null
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
index caaccc8044c4..7f9b50b3a632 100644
--- a/sysutils/policykit-gnome/Makefile
+++ b/sysutils/policykit-gnome/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	PolicyKit-gnome-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME frontend to the PolicyKit framework
 
-LIB_DEPENDS=	libpolkit.so:${PORTSDIR}/sysutils/policykit
+LIB_DEPENDS=	libpolkit.so:sysutils/policykit
 
 USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gconf2 gnomedocutils intlhack
diff --git a/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile
index a3af9a8ccc60..835a6db38f83 100644
--- a/sysutils/policykit-qt/Makefile
+++ b/sysutils/policykit-qt/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	polkit-qt-${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PolicyKit manager for Qt
 
-LIB_DEPENDS=	libpolkit.so:${PORTSDIR}/sysutils/policykit
+LIB_DEPENDS=	libpolkit.so:sysutils/policykit
 
 USE_LDCONFIG=	yes
 USE_KDE4=	automoc4
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 41498a6af3a5..9ac551d5ac35 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	PolicyKit-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libexpat.so:textproc/expat2
 
 USERS=		polkit
 GROUPS=		polkit
@@ -38,8 +38,8 @@ OPTIONS_DEFAULT=MANPAGES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	docbook-sgml>0:textproc/docbook-sgml \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 USE_GNOME+=	libxslt:build
 
 PLIST_SUB+=	MANPAGES=""
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index add57a990bba..5fcbf55fc037 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME frontend to the PolicyKit framework
 
-LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk20 gtk30 intlhack
diff --git a/sysutils/polkit-kde/Makefile b/sysutils/polkit-kde/Makefile
index 62af8182be85..87cc5336cad3 100644
--- a/sysutils/polkit-kde/Makefile
+++ b/sysutils/polkit-kde/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Polkit authentication UI for KDE Workspaces
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpolkit-qt-agent-1.so:${PORTSDIR}/sysutils/polkit-qt
+LIB_DEPENDS=	libpolkit-qt-agent-1.so:sysutils/polkit-qt
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index 4b5517f24bad..46fce623b75f 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Qt wrapper around Polkit libraries
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpolkit-agent-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libpolkit-agent-1.so:sysutils/polkit
 
 CMAKE_ARGS=	-DBUILD_EXAMPLES:BOOL=OFF \
 		-DBUILD_TEST:BOOL=OFF \
diff --git a/sysutils/polkit-qt5/Makefile b/sysutils/polkit-qt5/Makefile
index 8edd72d9c704..710a5387e159 100644
--- a/sysutils/polkit-qt5/Makefile
+++ b/sysutils/polkit-qt5/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Qt5 wrapper around Polkit libraries
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpolkit-agent-1.so:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libpolkit-agent-1.so:sysutils/polkit
 
 CMAKE_ARGS=	-DBUILD_EXAMPLES:BOOL=OFF \
 		-DBUILD_TEST:BOOL=OFF \
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index bd8c6b84b60a..3e7fdc9e1daa 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Framework for controlling access to system-wide components
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libmozjs-17.0.so:${PORTSDIR}/lang/spidermonkey170
-RUN_DEPENDS=	dbus-launch:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libmozjs-17.0.so:lang/spidermonkey170
+RUN_DEPENDS=	dbus-launch:devel/dbus
 
 USERS=		polkitd
 GROUPS=		polkitd
@@ -44,8 +44,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	MANPAGES
-MANPAGES_BUILD_DEPENDS=	docbook-sgml>=4.5:${PORTSDIR}/textproc/docbook-sgml \
-		docbook-xsl>=1.76:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_BUILD_DEPENDS=	docbook-sgml>=4.5:textproc/docbook-sgml \
+		docbook-xsl>=1.76:textproc/docbook-xsl
 MANPAGES_USE=	gnome=libxslt:build
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 OPTIONS_SUB=	yes
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 4ba7e379b113..9e91196bfdfc 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool for doing remote power control
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		libtool perl5 shebangfix
 SHEBANG_FILES=	heartbeat/powerman
diff --git a/sysutils/prelink/Makefile b/sysutils/prelink/Makefile
index c97e91819be1..eb09ee7a59c2 100644
--- a/sysutils/prelink/Makefile
+++ b/sysutils/prelink/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://people.redhat.com/jakub/prelink/
 MAINTAINER=	damjan.jov@gmail.com
 COMMENT=	ELF prelinking utility to speed up dynamic linking
 
-LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone
+LIB_DEPENDS=	libargp.so:devel/argp-standalone
 
 USES=		autoreconf gmake tar:bzip2 libtool
 GNU_CONFIGURE=	yes
diff --git a/sysutils/procenv/Makefile b/sysutils/procenv/Makefile
index 82f008ef0bea..95928bb64557 100644
--- a/sysutils/procenv/Makefile
+++ b/sysutils/procenv/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Utility to show process environment
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xmlwf:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	xmlwf:textproc/expat2
 
 USES=		autoreconf gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 77bc9c4959f9..cb5647681526 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Port of the Linux pstree, killall, and pidof commands
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	gsed:textproc/gsed
 
 CONFLICTS=	pidof-[0-9]* pstree-2.[0-9]*
 
diff --git a/sysutils/pstacku/Makefile b/sysutils/pstacku/Makefile
index e54421c662b9..b7c4870c2896 100644
--- a/sysutils/pstacku/Makefile
+++ b/sysutils/pstacku/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Retrieve process stack traces
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libunwind.so:${PORTSDIR}/devel/libunwind
+LIB_DEPENDS=	libunwind.so:devel/libunwind
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libunwind=${LOCALBASE}
diff --git a/sysutils/puppet37/Makefile b/sysutils/puppet37/Makefile
index 65686567c7c1..195ee88429de 100644
--- a/sysutils/puppet37/Makefile
+++ b/sysutils/puppet37/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Configuration management framework written in Ruby
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
-RUN_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-ruby-augeas \
-		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
+BUILD_DEPENDS=	rubygem-facter>=0:sysutils/rubygem-facter \
+		rubygem-hiera1>=0:sysutils/rubygem-hiera1
+RUN_DEPENDS=	rubygem-facter>=0:sysutils/rubygem-facter \
+		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \
+		rubygem-hiera1>=0:sysutils/rubygem-hiera1
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
diff --git a/sysutils/puppet38/Makefile b/sysutils/puppet38/Makefile
index c1c222a4c153..f752e016da35 100644
--- a/sysutils/puppet38/Makefile
+++ b/sysutils/puppet38/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Configuration management framework written in Ruby
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
-RUN_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
-		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-ruby-augeas \
-		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
+BUILD_DEPENDS=	rubygem-facter>=0:sysutils/rubygem-facter \
+		rubygem-hiera1>=0:sysutils/rubygem-hiera1
+RUN_DEPENDS=	rubygem-facter>=0:sysutils/rubygem-facter \
+		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \
+		rubygem-hiera1>=0:sysutils/rubygem-hiera1
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
diff --git a/sysutils/puppet4/Makefile b/sysutils/puppet4/Makefile
index 7d87988dd86a..a06616c3271c 100644
--- a/sysutils/puppet4/Makefile
+++ b/sysutils/puppet4/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Configuration management framework written in Ruby
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	rubygem-hiera>=2.0:${PORTSDIR}/sysutils/rubygem-hiera \
-		rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
-RUN_DEPENDS=	rubygem-hiera>=2.0:${PORTSDIR}/sysutils/rubygem-hiera \
-		rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure \
-		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-ruby-augeas
+BUILD_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
+		rubygem-json_pure>=0:devel/rubygem-json_pure
+RUN_DEPENDS=	rubygem-hiera>=2.0:sysutils/rubygem-hiera \
+		rubygem-json_pure>=0:devel/rubygem-json_pure \
+		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas
 
 USES=		cpe
 CPE_VENDOR=	puppetlabs
@@ -40,11 +40,11 @@ OPTIONS_RADIO_FACTER=	CFACTER RFACTER
 RFACTER_DESC=	Use facter 2.x (written in Ruby)
 CFACTER_DESC=	Use facter 3.x (experimental rewrite in C++)
 
-RFACTER_BUILD_DEPENDS=	rubygem-facter>=2.0:${PORTSDIR}/sysutils/rubygem-facter
-RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:${PORTSDIR}/sysutils/rubygem-facter
+RFACTER_BUILD_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
+RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
 
-CFACTER_BUILD_DEPENDS=	facter>=3.0:${PORTSDIR}/sysutils/facter
-CFACTER_RUN_DEPENDS=	facter>=3.0:${PORTSDIR}/sysutils/facter
+CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
+CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \
diff --git a/sysutils/puppetserver/Makefile b/sysutils/puppetserver/Makefile
index fb093cca7695..8096517095ca 100644
--- a/sysutils/puppetserver/Makefile
+++ b/sysutils/puppetserver/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Puppet Server running in the JVM
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	bash>=0:${PORTSDIR}/shells/bash \
-		puppet4>=0:${PORTSDIR}/sysutils/puppet4
-BUILD_DEPENDS=	rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	bash>=0:shells/bash \
+		puppet4>=0:sysutils/puppet4
+BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
 
 USE_RC_SUBR=	puppetserver
 
@@ -36,11 +36,11 @@ OPTIONS_RADIO_FACTER=	CFACTER RFACTER
 RFACTER_DESC=	Use facter 2.x (written in Ruby)
 CFACTER_DESC=	Use facter 3.x (experimental rewrite in C++)
 
-RFACTER_BUILD_DEPENDS=	rubygem-facter>=2.0:${PORTSDIR}/sysutils/rubygem-facter
-RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:${PORTSDIR}/sysutils/rubygem-facter
+RFACTER_BUILD_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
+RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
 
-CFACTER_BUILD_DEPENDS=	facter>=3.0:${PORTSDIR}/sysutils/facter
-CFACTER_RUN_DEPENDS=	facter>=3.0:${PORTSDIR}/sysutils/facter
+CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
+CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile
index 6ee3ae15f1b3..5956c1bce553 100644
--- a/sysutils/py-bcfg2/Makefile
+++ b/sysutils/py-bcfg2/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Configuration management system written in Python
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}daemon>=0:${PORTSDIR}/devel/py-daemon \
-		${PYTHON_PKGNAMEPREFIX}gamin>=0:${PORTSDIR}/devel/py-gamin \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon \
+		${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
 
 OPTIONS_DEFINE=	CHEETAH GENSHI
 CHEETAH_DESC=	Support Cheetah Templates
@@ -28,8 +28,8 @@ USE_RC_SUBR=	bcfg2
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 PORTDOCS=	COPYRIGHT README
 
-CHEETAH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=0:${PORTSDIR}/devel/py-cheetah
-GENSHI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0:${PORTSDIR}/textproc/py-genshi
+CHEETAH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah
+GENSHI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
diff --git a/sysutils/py-cdmi/Makefile b/sysutils/py-cdmi/Makefile
index c018f5c50182..18b2762aeccd 100644
--- a/sysutils/py-cdmi/Makefile
+++ b/sysutils/py-cdmi/Makefile
@@ -12,8 +12,8 @@ COMMENT=	CDMI on OpenStack Swift implementation
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}swift>0:${PORTSDIR}/databases/py-swift \
-		${PYTHON_PKGNAMEPREFIX}webob>0:${PORTSDIR}/www/py-webob
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift \
+		${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	osaddon
diff --git a/sysutils/py-croniter/Makefile b/sysutils/py-croniter/Makefile
index 9d3d0edc6da6..b58786cf70da 100644
--- a/sysutils/py-croniter/Makefile
+++ b/sysutils/py-croniter/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Iteration support for datetime objects with cron like format
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/sysutils/py-crontab/Makefile b/sysutils/py-crontab/Makefile
index 5b1f7cf3d843..0424db4124f7 100644
--- a/sysutils/py-crontab/Makefile
+++ b/sysutils/py-crontab/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Read and write crontab files using a direct API
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}croniter>0:${PORTSDIR}/sysutils/py-croniter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile
index 6816b072e9d1..4673f952a963 100644
--- a/sysutils/py-diffoscope/Makefile
+++ b/sysutils/py-diffoscope/Makefile
@@ -13,12 +13,12 @@ COMMENT=	In-depth comparison of files, archives, and directories
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:${PORTSDIR}/archivers/py3-libarchive-c \
-		${PYTHON_PKGNAMEPREFIX}python-magic>=0:${PORTSDIR}/devel/py3-python-magic
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:${PORTSDIR}/devel/py-pytest \
-		zipinfo:${PORTSDIR}/archivers/unzip \
-		isoinfo:${PORTSDIR}/sysutils/cdrkit \
-		rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py3-libarchive-c \
+		${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py3-python-magic
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \
+		zipinfo:archivers/unzip \
+		isoinfo:sysutils/cdrkit \
+		rpm2cpio:archivers/rpm2cpio
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-dlipower/Makefile b/sysutils/py-dlipower/Makefile
index 4a4b7cc8cb9a..82ae28866ca1 100644
--- a/sysutils/py-dlipower/Makefile
+++ b/sysutils/py-dlipower/Makefile
@@ -13,9 +13,9 @@ COMMENT=	CLI interface to Digital Logger's (DLI) Power Strips
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:${PORTSDIR}/www/py-beautifulsoup \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}six>=1.9:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six
 
 USES=		python shebangfix
 SHEBANG_FILES=	dlipower/fence_dli
diff --git a/sysutils/py-ezjailremote/Makefile b/sysutils/py-ezjailremote/Makefile
index e393035a3e55..c73eb872bffe 100644
--- a/sysutils/py-ezjailremote/Makefile
+++ b/sysutils/py-ezjailremote/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Remote control and convenience wrapper for ezjail
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	ezjail-admin:${PORTSDIR}/sysutils/ezjail \
-		${PYTHON_PKGNAMEPREFIX}fabric>0:${PORTSDIR}/devel/py-fabric
+RUN_DEPENDS=	ezjail-admin:sysutils/ezjail \
+		${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tomster
diff --git a/sysutils/py-freenas.cli/Makefile b/sysutils/py-freenas.cli/Makefile
index 6427099c061f..960777b3e30d 100644
--- a/sysutils/py-freenas.cli/Makefile
+++ b/sysutils/py-freenas.cli/Makefile
@@ -10,16 +10,16 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	FreeNAS Command Line Interface
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freenas.utils>0:${PORTSDIR}/devel/py-freenas.utils
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}columnize>0:${PORTSDIR}/devel/py-columnize \
-		${PYTHON_PKGNAMEPREFIX}pyicu>0:${PORTSDIR}/devel/py-pyicu \
-		${PYTHON_PKGNAMEPREFIX}natural>0:${PORTSDIR}/devel/py-natural \
-		${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply \
-		${PYTHON_PKGNAMEPREFIX}termcolor>0:${PORTSDIR}/devel/py-termcolor \
-		${PYTHON_PKGNAMEPREFIX}texttable>0:${PORTSDIR}/textproc/py-texttable \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:${PORTSDIR}/devel/py-freenas.utils \
-		${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:${PORTSDIR}/devel/py-freenas.dispatcher
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize \
+		${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu \
+		${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural \
+		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
+		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor \
+		${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils \
+		${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-glances/Makefile b/sysutils/py-glances/Makefile
index 04b16b719fe3..43572bee131d 100644
--- a/sysutils/py-glances/Makefile
+++ b/sysutils/py-glances/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CLI curses based monitoring tool for GNU/Linux and BSD OS
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:${PORTSDIR}/sysutils/py-psutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile
index c946ffa6bf51..fef9a851069e 100644
--- a/sysutils/py-halite/Makefile
+++ b/sysutils/py-halite/Makefile
@@ -13,8 +13,8 @@ COMMENT=	SaltStack Web UI
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:${PORTSDIR}/sysutils/py-salt \
-		${PYTHON_PKGNAMEPREFIX}cherrypy>0:${PORTSDIR}/www/py-cherrypy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/sysutils/py-honcho/Makefile b/sysutils/py-honcho/Makefile
index 30278839b340..313c48518f69 100644
--- a/sysutils/py-honcho/Makefile
+++ b/sysutils/py-honcho/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Managing Procfile-based applications tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:${PORTSDIR}/devel/py-Jinja2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nickstenning
diff --git a/sysutils/py-ploy/Makefile b/sysutils/py-ploy/Makefile
index 64c598d31606..0f9fb03557b7 100644
--- a/sysutils/py-ploy/Makefile
+++ b/sysutils/py-ploy/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Manage servers through a central configuration
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lazy>0:${PORTSDIR}/devel/py-lazy \
-		${PYTHON_PKGNAMEPREFIX}paramiko>0:${PORTSDIR}/security/py-paramiko \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \
+		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-ploy_ansible/Makefile b/sysutils/py-ploy_ansible/Makefile
index 9134c9c81088..41f76dfb629e 100644
--- a/sysutils/py-ploy_ansible/Makefile
+++ b/sysutils/py-ploy_ansible/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Plugin to integrate Ansible with ploy
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
-		${PYTHON_PKGNAMEPREFIX}execnet>0:${PORTSDIR}/sysutils/py-execnet \
-		ansible>=1.8.0:${PORTSDIR}/sysutils/ansible
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
+		${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet \
+		ansible>=1.8.0:sysutils/ansible
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-ploy_ec2/Makefile b/sysutils/py-ploy_ec2/Makefile
index 96861360bec5..3af33f5f9f87 100644
--- a/sysutils/py-ploy_ec2/Makefile
+++ b/sysutils/py-ploy_ec2/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Plugin for ploy to provision Amazon EC2 instances
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
-		${PYTHON_PKGNAMEPREFIX}boto>=2.0:${PORTSDIR}/devel/py-boto \
-		${PYTHON_PKGNAMEPREFIX}lazy>0:${PORTSDIR}/devel/py-lazy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
+		${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto \
+		${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-ploy_ezjail/Makefile b/sysutils/py-ploy_ezjail/Makefile
index 9e44cefd3149..a9e2c1137263 100644
--- a/sysutils/py-ploy_ezjail/Makefile
+++ b/sysutils/py-ploy_ezjail/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Plugin for ploy to provision FreeBSD jails using ezjail
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:${PORTSDIR}/sysutils/py-ploy \
-		${PYTHON_PKGNAMEPREFIX}lazy>0:${PORTSDIR}/devel/py-lazy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
+		${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-ploy_fabric/Makefile b/sysutils/py-ploy_fabric/Makefile
index c6f9c7a1e5dc..d663a83a3164 100644
--- a/sysutils/py-ploy_fabric/Makefile
+++ b/sysutils/py-ploy_fabric/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Ploy plugin for integration with Fabric
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:${PORTSDIR}/sysutils/py-ploy \
-		${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0:${PORTSDIR}/devel/py-fabric
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
+		${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0:devel/py-fabric
 
 USES=		python:-2.7 zip
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-plumbum/Makefile b/sysutils/py-plumbum/Makefile
index db64d35d0554..10d2cf833613 100644
--- a/sysutils/py-plumbum/Makefile
+++ b/sysutils/py-plumbum/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Shell combinators and more for python
 
 LICENSE=	MIT
 
-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/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index ee9b1766a70e..953be613daf4 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python bindings for the Sleuthkit
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libtsk.so:${PORTSDIR}/sysutils/sleuthkit
+LIB_DEPENDS=	libtsk.so:sysutils/sleuthkit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/sysutils/py-pywatchman/Makefile b/sysutils/py-pywatchman/Makefile
index 35519dfa0dc6..e19d57c1d381 100644
--- a/sysutils/py-pywatchman/Makefile
+++ b/sysutils/py-pywatchman/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Watchman client for Python
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	watchman>=4:${PORTSDIR}/sysutils/watchman
+RUN_DEPENDS=	watchman>=4:sysutils/watchman
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 21a8d1636513..d34f3cb8d946 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Distributed remote execution and configuration management system
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.13:${PORTSDIR}/devel/py-msgpack-python \
-		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:${PORTSDIR}/net/py-libcloud \
-		${PYTHON_PKGNAMEPREFIX}botocore>0:${PORTSDIR}/devel/py-botocore \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:${PORTSDIR}/textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}requests>1:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34 \
-		${PYTHON_PKGNAMEPREFIX}progressbar>0:${PORTSDIR}/misc/py-progressbar \
-		${PYTHON_PKGNAMEPREFIX}futures>=2.0:${PORTSDIR}/devel/py-futures \
-		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:${PORTSDIR}/www/py-tornado
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.13:devel/py-msgpack-python \
+		${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \
+		${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \
+		${PYTHON_PKGNAMEPREFIX}requests>1:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \
+		${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \
+		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
+		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado
 
 OPTIONS_DEFINE=	ZEROMQ RAET
 OPTIONS_DEFAULT=	ZEROMQ
@@ -31,13 +31,13 @@ OPTIONS_DEFAULT=	ZEROMQ
 ZEROMQ_DESC=	Enable ZeroMQ transport
 RAET_DESC=	Enable RAET transport
 
-ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq
-ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:${PORTSDIR}/net/py-pyzmq \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>2.6.1:${PORTSDIR}/security/py-pycrypto
+ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
+ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>2.6.1:security/py-pycrypto
 
-RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:${PORTSDIR}/security/py-libnacl \
-		${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:${PORTSDIR}/devel/py-ioflo \
-		${PYTHON_PKGNAMEPREFIX}raet>0:${PORTSDIR}/net/py-raet
+RAET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libnacl>=1.4.2:security/py-libnacl \
+		${PYTHON_PKGNAMEPREFIX}ioflo>=1.2.1:devel/py-ioflo \
+		${PYTHON_PKGNAMEPREFIX}raet>0:net/py-raet
 
 USES=		cpe python:2
 CPE_VENDOR=	saltstack
diff --git a/sysutils/py-shutilwhich/Makefile b/sysutils/py-shutilwhich/Makefile
index 649aede16b05..50efaa436b98 100644
--- a/sysutils/py-shutilwhich/Makefile
+++ b/sysutils/py-shutilwhich/Makefile
@@ -11,7 +11,7 @@ COMMENT=	shutil.which for those not using Python 3.3
 
 LICENSE=	PSFL
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python:-3.3
 USE_GITHUB=	yes
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index 3ff388bb0765..5c504bc33af8 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	hizel@vyborg.ru
 COMMENT=	System to monitor and control a number of processes on UNIX-like OS
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:${PORTSDIR}/www/py-meld3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3
 TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 OPTIONS_DEFINE=	TESTS
 TESTS_DESC=	Install mock for running unit tests
@@ -22,7 +22,7 @@ TESTS_DESC=	Install mock for running unit tests
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 PORTDOCS=	*.txt *.rst
diff --git a/sysutils/py-tmuxp/Makefile b/sysutils/py-tmuxp/Makefile
index 98f23ada362c..a21758220958 100644
--- a/sysutils/py-tmuxp/Makefile
+++ b/sysutils/py-tmuxp/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Session manager for tmux
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=0:${PORTSDIR}/devel/py-argcomplete \
-		${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:${PORTSDIR}/devel/py-kaptan \
-		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:${PORTSDIR}/devel/py-colorama \
-		tmux:${PORTSDIR}/sysutils/tmux
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete \
+		${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \
+		tmux:sysutils/tmux
 
 NO_ARCH=	yes
 USES=		python
diff --git a/sysutils/py-zdaemon/Makefile b/sysutils/py-zdaemon/Makefile
index 378fa358047d..129f389b6b6b 100644
--- a/sysutils/py-zdaemon/Makefile
+++ b/sysutils/py-zdaemon/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Daemon Process Control Library and Tools for Unix-bases Systems
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>0:${PORTSDIR}/devel/py-zconfig
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/sysutils/qpxtool/Makefile b/sysutils/qpxtool/Makefile
index 635e690b0885..34719ceee8c8 100644
--- a/sysutils/qpxtool/Makefile
+++ b/sysutils/qpxtool/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GUI for testing CD/DVD quality and transfer rate
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake tar:bzip2
 USE_QT4=	qmake_build moc_build rcc_build linguisttools_build \
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index f0867f87e49c..925f23837a03 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Linux/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface for easily configuring Synergy2
 
-BUILD_DEPENDS=	synergys:${PORTSDIR}/sysutils/synergy
+BUILD_DEPENDS=	synergys:sysutils/synergy
 
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig gettext iconv
diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile
index 9dfea15f86bb..0e340469d6cc 100644
--- a/sysutils/qzeitgeist/Makefile
+++ b/sysutils/qzeitgeist/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Qt 4 wrapper library around the Zeitgeist D-Bus API
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rapper:${PORTSDIR}/textproc/raptor2 \
-		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
+BUILD_DEPENDS=	rapper:textproc/raptor2 \
+		${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib
 
 USE_KDE4=	automoc4
 USE_QT4=	dbus declarative qtestlib \
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index 770a72df7e4d..d4dadf0fa313 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Local/remote mirroring+incremental backup
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
+LIB_DEPENDS=	librsync.so:net/librsync
 
 CONFLICTS=	rdiff-backup-[0-9]*
 
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 417ac2c9916b..5c26a0b7ec7d 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Local/remote mirroring+incremental backup
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
+LIB_DEPENDS=	librsync.so:net/librsync
 
 CONFLICTS=	rdiff-backup-devel-[0-9]* rdiff-backup-1.0*
 
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index 73616f3405ca..56fabf08fcca 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tool to generate (incremental) backup file list
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libnettle.so:${PORTSDIR}/security/nettle
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20 \
+		libpcre.so:devel/pcre \
+		libnettle.so:security/nettle
 
 USES=		gmake libarchive pkgconfig tar:bzip2
 USE_AUTOTOOLS=	autoconf
diff --git a/sysutils/realsync/Makefile b/sysutils/realsync/Makefile
index 558a459ace1d..a0be23116aba 100644
--- a/sysutils/realsync/Makefile
+++ b/sysutils/realsync/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Parallel synchronization daemon for rsync
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		sudo:${PORTSDIR}/security/sudo
+RUN_DEPENDS=	rsync:net/rsync \
+		sudo:security/sudo
 
 USES=		python
 NO_BUILD=	yes
diff --git a/sysutils/relaunchd/Makefile b/sysutils/relaunchd/Makefile
index f7e33d71bf8c..a7a7a2ebeae8 100644
--- a/sysutils/relaunchd/Makefile
+++ b/sysutils/relaunchd/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Service management daemon similar to Darwin's launchd(8)
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libucl.so:${PORTSDIR}/textproc/libucl
+LIB_DEPENDS=	libucl.so:textproc/libucl
 
 HAS_CONFIGURE=	YES
 USE_GITHUB=	YES
diff --git a/sysutils/relaxconf/Makefile b/sysutils/relaxconf/Makefile
index 02a0175e9b8e..26a3165a7a2b 100644
--- a/sysutils/relaxconf/Makefile
+++ b/sysutils/relaxconf/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/relaxbsd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of text menu based utilities for configuring RelaxBSD LiveCD
 
-BUILD_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog
-RUN_DEPENDS=	cdialog:${PORTSDIR}/devel/cdialog \
-		disktype:${PORTSDIR}/sysutils/disktype
+BUILD_DEPENDS=	cdialog:devel/cdialog
+RUN_DEPENDS=	cdialog:devel/cdialog \
+		disktype:sysutils/disktype
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/renameutils/Makefile b/sysutils/renameutils/Makefile
index a135c2409caf..1eaf6afe5a4e 100644
--- a/sysutils/renameutils/Makefile
+++ b/sysutils/renameutils/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Rename files faster and more easily
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	gls:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS=	gls:sysutils/coreutils
 
 GNU_CONFIGURE=	yes
 USES=		readline charsetfix
diff --git a/sysutils/reoback/Makefile b/sysutils/reoback/Makefile
index 981df1e5ddbe..1edd43224ddf 100644
--- a/sysutils/reoback/Makefile
+++ b/sysutils/reoback/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	_r3.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple but flexible ftp/nfs backup script
 
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 NO_BUILD=	yes
 USES=		perl5
diff --git a/sysutils/restic/Makefile b/sysutils/restic/Makefile
index 638763cfe599..74b0a326e28e 100644
--- a/sysutils/restic/Makefile
+++ b/sysutils/restic/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Restic backup program
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	restic:DEFAULT,chunker juju:errors golang:crypto
diff --git a/sysutils/rhc/Makefile b/sysutils/rhc/Makefile
index 66e1b2a313ff..880c42260a3e 100644
--- a/sysutils/rhc/Makefile
+++ b/sysutils/rhc/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Administration console client for RedHat OpenShift
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/bin/minitar:${PORTSDIR}/archivers/rubygem-archive-tar-minitar \
-		${LOCALBASE}/bin/commander:${PORTSDIR}/devel/rubygem-commander \
-		rubygem-highline>=1.6.11:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-httpclient>=2.4:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-net-scp>=1.1.2:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-ssh>=2.0.11:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-net-ssh-multi>=1.2.0:${PORTSDIR}/security/rubygem-net-ssh-multi \
-		rubygem-open4>0:${PORTSDIR}/devel/rubygem-open4
+RUN_DEPENDS=	${LOCALBASE}/bin/minitar:archivers/rubygem-archive-tar-minitar \
+		${LOCALBASE}/bin/commander:devel/rubygem-commander \
+		rubygem-highline>=1.6.11:devel/rubygem-highline \
+		rubygem-httpclient>=2.4:www/rubygem-httpclient \
+		rubygem-net-scp>=1.1.2:security/rubygem-net-scp \
+		rubygem-net-ssh>=2.0.11:security/rubygem-net-ssh \
+		rubygem-net-ssh-multi>=1.2.0:security/rubygem-net-ssh-multi \
+		rubygem-open4>0:devel/rubygem-open4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/riak-cs/Makefile b/sysutils/riak-cs/Makefile
index 2b1518fbac59..1867620d2714 100644
--- a/sysutils/riak-cs/Makefile
+++ b/sysutils/riak-cs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Open source, distributed, S3 interface to Riak KV
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak
+BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:lang/erlang-riak
 
 USES=		gmake readline shebangfix
 SHEBANG_FILES=	deps/eper/priv/bin/dtop \
diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index 40a999862a1f..b42d77498e6d 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Filesystem snapshot utility based on rsync(1)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rsync:${PORTSDIR}/net/rsync
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		p5-Lchown>=0:${PORTSDIR}/sysutils/p5-Lchown
+BUILD_DEPENDS=	rsync:net/rsync
+RUN_DEPENDS=	rsync:net/rsync \
+		p5-Lchown>=0:sysutils/p5-Lchown
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/rsyncbackup/Makefile b/sysutils/rsyncbackup/Makefile
index b201688e3b8c..59a7fe5bfb84 100644
--- a/sysutils/rsyncbackup/Makefile
+++ b/sysutils/rsyncbackup/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Rsync frontend written in Perl
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 CONFIGSRC=	${WRKSRC}/config
 CONFIGFILES=	backupset.conf config.conf destinations.conf sources.conf
diff --git a/sysutils/rsyncmanager/Makefile b/sysutils/rsyncmanager/Makefile
index 9a97cfc36e90..5ddca64ed364 100644
--- a/sysutils/rsyncmanager/Makefile
+++ b/sysutils/rsyncmanager/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Flexible rsync resource manager daemon written in ruby
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USE_RUBY=	yes
 
diff --git a/sysutils/rsyncrypto/Makefile b/sysutils/rsyncrypto/Makefile
index 84ae85af6c31..a961bb2a173f 100644
--- a/sysutils/rsyncrypto/Makefile
+++ b/sysutils/rsyncrypto/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Rsync Friendly File Encryption
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libargtable2.so:${PORTSDIR}/devel/argtable
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
-		gzip:${PORTSDIR}/archivers/gzip
+BUILD_DEPENDS=	${LOCALBASE}/lib/libargtable2.so:devel/argtable
+RUN_DEPENDS=	rsync:net/rsync \
+		gzip:archivers/gzip
 
 LDFLAGS+=	-L${LOCALBASE}/lib/
 CPPFLAGS+=	-I${LOCALBASE}/include/
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index a614c39f4f50..8cdd1f6c5706 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -9,13 +9,13 @@ MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Syslogd supporting SQL, TCP, and TLS
 
-BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt \
-		rst2man:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS=	libgcrypt-config:security/libgcrypt \
+		rst2man:textproc/py-docutils
 
-LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
-		libestr.so:${PORTSDIR}/devel/libestr \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		liblogging-stdlog.so:${PORTSDIR}/devel/liblogging
+LIB_DEPENDS=	libee.so:devel/libee \
+		libestr.so:devel/libestr \
+		libjson-c.so:devel/json-c \
+		liblogging-stdlog.so:devel/liblogging
 
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
@@ -41,7 +41,7 @@ USES=		alias libtool pkgconfig
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBI}
-LIB_DEPENDS+=	libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=	libdbi.so:databases/libdbi
 CONFIGURE_ARGS+=--enable-libdbi
 PLIST_FILES+=	lib/rsyslog/omlibdbi.so
 .else
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=--disable-libdbi
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 PLIST_FILES+=	lib/rsyslog/lmnsd_gtls.so
 .else
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=--disable-pgsql
 .endif
 
 .if ${PORT_OPTIONS:MRELP}
-LIB_DEPENDS+=	librelp.so:${PORTSDIR}/devel/librelp
+LIB_DEPENDS+=	librelp.so:devel/librelp
 CONFIGURE_ARGS+=--enable-relp
 PLIST_FILES+=	lib/rsyslog/imrelp.so \
 		lib/rsyslog/omrelp.so
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+=--disable-relp
 .endif
 
 .if ${PORT_OPTIONS:MRFC3195}
-LIB_DEPENDS+=	liblogging.so:${PORTSDIR}/devel/liblogging
+LIB_DEPENDS+=	liblogging.so:devel/liblogging
 CONFIGURE_ARGS+=--enable-rfc3195
 PLIST_FILES+=	lib/rsyslog/im3195.so
 .else
@@ -99,7 +99,7 @@ CONFIGURE_ARGS+=--disable-rfc3195
 .endif
 
 .if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 CONFIGURE_ARGS+=--enable-snmp
 PLIST_FILES+=	lib/rsyslog/omsnmp.so
 .else
@@ -107,7 +107,7 @@ CONFIGURE_ARGS+=--disable-snmp
 .endif
 
 .if ${PORT_OPTIONS:MUUID}
-LIB_DEPENDS+=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
 .else
 CONFIGURE_ARGS+=--disable-uuid
 .endif
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index d46b68b78b41..95dd8dee8518 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -9,14 +9,14 @@ MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 MAINTAINER=	brd@FreeBSD.org
 COMMENT=	Syslogd supporting SQL, TCP, and TLS
 
-BUILD_DEPENDS=	libgcrypt-config:${PORTSDIR}/security/libgcrypt \
-		rst2man:${PORTSDIR}/textproc/py-docutils
+BUILD_DEPENDS=	libgcrypt-config:security/libgcrypt \
+		rst2man:textproc/py-docutils
 
-LIB_DEPENDS=	libee.so:${PORTSDIR}/devel/libee \
-		libestr.so:${PORTSDIR}/devel/libestr \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libee.so:devel/libee \
+		libestr.so:devel/libestr \
+		libjson-c.so:devel/json-c \
+		liblogging-stdlog.so:devel/liblogging \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 USE_LDCONFIG=	yes
 
@@ -37,12 +37,12 @@ NORMALIZE_DESC=	Message normalization module for rsyslog
 
 USES=		libtool pkgconfig autoreconf
 
-DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_ENABLE=	libdbi
 DBI_PLIST_FILES=	lib/rsyslog/omlibdbi.so
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-			libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_ENABLE=gnutls
 GNUTLS_PLIST_FILES=	lib/rsyslog/lmnsd_gtls.so
 
@@ -59,16 +59,16 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	pgsql
 PGSQL_PLIST_FILES=	lib/rsyslog/ompgsql.so
 
-RELP_LIB_DEPENDS=	librelp.so:${PORTSDIR}/devel/librelp
+RELP_LIB_DEPENDS=	librelp.so:devel/librelp
 RELP_CONFIGURE_ENABLE=	relp
 RELP_PLIST_FILES=	lib/rsyslog/imrelp.so \
 			lib/rsyslog/omrelp.so
 
-SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_PLIST_FILES=	lib/rsyslog/omsnmp.so
 
-NORMALIZE_LIB_DEPENDS=	liblognorm.so:${PORTSDIR}/devel/liblognorm
+NORMALIZE_LIB_DEPENDS=	liblognorm.so:devel/liblognorm
 NORMALIZE_CONFIGURE_ENABLE=	mmnormalize
 NORMALIZE_PLIST_FILES=	lib/rsyslog/mmnormalize.so
 
diff --git a/sysutils/rubygem-backup/Makefile b/sysutils/rubygem-backup/Makefile
index 904a2cf15080..ef1437002df8 100644
--- a/sysutils/rubygem-backup/Makefile
+++ b/sysutils/rubygem-backup/Makefile
@@ -12,67 +12,67 @@ COMMENT=	Perform backup operations on remote and local environment
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-CFPropertyList>=2.3.1:${PORTSDIR}/devel/rubygem-CFPropertyList \
-		rubygem-addressable>=2.3.5:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-atomic>=1.1.14:${PORTSDIR}/devel/rubygem-atomic \
-		rubygem-aws-ses>=0.5.0:${PORTSDIR}/net/rubygem-aws-ses \
-		rubygem-buftok>=0.2.0:${PORTSDIR}/devel/rubygem-buftok \
-		rubygem-builder32>=3.2.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-descendants_tracker>=0.0.3:${PORTSDIR}/devel/rubygem-descendants_tracker \
-		rubygem-dogapi>=1.11.0:${PORTSDIR}/net/rubygem-dogapi \
-		rubygem-dropbox-sdk>=1.5.1:${PORTSDIR}/net/rubygem-dropbox-sdk \
-		rubygem-equalizer>=0.0.9:${PORTSDIR}/devel/rubygem-equalizer \
-		rubygem-excon>=0.44.4:${PORTSDIR}/devel/rubygem-excon \
-		rubygem-faraday>=0.8.8:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-fission>=0.5.0:${PORTSDIR}/emulators/rubygem-fission \
-		rubygem-flowdock>=0.4.0:${PORTSDIR}/www/rubygem-flowdock \
-		rubygem-fog>=1.28.0:${PORTSDIR}/devel/rubygem-fog \
-		rubygem-fog-atmos>=0.1.0:${PORTSDIR}/net/rubygem-fog-atmos \
-		rubygem-fog-aws>=0.1.1:${PORTSDIR}/net/rubygem-fog-aws \
-		rubygem-fog-brightbox>=0.7.1:${PORTSDIR}/net/rubygem-fog-brightbox \
-		rubygem-fog-core>=1.29.0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-fog-ecloud>=0.0.2:${PORTSDIR}/net/rubygem-fog-ecloud \
-		rubygem-fog-json>=1.0.0:${PORTSDIR}/devel/rubygem-fog-json \
-		rubygem-fog-profitbricks>=0.0.2:${PORTSDIR}/net/rubygem-fog-profitbricks \
-		rubygem-fog-radosgw>=0.0.3:${PORTSDIR}/net/rubygem-fog-radosgw \
-		rubygem-fog-riakcs>=0.1.0:${PORTSDIR}/net/rubygem-fog-riakcs \
-		rubygem-fog-sakuracloud>=1.0.0:${PORTSDIR}/net/rubygem-fog-sakuracloud \
-		rubygem-fog-serverlove>=0.1.1:${PORTSDIR}/net/rubygem-fog-serverlove \
-		rubygem-fog-softlayer>=0.4.1:${PORTSDIR}/net/rubygem-fog-softlayer \
-		rubygem-fog-storm_on_demand>=0.1.0:${PORTSDIR}/net/rubygem-fog-storm_on_demand \
-		rubygem-fog-terremark>=0.0.4:${PORTSDIR}/net/rubygem-fog-terremark \
-		rubygem-fog-vmfusion>=0.0.1:${PORTSDIR}/net/rubygem-fog-vmfusion \
-		rubygem-fog-voxel>=0.0.2:${PORTSDIR}/net/rubygem-fog-voxel \
-		rubygem-fog-xml>=0.1.1:${PORTSDIR}/textproc/rubygem-fog-xml \
-		rubygem-formatador>=0.2.5:${PORTSDIR}/devel/rubygem-formatador \
-		rubygem-hipchat>=1.0.1:${PORTSDIR}/net-im/rubygem-hipchat \
-		rubygem-http>=0.5.0:${PORTSDIR}/www/rubygem-http \
-		rubygem-http_parser.rb>=0.6.0:${PORTSDIR}/net/rubygem-http_parser.rb \
-		rubygem-httparty>=0.12.0:${PORTSDIR}/www/rubygem-httparty \
-		rubygem-inflecto>=0.0.2:${PORTSDIR}/devel/rubygem-inflecto \
-		rubygem-ipaddress>=0.8.0:${PORTSDIR}/net/rubygem-ipaddress \
-		rubygem-json>=1.8.2:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mail25>=2.5.4:${PORTSDIR}/mail/rubygem-mail25 \
-		rubygem-memoizable>=0.4.0:${PORTSDIR}/devel/rubygem-memoizable \
-		rubygem-mime-types1>=1.25.1:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-multi_json>=1.10.1:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-multi_xml>=0.5.5:${PORTSDIR}/textproc/rubygem-multi_xml \
-		rubygem-multipart-post>=1.2.0:${PORTSDIR}/www/rubygem-multipart-post \
-		rubygem-net-scp>=1.2.1:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-sftp>=2.1.2:${PORTSDIR}/security/rubygem-net-sftp \
-		rubygem-net-ssh>=2.9.2:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-nokogiri>=1.6.6.2:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-open4>=1.3.0:${PORTSDIR}/devel/rubygem-open4 \
-		rubygem-pagerduty>=2.0.0:${PORTSDIR}/www/rubygem-pagerduty \
-		rubygem-polyglot>=0.3.3:${PORTSDIR}/devel/rubygem-polyglot \
-		rubygem-simple_oauth>=0.2.0:${PORTSDIR}/net/rubygem-simple_oauth \
-		rubygem-thor>=0.18.1:${PORTSDIR}/devel/rubygem-thor \
-		rubygem-thread_safe1>=0.1.3:${PORTSDIR}/devel/rubygem-thread_safe1 \
-		rubygem-treetop>=1.4.15:${PORTSDIR}/devel/rubygem-treetop \
-		rubygem-twitter>=5.5.0:${PORTSDIR}/net/rubygem-twitter \
-		rubygem-unf>=0.1.3:${PORTSDIR}/textproc/rubygem-unf \
-		rubygem-unf_ext>=0.0.6:${PORTSDIR}/textproc/rubygem-unf_ext \
-		rubygem-xml-simple>=1.1.4:${PORTSDIR}/textproc/rubygem-xml-simple
+RUN_DEPENDS=	rubygem-CFPropertyList>=2.3.1:devel/rubygem-CFPropertyList \
+		rubygem-addressable>=2.3.5:www/rubygem-addressable \
+		rubygem-atomic>=1.1.14:devel/rubygem-atomic \
+		rubygem-aws-ses>=0.5.0:net/rubygem-aws-ses \
+		rubygem-buftok>=0.2.0:devel/rubygem-buftok \
+		rubygem-builder32>=3.2.2:devel/rubygem-builder32 \
+		rubygem-descendants_tracker>=0.0.3:devel/rubygem-descendants_tracker \
+		rubygem-dogapi>=1.11.0:net/rubygem-dogapi \
+		rubygem-dropbox-sdk>=1.5.1:net/rubygem-dropbox-sdk \
+		rubygem-equalizer>=0.0.9:devel/rubygem-equalizer \
+		rubygem-excon>=0.44.4:devel/rubygem-excon \
+		rubygem-faraday>=0.8.8:www/rubygem-faraday \
+		rubygem-fission>=0.5.0:emulators/rubygem-fission \
+		rubygem-flowdock>=0.4.0:www/rubygem-flowdock \
+		rubygem-fog>=1.28.0:devel/rubygem-fog \
+		rubygem-fog-atmos>=0.1.0:net/rubygem-fog-atmos \
+		rubygem-fog-aws>=0.1.1:net/rubygem-fog-aws \
+		rubygem-fog-brightbox>=0.7.1:net/rubygem-fog-brightbox \
+		rubygem-fog-core>=1.29.0:devel/rubygem-fog-core \
+		rubygem-fog-ecloud>=0.0.2:net/rubygem-fog-ecloud \
+		rubygem-fog-json>=1.0.0:devel/rubygem-fog-json \
+		rubygem-fog-profitbricks>=0.0.2:net/rubygem-fog-profitbricks \
+		rubygem-fog-radosgw>=0.0.3:net/rubygem-fog-radosgw \
+		rubygem-fog-riakcs>=0.1.0:net/rubygem-fog-riakcs \
+		rubygem-fog-sakuracloud>=1.0.0:net/rubygem-fog-sakuracloud \
+		rubygem-fog-serverlove>=0.1.1:net/rubygem-fog-serverlove \
+		rubygem-fog-softlayer>=0.4.1:net/rubygem-fog-softlayer \
+		rubygem-fog-storm_on_demand>=0.1.0:net/rubygem-fog-storm_on_demand \
+		rubygem-fog-terremark>=0.0.4:net/rubygem-fog-terremark \
+		rubygem-fog-vmfusion>=0.0.1:net/rubygem-fog-vmfusion \
+		rubygem-fog-voxel>=0.0.2:net/rubygem-fog-voxel \
+		rubygem-fog-xml>=0.1.1:textproc/rubygem-fog-xml \
+		rubygem-formatador>=0.2.5:devel/rubygem-formatador \
+		rubygem-hipchat>=1.0.1:net-im/rubygem-hipchat \
+		rubygem-http>=0.5.0:www/rubygem-http \
+		rubygem-http_parser.rb>=0.6.0:net/rubygem-http_parser.rb \
+		rubygem-httparty>=0.12.0:www/rubygem-httparty \
+		rubygem-inflecto>=0.0.2:devel/rubygem-inflecto \
+		rubygem-ipaddress>=0.8.0:net/rubygem-ipaddress \
+		rubygem-json>=1.8.2:devel/rubygem-json \
+		rubygem-mail25>=2.5.4:mail/rubygem-mail25 \
+		rubygem-memoizable>=0.4.0:devel/rubygem-memoizable \
+		rubygem-mime-types1>=1.25.1:misc/rubygem-mime-types1 \
+		rubygem-multi_json>=1.10.1:devel/rubygem-multi_json \
+		rubygem-multi_xml>=0.5.5:textproc/rubygem-multi_xml \
+		rubygem-multipart-post>=1.2.0:www/rubygem-multipart-post \
+		rubygem-net-scp>=1.2.1:security/rubygem-net-scp \
+		rubygem-net-sftp>=2.1.2:security/rubygem-net-sftp \
+		rubygem-net-ssh>=2.9.2:security/rubygem-net-ssh \
+		rubygem-nokogiri>=1.6.6.2:textproc/rubygem-nokogiri \
+		rubygem-open4>=1.3.0:devel/rubygem-open4 \
+		rubygem-pagerduty>=2.0.0:www/rubygem-pagerduty \
+		rubygem-polyglot>=0.3.3:devel/rubygem-polyglot \
+		rubygem-simple_oauth>=0.2.0:net/rubygem-simple_oauth \
+		rubygem-thor>=0.18.1:devel/rubygem-thor \
+		rubygem-thread_safe1>=0.1.3:devel/rubygem-thread_safe1 \
+		rubygem-treetop>=1.4.15:devel/rubygem-treetop \
+		rubygem-twitter>=5.5.0:net/rubygem-twitter \
+		rubygem-unf>=0.1.3:textproc/rubygem-unf \
+		rubygem-unf_ext>=0.0.6:textproc/rubygem-unf_ext \
+		rubygem-xml-simple>=1.1.4:textproc/rubygem-xml-simple
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-bosh-gen/Makefile b/sysutils/rubygem-bosh-gen/Makefile
index 8bf548f650f3..e699558f1995 100644
--- a/sysutils/rubygem-bosh-gen/Makefile
+++ b/sysutils/rubygem-bosh-gen/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Generators for creating BOSH releases
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-bosh_cli>=0:${PORTSDIR}/sysutils/rubygem-bosh_cli \
-		rubygem-bosh-template>=0:${PORTSDIR}/devel/rubygem-bosh-template \
-		rubygem-cyoi>=0.10:${PORTSDIR}/devel/rubygem-cyoi \
-		rubygem-fog>=1.11:${PORTSDIR}/devel/rubygem-fog \
-		rubygem-fog-aws>=0.7.6:${PORTSDIR}/net/rubygem-fog-aws \
-		rubygem-progressbar>=0:${PORTSDIR}/devel/rubygem-progressbar \
-		rubygem-readwritesettings>=3.0:${PORTSDIR}/devel/rubygem-readwritesettings \
-		rubygem-thor>=0:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
+		rubygem-bosh_cli>=0:sysutils/rubygem-bosh_cli \
+		rubygem-bosh-template>=0:devel/rubygem-bosh-template \
+		rubygem-cyoi>=0.10:devel/rubygem-cyoi \
+		rubygem-fog>=1.11:devel/rubygem-fog \
+		rubygem-fog-aws>=0.7.6:net/rubygem-fog-aws \
+		rubygem-progressbar>=0:devel/rubygem-progressbar \
+		rubygem-readwritesettings>=3.0:devel/rubygem-readwritesettings \
+		rubygem-thor>=0:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-bundler_ext/Makefile b/sysutils/rubygem-bundler_ext/Makefile
index 7e9bc473fe09..338a1bc0f1f2 100644
--- a/sysutils/rubygem-bundler_ext/Makefile
+++ b/sysutils/rubygem-bundler_ext/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Loads gems installed on the system using Bundler Gemfile DSL
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-bundler>=0:${PORTSDIR}/sysutils/rubygem-bundler
+RUN_DEPENDS=	rubygem-bundler>=0:sysutils/rubygem-bundler
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-capistrano-ext/Makefile b/sysutils/rubygem-capistrano-ext/Makefile
index b8588a636ed4..2865f7ed7006 100644
--- a/sysutils/rubygem-capistrano-ext/Makefile
+++ b/sysutils/rubygem-capistrano-ext/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Useful task libraries and methods for Capistrano
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-capistrano>=1.0.0:${PORTSDIR}/sysutils/rubygem-capistrano
+RUN_DEPENDS=	rubygem-capistrano>=1.0.0:sysutils/rubygem-capistrano
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index 3942cdf4826a..7135fad2f201 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Utility for executing commands in parallel on multiple machines
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-i18n>=0:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-rake>=10:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-sshkit>=1.3:${PORTSDIR}/security/rubygem-sshkit
+RUN_DEPENDS=	rubygem-i18n>=0:devel/rubygem-i18n \
+		rubygem-rake>=10:devel/rubygem-rake \
+		rubygem-sshkit>=1.3:security/rubygem-sshkit
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-chef-api/Makefile b/sysutils/rubygem-chef-api/Makefile
index 872290bc81e5..dcdad574c37b 100644
--- a/sysutils/rubygem-chef-api/Makefile
+++ b/sysutils/rubygem-chef-api/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Leightweight Chef API client
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-logify>=0.1:${PORTSDIR}/sysutils/rubygem-logify
+RUN_DEPENDS=	rubygem-logify>=0.1:sysutils/rubygem-logify
 
 NO_ARCH=	yes
 
diff --git a/sysutils/rubygem-chef-zero/Makefile b/sysutils/rubygem-chef-zero/Makefile
index 1dbf72731920..571b090eace5 100644
--- a/sysutils/rubygem-chef-zero/Makefile
+++ b/sysutils/rubygem-chef-zero/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Self-contained, easy-setup, fast-start in-memory Chef server
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-hashie2>=2.0.0:${PORTSDIR}/devel/rubygem-hashie2 \
-		rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mixlib-log>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-log \
-		rubygem-rack>=0.0.0:${PORTSDIR}/www/rubygem-rack
+RUN_DEPENDS=	rubygem-hashie2>=2.0.0:devel/rubygem-hashie2 \
+		rubygem-json>=1.8.1:devel/rubygem-json \
+		rubygem-mixlib-log>=1.3.0:devel/rubygem-mixlib-log \
+		rubygem-rack>=0.0.0:www/rubygem-rack
 
 NO_ARCH=	yes
 
diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 237063539715..89ee76ce53e1 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Systems integration framework. Client part
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-chef-zero>=2.1.0:${PORTSDIR}/sysutils/rubygem-chef-zero \
-		rubygem-diff-lcs>=0.0.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
-		rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-ffi-yajl>=1.0.1:${PORTSDIR}/devel/rubygem-ffi-yajl \
-		rubygem-highline>=1.6.9:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-mime-types1>=1.16:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-mixlib-authentication>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \
-		rubygem-mixlib-cli>=1.4.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
-		rubygem-mixlib-config>=2.1.0:${PORTSDIR}/devel/rubygem-mixlib-config \
-		rubygem-mixlib-log>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-log \
-		rubygem-mixlib-shellout>=1.4.0:${PORTSDIR}/devel/rubygem-mixlib-shellout \
-		rubygem-net-ssh>=2.6:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-net-ssh-multi>=1.1.0:${PORTSDIR}/security/rubygem-net-ssh-multi \
-		rubygem-ohai>=7.2.0:${PORTSDIR}/sysutils/rubygem-ohai \
-		rubygem-plist>=3.1.0:${PORTSDIR}/devel/rubygem-plist \
-		rubygem-pry>=0.9.0:${PORTSDIR}/devel/rubygem-pry \
-		rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client
+RUN_DEPENDS=	rubygem-chef-zero>=2.1.0:sysutils/rubygem-chef-zero \
+		rubygem-diff-lcs>=0.0.0:textproc/rubygem-diff-lcs \
+		rubygem-erubis>=0:www/rubygem-erubis \
+		rubygem-ffi-yajl>=1.0.1:devel/rubygem-ffi-yajl \
+		rubygem-highline>=1.6.9:devel/rubygem-highline \
+		rubygem-mime-types1>=1.16:misc/rubygem-mime-types1 \
+		rubygem-mixlib-authentication>=1.3.0:devel/rubygem-mixlib-authentication \
+		rubygem-mixlib-cli>=1.4.0:devel/rubygem-mixlib-cli \
+		rubygem-mixlib-config>=2.1.0:devel/rubygem-mixlib-config \
+		rubygem-mixlib-log>=1.3.0:devel/rubygem-mixlib-log \
+		rubygem-mixlib-shellout>=1.4.0:devel/rubygem-mixlib-shellout \
+		rubygem-net-ssh>=2.6:security/rubygem-net-ssh \
+		rubygem-net-ssh-multi>=1.1.0:security/rubygem-net-ssh-multi \
+		rubygem-ohai>=7.2.0:sysutils/rubygem-ohai \
+		rubygem-plist>=3.1.0:devel/rubygem-plist \
+		rubygem-pry>=0.9.0:devel/rubygem-pry \
+		rubygem-rest-client>=1.0.4:www/rubygem-rest-client
 
 NO_ARCH=		yes
 USE_RUBY=		yes
diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index eb9fd3e306f1..311d194fe627 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -28,7 +28,7 @@ OPTIONS_DEFAULT=	ZFS_FACTS
 
 # Restrict dmidecode dependency to Intel based systems
 .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
-RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+RUN_DEPENDS+=	dmidecode:sysutils/dmidecode
 .endif
 
 post-patch-ZFS_FACTS-off:
diff --git a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
index 0201f24624a9..d7d69b91290e 100644
--- a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
+++ b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Fluentd plugin to include format values into json, tsv or csv
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	rubygem-fluentd>0:${PORTSDIR}/sysutils/rubygem-fluentd \
-	rubygem-ltsv>0:${PORTSDIR}/textproc/rubygem-ltsv
+	rubygem-fluentd>0:sysutils/rubygem-fluentd \
+	rubygem-ltsv>0:textproc/rubygem-ltsv
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-fluent-plugin-config-expander/Makefile b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
index 376c9cd65b13..1c4d13a4fe01 100644
--- a/sysutils/rubygem-fluent-plugin-config-expander/Makefile
+++ b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Fluent plugin which provides directives for loop extraction
 
 RUN_DEPENDS=	\
-	rubygem-fluentd>0:${PORTSDIR}/sysutils/rubygem-fluentd
+	rubygem-fluentd>0:sysutils/rubygem-fluentd
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
index ff91906d31c1..756b35ddc2d4 100644
--- a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
+++ b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
@@ -9,8 +9,8 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Gems for fluent plugin of alternative implementation of out_file
 
 RUN_DEPENDS=	\
-	rubygem-fluentd>0:${PORTSDIR}/sysutils/rubygem-fluentd \
-	rubygem-fluent-mixin-plaintextformatter>0:${PORTSDIR}/sysutils/rubygem-fluent-mixin-plaintextformatter
+	rubygem-fluentd>0:sysutils/rubygem-fluentd \
+	rubygem-fluent-mixin-plaintextformatter>0:sysutils/rubygem-fluent-mixin-plaintextformatter
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
index b171862b53fd..a5e97c41b994 100644
--- a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
+++ b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Gems for fluent plugin to read whole line into single key
 
 RUN_DEPENDS=	\
-	rubygem-fluentd>0:${PORTSDIR}/sysutils/rubygem-fluentd
+	rubygem-fluentd>0:sysutils/rubygem-fluentd
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index bafe8bbfadad..4e159834f294 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Fluent event collector
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	rubygem-msgpack>=0.5.11:${PORTSDIR}/devel/rubygem-msgpack \
-	rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \
-	rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby \
-	rubygem-cool.io>=1.2.2:${PORTSDIR}/devel/rubygem-cool.io \
-	rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
-	rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \
-	rubygem-tzinfo>=1.0.0:${PORTSDIR}/devel/rubygem-tzinfo
+	rubygem-msgpack>=0.5.11:devel/rubygem-msgpack \
+	rubygem-json>=1.4.3:devel/rubygem-json \
+	rubygem-yajl-ruby>=1.0:devel/rubygem-yajl-ruby \
+	rubygem-cool.io>=1.2.2:devel/rubygem-cool.io \
+	rubygem-http_parser.rb>=0.5.1:net/rubygem-http_parser.rb \
+	rubygem-sigdump>=0.2.2:devel/rubygem-sigdump \
+	rubygem-tzinfo>=1.0.0:devel/rubygem-tzinfo
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
@@ -35,7 +35,7 @@ NO_LATEST_LINK=	YES
 .include <bsd.port.pre.mk>
 
 .if ${RUBY_VER} == 2.0
-RUN_DEPENDS+=	rubygem-string-scrub>=0.0.3:${PORTSDIR}/textproc/rubygem-string-scrub
+RUN_DEPENDS+=	rubygem-string-scrub>=0.0.3:textproc/rubygem-string-scrub
 .endif
 
 post-install:
diff --git a/sysutils/rubygem-fluentd010/Makefile b/sysutils/rubygem-fluentd010/Makefile
index d1aa9f9fcd38..165badcc1e73 100644
--- a/sysutils/rubygem-fluentd010/Makefile
+++ b/sysutils/rubygem-fluentd010/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Fluent event collector
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
-	rubygem-cool.io>=1.1.1:${PORTSDIR}/devel/rubygem-cool.io \
-	rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb \
-	rubygem-json>=1.4.3:${PORTSDIR}/devel/rubygem-json \
-	rubygem-msgpack>=0.5.4:${PORTSDIR}/devel/rubygem-msgpack \
-	rubygem-sigdump>=0.2.2:${PORTSDIR}/devel/rubygem-sigdump \
-	rubygem-yajl-ruby>=1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+	rubygem-cool.io>=1.1.1:devel/rubygem-cool.io \
+	rubygem-http_parser.rb>=0.5.1:net/rubygem-http_parser.rb \
+	rubygem-json>=1.4.3:devel/rubygem-json \
+	rubygem-msgpack>=0.5.4:devel/rubygem-msgpack \
+	rubygem-sigdump>=0.2.2:devel/rubygem-sigdump \
+	rubygem-yajl-ruby>=1.0:devel/rubygem-yajl-ruby
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-guard-livereload/Makefile b/sysutils/rubygem-guard-livereload/Makefile
index 562975a3fdb8..c5abd3cf80b8 100644
--- a/sysutils/rubygem-guard-livereload/Makefile
+++ b/sysutils/rubygem-guard-livereload/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Automatically reloads your browser when 'view' files are modified
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-em-websocket>=0.5:${PORTSDIR}/www/rubygem-em-websocket \
-		rubygem-guard>=2.8:${PORTSDIR}/sysutils/rubygem-guard \
-		rubygem-guard-compat>=1.0:${PORTSDIR}/sysutils/rubygem-guard-compat \
-		rubygem-multi_json>=1.8:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-em-websocket>=0.5:www/rubygem-em-websocket \
+		rubygem-guard>=2.8:sysutils/rubygem-guard \
+		rubygem-guard-compat>=1.0:sysutils/rubygem-guard-compat \
+		rubygem-multi_json>=1.8:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-guard-minitest/Makefile b/sysutils/rubygem-guard-minitest/Makefile
index 73231ce006f1..e40714ed5e4e 100644
--- a/sysutils/rubygem-guard-minitest/Makefile
+++ b/sysutils/rubygem-guard-minitest/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Automatically run your tests with Minitest framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-guard-compat>=1.2:${PORTSDIR}/sysutils/rubygem-guard-compat \
-		rubygem-minitest>=3:${PORTSDIR}/devel/rubygem-minitest
+RUN_DEPENDS=	rubygem-guard-compat>=1.2:sysutils/rubygem-guard-compat \
+		rubygem-minitest>=3:devel/rubygem-minitest
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-guard-rspec/Makefile b/sysutils/rubygem-guard-rspec/Makefile
index a3f5c537a7b8..82ef4678db16 100644
--- a/sysutils/rubygem-guard-rspec/Makefile
+++ b/sysutils/rubygem-guard-rspec/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Guard::RSpec automatically run your specs (much like autotest)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-guard>=2.1:${PORTSDIR}/sysutils/rubygem-guard \
-		rubygem-guard-compat>=1.1:${PORTSDIR}/sysutils/rubygem-guard-compat \
-		rubygem-rspec>=2.99.0:${PORTSDIR}/devel/rubygem-rspec
+RUN_DEPENDS=	rubygem-guard>=2.1:sysutils/rubygem-guard \
+		rubygem-guard-compat>=1.1:sysutils/rubygem-guard-compat \
+		rubygem-rspec>=2.99.0:devel/rubygem-rspec
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-guard/Makefile b/sysutils/rubygem-guard/Makefile
index 76b9206af987..15dfadbf8632 100644
--- a/sysutils/rubygem-guard/Makefile
+++ b/sysutils/rubygem-guard/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Command line tool to easily handle events on file system modifications
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-formatador>=0.2.4:${PORTSDIR}/devel/rubygem-formatador \
-		rubygem-listen>=2.7:${PORTSDIR}/devel/rubygem-listen \
-		rubygem-lumberjack>=1.0:${PORTSDIR}/devel/rubygem-lumberjack \
-		rubygem-nenv>=0.1:${PORTSDIR}/devel/rubygem-nenv \
-		rubygem-notiffany>=0:${PORTSDIR}/devel/rubygem-notiffany \
-		rubygem-pry>=0.9.12:${PORTSDIR}/devel/rubygem-pry \
-		rubygem-shellany>=0:${PORTSDIR}/sysutils/rubygem-shellany \
-		rubygem-thor>=0.18.1:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-formatador>=0.2.4:devel/rubygem-formatador \
+		rubygem-listen>=2.7:devel/rubygem-listen \
+		rubygem-lumberjack>=1.0:devel/rubygem-lumberjack \
+		rubygem-nenv>=0.1:devel/rubygem-nenv \
+		rubygem-notiffany>=0:devel/rubygem-notiffany \
+		rubygem-pry>=0.9.12:devel/rubygem-pry \
+		rubygem-shellany>=0:sysutils/rubygem-shellany \
+		rubygem-thor>=0.18.1:devel/rubygem-thor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-hammer_cli/Makefile b/sysutils/rubygem-hammer_cli/Makefile
index 864fd5b9b1bc..e3115eccb7e2 100644
--- a/sysutils/rubygem-hammer_cli/Makefile
+++ b/sysutils/rubygem-hammer_cli/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Provides CLI interfaces for Ruby apps
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.14:${PORTSDIR}/devel/rubygem-apipie-bindings \
-		rubygem-awesome_print>=0:${PORTSDIR}/devel/rubygem-awesome_print \
-		rubygem-clamp>=1.0.0:${PORTSDIR}/devel/rubygem-clamp \
-		rubygem-fast_gettext>=0:${PORTSDIR}/devel/rubygem-fast_gettext \
-		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \
-		rubygem-locale>=2.0.6:${PORTSDIR}/devel/rubygem-locale \
-		rubygem-logging>=0:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-table_print>=0:${PORTSDIR}/devel/rubygem-table_print
+RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.14:devel/rubygem-apipie-bindings \
+		rubygem-awesome_print>=0:devel/rubygem-awesome_print \
+		rubygem-clamp>=1.0.0:devel/rubygem-clamp \
+		rubygem-fast_gettext>=0:devel/rubygem-fast_gettext \
+		rubygem-highline>=0:devel/rubygem-highline \
+		rubygem-locale>=2.0.6:devel/rubygem-locale \
+		rubygem-logging>=0:devel/rubygem-logging \
+		rubygem-table_print>=0:devel/rubygem-table_print
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-hammer_cli_foreman/Makefile b/sysutils/rubygem-hammer_cli_foreman/Makefile
index 72f827096ce8..d484e24a2496 100644
--- a/sysutils/rubygem-hammer_cli_foreman/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Foreman commands for Hammer CLI
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.16:${PORTSDIR}/devel/rubygem-apipie-bindings \
-		rubygem-hammer_cli>=0.6.0:${PORTSDIR}/sysutils/rubygem-hammer_cli
+RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.16:devel/rubygem-apipie-bindings \
+		rubygem-hammer_cli>=0.6.0:sysutils/rubygem-hammer_cli
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile b/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
index fc5b3e508422..57fc38a2c944 100644
--- a/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Foreman bootdisk commands for Hammer CLI
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rubygem-hammer_cli_foreman>=0.1.2:${PORTSDIR}/sysutils/rubygem-hammer_cli_foreman
+RUN_DEPENDS=	rubygem-hammer_cli_foreman>=0.1.2:sysutils/rubygem-hammer_cli_foreman
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-hammer_cli_foreman_salt/Makefile b/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
index 647c90ccbdb6..873eef35dc17 100644
--- a/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	SaltStack integration commands for Hammer CLI
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rubygem-hammer_cli_foreman>=0.1.2:${PORTSDIR}/sysutils/rubygem-hammer_cli_foreman
+RUN_DEPENDS=	rubygem-hammer_cli_foreman>=0.1.2:sysutils/rubygem-hammer_cli_foreman
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile b/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
index 758034693db9..5c9e7edc0be0 100644
--- a/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
@@ -12,9 +12,9 @@ COMMENT=	SSH host commands for Hammer CLI
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	rubygem-hammer_cli>=0.0.6:${PORTSDIR}/sysutils/rubygem-hammer_cli \
-		rubygem-hammer_cli_foreman>=0:${PORTSDIR}/sysutils/rubygem-hammer_cli_foreman \
-		rubygem-net-ssh-multi>=1.2.1:${PORTSDIR}/security/rubygem-net-ssh-multi
+RUN_DEPENDS=	rubygem-hammer_cli>=0.0.6:sysutils/rubygem-hammer_cli \
+		rubygem-hammer_cli_foreman>=0:sysutils/rubygem-hammer_cli_foreman \
+		rubygem-net-ssh-multi>=1.2.1:security/rubygem-net-ssh-multi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-hiera-file/Makefile b/sysutils/rubygem-hiera-file/Makefile
index 9c3965988f52..b3da3c9d8a29 100644
--- a/sysutils/rubygem-hiera-file/Makefile
+++ b/sysutils/rubygem-hiera-file/Makefile
@@ -16,6 +16,6 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
+RUN_DEPENDS=	${PKGNAMEPREFIX}hiera1>=0:sysutils/rubygem-hiera1
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-hiera/Makefile b/sysutils/rubygem-hiera/Makefile
index ac97c491705d..04fb665e96be 100644
--- a/sysutils/rubygem-hiera/Makefile
+++ b/sysutils/rubygem-hiera/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Pluggable data store for hierarchical data
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
+RUN_DEPENDS=	rubygem-json_pure>=0:devel/rubygem-json_pure
 
 CONFLICTS_INSTALL=	rubygem-hiera1-*
 
diff --git a/sysutils/rubygem-hiera1/Makefile b/sysutils/rubygem-hiera1/Makefile
index f1e8cc00cd56..04e90fee91ee 100644
--- a/sysutils/rubygem-hiera1/Makefile
+++ b/sysutils/rubygem-hiera1/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pluggable data store for hierarchical data
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure
+RUN_DEPENDS=	rubygem-json_pure>=0:devel/rubygem-json_pure
 
 CONFLICTS_INSTALL=	rubygem-hiera-*
 
diff --git a/sysutils/rubygem-hieracles/Makefile b/sysutils/rubygem-hieracles/Makefile
index 79ecab492921..2f8c6886340f 100644
--- a/sysutils/rubygem-hieracles/Makefile
+++ b/sysutils/rubygem-hieracles/Makefile
@@ -11,9 +11,9 @@ COMMENT=	CLI tool for Hiera parameters visualisation and analysis
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-deep_merge>=1.0.1:${PORTSDIR}/devel/rubygem-deep_merge \
-		rubygem-awesome_print>=1.6.1:${PORTSDIR}/devel/rubygem-awesome_print \
-		rubygem-httparty>=0.13.7:${PORTSDIR}/www/rubygem-httparty
+RUN_DEPENDS=	rubygem-deep_merge>=1.0.1:devel/rubygem-deep_merge \
+		rubygem-awesome_print>=1.6.1:devel/rubygem-awesome_print \
+		rubygem-httparty>=0.13.7:www/rubygem-httparty
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-librarian-puppet/Makefile b/sysutils/rubygem-librarian-puppet/Makefile
index c806e33ee830..14f7e43bf99f 100644
--- a/sysutils/rubygem-librarian-puppet/Makefile
+++ b/sysutils/rubygem-librarian-puppet/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tool for management and bundling Puppet modules
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}librarianp>=0.6.3:${PORTSDIR}/devel/rubygem-librarianp \
-		${PKGNAMEPREFIX}puppet_forge1>=1.0:${PORTSDIR}/sysutils/rubygem-puppet_forge1 \
-		${PKGNAMEPREFIX}rsync>0:${PORTSDIR}/net/rubygem-rsync
+RUN_DEPENDS=	${PKGNAMEPREFIX}librarianp>=0.6.3:devel/rubygem-librarianp \
+		${PKGNAMEPREFIX}puppet_forge1>=1.0:sysutils/rubygem-puppet_forge1 \
+		${PKGNAMEPREFIX}rsync>0:net/rubygem-rsync
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-mothra/Makefile b/sysutils/rubygem-mothra/Makefile
index 1ee2dfe9d30f..0a8c6eecb2fd 100644
--- a/sysutils/rubygem-mothra/Makefile
+++ b/sysutils/rubygem-mothra/Makefile
@@ -11,9 +11,9 @@ COMMENT=	FreeBSD send-pr command line tool for Bugzilla system
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-colorize>=0.7.3:${PORTSDIR}/devel/rubygem-colorize \
-		rubygem-rodzilla>=0.3.6:${PORTSDIR}/devel/rubygem-rodzilla \
-		rubygem-thor>=0.19.1:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-colorize>=0.7.3:devel/rubygem-colorize \
+		rubygem-rodzilla>=0.3.6:devel/rubygem-rodzilla \
+		rubygem-thor>=0.19.1:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/sysutils/rubygem-ohai/Makefile b/sysutils/rubygem-ohai/Makefile
index 1f76f0fa35e7..32dd1192be4d 100644
--- a/sysutils/rubygem-ohai/Makefile
+++ b/sysutils/rubygem-ohai/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Ohai profiles your system and emits JSON
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-ffi>=1.9.0:${PORTSDIR}/devel/rubygem-ffi \
-		rubygem-ffi-yajl>=1.0.1:${PORTSDIR}/devel/rubygem-ffi-yajl \
-		rubygem-ipaddress>=0:${PORTSDIR}/net/rubygem-ipaddress \
-		rubygem-mime-types1>=1.16:${PORTSDIR}/misc/rubygem-mime-types1 \
-		rubygem-mixlib-cli>=0:${PORTSDIR}/devel/rubygem-mixlib-cli \
-		rubygem-mixlib-config>=0:${PORTSDIR}/devel/rubygem-mixlib-config \
-		rubygem-mixlib-log>=0:${PORTSDIR}/devel/rubygem-mixlib-log \
-		rubygem-mixlib-shellout>=0:${PORTSDIR}/devel/rubygem-mixlib-shellout \
-		rubygem-systemu>=2.6.4:${PORTSDIR}/devel/rubygem-systemu \
-		rubygem-wmi-lite>=1.0.0:${PORTSDIR}/devel/rubygem-wmi-lite
+RUN_DEPENDS=	rubygem-ffi>=1.9.0:devel/rubygem-ffi \
+		rubygem-ffi-yajl>=1.0.1:devel/rubygem-ffi-yajl \
+		rubygem-ipaddress>=0:net/rubygem-ipaddress \
+		rubygem-mime-types1>=1.16:misc/rubygem-mime-types1 \
+		rubygem-mixlib-cli>=0:devel/rubygem-mixlib-cli \
+		rubygem-mixlib-config>=0:devel/rubygem-mixlib-config \
+		rubygem-mixlib-log>=0:devel/rubygem-mixlib-log \
+		rubygem-mixlib-shellout>=0:devel/rubygem-mixlib-shellout \
+		rubygem-systemu>=2.6.4:devel/rubygem-systemu \
+		rubygem-wmi-lite>=1.0.0:devel/rubygem-wmi-lite
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-puppet_forge/Makefile b/sysutils/rubygem-puppet_forge/Makefile
index 818dea9ba93a..2fcbcd8ad3d7 100644
--- a/sysutils/rubygem-puppet_forge/Makefile
+++ b/sysutils/rubygem-puppet_forge/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Ruby client for the Puppet Forge API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-faraday>=0.9.0:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-faraday_middleware>=0.9.0:${PORTSDIR}/www/rubygem-faraday_middleware \
-		rubygem-minitar>=0:${PORTSDIR}/archivers/rubygem-minitar \
-		rubygem-semantic_puppet>=0.1.0:${PORTSDIR}/devel/rubygem-semantic_puppet
+RUN_DEPENDS=	rubygem-faraday>=0.9.0:www/rubygem-faraday \
+		rubygem-faraday_middleware>=0.9.0:www/rubygem-faraday_middleware \
+		rubygem-minitar>=0:archivers/rubygem-minitar \
+		rubygem-semantic_puppet>=0.1.0:devel/rubygem-semantic_puppet
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-puppet_forge1/Makefile b/sysutils/rubygem-puppet_forge1/Makefile
index 32b8cd643a4e..999890bd76da 100644
--- a/sysutils/rubygem-puppet_forge1/Makefile
+++ b/sysutils/rubygem-puppet_forge1/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby client for the Puppet Forge API
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-her>=0.6.8:${PORTSDIR}/databases/rubygem-her
+RUN_DEPENDS=	rubygem-her>=0.6.8:databases/rubygem-her
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index f205dd4d072b..20e262c0823c 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Tool for deploying Puppet environments and modules
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-colored>=1.2:${PORTSDIR}/textproc/rubygem-colored \
-		rubygem-cri>=2.6.1:${PORTSDIR}/devel/rubygem-cri \
-		rubygem-log4r>=1.1.10:${PORTSDIR}/sysutils/rubygem-log4r \
-		rubygem-minitar>=0:${PORTSDIR}/archivers/rubygem-minitar \
-		rubygem-multi_json>=1.10:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-puppet_forge>=2.1.1:${PORTSDIR}/sysutils/rubygem-puppet_forge \
-		rubygem-semantic_puppet>=0.1.0:${PORTSDIR}/devel/rubygem-semantic_puppet
+RUN_DEPENDS=	rubygem-colored>=1.2:textproc/rubygem-colored \
+		rubygem-cri>=2.6.1:devel/rubygem-cri \
+		rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \
+		rubygem-minitar>=0:archivers/rubygem-minitar \
+		rubygem-multi_json>=1.10:devel/rubygem-multi_json \
+		rubygem-puppet_forge>=2.1.1:sysutils/rubygem-puppet_forge \
+		rubygem-semantic_puppet>=0.1.0:devel/rubygem-semantic_puppet
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-rubyipmi/Makefile b/sysutils/rubygem-rubyipmi/Makefile
index bc9e8daaef5b..a1fbbd5495f7 100644
--- a/sysutils/rubygem-rubyipmi/Makefile
+++ b/sysutils/rubygem-rubyipmi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command line wrapper for ipmitool and freeipmi
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/bmc-device:${PORTSDIR}/sysutils/freeipmi
+RUN_DEPENDS=	${LOCALBASE}/sbin/bmc-device:sysutils/freeipmi
 
 NO_ARCH=	yes
 
diff --git a/sysutils/rubygem-smart_proxy_chef/Makefile b/sysutils/rubygem-smart_proxy_chef/Makefile
index 0c905a1a8c73..1a491ae67f59 100644
--- a/sysutils/rubygem-smart_proxy_chef/Makefile
+++ b/sysutils/rubygem-smart_proxy_chef/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Chef Plug-In for Foreman\'s Smart Proxy
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	foreman-proxy>=1.8.0:${PORTSDIR}/net/foreman-proxy \
-		rubygem-chef-api>0:${PORTSDIR}/sysutils/rubygem-chef-api
+RUN_DEPENDS=	foreman-proxy>=1.8.0:net/foreman-proxy \
+		rubygem-chef-api>0:sysutils/rubygem-chef-api
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-smart_proxy_dynflow/Makefile b/sysutils/rubygem-smart_proxy_dynflow/Makefile
index 02e8bb6b8d3d..995566245463 100644
--- a/sysutils/rubygem-smart_proxy_dynflow/Makefile
+++ b/sysutils/rubygem-smart_proxy_dynflow/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Plugin to use Dynflow in Foreman Smart Proxy
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	foreman-proxy>=1.9.0:${PORTSDIR}/net/foreman-proxy \
-		rubygem-dynflow>=0.8.4:${PORTSDIR}/devel/rubygem-dynflow \
-		rubygem-sequel>=0:${PORTSDIR}/devel/rubygem-sequel \
-		rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
+RUN_DEPENDS=	foreman-proxy>=1.9.0:net/foreman-proxy \
+		rubygem-dynflow>=0.8.4:devel/rubygem-dynflow \
+		rubygem-sequel>=0:devel/rubygem-sequel \
+		rubygem-sqlite3>=0:databases/rubygem-sqlite3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile b/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
index a7b6c49b81e6..310b48d13522 100644
--- a/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
+++ b/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
@@ -11,10 +11,10 @@ COMMENT=	SSH remote execution provider for foreman-proxy
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	foreman-proxy>=1.9.0:${PORTSDIR}/net/foreman-proxy \
-		rubygem-net-scp>=0:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-ssh>=0:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-smart_proxy_dynflow>=0.0.3:${PORTSDIR}/sysutils/rubygem-smart_proxy_dynflow
+RUN_DEPENDS=	foreman-proxy>=1.9.0:net/foreman-proxy \
+		rubygem-net-scp>=0:security/rubygem-net-scp \
+		rubygem-net-ssh>=0:security/rubygem-net-ssh \
+		rubygem-smart_proxy_dynflow>=0.0.3:sysutils/rubygem-smart_proxy_dynflow
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile
index 635bbb997d60..6d05b105f7e0 100644
--- a/sysutils/rubygem-smart_proxy_salt/Makefile
+++ b/sysutils/rubygem-smart_proxy_salt/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SaltStack Plug-In for Foreman's Smart Proxy
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	foreman-proxy>=1.8.0:${PORTSDIR}/net/foreman-proxy \
-		${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt
+RUN_DEPENDS=	foreman-proxy>=1.8.0:net/foreman-proxy \
+		${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt
 
 USES=		python
 NO_ARCH=	yes
diff --git a/sysutils/rubygem-sys-admin/Makefile b/sysutils/rubygem-sys-admin/Makefile
index fe7d7e4ac608..38cc5f4d6902 100644
--- a/sysutils/rubygem-sys-admin/Makefile
+++ b/sysutils/rubygem-sys-admin/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Unified, cross platform replacement for the Etc module
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-ffi>=1.1.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.1.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-sys-cpu/Makefile b/sysutils/rubygem-sys-cpu/Makefile
index c0b1e73b5e04..a31e39344a04 100644
--- a/sysutils/rubygem-sys-cpu/Makefile
+++ b/sysutils/rubygem-sys-cpu/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Interface for getting information about the CPU
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-sys-filesystem/Makefile b/sysutils/rubygem-sys-filesystem/Makefile
index 04eeb6c67e69..d75363981657 100644
--- a/sysutils/rubygem-sys-filesystem/Makefile
+++ b/sysutils/rubygem-sys-filesystem/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby interface for getting filesystem information
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-ffi>=0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-sys-proctable/Makefile b/sysutils/rubygem-sys-proctable/Makefile
index 42d61fa5131f..a3b3e24759d4 100644
--- a/sysutils/rubygem-sys-proctable/Makefile
+++ b/sysutils/rubygem-sys-proctable/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby interface for getting process information
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-ffi>=0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 
 GEM_NAME=	${PORTNAME}-${DISTVERSIONFULL}
 NO_ARCH=	yes
diff --git a/sysutils/rubygem-sys-uname/Makefile b/sysutils/rubygem-sys-uname/Makefile
index ba70d54d4d53..3bde604e12c4 100644
--- a/sysutils/rubygem-sys-uname/Makefile
+++ b/sysutils/rubygem-sys-uname/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby interface for getting system information
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-sys-uptime/Makefile b/sysutils/rubygem-sys-uptime/Makefile
index 7a3c3d8b6ed1..d89bff73f25b 100644
--- a/sysutils/rubygem-sys-uptime/Makefile
+++ b/sysutils/rubygem-sys-uptime/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Provides uptime and boot time information
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	rubygem-ffi>=1.0.0:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-winrm-fs/Makefile b/sysutils/rubygem-winrm-fs/Makefile
index 8c56bd860584..ca80f0064c58 100644
--- a/sysutils/rubygem-winrm-fs/Makefile
+++ b/sysutils/rubygem-winrm-fs/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Library for file system operations via WinRM
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-erubis>=2.7:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-logging>=1.6.1:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-rubyzip>=1.1:${PORTSDIR}/archivers/rubygem-rubyzip \
-		rubygem-winrm>=1.3.0:${PORTSDIR}/sysutils/rubygem-winrm
+RUN_DEPENDS=	rubygem-erubis>=2.7:www/rubygem-erubis \
+		rubygem-logging>=1.6.1:devel/rubygem-logging \
+		rubygem-rubyzip>=1.1:archivers/rubygem-rubyzip \
+		rubygem-winrm>=1.3.0:sysutils/rubygem-winrm
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/rubygem-winrm/Makefile b/sysutils/rubygem-winrm/Makefile
index 3ef51ba51cd7..2fd721ac079c 100644
--- a/sysutils/rubygem-winrm/Makefile
+++ b/sysutils/rubygem-winrm/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Library for Windows Remote Management
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-builder32>=2.1.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-gssapi>=1.2:${PORTSDIR}/security/rubygem-gssapi \
-		rubygem-gyoku>=1.0:${PORTSDIR}/devel/rubygem-gyoku \
-		rubygem-httpclient>=2.3.3:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-logging>=1.8.1:${PORTSDIR}/devel/rubygem-logging \
-		rubygem-nokogiri>=1.6.1:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-nori>=2.0:${PORTSDIR}/devel/rubygem-nori \
-		rubygem-rubyntlm>=0.4.0:${PORTSDIR}/net/rubygem-rubyntlm \
-		rubygem-uuidtools>=2.1.4:${PORTSDIR}/devel/rubygem-uuidtools
+RUN_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
+		rubygem-gssapi>=1.2:security/rubygem-gssapi \
+		rubygem-gyoku>=1.0:devel/rubygem-gyoku \
+		rubygem-httpclient>=2.3.3:www/rubygem-httpclient \
+		rubygem-logging>=1.8.1:devel/rubygem-logging \
+		rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri \
+		rubygem-nori>=2.0:devel/rubygem-nori \
+		rubygem-rubyntlm>=0.4.0:net/rubygem-rubyntlm \
+		rubygem-uuidtools>=2.1.4:devel/rubygem-uuidtools
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/sysutils/runwhen/Makefile b/sysutils/runwhen/Makefile
index e32732023eba..13cb76512ca4 100644
--- a/sysutils/runwhen/Makefile
+++ b/sysutils/runwhen/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tools for running commands at particular times
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/skalibs:${PORTSDIR}/devel/skalibs
+BUILD_DEPENDS=	${LOCALBASE}/include/skalibs:devel/skalibs
 
 USES=		tar:bzip2
 
diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile
index c4296f595b54..cbb930ba1a5e 100644
--- a/sysutils/s6/Makefile
+++ b/sysutils/s6/Makefile
@@ -11,9 +11,9 @@ COMMENT=	skarnet.org supervision suite
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	skalibs>=2.3.9.0:${PORTSDIR}/devel/skalibs \
-		execline>=2.1.4.5:${PORTSDIR}/lang/execline
-RUN_DEPENDS=	execlineb:${PORTSDIR}/lang/execline
+BUILD_DEPENDS=	skalibs>=2.3.9.0:devel/skalibs \
+		execline>=2.1.4.5:lang/execline
+RUN_DEPENDS=	execlineb:lang/execline
 
 USES=		gmake
 USE_RC_SUBR=	s6
diff --git a/sysutils/sample/Makefile b/sysutils/sample/Makefile
index d63d771f3280..4fb2c84ee72b 100644
--- a/sysutils/sample/Makefile
+++ b/sysutils/sample/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Examine periodic stack traces of all running processes
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libbfd.a:${PORTSDIR}/devel/libbfd \
-		${LOCALBASE}/lib/libiberty.a:${PORTSDIR}/devel/gnulibiberty \
-		${LOCALBASE}/lib/libxo.a:${PORTSDIR}/devel/libxo \
-		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \
-		${LOCALBASE}/bin/python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	${LOCALBASE}/lib/libbfd.a:devel/libbfd \
+		${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty \
+		${LOCALBASE}/lib/libxo.a:devel/libxo \
+		${LOCALBASE}/bin/cython:lang/cython \
+		${LOCALBASE}/bin/python:lang/python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freenas
diff --git a/sysutils/sbsigntool/Makefile b/sysutils/sbsigntool/Makefile
index 6eaeff2f9499..f4f25dd5b6f1 100644
--- a/sysutils/sbsigntool/Makefile
+++ b/sysutils/sbsigntool/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Signing utility for UEFI secure boot
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgnuefi.a:${PORTSDIR}/devel/gnu-efi \
-		help2man:${PORTSDIR}/misc/help2man
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgnuefi.a:devel/gnu-efi \
+		help2man:misc/help2man
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/sysutils/scalpel/Makefile b/sysutils/scalpel/Makefile
index 39b318b32ba2..60a624f4b7b3 100644
--- a/sysutils/scalpel/Makefile
+++ b/sysutils/scalpel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Frugal, high performance file carver
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libtre.so:textproc/libtre
 
 USES=		alias
 GNU_CONFIGURE=	yes
diff --git a/sysutils/scanmem/Makefile b/sysutils/scanmem/Makefile
index 8bf014fa4315..b1a5d35a4c49 100644
--- a/sysutils/scanmem/Makefile
+++ b/sysutils/scanmem/Makefile
@@ -25,7 +25,7 @@ OPTIONS_SUB=	yes
 
 X11_DESC=	Install PyGTK-based GUI (GameConqueror)
 X11_CATEGORIES=	python
-X11_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2
+X11_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:x11-toolkits/py-gtk2
 X11_CONFIGURE_ON=	--enable-gui
 
 post-patch:
diff --git a/sysutils/screen-legacy/Makefile b/sysutils/screen-legacy/Makefile
index 9766d839ada3..661d8f02a4f5 100644
--- a/sysutils/screen-legacy/Makefile
+++ b/sysutils/screen-legacy/Makefile
@@ -42,7 +42,7 @@ MAKE_ARGS+=	-DWITH_MAN
 .endif
 .if ${PORT_OPTIONS:MINFO}
 .if !exists(/usr/bin/install-info)
-RUN_DEPENDS+=	install-info:${PORTSDIR}/print/texinfo
+RUN_DEPENDS+=	install-info:print/texinfo
 .endif
 INFO=		screen
 MAKE_ARGS+=	-DWITH_INFO
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 1ae7715cb41b..3730c6df3e00 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -50,7 +50,7 @@ PLIST_SUB+=	MAN="@comment"
 .endif
 .if ${PORT_OPTIONS:MINFO}
 .if !exists(/usr/bin/install-info)
-RUN_DEPENDS+=	install-info:${PORTSDIR}/print/texinfo
+RUN_DEPENDS+=	install-info:print/texinfo
 .endif
 INFO=		screen
 MAKE_ARGS+=	WITH_INFO=1
diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile
index 5196687f3478..4e9e6330fbfb 100644
--- a/sysutils/screenfetch/Makefile
+++ b/sysutils/screenfetch/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Bash Screenshot Information Tool
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+RUN_DEPENDS=	bash:shells/bash \
+		xdpyinfo:x11/xdpyinfo
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/screenie/Makefile b/sysutils/screenie/Makefile
index a92e49ca8cc8..e7d2c3e5d066 100644
--- a/sysutils/screenie/Makefile
+++ b/sysutils/screenie/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small and lightweight screen(1) wrapper
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	screen:${PORTSDIR}/sysutils/screen
+RUN_DEPENDS=	screen:sysutils/screen
 
 NO_BUILD=	yes
 
diff --git a/sysutils/scterc/Makefile b/sysutils/scterc/Makefile
index 836bc79506e2..cc8d15aec4af 100644
--- a/sysutils/scterc/Makefile
+++ b/sysutils/scterc/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Configure SCT ERC for hard disks on system startup
 
-RUN_DEPENDS=	smartctl:${PORTSDIR}/sysutils/smartmontools
+RUN_DEPENDS=	smartctl:sysutils/smartmontools
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 6e411a6304c6..59cf1ce5ec4b 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Service discovery and configuration made easy
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	go14>=1.4:${PORTSDIR}/lang/go14
+BUILD_DEPENDS=	go14>=1.4:lang/go14
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp:DEFAULT,go_msgpack,go_syslog,go_net,logutils,mdns,memberlist \
diff --git a/sysutils/shim/Makefile b/sysutils/shim/Makefile
index f926d314eccf..222943edcc72 100644
--- a/sysutils/shim/Makefile
+++ b/sysutils/shim/Makefile
@@ -11,8 +11,8 @@ COMMENT=	UEFI Secure Boot shim loader
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgnuefi.a:${PORTSDIR}/devel/gnu-efi \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgnuefi.a:devel/gnu-efi \
+		bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mjg59
diff --git a/sysutils/slack/Makefile b/sysutils/slack/Makefile
index 8f85f7942cbf..6accb81820a6 100644
--- a/sysutils/slack/Makefile
+++ b/sysutils/slack/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	satwell@disjoint.net
 COMMENT=	Configuration management system designed to appeal to lazy admins
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES=		perl5 gmake
 NO_ARCH=	yes
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 4b084b6a0c16..f8efd35f81e8 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -18,8 +18,8 @@ LICENSE_FILE_IBM=${WRKSRC}/licenses/IBM-LICENSE
 LICENSE_PERMS_CPL=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IBM=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-RUN_DEPENDS=	p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		exif:${PORTSDIR}/graphics/exif
+RUN_DEPENDS=	p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		exif:graphics/exif
 
 CONFLICTS=	ja-ls-[0-9]* icat-[0-9]*
 
@@ -36,10 +36,10 @@ AFFLIB_DESC=	Build with AFFLIB support
 LIBEWF_DESC=	Build with EWF support
 OPTIONS_DEFAULT=LIBEWF
 
-AFFLIB_LIB_DEPENDS=	libafflib.so:${PORTSDIR}/sysutils/afflib
+AFFLIB_LIB_DEPENDS=	libafflib.so:sysutils/afflib
 AFFLIB_CONFIGURE_WITH=	afflib=${LOCALBASE}
 
-LIBEWF_LIB_DEPENDS=	libewf.so:${PORTSDIR}/devel/libewf
+LIBEWF_LIB_DEPENDS=	libewf.so:devel/libewf
 LIBEWF_CONFIGURE_WITH=	libewf=${LOCALBASE}
 
 post-install:
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index 660ca440c51a..f0efbae72665 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Simple Linux Utility for Resource Management
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo \
-		libhwloc.so:${PORTSDIR}/devel/hwloc \
-		libmunge.so:${PORTSDIR}/security/munge \
-		librrd.so:${PORTSDIR}/databases/rrdtool \
-		libhdf5.so:${PORTSDIR}/science/hdf5
+LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo \
+		libhwloc.so:devel/hwloc \
+		libmunge.so:security/munge \
+		librrd.so:databases/rrdtool \
+		libhdf5.so:science/hdf5
 
 USERS=		slurm
 GROUPS=		${USERS}
diff --git a/sysutils/snowlog/Makefile b/sysutils/snowlog/Makefile
index 4725e461919c..dd2f4ddd4011 100644
--- a/sysutils/snowlog/Makefile
+++ b/sysutils/snowlog/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Webserver access log browser/analyzer
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		ncurses
 DOCS=		INSTALLATION doc/README doc/filters.example
diff --git a/sysutils/socklog/Makefile b/sysutils/socklog/Makefile
index be6e08967151..d9ef801c5d75 100644
--- a/sysutils/socklog/Makefile
+++ b/sysutils/socklog/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Small and secure replacement for syslogd
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/package/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/chpst:${PORTSDIR}/sysutils/runit
+RUN_DEPENDS=	${LOCALBASE}/sbin/chpst:sysutils/runit
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 ALL_TARGET=	default
diff --git a/sysutils/squashfs-tools/Makefile b/sysutils/squashfs-tools/Makefile
index 33ea215085a8..9daeba564fa3 100644
--- a/sysutils/squashfs-tools/Makefile
+++ b/sysutils/squashfs-tools/Makefile
@@ -40,7 +40,7 @@ MAKE_ARGS+=	XZ_SUPPORT=1
 
 .if ${PORT_OPTIONS:MLZO}
 MAKE_ARGS+=	LZO_SUPPORT=1 LZO_DIR=${LOCALBASE}
-LIB_DEPENDS+=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 .endif
 
 post-patch:
diff --git a/sysutils/sshsudo/Makefile b/sysutils/sshsudo/Makefile
index 975e62c00f9f..26c8dd68f5b5 100644
--- a/sysutils/sshsudo/Makefile
+++ b/sysutils/sshsudo/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Bash script to run sudo command on multiple remote computers
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		sshpass>=0:${PORTSDIR}/security/sshpass
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		sshpass>=0:security/sshpass
 
 PROJECTHOST=	sshsudo
 
diff --git a/sysutils/stalepid/Makefile b/sysutils/stalepid/Makefile
index 20e0a5239f37..90a7503e1c1e 100644
--- a/sysutils/stalepid/Makefile
+++ b/sysutils/stalepid/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/pre/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Check for stale pid files and remove them
 
-RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
+RUN_DEPENDS=	p5-Error>=0:lang/p5-Error
 
 USES=		perl5 shebangfix uidfix
 USE_PERL5=	run
diff --git a/sysutils/stanchion/Makefile b/sysutils/stanchion/Makefile
index 336819e2cd8c..4788f6112c79 100644
--- a/sysutils/stanchion/Makefile
+++ b/sysutils/stanchion/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Open source database cluster control for Riak
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak
+BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:lang/erlang-riak
 
 USES=		gmake readline
 USE_RC_SUBR=	stanchion
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index c53d39879f2f..824f2191c3c7 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNU version of Carnegie Mellon's "Depot" program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-TEST_DEPENDS=	p5-Test-Output>0:${PORTSDIR}/devel/p5-Test-Output
+TEST_DEPENDS=	p5-Test-Output>0:devel/p5-Test-Output
 
 USES=		gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/sysutils/stowES/Makefile b/sysutils/stowES/Makefile
index 718f26957794..4c67b099f0cf 100644
--- a/sysutils/stowES/Makefile
+++ b/sysutils/stowES/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Stow enhancement script
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	stow:${PORTSDIR}/sysutils/stow
+RUN_DEPENDS=	stow:sysutils/stow
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index fc20e709a738..06f701ec9b29 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.ccs.neu.edu/pub/sysadmin/
 MAINTAINER=	gd.workbox@gmail.com
 COMMENT=	Enhanced su, allows users to su with own password + more
 
-PATCH_DEPENDS=	rcsdiff:${PORTSDIR}/devel/rcs
+PATCH_DEPENDS=	rcsdiff:devel/rcs
 
 NO_CDROM=	Do not sell for profit
 BROKEN=		fails to fetch; mastersite disappeared
diff --git a/sysutils/superiotool/Makefile b/sysutils/superiotool/Makefile
index 89b3f73539ab..15018da149c8 100644
--- a/sysutils/superiotool/Makefile
+++ b/sysutils/superiotool/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	LOCAL/avg \
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Helper tool for Super I/O chip detection and analysis
 
-LIB_DEPENDS=	libpci.so:${PORTSDIR}/devel/libpci
+LIB_DEPENDS=	libpci.so:devel/libpci
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=The tool is for x86-specific hardware
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index 0c7bcb394a44..7e3b5668decc 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.rkeene.org/files/oss/swapd/
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Daemon that watches free memory and manages swap files
 
-LIB_DEPENDS=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
+LIB_DEPENDS=	libstatgrab.so:devel/libstatgrab
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 05608cdb5a19..94021f38d98e 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -27,7 +27,7 @@ WITHOUT_SYMUX=	yes
 .endif
 
 .if !defined(WITHOUT_SYMUX)
-LIB_DEPENDS+=	librrd.so:${PORTSDIR}/databases/rrdtool
+LIB_DEPENDS+=	librrd.so:databases/rrdtool
 .endif
 
 .if defined(WITHOUT_SYMUX) && defined(WITHOUT_SYMON)
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 49bfa3af41bd..e7c89d72fe70 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/sysutils/sysgather/Makefile b/sysutils/sysgather/Makefile
index 95ba9100a544..6789d1df3996 100644
--- a/sysutils/sysgather/Makefile
+++ b/sysutils/sysgather/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Keep configuration files under version control
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles
+BUILD_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix uidfix
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
index 8d86b333af40..09d75b5d4d14 100644
--- a/sysutils/sysinfo/Makefile
+++ b/sysutils/sysinfo/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 OPTIONS_DEFINE=	DMIDECODE
 
 DMIDECODE_DESC=		Include information from the dmidecode tool
-DMIDECODE_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode
+DMIDECODE_RUN_DEPENDS=	dmidecode:sysutils/dmidecode
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|common.subr|${DATADIR}/common.subr|g' ${WRKSRC}/sysinfo
diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile
index 8d34d5a6cc2f..06aa2db7b30e 100644
--- a/sysutils/syslinux/Makefile
+++ b/sysutils/syslinux/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Boot loader for the Linux operating system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
+BUILD_DEPENDS=	nasm:devel/nasm
+RUN_DEPENDS=	mtools:emulators/mtools
 
 USES=		perl5 gmake tar:xz
 USE_PERL5=	build
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index dfd9adce7dc3..3e8f61339c48 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
+		libpcre.so:devel/pcre
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
@@ -54,8 +54,8 @@ BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-BUILD_DEPENDS+=		xsltproc:${PORTSDIR}/textproc/libxslt \
-			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=		xsltproc:textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
 .if ${PORT_OPTIONS:MSPOOF}
-LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS+=		libnet.so:net/libnet
 CONFIGURE_ARGS+=	--enable-spoof-source
 .else
 CONFIGURE_ARGS+=	--disable-spoof-source
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libgeoip-plugin.so
 .else
@@ -90,7 +90,7 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MREDIS}
 CONFIGURE_ARGS+=        --enable-redis
-LIB_DEPENDS+=           libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=           libhiredis.so:databases/hiredis
 PLIST_FILES+=           lib/syslog-ng/libredis.so
 .else
 CONFIGURE_ARGS+=        --disable-redis
@@ -98,14 +98,14 @@ CONFIGURE_ARGS+=        --disable-redis
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
 LDFLAGS+=		-L${LOCALBASE}/lib
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson-c.so:devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 .else
@@ -125,8 +125,8 @@ CONFIGURE_ARGS+=        --disable-json
 .if ${PORT_OPTIONS:MJAVA}
 CONFIGURE_ARGS+=	--enable-java
 USE_JAVA=	yes
-BUILD_DEPENDS+=		gradle:${PORTSDIR}/devel/gradle
-BUILD_DEPENDS+=		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS+=		gradle:devel/gradle
+BUILD_DEPENDS+=		bash:shells/bash
 PLIST_FILES+= 		lib/syslog-ng/libmod-java.so \
 			lib/syslog-ng/java-modules/syslog-ng-core.jar \
 			lib/syslog-ng/java-modules/log4j-1.2.16.jar \
diff --git a/sysutils/syslog-ng-incubator/Makefile b/sysutils/syslog-ng-incubator/Makefile
index 2419de718b16..24df89c52e40 100644
--- a/sysutils/syslog-ng-incubator/Makefile
+++ b/sysutils/syslog-ng-incubator/Makefile
@@ -16,8 +16,8 @@ WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog \
-		libsyslog-ng-3.6.so.0:${PORTSDIR}/sysutils/syslog-ng36
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
+		libsyslog-ng-3.6.so.0:sysutils/syslog-ng36
 
 USES=		bison gmake libtool lua pathfix pkgconfig shebangfix tar:xz
 SHEBANG_FILES=	scl/elasticsearch/es-bridge
diff --git a/sysutils/syslog-ng-incubator03/Makefile b/sysutils/syslog-ng-incubator03/Makefile
index e4c56110a266..603dde7e2860 100644
--- a/sysutils/syslog-ng-incubator03/Makefile
+++ b/sysutils/syslog-ng-incubator03/Makefile
@@ -19,8 +19,8 @@ WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog \
-		libsyslog-ng-3.5.6.so:${PORTSDIR}/sysutils/syslog-ng35
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
+		libsyslog-ng-3.5.6.so:sysutils/syslog-ng35
 
 USES=		bison gmake libtool lua pathfix pkgconfig shebangfix tar:xz
 SHEBANG_FILES=	scl/elasticsearch/es-bridge
diff --git a/sysutils/syslog-ng34/Makefile b/sysutils/syslog-ng34/Makefile
index 27e08be28e62..c44f118a5196 100644
--- a/sysutils/syslog-ng34/Makefile
+++ b/sysutils/syslog-ng34/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Powerful syslogd replacement
 DEPRECATED=	EOL, no longer supported by bababit.hu
 EXPIRATION_DATE=	2016-06-30
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
 .if ${PORT_OPTIONS:MSPOOF}
-LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS+=		libnet.so:net/libnet
 CONFIGURE_ARGS+=	--enable-spoof-source
 .else
 CONFIGURE_ARGS+=	--disable-spoof-source
@@ -83,14 +83,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libtfgeoip.so
 .else
@@ -99,14 +99,14 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-L${LOCALBASE}/lib -ldbi"
 CONFIGURE_ARGS+=	--enable-sql
 PLIST_FILES+=		lib/syslog-ng/libafsql.so
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson-c.so:devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 .else
diff --git a/sysutils/syslog-ng35/Makefile b/sysutils/syslog-ng35/Makefile
index 72e13eb0a94f..7e012a967cc6 100644
--- a/sysutils/syslog-ng35/Makefile
+++ b/sysutils/syslog-ng35/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Powerful syslogd replacement
 DEPRECATED=	EOL, no longer supported by bababit.hu
 EXPIRATION_DATE=	2016-06-30
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
 .if ${PORT_OPTIONS:MSPOOF}
-LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS+=		libnet.so:net/libnet
 CONFIGURE_ARGS+=	--enable-spoof-source
 .else
 CONFIGURE_ARGS+=	--disable-spoof-source
@@ -85,14 +85,14 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MPCRE}
 CONFIGURE_ARGS+=	--enable-pcre
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libtfgeoip.so
 .else
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MREDIS}
 CONFIGURE_ARGS+=        --enable-redis
-LIB_DEPENDS+=           libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=           libhiredis.so:databases/hiredis
 PLIST_FILES+=           lib/syslog-ng/libredis.so
 .else
 CONFIGURE_ARGS+=        --disable-redis
@@ -110,14 +110,14 @@ CONFIGURE_ARGS+=        --disable-redis
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
 LDFLAGS+=		-L${LOCALBASE}/lib
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson-c.so:devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 .else
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index 6a106d75e86c..1544a6482b13 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -15,8 +15,8 @@ MASTER_SITES=	https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAM
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
+		libpcre.so:devel/pcre
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
 .if ${PORT_OPTIONS:MSPOOF}
-LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS+=		libnet.so:net/libnet
 CONFIGURE_ARGS+=	--enable-spoof-source
 .else
 CONFIGURE_ARGS+=	--disable-spoof-source
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libtfgeoip.so
 .else
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MREDIS}
 CONFIGURE_ARGS+=        --enable-redis --with-libhiredis=${LOCALBASE}/lib
-LIB_DEPENDS+=           libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=           libhiredis.so:databases/hiredis
 PLIST_FILES+=           lib/syslog-ng/libredis.so
 .else
 CONFIGURE_ARGS+=        --disable-redis
@@ -101,14 +101,14 @@ CONFIGURE_ARGS+=        --disable-redis
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
 LDFLAGS+=		-L${LOCALBASE}/lib
@@ -118,7 +118,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson-c.so:devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 .else
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index 980f48e99381..ac1cc73553ab 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -15,8 +15,8 @@ MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 
-LIB_DEPENDS=	libevtlog.so:${PORTSDIR}/sysutils/eventlog \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
+		libpcre.so:devel/pcre
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
@@ -56,8 +56,8 @@ BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-BUILD_DEPENDS+=		xsltproc:${PORTSDIR}/textproc/libxslt \
-			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=		xsltproc:textproc/libxslt \
+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
 .endif
 
 .if ${PORT_OPTIONS:MSPOOF}
-LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS+=		libnet.so:net/libnet
 CONFIGURE_ARGS+=	--enable-spoof-source
 .else
 CONFIGURE_ARGS+=	--disable-spoof-source
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if ${PORT_OPTIONS:MGEOIP}
 CONFIGURE_ARGS+=	--enable-geoip
-LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
 PLIST_FILES+=		lib/syslog-ng/libgeoip-plugin.so
 .else
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+=	--disable-geoip
 
 .if ${PORT_OPTIONS:MREDIS}
 CONFIGURE_ARGS+=        --enable-redis
-LIB_DEPENDS+=           libhiredis.so:${PORTSDIR}/databases/hiredis
+LIB_DEPENDS+=           libhiredis.so:databases/hiredis
 PLIST_FILES+=           lib/syslog-ng/libredis.so
 .else
 CONFIGURE_ARGS+=        --disable-redis
@@ -100,14 +100,14 @@ CONFIGURE_ARGS+=        --disable-redis
 
 .if ${PORT_OPTIONS:MSMTP}
 CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/
-LIB_DEPENDS+=		libesmtp.so:${PORTSDIR}/mail/libesmtp
+LIB_DEPENDS+=		libesmtp.so:mail/libesmtp
 PLIST_FILES+=		lib/syslog-ng/libafsmtp.so
 .else
 CONFIGURE_ARGS+=	--disable-smtp
 .endif
 
 .if ${PORT_OPTIONS:MSQL}
-LIB_DEPENDS+=		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
 CONFIGURE_ARGS+=	--enable-sql
 LDFLAGS+=		-L${LOCALBASE}/lib
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=	--disable-sql
 .endif
 
 .if ${PORT_OPTIONS:MJSON}
-LIB_DEPENDS+=		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS+=		libjson-c.so:devel/json-c
 CONFIGURE_ARGS+=	--enable-json
 PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 .else
@@ -127,8 +127,8 @@ CONFIGURE_ARGS+=        --disable-json
 .if ${PORT_OPTIONS:MJAVA}
 CONFIGURE_ARGS+=	--enable-java
 USE_JAVA=	yes
-BUILD_DEPENDS+=		gradle:${PORTSDIR}/devel/gradle
-BUILD_DEPENDS+=		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS+=		gradle:devel/gradle
+BUILD_DEPENDS+=		bash:shells/bash
 PLIST_FILES+= 		lib/syslog-ng/libmod-java.so \
 			lib/syslog-ng/java-modules/syslog-ng-core.jar \
 			lib/syslog-ng/java-modules/log4j-1.2.16.jar \
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 2aa41a3eb53b..0a087ea089af 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Backend system admin scripts for gnome-system-tools
 
-BUILD_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
-RUN_DEPENDS=	p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
+BUILD_DEPENDS=	p5-Net-DBus>=0:devel/p5-Net-DBus
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libpolkit-gobject-1.so:sysutils/polkit
+RUN_DEPENDS=	p5-Net-DBus>=0:devel/p5-Net-DBus
 
 USES=		gettext-tools gmake pathfix perl5 pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	SystemToolsBackends.pl.in
diff --git a/sysutils/tarsnap-periodic/Makefile b/sysutils/tarsnap-periodic/Makefile
index 6b17ae617223..fb1945a38bb6 100644
--- a/sysutils/tarsnap-periodic/Makefile
+++ b/sysutils/tarsnap-periodic/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	kamila@ksp.sk
 COMMENT=	Simple way of making tarsnap backups using the periodic system
 
-RUN_DEPENDS=    tarsnap:${PORTSDIR}/sysutils/tarsnap
+RUN_DEPENDS=    tarsnap:sysutils/tarsnap
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	anotherkamila
diff --git a/sysutils/tartarus/Makefile b/sysutils/tartarus/Makefile
index 0a230d705ef7..d7cc735c2d8c 100644
--- a/sysutils/tartarus/Makefile
+++ b/sysutils/tartarus/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Wrappers around common Unix tools for simplified backup solution
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
-		${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/bin/gtar:archivers/gtar \
+		${LOCALBASE}/bin/curl:ftp/curl
 
 USES=		gmake perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/bin/*
diff --git a/sysutils/tcplist/Makefile b/sysutils/tcplist/Makefile
index 704dfb0907c7..51c3d8f22a99 100644
--- a/sysutils/tcplist/Makefile
+++ b/sysutils/tcplist/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.shar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lists TCP connections to/from local machine (+username on both sides)
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof
+RUN_DEPENDS=	${LOCALBASE}/sbin/lsof:sysutils/lsof
 
 EXTRACT_CMD=	${CAT}
 EXTRACT_BEFORE_ARGS=
diff --git a/sysutils/tenshi/Makefile b/sysutils/tenshi/Makefile
index 0ef5b252b6e9..1a2a5093d2ad 100644
--- a/sysutils/tenshi/Makefile
+++ b/sysutils/tenshi/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=		http://dev.inversepath.com/tenshi/
 MAINTAINER=		jadawin@FreeBSD.org
 COMMENT=		Tenshi is a log monitoring program, designed to watch multiple logs
 
-RUN_DEPENDS=		${LOCALBASE}/bin/gtail:${PORTSDIR}/sysutils/coreutils \
-			p5-IO-BufferedSelect>=0:${PORTSDIR}/devel/p5-IO-BufferedSelect
+RUN_DEPENDS=		${LOCALBASE}/bin/gtail:sysutils/coreutils \
+			p5-IO-BufferedSelect>=0:devel/p5-IO-BufferedSelect
 
 USES=			perl5
 USE_PERL5=		run build patch
diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 8c8f86e04c20..1652bc8f86a6 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	hashicorp-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Provides a common configuration to launch infrastructure
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp:DEFAULT,atlasgo,consul,errwrap,gocheckpoint \
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index dfb2e5ff272a..1d307cc9a2a9 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -41,18 +41,18 @@ ICONV_CONFIGURE_OFF=	--without-iconv
 # e2fsprogs does not provide ext2fs.so any more
 # since it does not do 'make install-libs'
 #.if defined(WITH_E2FSPROGS)
-#LIB_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
+#LIB_DEPENDS+=	ext2fs.2:sysutils/e2fsprogs
 #.else
 #CONFIGURE_ARGS+=--without-ext2fs
 #.endif
 
-NTFS3G_LIB_DEPENDS=	libntfs-3g.so:${PORTSDIR}/sysutils/fusefs-ntfs
+NTFS3G_LIB_DEPENDS=	libntfs-3g.so:sysutils/fusefs-ntfs
 NTFS3G_CONFIGURE_OFF=	--without-ntfs3g
 
-NTFSPROGS_LIB_DEPENDS=	libntfs.so:${PORTSDIR}/sysutils/ntfsprogs
+NTFSPROGS_LIB_DEPENDS=	libntfs.so:sysutils/ntfsprogs
 NTFS_PROGS_CONFIGURE_ARGS=	--without-ntfs
 
-PROGSREISERFS_LIB_DEPENDS=	libreiserfs-0.3.so:${PORTSDIR}/sysutils/progsreiserfs
+PROGSREISERFS_LIB_DEPENDS=	libreiserfs-0.3.so:sysutils/progsreiserfs
 PROGSREISERFS_CONFIGURE_OFF=	--without-reiserfs
 
 post-patch:
diff --git a/sysutils/titlefix/Makefile b/sysutils/titlefix/Makefile
index 27f8162e50b0..5801c98c760a 100644
--- a/sysutils/titlefix/Makefile
+++ b/sysutils/titlefix/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Renames files in a proper English title format
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	id3v2:${PORTSDIR}/audio/id3v2
+RUN_DEPENDS=	id3v2:audio/id3v2
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${PORTNAME}
diff --git a/sysutils/tkdvd/Makefile b/sysutils/tkdvd/Makefile
index 8e3b3b4464fd..fcd8eb4464b7 100644
--- a/sysutils/tkdvd/Makefile
+++ b/sysutils/tkdvd/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://regis.damongeot.free.fr/tkdvd/dl/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	GUI to dvd+rw-tools and cdrecord
 
-RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	growisofs:sysutils/dvd+rw-tools \
+		cdrecord:sysutils/cdrtools
 
 USES=		tk
 
diff --git a/sysutils/tlsdate/Makefile b/sysutils/tlsdate/Makefile
index 3146179ff5c6..2ed19604a245 100644
--- a/sysutils/tlsdate/Makefile
+++ b/sysutils/tlsdate/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Secure parasitic rdate replacement
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile
index 07f1e30ff25d..75b5e7b245d8 100644
--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@@ -33,8 +33,8 @@ BACKSPACE_DESC=	Build with tty/keys patch
 
 BACKSPACE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-tty-keys.c
 
-LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:${PORTSDIR}/devel/libevent2
-LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent2
+LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 LIBEVENT_STATIC_VARS=	LESTATIC=${LOCALBASE}/lib/libevent.a
 
 post-patch:
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index aee8124868d3..4e3a5d23d0aa 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -9,18 +9,18 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Object database, tag/metadata database, search tool and indexer
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
-		libhal.so:${PORTSDIR}/sysutils/hal \
-		libraptor.so:${PORTSDIR}/textproc/raptor \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libicutu.so:${PORTSDIR}/devel/icu \
-		libmediaart-2.0.so:${PORTSDIR}/multimedia/libmediaart \
-		librest-0.7.so:${PORTSDIR}/devel/librest
-RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
-		o3totxt:${PORTSDIR}/converters/o3read \
-		pdftotext:${PORTSDIR}/graphics/poppler-utils \
-		w3m:${PORTSDIR}/www/w3m
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libgmime-2.6.so:mail/gmime26 \
+		libhal.so:sysutils/hal \
+		libraptor.so:textproc/raptor \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libicutu.so:devel/icu \
+		libmediaart-2.0.so:multimedia/libmediaart \
+		librest-0.7.so:devel/librest
+RUN_DEPENDS=	xdg-desktop-icon:devel/xdg-utils \
+		o3totxt:converters/o3read \
+		pdftotext:graphics/poppler-utils \
+		w3m:www/w3m
 
 PORTSCOUT=	limitw:1,even
 
@@ -72,32 +72,32 @@ NAUTILUS_DESC=		Support for nautilus tagging
 
 WEB_MINERS_CONFIGURE_ENABLE=	miner-firefox miner-thunderbird
 # miner-evolution
-WEB_MINERS_BUILD_DEPENDS=	firefox>=0:${PORTSDIR}/www/firefox \
-				thunderbird>=0:${PORTSDIR}/mail/thunderbird
-WEB_MINERS_RUN_DEPENDS=		firefox>=0:${PORTSDIR}/www/firefox \
-				thunderbird>=0:${PORTSDIR}/mail/thunderbird
+WEB_MINERS_BUILD_DEPENDS=	firefox>=0:www/firefox \
+				thunderbird>=0:mail/thunderbird
+WEB_MINERS_RUN_DEPENDS=		firefox>=0:www/firefox \
+				thunderbird>=0:mail/thunderbird
 
 AUDIO_MINERS_CONFIGURE_ENABLE=	libvorbis libflac taglib mp3 libcue playlist
-AUDIO_MINERS_LIB_DEPENDS=	libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
-				libFLAC.so:${PORTSDIR}/audio/flac \
-				libvorbis.so:${PORTSDIR}/audio/libvorbis \
-				libcue.so:${PORTSDIR}/textproc/libcue \
-				libogg.so:${PORTSDIR}/audio/libogg \
-				libtag.so:${PORTSDIR}/audio/taglib
+AUDIO_MINERS_LIB_DEPENDS=	libtotem-plparser.so:multimedia/totem-pl-parser \
+				libFLAC.so:audio/flac \
+				libvorbis.so:audio/libvorbis \
+				libcue.so:textproc/libcue \
+				libogg.so:audio/libogg \
+				libtag.so:audio/taglib
 
 DOCUMENT_MINERS_CONFIGURE_ENABLE=	libgxps poppler libxml2 libgsf \
 				abiword dvi ps exempi text
-DOCUMENT_MINERS_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-				libgxps.so:${PORTSDIR}/graphics/libgxps \
-				libgsf-1.so:${PORTSDIR}/devel/libgsf \
-				libexempi.so:${PORTSDIR}/textproc/exempi \
-				libwv.so:${PORTSDIR}/textproc/wv
+DOCUMENT_MINERS_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib \
+				libgxps.so:graphics/libgxps \
+				libgsf-1.so:devel/libgsf \
+				libexempi.so:textproc/exempi \
+				libwv.so:textproc/wv
 
 GRAPHIC_MINERS_CONFIGURE_ENABLE=	libexif libgif libjpeg libtiff icon libpng
-GRAPHIC_MINERS_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-				libgif.so:${PORTSDIR}/graphics/giflib \
-				libpng.so:${PORTSDIR}/graphics/png \
-				libtiff.so:${PORTSDIR}/graphics/tiff
+GRAPHIC_MINERS_LIB_DEPENDS=	libexif.so:graphics/libexif \
+				libgif.so:graphics/giflib \
+				libpng.so:graphics/png \
+				libtiff.so:graphics/tiff
 
 # cirular dependancy tracker -> nautilus -> tracker
 CONFIGURE_ARGS=		--disable-nautilus-extension
diff --git a/sysutils/tuptime/Makefile b/sysutils/tuptime/Makefile
index d995f2c71092..6ed194f45c27 100644
--- a/sysutils/tuptime/Makefile
+++ b/sysutils/tuptime/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Historical and statistical system running time report tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3
 
 USES=		python:run shebangfix
 
diff --git a/sysutils/u-boot-beaglebone/Makefile b/sysutils/u-boot-beaglebone/Makefile
index 01fe651068fb..1ec4ed1e134d 100644
--- a/sysutils/u-boot-beaglebone/Makefile
+++ b/sysutils/u-boot-beaglebone/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Cross-build U-Boot loader for BeagleBone and BeagleBone Black
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc492
+BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
 
 CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
diff --git a/sysutils/u-boot-cubieboard/Makefile b/sysutils/u-boot-cubieboard/Makefile
index d4fcff345ffa..f8f108c37352 100644
--- a/sysutils/u-boot-cubieboard/Makefile
+++ b/sysutils/u-boot-cubieboard/Makefile
@@ -11,7 +11,7 @@ COMMENT?=	Cross-build U-Boot loader for Cubieboard
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	arm-none-eabi-gcc:${PORTSDIR}/devel/arm-none-eabi-gcc
+BUILD_DEPENDS=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
 
 MODEL?=		cubieboard
 CONF_TARGET?=	Cubieboard_defconfig
diff --git a/sysutils/u-boot-cubox-hummingboard/Makefile b/sysutils/u-boot-cubox-hummingboard/Makefile
index f75d6ef33bae..91933b43aff6 100644
--- a/sysutils/u-boot-cubox-hummingboard/Makefile
+++ b/sysutils/u-boot-cubox-hummingboard/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross-build U-Boot loader for SolidRun Cubox
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc492
+BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
 
 CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
diff --git a/sysutils/u-boot-duovero/Makefile b/sysutils/u-boot-duovero/Makefile
index 9bf35ff9f13b..9e97f191e9a8 100644
--- a/sysutils/u-boot-duovero/Makefile
+++ b/sysutils/u-boot-duovero/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross-build U-Boot loader for Duovero
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc492
+BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
 
 CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
diff --git a/sysutils/u-boot-pandaboard/Makefile b/sysutils/u-boot-pandaboard/Makefile
index 28a03a737b53..464f68be1228 100644
--- a/sysutils/u-boot-pandaboard/Makefile
+++ b/sysutils/u-boot-pandaboard/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross-build U-Boot loader for PandaBoard
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc492
+BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
 
 CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
diff --git a/sysutils/u-boot-rpi/Makefile b/sysutils/u-boot-rpi/Makefile
index 7b170dfa0872..05256bd0e176 100644
--- a/sysutils/u-boot-rpi/Makefile
+++ b/sysutils/u-boot-rpi/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cross-build U-Boot loader for Raspberry Pi
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	arm-none-eabi-gcc:${PORTSDIR}/devel/arm-none-eabi-gcc
+BUILD_DEPENDS=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
 
 NO_ARCH=	yes
 
diff --git a/sysutils/u-boot-rpi2/Makefile b/sysutils/u-boot-rpi2/Makefile
index f5ca4348a4b2..cbf5a17c484d 100644
--- a/sysutils/u-boot-rpi2/Makefile
+++ b/sysutils/u-boot-rpi2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Cross-build U-Boot loader for Raspberry Pi 2
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	arm-none-eabi-gcc:${PORTSDIR}/devel/arm-none-eabi-gcc
+BUILD_DEPENDS=	arm-none-eabi-gcc:devel/arm-none-eabi-gcc
 
 NO_ARCH=	yes
 
diff --git a/sysutils/u-boot-utilite/Makefile b/sysutils/u-boot-utilite/Makefile
index ab170ccf53bc..0fcf07974f03 100644
--- a/sysutils/u-boot-utilite/Makefile
+++ b/sysutils/u-boot-utilite/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Cross-build U-Boot loader for Utilite (and Utilite Pro)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc
+BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc
 
 CROSS_GCC=	arm-none-eabi-gcc
 
diff --git a/sysutils/u-boot-wandboard/Makefile b/sysutils/u-boot-wandboard/Makefile
index 459b91be29f2..c421997ec5dc 100644
--- a/sysutils/u-boot-wandboard/Makefile
+++ b/sysutils/u-boot-wandboard/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Cross-build U-Boot loader for Wandboard (solo, dual, and quad)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${CROSS_GCC}:${PORTSDIR}/devel/arm-none-eabi-gcc492
+BUILD_DEPENDS=	${CROSS_GCC}:devel/arm-none-eabi-gcc492
 
 CROSS_GCC=	arm-none-eabi-gcc-4.9.2
 
diff --git a/sysutils/ucspi-proxy/Makefile b/sysutils/ucspi-proxy/Makefile
index 7f83be8a85cd..67bec981322f 100644
--- a/sysutils/ucspi-proxy/Makefile
+++ b/sysutils/ucspi-proxy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://untroubled.org/ucspi-proxy/
 MAINTAINER=	dale.woolridge@gmail.com
 COMMENT=	Proxy program for UCSPI servers and clients
 
-LIB_DEPENDS=	libbg.so:${PORTSDIR}/devel/bglibs
+LIB_DEPENDS=	libbg.so:devel/bglibs
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/ucspi-ssl/Makefile b/sysutils/ucspi-ssl/Makefile
index 47f95dc774a0..2381b07e4297 100644
--- a/sysutils/ucspi-ssl/Makefile
+++ b/sysutils/ucspi-ssl/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	LOCAL/garga/ucspi-ssl \
 MAINTAINER?=	lx@FreeBSD.org
 COMMENT?=	UCSPI tools for building SSL client-server applications
 
-RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+RUN_DEPENDS=	tcpserver:sysutils/ucspi-tcp \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 CONFLICTS?=	ucspi-ssl-tls-[0-9]*
 
diff --git a/sysutils/ucspi-unix/Makefile b/sysutils/ucspi-unix/Makefile
index 9fea405f60d8..ba68120eb4c5 100644
--- a/sysutils/ucspi-unix/Makefile
+++ b/sysutils/ucspi-unix/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Unix-domain socket client-server command-line tools
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${BGLIBS_LIB}/libbg.a:${PORTSDIR}/devel/bglibs
+BUILD_DEPENDS=	${BGLIBS_LIB}/libbg.a:devel/bglibs
 
 BGLIBS_INC=	${LOCALBASE}/include/bglibs
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index dfc45a540b91..03d90a9b0387 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Eject(1) replacement
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libcdio.so:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
+		libpcre.so:devel/pcre \
+		libcdio.so:sysutils/libcdio
 
 USES=		tar:bzip2 pathfix pkgconfig gettext iconv libtool
 USE_GNOME=	glib20
diff --git a/sysutils/uniutils/Makefile b/sysutils/uniutils/Makefile
index 522819020f1d..2ee5e03c2db3 100644
--- a/sysutils/uniutils/Makefile
+++ b/sysutils/uniutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Unicode Description Utilities
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	ascii2binary:${PORTSDIR}/converters/ascii2binary
+RUN_DEPENDS=	ascii2binary:converters/ascii2binary
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 42df468b50f1..9fe83c2c6278 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -12,8 +12,8 @@ COMMENT=	D-Bus daemon for simplifying power management tasks
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack glib20 introspection:build
@@ -32,9 +32,9 @@ OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 MANPAGES_BUILD_DEPENDS= \
-	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
-	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+	docbook-sgml>0:textproc/docbook-sgml \
+	docbook-xml>0:textproc/docbook-xml \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MANPAGES_USE=	GNOME=libxslt:build
 
 .include <bsd.port.mk>
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile
index 57e6409f58ee..2853a629b277 100644
--- a/sysutils/usbhotkey/Makefile
+++ b/sysutils/usbhotkey/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Utility to remap USB keyboards under X11
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libhid.so:${PORTSDIR}/devel/libhid \
-		libXtst.so:${PORTSDIR}/x11/libXtst
+LIB_DEPENDS=	libhid.so:devel/libhid \
+		libXtst.so:x11/libXtst
 
 USES=		gmake
 USE_RUBY=	yes
diff --git a/sysutils/uschedule/Makefile b/sysutils/uschedule/Makefile
index 408aae9ae82c..6bd54c0cd444 100644
--- a/sysutils/uschedule/Makefile
+++ b/sysutils/uschedule/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.ohse.de/uwe/uschedule/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scheduler program, designed to replace cron(8) and at(1)
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/tai64nlocal:${PORTSDIR}/sysutils/daemontools
-RUN_DEPENDS=	${LOCALBASE}/bin/multilog:${PORTSDIR}/sysutils/daemontools
+BUILD_DEPENDS=	${LOCALBASE}/bin/tai64nlocal:sysutils/daemontools
+RUN_DEPENDS=	${LOCALBASE}/bin/multilog:sysutils/daemontools
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 
diff --git a/sysutils/usermatic/Makefile b/sysutils/usermatic/Makefile
index 8f4475d96888..eb76d2d66c41 100644
--- a/sysutils/usermatic/Makefile
+++ b/sysutils/usermatic/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://btw23.de/johannes/usermatic/\
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Scripts to automate the maintenance of accounts
 
-RUN_DEPENDS=	${PREFIX}/sbin/userneu.pl:${PORTSDIR}/sysutils/userneu
+RUN_DEPENDS=	${PREFIX}/sbin/userneu.pl:sysutils/userneu
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 97e698f72a23..facdb7b282f3 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Web-based interface for performing some user tasks
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
+RUN_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-Authen-PAM>=0:security/p5-Authen-PAM
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile
index c50e4ecbddff..3f8513301c70 100644
--- a/sysutils/userneu-devel/Makefile
+++ b/sysutils/userneu-devel/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Account management and creation tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd
+RUN_DEPENDS=	p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Crypt-RandPasswd>=0:security/p5-Crypt-RandPasswd
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	userneu.pl smbrepair.pl
diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile
index 27a0ae823b5c..c93b8beb670f 100644
--- a/sysutils/userneu/Makefile
+++ b/sysutils/userneu/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Account management and creation tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
-		p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd
+RUN_DEPENDS=	p5-Crypt-PasswdMD5>=0:security/p5-Crypt-PasswdMD5 \
+		p5-Crypt-RandPasswd>=0:security/p5-Crypt-RandPasswd
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/sysutils/vagrant/Makefile b/sysutils/vagrant/Makefile
index c0610018ea93..d62c0b711651 100644
--- a/sysutils/vagrant/Makefile
+++ b/sysutils/vagrant/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Vagrant Virtual Machine Manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	rubygem-builder32>=2.1.2:${PORTSDIR}/devel/rubygem-builder32 \
-		rubygem-bundler>=1.5.3:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-main>=1.0:${PORTSDIR}/devel/rubygem-main
-RUN_DEPENDS=	rubygem-bundler>=1.5.3:${PORTSDIR}/sysutils/rubygem-bundler \
-		rubygem-childprocess>=0.5.1:${PORTSDIR}/devel/rubygem-childprocess \
-		rubygem-erubis>=2.7.0:${PORTSDIR}/www/rubygem-erubis \
-		rubygem-hashicorp-checkpoint>=0.1.4:${PORTSDIR}/www/rubygem-hashicorp-checkpoint \
-		rubygem-i18n>=0.6.9:${PORTSDIR}/devel/rubygem-i18n \
-		rubygem-listen>=3.0.2:${PORTSDIR}/devel/rubygem-listen \
-		rubygem-log4r>=1.1.10:${PORTSDIR}/sysutils/rubygem-log4r \
-		rubygem-net-scp>=1.1.0:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-sftp>=2.1:${PORTSDIR}/security/rubygem-net-sftp \
-		rubygem-net-ssh>=3.0.1:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-nokogiri>=1.6.3.1:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rb-kqueue>=0.2.2:${PORTSDIR}/devel/rubygem-rb-kqueue \
-		rubygem-rest-client>=1.6.0:${PORTSDIR}/www/rubygem-rest-client \
-		rubygem-wdm>=0.1.0:${PORTSDIR}/devel/rubygem-wdm \
-		rubygem-winrm>=1.3.0:${PORTSDIR}/sysutils/rubygem-winrm \
-		rubygem-winrm-fs>=0.2.0:${PORTSDIR}/sysutils/rubygem-winrm-fs
+BUILD_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
+		rubygem-bundler>=1.5.3:sysutils/rubygem-bundler \
+		rubygem-main>=1.0:devel/rubygem-main
+RUN_DEPENDS=	rubygem-bundler>=1.5.3:sysutils/rubygem-bundler \
+		rubygem-childprocess>=0.5.1:devel/rubygem-childprocess \
+		rubygem-erubis>=2.7.0:www/rubygem-erubis \
+		rubygem-hashicorp-checkpoint>=0.1.4:www/rubygem-hashicorp-checkpoint \
+		rubygem-i18n>=0.6.9:devel/rubygem-i18n \
+		rubygem-listen>=3.0.2:devel/rubygem-listen \
+		rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \
+		rubygem-net-scp>=1.1.0:security/rubygem-net-scp \
+		rubygem-net-sftp>=2.1:security/rubygem-net-sftp \
+		rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
+		rubygem-nokogiri>=1.6.3.1:textproc/rubygem-nokogiri \
+		rubygem-rb-kqueue>=0.2.2:devel/rubygem-rb-kqueue \
+		rubygem-rest-client>=1.6.0:www/rubygem-rest-client \
+		rubygem-wdm>=0.1.0:devel/rubygem-wdm \
+		rubygem-winrm>=1.3.0:sysutils/rubygem-winrm \
+		rubygem-winrm-fs>=0.2.0:sysutils/rubygem-winrm-fs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mitchellh
diff --git a/sysutils/vbetool/Makefile b/sysutils/vbetool/Makefile
index 0d7e1c43567a..c3765b4e52b1 100644
--- a/sysutils/vbetool/Makefile
+++ b/sysutils/vbetool/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Application for executing video card BIOS code
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpci.so:${PORTSDIR}/devel/libpci \
-		libx86.so:${PORTSDIR}/devel/libx86
+LIB_DEPENDS=	libpci.so:devel/libpci \
+		libx86.so:devel/libx86
 
 PLIST_FILES=	man/man1/vbetool.1.gz \
 		sbin/vbetool
diff --git a/sysutils/vii/Makefile b/sysutils/vii/Makefile
index 2f1cf0895389..3ccf328de760 100644
--- a/sysutils/vii/Makefile
+++ b/sysutils/vii/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Execute a command repeatedly and scroll the output
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexplain.so:${PORTSDIR}/devel/libexplain
+LIB_DEPENDS=	libexplain.so:devel/libexplain
 
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/vils/Makefile b/sysutils/vils/Makefile
index 329057cc7194..e0ae4155a1e7 100644
--- a/sysutils/vils/Makefile
+++ b/sysutils/vils/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Use your favorite editor to rename files
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	zsh:${PORTSDIR}/shells/zsh
+RUN_DEPENDS=	zsh:shells/zsh
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/sysutils/vimpager/Makefile b/sysutils/vimpager/Makefile
index d4d7c814d6c7..7c463566af4d 100644
--- a/sysutils/vimpager/Makefile
+++ b/sysutils/vimpager/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Use ViM as a pager
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	vim:${PORTSDIR}/editors/vim
+RUN_DEPENDS=	vim:editors/vim
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rkitover
diff --git a/sysutils/virtualmin/Makefile b/sysutils/virtualmin/Makefile
index bd4ee1d10394..3bc4272f0fef 100644
--- a/sysutils/virtualmin/Makefile
+++ b/sysutils/virtualmin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Virtual hosting management system based on webmin
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/lib/webmin/webmin-init:${PORTSDIR}/sysutils/webmin
+RUN_DEPENDS=	${LOCALBASE}/lib/webmin/webmin-init:sysutils/webmin
 
 USES=		shebangfix
 SHEBANG_FILES=	*.cgi
diff --git a/sysutils/vlogger/Makefile b/sysutils/vlogger/Makefile
index 0ee6c88a09af..3c35d2780d98 100644
--- a/sysutils/vlogger/Makefile
+++ b/sysutils/vlogger/Makefile
@@ -13,7 +13,7 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index e2a0f0ea756c..4ac0f1e9122a 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://vobcopy.org/download/ \
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Decrypts and copies DVD .vob files
 
-LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
diff --git a/sysutils/volman/Makefile b/sysutils/volman/Makefile
index 9ed3fe099480..816b71cf48a7 100644
--- a/sysutils/volman/Makefile
+++ b/sysutils/volman/Makefile
@@ -23,14 +23,14 @@ NTFS3G_DESC=	Use fusefs-ntfs extensions
 
 .if ${PORT_OPTIONS:MOPENBOX}
 VM_SUB_FILES+=	obvolman
-RUN_DEPENDS+=	${LOCALBASE}/bin/xmessage:${PORTSDIR}/x11/xmessage
+RUN_DEPENDS+=	${LOCALBASE}/bin/xmessage:x11/xmessage
 PLIST_SUB+=	OPENBOX=""
 .else
 PLIST_SUB+=	OPENBOX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNTFS3G}
-RUN_DEPENDS+=	${LOCALBASE}/bin/ntfs-3g:${PORTSDIR}/sysutils/fusefs-ntfs
+RUN_DEPENDS+=	${LOCALBASE}/bin/ntfs-3g:sysutils/fusefs-ntfs
 SUB_LIST+=	RCFUSEFS=" fusefs"
 .else
 SUB_LIST+=	RCFUSEFS=""
diff --git a/sysutils/warden/Makefile b/sysutils/warden/Makefile
index 4cb389d8da49..7f6b23c7a4f9 100644
--- a/sysutils/warden/Makefile
+++ b/sysutils/warden/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Warden jail management system utility
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:${PORTSDIR}/sysutils/pcbsd-libsh \
-		debootstrap:${PORTSDIR}/sysutils/debootstrap \
-		jailme:${PORTSDIR}/sysutils/jailme
+RUN_DEPENDS=	${LOCALBASE}/share/pcbsd/scripts/functions.sh:sysutils/pcbsd-libsh \
+		debootstrap:sysutils/debootstrap \
+		jailme:sysutils/jailme
 
 WRKSRC_SUBDIR=	src-sh/warden
 USES=		pkgconfig tar:xz
diff --git a/sysutils/watchman/Makefile b/sysutils/watchman/Makefile
index 0457a79f92ea..ad60d3d104df 100644
--- a/sysutils/watchman/Makefile
+++ b/sysutils/watchman/Makefile
@@ -38,7 +38,7 @@ BACKTRACE_CPPFLAGS=	${EXECINFO_CPPFLAGS}
 BACKTRACE_LDFLAGS=	${EXECINFO_LDFLAGS}
 BACKTRACE_LIBS=		-lexecinfo
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
 
 post-patch:
diff --git a/sysutils/watchmen/Makefile b/sysutils/watchmen/Makefile
index 293d876cbf64..7958a13ed58e 100644
--- a/sysutils/watchmen/Makefile
+++ b/sysutils/watchmen/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Watch and restart daemons
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-libwww>=6.04:www/p5-libwww \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
@@ -34,16 +34,16 @@ PLIST_FILES=	bin/${PORTNAME} \
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
-RUN_DEPENDS+=	p5-DBD-Pg>=2.19.2:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=2.19.2:databases/p5-DBD-Pg
 .endif
 
 .if ${PORT_OPTIONS:MEMAIL}
-RUN_DEPENDS+=	p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite
+RUN_DEPENDS+=	p5-MIME-Lite>=0:mail/p5-MIME-Lite
 .endif
 
 post-install:
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index a76ca6a55477..809182cafd2c 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Web-based interface for system administration for Unix
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
-		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
+RUN_DEPENDS=	p5-Net-SSLeay>=0:security/p5-Net-SSLeay \
+		p5-IO-Tty>=0:devel/p5-IO-Tty \
+		p5-Authen-PAM>=0:security/p5-Authen-PAM
 
 USES=		cpe perl5 python
 USE_RC_SUBR=	webmin
diff --git a/sysutils/wemux/Makefile b/sysutils/wemux/Makefile
index 2bfd9f5607fd..c3281c2c0e0d 100644
--- a/sysutils/wemux/Makefile
+++ b/sysutils/wemux/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Enhances tmux to make multi-user terminal multiplexing easier
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	tmux:${PORTSDIR}/sysutils/tmux \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	tmux:sysutils/tmux \
+		bash:shells/bash
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
diff --git a/sysutils/whatpix/Makefile b/sysutils/whatpix/Makefile
index 87394735eac8..610f6f735f4d 100644
--- a/sysutils/whatpix/Makefile
+++ b/sysutils/whatpix/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl console application which finds, moves, or deletes duplicate files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/sysutils/wiimms/Makefile b/sysutils/wiimms/Makefile
index 514bd86f199f..a9b9133d0f53 100644
--- a/sysutils/wiimms/Makefile
+++ b/sysutils/wiimms/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Wiimms ISO Tools
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=	${WRKDIR}/wiimms-iso-tools
 USES+=		gmake
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 357ed551debc..d0c5f27763c5 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.swanson.ukfsn.org/wmfire/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker dock app showing load average as a flame
 
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile
index 80b2c374e7fe..85dabcea13b8 100644
--- a/sysutils/x86info/Makefile
+++ b/sysutils/x86info/Makefile
@@ -12,7 +12,7 @@ COMMENT=	x86 CPU identification utility
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpci.so:${PORTSDIR}/devel/libpci
+LIB_DEPENDS=	libpci.so:devel/libpci
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index d2918cf56d32..a5607ee0c327 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -17,8 +17,8 @@ OPTIONS_DEFINE=	GTK2 NONROOT NLS
 OPTIONS_DEFAULT=	GTK2
 NONROOT_DESC=	Use xcdroast w/o being root
 
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
-BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	cdrecord:sysutils/cdrtools
+BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
 
 USES=		gettext gmake iconv pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index 17c69d1f9447..eb995757e33c 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-6.0.2
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	FreeBSD VM tools for Citrix XenServer and XCP
 
-RUN_DEPENDS=	xen-guest-tools>0:${PORTSDIR}/${PKGCATEGORY}/xen-guest-tools
+RUN_DEPENDS=	xen-guest-tools>0:${PKGCATEGORY}/xen-guest-tools
 
 USES=		gmake python
 USE_RC_SUBR=	xenguest
diff --git a/sysutils/xen-guest-tools/Makefile b/sysutils/xen-guest-tools/Makefile
index 70f2dd90f990..2b8b95583143 100644
--- a/sysutils/xen-guest-tools/Makefile
+++ b/sysutils/xen-guest-tools/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Xen tools within FreeBSD domU
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 DISTFILES=	xen-${PORTVERSION}.tar.gz
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/lib/libglib-2.0.so:${PORTSDIR}/devel/glib20 \
-		${LOCALBASE}/lib/libyajl.so:${PORTSDIR}/devel/yajl
+BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \
+		${LOCALBASE}/lib/libyajl.so:devel/yajl
 
 USES=		gmake python:configure perl5 gettext-runtime:build gettext-tools:build pkgconfig
 USE_PERL5=	build
diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index 7a8717667a8e..822578084ee8 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Xen management tool, based on LibXenlight
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libpixman-1.so:${PORTSDIR}/x11/pixman
-BUILD_DEPENDS=	dev86>0:${PORTSDIR}/devel/dev86 \
-		seabios>0:${PORTSDIR}/misc/seabios
+LIB_DEPENDS=	libyajl.so:devel/yajl \
+		liblzo2.so:archivers/lzo2 \
+		libpixman-1.so:x11/pixman
+BUILD_DEPENDS=	dev86>0:devel/dev86 \
+		seabios>0:misc/seabios
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index dd97efd8c828..0f55a28738e3 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -13,9 +13,9 @@ COMMENT=	CD/DVD burning tool for Xfce
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libburn.so:${PORTSDIR}/devel/libburn \
-		libisofs.so:${PORTSDIR}/devel/libisofs
-RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
+LIB_DEPENDS=	libburn.so:devel/libburn \
+		libisofs.so:devel/libisofs
+RUN_DEPENDS=	cdrdao:sysutils/cdrdao
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool intlhack glib20 gtk20
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index 64f618dea3d7..acdcf949cf1d 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Power manager for the Xfce Desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-	libupower-glib.so:${PORTSDIR}/sysutils/upower
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+	libdbus-glib-1.so:devel/dbus-glib \
+	libpolkit-gobject-1.so:sysutils/polkit \
+	libupower-glib.so:sysutils/upower
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index f2431281e7e6..a4dc664ed956 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Xfce 4 settings application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-	libxklavier.so:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+	libfontconfig.so:x11-fonts/fontconfig \
+	libxklavier.so:x11/libxklavier
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -33,11 +33,11 @@ OPTIONS_DEFAULT=	NOTIFY NLS
 
 UPOWER_DESC=	Power management tasks
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	libnotify
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext-runtime
-UPOWER_LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 UPOWER_CONFIGURE_ENABLE=	upower-glib
 OPTIONS_SUB=	yes
 
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 1d70e9cd1271..1911e57d6c3d 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	System Load plugin for Xfce4 panel
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 
 SSP_UNSAFE=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile
index 7d305b701884..4c2395151716 100644
--- a/sysutils/xorriso/Makefile
+++ b/sysutils/xorriso/Makefile
@@ -13,10 +13,10 @@ COMMENT=	ISO image manipulation tool based on Libburnia
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	libburn>=1.1.0:${PORTSDIR}/devel/libburn \
-		libisofs>=1.1.2:${PORTSDIR}/devel/libisofs
-RUN_DEPENDS=	libburn>=1.1.0:${PORTSDIR}/devel/libburn \
-		libisofs>=1.1.2:${PORTSDIR}/devel/libisofs
+BUILD_DEPENDS=	libburn>=1.1.0:devel/libburn \
+		libisofs>=1.1.2:devel/libisofs
+RUN_DEPENDS=	libburn>=1.1.0:devel/libburn \
+		libisofs>=1.1.2:devel/libisofs
 
 GNU_CONFIGURE=	yes
 USES=		gmake iconv libtool pathfix pkgconfig shebangfix
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index aaf42f947b99..c07855198965 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -13,13 +13,13 @@ COMMENT=		Capture your X display to individual frames or MPEG video
 
 LICENSE=		GPLv3
 
-BUILD_DEPENDS=		xml2po:${PORTSDIR}/textproc/gnome-doc-utils	\
-			scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-LIB_DEPENDS=		libswscale.so:${PORTSDIR}/multimedia/ffmpeg	\
-			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib	\
-			libmp3lame.so:${PORTSDIR}/audio/lame
-RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick	\
-			gimp:${PORTSDIR}/graphics/gimp-app
+BUILD_DEPENDS=		xml2po:textproc/gnome-doc-utils	\
+			scrollkeeper-config:textproc/scrollkeeper
+LIB_DEPENDS=		libswscale.so:multimedia/ffmpeg	\
+			libdbus-glib-1.so:devel/dbus-glib	\
+			libmp3lame.so:audio/lame
+RUN_DEPENDS=		animate:graphics/ImageMagick	\
+			gimp:graphics/gimp-app
 
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index d342919ff799..73fd734c4060 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Installer/updater for rpm
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		intltool-update:${PORTSDIR}/textproc/intltool
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${PYTHON_SITELIBDIR}/rpm/__init__.py:${PORTSDIR}/archivers/rpm4 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/sqlitecachec.py:${PORTSDIR}/devel/py-yum-metadata-parser \
-		${PYTHON_PKGNAMEPREFIX}iniparse>0:${PORTSDIR}/devel/py-iniparse \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:${PORTSDIR}/www/py-urlgrabber
+BUILD_DEPENDS=	bash:shells/bash \
+		intltool-update:textproc/intltool
+RUN_DEPENDS=	bash:shells/bash \
+		${PYTHON_SITELIBDIR}/rpm/__init__.py:archivers/rpm4 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \
+		${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
 
 USES=		cpe gettext gmake python shebangfix
 SHEBANG_FILES=	etc/yum-updatesd.init
diff --git a/sysutils/zbackup/Makefile b/sysutils/zbackup/Makefile
index f70b79824eaf..d544e941ce6d 100644
--- a/sysutils/zbackup/Makefile
+++ b/sysutils/zbackup/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Versatile deduplicating backup tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
+		liblzo2.so:archivers/lzo2
 
 USES=		alias cmake
 
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index d585d97360ce..9d8072d7adb4 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Event logging framework
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
-		dee-tool:${PORTSDIR}/devel/dee \
-		rapper:${PORTSDIR}/textproc/raptor2 \
-		${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:${PORTSDIR}/textproc/py-rdflib
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	valac:lang/vala \
+		dee-tool:devel/dee \
+		rapper:textproc/raptor2 \
+		${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg \
+		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus
 
 USE_GNOME=	intlhack glib20 introspection:build
 GNU_CONFIGURE=	yes
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--disable-fts --disable-telepathy \
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DATAHUB
 OPTIONS_DEFAULT=DATAHUB
-DATAHUB_LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+DATAHUB_LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 DATAHUB_USE=	gnome=gtk30
 DATAHUB_CONFIGURE_ENABLE=	datahub
 DATAHUB_DESC=	Passive loggers for Zeitgeist
diff --git a/sysutils/zeroer/Makefile b/sysutils/zeroer/Makefile
index 6ba25cb07e97..51d7b5a14855 100644
--- a/sysutils/zeroer/Makefile
+++ b/sysutils/zeroer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line utility for wiping unallocated space on a filesystem
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 PLIST_FILES=	bin/zeroer man/man1/zeroer.1.gz
 PORTDOCS=	README
diff --git a/sysutils/zfs-replicate/Makefile b/sysutils/zfs-replicate/Makefile
index 9ca212ae309e..f15d92bdfcff 100644
--- a/sysutils/zfs-replicate/Makefile
+++ b/sysutils/zfs-replicate/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_v${PORTVERSION}
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	ZFS Snapshot Replication Script
 
-RUN_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
+RUN_DEPENDS=	ksh:shells/pdksh
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/sysutils/zogftw/Makefile b/sysutils/zogftw/Makefile
index 906149d2f5bc..2a2b081025d0 100644
--- a/sysutils/zogftw/Makefile
+++ b/sysutils/zogftw/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}-2015-11-21-0a21288
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Creates redundant backups on encrypted ZFS pools
 
-RUN_DEPENDS=	mbuffer:${PORTSDIR}/misc/mbuffer \
-		sudo:${PORTSDIR}/security/sudo
+RUN_DEPENDS=	mbuffer:misc/mbuffer \
+		sudo:security/sudo
 
 OPTIONS_DEFINE=		EXECUTE_TESTS GNUPG
 OPTIONS_DEFAULT=	GNUPG
@@ -23,10 +23,10 @@ PLIST_FILES=	sbin/zogftw \
 NO_BUILD=	yes
 PORTSCOUT=	ignore:1
 
-GNUPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+GNUPG_RUN_DEPENDS=	gpg:security/gnupg
 
-EXECUTE_TESTS_BUILD_DEPENDS=	atf-sh:${PORTSDIR}/devel/atf \
-				kyua:${PORTSDIR}/devel/kyua
+EXECUTE_TESTS_BUILD_DEPENDS=	atf-sh:devel/atf \
+				kyua:devel/kyua
 
 .include <bsd.port.options.mk>
 
diff --git a/sysutils/zrep/Makefile b/sysutils/zrep/Makefile
index 86c5b12f5904..3199ef9836a4 100644
--- a/sysutils/zrep/Makefile
+++ b/sysutils/zrep/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	ZFS based replication and failover solution
 
-RUN_DEPENDS=	ksh93:${PORTSDIR}/shells/ksh93
+RUN_DEPENDS=	ksh93:shells/ksh93
 
 PLIST_FILES=	bin/zrep
 
diff --git a/sysutils/zxfer/Makefile b/sysutils/zxfer/Makefile
index 8d8fe7a3c84c..35d983019806 100644
--- a/sysutils/zxfer/Makefile
+++ b/sysutils/zxfer/Makefile
@@ -18,7 +18,7 @@ NO_BUILD=	yes
 OPTIONS_DEFINE=	RSYNC
 
 RSYNC_DESC=		Enable RSYNC Support
-RSYNC_RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RSYNC_RUN_DEPENDS=	rsync:net/rsync
 
 .include <bsd.port.options.mk>
 
diff --git a/textproc/R-cran-DT/Makefile b/textproc/R-cran-DT/Makefile
index b33311239148..8ad0c08eb588 100644
--- a/textproc/R-cran-DT/Makefile
+++ b/textproc/R-cran-DT/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Wrapper of the JavaScript Library 'DataTables'
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	R-cran-htmltools>0:${PORTSDIR}/textproc/R-cran-htmltools \
-		R-cran-htmlwidgets>=0.4:${PORTSDIR}/www/R-cran-htmlwidgets \
-		R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr
+RUN_DEPENDS=	R-cran-htmltools>0:textproc/R-cran-htmltools \
+		R-cran-htmlwidgets>=0.4:www/R-cran-htmlwidgets \
+		R-cran-magrittr>0:devel/R-cran-magrittr
 
 USES=	cran:auto-plist
 
diff --git a/textproc/R-cran-htmltools/Makefile b/textproc/R-cran-htmltools/Makefile
index 799ad01b6585..85e59cf15437 100644
--- a/textproc/R-cran-htmltools/Makefile
+++ b/textproc/R-cran-htmltools/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tools for HTML generation and output
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-digest>0:${PORTSDIR}/security/R-cran-digest \
-		R-cran-Rcpp>0:${PORTSDIR}/devel/R-cran-Rcpp
+RUN_DEPENDS=	R-cran-digest>0:security/R-cran-digest \
+		R-cran-Rcpp>0:devel/R-cran-Rcpp
 
 USES=	cran:auto-plist
 
diff --git a/textproc/R-cran-markdown/Makefile b/textproc/R-cran-markdown/Makefile
index 7e59f94e6ff9..a418fee5c127 100644
--- a/textproc/R-cran-markdown/Makefile
+++ b/textproc/R-cran-markdown/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Markdown Rendering for R
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-mime>=0.3:${PORTSDIR}/misc/R-cran-mime
+RUN_DEPENDS=	R-cran-mime>=0.3:misc/R-cran-mime
 
 USES=	cran:auto-plist
 
diff --git a/textproc/R-cran-rmarkdown/Makefile b/textproc/R-cran-rmarkdown/Makefile
index f30cb8ac579e..b1b9e620d5b2 100644
--- a/textproc/R-cran-rmarkdown/Makefile
+++ b/textproc/R-cran-rmarkdown/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Dynamic Documents for R
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	hs-pandoc>=1.12.3:${PORTSDIR}/textproc/hs-pandoc \
-		R-cran-knitr>=1.11:${PORTSDIR}/print/R-cran-knitr \
-		R-cran-yaml>=2.1.5:${PORTSDIR}/textproc/R-cran-yaml \
-		R-cran-htmltools>=0.2.4:${PORTSDIR}/textproc/R-cran-htmltools \
-		R-cran-caTools>0:${PORTSDIR}/devel/R-cran-caTools
+RUN_DEPENDS=	hs-pandoc>=1.12.3:textproc/hs-pandoc \
+		R-cran-knitr>=1.11:print/R-cran-knitr \
+		R-cran-yaml>=2.1.5:textproc/R-cran-yaml \
+		R-cran-htmltools>=0.2.4:textproc/R-cran-htmltools \
+		R-cran-caTools>0:devel/R-cran-caTools
 
 USES=	cran:auto-plist
 
diff --git a/textproc/R-cran-stringi/Makefile b/textproc/R-cran-stringi/Makefile
index 8a4f537b176a..5a5ed8de0cd4 100644
--- a/textproc/R-cran-stringi/Makefile
+++ b/textproc/R-cran-stringi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Character String Processing Facilities
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USES=	cran:auto-plist pkgconfig:build
 
diff --git a/textproc/R-cran-stringr/Makefile b/textproc/R-cran-stringr/Makefile
index b4b3eb535f9b..88e9bb2ea987 100644
--- a/textproc/R-cran-stringr/Makefile
+++ b/textproc/R-cran-stringr/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Make it easier to work with strings
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	R-cran-stringi>=0.4.1:${PORTSDIR}/textproc/R-cran-stringi \
-		R-cran-magrittr>0:${PORTSDIR}/devel/R-cran-magrittr
+RUN_DEPENDS=	R-cran-stringi>=0.4.1:textproc/R-cran-stringi \
+		R-cran-magrittr>0:devel/R-cran-magrittr
 
 USES=	cran:auto-plist
 
diff --git a/textproc/R-cran-xml2/Makefile b/textproc/R-cran-xml2/Makefile
index 67b46f3a2bdb..c35e1ac8257f 100644
--- a/textproc/R-cran-xml2/Makefile
+++ b/textproc/R-cran-xml2/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Parse XML
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	R-cran-Rcpp>=0.11.4.6:${PORTSDIR}/devel/R-cran-Rcpp \
-		R-cran-BH>0:${PORTSDIR}/devel/R-cran-BH
+RUN_DEPENDS=	R-cran-Rcpp>=0.11.4.6:devel/R-cran-Rcpp \
+		R-cran-BH>0:devel/R-cran-BH
 
 USES=	cran:auto-plist
 
diff --git a/textproc/ack/Makefile b/textproc/ack/Makefile
index e5d707c7869d..9fe4255dbb99 100644
--- a/textproc/ack/Makefile
+++ b/textproc/ack/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Grep-like text finder for large trees of text
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-File-Next>=0.40:${PORTSDIR}/sysutils/p5-File-Next
+BUILD_DEPENDS=	p5-File-Next>=0.40:sysutils/p5-File-Next
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty
+TEST_DEPENDS=	bash:shells/bash \
+		p5-IO-Tty>=0:devel/p5-IO-Tty
 
 CONFLICTS_INSTALL=	ja-ack-[0-9]*
 
diff --git a/textproc/adabrowse/Makefile b/textproc/adabrowse/Makefile
index 304b6acfff7a..f82bda7c2686 100644
--- a/textproc/adabrowse/Makefile
+++ b/textproc/adabrowse/Makefile
@@ -13,7 +13,7 @@ COMMENT=	HTML generator for Ada 95 library unit specifications
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	asis>=2011:${PORTSDIR}/lang/asis
+BUILD_DEPENDS=	asis>=2011:lang/asis
 
 USES=		ada
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
diff --git a/textproc/aiksaurus-gtk/Makefile b/textproc/aiksaurus-gtk/Makefile
index 269971b05001..f6a78f14c3b8 100644
--- a/textproc/aiksaurus-gtk/Makefile
+++ b/textproc/aiksaurus-gtk/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-gtk
 
 COMMENT=	GTK+2 front-end for Aiksaurus, a thesaurus
 
-LIB_DEPENDS=	libAiksaurus.so:${PORTSDIR}/textproc/aiksaurus
+LIB_DEPENDS=	libAiksaurus.so:textproc/aiksaurus
 
 MASTERDIR=	${.CURDIR}/../aiksaurus
 PKGDIR=		${.CURDIR}
diff --git a/textproc/amberfish/Makefile b/textproc/amberfish/Makefile
index 332cf7fde952..b33c10a03c7d 100644
--- a/textproc/amberfish/Makefile
+++ b/textproc/amberfish/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/${PORTNAME}/Amberfish%20source%20-%20stable/${PORTVERSION}	\
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose text retrieval Software
 
-LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 
 USES=		gmake makeinfo
 GNU_CONFIGURE=	yes
diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile
index a88ecfa45c79..98a228682c98 100644
--- a/textproc/ant-xinclude-task/Makefile
+++ b/textproc/ant-xinclude-task/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	ant-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XInclude task for Jakarta Ant
 
-BUILD_DEPENDS=	${JAVAJARDIR}/xincluder.jar:${PORTSDIR}/textproc/xincluder
+BUILD_DEPENDS=	${JAVAJARDIR}/xincluder.jar:textproc/xincluder
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index 1d65758941b4..f390fefc673b 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Application for displaying Microsoft(R) Word documents
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/Docs/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:${PORTSDIR}/print/gsfonts
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:${PORTSDIR}/print/gsfonts
+BUILD_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:print/gsfonts
+RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:print/gsfonts
 
 USES=		cpe gmake shebangfix perl5
 CPE_VENDOR=	antiword_project
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index 9521dc82ea01..9619514b4a14 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Toolbox to build shallow-transfer machine translation systems
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	liblttoolbox3.so:${PORTSDIR}/textproc/lttoolbox \
-		libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	liblttoolbox3.so:textproc/lttoolbox \
+		libpcre.so:devel/pcre
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf pathfix pkgconfig libtool
 USE_GNOME=	libxml2 libxslt
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 3acd2872cfb9..6f7e95fbbfba 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Extensible reader/decompiler of files in CHM format
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm \
-		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/chm/chm.py:textproc/pychm \
+		${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32
 
 NO_BUILD=	yes
 USES=		cpe python:2 tar:bzip2
diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile
index 59c9949ae1aa..253ab14d7497 100644
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Free cross-platform English thesaurus
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libWN.so:${PORTSDIR}/textproc/wordnet
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libWN.so:textproc/wordnet
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool
@@ -28,6 +28,6 @@ LIBS+=		`pkg-config --libs gio-2.0`
 OPTIONS_DEFINE=	NOTIFY
 NOTIFY_DESC=	Popup word definition as notification
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 .include <bsd.port.mk>
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 72f664ce9b0a..29e732ba4102 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+RUN_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
 
 NO_ARCH=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/asciinema/Makefile b/textproc/asciinema/Makefile
index 95e428cb0a0e..be7359936d11 100644
--- a/textproc/asciinema/Makefile
+++ b/textproc/asciinema/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	textproc
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Terminal session recorder
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 
diff --git a/textproc/asm-xml/Makefile b/textproc/asm-xml/Makefile
index 7fbfa222dfbe..0b6a90b69817 100644
--- a/textproc/asm-xml/Makefile
+++ b/textproc/asm-xml/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very fast XML parser and decoder written in pure assembler
 
-BUILD_DEPENDS=	fasm:${PORTSDIR}/lang/fasm
+BUILD_DEPENDS=	fasm:lang/fasm
 
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		dos2unix uidfix
diff --git a/textproc/aspell-ispell/Makefile b/textproc/aspell-ispell/Makefile
index b6a4e1ad374e..795ea556fc71 100644
--- a/textproc/aspell-ispell/Makefile
+++ b/textproc/aspell-ispell/Makefile
@@ -13,7 +13,7 @@ LICENSE=	LGPL21
 
 CONFLICTS+=	ispell* ??-ispell*
 
-RUN_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+RUN_DEPENDS=	aspell:textproc/aspell
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/ispell \
diff --git a/textproc/aspell/Makefile.inc b/textproc/aspell/Makefile.inc
index 2bd9e70966aa..ba10e608d233 100644
--- a/textproc/aspell/Makefile.inc
+++ b/textproc/aspell/Makefile.inc
@@ -5,7 +5,7 @@ MASTER_SITES?=	GNU/aspell/dict/${DICT}
 DISTNAME?=	aspell${DISTVERSION}
 PORTVERSION?=	${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	libaspell.so:textproc/aspell
 
 USES+=		gmake tar:bzip2
 HAS_CONFIGURE=	yes
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index 30f63bc5623a..e00eafdd9f03 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Configuration editing tool
 
 LICENSE=	LGPL21
 
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
+TEST_DEPENDS=	bash:shells/bash \
+		gsed:textproc/gsed
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf cpe gmake libtool pkgconfig readline
diff --git a/textproc/bibtex2html/Makefile b/textproc/bibtex2html/Makefile
index 0a48a0404c91..53413e6a712e 100644
--- a/textproc/bibtex2html/Makefile
+++ b/textproc/bibtex2html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.lri.fr/~filliatr/ftp/bibtex2html/
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Tools for searching BibTeX and translating from BibTeX to HTML
 
-BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
+BUILD_DEPENDS=	ocaml:lang/ocaml
 
 USES=		perl5
 GNU_CONFIGURE=	yes
@@ -20,7 +20,7 @@ PDFDOCS_DESC=	${DOCS_DESC}
 
 PDFDOCS_CONFIGURE_ENABLE=	doc
 PDFDOCS_USE=	TEX=latex:build
-PDFDOCS_BUILD_DEPENDS=	hevea:${PORTSDIR}/textproc/hevea
+PDFDOCS_BUILD_DEPENDS=	hevea:textproc/hevea
 PDFDOCS_INSTALL_TARGET=	install install-doc
 
 PLIST_FILES=	bin/aux2bib bin/bib2bib bin/bibtex2html \
diff --git a/textproc/cbedic/Makefile b/textproc/cbedic/Makefile
index 61b9d96203f9..af7512cdb849 100644
--- a/textproc/cbedic/Makefile
+++ b/textproc/cbedic/Makefile
@@ -14,7 +14,7 @@ BROKEN=		unfetchable
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${DICT_DIR}/${DICT_CHECK}:${PORTSDIR}/textproc/bedic-data
+RUN_DEPENDS=	${DICT_DIR}/${DICT_CHECK}:textproc/bedic-data
 
 DICT_CHECK?=	buleng.dat
 DICT_DIR?=	${LOCALBASE}/share
diff --git a/textproc/cgrep/Makefile b/textproc/cgrep/Makefile
index f3685f520cb0..18319a52e802 100644
--- a/textproc/cgrep/Makefile
+++ b/textproc/cgrep/Makefile
@@ -11,16 +11,16 @@ COMMENT=	Context-aware grep for source codes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
-		hs-ansi-terminal>=0.5:${PORTSDIR}/devel/hs-ansi-terminal \
-		hs-cmdargs>=0.10:${PORTSDIR}/devel/hs-cmdargs \
-		hs-dlist>=0.3:${PORTSDIR}/devel/hs-dlist \
-		hs-regex-posix>=0.90:${PORTSDIR}/textproc/hs-regex-posix \
-		hs-safe>=0.3:${PORTSDIR}/devel/hs-safe \
-		hs-split>=0.2:${PORTSDIR}/devel/hs-split \
-		hs-stm>=2.1:${PORTSDIR}/devel/hs-stm \
-		hs-stringsearch>=0.3:${PORTSDIR}/textproc/hs-stringsearch \
-		hs-unordered-containers>=0.1:${PORTSDIR}/devel/hs-unordered-containers
+BUILD_DEPENDS=	ghc:lang/ghc \
+		hs-ansi-terminal>=0.5:devel/hs-ansi-terminal \
+		hs-cmdargs>=0.10:devel/hs-cmdargs \
+		hs-dlist>=0.3:devel/hs-dlist \
+		hs-regex-posix>=0.90:textproc/hs-regex-posix \
+		hs-safe>=0.3:devel/hs-safe \
+		hs-split>=0.2:devel/hs-split \
+		hs-stm>=2.1:devel/hs-stm \
+		hs-stringsearch>=0.3:textproc/hs-stringsearch \
+		hs-unordered-containers>=0.1:devel/hs-unordered-containers
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	awgn
diff --git a/textproc/chm2pdf/Makefile b/textproc/chm2pdf/Makefile
index ef0887dfec60..93a0dc644745 100644
--- a/textproc/chm2pdf/Makefile
+++ b/textproc/chm2pdf/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python script that converts CHM files into PDF files
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	htmldoc:${PORTSDIR}/textproc/htmldoc \
-		${PYTHON_SITELIBDIR}/chm/chm.py:${PORTSDIR}/textproc/pychm
+RUN_DEPENDS=	htmldoc:textproc/htmldoc \
+		${PYTHON_SITELIBDIR}/chm/chm.py:textproc/pychm
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/textproc/chpp/Makefile b/textproc/chpp/Makefile
index b46bc99f90f7..b3a7b8a802fd 100644
--- a/textproc/chpp/Makefile
+++ b/textproc/chpp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Non-intrusive full-featured text preprocessor
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
 USES=		autoreconf gmake makeinfo
 GNU_CONFIGURE=	yes
diff --git a/textproc/cl-meta-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile
index f0ecdb65581e..bbc0e826373e 100644
--- a/textproc/cl-meta-sbcl/Makefile
+++ b/textproc/cl-meta-sbcl/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Parser generator for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:${PORTSDIR}/textproc/cl-meta
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:${PORTSDIR}/textproc/cl-meta
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:textproc/cl-meta
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/meta/meta.asd:textproc/cl-meta
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile
index a30fe43304cc..03cc8adeed36 100644
--- a/textproc/cl-ppcre-sbcl/Makefile
+++ b/textproc/cl-ppcre-sbcl/Makefile
@@ -10,8 +10,8 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Portable Perl-Compatible Regular Expression for Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:${PORTSDIR}/textproc/cl-ppcre
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:textproc/cl-ppcre
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/cl-ppcre/cl-ppcre.asd:textproc/cl-ppcre
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 2a6635259b32..c809d70cd49b 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -14,7 +14,7 @@ COMMENT=	CLucene is a C++ port of Lucene
 LICENSE=	APACHE20 LGPL21
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/lib/libboost_regex.a:devel/boost-libs
 
 USES=		cmake ninja
 USE_LDCONFIG=	yes
diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile
index 5807aeba9427..86e1e441f2a3 100644
--- a/textproc/coccigrep/Makefile
+++ b/textproc/coccigrep/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Semantic grep for the C language
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	spatch:${PORTSDIR}/devel/coccinelle
+RUN_DEPENDS=	spatch:devel/coccinelle
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	regit
diff --git a/textproc/confetti/Makefile b/textproc/confetti/Makefile
index 1ee241d7665f..366eade28bc6 100644
--- a/textproc/confetti/Makefile
+++ b/textproc/confetti/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/vg
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Configuration file parser generator
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		bison perl5 gmake tar:bzip2
 DATE=		20120801
diff --git a/textproc/confget/Makefile b/textproc/confget/Makefile
index 8e7f4b0b8278..ef2c3e786e85 100644
--- a/textproc/confget/Makefile
+++ b/textproc/confget/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	bin/confget \
 		man/man1/confget.1.gz
 PORTEXAMPLES=	t1.ini t2.ini
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_MAKE_ENV_OFF=	PCRE_CFLAGS="" PCRE_LIBS=""
 
 do-install:
diff --git a/textproc/consul-template/Makefile b/textproc/consul-template/Makefile
index f291b3b6a532..edf65ea43cd8 100644
--- a/textproc/consul-template/Makefile
+++ b/textproc/consul-template/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	textproc
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generic template rendering and notifications with Consul
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp:DEFAULT,consul,go_multierror,go_syslog,hcl,logutils \
diff --git a/textproc/csv2latex/Makefile b/textproc/csv2latex/Makefile
index fd14df3d398d..22538eff1f75 100644
--- a/textproc/csv2latex/Makefile
+++ b/textproc/csv2latex/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Converts a well formed csv file to a LaTeX document
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
+BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	bin/csv2latex man/man1/${PORTNAME}.1.gz
diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile
index a6d172cf377d..b79a835198ea 100644
--- a/textproc/ctpp2/Makefile
+++ b/textproc/ctpp2/Makefile
@@ -28,7 +28,7 @@ OPTIONS_SUB=	yes
 
 DEBUG_CMAKE_ON=	-DDEBUG_MODE=ON
 DEBUG_CMAKE_OFF=	-DDEBUG_MODE=OFF
-DOCS_BUILD_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils
+DOCS_BUILD_DEPENDS=	rst2html:textproc/py-docutils
 DOCS_CMAKE_ON=	-DENABLE_DOCS=ON
 DOCS_CMAKE_OFF=	-DENABLE_DOCS=OFF
 MD5_CMAKE_ON=	-DMD5_SUPPORT=ON
diff --git a/textproc/db2latex/Makefile b/textproc/db2latex/Makefile
index 1f2605532525..2f302efe8d72 100644
--- a/textproc/db2latex/Makefile
+++ b/textproc/db2latex/Makefile
@@ -14,9 +14,9 @@ COMMENT=	DocBook to LaTeX XSL stylesheets
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
+RUN_DEPENDS=	xsltproc:textproc/libxslt \
+		docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/VERSION:textproc/docbook-xsl
 
 NO_BUILD=	yes
 
diff --git a/textproc/dbacl/Makefile b/textproc/dbacl/Makefile
index d6f2206516b4..aa26f433bc55 100644
--- a/textproc/dbacl/Makefile
+++ b/textproc/dbacl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Digramic Bayesian classifier
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index 06c0084750a9..ac658a03a718 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook to LaTeX/ConTeXt Publishing
 
-BUILD_DEPENDS=	${LOCALBASE}/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty:${PORTSDIR}/print/texlive-texmf
-RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	${LOCALBASE}/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty:print/texlive-texmf
+RUN_DEPENDS=	xsltproc:textproc/libxslt \
+		docbook-xml>0:textproc/docbook-xml
 
 USES=		tar:bzip2 python:2
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/denature/Makefile b/textproc/denature/Makefile
index 28f1d062067b..8faa0a1a84dd 100644
--- a/textproc/denature/Makefile
+++ b/textproc/denature/Makefile
@@ -12,11 +12,11 @@ COMMENT=	HTML to PDF converter
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-CSS-Tiny>=0:${PORTSDIR}/textproc/p5-CSS-Tiny \
-		fop:${PORTSDIR}/textproc/fop
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-CSS-Tiny>=0:textproc/p5-CSS-Tiny \
+		fop:textproc/fop
 
 USES=		perl5
 USE_JAVA=	yes
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index fceac3e04c7f..dff30cf721ef 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Dictionary Server Protocol (RFC2229) client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmaa.so:${PORTSDIR}/devel/libmaa
+LIB_DEPENDS=	libmaa.so:devel/libmaa
 
 ALL_TARGET=	dict
 GNU_CONFIGURE=	yes
diff --git a/textproc/dictem/Makefile b/textproc/dictem/Makefile
index 65d7cbb99132..76723ce6f829 100644
--- a/textproc/dictem/Makefile
+++ b/textproc/dictem/Makefile
@@ -13,7 +13,7 @@ COMMENT=	DictEm is a dict client for [X]Emacs
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dict:${PORTSDIR}/textproc/dict
+RUN_DEPENDS=	${LOCALBASE}/bin/dict:textproc/dict
 
 USE_EMACS=	yes
 
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 876e7d1993a5..aa3ade67a0a7 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Formats a DICT protocol dictionary database
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmaa.so:${PORTSDIR}/devel/libmaa
+LIB_DEPENDS=	libmaa.so:devel/libmaa
 
 ALL_TARGET=	dictfmt
 GNU_CONFIGURE=	yes
diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile
index 0eead88bbfcc..0b75c09e11d1 100644
--- a/textproc/diffutils/Makefile
+++ b/textproc/diffutils/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The GNU diff utilities
 
-LIB_DEPENDS=	libsigsegv.so:${PORTSDIR}/devel/libsigsegv
+LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
 
 USES=		charsetfix tar:xz
 GNU_CONFIGURE=	yes
diff --git a/textproc/docbook-sgml/Makefile b/textproc/docbook-sgml/Makefile
index 35c0f3fabc6f..aa30728f7df8 100644
--- a/textproc/docbook-sgml/Makefile
+++ b/textproc/docbook-sgml/Makefile
@@ -11,8 +11,8 @@ DISTFILES=	${DBFILES:C,.*:(.*),\1.zip:\1,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	DocBook SGML DTD
 
-RUN_DEPENDS=	${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${LOCALBASE}/${ISOCAT}:textproc/iso8879 \
+		${LOCALBASE}/${XMLCATMGR}:textproc/xmlcatmgr
 
 NO_BUILD=	yes
 
diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile
index d672d3c50450..2a32fc517ed5 100644
--- a/textproc/docbook-to-man/Makefile
+++ b/textproc/docbook-to-man/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook SGML DTD into nroff/troff -man macros converter
 
-RUN_DEPENDS=	docbook>0:${PORTSDIR}/textproc/docbook
+RUN_DEPENDS=	docbook>0:textproc/docbook
 
 USES=		imake
 XFREE86_HTML_MAN=	no
@@ -26,10 +26,10 @@ OPENJADE_DESC=	Use OpenJade SGML/XML/DSSSL toolkit instead of Jade
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENJADE}
-RUN_DEPENDS+=	onsgmls:${PORTSDIR}/textproc/openjade
+RUN_DEPENDS+=	onsgmls:textproc/openjade
 NSGMLS=		onsgmls
 .else
-RUN_DEPENDS+=	nsgmls:${PORTSDIR}/textproc/jade
+RUN_DEPENDS+=	nsgmls:textproc/jade
 NSGMLS=		nsgmls
 .endif
 
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index dceb1d8abf48..8f3cd0d9e00d 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	SOURCEWARE/docbook-tools/new-trials/SOURCES
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Generates various output formats from DocBook SGML documents
 
-BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
-		dsssl-docbook-modular>0:${PORTSDIR}/textproc/dsssl-docbook-modular \
-		nsgmls:${PORTSDIR}/textproc/jade
-RUN_DEPENDS+=	dsssl-docbook-modular>0:${PORTSDIR}/textproc/dsssl-docbook-modular \
-		nsgmls:${PORTSDIR}/textproc/jade \
-		sgmlspl:${PORTSDIR}/textproc/p5-SGMLSpm \
-		lynx:${PORTSDIR}/www/lynx
+BUILD_DEPENDS+=	docbook-sgml>0:textproc/docbook-sgml \
+		dsssl-docbook-modular>0:textproc/dsssl-docbook-modular \
+		nsgmls:textproc/jade
+RUN_DEPENDS+=	dsssl-docbook-modular>0:textproc/dsssl-docbook-modular \
+		nsgmls:textproc/jade \
+		sgmlspl:textproc/p5-SGMLSpm \
+		lynx:www/lynx
 
 CONFLICTS=	docbook2X-*
 
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 367a80f5caca..fe5272601b73 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -11,10 +11,10 @@ DISTFILES=	${DBFILES:C,.*:(.*),\1.zip:\1,:C,:docbook-xml-([0-9]+).([0-9]+).?([0-
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	DocBook XML DTD
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xml/xmlcharent/catalog.xml:${PORTSDIR}/textproc/xmlcharent \
-		${XMLCATMGR_CMD}:${PORTSDIR}/textproc/xmlcatmgr
-RUN_DEPENDS=	${LOCALBASE}/share/xml/xmlcharent/catalog.xml:${PORTSDIR}/textproc/xmlcharent \
-		${XMLCATMGR_CMD}:${PORTSDIR}/textproc/xmlcatmgr
+BUILD_DEPENDS=	${LOCALBASE}/share/xml/xmlcharent/catalog.xml:textproc/xmlcharent \
+		${XMLCATMGR_CMD}:textproc/xmlcatmgr
+RUN_DEPENDS=	${LOCALBASE}/share/xml/xmlcharent/catalog.xml:textproc/xmlcharent \
+		${XMLCATMGR_CMD}:textproc/xmlcatmgr
 
 NO_BUILD=	yes
 
diff --git a/textproc/docbook-xsl-ns/Makefile b/textproc/docbook-xsl-ns/Makefile
index f05a84d66604..8d1b44e9e727 100644
--- a/textproc/docbook-xsl-ns/Makefile
+++ b/textproc/docbook-xsl-ns/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Namespace-aware DocBook XSLT stylesheets
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
-RUN_DEPENDS=	docbook>=0:${PORTSDIR}/textproc/docbook \
-		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+BUILD_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
+RUN_DEPENDS=	docbook>=0:textproc/docbook \
+		xmlcatmgr:textproc/xmlcatmgr
 
 USES=	tar:bzip2
 NO_BUILD=	yes
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index b1553d044f92..65d87ee2b53a 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -11,9 +11,9 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	XSL DocBook stylesheets
 
-BUILD_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
-RUN_DEPENDS=	docbook>=0:${PORTSDIR}/textproc/docbook \
-		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+BUILD_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
+RUN_DEPENDS=	docbook>=0:textproc/docbook \
+		xmlcatmgr:textproc/xmlcatmgr
 
 USES=	tar:bzip2
 NO_BUILD=	yes
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 9370bcf80bf1..3157c41fb8bb 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -8,9 +8,9 @@ CATEGORIES=	textproc
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	Meta-port for the different versions of the DocBook DTD
 
-RUN_DEPENDS=	${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook-sgml \
-		${LOCALBASE}/share/xml/docbook/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
-		sdocbook-xml>0:${PORTSDIR}/textproc/sdocbook-xml
+RUN_DEPENDS=	${LOCALBASE}/share/sgml/docbook/catalog:textproc/docbook-sgml \
+		${LOCALBASE}/share/xml/docbook/catalog.xml:textproc/docbook-xml \
+		sdocbook-xml>0:textproc/sdocbook-xml
 
 USES=		metaport
 
diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile
index e03a05e0d2e9..ebcd9671f279 100644
--- a/textproc/docbook2X/Makefile
+++ b/textproc/docbook2X/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Convert DocBook documents into UNIX man page and GNU Texinfo formats
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	OpenSP>=0:${PORTSDIR}/textproc/opensp \
-		dsssl-docbook-modular>=0:${PORTSDIR}/textproc/dsssl-docbook-modular \
-		p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Expat>=0:${PORTSDIR}/textproc/p5-XML-SAX-Expat \
-		sdocbook-xml>=0:${PORTSDIR}/textproc/sdocbook-xml
+BUILD_DEPENDS=	OpenSP>=0:textproc/opensp \
+		dsssl-docbook-modular>=0:textproc/dsssl-docbook-modular \
+		p5-XML-NamespaceSupport>=0:textproc/p5-XML-NamespaceSupport \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-SAX-Expat>=0:textproc/p5-XML-SAX-Expat \
+		sdocbook-xml>=0:textproc/sdocbook-xml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS_INSTALL=	docbook-utils-*
diff --git a/textproc/docbook2mdoc/Makefile b/textproc/docbook2mdoc/Makefile
index ba302096ab14..57aa2f875a09 100644
--- a/textproc/docbook2mdoc/Makefile
+++ b/textproc/docbook2mdoc/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Convert DocBook refentry to mdoc
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 PLIST_FILES=	bin/docbook2mdoc \
 		man/man1/docbook2mdoc.1.gz
diff --git a/textproc/docbook2odf/Makefile b/textproc/docbook2odf/Makefile
index 89bf7a03b5cb..68c31c2eb78a 100644
--- a/textproc/docbook2odf/Makefile
+++ b/textproc/docbook2odf/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Convert docbook document to Oasis Open Document
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsablot.so:${PORTSDIR}/textproc/sablotron \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
-		zip:${PORTSDIR}/archivers/zip \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip
+LIB_DEPENDS=	libsablot.so:textproc/sablotron \
+		libxslt.so:textproc/libxslt
+RUN_DEPENDS=	convert:graphics/ImageMagick \
+		zip:archivers/zip \
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip
 
 USES=		desktop-file-utils perl5 shebangfix
 SHEBANG_FILES=	utils/maketests utils/${PORTNAME}
diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile
index 7298b5acc8c7..4881f6780030 100644
--- a/textproc/doclifter/Makefile
+++ b/textproc/doclifter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.catb.org/~esr/doclifter/
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Translates documents written in troff macros to DocBook
 
-RUN_DEPENDS+=	python2:${PORTSDIR}/lang/python2
+RUN_DEPENDS+=	python2:lang/python2
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	manlifter
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 2bd67b23c338..420e9518399b 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -9,19 +9,19 @@ CATEGORIES=	textproc
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	The "meta-port" for the FreeBSD Documentation Project
 
-RUN_DEPENDS=	links:${PORTSDIR}/www/links1 \
-		pngtopnm:${PORTSDIR}/graphics/netpbm \
-		scr2png:${PORTSDIR}/graphics/scr2png \
-		scr2txt:${PORTSDIR}/textproc/scr2txt \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		peps:${PORTSDIR}/graphics/peps \
-		${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \
-		docbook-xsl-ns>=1.78.1_4:${PORTSDIR}/textproc/docbook-xsl-ns \
-		${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:${PORTSDIR}/textproc/iso-schematron-xslt \
-		docbook>0:${PORTSDIR}/textproc/docbook \
-		${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
-		p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \
-		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	links:www/links1 \
+		pngtopnm:graphics/netpbm \
+		scr2png:graphics/scr2png \
+		scr2txt:textproc/scr2txt \
+		xsltproc:textproc/libxslt \
+		peps:graphics/peps \
+		${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:textproc/xhtml \
+		docbook-xsl-ns>=1.78.1_4:textproc/docbook-xsl-ns \
+		${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:textproc/iso-schematron-xslt \
+		docbook>0:textproc/docbook \
+		${LOCALBASE}/share/xml/xmlcharent/catalog:textproc/xmlcharent \
+		p5-XML-Parser>=2.41:textproc/p5-XML-Parser \
+		zip:archivers/zip
 
 USES=		ghostscript:run metaport perl5
 USE_PERL5=	run
@@ -32,30 +32,30 @@ OPTIONS_DEFAULT=	        CJK     IGOR
 OPTIONS_DEFAULT+=	SVN
 .endif
 CJK_DESC=		CJK support
-CJK_RUN_DEPENDS=	html2text:${PORTSDIR}/textproc/html2text
+CJK_RUN_DEPENDS=	html2text:textproc/html2text
 SVN_DESC=		Subversion support (required to check out sources)
-SVN_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+SVN_RUN_DEPENDS=	svn:devel/subversion
 IGOR_DESC=		Igor automated proofreader for documentation
-IGOR_RUN_DEPENDS=	igor:${PORTSDIR}/textproc/igor
+IGOR_RUN_DEPENDS=	igor:textproc/igor
 FOP_DESC=		FOP PDF renderer (requires Java)
-FOP_RUN_DEPENDS=	fop:${PORTSDIR}/textproc/fop \
+FOP_RUN_DEPENDS=	fop:textproc/fop \
 			${FONTS}
 JING_DESC=		Jing for advanced RELAX NG validation (optional)
-JING_RUN_DEPENDS=	jing:${PORTSDIR}/textproc/jing
+JING_RUN_DEPENDS=	jing:textproc/jing
 DBLATEX_DESC=		dblatex PDF renderer (experimental, requires TeXLive)
-DBLATEX_RUN_DEPENDS=	dblatex:${PORTSDIR}/textproc/dblatex \
+DBLATEX_RUN_DEPENDS=	dblatex:textproc/dblatex \
 			${FONTS}
 DBLATEX_USE=		TEX=xetex
 TRANSLATOR_DESC=	Tools for translators
-TRANSLATOR_RUN_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+TRANSLATOR_RUN_DEPENDS=	itstool:textproc/itstool
 
-FONTS=	${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
-	${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
-	${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
-	${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu
-FONTS_CJK=${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
-	${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa \
-	${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:${PORTSDIR}/korean/nanumfonts-ttf
+FONTS=	${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:x11-fonts/gentium-plus \
+	${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \
+	${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:x11-fonts/lohit \
+	${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:x11-fonts/dejavu
+FONTS_CJK=${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf \
+	${LOCALBASE}/share/fonts/OTF/ipam.otf:japanese/font-ipa \
+	${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:korean/nanumfonts-ttf
 
 .include <bsd.port.options.mk>
 
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index 5c524c6b5807..f797869a965e 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight implementation of the DOM in ANSI C
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libmba.so:${PORTSDIR}/devel/libmba
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libmba.so:devel/libmba
 
 USES=		gmake
 MAKE_ENV=	prefix="${LOCALBASE}" INSTDIR="${STAGEDIR}${PREFIX}"
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 9cfff584e434..3c2620f87e8a 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	DSSSL stylesheets for the DocBook DTD by Norman Walsh
 
-BUILD_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+BUILD_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_MTREE=	yes
diff --git a/textproc/dtd-catalogs/Makefile b/textproc/dtd-catalogs/Makefile
index be4f605bd3be..a7f9783cae89 100644
--- a/textproc/dtd-catalogs/Makefile
+++ b/textproc/dtd-catalogs/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	textproc
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SGML DTDs catalogs
 
-RUN_DEPENDS=	${ISO8879_CAT}:${PORTSDIR}/textproc/iso8879 \
-		${ISO12083_CAT}:${PORTSDIR}/textproc/iso12083 \
-		${HTML_CAT}:${PORTSDIR}/textproc/html \
-		${LINUXDOC_CAT}:${PORTSDIR}/textproc/linuxdoc
+RUN_DEPENDS=	${ISO8879_CAT}:textproc/iso8879 \
+		${ISO12083_CAT}:textproc/iso12083 \
+		${HTML_CAT}:textproc/html \
+		${LINUXDOC_CAT}:textproc/linuxdoc
 
 USES=		metaport
 
diff --git a/textproc/dtdparse/Makefile b/textproc/dtdparse/Makefile
index 33083abb43ed..909ff8c60a99 100644
--- a/textproc/dtdparse/Makefile
+++ b/textproc/dtdparse/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	SGML-DTDParse-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse a DTD and produce an XML document that represents it
 
-RUN_DEPENDS=	p5-DelimMatch>=0:${PORTSDIR}/textproc/p5-DelimMatch \
-		p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+RUN_DEPENDS=	p5-DelimMatch>=0:textproc/p5-DelimMatch \
+		p5-XML-DOM>=0:textproc/p5-XML-DOM
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index fd3504465d69..acec742a9acd 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -22,7 +22,7 @@ NLS_CONFIGURE_WITH=	gettext
 NLS_USES=	gettext
 
 UNICODE_CONFIGURE_WITH=	unicode
-UNICODE_LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu
+UNICODE_LIB_DEPENDS=	libicudata.so:devel/icu
 
 HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/ebook-tools/Makefile b/textproc/ebook-tools/Makefile
index 1b2171963773..7e6beea0216c 100644
--- a/textproc/ebook-tools/Makefile
+++ b/textproc/ebook-tools/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Accesses and converts various ebook file formats
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libzip.so:archivers/libzip
 
 USES=		cmake
 USE_LDCONFIG=	yes
diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile
index be032fb45c8d..5b90addecc02 100644
--- a/textproc/ecromedos/Makefile
+++ b/textproc/ecromedos/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Document preparation system that allows concurrent publication
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_SITELIBDIR}/libxslt.py:${PORTSDIR}/textproc/py-libxslt \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		pygmentize:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt \
+		convert:graphics/ImageMagick \
+		pygmentize:textproc/py-pygments
 
 NO_BUILD=	yes
 
diff --git a/textproc/elasticsearch-plugin-hq/Makefile b/textproc/elasticsearch-plugin-hq/Makefile
index 23c55264e096..8b3f9db0c370 100644
--- a/textproc/elasticsearch-plugin-hq/Makefile
+++ b/textproc/elasticsearch-plugin-hq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	ElasticSearch HQ Plugin
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	elasticsearch>=1.7.0:${PORTSDIR}/textproc/elasticsearch
+RUN_DEPENDS=	elasticsearch>=1.7.0:textproc/elasticsearch
 
 CONFLICTS=	elasticsearch2-plugin-hq-2.*
 
diff --git a/textproc/elasticsearch-plugin-marvel/Makefile b/textproc/elasticsearch-plugin-marvel/Makefile
index eef961dfe7fb..f0fe13c64ce0 100644
--- a/textproc/elasticsearch-plugin-marvel/Makefile
+++ b/textproc/elasticsearch-plugin-marvel/Makefile
@@ -16,7 +16,7 @@ LICENSE_TEXT=	License available from Elasticsearch for production use.
 LICENSE_TEXT+=	See http://www.elasticsearch.com/marvel/ for more details.
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell no-auto-accept
 
-RUN_DEPENDS:=	elasticsearch>=0.90.9:${PORTSDIR}/textproc/elasticsearch
+RUN_DEPENDS:=	elasticsearch>=0.90.9:textproc/elasticsearch
 
 NO_BUILD=	yes
 LEGAL_TEXT=	${LICENSE_NAME_COMMERCIAL}
diff --git a/textproc/elasticsearch-plugin-sql/Makefile b/textproc/elasticsearch-plugin-sql/Makefile
index 82963a7605d8..38156eb3239d 100644
--- a/textproc/elasticsearch-plugin-sql/Makefile
+++ b/textproc/elasticsearch-plugin-sql/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ElasticSearch SQL plugin
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	elasticsearch>=1.7.0:${PORTSDIR}/textproc/elasticsearch
+RUN_DEPENDS=	elasticsearch>=1.7.0:textproc/elasticsearch
 
 CONFLICTS=      elasticsearch2-plugin-sql-2.*
 
diff --git a/textproc/elasticsearch-river-rabbitmq/Makefile b/textproc/elasticsearch-river-rabbitmq/Makefile
index e323816e5e37..c10d52323be7 100644
--- a/textproc/elasticsearch-river-rabbitmq/Makefile
+++ b/textproc/elasticsearch-river-rabbitmq/Makefile
@@ -13,7 +13,7 @@ COMMENT=	ElasticSearch RabbitMQ River
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	elasticsearch>=1.6.0:${PORTSDIR}/textproc/elasticsearch
+RUN_DEPENDS=	elasticsearch>=1.6.0:textproc/elasticsearch
 
 USES=		zip
 
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index eb16d8199132..8d98186e215b 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Full-text search engine for Java
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	java-sigar>=0:${PORTSDIR}/java/sigar
+RUN_DEPENDS=	java-sigar>=0:java/sigar
 
 CONFLICTS=	elasticsearch2-[0-9]*
 
diff --git a/textproc/elasticsearch2-plugin-hq/Makefile b/textproc/elasticsearch2-plugin-hq/Makefile
index 4f791410041e..47d7c80f32e1 100644
--- a/textproc/elasticsearch2-plugin-hq/Makefile
+++ b/textproc/elasticsearch2-plugin-hq/Makefile
@@ -11,7 +11,7 @@ COMMENT=	ElasticSearch HQ Plugin
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	elasticsearch2>=2.0.0:${PORTSDIR}/textproc/elasticsearch2
+RUN_DEPENDS=	elasticsearch2>=2.0.0:textproc/elasticsearch2
 
 CONFLICTS=	elasticsearch-plugin-hq-1.*
 
diff --git a/textproc/elasticsearch2-plugin-marvel/Makefile b/textproc/elasticsearch2-plugin-marvel/Makefile
index 336bd8f77c7a..047ec1d751dd 100644
--- a/textproc/elasticsearch2-plugin-marvel/Makefile
+++ b/textproc/elasticsearch2-plugin-marvel/Makefile
@@ -20,7 +20,7 @@ LICENSE_TEXT=	License available from Elasticsearch for production use.
 LICENSE_TEXT+=	See http://www.elasticsearch.com/marvel/ for more details.
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell no-auto-accept
 
-RUN_DEPENDS:=	elasticsearch2>2.0.0:${PORTSDIR}/textproc/elasticsearch2
+RUN_DEPENDS:=	elasticsearch2>2.0.0:textproc/elasticsearch2
 
 NO_BUILD=	yes
 LEGAL_TEXT=	${LICENSE_NAME_COMMERCIAL}
diff --git a/textproc/elasticsearch2-plugin-sql/Makefile b/textproc/elasticsearch2-plugin-sql/Makefile
index a68b6fcdb2b0..9e0f94dc984c 100644
--- a/textproc/elasticsearch2-plugin-sql/Makefile
+++ b/textproc/elasticsearch2-plugin-sql/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ElasticSearch SQL plugin
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	elasticsearch2>=2.1.0:${PORTSDIR}/textproc/elasticsearch2
+RUN_DEPENDS=	elasticsearch2>=2.1.0:textproc/elasticsearch2
 
 CONFLICTS=      elasticsearch-plugin-sql-1.*
 
diff --git a/textproc/emacs-wiki/Makefile b/textproc/emacs-wiki/Makefile
index d9079b0240d7..84772be618e3 100644
--- a/textproc/emacs-wiki/Makefile
+++ b/textproc/emacs-wiki/Makefile
@@ -19,8 +19,8 @@ OPTIONS_DEFINE=	CONTRIB
 CONTRIB_DESC=	Install extra packages. This can shadow versions already there.
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/xml-parse.el:${PORTSDIR}/textproc/xml-parse.el
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/htmlize.el:${PORTSDIR}/textproc/htmlize.el
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/xml-parse.el:textproc/xml-parse.el
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_SITE_LISPDIR}/htmlize.el:textproc/htmlize.el
 
 INFO=		emacs-wiki
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index e32a7bc87c29..e3101e37eda8 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -31,23 +31,23 @@ HSPELL_DESC=	Spell checking via Hspell
 HUNSPELL_DESC=	Spell checking via Hunspell
 ZEMBEREK_DESC=	Spell checking via Zemberek
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ENABLE=	aspell
 ASPELL_CONFIGURE_ON=	--with-aspell-prefix=${LOCALBASE}
 
-HSPELL_BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
+HSPELL_BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:hebrew/hspell
 HSPELL_CONFIGURE_ENABLE=	hspell
 HSPELL_CONFIGURE_ON=	--with-hspell-prefix=${LOCALBASE}
 
-HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 HUNSPELL_CONFIGURE_ENABLE=	myspell
 HUNSPELL_CONFIGURE_ON=	--with-system-myspell=yes \
 			--with-myspell-dir=${LOCALBASE}/share/hunspell
 
-ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_CONFIGURE_ENABLE=	ispell
 
-ZEMBEREK_LIb_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+ZEMBEREK_LIb_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 ZEMBEREK_CONFIGURE_ENABLE=	zemberek
 
 post-patch:
diff --git a/textproc/eqe/Makefile b/textproc/eqe/Makefile
index 0eef7ce22fb7..465ee64d08e5 100644
--- a/textproc/eqe/Makefile
+++ b/textproc/eqe/Makefile
@@ -13,10 +13,10 @@ COMMENT=	LaTeX equation editor
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/GPL.txt
 
-BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		Magick++-config:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		Magick++-config:graphics/ImageMagick
 
 USES=		perl5 shebangfix tar:bzip2
 SHEBANG_FILES=	src/eqe src/eqedit
diff --git a/textproc/erlang-p1xml/Makefile b/textproc/erlang-p1xml/Makefile
index b89a9516ac63..405c05c1323d 100644
--- a/textproc/erlang-p1xml/Makefile
+++ b/textproc/erlang-p1xml/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fast Expat based Erlang XML parsing library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		erlang:rebar
 USE_GITHUB=	yes
diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile
index 0a8d846f8fb3..57a7479f4569 100644
--- a/textproc/estraier/Makefile
+++ b/textproc/estraier/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://fallabs.com/estraier/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search system for personal use
 
-LIB_DEPENDS=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	libqdbm.so:databases/qdbm
 
 USES=		iconv
 GNU_CONFIGURE=	yes
@@ -27,16 +27,16 @@ CHASEN_DESC=	Japanese Morphological Analysis Support
 MECAB_DESC=	Part-of-Speech and Morphological Analyzer
 KAKASI_DESC=	Language processing filter/converter
 
-CHASEN_LIB_DEPENDS=	libchasen.so:${PORTSDIR}/japanese/chasen-base
+CHASEN_LIB_DEPENDS=	libchasen.so:japanese/chasen-base
 CHASEN_CONFIGURE_ENABLE=	chasen
 
-KAKASI_LIB_DEPENDS=	libkakasi.so:${PORTSDIR}/japanese/kakasi
+KAKASI_LIB_DEPENDS=	libkakasi.so:japanese/kakasi
 KAKASI_CONFIGURE_ENABLE=	kakasi
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMECAB} && ${ARCH} == "i386"
-LIB_DEPENDS+=	libmecab.so:${PORTSDIR}/japanese/mecab
+LIB_DEPENDS+=	libmecab.so:japanese/mecab
 CONFIGURE_ARGS+=	--enable-mecab
 .endif
 
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index b28b93d04769..50b72683dc52 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Port of Adobe XMP SDK to work on UNIX
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-unittest=no
diff --git a/textproc/extract_url/Makefile b/textproc/extract_url/Makefile
index d6d984a60034..be1efb1b02c9 100644
--- a/textproc/extract_url/Makefile
+++ b/textproc/extract_url/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl script that extracts URLs from email in MIME or plain text format
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake perl5
@@ -40,10 +40,10 @@ URLVIEW_DESC=		Uses urlview for the URL selector menu
 
 OPTIONS_SUB=	yes
 
-CURSES_UI_RUN_DEPENDS=		p5-Curses-UI>=0:${PORTSDIR}/devel/p5-Curses-UI
-GETOPT_LONG_RUN_DEPENDS=	p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long
-URLVIEW_RUN_DEPENDS=		urlview>=0:${PORTSDIR}/textproc/urlview
-URI_FIND_RUN_DEPENDS=		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find
+CURSES_UI_RUN_DEPENDS=		p5-Curses-UI>=0:devel/p5-Curses-UI
+GETOPT_LONG_RUN_DEPENDS=	p5-Getopt-Long>=0:devel/p5-Getopt-Long
+URLVIEW_RUN_DEPENDS=		urlview>=0:textproc/urlview
+URI_FIND_RUN_DEPENDS=		p5-URI-Find>=0:textproc/p5-URI-Find
 
 PORTDOCS=	AUTHORS NEWS README
 
diff --git a/textproc/fcitx-m17n/Makefile b/textproc/fcitx-m17n/Makefile
index deec5cc2f535..4ec6e8c7600b 100644
--- a/textproc/fcitx-m17n/Makefile
+++ b/textproc/fcitx-m17n/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multilingualization support for Fcitx
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libm17n.so:${PORTSDIR}/devel/m17n-lib
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libm17n.so:devel/m17n-lib
 
 USES=		cmake gettext pkgconfig tar:xz
 
diff --git a/textproc/fixrtf/Makefile b/textproc/fixrtf/Makefile
index 1cd078116758..f9dc2777cf25 100644
--- a/textproc/fixrtf/Makefile
+++ b/textproc/fixrtf/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Patch making it possible to embed PNGs into RTFs
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		uidfix
 WRKSRC=		${WRKDIR}/src
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 4117f614fbfc..8d633ec890a7 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Graphical diff program using FLTK
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index a0823d95bc64..d54c41defd20 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	https://github.com/westes/flex/releases/download/v${PORTVERSION}/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Fast lexical analyzer generator
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
-		gm4:${PORTSDIR}/devel/m4
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	help2man:misc/help2man \
+		gm4:devel/m4
+RUN_DEPENDS=	gm4:devel/m4
 
 USES=		bison gmake libtool makeinfo tar:xz
 GNU_CONFIGURE=	yes
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index ca20fd9b69c4..7f0acf2e7d44 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	geoff@sea-incorporated.com
 COMMENT=	Print formatter driven by XSL formatting
 
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/fpc-libxml2/Makefile b/textproc/fpc-libxml2/Makefile
index a3efdc1ced64..9fd1583d05cd 100644
--- a/textproc/fpc-libxml2/Makefile
+++ b/textproc/fpc-libxml2/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBXML2
 LIBXML2_DESC=	Install xml2 library
 OPTIONS_DEFAULT=	LIBXML2
 
-LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/gladtex/Makefile b/textproc/gladtex/Makefile
index 39bd6fef865a..bfbd42273e85 100644
--- a/textproc/gladtex/Makefile
+++ b/textproc/gladtex/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Program to replace LaTeX formulas in HTML files with images
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png
 
 USE_TEX=	latex dvipsk
 BINPATH=	${PREFIX}/bin
diff --git a/textproc/glpi-plugins-AdditionalReports/Makefile b/textproc/glpi-plugins-AdditionalReports/Makefile
index 166fbcaee8ec..8be028396594 100644
--- a/textproc/glpi-plugins-AdditionalReports/Makefile
+++ b/textproc/glpi-plugins-AdditionalReports/Makefile
@@ -14,7 +14,7 @@ COMMENT=	This plugin enables additional reports
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	glpi>=0.72:${PORTSDIR}/www/glpi
+RUN_DEPENDS=	glpi>=0.72:www/glpi
 
 WRKSRC=		${WRKDIR}/reports
 NO_BUILD=	yes
diff --git a/textproc/glpi-plugins-DataInjection/Makefile b/textproc/glpi-plugins-DataInjection/Makefile
index 331612b38203..c79f360536df 100644
--- a/textproc/glpi-plugins-DataInjection/Makefile
+++ b/textproc/glpi-plugins-DataInjection/Makefile
@@ -14,7 +14,7 @@ COMMENT=	This glpi plugin allows data import into GLPI using CSV files
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	glpi>=0.72:${PORTSDIR}/www/glpi
+RUN_DEPENDS=	glpi>=0.72:www/glpi
 
 WRKSRC=		${WRKDIR}/datainjection
 NO_BUILD=	yes
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index ec68dbac76a8..58e644226b1e 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of DOM Implementations
 
-LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
+LIB_DEPENDS=	libgdome.so:textproc/gdome2
 
 USES=		gmake iconv libtool pathfix pkgconfig
 USE_GNOME=	glib20 libxml2
@@ -25,8 +25,8 @@ OPTIONS_SUB=	yes
 
 OCAML_DESC=	OCAML language support
 
-OCAML_BUILD_DEPENDS=	ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
-			ocamlc:${PORTSDIR}/lang/ocaml
+OCAML_BUILD_DEPENDS=	ocamlfind:devel/ocaml-findlib \
+			ocamlc:lang/ocaml
 OCAML_CONFIGURE_OFF=	HAVE_OCAMLDEP=no HAVE_OCAMLFIND=no HAVE_OCAMLOPT=no
 
 post-patch:
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 687316673aa9..8f852c095c3a 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME doc utils
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
-		${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian \
-		${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian \
+		${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2
+RUN_DEPENDS=	rarian-sk-config:textproc/rarian \
+		${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2 \
+		docbook-xml>0:textproc/docbook-xml
 
 USES=		gettext-tools:build,run gmake pathfix pkgconfig python:2 tar:xz
 USE_GNOME=	libxslt intlhack
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 981d3ace01f7..e60f7c8f8235 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME/Bonobo component for spell checking
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	libaspell.so:textproc/aspell
 
 USE_GNOME=	gnomeprefix intlhack libgnomeui
 USES=		gettext gmake libtool pathfix pkgconfig perl5 tar:bzip2
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 00703244abcf..a9bd29396ba2 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -34,7 +34,7 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_OFF=	--without-libintl-prefix
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_ENABLE=	perl-regexp
 PCRE_CPPFLAGS=		-I${LOCALBASE}/include
 PCRE_LDFLAGS=		-L${LOCALBASE}/lib
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index 9c1368f9eaa1..92a7d2132da1 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Feature-rich Qt4 based dictionary lookup program
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell \
+		libvorbis.so:audio/libvorbis
 
 NO_WRKSUBDIR=	yes
 HAS_CONFIGURE=	yes
diff --git a/textproc/google-translate-cli/Makefile b/textproc/google-translate-cli/Makefile
index 476389a67c7f..2cf82f6e2bc1 100644
--- a/textproc/google-translate-cli/Makefile
+++ b/textproc/google-translate-cli/Makefile
@@ -14,14 +14,14 @@ LICENSE_NAME=	Beerware
 LICENSE_TEXT=	http://www.sax.de/~joerg/beerware-license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gawk:${PORTSDIR}/lang/gawk
-TEST_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk
+RUN_DEPENDS=	bash:shells/bash \
+		gawk:lang/gawk
+TEST_DEPENDS=	gawk:lang/gawk
 
 ALL_TARGET=	build
 
-FRIBIDI_RUN_DEPENDS=	fribidi:${PORTSDIR}/converters/fribidi
+FRIBIDI_RUN_DEPENDS=	fribidi:converters/fribidi
 
 GH_ACCOUNT=	soimort
 GH_PROJECT=	translate-shell
@@ -31,10 +31,10 @@ OPTIONS_DEFINE=	DOCS FRIBIDI READLINE TEXT2SPEECH
 
 PLIST_FILES=	bin/trans man/man1/trans.1.gz
 
-READLINE_RUN_DEPENDS=	rlwrap:${PORTSDIR}/devel/rlwrap
+READLINE_RUN_DEPENDS=	rlwrap:devel/rlwrap
 
 TEXT2SPEECH_DESC=	Enable Text-to-Speech functionality via espeak
-TEXT2SPEECH_RUN_DEPENDS=	espeak:${PORTSDIR}/audio/espeak
+TEXT2SPEECH_RUN_DEPENDS=	espeak:audio/espeak
 
 USE_GITHUB=	yes
 
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 600187d4a5ae..86bb21638417 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Software typesetting package
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/psselect:${PORTSDIR}/print/psutils
+BUILD_DEPENDS=	${LOCALBASE}/bin/psselect:print/psutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cpe ghostscript gmake perl5 shebangfix
@@ -62,8 +62,8 @@ PLIST_SUB+=	HTMLDOCS="@comment "
 .endif
 .else
 USE_XORG=	x11 xaw xmu
-BUILD_DEPENDS+=	${LOCALBASE}/bin/pnmtops:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS+=	${LOCALBASE}/bin/pnmtops:${PORTSDIR}/graphics/netpbm
+BUILD_DEPENDS+=	${LOCALBASE}/bin/pnmtops:graphics/netpbm
+RUN_DEPENDS+=	${LOCALBASE}/bin/pnmtops:graphics/netpbm
 CONFIGURE_ARGS+=--with-x --with-appresdir=${PREFIX}/lib/X11/app-defaults
 PLIST_SUB+=	X11=""
 PLIST_SUB+=	HTMLDOCS=""
diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index a258aec7ee66..2880e2e91001 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Open-source fulltext search engine and column store
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -35,12 +35,12 @@ OPTIONS_DEFAULT=	MECAB SUGGEST RUBY
 OPTIONS_SUB=		yes
 
 MECAB_DESC=		Morphological analysis support via MeCab
-MECAB_LIB_DEPENDS=	libmecab.so:${PORTSDIR}/japanese/mecab
+MECAB_LIB_DEPENDS=	libmecab.so:japanese/mecab
 MECAB_CONFIGURE_OFF=	--without-mecab
 SUGGEST_DESC=		Suggestions support
-SUGGEST_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
-			libmsgpack.so:${PORTSDIR}/devel/msgpack \
-			libzmq.so:${PORTSDIR}/net/libzmq2
+SUGGEST_LIB_DEPENDS=	libevent.so:devel/libevent2 \
+			libmsgpack.so:devel/msgpack \
+			libzmq.so:net/libzmq2
 SUGGEST_CONFIGURE_ON=	--with-libevent=${LOCALBASE} \
 			--with-message-pack=${LOCALBASE} \
 			--enable-zeromq
diff --git a/textproc/gspell/Makefile b/textproc/gspell/Makefile
index 27dbdf1986f9..412a86c2a093 100644
--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Spell checking for GTK+
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
-	iso-codes>=3.57:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+BUILD_DEPENDS=	valac:lang/vala \
+	iso-codes>=3.57:misc/iso-codes
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 PORTSCOUT=	limit:^0\.1\.
 
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 0ffb2459dba8..f0c95edce1b7 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -10,15 +10,15 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Code documentation system, originally for GTK+
 
-BUILD_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
-		itstool:${PORTSDIR}/textproc/itstool \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		rarian-sk-config:${PORTSDIR}/textproc/rarian
-RUN_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		rarian-sk-config:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	jade:textproc/jade \
+		itstool:textproc/itstool \
+		docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+		rarian-sk-config:textproc/rarian
+RUN_DEPENDS=	jade:textproc/jade \
+		docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+		rarian-sk-config:textproc/rarian
 
 DOCBOOK_VERSION=	4.1.2
 
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 859e2c4518ef..5ac4e6e0401a 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GTK+ 2 spell checking component
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 USES=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk20 intlhack
diff --git a/textproc/gtkspell3/Makefile b/textproc/gtkspell3/Makefile
index 9ba1c861b3dc..e700381e55ab 100644
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF/gtkspell/${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GTK+ 3 spell checking component
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 USE_GNOME=	gtk30 intlhack introspection:build
 USES=		gettext gmake libtool pathfix pkgconfig
diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile
index 2bef073ee386..da830a18423d 100644
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Convert LaTeX to HTML
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
+BUILD_DEPENDS=	ocamlc:lang/ocaml
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/hhm/Makefile b/textproc/hhm/Makefile
index 7690aafa2e50..2e088c01f36f 100644
--- a/textproc/hhm/Makefile
+++ b/textproc/hhm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML Help Maker
 
-LIB_DEPENDS=	liblzxcomp.so:${PORTSDIR}/archivers/liblzxcomp
+LIB_DEPENDS=	liblzxcomp.so:archivers/liblzxcomp
 
 USES=		uidfix
 MAKEFILE=	${FILESDIR}/Makefile
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index c1a152cf9e81..f907bd8090be 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.andre-simon.de/zip/
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Customizable syntax highlighter
 
-BUILD_DEPENDS=	boost-libs>0:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 
 USES=		dos2unix gmake lua:52 pkgconfig tar:bzip2
 MAKEFILE=	makefile
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index d7e692e25d27..488b9ecc76af 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -15,7 +15,7 @@ USE_CABAL=	text>=0.11.0.8
 
 .if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-double-conversion.cabal
-LIB_DEPENDS+=	libcxxrt.so:${PORTSDIR}/devel/libcxxrt
+LIB_DEPENDS+=	libcxxrt.so:devel/libcxxrt
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
index 575a585c77e5..3f787ea2cb5c 100644
--- a/textproc/hs-libxml-sax/Makefile
+++ b/textproc/hs-libxml-sax/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 USE_CABAL=	text>=0.7 xml-types>=0.3
 
 USES=		pkgconfig
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index fd47ea0cc381..97976c6f36ce 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 
 USE_CABAL=	regex-base>=0.93
 
-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/textproc/html/Makefile b/textproc/html/Makefile
index 47719ad8068b..baae73ec6b9e 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/kuriyama
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	All W3C published SGML DTDs for HTML
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 NO_MTREE=	yes
 NO_BUILD=	yes
diff --git a/textproc/htmlc/Makefile b/textproc/htmlc/Makefile
index f6211e22bc19..b7e0dc53bd2e 100644
--- a/textproc/htmlc/Makefile
+++ b/textproc/htmlc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://htmlc.inria.fr/ \
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Text file generator
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
+BUILD_DEPENDS=	ocamlc:lang/ocaml
 
 USES=		gmake tar:tgz
 
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index 1ada4e6c60b5..737949b498ac 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Converts HTML to PDF and/or PostScript
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	HTMLDOCGUI
 HTMLDOCGUI_DESC=	Build GUI front-end
@@ -37,7 +37,7 @@ INSTALL_TARGET=	install \
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-HTMLDOCGUI_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+HTMLDOCGUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 HTMLDOCGUI_CONFIGURE_ON=	--with-gui=yes
 HTMLDOCGUI_CONFIGURE_OFF=	--with-gui=no
 
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index cf9365ea1f04..d69c6dce7f54 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	HTML to LaTeX to PDF Converter
 
-LIB_DEPENDS=	libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick
+LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick
 
 USES=		bison gmake
 MAKEFILE=	GNUmakefile
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index 70cca9d69caa..4f57c68b2544 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search system
 
-BUILD_DEPENDS=	qdbm>=1.8.77:${PORTSDIR}/databases/qdbm
+BUILD_DEPENDS=	qdbm>=1.8.77:databases/qdbm
 # check configure for min version of qdbm.
-LIB_DEPENDS=	libqdbm.so.14:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	libqdbm.so.14:databases/qdbm
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -31,11 +31,11 @@ LZO_DESC=	Enable lzo support
 MECAB_DESC=	Enable mecab support
 
 LZO_CONFIGURE_ENABLE=	lzo
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 MECAB_CONFIGURE_ENABLE=	mecab
-MECAB_LIB_DEPENDS=	libmecab.so:${PORTSDIR}/japanese/mecab
-MECAB_RUN_DEPENDS=	${LOCALBASE}/lib/mecab/dic/ipadic/matrix.bin:${PORTSDIR}/japanese/mecab-ipadic
+MECAB_LIB_DEPENDS=	libmecab.so:japanese/mecab
+MECAB_RUN_DEPENDS=	${LOCALBASE}/lib/mecab/dic/ipadic/matrix.bin:japanese/mecab-ipadic
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
diff --git a/textproc/hyphen/Makefile b/textproc/hyphen/Makefile
index 612f84d1589b..575d6b9b530f 100644
--- a/textproc/hyphen/Makefile
+++ b/textproc/hyphen/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for high quality hyphenation and justification
 LICENSE=	LGPL21 LGPL3 MPL
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk
 
 CONFIGURE_ENV=	ac_cv_prog_AWK=gawk
 GNU_CONFIGURE=	yes
diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index c696f476820e..70ffaa721a35 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	IBus client for GNU Emacs
 
-RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus \
-		${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
+RUN_DEPENDS=	ibus-daemon:textproc/ibus \
+		${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
 
 USES=		python:run
 USE_EMACS=	yes
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index cd70846554a6..cbfe135d2a32 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL IMEngine for IBus framework
 
-LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libkmfl.so:${PORTSDIR}/textproc/libkmfl \
-		libkmflcomp.so:${PORTSDIR}/textproc/kmflcomp
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+LIB_DEPENDS=	libibus-1.0.so:textproc/ibus \
+		libkmfl.so:textproc/libkmfl \
+		libkmflcomp.so:textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 USES=		pkgconfig gmake
 USE_GNOME=	glib20
diff --git a/textproc/ibus-m17n/Makefile b/textproc/ibus-m17n/Makefile
index d149786bac48..1490339d194d 100644
--- a/textproc/ibus-m17n/Makefile
+++ b/textproc/ibus-m17n/Makefile
@@ -13,9 +13,9 @@ COMMENT=	The m17n IMEngine for IBus framework
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libm17n.so:${PORTSDIR}/devel/m17n-lib
-RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
+LIB_DEPENDS=	libibus-1.0.so:textproc/ibus \
+		libm17n.so:devel/m17n-lib
+RUN_DEPENDS=	ibus-daemon:textproc/ibus
 
 PROJECTHOST=	ibus
 
diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile
index 1b23658c63e2..01c22a2f700d 100644
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@@ -15,10 +15,10 @@ COMMENT=	IBus input method module for Qt4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	ibus>=1.3.7:${PORTSDIR}/textproc/ibus
-RUN_DEPENDS=	ibus>=1.3.7:${PORTSDIR}/textproc/ibus
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-	libicuuc.so:${PORTSDIR}/devel/icu
+BUILD_DEPENDS=	ibus>=1.3.7:textproc/ibus
+RUN_DEPENDS=	ibus>=1.3.7:textproc/ibus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+	libicuuc.so:devel/icu
 
 GH_ACCOUNT=	ibus
 
diff --git a/textproc/ibus-table/Makefile b/textproc/ibus-table/Makefile
index 768c8bc41931..2eac000ad382 100644
--- a/textproc/ibus-table/Makefile
+++ b/textproc/ibus-table/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Table based input method framework for IBus
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
-LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USE_GNOME=	pygtk2
 USES=		gmake pkgconfig python
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index bfdd515fab31..e18b2a55998a 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Intelligent Input Bus for Linux / Unix OS
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
-		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
-		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:${PORTSDIR}/misc/iso-codes \
-		setxkbmap:${PORTSDIR}/x11/setxkbmap
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \
+		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify \
+		${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg \
+		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
+		setxkbmap:x11/setxkbmap
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		compiler cpe gmake libtool pathfix pkgconfig python
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
@@ -58,14 +58,14 @@ GTK2_CONFIGURE_ENABLE=	gtk2
 
 GTK3_USE=		GNOME=gtk30 XORG=x11
 GTK3_CONFIGURE_ENABLE=	gtk3 libnotify
-GTK3_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+GTK3_LIB_DEPENDS=	libnotify.so:devel/libnotify
 GTK3_LIBS=		-lX11
 
-VALA_BUILD_DEPENDS=	vala>=0.20:${PORTSDIR}/lang/vala
+VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
 VALA_CONFIGURE_ENABLE=	vala
 
-GINTRO_BUILD_DEPENDS=	gobject-introspection>=0.6.8:${PORTSDIR}/devel/gobject-introspection
-GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:${PORTSDIR}/devel/gobject-introspection
+GINTRO_BUILD_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
+GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
 GINTRO_CONFIGURE_ON=	--enable-introspection=yes
 GINTRO_CONFIGURE_OFF=	--enable-introspection=no
 
diff --git a/textproc/idnits/Makefile b/textproc/idnits/Makefile
index c2ec2d704976..59a02e6efbde 100644
--- a/textproc/idnits/Makefile
+++ b/textproc/idnits/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Looks for problems in internet draft formatting
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index 19d4df23320c..87c48f036266 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	XML parser library mainly designed for Jabber applications
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		autoreconf libtool makeinfo pathfix pkgconfig
 PATHFIX_MAKEFILEIN=	Makefile.am
diff --git a/textproc/info2man/Makefile b/textproc/info2man/Makefile
index 78a5a0ed568e..3420038f7c96 100644
--- a/textproc/info2man/Makefile
+++ b/textproc/info2man/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translate GNU info files into man pages
 
-RUN_DEPENDS=	p5-Perl4-CoreLibs>0:${PORTSDIR}/devel/p5-Perl4-CoreLibs
+RUN_DEPENDS=	p5-Perl4-CoreLibs>0:devel/p5-Perl4-CoreLibs
 USES=		perl5 shebangfix
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index c36ef6f85fd9..e84b4c1305ff 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to internationalize various kinds of data files
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		iconv gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile
index 157a8094cbcb..633b78b70be1 100644
--- a/textproc/irstlm/Makefile
+++ b/textproc/irstlm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-5.80
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The IRST Language Modeling Toolkit
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index c82336f08f44..390fcd2bc9c9 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	SGML DTDs from the The Electronic Publishing Special Interest Group
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 DIST_SUBDIR=	iso12083
 
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 91ef807a8bf3..6bf8a4151b4a 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	isoENTS
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Character entity sets from ISO 8879:1986 (SGML)
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile
index 141a3285f7a2..5dee32c1ec59 100644
--- a/textproc/itstool/Makefile
+++ b/textproc/itstool/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Make XML documents translatable through po files
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2
 
 USES=		python:2,run tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 74701006f54b..c6fc83cb9dbb 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -16,7 +16,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 CONFLICTS=	sp-1.*
 
diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile
index 952a3779a12b..f0817902d423 100644
--- a/textproc/jakarta-commons-digester/Makefile
+++ b/textproc/jakarta-commons-digester/Makefile
@@ -33,11 +33,11 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-JAR_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
-		${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
+JAR_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections
 .if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} != "1.4"
-JAR_DEPENDS+=	${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
+JAR_DEPENDS+=	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 .endif
 
 do-install:
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index b94ec0e11f40..a2e082fc542e 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Java XUpdate engine
 BUILD_DEPENDS=	${JAR_DEPENDS}
 RUN_DEPENDS=	${JAR_DEPENDS}
 
-JAR_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \
-		${JAVALIBDIR}/jaxen-full.jar:${PORTSDIR}/java/jaxen \
-		${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
+JAR_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
+		${JAVALIBDIR}/jaxen-full.jar:java/jaxen \
+		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
 USES=		zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin
index c2d412c4b13b..dc5d415fe08e 100644
--- a/textproc/jdictionary/Makefile.plugin
+++ b/textproc/jdictionary/Makefile.plugin
@@ -6,7 +6,7 @@ EXTRACT_SUFX=	#
 MAINTAINER?=	jmohacsi@bsd.hu
 COMMENT?=	JDictionary plugin master port
 
-RUN_DEPENDS+=	jdictionary:${PORTSDIR}/textproc/jdictionary
+RUN_DEPENDS+=	jdictionary:textproc/jdictionary
 
 # WARNING: USE_JAVA is set to be able to use JAVASHAREDIR.
 #          Please make sure that JAVA_VERSION here is the same as in Makefile.
diff --git a/textproc/jq/Makefile b/textproc/jq/Makefile
index d402436f8a0a..26659c074289 100644
--- a/textproc/jq/Makefile
+++ b/textproc/jq/Makefile
@@ -32,7 +32,7 @@ DOCS_MAKE_ARGS_OFF=	docdir=
 DOCS_CONFIGURE_ENABLE=	docs
 
 ONIGURUMA_DESC=		With oniguruma BSDL regular expression library
-ONIGURUMA_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma5
+ONIGURUMA_LIB_DEPENDS=	libonig.so:devel/oniguruma5
 #ONIGURUMA_CONFIGURE_WITH=oniguruma=${LOCALBASE} # pending resolution of https://github.com/stedolan/jq/issues/1021, next line is the workaround
 ONIGURUMA_CONFIGURE_ON=	--with-oniguruma=${LOCALBASE}
 
diff --git a/textproc/jrefentry/Makefile b/textproc/jrefentry/Makefile
index 5b48b68edf50..2a806d33821b 100644
--- a/textproc/jrefentry/Makefile
+++ b/textproc/jrefentry/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/docbook/OldFiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook XML JRefEntry DTD
 
-RUN_DEPENDS=	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+RUN_DEPENDS=	docbook-xml>0:textproc/docbook-xml
 
 NO_BUILD=	yes
 
diff --git a/textproc/jshon/Makefile b/textproc/jshon/Makefile
index f17af6480b43..71ce4a02d758 100644
--- a/textproc/jshon/Makefile
+++ b/textproc/jshon/Makefile
@@ -10,7 +10,7 @@ COMMENT=	JSON parser for the shell
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
+LIB_DEPENDS=	libjansson.so:devel/jansson
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keenerd
diff --git a/textproc/kenlm/Makefile b/textproc/kenlm/Makefile
index 0a1e01b76c85..63af5ee8d0e7 100644
--- a/textproc/kenlm/Makefile
+++ b/textproc/kenlm/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	KenLM Language Model Toolkit
 
-BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	bjam:devel/boost-jam \
+		bash:shells/bash
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES+=		compiler:c++11-lib
 USE_LDCONFIG=	yes
diff --git a/textproc/kibana41/Makefile b/textproc/kibana41/Makefile
index ea05ed9d965f..72db1d1459be 100644
--- a/textproc/kibana41/Makefile
+++ b/textproc/kibana41/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Browser based analytics and search interface to ElasticSearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	node010>=0:${PORTSDIR}/www/node010
+RUN_DEPENDS=	node010>=0:www/node010
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/kibana42/Makefile b/textproc/kibana42/Makefile
index 0c69249d5daa..384f0a396d3c 100644
--- a/textproc/kibana42/Makefile
+++ b/textproc/kibana42/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Browser based analytics and search interface to ElasticSearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	node012>=0:${PORTSDIR}/www/node012
+RUN_DEPENDS=	node012>=0:www/node012
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/kmfl-european-latin/Makefile b/textproc/kmfl-european-latin/Makefile
index 928386bb7557..8e491a3ae4b3 100644
--- a/textproc/kmfl-european-latin/Makefile
+++ b/textproc/kmfl-european-latin/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Paneuropean Latin KMFL keyboard covering 120 languages
 
-BUILD_DEPENDS=	base64:${PORTSDIR}/converters/base64
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+BUILD_DEPENDS=	base64:converters/base64
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/EuroLatin\ Source\ Files
 USES=		dos2unix zip
diff --git a/textproc/kmfl-khmer/Makefile b/textproc/kmfl-khmer/Makefile
index f499d66b9914..5c368ed3298f 100644
--- a/textproc/kmfl-khmer/Makefile
+++ b/textproc/kmfl-khmer/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	kmfl-
 MAINTAINER=	buganini@gmail.com
 COMMENT=	KMFL SCIM IMEngine keyboard for Khmer language
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/textproc/kmfl-sil-ezra/Makefile b/textproc/kmfl-sil-ezra/Makefile
index ee292cc43b1b..454be3959daf 100644
--- a/textproc/kmfl-sil-ezra/Makefile
+++ b/textproc/kmfl-sil-ezra/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	EzraSIL251_Src.zip
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL keyboard for Unicode Biblical Hebrew
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}/EzraSIL2.51
 USES=		dos2unix zip
diff --git a/textproc/kmfl-sil-galatia/Makefile b/textproc/kmfl-sil-galatia/Makefile
index 1bc54bbcfb42..99778b730e43 100644
--- a/textproc/kmfl-sil-galatia/Makefile
+++ b/textproc/kmfl-sil-galatia/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL Unicode keyboard for typesetting Ancient Greek
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 USES=		dos2unix zip
 DOS2UNIX_FILES=	GrkPolyCompv${PORTVERSION:S|.||}.KMN
diff --git a/textproc/kmfl-sil-ipa-unicode/Makefile b/textproc/kmfl-sil-ipa-unicode/Makefile
index 40dbb39c7336..12aa2eafc5b6 100644
--- a/textproc/kmfl-sil-ipa-unicode/Makefile
+++ b/textproc/kmfl-sil-ipa-unicode/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	IPAUni_Src12.zip
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	IPA Unicode 5.1 mnemonic keyboard for KMFL IMEngine
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 USES=		dos2unix zip
 WRKSRC=		${WRKDIR}/IPA12
diff --git a/textproc/kmfl-sil-panafrican-latin/Makefile b/textproc/kmfl-sil-panafrican-latin/Makefile
index a88fdd3c9001..1b60c72e2928 100644
--- a/textproc/kmfl-sil-panafrican-latin/Makefile
+++ b/textproc/kmfl-sil-panafrican-latin/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL keyboard for African Latin writing systems
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}
 USES=		dos2unix zip
diff --git a/textproc/kmfl-sil-yi/Makefile b/textproc/kmfl-sil-yi/Makefile
index f0ee36237f50..8b28065dcfb1 100644
--- a/textproc/kmfl-sil-yi/Makefile
+++ b/textproc/kmfl-sil-yi/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL Unicode keyboard for standardized Yi script
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 WRKSRC=		${WRKDIR}
 USES=		dos2unix zip
diff --git a/textproc/kmfl-varamozhi-malayalam/Makefile b/textproc/kmfl-varamozhi-malayalam/Makefile
index 9bc2de30d9b8..51920f4f5b39 100644
--- a/textproc/kmfl-varamozhi-malayalam/Makefile
+++ b/textproc/kmfl-varamozhi-malayalam/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	KMFL Malayalam keyboard according to the Mozhi scheme
 
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp
 
 USES=		dos2unix zip
 DOS2UNIX_FILES=	mozhi_1.1.0.kmn
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index 4d1245a23e2e..7f9c6bea2c5d 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Compiler of Keyman KMFL keyboard sources to use with SCIM/IBus
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
+BUILD_DEPENDS=	bison:devel/bison
 
 USE_XORG=	x11
 USE_LDCONFIG=	yes
diff --git a/textproc/kompare/Makefile b/textproc/kompare/Makefile
index b4d64ea8f2bc..e155984d0891 100644
--- a/textproc/kompare/Makefile
+++ b/textproc/kompare/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Diff/Patch Frontend
 
-LIB_DEPENDS=	libkomparediff2.so:${PORTSDIR}/textproc/libkomparediff2
+LIB_DEPENDS=	libkomparediff2.so:textproc/libkomparediff2
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/textproc/lasem/Makefile b/textproc/lasem/Makefile
index 12c2c2c726e8..4ecda06dac89 100644
--- a/textproc/lasem/Makefile
+++ b/textproc/lasem/Makefile
@@ -13,7 +13,7 @@ COMMENT=	SVG/Mathml renderer and editor
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	stixfonts>0:${PORTSDIR}/x11-fonts/stix-fonts
+RUN_DEPENDS=	stixfonts>0:x11-fonts/stix-fonts
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index a7ddfa2b8b33..920895226378 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	TEX_CTAN/support/${PORTNAME}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert LaTeX documents to HTML
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/anytopnm:${PORTSDIR}/graphics/netpbm
+BUILD_DEPENDS=	${LOCALBASE}/bin/anytopnm:graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	ja-latex2html-[0-9]*
diff --git a/textproc/libabw/Makefile b/textproc/libabw/Makefile
index b49b76571351..7da54bbc5c79 100644
--- a/textproc/libabw/Makefile
+++ b/textproc/libabw/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Library providing ability to interpret Abiword documents
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 USES=		gperf perl5 libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/textproc/libcrm114/Makefile b/textproc/libcrm114/Makefile
index 8c7ae8b9dc24..1994dd098b14 100644
--- a/textproc/libcrm114/Makefile
+++ b/textproc/libcrm114/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://crm114.sourceforge.net/tarballs/
 MAINTAINER=	info@mschuette.name
 COMMENT=	CRM114 C-callable Library
 
-LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libtre.so:textproc/libtre
 
 LICENSE=	LGPL3
 
diff --git a/textproc/libcss/Makefile b/textproc/libcss/Makefile
index 1500724f1fcf..7541ccb5eaae 100644
--- a/textproc/libcss/Makefile
+++ b/textproc/libcss/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Cascading Style Sheets library
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	netsurf-buildsystem>=1.5:${PORTSDIR}/devel/netsurf-buildsystem
-LIB_DEPENDS=	libwapcaplet.so:${PORTSDIR}/textproc/libwapcaplet \
-	libparserutils.so:${PORTSDIR}/devel/libparserutils
+BUILD_DEPENDS=	netsurf-buildsystem>=1.5:devel/netsurf-buildsystem
+LIB_DEPENDS=	libwapcaplet.so:textproc/libwapcaplet \
+	libparserutils.so:devel/libparserutils
 
 USES=	gmake iconv:wchar_t localbase pkgconfig
 USE_LDCONFIG=	yes
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index eacf2f399f3d..e698be1c4e5b 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Library for import of reflowable e-book formats
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		librevenge-0.0.so:textproc/librevenge
 
 OPTIONS_DEFINE=	DOCS
 
@@ -29,7 +29,7 @@ CONFIGURE_ARGS=	--disable-werror --disable-tests
 CPPFLAGS+=	-I${LOCALBASE}/include -DBOOST_ERROR_CODE_HEADER_ONLY
 
 PORTDOCS=	*
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_OFF=	--without-docs
 
 .include <bsd.port.mk>
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 4bccbfeca61d..7a6ec8181470 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for keyword extraction
 
 LICENSE=	GPLv3+
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		iconv gettext libtool makeinfo pathfix pkgconfig python
 USE_GNOME=	gtk20
@@ -35,35 +35,35 @@ OPTIONS_DEFAULT=	EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \
 			RPM SMF TIDY VORBIS
 OPTIONS_SUB=		yes
 
-EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENV=	EXIV2_H="<exiv2/image.hpp>"
 EXIV2_CONFIGURE_ENV_OFF=	EXIV2_H=""
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENV_OFF= ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CONFIGURE_ENV_OFF=	ac_cv_lib_gif_DGifOpen=no
 GSF_DESC=		GSF (OLE2 (MS office) support)
 GSF_USE=		gnome=libgsf
 GSF_CONFIGURE_ENV_OFF=	ac_cv_lib_gsf_1_gsf_init=no
 GSTREAMER_USE=		gstreamer1=yes
 GSTREAMER_CONFIGURE_WITH=	gstreamer
-MPEG2_LIB_DEPENDS=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
+MPEG2_LIB_DEPENDS=	libmpeg2.so:multimedia/libmpeg2
 MPEG2_CONFIGURE_ENV_OFF=	ac_cv_lib_mpeg2_mpeg2_init=no
-MP4_LIB_DEPENDS=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+MP4_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 MP4_CONFIGURE_ENV_OFF=	ac_cv_lib_mp4v2_MP4ReadProvider=no
 RPM_DESC=		RPM support
-RPM_LIB_DEPENDS=	librpm.so:${PORTSDIR}/archivers/rpm4
+RPM_LIB_DEPENDS=	librpm.so:archivers/rpm4
 RPM_CONFIGURE_ENV=	ac_cv_lib_rpm_rpmReadPackageFile=yes
 RPM_CONFIGURE_ENV_OFF=	ac_cv_lib_rpm_rpmReadPackageFile=no
 SMF_DESC=		Standard MIDI file support via LibSMF
-SMF_LIB_DEPENDS=	libsmf.so:${PORTSDIR}/audio/libsmf
+SMF_LIB_DEPENDS=	libsmf.so:audio/libsmf
 SMF_CONFIGURE_ENV_OFF=	ac_cv_lib_smf_smf_load_from_memory=no
-TIDY_LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
+TIDY_LIB_DEPENDS=	libtidy.so:www/tidy-lib
 TIDY_CONFIGURE_ENV=	TIDY_H="<tidy/tidy.h>"
 TIDY_CONFIGURE_ENV_OFF=	TIDY_H=""
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_ENV_OFF=	ac_cv_lib_vorbisfile_ov_open_callbacks=no
 
 post-patch:
diff --git a/textproc/libguess/Makefile b/textproc/libguess/Makefile
index 8e5e5831beaa..61466a6ebd14 100644
--- a/textproc/libguess/Makefile
+++ b/textproc/libguess/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://distfiles.atheme.org/
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	High-speed character set detection library
 
-LIB_DEPENDS=	libmowgli.so:${PORTSDIR}/devel/libmowgli
+LIB_DEPENDS=	libmowgli.so:devel/libmowgli
 
 USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/textproc/libkmfl/Makefile b/textproc/libkmfl/Makefile
index 9ce26156a2d9..3114e5ada404 100644
--- a/textproc/libkmfl/Makefile
+++ b/textproc/libkmfl/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Engine to interpret compiled KMFL keyboard tables
 
-LIB_DEPENDS=	libkmflcomp.so:${PORTSDIR}/textproc/kmflcomp
+LIB_DEPENDS=	libkmflcomp.so:textproc/kmflcomp
 
 USE_LDCONFIG=	yes
 USES=	libtool
diff --git a/textproc/libkolabxml/Makefile b/textproc/libkolabxml/Makefile
index ebf163d4ebdd..ed47d661903e 100644
--- a/textproc/libkolabxml/Makefile
+++ b/textproc/libkolabxml/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Kolab XML Format Schema Definitions Library
 # are considered LGPL3-licensed, though.
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	xsdcxx:${PORTSDIR}/devel/xsd
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
+BUILD_DEPENDS=	xsdcxx:devel/xsd
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libcurl.so:ftp/curl \
+		libxerces-c.so.3:textproc/xerces-c3
 
 # TODO: Conditionally enable the bindings based on OPTIONs.
 CMAKE_ARGS=	-DBUILD_TESTS:BOOL=OFF \
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index 996ef6b009b7..53430833433f 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Library for manipulating RDF files describing LADSPA plugins
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libraptor2.so:${PORTSDIR}/textproc/raptor2
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libicuuc.so:devel/icu \
+		libyajl.so:devel/yajl \
+		libcurl.so:ftp/curl \
+		libraptor2.so:textproc/raptor2
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf iconv libtool pathfix pkgconfig
diff --git a/textproc/libmrss-php/Makefile b/textproc/libmrss-php/Makefile
index 220a196fcf6d..2bf364d80c8d 100644
--- a/textproc/libmrss-php/Makefile
+++ b/textproc/libmrss-php/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP library for parsing, writing, and creating RSS
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
-LIB_DEPENDS=	libmrss.so:${PORTSDIR}/textproc/libmrss
+LIB_DEPENDS=	libmrss.so:textproc/libmrss
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 0b2db141de49..8706a057e864 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -13,8 +13,8 @@ COMMENT=	C library for parsing, writing, and creating RSS
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libnxml.so:${PORTSDIR}/textproc/libnxml
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libnxml.so:textproc/libnxml
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/libmwaw03/Makefile b/textproc/libmwaw03/Makefile
index 2d4e48ce2bac..1d4064e14689 100644
--- a/textproc/libmwaw03/Makefile
+++ b/textproc/libmwaw03/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Import library for some old mac text documents
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -27,7 +27,7 @@ INSTALL_TARGET=	install-strip
 .if ${COMPILER_FEATURES:Mlibc++}
 CONFIGURE_ARGS+=	--with-sharedptr=c++11
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 CONFIGURE_ARGS+=	--with-sharedptr=boost
 .endif
 
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index ccec237309ab..4ad917ff7fb2 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.autistici.org/bakunin/libnxml/ \
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	C library for writing XML 1.0/1.1 files or streams
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		libtool pathfix
 GNU_CONFIGURE=	yes
diff --git a/textproc/libodfgen01/Makefile b/textproc/libodfgen01/Makefile
index 28e2f5204943..6682c40af5d4 100644
--- a/textproc/libodfgen01/Makefile
+++ b/textproc/libodfgen01/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for generating documents in Open Document Format (ODF)
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -27,7 +27,7 @@ INSTALL_TARGET=	install-strip
 .if ${COMPILER_FEATURES:Mlibc++}
 CONFIGURE_ARGS+=	--with-sharedptr=c++11
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 CONFIGURE_ARGS+=	--with-sharedptr=boost
 .endif
 
diff --git a/textproc/librevenge/Makefile b/textproc/librevenge/Makefile
index 140e8adaf0c4..745d67facacf 100644
--- a/textproc/librevenge/Makefile
+++ b/textproc/librevenge/Makefile
@@ -16,7 +16,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
 
 OPTIONS_DEFINE=	DOCS
 
@@ -24,7 +24,7 @@ CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	-disable-werror --disable-tests
 
 PORTDOCS=	*
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_OFF=	--without-docs
 
 .include <bsd.port.mk>
diff --git a/textproc/libtext-wrapi18n-perl/Makefile b/textproc/libtext-wrapi18n-perl/Makefile
index a95f858872e5..91c15bbf98cb 100644
--- a/textproc/libtext-wrapi18n-perl/Makefile
+++ b/textproc/libtext-wrapi18n-perl/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Documentation gettext tools
 
-BUILD_DEPENDS=	libtext-charwidth-perl>=0:${PORTSDIR}/textproc/libtext-charwidth-perl
+BUILD_DEPENDS=	libtext-charwidth-perl>=0:textproc/libtext-charwidth-perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/textproc/libtranslate/Makefile b/textproc/libtranslate/Makefile
index 5dc529dcb81a..770fbfae02c4 100644
--- a/textproc/libtranslate/Makefile
+++ b/textproc/libtranslate/Makefile
@@ -37,7 +37,7 @@ post-patch::
 .if ${PORT_OPTIONS:MGENERIC}
 PLIST_SUB+=	GENERIC=""
 USE_GNOME+=	libxml2
-LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
 CPPFLAGS+=	-DHAVE_LIBSOUP24
 DISTFILES+=	libtranslate-0.99-libsoup24.diff
 EXTRACT_ONLY=	${DISTFILES:M*tar.*}
@@ -53,7 +53,7 @@ PLIST_SUB+=	GENERIC="@comment "
 
 .if ${PORT_OPTIONS:MTALKFILTERS}
 PLIST_SUB+=	TALKFILTERS=""
-LIB_DEPENDS+=	libtalkfilters.so:${PORTSDIR}/misc/talkfilters
+LIB_DEPENDS+=	libtalkfilters.so:misc/talkfilters
 .else
 CONFIGURE_ARGS+=--disable-talkfilters
 PLIST_SUB+=	TALKFILTERS="@comment "
diff --git a/textproc/libutf8proc/Makefile b/textproc/libutf8proc/Makefile
index 7eb2da368dd1..454620dc1be8 100644
--- a/textproc/libutf8proc/Makefile
+++ b/textproc/libutf8proc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	UTF8 Processing 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/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index f48a26d833fe..42d332362450 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library and tools for parsing the visio file format structure
 LICENSE=	LGPL21 MPL GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu \
-		librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/spirit/include/classic_core.hpp:devel/boost-libs
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		librevenge-0.0.so:textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-tests --disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/libwapcaplet/Makefile b/textproc/libwapcaplet/Makefile
index b430d1a06bd2..4bdc4326a272 100644
--- a/textproc/libwapcaplet/Makefile
+++ b/textproc/libwapcaplet/Makefile
@@ -12,8 +12,8 @@ COMMENT=	String internment library
 
 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=	gmake
 USE_LDCONFIG=	yes
diff --git a/textproc/libwpd010/Makefile b/textproc/libwpd010/Makefile
index c3015cabac28..f4efe55df9f4 100644
--- a/textproc/libwpd010/Makefile
+++ b/textproc/libwpd010/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tools for importing and exporting WordPerfect(tm) documents
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 USES=		libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index 57a60b338f7e..64c87400ba86 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Microsoft file word processor format import filter library
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -26,7 +26,7 @@ INSTALL_TARGET=	install-strip
 .if ${COMPILER_FEATURES:Mlibc++}
 CONFIGURE_ARGS+=	--with-sharedptr=c++11
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 CONFIGURE_ARGS+=	--with-sharedptr=boost
 .endif
 
diff --git a/textproc/libwps03/Makefile b/textproc/libwps03/Makefile
index 1e731dae51f8..a05b09bbb71c 100644
--- a/textproc/libwps03/Makefile
+++ b/textproc/libwps03/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Microsoft file word processor format import filter library
 LICENSE=	LGPL21 MPL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librevenge-0.0.so:${PORTSDIR}/textproc/librevenge
+LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
 
 CONFIGURE_ARGS=	--disable-werror --without-docs
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -28,7 +28,7 @@ INSTALL_TARGET=	install-strip
 .if ${COMPILER_FEATURES:Mlibc++}
 CONFIGURE_ARGS+=	--with-sharedptr=c++11
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 CONFIGURE_ARGS+=	--with-sharedptr=boost
 .endif
 
diff --git a/textproc/libxml++26-reference/Makefile b/textproc/libxml++26-reference/Makefile
index 947df3bb6c6a..5056c0b87fd4 100644
--- a/textproc/libxml++26-reference/Makefile
+++ b/textproc/libxml++26-reference/Makefile
@@ -4,8 +4,8 @@
 
 PORTREVISION=	0
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc:${PORTSDIR}/textproc/libxml++26 \
-		glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc:textproc/libxml++26 \
+		glibmm-reference>=0:devel/glibmm-reference
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 0686e1267b67..842af5a09bdf 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -17,7 +17,7 @@ PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES+=		gmake libtool pathfix pkgconfig
 USE_GNOME=	glibmm libxml2
diff --git a/textproc/libxml2-reference/Makefile b/textproc/libxml2-reference/Makefile
index b25b2845f97e..0f88ab209d47 100644
--- a/textproc/libxml2-reference/Makefile
+++ b/textproc/libxml2-reference/Makefile
@@ -3,7 +3,7 @@
 
 PORTREVISION=	0
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/libxml2:configure
+BUILD_DEPENDS=	${NONEXISTENT}:textproc/libxml2:configure
 
 PARENT_WRKSRC!=	cd ${.CURDIR}/../libxml2 && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index f5c8ed092074..f11effd5dad0 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML library which wraps expat
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/textproc/libxslt-reference/Makefile b/textproc/libxslt-reference/Makefile
index 61e569b7db82..2928f51cb3c9 100644
--- a/textproc/libxslt-reference/Makefile
+++ b/textproc/libxslt-reference/Makefile
@@ -3,7 +3,7 @@
 
 PORTREVISION=	0
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/libxslt:configure
+BUILD_DEPENDS=	${NONEXISTENT}:textproc/libxslt:configure
 
 PARENT_WRKSRC!=	cd ${.CURDIR}/../libxslt && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index e492f9ba1826..7e0f9a33eb40 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -40,7 +40,7 @@ CRYPTO_DESC=	Enable crypto support for exslt
 
 MEM_DEBUG_CONFIGURE_ON=	--with-mem-debug
 CRYPTO_CONFIGURE_WITH=	crypto
-CRYPTO_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+CRYPTO_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' \
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 370ceb9805ca..452fc16f59f0 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Grammar checking library
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	libaspell.so:textproc/aspell
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/linuxdoc-tools/Makefile b/textproc/linuxdoc-tools/Makefile
index 2bcfa05a1d88..5017fb3ad349 100644
--- a/textproc/linuxdoc-tools/Makefile
+++ b/textproc/linuxdoc-tools/Makefile
@@ -16,12 +16,12 @@ LICENSE_NAME_LinuxdocTools=	The linuxdoc-tools license
 LICENSE_FILE_LinuxdocTools=	${WRKSRC}/COPYING
 LICENSE_PERMS_LinuxdocTools=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		nsgmls:${PORTSDIR}/textproc/jade \
-		sgmlsasp:${PORTSDIR}/textproc/sgmls
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		nsgmls:${PORTSDIR}/textproc/jade \
-		sgmlsasp:${PORTSDIR}/textproc/sgmls
+BUILD_DEPENDS=	gawk:lang/gawk \
+		nsgmls:textproc/jade \
+		sgmlsasp:textproc/sgmls
+RUN_DEPENDS=	gawk:lang/gawk \
+		nsgmls:textproc/jade \
+		sgmlsasp:textproc/sgmls
 
 GNU_CONFIGURE=	yes
 USES=		gmake perl5
@@ -32,7 +32,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+DOCS_BUILD_DEPENDS=	bash:shells/bash
 DOCS_MAKE_ENV=		LANG=C BUILD_DOCS=true
 
 post-patch:
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 7a461bb51044..7dc2055e8333 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://dist.bsdlab.org/ \
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The Linuxdoc SGML DTD
 
-RUN_DEPENDS=	${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
-		${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${ISOCAT}:textproc/iso8879 \
+		${XMLCATMGR}:textproc/xmlcatmgr
 
 EXTRACT_ONLY=	# empty
 NO_BUILD=	yes
diff --git a/textproc/loook/Makefile b/textproc/loook/Makefile
index c16e1f36d0e4..2bc50e5ad094 100644
--- a/textproc/loook/Makefile
+++ b/textproc/loook/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple Python tool that search in LibreOffice/OpenOffice files
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
 
 WRKSRC=		${WRKDIR}
 
diff --git a/textproc/lttoolbox/Makefile b/textproc/lttoolbox/Makefile
index d12d7ba5cbe7..01da5d01a68a 100644
--- a/textproc/lttoolbox/Makefile
+++ b/textproc/lttoolbox/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tool for lexical, morphological analysis and generation of words
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 APVER=	3.3
 APREV=	2
diff --git a/textproc/luaexpat/Makefile b/textproc/luaexpat/Makefile
index 7e80a99a7006..48afc0eeadfe 100644
--- a/textproc/luaexpat/Makefile
+++ b/textproc/luaexpat/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	LuaExpat is a SAX XML parser based on the Expat library
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake lua:51
 ALL_TARGET=	lib
diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile
index d9c780c1fb1c..717a1cf98736 100644
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@@ -11,7 +11,7 @@ COMMENT=	C++ port of the Lucene library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LGPL.license
 
-LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	luceneplusplus
diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile
index bf7fd524c1f9..9bceaa7bf2b6 100644
--- a/textproc/m17n-im-config/Makefile
+++ b/textproc/m17n-im-config/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.m17n.org/common/im-config/ \
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	GUI for per-user configuration of m17n-lib input methods
 
-LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
+LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index 097212791176..d5b8cb6bff4e 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://mdocml.bsd.lv/snapshots/ \
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	mdoc macro compiler
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 EXAMPLESDIR=	${PREFIX}/share/examples/mandoc
 
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 345b0105202d..ca050e54ecc8 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -11,8 +11,8 @@ COMMENT=	GNOME visual diff and merge tool
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	itstool:textproc/itstool
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USES=		desktop-file-utils gettext python:2 shared-mime-info \
 		shebangfix tar:xz
diff --git a/textproc/miller/Makefile b/textproc/miller/Makefile
index 86ca3bd9486a..aab781da3ae9 100644
--- a/textproc/miller/Makefile
+++ b/textproc/miller/Makefile
@@ -21,7 +21,7 @@ PLIST_FILES=	bin/mlr man/man1/mlr.1.gz
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 .endif
 
 post-configure:
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index adde9ec8dfa5..6707b15bae48 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfile
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Modular log file analysis program
 
-LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns \
-		libgd.so:${PORTSDIR}/graphics/gd \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libadns.so:dns/adns \
+		libgd.so:graphics/gd \
+		libpcre.so:devel/pcre \
+		libexpat.so:textproc/expat2
 
 USES=		gettext libtool
 
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index af0f5652c6e0..9c23bc8092aa 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Sorting files in sophisticated ways
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre \
-		libuninum.so:${PORTSDIR}/devel/libuninum \
-		libutf8proc.so:${PORTSDIR}/textproc/utf8proc
-RUN_DEPENDS=	iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
-TEST_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libtre.so:textproc/libtre \
+		libuninum.so:devel/libuninum \
+		libutf8proc.so:textproc/utf8proc
+RUN_DEPENDS=	iwidgets>=0:x11-toolkits/iwidgets
+TEST_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 CONFIGURE_ENV=	ac_cv_lib_tre_regwcomp=yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index 1aa97b64176a..c0fcb1971483 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple thesaurus library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 
 USES=	libtool pathfix pkgconfig shebangfix
 SHEBANG_FILES=	th_gen_idx.pl
diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile
index 7177b27d494d..191762ce6f81 100644
--- a/textproc/nux/Makefile
+++ b/textproc/nux/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://dst.lbl.gov/ACSSoftware/nux/nux-download/releases/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small open-source XQuery extension of the XOM library
 
-RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom \
-		${JAVALIBDIR}/saxon9.jar:${PORTSDIR}/textproc/saxon-devel
+RUN_DEPENDS=	${JAVALIBDIR}/xom.jar:textproc/xom \
+		${JAVALIBDIR}/saxon9.jar:textproc/saxon-devel
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=		XQUERY_TOOL DOCS
 OPTIONS_DEFAULT=	XQUERY_TOOL
 
 XQUERY_TOOL_DESC=	Install the XQuery command-line tool
-XQUERY_TOOL_RUN_DEPENDS=${JAVALIBDIR}/java-getopt.jar:${PORTSDIR}/java/java-getopt
+XQUERY_TOOL_RUN_DEPENDS=${JAVALIBDIR}/java-getopt.jar:java/java-getopt
 XQUERY_TOOL_PLIST_FILES=bin/fire-xquery
 XQUERY_TOOL_SUB_FILES=	fire-xquery.sh
 
diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile
index 7dabd1fd6fdd..bfa6c121e903 100644
--- a/textproc/ocaml-csv/Makefile
+++ b/textproc/ocaml-csv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/420/
 MAINTAINER=	tcrimi@gmail.com
 COMMENT=	OCaml library to read and write CSV files
 
-BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/extlib:${PORTSDIR}/devel/ocaml-extlib
+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/extlib:devel/ocaml-extlib
 
 WRKSRC=		${WRKDIR}/csv-${PORTVERSION}
 USES=		gmake
diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile
index 41e7fe83d4aa..2a9b223a2e89 100644
--- a/textproc/ocaml-expat/Makefile
+++ b/textproc/ocaml-expat/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Stub for the expat parser in OCaml
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake
 USE_OCAML=	yes
diff --git a/textproc/ocaml-pxp/Makefile b/textproc/ocaml-pxp/Makefile
index a9982c9eb4ba..2510aae802be 100644
--- a/textproc/ocaml-pxp/Makefile
+++ b/textproc/ocaml-pxp/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Validating XML parser for OCaml
 
-BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
-RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
+BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net
+RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net
 
 OPTIONS_DEFINE=	ULEX
 OPTIONS_DEFAULT=ULEX
@@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=	true
 USE_OCAML_LDCONFIG=	true
 USE_OCAML_CAMLP4=	true
 
-ULEX_BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex
-ULEX_RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:${PORTSDIR}/devel/ocaml-ulex
+ULEX_BUILD_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:devel/ocaml-ulex
+ULEX_RUN_DEPENDS=	${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:devel/ocaml-ulex
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=-without-wlex-compat -without-wlex
diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile
index aa27d6a6140c..7447b66ae829 100644
--- a/textproc/ocaml-text/Makefile
+++ b/textproc/ocaml-text/Makefile
@@ -31,8 +31,8 @@ OPTIONS_DEFINE=		PCRE
 OPTIONS_DEFAULT=	PCRE
 
 PCRE_CONFIGURE_ENABLE=	pcre
-PCRE_BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-PCRE_RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
+PCRE_BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
+PCRE_RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:devel/ocaml-pcre
 
 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/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile
index 01fcd2ae9086..535dbc78abd3 100644
--- a/textproc/ocaml-tyxml/Makefile
+++ b/textproc/ocaml-tyxml/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	Lesser GPL 2.1 with a special OpenSSL exception clause
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${SA_DIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
-RUN_DEPENDS=	${SA_DIR}/netstring/netstring.a:${PORTSDIR}/www/ocaml-net
+BUILD_DEPENDS=	${SA_DIR}/netstring/netstring.a:www/ocaml-net
+RUN_DEPENDS=	${SA_DIR}/netstring/netstring.a:www/ocaml-net
 
 USES=			gmake
 USE_OCAML=		yes
diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index 14e843ac5277..6db82aa31342 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	Search-OpenFTS-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Open Source Full Text Search engine
 
-RUN_DEPENDS=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 
 USES+=		perl5 pgsql shebangfix
 SHEBANG_FILES=	examples/*.pl examples/parser/*.pl
diff --git a/textproc/opengrm-ngram/Makefile b/textproc/opengrm-ngram/Makefile
index 727f1f078c10..0dfcc370874d 100644
--- a/textproc/opengrm-ngram/Makefile
+++ b/textproc/opengrm-ngram/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for making n-gram language models encoded as weighted FSTs
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libfst.so:${PORTSDIR}/math/openfst
+LIB_DEPENDS=	libfst.so:math/openfst
 
 USES=		compiler:c++11-lib libtool
 USE_LDCONFIG=	yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 89b7ae82e47e..dfe1b30e1712 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/-pre/}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
-LIB_DEPENDS=	libosp.so:${PORTSDIR}/textproc/opensp
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+LIB_DEPENDS=	libosp.so:textproc/opensp
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 USES=		gettext gmake libtool perl5
 USE_LDCONFIG=	yes
diff --git a/textproc/opentoken/Makefile b/textproc/opentoken/Makefile
index a79e6549658a..1bfb7e4aa519 100644
--- a/textproc/opentoken/Makefile
+++ b/textproc/opentoken/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lexical analyser and parser for the Ada language
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild>=20130416:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild>=20130416:devel/gprbuild
 
 USES=		ada tar:bzip2
 
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 3c5581ef4315..002b011ed3b8 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Open Text Summarizer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 USES=		autoreconf gettext libtool pathfix pkgconfig
 PATHFIX_MAKEFILEIN=	Makefile.am
diff --git a/textproc/p5-AI-Categorizer/Makefile b/textproc/p5-AI-Categorizer/Makefile
index e3ef4d5147a9..e5d10ce67117 100644
--- a/textproc/p5-AI-Categorizer/Makefile
+++ b/textproc/p5-AI-Categorizer/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Automatic Text Categorization
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Container>=0:${PORTSDIR}/devel/p5-Class-Container \
-		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-Statistics-Contingency>=0:${PORTSDIR}/math/p5-Statistics-Contingency \
-		p5-Lingua-Stem>=0:${PORTSDIR}/textproc/p5-Lingua-Stem \
-		p5-Time-Progress>=0:${PORTSDIR}/devel/p5-Time-Progress \
-		p5-Algorithm-SVM>=0:${PORTSDIR}/devel/p5-Algorithm-SVM \
-		p5-AI-DecisionTree>=0:${PORTSDIR}/math/p5-AI-DecisionTree \
-		p5-Algorithm-NaiveBayes>=0:${PORTSDIR}/devel/p5-Algorithm-NaiveBayes
+BUILD_DEPENDS=	p5-Class-Container>=0:devel/p5-Class-Container \
+		p5-Params-Validate>=0:devel/p5-Params-Validate \
+		p5-Statistics-Contingency>=0:math/p5-Statistics-Contingency \
+		p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem \
+		p5-Time-Progress>=0:devel/p5-Time-Progress \
+		p5-Algorithm-SVM>=0:devel/p5-Algorithm-SVM \
+		p5-AI-DecisionTree>=0:math/p5-AI-DecisionTree \
+		p5-Algorithm-NaiveBayes>=0:devel/p5-Algorithm-NaiveBayes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Algorithm-CheckDigits/Makefile b/textproc/p5-Algorithm-CheckDigits/Makefile
index 253388863b16..65c44dae4df5 100644
--- a/textproc/p5-Algorithm-CheckDigits/Makefile
+++ b/textproc/p5-Algorithm-CheckDigits/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl extension to generate and test check digits
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Probe-Perl>=0:${PORTSDIR}/sysutils/p5-Probe-Perl
+TEST_DEPENDS=	p5-Probe-Perl>=0:sysutils/p5-Probe-Perl
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Algorithm-RabinKarp/Makefile b/textproc/p5-Algorithm-RabinKarp/Makefile
index 09596c936896..962b19acd2c8 100644
--- a/textproc/p5-Algorithm-RabinKarp/Makefile
+++ b/textproc/p5-Algorithm-RabinKarp/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Rabin-Karp streaming hash
 
-BUILD_DEPENDS=	p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp
+BUILD_DEPENDS=	p5-File-Temp>=0:devel/p5-File-Temp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-BibTeX-Parser/Makefile b/textproc/p5-BibTeX-Parser/Makefile
index 8b3fd540b842..ee288c00a8e5 100644
--- a/textproc/p5-BibTeX-Parser/Makefile
+++ b/textproc/p5-BibTeX-Parser/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Pure perl BibTeX parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-LaTeX-ToUnicode>=0.02:${PORTSDIR}/textproc/p5-LaTeX-ToUnicode \
-		p5-IO-String>0:${PORTSDIR}/devel/p5-IO-String
+RUN_DEPENDS=	p5-LaTeX-ToUnicode>=0.02:textproc/p5-LaTeX-ToUnicode \
+		p5-IO-String>0:devel/p5-IO-String
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Bloom-Filter/Makefile b/textproc/p5-Bloom-Filter/Makefile
index e87c7823f429..ed88061af7a4 100644
--- a/textproc/p5-Bloom-Filter/Makefile
+++ b/textproc/p5-Bloom-Filter/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Probabilistic algorithm for doing existence tests
 
-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/textproc/p5-CAM-PDF/Makefile b/textproc/p5-CAM-PDF/Makefile
index 82b09bd4ff6b..1f49e6bcc9c9 100644
--- a/textproc/p5-CAM-PDF/Makefile
+++ b/textproc/p5-CAM-PDF/Makefile
@@ -14,12 +14,12 @@ COMMENT=	PDF manipulation library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-RC4>=2.02:${PORTSDIR}/security/p5-Crypt-RC4 \
-		p5-Text-PDF>=0.29:${PORTSDIR}/print/p5-Text-PDF
+BUILD_DEPENDS=	p5-Crypt-RC4>=2.02:security/p5-Crypt-RC4 \
+		p5-Text-PDF>=0.29:print/p5-Text-PDF
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Memory-Cycle>=1.02:${PORTSDIR}/devel/p5-Test-Memory-Cycle \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Memory-Cycle>=1.02:devel/p5-Test-Memory-Cycle \
+		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/textproc/p5-CQL-Parser/Makefile b/textproc/p5-CQL-Parser/Makefile
index f42b33352777..46c673f345a8 100644
--- a/textproc/p5-CQL-Parser/Makefile
+++ b/textproc/p5-CQL-Parser/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Compiles CQL strings into parse trees of Node subtypes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0.1:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Clone>=0.15:${PORTSDIR}/devel/p5-Clone \
-		p5-String-Tokenizer>=0.05:${PORTSDIR}/textproc/p5-String-Tokenizer
+BUILD_DEPENDS=	p5-Class-Accessor>=0.1:devel/p5-Class-Accessor \
+		p5-Clone>=0.15:devel/p5-Clone \
+		p5-String-Tokenizer>=0.05:textproc/p5-String-Tokenizer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \
-		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-CPAN-Changes>=0:devel/p5-CPAN-Changes \
+		p5-Test-Exception>=0.21:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-CSS-Croco/Makefile b/textproc/p5-CSS-Croco/Makefile
index 27e2497ec053..c6fffe4655fd 100644
--- a/textproc/p5-CSS-Croco/Makefile
+++ b/textproc/p5-CSS-Croco/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Quick CSS parser
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
+LIB_DEPENDS=	libcroco-0.6.so:textproc/libcroco
 
 USES=		perl5 pkgconfig
 USE_PERL5=	configure
diff --git a/textproc/p5-CSS-Minifier-XS/Makefile b/textproc/p5-CSS-Minifier-XS/Makefile
index fdfb93175d72..45bd205ef3c1 100644
--- a/textproc/p5-CSS-Minifier-XS/Makefile
+++ b/textproc/p5-CSS-Minifier-XS/Makefile
@@ -14,9 +14,9 @@ COMMENT=	XS based CSS minifier
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-CSS-Minifier>=0:${PORTSDIR}/textproc/p5-CSS-Minifier \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-CSS-Minifier>=0:textproc/p5-CSS-Minifier \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-CSS-Packer/Makefile b/textproc/p5-CSS-Packer/Makefile
index ecf1ca7bbf6e..b53cbc3d5276 100644
--- a/textproc/p5-CSS-Packer/Makefile
+++ b/textproc/p5-CSS-Packer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Another CSS minifier
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Regexp-RegGrp>=1.001001:${PORTSDIR}/devel/p5-Regexp-RegGrp
+BUILD_DEPENDS=	p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index 9ad9d5bce6c2..287c080a3fe4 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -14,7 +14,7 @@ COMMENT=	SAC CSS (Simple API for CSS) parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ArrayObjects>=0.04:${PORTSDIR}/devel/p5-Class-ArrayObjects
+BUILD_DEPENDS=	p5-Class-ArrayObjects>=0.04:devel/p5-Class-ArrayObjects
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-CSS-Simple/Makefile b/textproc/p5-CSS-Simple/Makefile
index 4a90ec768afa..3e378078a7a2 100644
--- a/textproc/p5-CSS-Simple/Makefile
+++ b/textproc/p5-CSS-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Interface through which to read/write/manipulate CSS files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
-RUN_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
+RUN_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-CSS-Squish/Makefile b/textproc/p5-CSS-Squish/Makefile
index 98cf932e675c..18d41920fb63 100644
--- a/textproc/p5-CSS-Squish/Makefile
+++ b/textproc/p5-CSS-Squish/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Compact many CSS files into one big file
 
-RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+		p5-Test-LongString>=0:devel/p5-Test-LongString
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-CSS-Tiny/Makefile b/textproc/p5-CSS-Tiny/Makefile
index e6bf4ef87dcb..5c3d3ea91e59 100644
--- a/textproc/p5-CSS-Tiny/Makefile
+++ b/textproc/p5-CSS-Tiny/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Read/Write .css files with as little code as possible
 
 LICENSE=	ARTPERL10
 
-RUN_DEPENDS=	p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
+RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-CSS/Makefile b/textproc/p5-CSS/Makefile
index 3a1d8d5a2599..089a930162a6 100644
--- a/textproc/p5-CSS/Makefile
+++ b/textproc/p5-CSS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object oriented access to Cascading Style Sheets (CSS)
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Class-CSV/Makefile b/textproc/p5-Class-CSV/Makefile
index f5daadebf9cd..f73853263ae0 100644
--- a/textproc/p5-Class-CSV/Makefile
+++ b/textproc/p5-Class-CSV/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class based CSV parser/writer
 
-BUILD_DEPENDS=	p5-Text-CSV_XS>=0.23:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-Class-Accessor>=0.18:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Text-CSV_XS>=0.23:textproc/p5-Text-CSV_XS \
+		p5-Class-Accessor>=0.18:devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
index 4e84ab989263..8843c59c9e16 100644
--- a/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
+++ b/textproc/p5-Data-FormValidator-Constraints-DateTime/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Data::FormValidator constraints for dates and times
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-FormValidator>=0:${PORTSDIR}/textproc/p5-Data-FormValidator \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-Format-Builder>=0:${PORTSDIR}/devel/p5-DateTime-Format-Builder
+BUILD_DEPENDS=	p5-Data-FormValidator>=0:textproc/p5-Data-FormValidator \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-Format-Builder>=0:devel/p5-DateTime-Format-Builder
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 17ae138e284c..4cef56efab90 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -11,14 +11,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Validates user input (usually from an HTML form) based
 
-BUILD_DEPENDS=	p5-CGI>=3.48:${PORTSDIR}/www/p5-CGI \
-		p5-Date-Calc>=5.0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-File-MMagic>=1.17:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-MIME-Types>=1.005:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Perl6-Junction>=1.10:${PORTSDIR}/devel/p5-Perl6-Junction \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-CGI>=3.48:www/p5-CGI \
+		p5-Date-Calc>=5.0:devel/p5-Date-Calc \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-File-MMagic>=1.17:devel/p5-File-MMagic \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-MIME-Types>=1.005:mail/p5-MIME-Types \
+		p5-Perl6-Junction>=1.10:devel/p5-Perl6-Junction \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile b/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
index 6468c2d86b84..0946b6f92f9b 100644
--- a/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
+++ b/textproc/p5-Data-Phrasebook-Loader-YAML/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Loader class for phrasebook implementations using YAML
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Data-Phrasebook>=0.24:${PORTSDIR}/textproc/p5-Data-Phrasebook \
-		p5-YAML>=0.35:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Data-Phrasebook>=0.24:textproc/p5-Data-Phrasebook \
+		p5-YAML>=0.35:textproc/p5-YAML
 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/textproc/p5-Data-Report/Makefile b/textproc/p5-Data-Report/Makefile
index fd7ff60a45ef..348ed7ddcd44 100644
--- a/textproc/p5-Data-Report/Makefile
+++ b/textproc/p5-Data-Report/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Data::Report - Framework for flexible reporting
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-COMMON_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Text-CSV_XS>0:${PORTSDIR}/textproc/p5-Text-CSV_XS
-BUILD_DEPENDS=	p5-Module-Build>=0.28:${PORTSDIR}/devel/p5-Module-Build \
+COMMON_DEPENDS=	p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-Text-CSV_XS>0:textproc/p5-Text-CSV_XS
+BUILD_DEPENDS=	p5-Module-Build>=0.28:devel/p5-Module-Build \
 		${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/textproc/p5-Data-SpreadPagination/Makefile b/textproc/p5-Data-SpreadPagination/Makefile
index 943b9418928f..eed73e56204b 100644
--- a/textproc/p5-Data-SpreadPagination/Makefile
+++ b/textproc/p5-Data-SpreadPagination/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Page numbering and spread pagination
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Page>=0:${PORTSDIR}/databases/p5-Data-Page \
-		p5-Math-Round>=0:${PORTSDIR}/math/p5-Math-Round
+BUILD_DEPENDS=	p5-Data-Page>=0:databases/p5-Data-Page \
+		p5-Math-Round>=0:math/p5-Math-Round
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Dev-Bollocks/Makefile b/textproc/p5-Dev-Bollocks/Makefile
index 174db9a56be7..a87f6291b564 100644
--- a/textproc/p5-Dev-Bollocks/Makefile
+++ b/textproc/p5-Dev-Bollocks/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to generate bollocks straight from middle management
 
-BUILD_DEPENDS=	p5-Math-String>=0:${PORTSDIR}/math/p5-Math-String
+BUILD_DEPENDS=	p5-Math-String>=0:math/p5-Math-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Devel-TraceSAX/Makefile b/textproc/p5-Devel-TraceSAX/Makefile
index 63fe8b6f3570..e115e6b6e456 100644
--- a/textproc/p5-Devel-TraceSAX/Makefile
+++ b/textproc/p5-Devel-TraceSAX/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Trace SAX events
 
-BUILD_DEPENDS=	p5-Devel-TraceCalls>=0.03:${PORTSDIR}/devel/p5-Devel-TraceCalls \
-		p5-XML-SAX-Machines>=0:${PORTSDIR}/textproc/p5-XML-SAX-Machines
+BUILD_DEPENDS=	p5-Devel-TraceCalls>=0.03:devel/p5-Devel-TraceCalls \
+		p5-XML-SAX-Machines>=0:textproc/p5-XML-SAX-Machines
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-DocSet/Makefile b/textproc/p5-DocSet/Makefile
index d1c16add9bdf..73a00fff9999 100644
--- a/textproc/p5-DocSet/Makefile
+++ b/textproc/p5-DocSet/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Documentation projects builder in HTML, PS, and PDF formats
 
-BUILD_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Pod-POM>=0:textproc/p5-Pod-POM \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-EBook-Tools/Makefile b/textproc/p5-EBook-Tools/Makefile
index 782098a78512..f3fecb13db3c 100644
--- a/textproc/p5-EBook-Tools/Makefile
+++ b/textproc/p5-EBook-Tools/Makefile
@@ -13,30 +13,30 @@ COMMENT=	Object class for manipulating and generating E-books
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Lingua-EN-NameParse>=0:${PORTSDIR}/textproc/p5-Lingua-EN-NameParse \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Palm>=0:${PORTSDIR}/palm/p5-Palm \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32 \
-		txt2html>=0:${PORTSDIR}/textproc/txt2html \
-		p5-Bit-Vector>=0:${PORTSDIR}/math/p5-Bit-Vector \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-File-MimeInfo>=0:devel/p5-File-MimeInfo \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Lingua-EN-NameParse>=0:textproc/p5-Lingua-EN-NameParse \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-Mojolicious>=0:www/p5-Mojolicious \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-Palm>=0:palm/p5-Palm \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-String-CRC32>=0:devel/p5-String-CRC32 \
+		txt2html>=0:textproc/txt2html \
+		p5-Bit-Vector>=0:math/p5-Bit-Vector \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${LOCALBASE}/bin/tidy5:${PORTSDIR}/www/tidy-html5
+RUN_DEPENDS+=	${LOCALBASE}/bin/tidy5:www/tidy-html5
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-ElasticSearch-SearchBuilder/Makefile b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
index 5ab84b472820..3930c26f70c0 100644
--- a/textproc/p5-ElasticSearch-SearchBuilder/Makefile
+++ b/textproc/p5-ElasticSearch-SearchBuilder/Makefile
@@ -14,10 +14,10 @@ COMMENT=	ElasticSearch Query Builder
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Carp>=0:${PORTSDIR}/devel/p5-Carp
-TEST_DEPENDS=	p5-Test-Deep>=:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump
+RUN_DEPENDS=	p5-Carp>=0:devel/p5-Carp
+TEST_DEPENDS=	p5-Test-Deep>=:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Data-Dump>=0:devel/p5-Data-Dump
 
 DEPRECATED=	Use textproc/p5-Elasticsearch which is the official client
 EXPIRATION_DATE=	2016-04-10
diff --git a/textproc/p5-ElasticSearch-legacy/Makefile b/textproc/p5-ElasticSearch-legacy/Makefile
index 82e1225c0d13..293e70658494 100644
--- a/textproc/p5-ElasticSearch-legacy/Makefile
+++ b/textproc/p5-ElasticSearch-legacy/Makefile
@@ -15,20 +15,20 @@ COMMENT=	ElasticSearch API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-ElasticSearch-SearchBuilder>=0:${PORTSDIR}/textproc/p5-ElasticSearch-SearchBuilder \
-		p5-Any-URI-Escape>=0:${PORTSDIR}/www/p5-Any-URI-Escape \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-HTTP-Lite>=0:${PORTSDIR}/www/p5-HTTP-Lite \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-HTTP-Tiny>=0:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+RUN_DEPENDS=	p5-ElasticSearch-SearchBuilder>=0:textproc/p5-ElasticSearch-SearchBuilder \
+		p5-Any-URI-Escape>=0:www/p5-Any-URI-Escape \
+		p5-PathTools>=0:devel/p5-PathTools \
+		p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-HTTP-Tiny>=0:www/p5-HTTP-Tiny \
+		p5-IO-Compress>=0:archivers/p5-IO-Compress \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-URI>=0:net/p5-URI \
+		p5-YAML>=0:textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 DEPRECATED=	Use textproc/p5-Elasticsearch which is the official client
 EXPIRATION_DATE=	2016-04-10
diff --git a/textproc/p5-Excel-Template/Makefile b/textproc/p5-Excel-Template/Makefile
index 9f8027c1980a..48b220e22350 100644
--- a/textproc/p5-Excel-Template/Makefile
+++ b/textproc/p5-Excel-Template/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl module for templating Excel files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Test-Exception>=0.21:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Test-Exception>=0.21:devel/p5-Test-Exception \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Excel-Writer-XLSX/Makefile b/textproc/p5-Excel-Writer-XLSX/Makefile
index e39f174c4b7f..b1ae99ce9c3e 100644
--- a/textproc/p5-Excel-Writer-XLSX/Makefile
+++ b/textproc/p5-Excel-Writer-XLSX/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Create a new file in the Excel 2007+ XLSX format
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.30:${PORTSDIR}/archivers/p5-Archive-Zip
+BUILD_DEPENDS=	p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip
+TEST_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-Date-Manip>=0:devel/p5-Date-Manip
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-FormValidator-Lite/Makefile b/textproc/p5-FormValidator-Lite/Makefile
index abf4bd8d484f..556c8c1abe5f 100644
--- a/textproc/p5-FormValidator-Lite/Makefile
+++ b/textproc/p5-FormValidator-Lite/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Lightleight form validation library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite \
-		p5-Class-Load>=0.11:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Email-Valid>=0:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-Email-Valid-Loose>=0:${PORTSDIR}/mail/p5-Email-Valid-Loose
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
+		p5-Class-Load>=0.11:devel/p5-Class-Load \
+		p5-Email-Valid>=0:mail/p5-Email-Valid \
+		p5-Email-Valid-Loose>=0:mail/p5-Email-Valid-Loose
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Text-TestBase>=0:${PORTSDIR}/textproc/p5-Text-TestBase \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-Test-Requires>=0.05:devel/p5-Test-Requires \
+		p5-Text-TestBase>=0:textproc/p5-Text-TestBase \
+		p5-YAML>=0:textproc/p5-YAML
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/textproc/p5-Games-Dissociate/Makefile b/textproc/p5-Games-Dissociate/Makefile
index 2ea58569e027..a81e1dfb7faf 100644
--- a/textproc/p5-Games-Dissociate/Makefile
+++ b/textproc/p5-Games-Dissociate/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dissociated Press algorithm and filter
 
-TEST_DEPENDS=	p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.00:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Geo-Parse-OSM/Makefile b/textproc/p5-Geo-Parse-OSM/Makefile
index 58c72c672dca..c887859b6208 100644
--- a/textproc/p5-Geo-Parse-OSM/Makefile
+++ b/textproc/p5-Geo-Parse-OSM/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	OpenStreetMap XML file regexp parser
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.221
diff --git a/textproc/p5-Getopt-Lucid/Makefile b/textproc/p5-Getopt-Lucid/Makefile
index 4094937baa8f..54826bd71735 100644
--- a/textproc/p5-Getopt-Lucid/Makefile
+++ b/textproc/p5-Getopt-Lucid/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Clear, readable syntax for command line processing
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Exception-Class>=1.23:${PORTSDIR}/devel/p5-Exception-Class
+BUILD_DEPENDS=	p5-Exception-Class>=1.23:devel/p5-Exception-Class
 RUN_DEPENDS+=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Exception-Class-TryCatch>=1.10:${PORTSDIR}/devel/p5-Exception-Class-TryCatch
+TEST_DEPENDS=	p5-Exception-Class-TryCatch>=1.10:devel/p5-Exception-Class-TryCatch
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/textproc/p5-Google-Data-JSON/Makefile b/textproc/p5-Google-Data-JSON/Makefile
index 881229722930..09784d9ed17c 100644
--- a/textproc/p5-Google-Data-JSON/Makefile
+++ b/textproc/p5-Google-Data-JSON/Makefile
@@ -13,17 +13,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	General XML-JSON converter based on Google Data APIs
 
-BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Perl6-Export-Attrs>=0:${PORTSDIR}/devel/p5-Perl6-Export-Attrs \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-JSON-Any>=0:converters/p5-JSON-Any \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Perl6-Export-Attrs>=0:devel/p5-Perl6-Export-Attrs \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-XML-Atom>=0:textproc/p5-XML-Atom \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Groonga-API/Makefile b/textproc/p5-Groonga-API/Makefile
index d34b37172d04..8e211780b31a 100644
--- a/textproc/p5-Groonga-API/Makefile
+++ b/textproc/p5-Groonga-API/Makefile
@@ -19,12 +19,12 @@ GH_PROJECT=	${PORTNAME:tl}
 GH_TAGNAME=	314060b
 
 RUN_DEPENDS=	\
-	p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-Path-Extended>0:${PORTSDIR}/devel/p5-Path-Extended \
-	p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences \
-	p5-Test-UseAllModules>=0.10:${PORTSDIR}/devel/p5-Test-UseAllModules
+	p5-JSON-XS>0:converters/p5-JSON-XS \
+	p5-Path-Extended>0:devel/p5-Path-Extended \
+	p5-Test-Differences>0:devel/p5-Test-Differences \
+	p5-Test-UseAllModules>=0.10:devel/p5-Test-UseAllModules
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	libgroonga.so:${PORTSDIR}/textproc/groonga
+LIB_DEPENDS=	libgroonga.so:textproc/groonga
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-HTML-CTPP2/Makefile b/textproc/p5-HTML-CTPP2/Makefile
index 3786144d2359..be85d0f20356 100644
--- a/textproc/p5-HTML-CTPP2/Makefile
+++ b/textproc/p5-HTML-CTPP2/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	reki@reki.ru
 COMMENT=	Perl interface module to CTPP2 library
 
-BUILD_DEPENDS=	ctpp2>=2.5.1:${PORTSDIR}/textproc/ctpp2
-LIB_DEPENDS=	libctpp2.so:${PORTSDIR}/textproc/ctpp2
+BUILD_DEPENDS=	ctpp2>=2.5.1:textproc/ctpp2
+LIB_DEPENDS=	libctpp2.so:textproc/ctpp2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-HTML-Copy/Makefile b/textproc/p5-HTML-Copy/Makefile
index 7ab1ed6bea49..da1578afb454 100644
--- a/textproc/p5-HTML-Copy/Makefile
+++ b/textproc/p5-HTML-Copy/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Copy a HTML file without breaking links
 
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-HTML-Parser>=3.4:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-HTML-Parser>=3.4:www/p5-HTML-Parser \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-URI>=0:net/p5-URI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-Entities-Interpolate/Makefile b/textproc/p5-HTML-Entities-Interpolate/Makefile
index 4f862179c13c..f4c331abe4bf 100644
--- a/textproc/p5-HTML-Entities-Interpolate/Makefile
+++ b/textproc/p5-HTML-Entities-Interpolate/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Call HTML::Entities::encode_entities, via a hash, within a string
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Tie-Function>=0.02:${PORTSDIR}/devel/p5-Tie-Function
+BUILD_DEPENDS=	p5-HTML-Parser>=3.69:www/p5-HTML-Parser \
+		p5-Tie-Function>=0.02:devel/p5-Tie-Function
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurper>=0.008:${PORTSDIR}/devel/p5-File-Slurper
+TEST_DEPENDS=	p5-File-Slurper>=0.008:devel/p5-File-Slurper
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-HTML-EscapeEvil/Makefile b/textproc/p5-HTML-EscapeEvil/Makefile
index 9783b6bd5c27..9321bef44288 100644
--- a/textproc/p5-HTML-EscapeEvil/Makefile
+++ b/textproc/p5-HTML-EscapeEvil/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Escape evil HTML tags
 
-BUILD_DEPENDS=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 82959cbd9357..5a438f3ef197 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Module to format HTML to text or PS
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Font-AFM>=0:${PORTSDIR}/x11-fonts/p5-Font-AFM \
-		p5-HTML-Tree>=3.15:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-Font-AFM>=0:x11-fonts/p5-Font-AFM \
+		p5-HTML-Tree>=3.15:www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-HTML-FormatExternal/Makefile b/textproc/p5-HTML-FormatExternal/Makefile
index d3248cc83d6b..02e00700a977 100644
--- a/textproc/p5-HTML-FormatExternal/Makefile
+++ b/textproc/p5-HTML-FormatExternal/Makefile
@@ -12,9 +12,9 @@ COMMENT=	HTML to text formatting using external programs
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-IPC-Run>0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-URI>=0.08:${PORTSDIR}/net/p5-URI \
-		p5-constant-defer>=0:${PORTSDIR}/devel/p5-constant-defer
+BUILD_DEPENDS=	p5-IPC-Run>0:devel/p5-IPC-Run \
+		p5-URI>=0.08:net/p5-URI \
+		p5-constant-defer>=0:devel/p5-constant-defer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	ELINKS HTML2TEXT LINKS LYNX LYNX_CURRENT NETRIK W3M
@@ -26,18 +26,18 @@ USES=		perl5
 USE_PERL5=	configure
 
 ELINKS_DESC=		Install with elinks
-ELINKS_RUN_DEPENDS=	elinks:${PORTSDIR}/www/elinks
+ELINKS_RUN_DEPENDS=	elinks:www/elinks
 HTML2TEXT_DESC=		Install with html2text
-HTML2TEXT_RUN_DEPENDS=	html2text:${PORTSDIR}/textproc/html2text
+HTML2TEXT_RUN_DEPENDS=	html2text:textproc/html2text
 LINKS_DESC=		Install with links
-LINKS_RUN_DEPENDS=	links:${PORTSDIR}/www/links
+LINKS_RUN_DEPENDS=	links:www/links
 LYNX_DESC=		Install with lynx
-LYNX_RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx
+LYNX_RUN_DEPENDS=	lynx:www/lynx
 LYNX_CURRENT_DESC=	Install with lynx-current
-LYNX_CURRENT_RUN_DEPENDS=	lynx:${PORTSDIR}/www/lynx-current
+LYNX_CURRENT_RUN_DEPENDS=	lynx:www/lynx-current
 NETRIK_DESC=		Install with netrik
-NETRIK_RUN_DEPENDS=	netrik:${PORTSDIR}/www/netrik
+NETRIK_RUN_DEPENDS=	netrik:www/netrik
 W3M_DESC=		Install with w3m
-W3M_RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m
+W3M_RUN_DEPENDS=	w3m:www/w3m
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
index af2a689f7cca..b994b847d803 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl5 module to convert HTML to text with tables in tact
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format \
-		p5-HTML-FormatText-WithLinks>=0:${PORTSDIR}/textproc/p5-HTML-FormatText-WithLinks \
-		p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree
+BUILD_DEPENDS=	p5-HTML-Format>=0:textproc/p5-HTML-Format \
+		p5-HTML-FormatText-WithLinks>=0:textproc/p5-HTML-FormatText-WithLinks \
+		p5-HTML-Tree>=0:www/p5-HTML-Tree
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-FormatText-WithLinks/Makefile b/textproc/p5-HTML-FormatText-WithLinks/Makefile
index 1a560b9be866..a9a0b07be43a 100644
--- a/textproc/p5-HTML-FormatText-WithLinks/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl5 module to convert HTML to text with links as footnotes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Format>=0:textproc/p5-HTML-Format \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-HTML5-Parser/Makefile b/textproc/p5-HTML-HTML5-Parser/Makefile
index ac6e7f05a74f..86d71318b309 100644
--- a/textproc/p5-HTML-HTML5-Parser/Makefile
+++ b/textproc/p5-HTML-HTML5-Parser/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Named entity list for HTML parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-HTML5-Entities>=0.002:${PORTSDIR}/textproc/p5-HTML-HTML5-Entities \
-		p5-IO-HTML>0:${PORTSDIR}/devel/p5-IO-HTML \
-		p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI>0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=1.94:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-HTML-HTML5-Entities>=0.002:textproc/p5-HTML-HTML5-Entities \
+		p5-IO-HTML>0:devel/p5-IO-HTML \
+		p5-Try-Tiny>0:lang/p5-Try-Tiny \
+		p5-URI>0:net/p5-URI \
+		p5-XML-LibXML>=1.94:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-HTMLDoc/Makefile b/textproc/p5-HTML-HTMLDoc/Makefile
index e49eb197078a..45de51e81a72 100644
--- a/textproc/p5-HTML-HTMLDoc/Makefile
+++ b/textproc/p5-HTML-HTMLDoc/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kostjnspb@yandex.ru
 COMMENT=	Perl interface to the htmldoc program
 
-BUILD_DEPENDS=	htmldoc>0:${PORTSDIR}/textproc/htmldoc
+BUILD_DEPENDS=	htmldoc>0:textproc/htmldoc
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-Packer/Makefile b/textproc/p5-HTML-Packer/Makefile
index 1e89df4b4418..81ca7adef3c1 100644
--- a/textproc/p5-HTML-Packer/Makefile
+++ b/textproc/p5-HTML-Packer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Another HTML code cleaner
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Regexp-RegGrp>=1.001001:${PORTSDIR}/devel/p5-Regexp-RegGrp
+BUILD_DEPENDS=	p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-HTML-QRCode/Makefile b/textproc/p5-HTML-QRCode/Makefile
index 8880a0bfa8ac..131d0bb4ed10 100644
--- a/textproc/p5-HTML-QRCode/Makefile
+++ b/textproc/p5-HTML-QRCode/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate HTML based QR Code
 
-BUILD_DEPENDS=	p5-Text-QRCode>0:${PORTSDIR}/textproc/p5-Text-QRCode
+BUILD_DEPENDS=	p5-Text-QRCode>0:textproc/p5-Text-QRCode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-HTML-Quoted/Makefile b/textproc/p5-HTML-Quoted/Makefile
index 06bcb5e60b6f..2d0bcc69ef87 100644
--- a/textproc/p5-HTML-Quoted/Makefile
+++ b/textproc/p5-HTML-Quoted/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extract structure of quoted HTML mail message
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=3.0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-RewriteAttributes/Makefile b/textproc/p5-HTML-RewriteAttributes/Makefile
index d4941ee1661c..255360a46054 100644
--- a/textproc/p5-HTML-RewriteAttributes/Makefile
+++ b/textproc/p5-HTML-RewriteAttributes/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple yet powerful HTML attribute rewriting
 
-BUILD_DEPENDS=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-HTML-Parser>0:www/p5-HTML-Parser \
+		p5-HTML-Tagset>0:www/p5-HTML-Tagset \
+		p5-URI>0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-SBC/Makefile b/textproc/p5-HTML-SBC/Makefile
index 798a946bc0d0..3b43a60785cb 100644
--- a/textproc/p5-HTML-SBC/Makefile
+++ b/textproc/p5-HTML-SBC/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple blog code to valid XHTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/textproc/p5-HTML-TagFilter/Makefile b/textproc/p5-HTML-TagFilter/Makefile
index a152b48ed48f..b000c387bd4a 100644
--- a/textproc/p5-HTML-TagFilter/Makefile
+++ b/textproc/p5-HTML-TagFilter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fine-grained html-filter, xss-blocker and mailto-obfuscator
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-HTML-Tidy/Makefile b/textproc/p5-HTML-Tidy/Makefile
index bcda51c69a36..6b434f98c35a 100644
--- a/textproc/p5-HTML-Tidy/Makefile
+++ b/textproc/p5-HTML-Tidy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Web validation in a Perl object using tidy
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-LIB_DEPENDS=	libtidyp.so:${PORTSDIR}/textproc/tidyp
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+LIB_DEPENDS=	libtidyp.so:textproc/tidyp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/textproc/p5-HTML-Truncate/Makefile b/textproc/p5-HTML-Truncate/Makefile
index bf56fd371037..47a03d271cba 100644
--- a/textproc/p5-HTML-Truncate/Makefile
+++ b/textproc/p5-HTML-Truncate/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Truncate HTML by character count while preserving well-formedness
 
-BUILD_DEPENDS=	p5-HTML-Parser>=2:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>=3:${PORTSDIR}/www/p5-HTML-Tagset
+BUILD_DEPENDS=	p5-HTML-Parser>=2:www/p5-HTML-Parser \
+		p5-HTML-Tagset>=3:www/p5-HTML-Tagset
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Hailo/Makefile b/textproc/p5-Hailo/Makefile
index 10be0ff4fa5a..22393f3bc66b 100644
--- a/textproc/p5-Hailo/Makefile
+++ b/textproc/p5-Hailo/Makefile
@@ -15,33 +15,33 @@ COMMENT=	Pluggable Markov engine analogous to MegaHAL
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Any-Moose>=0.13:${PORTSDIR}/devel/p5-Any-Moose \
-		p5-Bot-Training-MegaHAL>=0:${PORTSDIR}/misc/p5-Bot-Training-MegaHAL \
-		p5-Bot-Training-StarCraft>=0:${PORTSDIR}/misc/p5-Bot-Training-StarCraft \
-		p5-Bot-Training>=0:${PORTSDIR}/misc/p5-Bot-Training \
-		p5-Class-Load>=0.06:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Data-Dump>=1.17:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Data-Section>=0.101620:${PORTSDIR}/devel/p5-Data-Section \
-		p5-Dir-Self>=0.10:${PORTSDIR}/devel/p5-Dir-Self \
-		p5-File-CountLines>=0.0.2:${PORTSDIR}/devel/p5-File-CountLines \
-		p5-Getopt-Long-Descriptive>=0.085:${PORTSDIR}/devel/p5-Getopt-Long-Descriptive \
-		p5-IO-Interactive>=0.0.6:${PORTSDIR}/devel/p5-IO-Interactive \
-		p5-IPC-System-Simple>=1.21:${PORTSDIR}/devel/p5-IPC-System-Simple \
-		p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-MooseX-StrictConstructor>=0.16:${PORTSDIR}/devel/p5-MooseX-StrictConstructor \
-		p5-MouseX-Getopt>=0.33:${PORTSDIR}/devel/p5-MouseX-Getopt \
-		p5-MouseX-StrictConstructor>=0.02:${PORTSDIR}/devel/p5-MouseX-StrictConstructor \
-		p5-Regexp-Common>=2010010201:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Term-Sk>=0.06:${PORTSDIR}/devel/p5-Term-Sk \
-		p5-namespace-clean>=0.18:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Any-Moose>=0.13:devel/p5-Any-Moose \
+		p5-Bot-Training-MegaHAL>=0:misc/p5-Bot-Training-MegaHAL \
+		p5-Bot-Training-StarCraft>=0:misc/p5-Bot-Training-StarCraft \
+		p5-Bot-Training>=0:misc/p5-Bot-Training \
+		p5-Class-Load>=0.06:devel/p5-Class-Load \
+		p5-Data-Dump>=1.17:devel/p5-Data-Dump \
+		p5-Data-Section>=0.101620:devel/p5-Data-Section \
+		p5-Dir-Self>=0.10:devel/p5-Dir-Self \
+		p5-File-CountLines>=0.0.2:devel/p5-File-CountLines \
+		p5-Getopt-Long-Descriptive>=0.085:devel/p5-Getopt-Long-Descriptive \
+		p5-IO-Interactive>=0.0.6:devel/p5-IO-Interactive \
+		p5-IPC-System-Simple>=1.21:devel/p5-IPC-System-Simple \
+		p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+		p5-MooseX-StrictConstructor>=0.16:devel/p5-MooseX-StrictConstructor \
+		p5-MouseX-Getopt>=0.33:devel/p5-MouseX-Getopt \
+		p5-MouseX-StrictConstructor>=0.02:devel/p5-MouseX-StrictConstructor \
+		p5-Regexp-Common>=2010010201:textproc/p5-Regexp-Common \
+		p5-Term-Sk>=0.06:devel/p5-Term-Sk \
+		p5-namespace-clean>=0.18:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Test-Exception>=0.29:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Expect>=0.31:${PORTSDIR}/devel/p5-Test-Expect \
-		p5-Test-Output>=0.16:${PORTSDIR}/devel/p5-Test-Output \
-		p5-Test-Script>=1.07:${PORTSDIR}/devel/p5-Test-Script \
-		p5-Test-Script-Run>=0.04:${PORTSDIR}/devel/p5-Test-Script-Run \
-		p5-Test-Synopsis>=0.06:${PORTSDIR}/devel/p5-Test-Synopsis
+TEST_DEPENDS=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite \
+		p5-Test-Exception>=0.29:devel/p5-Test-Exception \
+		p5-Test-Expect>=0.31:devel/p5-Test-Expect \
+		p5-Test-Output>=0.16:devel/p5-Test-Output \
+		p5-Test-Script>=1.07:devel/p5-Test-Script \
+		p5-Test-Script-Run>=0.04:devel/p5-Test-Script-Run \
+		p5-Test-Synopsis>=0.06:devel/p5-Test-Synopsis
 
 USES=		perl5
 USE_PERL5=	configure
@@ -52,14 +52,14 @@ OPTIONS_DEFAULT=	SQLITE
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:${PORTSDIR}/databases/p5-DBD-SQLite
+RUN_DEPENDS+=	p5-DBD-SQLite>=1.29:databases/p5-DBD-SQLite
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Hash-Merge/Makefile b/textproc/p5-Hash-Merge/Makefile
index 5dbb461d8dfc..7e74dcdb2135 100644
--- a/textproc/p5-Hash-Merge/Makefile
+++ b/textproc/p5-Hash-Merge/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Merges hashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
+RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Hatena-Keyword/Makefile b/textproc/p5-Hatena-Keyword/Makefile
index d5f6939bcce7..847a7a86514d 100644
--- a/textproc/p5-Hatena-Keyword/Makefile
+++ b/textproc/p5-Hatena-Keyword/Makefile
@@ -12,20 +12,20 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Extract Hatena Keywords in a string
 
-BUILD_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
-		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
-		p5-RPC-XML>=0:${PORTSDIR}/net/p5-RPC-XML \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Cache>=0:devel/p5-Cache \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		ja-p5-Jcode>=0:japanese/p5-Jcode \
+		p5-RPC-XML>=0:net/p5-RPC-XML \
+		p5-URI>=0:net/p5-URI
+RUN_DEPENDS=	p5-Cache>=0:devel/p5-Cache \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		ja-p5-Jcode>=0:japanese/p5-Jcode \
+		p5-RPC-XML>=0:net/p5-RPC-XML \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-IO-CSVHeaderFile/Makefile b/textproc/p5-IO-CSVHeaderFile/Makefile
index 91f80b71c4ac..cd07b89a38e3 100644
--- a/textproc/p5-IO-CSVHeaderFile/Makefile
+++ b/textproc/p5-IO-CSVHeaderFile/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to automate reads from CSV formatted text files
 
-BUILD_DEPENDS=	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS
+BUILD_DEPENDS=	p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-JavaScript-Minifier-XS/Makefile b/textproc/p5-JavaScript-Minifier-XS/Makefile
index 7d23bfd54ebe..144d0ad55c14 100644
--- a/textproc/p5-JavaScript-Minifier-XS/Makefile
+++ b/textproc/p5-JavaScript-Minifier-XS/Makefile
@@ -14,9 +14,9 @@ COMMENT=	XS based JavaScript minifier
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-JavaScript-Minifier>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-JavaScript-Minifier>=0:textproc/p5-JavaScript-Minifier \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-JavaScript-Packer/Makefile b/textproc/p5-JavaScript-Packer/Makefile
index bfeffa24f42a..347a86c31deb 100644
--- a/textproc/p5-JavaScript-Packer/Makefile
+++ b/textproc/p5-JavaScript-Packer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl version of Dean Edwards' Packer.js
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Regexp-RegGrp>=1.001001:${PORTSDIR}/devel/p5-Regexp-RegGrp
+BUILD_DEPENDS=	p5-Regexp-RegGrp>=1.001001:devel/p5-Regexp-RegGrp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-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/textproc/p5-KinoSearch1/Makefile b/textproc/p5-KinoSearch1/Makefile
index 33ac13e7c209..90b98c4fde1f 100644
--- a/textproc/p5-KinoSearch1/Makefile
+++ b/textproc/p5-KinoSearch1/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl search engine library
 
-BUILD_DEPENDS=	p5-Lingua-StopWords>=0.02:${PORTSDIR}/textproc/p5-Lingua-StopWords \
-		p5-Lingua-Stem-Snowball>=0.94:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball \
-		p5-Clone>=0.18:${PORTSDIR}/devel/p5-Clone
+BUILD_DEPENDS=	p5-Lingua-StopWords>=0.02:textproc/p5-Lingua-StopWords \
+		p5-Lingua-Stem-Snowball>=0.94:textproc/p5-Lingua-Stem-Snowball \
+		p5-Clone>=0.18:devel/p5-Clone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-LaTeX-Driver/Makefile b/textproc/p5-LaTeX-Driver/Makefile
index d2c763dc65c7..0fa6a419f161 100644
--- a/textproc/p5-LaTeX-Driver/Makefile
+++ b/textproc/p5-LaTeX-Driver/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Perl module of LaTeX Driver
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Exception-Class>=0:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IPC-ShellCmd>=0:${PORTSDIR}/devel/p5-IPC-ShellCmd \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Exception-Class>=0:devel/p5-Exception-Class \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-IPC-ShellCmd>=0:devel/p5-IPC-ShellCmd \
+		p5-Readonly>=0:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-LaTeX-Encode/Makefile b/textproc/p5-LaTeX-Encode/Makefile
index 77c22cb1ba8f..6c2053b57671 100644
--- a/textproc/p5-LaTeX-Encode/Makefile
+++ b/textproc/p5-LaTeX-Encode/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Encode characters for LaTeX formatting
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-LaTeX-Pod/Makefile b/textproc/p5-LaTeX-Pod/Makefile
index e702c43e24c4..990e54669a4a 100644
--- a/textproc/p5-LaTeX-Pod/Makefile
+++ b/textproc/p5-LaTeX-Pod/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Transform LaTeX source files to POD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-LaTeX-TOM>=0.9:${PORTSDIR}/textproc/p5-LaTeX-TOM \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Validate>=0.91:${PORTSDIR}/devel/p5-Params-Validate \
-		p5-boolean>=0.20:${PORTSDIR}/devel/p5-boolean
+BUILD_DEPENDS=	p5-LaTeX-TOM>=0.9:textproc/p5-LaTeX-TOM \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Params-Validate>=0.91:devel/p5-Params-Validate \
+		p5-boolean>=0.20:devel/p5-boolean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-LaTeX-Table/Makefile b/textproc/p5-LaTeX-Table/Makefile
index a6d5a16d0bc7..360365a4f04c 100644
--- a/textproc/p5-LaTeX-Table/Makefile
+++ b/textproc/p5-LaTeX-Table/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Perl extension for the automatic generation of LaTeX tables
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.76:${PORTSDIR}/devel/p5-Moose \
-		p5-Moose-Policy>=0:${PORTSDIR}/devel/p5-Moose-Policy \
-		p5-LaTeX-Encode>=0:${PORTSDIR}/textproc/p5-LaTeX-Encode \
-		p5-LaTeX-Driver>=0:${PORTSDIR}/textproc/p5-LaTeX-Driver \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Number-Format>=0:${PORTSDIR}/textproc/p5-Number-Format \
-		p5-MooseX-FollowPBP>=0.03:${PORTSDIR}/devel/p5-MooseX-FollowPBP
+BUILD_DEPENDS=	p5-Moose>=0.76:devel/p5-Moose \
+		p5-Moose-Policy>=0:devel/p5-Moose-Policy \
+		p5-LaTeX-Encode>=0:textproc/p5-LaTeX-Encode \
+		p5-LaTeX-Driver>=0:textproc/p5-LaTeX-Driver \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Number-Format>=0:textproc/p5-Number-Format \
+		p5-MooseX-FollowPBP>=0.03:devel/p5-MooseX-FollowPBP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0.084:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0.084:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Lingua-EN-AddressParse/Makefile b/textproc/p5-Lingua-EN-AddressParse/Makefile
index e1b387ecdb7a..e368cd75f1d1 100644
--- a/textproc/p5-Lingua-EN-AddressParse/Makefile
+++ b/textproc/p5-Lingua-EN-AddressParse/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl module to manipulate geographical addresses
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-EN-NameParse>=1.24:${PORTSDIR}/textproc/p5-Lingua-EN-NameParse \
-		p5-Locale-SubCountry>=1.41:${PORTSDIR}/misc/p5-Locale-SubCountry \
-		p5-Parse-RecDescent>=1:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Lingua-EN-NameParse>=1.24:textproc/p5-Lingua-EN-NameParse \
+		p5-Locale-SubCountry>=1.41:misc/p5-Locale-SubCountry \
+		p5-Parse-RecDescent>=1:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Lingua-EN-Fathom/Makefile b/textproc/p5-Lingua-EN-Fathom/Makefile
index 59da6ff8e3a6..87a4e444755e 100644
--- a/textproc/p5-Lingua-EN-Fathom/Makefile
+++ b/textproc/p5-Lingua-EN-Fathom/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Lingua::EN::Fathom - Measure readability of English text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-COMMON_DEPENDS=	p5-Lingua-EN-Syllable>0:${PORTSDIR}/textproc/p5-Lingua-EN-Syllable
+COMMON_DEPENDS=	p5-Lingua-EN-Syllable>0:textproc/p5-Lingua-EN-Syllable
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/textproc/p5-Lingua-EN-FindNumber/Makefile b/textproc/p5-Lingua-EN-FindNumber/Makefile
index 5d0014d33101..65b280398d7d 100644
--- a/textproc/p5-Lingua-EN-FindNumber/Makefile
+++ b/textproc/p5-Lingua-EN-FindNumber/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Locate (written) numbers in English text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-EN-Words2Nums>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Words2Nums
+BUILD_DEPENDS=	p5-Lingua-EN-Words2Nums>=0:textproc/p5-Lingua-EN-Words2Nums
 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
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-Lingua-EN-Inflect-Number/Makefile b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
index 62834f195e97..bf51bc09cdc6 100644
--- a/textproc/p5-Lingua-EN-Inflect-Number/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Number/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Force number of words to singular or plural
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect
+BUILD_DEPENDS=	p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
index ac2bdbd77cfe..fb2175f8579f 100644
--- a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
@@ -14,15 +14,15 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Lingua-EN-FindNumber>=0:${PORTSDIR}/textproc/p5-Lingua-EN-FindNumber \
-	p5-Lingua-EN-Inflect>=1.89.1:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-	p5-Lingua-EN-Inflect-Number>=1.1:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number \
-	p5-Lingua-EN-Number-IsOrdinal>0:${PORTSDIR}/textproc/p5-Lingua-EN-Number-IsOrdinal \
-	p5-Lingua-EN-Tagger>=0.20:${PORTSDIR}/textproc/p5-Lingua-EN-Tagger
+	p5-Lingua-EN-FindNumber>=0:textproc/p5-Lingua-EN-FindNumber \
+	p5-Lingua-EN-Inflect>=1.89.1:textproc/p5-Lingua-EN-Inflect \
+	p5-Lingua-EN-Inflect-Number>=1.1:textproc/p5-Lingua-EN-Inflect-Number \
+	p5-Lingua-EN-Number-IsOrdinal>0:textproc/p5-Lingua-EN-Number-IsOrdinal \
+	p5-Lingua-EN-Tagger>=0.20:textproc/p5-Lingua-EN-Tagger
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Lingua-EN-Number-IsOrdinal>0:${PORTSDIR}/textproc/p5-Lingua-EN-Number-IsOrdinal \
-	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+	p5-Lingua-EN-Number-IsOrdinal>0:textproc/p5-Lingua-EN-Number-IsOrdinal \
+	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index a644f9572b67..9c61097367d3 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Smart matching for human names
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-EN-NameParse>=0:${PORTSDIR}/textproc/p5-Lingua-EN-NameParse \
-		p5-Lingua-EN-Nickname>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Nickname \
-		p5-String-Approx>=0:${PORTSDIR}/devel/p5-String-Approx \
-		p5-Text-Metaphone>=0:${PORTSDIR}/textproc/p5-Text-Metaphone
+BUILD_DEPENDS=	p5-Lingua-EN-NameParse>=0:textproc/p5-Lingua-EN-NameParse \
+		p5-Lingua-EN-Nickname>=0:textproc/p5-Lingua-EN-Nickname \
+		p5-String-Approx>=0:devel/p5-String-Approx \
+		p5-Text-Metaphone>=0:textproc/p5-Text-Metaphone
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -25,8 +25,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-Text-Soundex>=0:${PORTSDIR}/textproc/p5-Text-Soundex
-RUN_DEPENDS+=	p5-Text-Soundex>=0:${PORTSDIR}/textproc/p5-Text-Soundex
+BUILD_DEPENDS+=	p5-Text-Soundex>=0:textproc/p5-Text-Soundex
+RUN_DEPENDS+=	p5-Text-Soundex>=0:textproc/p5-Text-Soundex
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Lingua-EN-NameParse/Makefile b/textproc/p5-Lingua-EN-NameParse/Makefile
index ba9d84535d1f..cac7e1ce69e5 100644
--- a/textproc/p5-Lingua-EN-NameParse/Makefile
+++ b/textproc/p5-Lingua-EN-NameParse/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Routines for manipulating a person's name
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-EN-NamedEntity/Makefile b/textproc/p5-Lingua-EN-NamedEntity/Makefile
index 40a1a199061b..f8b6303d93dc 100644
--- a/textproc/p5-Lingua-EN-NamedEntity/Makefile
+++ b/textproc/p5-Lingua-EN-NamedEntity/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Basic Named Entity Extraction algorithm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-Stem>=0:${PORTSDIR}/textproc/p5-Lingua-Stem
+BUILD_DEPENDS=	p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile b/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
index 5db421465ce6..e720f8ac364c 100644
--- a/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
+++ b/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
@@ -13,11 +13,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Lingua-EN-FindNumber>0:${PORTSDIR}/textproc/p5-Lingua-EN-FindNumber
+	p5-Lingua-EN-FindNumber>0:textproc/p5-Lingua-EN-FindNumber
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Fatal>0:${PORTSDIR}/devel/p5-Test-Fatal \
-	p5-Try-Tiny:${PORTSDIR}/lang/p5-Try-Tiny
+	p5-Test-Fatal>0:devel/p5-Test-Fatal \
+	p5-Try-Tiny:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
index cc4440556beb..c51bbeaa312d 100644
--- a/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
+++ b/textproc/p5-Lingua-EN-Numbers-Easy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl module providing hash access to Lingua::EN::Numbers objects
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Lingua-EN-Numbers>=1.01:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers
+BUILD_DEPENDS=	p5-Lingua-EN-Numbers>=1.01:textproc/p5-Lingua-EN-Numbers
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-EN-Summarize/Makefile b/textproc/p5-Lingua-EN-Summarize/Makefile
index c8f82fe3a6a9..c02ff9af43d5 100644
--- a/textproc/p5-Lingua-EN-Summarize/Makefile
+++ b/textproc/p5-Lingua-EN-Summarize/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple tool for summarizing bodies of English text
 
-BUILD_DEPENDS=	p5-HTML-Summary>=0:${PORTSDIR}/www/p5-HTML-Summary \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Summary>=0:www/p5-HTML-Summary \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-EN-Tagger/Makefile b/textproc/p5-Lingua-EN-Tagger/Makefile
index 6307d0d2e3ac..3fcc20594e51 100644
--- a/textproc/p5-Lingua-EN-Tagger/Makefile
+++ b/textproc/p5-Lingua-EN-Tagger/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Part-of-speech tagger for English natural language processing
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.45:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>=3.20:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-Lingua-Stem>=0.81:${PORTSDIR}/textproc/p5-Lingua-Stem \
-		p5-Memoize-ExpireLRU>=0.55:${PORTSDIR}/devel/p5-Memoize-ExpireLRU
+BUILD_DEPENDS=	p5-HTML-Parser>=3.45:www/p5-HTML-Parser \
+		p5-HTML-Tagset>=3.20:www/p5-HTML-Tagset \
+		p5-Lingua-Stem>=0.81:textproc/p5-Lingua-Stem \
+		p5-Memoize-ExpireLRU>=0.55:devel/p5-Memoize-ExpireLRU
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-Identify-CLD/Makefile b/textproc/p5-Lingua-Identify-CLD/Makefile
index 70c266500984..c51457465ec7 100644
--- a/textproc/p5-Lingua-Identify-CLD/Makefile
+++ b/textproc/p5-Lingua-Identify-CLD/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Interface to Chrome language detection library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcld.so:${PORTSDIR}/devel/cld
-BUILD_DEPENDS=	p5-Config-AutoConf>=0.16:${PORTSDIR}/devel/p5-Config-AutoConf \
-		p5-ExtUtils-CBuilder>0.27:${PORTSDIR}/devel/p5-ExtUtils-CBuilder \
-		p5-ExtUtils-ParseXS>=0:${PORTSDIR}/devel/p5-ExtUtils-ParseXS \
-		p5-ExtUtils-LibBuilder>=0.02:${PORTSDIR}/devel/p5-ExtUtils-LibBuilder
-RUN_DEPENDS=	p5-XSLoader>=0:${PORTSDIR}/devel/p5-XSLoader
+LIB_DEPENDS=	libcld.so:devel/cld
+BUILD_DEPENDS=	p5-Config-AutoConf>=0.16:devel/p5-Config-AutoConf \
+		p5-ExtUtils-CBuilder>0.27:devel/p5-ExtUtils-CBuilder \
+		p5-ExtUtils-ParseXS>=0:devel/p5-ExtUtils-ParseXS \
+		p5-ExtUtils-LibBuilder>=0.02:devel/p5-ExtUtils-LibBuilder
+RUN_DEPENDS=	p5-XSLoader>=0:devel/p5-XSLoader
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Lingua-Identify/Makefile b/textproc/p5-Lingua-Identify/Makefile
index 456efcfd7ba9..69ca705c4e8b 100644
--- a/textproc/p5-Lingua-Identify/Makefile
+++ b/textproc/p5-Lingua-Identify/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Lingua::Identify - Language identification
 
-BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:${PORTSDIR}/devel/p5-Class-Factory-Util \
-		p5-Text-Affixes>=0.04:${PORTSDIR}/textproc/p5-Text-Affixes \
-		p5-Text-Ngram>=0.03:${PORTSDIR}/textproc/p5-Text-Ngram
+BUILD_DEPENDS=	p5-Class-Factory-Util>=1.6:devel/p5-Class-Factory-Util \
+		p5-Text-Affixes>=0.04:textproc/p5-Text-Affixes \
+		p5-Text-Ngram>=0.03:textproc/p5-Text-Ngram
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-Ispell/Makefile b/textproc/p5-Lingua-Ispell/Makefile
index 297e66c7c26f..f92e197f3e04 100644
--- a/textproc/p5-Lingua-Ispell/Makefile
+++ b/textproc/p5-Lingua-Ispell/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module that encapsulates access to the Ispell program
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Lingua-Preferred/Makefile b/textproc/p5-Lingua-Preferred/Makefile
index 99cdf7e46973..83b5cba1b57d 100644
--- a/textproc/p5-Lingua-Preferred/Makefile
+++ b/textproc/p5-Lingua-Preferred/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to choose a language
 
-BUILD_DEPENDS=	p5-Log-TraceMessages>=0:${PORTSDIR}/devel/p5-Log-TraceMessages
+BUILD_DEPENDS=	p5-Log-TraceMessages>=0:devel/p5-Log-TraceMessages
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Lingua-Stem/Makefile b/textproc/p5-Lingua-Stem/Makefile
index 047a50140918..3108247f7217 100644
--- a/textproc/p5-Lingua-Stem/Makefile
+++ b/textproc/p5-Lingua-Stem/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides word stemming algorithms localized by language
 
-BUILD_DEPENDS=	p5-Lingua-PT-Stemmer>=0:${PORTSDIR}/textproc/p5-Lingua-PT-Stemmer \
-		p5-Lingua-Stem-Fr>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Fr \
-		p5-Lingua-Stem-It>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-It \
-		p5-Lingua-Stem-Ru>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Ru \
-		p5-Lingua-Stem-Snowball-Da>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-Da \
-		p5-Lingua-Stem-Snowball-No>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-No \
-		p5-Lingua-Stem-Snowball-Se>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball-Se \
-		p5-Text-German>=0:${PORTSDIR}/textproc/p5-Text-German
+BUILD_DEPENDS=	p5-Lingua-PT-Stemmer>=0:textproc/p5-Lingua-PT-Stemmer \
+		p5-Lingua-Stem-Fr>=0:textproc/p5-Lingua-Stem-Fr \
+		p5-Lingua-Stem-It>=0:textproc/p5-Lingua-Stem-It \
+		p5-Lingua-Stem-Ru>=0:textproc/p5-Lingua-Stem-Ru \
+		p5-Lingua-Stem-Snowball-Da>=0:textproc/p5-Lingua-Stem-Snowball-Da \
+		p5-Lingua-Stem-Snowball-No>=0:textproc/p5-Lingua-Stem-Snowball-No \
+		p5-Lingua-Stem-Snowball-Se>=0:textproc/p5-Lingua-Stem-Snowball-Se \
+		p5-Text-German>=0:textproc/p5-Text-German
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-MARC-Charset/Makefile b/textproc/p5-MARC-Charset/Makefile
index d4bd0b1a9bbe..bdb4b4dbbd3d 100644
--- a/textproc/p5-MARC-Charset/Makefile
+++ b/textproc/p5-MARC-Charset/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert MARC-8 encoded strings to UTF-8
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-MARC-Lint/Makefile b/textproc/p5-MARC-Lint/Makefile
index 354a286fc6e1..774bcceb7159 100644
--- a/textproc/p5-MARC-Lint/Makefile
+++ b/textproc/p5-MARC-Lint/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Mechanism for validating MARC records
 
-BUILD_DEPENDS=	p5-MARC-Record>=0:${PORTSDIR}/textproc/p5-MARC-Record \
-		p5-Business-ISBN>=2.03:${PORTSDIR}/misc/p5-Business-ISBN
+BUILD_DEPENDS=	p5-MARC-Record>=0:textproc/p5-MARC-Record \
+		p5-Business-ISBN>=2.03:misc/p5-Business-ISBN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/marc-lint
diff --git a/textproc/p5-MARC-XML/Makefile b/textproc/p5-MARC-XML/Makefile
index ae59d934ca2d..ace494de0a85 100644
--- a/textproc/p5-MARC-XML/Makefile
+++ b/textproc/p5-MARC-XML/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Extension to the MARC-Record distribution for working with XML data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MARC-Record>=2:${PORTSDIR}/textproc/p5-MARC-Record \
-		p5-MARC-Charset>=0.98:${PORTSDIR}/textproc/p5-MARC-Charset \
-		p5-XML-SAX>=0.12:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-MARC-Record>=2:textproc/p5-MARC-Record \
+		p5-MARC-Charset>=0.98:textproc/p5-MARC-Charset \
+		p5-XML-SAX>=0.12:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Makefile-DOM/Makefile b/textproc/p5-Makefile-DOM/Makefile
index b931ca33eebe..bb77adc91907 100644
--- a/textproc/p5-Makefile-DOM/Makefile
+++ b/textproc/p5-Makefile-DOM/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Simple DOM parser for Makefiles
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0.18:${PORTSDIR}/devel/p5-Clone \
-		p5-List-MoreUtils>=0.21:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Util>=0.22:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Clone>=0.18:devel/p5-Clone \
+		p5-List-MoreUtils>=0.21:lang/p5-List-MoreUtils \
+		p5-Params-Util>=0.22:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Makefile-Parser/Makefile b/textproc/p5-Makefile-Parser/Makefile
index 8768e50c010f..39e992820789 100644
--- a/textproc/p5-Makefile-Parser/Makefile
+++ b/textproc/p5-Makefile-Parser/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Makefile::Parser - A Simple Parser for Makefiles
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Trigger>=0.13:${PORTSDIR}/devel/p5-Class-Trigger \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IPC-Run3>=0.036:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Makefile-DOM>=0.005:${PORTSDIR}/textproc/p5-Makefile-DOM
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Trigger>=0.13:devel/p5-Class-Trigger \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-IPC-Run3>=0.036:devel/p5-IPC-Run3 \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Makefile-DOM>=0.005:textproc/p5-Makefile-DOM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Markapl/Makefile b/textproc/p5-Markapl/Makefile
index 8a2d4ceb2c6d..2c382d9fa700 100644
--- a/textproc/p5-Markapl/Makefile
+++ b/textproc/p5-Markapl/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Markup as Perl
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Exporter-Lite>=0:${PORTSDIR}/devel/p5-Exporter-Lite \
-		p5-HTML-Lint>=0:${PORTSDIR}/www/p5-HTML-Lint \
-		p5-B-Hooks-EndOfScope>=0.05:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-String-BufferStack>=1.15:${PORTSDIR}/textproc/p5-String-BufferStack \
-		p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare
+BUILD_DEPENDS=	p5-Exporter-Lite>=0:devel/p5-Exporter-Lite \
+		p5-HTML-Lint>=0:www/p5-HTML-Lint \
+		p5-B-Hooks-EndOfScope>=0.05:devel/p5-B-Hooks-EndOfScope \
+		p5-String-BufferStack>=1.15:textproc/p5-String-BufferStack \
+		p5-Devel-Declare>=0:devel/p5-Devel-Declare
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Marpa-HTML/Makefile b/textproc/p5-Marpa-HTML/Makefile
index 85bcef363731..77ae47614a88 100644
--- a/textproc/p5-Marpa-HTML/Makefile
+++ b/textproc/p5-Marpa-HTML/Makefile
@@ -16,9 +16,9 @@ COMMENT=	High-level HTML Parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.64:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Marpa-PP>=0.012:${PORTSDIR}/lang/p5-Marpa-PP \
-		p5-Marpa-XS>=0.026:${PORTSDIR}/lang/p5-Marpa-XS
+BUILD_DEPENDS=	p5-HTML-Parser>=3.64:www/p5-HTML-Parser \
+		p5-Marpa-PP>=0.012:lang/p5-Marpa-PP \
+		p5-Marpa-XS>=0.026:lang/p5-Marpa-XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Net-Groonga-HTTP/Makefile b/textproc/p5-Net-Groonga-HTTP/Makefile
index 16ae04f24c99..dddca9898675 100644
--- a/textproc/p5-Net-Groonga-HTTP/Makefile
+++ b/textproc/p5-Net-Groonga-HTTP/Makefile
@@ -13,11 +13,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Data-Page>0:${PORTSDIR}/databases/p5-Data-Page \
-	p5-Furl>0:${PORTSDIR}/www/p5-Furl \
-	p5-JSON-XS>0:${PORTSDIR}/converters/p5-JSON-XS \
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-	p5-URI>0:${PORTSDIR}/net/p5-URI
+	p5-Data-Page>0:databases/p5-Data-Page \
+	p5-Furl>0:www/p5-Furl \
+	p5-JSON-XS>0:converters/p5-JSON-XS \
+	p5-Mouse>0:devel/p5-Mouse \
+	p5-URI>0:net/p5-URI
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Net-IDN-Encode/Makefile b/textproc/p5-Net-IDN-Encode/Makefile
index 619320d325d6..52fbc9aafd7d 100644
--- a/textproc/p5-Net-IDN-Encode/Makefile
+++ b/textproc/p5-Net-IDN-Encode/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Internationalizing Domain Names in Applications (RFC 3490)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+BUILD_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Net-YASA/Makefile b/textproc/p5-Net-YASA/Makefile
index f6590d6e39ca..d1de614ecac9 100644
--- a/textproc/p5-Net-YASA/Makefile
+++ b/textproc/p5-Net-YASA/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to YASA (Yet Another Suffix Array)
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index 61a29acf0d88..0f9e2cf05446 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Iterates over all IP addresses in a text similar to Email::Find
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-NetAddr-IP>0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
+BUILD_DEPENDS=	p5-NetAddr-IP>0:net-mgmt/p5-NetAddr-IP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-ODF-lpOD/Makefile b/textproc/p5-ODF-lpOD/Makefile
index e6504e044e6a..5f8bcdb526af 100644
--- a/textproc/p5-ODF-lpOD/Makefile
+++ b/textproc/p5-ODF-lpOD/Makefile
@@ -13,12 +13,12 @@ COMMENT=	OpenDocument management interface
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.30:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-XML-Twig>=3.37:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip \
+		p5-XML-Twig>=3.37:textproc/p5-XML-Twig \
+		p5-File-Type>=0:devel/p5-File-Type \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-libwww>=0:www/p5-libwww \
+		p5-File-Slurp>=0:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-OpenOffice-OODoc/Makefile b/textproc/p5-OpenOffice-OODoc/Makefile
index 086a1975d617..73fb6078bdc5 100644
--- a/textproc/p5-OpenOffice-OODoc/Makefile
+++ b/textproc/p5-OpenOffice-OODoc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl Open OpenDocument Connector
 
 LICENSE=	LGPL21
 
-RUN_DEPENDS=	p5-Archive-Zip>=1.18:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-XML-Twig>=3.32:${PORTSDIR}/textproc/p5-XML-Twig
+RUN_DEPENDS=	p5-Archive-Zip>=1.18:archivers/p5-Archive-Zip \
+		p5-XML-Twig>=3.32:textproc/p5-XML-Twig
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-PDF-API2-Simple/Makefile b/textproc/p5-PDF-API2-Simple/Makefile
index c242179bf172..68e54e456119 100644
--- a/textproc/p5-PDF-API2-Simple/Makefile
+++ b/textproc/p5-PDF-API2-Simple/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jeremybbaggs@gmail.com
 COMMENT=	Wrapper for the PDF::API2 modules
 
-RUN_DEPENDS=	p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2
+RUN_DEPENDS=	p5-PDF-API2>=0:textproc/p5-PDF-API2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 89f914fb99f4..25736dff68e4 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Facilitates the creation and modification of PDF files
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Font-TTF>=0:${PORTSDIR}/x11-fonts/p5-Font-TTF
+BUILD_DEPENDS=	p5-Font-TTF>=0:x11-fonts/p5-Font-TTF
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PDF-FromHTML/Makefile b/textproc/p5-PDF-FromHTML/Makefile
index b46ef7dbd1ff..ca817f13ba08 100644
--- a/textproc/p5-PDF-FromHTML/Makefile
+++ b/textproc/p5-PDF-FromHTML/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert HTML documents to PDF
 
-BUILD_DEPENDS=	p5-Graphics-ColorNames>=0:${PORTSDIR}/graphics/p5-Graphics-ColorNames \
-		p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2 \
-		p5-PDF-Writer>=0.05:${PORTSDIR}/textproc/p5-PDF-Writer \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Graphics-ColorNames>=0:graphics/p5-Graphics-ColorNames \
+		p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-PDF-API2>=0:textproc/p5-PDF-API2 \
+		p5-PDF-Writer>=0.05:textproc/p5-PDF-Writer \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PDF-Table/Makefile b/textproc/p5-PDF-Table/Makefile
index 3415b366be32..d0ed281c282f 100644
--- a/textproc/p5-PDF-Table/Makefile
+++ b/textproc/p5-PDF-Table/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Utility class for building table layouts in a PDF::API2 object
 
-BUILD_DEPENDS=	p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2
+BUILD_DEPENDS=	p5-PDF-API2>=0:textproc/p5-PDF-API2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PDF-WebKit/Makefile b/textproc/p5-PDF-WebKit/Makefile
index bb76482b8e16..c900f4812bd4 100644
--- a/textproc/p5-PDF-WebKit/Makefile
+++ b/textproc/p5-PDF-WebKit/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Use WebKit to Generate PDFs from HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
-		p5-XML-LibXML>=1.62:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Moo>=0:devel/p5-Moo \
+		p5-XML-LibXML>=1.62:textproc/p5-XML-LibXML \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		wkhtmltopdf:${PORTSDIR}/converters/wkhtmltopdf
-TEST_DEPENDS=	p5-Test-Spec:${PORTSDIR}/devel/p5-Test-Spec
+		wkhtmltopdf:converters/wkhtmltopdf
+TEST_DEPENDS=	p5-Test-Spec:devel/p5-Test-Spec
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-POE-Filter-XML/Makefile b/textproc/p5-POE-Filter-XML/Makefile
index ed38f17726a2..89befdf12e60 100644
--- a/textproc/p5-POE-Filter-XML/Makefile
+++ b/textproc/p5-POE-Filter-XML/Makefile
@@ -13,12 +13,12 @@ COMMENT=	POE Filter for parsing XML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-InsideOut>=0:${PORTSDIR}/devel/p5-MooseX-InsideOut \
-		p5-MooseX-NonMoose>=0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-SAX-Base>=0:${PORTSDIR}/textproc/p5-XML-SAX-Base
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-InsideOut>=0:devel/p5-MooseX-InsideOut \
+		p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
+		p5-POE>=0:devel/p5-POE \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-SAX-Base>=0:textproc/p5-XML-SAX-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PPI-HTML/Makefile b/textproc/p5-PPI-HTML/Makefile
index 0c2f1e585bf5..c94200a4f2ac 100644
--- a/textproc/p5-PPI-HTML/Makefile
+++ b/textproc/p5-PPI-HTML/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Generate syntax-highlighted HTML for Perl using PPI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-PPI>=0.990:${PORTSDIR}/textproc/p5-PPI \
-		p5-CSS-Tiny>=0.10:${PORTSDIR}/textproc/p5-CSS-Tiny \
-		p5-Params-Util>=0.05:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-PPI>=0.990:textproc/p5-PPI \
+		p5-CSS-Tiny>=0.10:textproc/p5-CSS-Tiny \
+		p5-Params-Util>=0.05:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PPI-XS/Makefile b/textproc/p5-PPI-XS/Makefile
index 649b0104dd62..5f810981d3b1 100644
--- a/textproc/p5-PPI-XS/Makefile
+++ b/textproc/p5-PPI-XS/Makefile
@@ -13,7 +13,7 @@ COMMENT=	XS acceleration for the PPI perl parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-PPI>=1.000:${PORTSDIR}/textproc/p5-PPI
+RUN_DEPENDS=	p5-PPI>=1.000:textproc/p5-PPI
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PPI/Makefile b/textproc/p5-PPI/Makefile
index 19aa54c75752..dcb1aba627fe 100644
--- a/textproc/p5-PPI/Makefile
+++ b/textproc/p5-PPI/Makefile
@@ -15,17 +15,17 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	\
-		p5-Clone>=0.30:${PORTSDIR}/devel/p5-Clone \
-		p5-IO-String>=1.07:${PORTSDIR}/devel/p5-IO-String \
-		p5-List-MoreUtils>=0.16:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Task-Weaken>0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Class-Inspector>=1.22:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-File-Remove>=1.42:${PORTSDIR}/devel/p5-File-Remove
+		p5-Clone>=0.30:devel/p5-Clone \
+		p5-IO-String>=1.07:devel/p5-IO-String \
+		p5-List-MoreUtils>=0.16:lang/p5-List-MoreUtils \
+		p5-Params-Util>=1.00:devel/p5-Params-Util \
+		p5-Task-Weaken>0:devel/p5-Task-Weaken \
+		p5-Class-Inspector>=1.22:devel/p5-Class-Inspector \
+		p5-File-Remove>=1.42:devel/p5-File-Remove
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0.084:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Object>=0.07:${PORTSDIR}/devel/p5-Test-Object \
-		p5-Test-SubCalls>=1.07:${PORTSDIR}/devel/p5-Test-SubCalls
+TEST_DEPENDS=	p5-Test-NoWarnings>=0.084:devel/p5-Test-NoWarnings \
+		p5-Test-Object>=0.07:devel/p5-Test-Object \
+		p5-Test-SubCalls>=1.07:devel/p5-Test-SubCalls
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-PPIx-EditorTools/Makefile b/textproc/p5-PPIx-EditorTools/Makefile
index 6d9d1d59a41b..f56d67299bae 100644
--- a/textproc/p5-PPIx-EditorTools/Makefile
+++ b/textproc/p5-PPIx-EditorTools/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Utility methods and base class for manipulating Perl via PPI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-XSAccessor>=1.02:${PORTSDIR}/devel/p5-Class-XSAccessor \
-		p5-PPI>=1.215:${PORTSDIR}/textproc/p5-PPI \
-		p5-Try-Tiny>=0.11:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Class-XSAccessor>=1.02:devel/p5-Class-XSAccessor \
+		p5-PPI>=1.215:textproc/p5-PPI \
+		p5-Try-Tiny>=0.11:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Test-NoWarnings>=0.084:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Test-NoWarnings>=0.084:devel/p5-Test-NoWarnings
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-PPIx-Regexp/Makefile b/textproc/p5-PPIx-Regexp/Makefile
index 6e65b7d328f3..94bc7cc1c0a4 100644
--- a/textproc/p5-PPIx-Regexp/Makefile
+++ b/textproc/p5-PPIx-Regexp/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	PPI regular expression parser
 
-BUILD_DEPENDS=	p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-PPI>=1.117:${PORTSDIR}/textproc/p5-PPI \
-		p5-Task-Weaken>0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-PPI>=1.117:textproc/p5-PPI \
+		p5-Task-Weaken>0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PPIx-Utilities/Makefile b/textproc/p5-PPIx-Utilities/Makefile
index ed2fa88f6452..36105e23fd50 100644
--- a/textproc/p5-PPIx-Utilities/Makefile
+++ b/textproc/p5-PPIx-Utilities/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to PPI
 
-RUN_DEPENDS=	p5-Exception-Class>=1.23:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-PPI>=1.208:${PORTSDIR}/textproc/p5-PPI \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+RUN_DEPENDS=	p5-Exception-Class>=1.23:devel/p5-Exception-Class \
+		p5-PPI>=1.208:textproc/p5-PPI \
+		p5-Readonly>=1.03:devel/p5-Readonly \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 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=	modbuild
diff --git a/textproc/p5-Parse-BooleanLogic/Makefile b/textproc/p5-Parse-BooleanLogic/Makefile
index 7f0a2f2b7646..35105acdd628 100644
--- a/textproc/p5-Parse-BooleanLogic/Makefile
+++ b/textproc/p5-Parse-BooleanLogic/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Parser of boolean expressions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Regexp-Common>=2.122:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Module-Install>=0.91_1:${PORTSDIR}/devel/p5-Module-Install
+BUILD_DEPENDS=	p5-Regexp-Common>=2.122:textproc/p5-Regexp-Common \
+		p5-Module-Install>=0.91_1:devel/p5-Module-Install
 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/textproc/p5-Parse-CSV/Makefile b/textproc/p5-Parse-CSV/Makefile
index 29431a21ac9f..4cd9528a3f18 100644
--- a/textproc/p5-Parse-CSV/Makefile
+++ b/textproc/p5-Parse-CSV/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Highly flexible CSV parser for large files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>=1:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Text-CSV_XS>=0.80:${PORTSDIR}/textproc/p5-Text-CSV_XS
+BUILD_DEPENDS=	p5-Params-Util>=1:devel/p5-Params-Util \
+		p5-Text-CSV_XS>=0.80:textproc/p5-Text-CSV_XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Parse-Syslog/Makefile b/textproc/p5-Parse-Syslog/Makefile
index 75729fca4205..79f08b852547 100644
--- a/textproc/p5-Parse-Syslog/Makefile
+++ b/textproc/p5-Parse-Syslog/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 routines that present a simple interface to parse syslog files
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Perl-Critic-Bangs/Makefile b/textproc/p5-Perl-Critic-Bangs/Makefile
index b2792adbe1c2..278aadabe1cf 100644
--- a/textproc/p5-Perl-Critic-Bangs/Makefile
+++ b/textproc/p5-Perl-Critic-Bangs/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Collection of handy Perl::Critic policies
 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}
-TEST_DEPENDS=	p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
-		p5-Perl-Critic-Deprecated>=0:${PORTSDIR}/devel/p5-Perl-Critic-Deprecated
+TEST_DEPENDS=	p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
+		p5-Perl-Critic-Deprecated>=0:devel/p5-Perl-Critic-Deprecated
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Perl-Critic-Itch/Makefile b/textproc/p5-Perl-Critic-Itch/Makefile
index f1d101111b2e..cc554adb43a8 100644
--- a/textproc/p5-Perl-Critic-Itch/Makefile
+++ b/textproc/p5-Perl-Critic-Itch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A collection of Perl::Critic Policies
 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/textproc/p5-Perl-Critic-Moose/Makefile b/textproc/p5-Perl-Critic-Moose/Makefile
index 32cadcefb9d7..2b9c0041c98c 100644
--- a/textproc/p5-Perl-Critic-Moose/Makefile
+++ b/textproc/p5-Perl-Critic-Moose/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Policies for Perl::Critic concerned with using Moose
 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/textproc/p5-Perl-Critic-More/Makefile b/textproc/p5-Perl-Critic-More/Makefile
index 2b2101c702d3..c5c57557ea2d 100644
--- a/textproc/p5-Perl-Critic-More/Makefile
+++ b/textproc/p5-Perl-Critic-More/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Supplemental policies for 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/textproc/p5-Perl-Critic-Pulp/Makefile b/textproc/p5-Perl-Critic-Pulp/Makefile
index 84dcbd756c33..99b1d85b146d 100644
--- a/textproc/p5-Perl-Critic-Pulp/Makefile
+++ b/textproc/p5-Perl-Critic-Pulp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	some add-on perlcritic policies
 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/textproc/p5-Perl-Critic-Swift/Makefile b/textproc/p5-Perl-Critic-Swift/Makefile
index 4e7b914b9420..2ecd9e8cad29 100644
--- a/textproc/p5-Perl-Critic-Swift/Makefile
+++ b/textproc/p5-Perl-Critic-Swift/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A set of additional policies for 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/textproc/p5-Perl-Critic-Tics/Makefile b/textproc/p5-Perl-Critic-Tics/Makefile
index 0ff5c636f9a1..f4ebb2cad906 100644
--- a/textproc/p5-Perl-Critic-Tics/Makefile
+++ b/textproc/p5-Perl-Critic-Tics/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extra policies for 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/textproc/p5-Perl-Critic/Makefile b/textproc/p5-Perl-Critic/Makefile
index e12091e758d3..6a9d0807d1bb 100644
--- a/textproc/p5-Perl-Critic/Makefile
+++ b/textproc/p5-Perl-Critic/Makefile
@@ -14,26 +14,26 @@ COMMENT=	Critique Perl source for style and standards
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Keywords>=1.05:${PORTSDIR}/devel/p5-B-Keywords \
-		p5-Config-Tiny>=2:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-Email-Address>=1.88.9:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Exception-Class>=1.23:${PORTSDIR}/devel/p5-Exception-Class \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-List-MoreUtils>=0.19:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Pod-Spell>=1:${PORTSDIR}/textproc/p5-Pod-Spell \
-		p5-PPI>=1.220:${PORTSDIR}/textproc/p5-PPI \
-		p5-PPIx-Regexp>=0.027:${PORTSDIR}/textproc/p5-PPIx-Regexp \
-		p5-PPIx-Utilities>=1.001:${PORTSDIR}/textproc/p5-PPIx-Utilities \
-		p5-Readonly>=2.00:${PORTSDIR}/devel/p5-Readonly \
-		p5-String-Format>=1.13:${PORTSDIR}/textproc/p5-String-Format \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken \
-		p5-Term-ANSIColor>=2.02:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		perltidy:${PORTSDIR}/devel/p5-Perl-Tidy
+BUILD_DEPENDS=	p5-B-Keywords>=1.05:devel/p5-B-Keywords \
+		p5-Config-Tiny>=2:devel/p5-Config-Tiny \
+		p5-Email-Address>=1.88.9:mail/p5-Email-Address \
+		p5-Exception-Class>=1.23:devel/p5-Exception-Class \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-List-MoreUtils>=0.19:lang/p5-List-MoreUtils \
+		p5-Pod-Spell>=1:textproc/p5-Pod-Spell \
+		p5-PPI>=1.220:textproc/p5-PPI \
+		p5-PPIx-Regexp>=0.027:textproc/p5-PPIx-Regexp \
+		p5-PPIx-Utilities>=1.001:textproc/p5-PPIx-Utilities \
+		p5-Readonly>=2.00:devel/p5-Readonly \
+		p5-String-Format>=1.13:textproc/p5-String-Format \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken \
+		p5-Term-ANSIColor>=2.02:devel/p5-Term-ANSIColor \
+		perltidy:devel/p5-Perl-Tidy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Memory-Cycle>=0:devel/p5-Test-Memory-Cycle
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Perl-Lint/Makefile b/textproc/p5-Perl-Lint/Makefile
index cc6c6c7e25f7..bf45e7e1c202 100644
--- a/textproc/p5-Perl-Lint/Makefile
+++ b/textproc/p5-Perl-Lint/Makefile
@@ -15,17 +15,17 @@ COMMENT=	Yet another Perl source code linter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Keywords>=0:${PORTSDIR}/devel/p5-B-Keywords \
-		p5-Compiler-Lexer>=0.22:${PORTSDIR}/devel/p5-Compiler-Lexer \
-		p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-List-Flatten>=0:${PORTSDIR}/devel/p5-List-Flatten \
-		p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Path-Tiny>=0.068:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Regexp-Lexer>=0.05:${PORTSDIR}/devel/p5-Regexp-Lexer \
-		p5-String-CamelCase>=0:${PORTSDIR}/textproc/p5-String-CamelCase \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+BUILD_DEPENDS=	p5-B-Keywords>=0:devel/p5-B-Keywords \
+		p5-Compiler-Lexer>=0.22:devel/p5-Compiler-Lexer \
+		p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-List-Flatten>=0:devel/p5-List-Flatten \
+		p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+		p5-Path-Tiny>=0.068:devel/p5-Path-Tiny \
+		p5-Regexp-Lexer>=0.05:devel/p5-Regexp-Lexer \
+		p5-String-CamelCase>=0:textproc/p5-String-CamelCase \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Text-TestBase>=0:${PORTSDIR}/textproc/p5-Text-TestBase
+TEST_DEPENDS=	p5-Text-TestBase>=0:textproc/p5-Text-TestBase
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
@@ -41,11 +41,11 @@ post-install-EXAMPLES-on:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
-RUN_DEPENDS+=	p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
 .else
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils
-RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.41:${PORTSDIR}/lang/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	p5-Scalar-List-Utils>=1.41:lang/p5-Scalar-List-Utils
+RUN_DEPENDS+=	p5-Scalar-List-Utils>=1.41:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Perl-MinimumVersion/Makefile b/textproc/p5-Perl-MinimumVersion/Makefile
index 8c3b566eb8fe..269d63b56330 100644
--- a/textproc/p5-Perl-MinimumVersion/Makefile
+++ b/textproc/p5-Perl-MinimumVersion/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Find a minimum required version of perl for Perl code
 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-PPI>=1.215:${PORTSDIR}/textproc/p5-PPI \
-		p5-PPIx-Regexp>=0.033:${PORTSDIR}/textproc/p5-PPIx-Regexp \
-		p5-Perl-Critic>=1.10.4:${PORTSDIR}/textproc/p5-Perl-Critic \
-		p5-Params-Util>=0.25:${PORTSDIR}/devel/p5-Params-Util
+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-PPI>=1.215:textproc/p5-PPI \
+		p5-PPIx-Regexp>=0.033:textproc/p5-PPIx-Regexp \
+		p5-Perl-Critic>=1.10.4:textproc/p5-Perl-Critic \
+		p5-Params-Util>=0.25:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Script>=0:${PORTSDIR}/devel/p5-Test-Script
+TEST_DEPENDS=	p5-Test-Script>=0:devel/p5-Test-Script
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-PerlPoint-Converters/Makefile b/textproc/p5-PerlPoint-Converters/Makefile
index 4b87cae702e5..731acd343788 100644
--- a/textproc/p5-PerlPoint-Converters/Makefile
+++ b/textproc/p5-PerlPoint-Converters/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(..)$/\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert PerlPoint docs into various formats
 
-BUILD_DEPENDS=	p5-PerlPoint-Package>=0:${PORTSDIR}/textproc/p5-PerlPoint-Package \
-		p5-Getopt-ArgvFile>=0:${PORTSDIR}/devel/p5-Getopt-ArgvFile
+BUILD_DEPENDS=	p5-PerlPoint-Package>=0:textproc/p5-PerlPoint-Package \
+		p5-Getopt-ArgvFile>=0:devel/p5-Getopt-ArgvFile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 08e1208d9415..3e1ca739cbcd 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PerlPoint is both a presentation and a documentation toolset
 
-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/textproc/p5-Petal-CodePerl/Makefile b/textproc/p5-Petal-CodePerl/Makefile
index 71254319ecb3..f16447301052 100644
--- a/textproc/p5-Petal-CodePerl/Makefile
+++ b/textproc/p5-Petal-CodePerl/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Make Petal go faster by compiling the expressions
 
-BUILD_DEPENDS=	p5-Petal>=0:${PORTSDIR}/textproc/p5-Petal \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Code-Perl>=0:${PORTSDIR}/devel/p5-Code-Perl
+BUILD_DEPENDS=	p5-Petal>=0:textproc/p5-Petal \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+		p5-Code-Perl>=0:devel/p5-Code-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Petal-Mail/Makefile b/textproc/p5-Petal-Mail/Makefile
index 4bbc721d6184..246dbfc15a5a 100644
--- a/textproc/p5-Petal-Mail/Makefile
+++ b/textproc/p5-Petal-Mail/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Format text e-mail using Petal
 
-BUILD_DEPENDS=	p5-Petal>=0:${PORTSDIR}/textproc/p5-Petal \
-		p5-Encode>=0:${PORTSDIR}/converters/p5-Encode
+BUILD_DEPENDS=	p5-Petal>=0:textproc/p5-Petal \
+		p5-Encode>=0:converters/p5-Encode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Petal-Utils/Makefile b/textproc/p5-Petal-Utils/Makefile
index 232c4aaaf7d2..92c66b99a27b 100644
--- a/textproc/p5-Petal-Utils/Makefile
+++ b/textproc/p5-Petal-Utils/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Useful template modifiers for Petal
 
-BUILD_DEPENDS=	p5-Petal>=0:${PORTSDIR}/textproc/p5-Petal \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Petal>=0:textproc/p5-Petal \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Petal/Makefile b/textproc/p5-Petal/Makefile
index f1495ef326ea..55a0709c563d 100644
--- a/textproc/p5-Petal/Makefile
+++ b/textproc/p5-Petal/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Template Attribute Language - TAL for Perl!
 
-BUILD_DEPENDS=	p5-MKDoc-XML>=0.72:${PORTSDIR}/textproc/p5-MKDoc-XML
+BUILD_DEPENDS=	p5-MKDoc-XML>=0.72:textproc/p5-MKDoc-XML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Locale-Maketext-Gettext>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Gettext \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-Locale-Maketext-Gettext>=0:devel/p5-Locale-Maketext-Gettext \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index 7b0d1177fc54..aaa80bdd03d2 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -15,31 +15,31 @@ COMMENT=	Pluggable RSS/Atom feed aggregator written in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-DateTime-Locale>=0:${PORTSDIR}/devel/p5-DateTime-Locale \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-		p5-DateTime-Format-W3CDTF>=0:${PORTSDIR}/devel/p5-DateTime-Format-W3CDTF \
-		p5-Cache>=0:${PORTSDIR}/devel/p5-Cache \
-		p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-File-Find-Rule>=0:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
-		p5-Module-Pluggable-Fast>=0:${PORTSDIR}/devel/p5-Module-Pluggable-Fast \
-		p5-Term-Encoding>=0:${PORTSDIR}/devel/p5-Term-Encoding \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-MIME-Types>=0:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Text-Tags>=0:${PORTSDIR}/textproc/p5-Text-Tags \
-		p5-XML-Feed>=0:${PORTSDIR}/textproc/p5-XML-Feed \
-		p5-XML-RSS-LibXML>=0:${PORTSDIR}/textproc/p5-XML-RSS-LibXML \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Template-Provider-Encoding>=0:${PORTSDIR}/www/p5-Template-Provider-Encoding \
-		p5-HTML-ResolveLink>=0:${PORTSDIR}/www/p5-HTML-ResolveLink \
-		p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-DateTime-Locale>=0:devel/p5-DateTime-Locale \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+		p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
+		p5-Cache>=0:devel/p5-Cache \
+		p5-Cache-Cache>=0:devel/p5-Cache-Cache \
+		p5-File-Find-Rule>=0:devel/p5-File-Find-Rule \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-Module-Install>=0:devel/p5-Module-Install \
+		p5-Module-Pluggable-Fast>=0:devel/p5-Module-Pluggable-Fast \
+		p5-Term-Encoding>=0:devel/p5-Term-Encoding \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-MIME-Types>=0:mail/p5-MIME-Types \
+		p5-Text-Tags>=0:textproc/p5-Text-Tags \
+		p5-XML-Feed>=0:textproc/p5-XML-Feed \
+		p5-XML-RSS-LibXML>=0:textproc/p5-XML-RSS-LibXML \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Template-Provider-Encoding>=0:www/p5-Template-Provider-Encoding \
+		p5-HTML-ResolveLink>=0:www/p5-HTML-ResolveLink \
+		p5-URI-Fetch>=0:www/p5-URI-Fetch \
+		p5-YAML>=0:textproc/p5-YAML
 
 NO_ARCH=	yes
 USES=		perl5 shebangfix
@@ -134,255 +134,255 @@ OPTIONS_DEFAULT=	BETTERENCODING LIBERALXML XPATH BETTERHTML \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBETTERENCODING}
-BUILD_DEPENDS+=	p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect
+BUILD_DEPENDS+=	p5-Encode-Detect>=0:converters/p5-Encode-Detect
 .endif
 
 .if ${PORT_OPTIONS:MPODTESTING}
-BUILD_DEPENDS+=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+BUILD_DEPENDS+=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 .endif
 
 .if ${PORT_OPTIONS:MCOOKIESHARING}
-BUILD_DEPENDS+=	p5-HTTP-Cookies-Mozilla>=0:${PORTSDIR}/www/p5-HTTP-Cookies-Mozilla
+BUILD_DEPENDS+=	p5-HTTP-Cookies-Mozilla>=0:www/p5-HTTP-Cookies-Mozilla
 .endif
 
 .if ${PORT_OPTIONS:MLIBERALXML}
-BUILD_DEPENDS+=	p5-XML-Liberal>=0:${PORTSDIR}/textproc/p5-XML-Liberal  \
-		p5-XML-RSS-Liberal>=0:${PORTSDIR}/textproc/p5-XML-RSS-Liberal
+BUILD_DEPENDS+=	p5-XML-Liberal>=0:textproc/p5-XML-Liberal  \
+		p5-XML-RSS-Liberal>=0:textproc/p5-XML-RSS-Liberal
 .endif
 
 .if ${PORT_OPTIONS:MXPATH}
-BUILD_DEPENDS+=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format
+BUILD_DEPENDS+=	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+		p5-HTML-Format>=0:textproc/p5-HTML-Format
 .endif
 
 .if ${PORT_OPTIONS:MBETTERHTML}
-BUILD_DEPENDS+=	p5-HTML-TreeBuilder-XPath>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath
+BUILD_DEPENDS+=	p5-HTML-TreeBuilder-XPath>=0:www/p5-HTML-TreeBuilder-XPath
 .endif
 
 .if ${PORT_OPTIONS:MPRSJPNDATE}
-BUILD_DEPENDS+=	ja-p5-DateTime-Format-Japanese>=0:${PORTSDIR}/japanese/p5-DateTime-Format-Japanese
+BUILD_DEPENDS+=	ja-p5-DateTime-Format-Japanese>=0:japanese/p5-DateTime-Format-Japanese
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHEXCEL}
-BUILD_DEPENDS+=	p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
+BUILD_DEPENDS+=	p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel
 .endif
 
 .if ${PORT_OPTIONS:MFILTERPIPE}
-BUILD_DEPENDS+=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS+=	p5-IPC-Run>=0:devel/p5-IPC-Run
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHPLANET}
-BUILD_DEPENDS+=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
+BUILD_DEPENDS+=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHCSV}
-BUILD_DEPENDS+=	p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV
+BUILD_DEPENDS+=	p5-Text-CSV>=0:textproc/p5-Text-CSV
 .endif
 
 .if ${PORT_OPTIONS:MFILDEGYT}
-BUILD_DEPENDS+=	p5-WebService-YouTube>=0:${PORTSDIR}/www/p5-WebService-YouTube
+BUILD_DEPENDS+=	p5-WebService-YouTube>=0:www/p5-WebService-YouTube
 .endif
 
 .if ${PORT_OPTIONS:MAUTHORNAME}
-BUILD_DEPENDS+=	p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address
+BUILD_DEPENDS+=	p5-Email-Address>=0:mail/p5-Email-Address
 .endif
 
 .if ${PORT_OPTIONS:MGUESSLANG}
-BUILD_DEPENDS+=	p5-Lingua-ZH-HanDetect>=0:${PORTSDIR}/chinese/p5-Lingua-ZH-HanDetect \
-		p5-Text-Language-Guess>=0:${PORTSDIR}/textproc/p5-Text-Language-Guess
+BUILD_DEPENDS+=	p5-Lingua-ZH-HanDetect>=0:chinese/p5-Lingua-ZH-HanDetect \
+		p5-Text-Language-Guess>=0:textproc/p5-Text-Language-Guess
 .endif
 
 .if ${PORT_OPTIONS:MGUESSTZ}
-BUILD_DEPENDS+=	p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
+BUILD_DEPENDS+=	p5-IP-Country>=0:net/p5-IP-Country
 .endif
 
 .if ${PORT_OPTIONS:MHTMLTIDY}
-BUILD_DEPENDS+=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy
+BUILD_DEPENDS+=	p5-HTML-Tidy>=0:textproc/p5-HTML-Tidy
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHMT}
-BUILD_DEPENDS+=	p5-Net-MovableType>=0:${PORTSDIR}/net/p5-Net-MovableType
+BUILD_DEPENDS+=	p5-Net-MovableType>=0:net/p5-Net-MovableType
 .endif
 
 .if ${PORT_OPTIONS:MPUBSERLZR}
-BUILD_DEPENDS+=	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer
+BUILD_DEPENDS+=	p5-Data-Serializer>=0:devel/p5-Data-Serializer
 .endif
 
 .if ${PORT_OPTIONS:MPUBICAL}
-BUILD_DEPENDS+=	p5-Data-ICal>=0:${PORTSDIR}/deskutils/p5-Data-ICal \
-		p5-DateTime-Format-ICal>=0:${PORTSDIR}/devel/p5-DateTime-Format-ICal
+BUILD_DEPENDS+=	p5-Data-ICal>=0:deskutils/p5-Data-ICal \
+		p5-DateTime-Format-ICal>=0:devel/p5-DateTime-Format-ICal
 .endif
 
 .if ${PORT_OPTIONS:MROMANIZE}
-BUILD_DEPENDS+=	ja-p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi
+BUILD_DEPENDS+=	ja-p5-Text-Kakasi>=0:japanese/p5-Text-Kakasi
 .endif
 
 .if ${PORT_OPTIONS:MJAVASCRIPT}
-BUILD_DEPENDS+=	p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript
+BUILD_DEPENDS+=	p5-Template-Plugin-JavaScript>=0:www/p5-Template-Plugin-JavaScript
 .endif
 
 .if ${PORT_OPTIONS:MEMOTICON}
-BUILD_DEPENDS+=	p5-Text-Emoticon>=0:${PORTSDIR}/textproc/p5-Text-Emoticon
+BUILD_DEPENDS+=	p5-Text-Emoticon>=0:textproc/p5-Text-Emoticon
 .endif
 
 .if ${PORT_OPTIONS:MFILHATENA}
-BUILD_DEPENDS+=	p5-Text-Hatena>=0:${PORTSDIR}/textproc/p5-Text-Hatena
+BUILD_DEPENDS+=	p5-Text-Hatena>=0:textproc/p5-Text-Hatena
 .endif
 
 .if ${PORT_OPTIONS:MFILHATKTAG}
-BUILD_DEPENDS+=	p5-Hatena-Keyword>=0:${PORTSDIR}/textproc/p5-Hatena-Keyword
+BUILD_DEPENDS+=	p5-Hatena-Keyword>=0:textproc/p5-Hatena-Keyword
 .endif
 
 .if ${PORT_OPTIONS:MRULEFRESH}
-BUILD_DEPENDS+=	p5-Time-Duration-Parse>=0:${PORTSDIR}/devel/p5-Time-Duration-Parse
+BUILD_DEPENDS+=	p5-Time-Duration-Parse>=0:devel/p5-Time-Duration-Parse
 .endif
 
 .if ${PORT_OPTIONS:MSUBSCOPML}
-BUILD_DEPENDS+=	p5-XML-OPML>=0:${PORTSDIR}/textproc/p5-XML-OPML
+BUILD_DEPENDS+=	p5-XML-OPML>=0:textproc/p5-XML-OPML
 .endif
 
 .if ${PORT_OPTIONS:MFLICKRSEARCH}
-BUILD_DEPENDS+=	p5-Flickr-API>=0:${PORTSDIR}/www/p5-Flickr-API \
-		p5-DateTime-Format-Epoch>=0:${PORTSDIR}/devel/p5-DateTime-Format-Epoch
+BUILD_DEPENDS+=	p5-Flickr-API>=0:www/p5-Flickr-API \
+		p5-DateTime-Format-Epoch>=0:devel/p5-DateTime-Format-Epoch
 .endif
 
 .if ${PORT_OPTIONS:MHATENABKMK}
-BUILD_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS+=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 .endif
 
 .if ${PORT_OPTIONS:MPALMDOC}
-BUILD_DEPENDS+=	p5-Palm-PalmDoc>=0:${PORTSDIR}/palm/p5-Palm-PalmDoc
+BUILD_DEPENDS+=	p5-Palm-PalmDoc>=0:palm/p5-Palm-PalmDoc
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHSWF}
-BUILD_DEPENDS+=	p5-SWF-Builder>=0:${PORTSDIR}/graphics/p5-SWF-Builder \
-		libtext-wrapi18n-perl>=0:${PORTSDIR}/textproc/libtext-wrapi18n-perl
+BUILD_DEPENDS+=	p5-SWF-Builder>=0:graphics/p5-SWF-Builder \
+		libtext-wrapi18n-perl>=0:textproc/libtext-wrapi18n-perl
 .endif
 
 .if ${PORT_OPTIONS:MSUBSCRDBI}
-BUILD_DEPENDS+=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class
+BUILD_DEPENDS+=	p5-DBIx-Class>=0:databases/p5-DBIx-Class
 .endif
 
 .if ${PORT_OPTIONS:MFILTERPPT}
-BUILD_DEPENDS+=	p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find
+BUILD_DEPENDS+=	p5-URI-Find>=0:textproc/p5-URI-Find
 .endif
 
 .if ${PORT_OPTIONS:MKINOSEARCH}
-BUILD_DEPENDS+=	p5-KinoSearch1>=0:${PORTSDIR}/textproc/p5-KinoSearch1
+BUILD_DEPENDS+=	p5-KinoSearch1>=0:textproc/p5-KinoSearch1
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHGMAIL}
-BUILD_DEPENDS+=	p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS \
-		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS+=	p5-Net-SMTP-TLS>=0:mail/p5-Net-SMTP-TLS \
+		p5-MIME-Lite>=0:mail/p5-MIME-Lite \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools
 .endif
 
 .if ${PORT_OPTIONS:MPUBDELICIOUS}
-BUILD_DEPENDS+=	p5-Net-Delicious>=0:${PORTSDIR}/net/p5-Net-Delicious
+BUILD_DEPENDS+=	p5-Net-Delicious>=0:net/p5-Net-Delicious
 .endif
 
 .if ${PORT_OPTIONS:MESTRAIER}
-BUILD_DEPENDS+=	p5-Search-Estraier>=0:${PORTSDIR}/textproc/p5-Search-Estraier
+BUILD_DEPENDS+=	p5-Search-Estraier>=0:textproc/p5-Search-Estraier
 .endif
 
 .if ${PORT_OPTIONS:MSRCHGREP}
-BUILD_DEPENDS+=	p5-File-Grep>=0:${PORTSDIR}/devel/p5-File-Grep
+BUILD_DEPENDS+=	p5-File-Grep>=0:devel/p5-File-Grep
 .endif
 
 .if ${PORT_OPTIONS:MPUBJSON}
-BUILD_DEPENDS+=	p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS+=	p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 .endif
 
 .if ${PORT_OPTIONS:MFILSPAMASSN}
-BUILD_DEPENDS+=	spamassassin>=0:${PORTSDIR}/mail/spamassassin
+BUILD_DEPENDS+=	spamassassin>=0:mail/spamassassin
 .endif
 
 .if ${PORT_OPTIONS:MPROFANITY}
-BUILD_DEPENDS+=	p5-Regexp-Common-profanity_us>=0:${PORTSDIR}/textproc/p5-Regexp-Common-profanity_us
+BUILD_DEPENDS+=	p5-Regexp-Common-profanity_us>=0:textproc/p5-Regexp-Common-profanity_us
 .endif
 
 .if ${PORT_OPTIONS:MHATENARSS}
-BUILD_DEPENDS+=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+BUILD_DEPENDS+=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 .endif
 
 .if ${PORT_OPTIONS:MSUBSCRFOAF}
-BUILD_DEPENDS+=	p5-XML-FOAF>=0:${PORTSDIR}/textproc/p5-XML-FOAF
+BUILD_DEPENDS+=	p5-XML-FOAF>=0:textproc/p5-XML-FOAF
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFYIRC}
-BUILD_DEPENDS+=	p5-POE-Component-IRC>=0:${PORTSDIR}/irc/p5-POE-Component-IRC \
-		p5-POE-Component-IKC>=0:${PORTSDIR}/devel/p5-POE-Component-IKC
+BUILD_DEPENDS+=	p5-POE-Component-IRC>=0:irc/p5-POE-Component-IRC \
+		p5-POE-Component-IKC>=0:devel/p5-POE-Component-IKC
 .endif
 
 .if ${PORT_OPTIONS:MHATENADIARY}
-BUILD_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS+=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
 .endif
 
 .if ${PORT_OPTIONS:MLIVEDOOR}
-BUILD_DEPENDS+=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS+=	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 .endif
 
 .if ${PORT_OPTIONS:MPINGSERVER}
-BUILD_DEPENDS+=	p5-HTML-RSSAutodiscovery>=0:${PORTSDIR}/www/p5-HTML-RSSAutodiscovery
+BUILD_DEPENDS+=	p5-HTML-RSSAutodiscovery>=0:www/p5-HTML-RSSAutodiscovery
 .endif
 
 .if ${PORT_OPTIONS:MIMAGEINFO}
-BUILD_DEPENDS+=	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
+BUILD_DEPENDS+=	p5-Image-Info>=0:graphics/p5-Image-Info
 .endif
 
 .if ${PORT_OPTIONS:MFILMRKDWN}
-BUILD_DEPENDS+=	p5-Text-Markdown>=0:${PORTSDIR}/textproc/p5-Text-Markdown
+BUILD_DEPENDS+=	p5-Text-Markdown>=0:textproc/p5-Text-Markdown
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHIMAP}
-BUILD_DEPENDS+=	p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient
+BUILD_DEPENDS+=	p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient
 .endif
 
 .if ${PORT_OPTIONS:MPUBLISHPDF}
-BUILD_DEPENDS+=	p5-PDF-FromHTML>=0:${PORTSDIR}/textproc/p5-PDF-FromHTML
+BUILD_DEPENDS+=	p5-PDF-FromHTML>=0:textproc/p5-PDF-FromHTML
 .endif
 
 .if ${PORT_OPTIONS:MBLOGLINES}
-BUILD_DEPENDS+=	p5-WebService-Bloglines>=0:${PORTSDIR}/www/p5-WebService-Bloglines
+BUILD_DEPENDS+=	p5-WebService-Bloglines>=0:www/p5-WebService-Bloglines
 .endif
 
 .if ${PORT_OPTIONS:MBABELFISH}
-BUILD_DEPENDS+=	p5-WWW-Babelfish>=0:${PORTSDIR}/www/p5-WWW-Babelfish
+BUILD_DEPENDS+=	p5-WWW-Babelfish>=0:www/p5-WWW-Babelfish
 .endif
 
 .if ${PORT_OPTIONS:MCUSFEEDMIXI}
-BUILD_DEPENDS+=	p5-WWW-Mixi>=0:${PORTSDIR}/www/p5-WWW-Mixi
+BUILD_DEPENDS+=	p5-WWW-Mixi>=0:www/p5-WWW-Mixi
 .endif
 
 .if ${PORT_OPTIONS:MCUSTOMSVNLOG}
-BUILD_DEPENDS+=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
+BUILD_DEPENDS+=	p5-subversion>=0:devel/p5-subversion
 .endif
 
 .if ${PORT_OPTIONS:MNTFYNETSEND}
-BUILD_DEPENDS+=	p5-Net-NetSend>=0:${PORTSDIR}/net-im/p5-Net-NetSend
+BUILD_DEPENDS+=	p5-Net-NetSend>=0:net-im/p5-Net-NetSend
 .endif
 
 .if ${PORT_OPTIONS:MFILHTMLSCRB}
-BUILD_DEPENDS+=	p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
+BUILD_DEPENDS+=	p5-HTML-Scrubber>=0:www/p5-HTML-Scrubber
 .endif
 
 .if ${PORT_OPTIONS:MPLANETINI}
-BUILD_DEPENDS+=	p5-Config-INI-Simple>=0:${PORTSDIR}/devel/p5-Config-INI-Simple
+BUILD_DEPENDS+=	p5-Config-INI-Simple>=0:devel/p5-Config-INI-Simple
 .endif
 
 .if ${PORT_OPTIONS:MSUMMARYENG}
-BUILD_DEPENDS+=	p5-Lingua-EN-Summarize>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Summarize
+BUILD_DEPENDS+=	p5-Lingua-EN-Summarize>=0:textproc/p5-Lingua-EN-Summarize
 .endif
 
 .if ${PORT_OPTIONS:MSUMJPN}
-BUILD_DEPENDS+=	ja-p5-Lingua-JA-Summarize-Extract>=0:${PORTSDIR}/japanese/p5-Lingua-JA-Summarize-Extract
+BUILD_DEPENDS+=	ja-p5-Lingua-JA-Summarize-Extract>=0:japanese/p5-Lingua-JA-Summarize-Extract
 .endif
 
 .if ${PORT_OPTIONS:MSUMTEXTORG}
-BUILD_DEPENDS+=	p5-Text-Original>=0:${PORTSDIR}/textproc/p5-Text-Original
+BUILD_DEPENDS+=	p5-Text-Original>=0:textproc/p5-Text-Original
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile b/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
index 4bed7cc614e3..9bc4fb020f24 100644
--- a/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Analysis-CJKAnalyzer/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Analyzer for CJK texts
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Plucene>=0:${PORTSDIR}/textproc/p5-Plucene
+BUILD_DEPENDS=	p5-Plucene>=0:textproc/p5-Plucene
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
+TEST_DEPENDS=	p5-YAML>=0:textproc/p5-YAML
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
index 9c45efa828ea..e329d3c5910c 100644
--- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
+++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Stemmed analyzer plugin for p5-Plucene search engine
 
-BUILD_DEPENDS=	p5-Lingua-StopWords>=0:${PORTSDIR}/textproc/p5-Lingua-StopWords \
-		p5-Lingua-Stem-Snowball>=0:${PORTSDIR}/textproc/p5-Lingua-Stem-Snowball \
-		p5-Plucene>=0:${PORTSDIR}/textproc/p5-Plucene
+BUILD_DEPENDS=	p5-Lingua-StopWords>=0:textproc/p5-Lingua-StopWords \
+		p5-Lingua-Stem-Snowball>=0:textproc/p5-Lingua-Stem-Snowball \
+		p5-Plucene>=0:textproc/p5-Plucene
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Plucene-Simple/Makefile b/textproc/p5-Plucene-Simple/Makefile
index b6ee3cebc59c..191aa8e86f32 100644
--- a/textproc/p5-Plucene-Simple/Makefile
+++ b/textproc/p5-Plucene-Simple/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	${PORTNAME:S/-//}-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to Plucene
 
-BUILD_DEPENDS=	p5-Time-Piece>=1.08:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Time-Piece-Range>=1.0:${PORTSDIR}/devel/p5-Time-Piece-Range \
-		p5-Plucene>=1.09:${PORTSDIR}/textproc/p5-Plucene \
-		p5-File-Find-Rule>=0.10:${PORTSDIR}/devel/p5-File-Find-Rule \
-		p5-File-Slurp>=2002.1031:${PORTSDIR}/devel/p5-File-Slurp
+BUILD_DEPENDS=	p5-Time-Piece>=1.08:devel/p5-Time-Piece \
+		p5-Time-Piece-Range>=1.0:devel/p5-Time-Piece-Range \
+		p5-Plucene>=1.09:textproc/p5-Plucene \
+		p5-File-Find-Rule>=0.10:devel/p5-File-Find-Rule \
+		p5-File-Slurp>=2002.1031:devel/p5-File-Slurp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Class>=0.03:${PORTSDIR}/devel/p5-Test-Class
+TEST_DEPENDS=	p5-Test-Class>=0.03:devel/p5-Test-Class
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Plucene/Makefile b/textproc/p5-Plucene/Makefile
index 7d5873e36f39..aef2938300e5 100644
--- a/textproc/p5-Plucene/Makefile
+++ b/textproc/p5-Plucene/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl port of the Java Lucene search engine
 
-BUILD_DEPENDS=	p5-Tie-Array-Sorted>=0:${PORTSDIR}/devel/p5-Tie-Array-Sorted \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Class-Virtual>=0:${PORTSDIR}/devel/p5-Class-Virtual \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
-		p5-Lingua-Stem>=0:${PORTSDIR}/textproc/p5-Lingua-Stem \
-		p5-Bit-Vector-Minimal>=0:${PORTSDIR}/math/p5-Bit-Vector-Minimal \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy
+BUILD_DEPENDS=	p5-Tie-Array-Sorted>=0:devel/p5-Tie-Array-Sorted \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Class-Virtual>=0:devel/p5-Class-Virtual \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Time-Piece>=0:devel/p5-Time-Piece \
+		p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem \
+		p5-Bit-Vector-Minimal>=0:math/p5-Bit-Vector-Minimal \
+		p5-IO-stringy>=0:devel/p5-IO-stringy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-Abstract/Makefile b/textproc/p5-Pod-Abstract/Makefile
index cae249f94862..0840f7771320 100644
--- a/textproc/p5-Pod-Abstract/Makefile
+++ b/textproc/p5-Pod-Abstract/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Abstract document tree for Perl POD documents
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-Autopod/Makefile b/textproc/p5-Pod-Autopod/Makefile
index 498fe78ec1cd..03e474314e16 100644
--- a/textproc/p5-Pod-Autopod/Makefile
+++ b/textproc/p5-Pod-Autopod/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Generates pod documentation by analysing perl modules
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	p5-Pod-Abstract>=0:${PORTSDIR}/textproc/p5-Pod-Abstract
+BUILD_DEPENDS=	p5-Pod-Abstract>=0:textproc/p5-Pod-Abstract
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-DocBook/Makefile b/textproc/p5-Pod-DocBook/Makefile
index bd59e05f1dfb..422da6711ccf 100644
--- a/textproc/p5-Pod-DocBook/Makefile
+++ b/textproc/p5-Pod-DocBook/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert Pod data to DocBook SGML
 
-BUILD_DEPENDS=	p5-podlators>=0:${PORTSDIR}/textproc/p5-podlators \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap
+BUILD_DEPENDS=	p5-podlators>=0:textproc/p5-podlators \
+		p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-Elemental/Makefile b/textproc/p5-Pod-Elemental/Makefile
index 65b1fdd9ffe0..f004a189b421 100644
--- a/textproc/p5-Pod-Elemental/Makefile
+++ b/textproc/p5-Pod-Elemental/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Treating a Pod document as a tree of elements
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-Mixin-Linewise>=0:${PORTSDIR}/devel/p5-Mixin-Linewise \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Pod-Eventual>=0:${PORTSDIR}/textproc/p5-Pod-Eventual \
-		p5-String-RewritePrefix>=0:${PORTSDIR}/textproc/p5-String-RewritePrefix \
-		p5-String-Truncate>=0:${PORTSDIR}/textproc/p5-String-Truncate \
-		p5-Sub-Exporter-ForMethods>=0:${PORTSDIR}/devel/p5-Sub-Exporter-ForMethods \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-Mixin-Linewise>=0:devel/p5-Mixin-Linewise \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Pod-Eventual>=0:textproc/p5-Pod-Eventual \
+		p5-String-RewritePrefix>=0:textproc/p5-String-RewritePrefix \
+		p5-String-Truncate>=0:textproc/p5-String-Truncate \
+		p5-Sub-Exporter-ForMethods>=0:devel/p5-Sub-Exporter-ForMethods \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Differences>=0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
@@ -32,8 +32,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/textproc/p5-Pod-Eventual/Makefile b/textproc/p5-Pod-Eventual/Makefile
index 39f29c7cf536..3a61b767fa52 100644
--- a/textproc/p5-Pod-Eventual/Makefile
+++ b/textproc/p5-Pod-Eventual/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Read a POD document as a series of trivial events
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mixin-Linewise>=0.102:${PORTSDIR}/devel/p5-Mixin-Linewise
+BUILD_DEPENDS=	p5-Mixin-Linewise>=0.102:devel/p5-Mixin-Linewise
 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/textproc/p5-Pod-HtmlEasy/Makefile b/textproc/p5-Pod-HtmlEasy/Makefile
index f2c6ab2d5227..eb248cb50fbf 100644
--- a/textproc/p5-Pod-HtmlEasy/Makefile
+++ b/textproc/p5-Pod-HtmlEasy/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Generate personalized HTML from PODs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Slurp>=9999.13:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IPC-Run>=0.8:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Exporter-Easy>=0:${PORTSDIR}/devel/p5-Exporter-Easy \
-		p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-		p5-Regexp-Common>=2.12:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-Pod-Escapes>=0:${PORTSDIR}/textproc/p5-Pod-Escapes
+BUILD_DEPENDS=	p5-File-Slurp>=9999.13:devel/p5-File-Slurp \
+		p5-IPC-Run>=0.8:devel/p5-IPC-Run \
+		p5-Exporter-Easy>=0:devel/p5-Exporter-Easy \
+		p5-Readonly>=1.03:devel/p5-Readonly \
+		p5-Regexp-Common>=2.12:textproc/p5-Regexp-Common \
+		p5-Pod-Escapes>=0:textproc/p5-Pod-Escapes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 tar:tgz
diff --git a/textproc/p5-Pod-Markdown/Makefile b/textproc/p5-Pod-Markdown/Makefile
index 82fafd8517e1..6add58148fa4 100644
--- a/textproc/p5-Pod-Markdown/Makefile
+++ b/textproc/p5-Pod-Markdown/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
index eb29de9d0a8a..f2eafcbb3aa7 100644
--- a/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
+++ b/textproc/p5-Pod-POM-View-HTML-Filter/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use filters on sections of your pod documents
 
-BUILD_DEPENDS=	p5-Pod-POM>=0:${PORTSDIR}/textproc/p5-Pod-POM \
-		p5-Syntax-Highlight-Shell>=0:${PORTSDIR}/www/p5-Syntax-Highlight-Shell \
-		perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \
-		p5-Syntax-Highlight-HTML>=0:${PORTSDIR}/www/p5-Syntax-Highlight-HTML
+BUILD_DEPENDS=	p5-Pod-POM>=0:textproc/p5-Pod-POM \
+		p5-Syntax-Highlight-Shell>=0:www/p5-Syntax-Highlight-Shell \
+		perltidy:devel/p5-Perl-Tidy \
+		p5-Syntax-Highlight-HTML>=0:www/p5-Syntax-Highlight-HTML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index bc6ad01af9f1..ab8b6ce4ec0a 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -13,9 +13,9 @@ COMMENT=	POD Object Model
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-File-Slurper>=0.004:${PORTSDIR}/devel/p5-File-Slurper \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff
+TEST_DEPENDS=	p5-File-Slurper>=0.004:devel/p5-File-Slurper \
+		p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Text-Diff>=0:textproc/p5-Text-Diff
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/textproc/p5-Pod-ProjectDocs/Makefile b/textproc/p5-Pod-ProjectDocs/Makefile
index c0d0ce42c8e6..de9f5eff5e1b 100644
--- a/textproc/p5-Pod-ProjectDocs/Makefile
+++ b/textproc/p5-Pod-ProjectDocs/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generates CPAN like pod pages
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-JSON>=2.04:${PORTSDIR}/converters/p5-JSON \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-JSON>=2.04:converters/p5-JSON \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-Readme/Makefile b/textproc/p5-Pod-Readme/Makefile
index 2fb5786fd700..2c8edabd6a5d 100644
--- a/textproc/p5-Pod-Readme/Makefile
+++ b/textproc/p5-Pod-Readme/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convert POD to README file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix dos2unix
diff --git a/textproc/p5-Pod-Spell/Makefile b/textproc/p5-Pod-Spell/Makefile
index 52d44e4aa481..f1f66f4273c4 100644
--- a/textproc/p5-Pod-Spell/Makefile
+++ b/textproc/p5-Pod-Spell/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Formatter for spellchecking Pod
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-Class-Tiny>=0:${PORTSDIR}/devel/p5-Class-Tiny \
-		p5-File-ShareDir-ProjectDistDir>=1.000:${PORTSDIR}/devel/p5-File-ShareDir-ProjectDistDir \
-		devel/p5-File-ShareDir-Install>=0.06:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Pod-Escapes>=1.01:${PORTSDIR}/textproc/p5-Pod-Escapes
+BUILD_DEPENDS=	p5-Class-Tiny>=0:devel/p5-Class-Tiny \
+		p5-File-ShareDir-ProjectDistDir>=1.000:devel/p5-File-ShareDir-ProjectDistDir \
+		devel/p5-File-ShareDir-Install>=0.06:devel/p5-File-ShareDir-Install \
+		p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-Pod-Escapes>=1.01:textproc/p5-Pod-Escapes
 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/textproc/p5-Pod-Tree/Makefile b/textproc/p5-Pod-Tree/Makefile
index 220f79a1dbad..ecb88a8734fe 100644
--- a/textproc/p5-Pod-Tree/Makefile
+++ b/textproc/p5-Pod-Tree/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Create a static syntax tree for a POD
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-HTML-Stream>=1.49:${PORTSDIR}/www/p5-HTML-Stream \
-		p5-IO-String>=1:${PORTSDIR}/devel/p5-IO-String \
-		p5-Path-Tiny>=0.068:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Text-Template>=1:${PORTSDIR}/textproc/p5-Text-Template
+RUN_DEPENDS=	p5-HTML-Stream>=1.49:www/p5-HTML-Stream \
+		p5-IO-String>=1:devel/p5-IO-String \
+		p5-Path-Tiny>=0.068:devel/p5-Path-Tiny \
+		p5-Text-Template>=1:textproc/p5-Text-Template
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Path-Tiny>=0.068:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-Test-Compile>1.2.1:${PORTSDIR}/devel/p5-Test-Compile
+TEST_DEPENDS=	p5-Path-Tiny>=0.068:devel/p5-Path-Tiny \
+		p5-Test-Compile>1.2.1:devel/p5-Test-Compile
 
 USES=		perl5
 USE_PERL5=	configure
@@ -33,7 +33,7 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+=	p5-Test-Simple>=1:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/p5-Pod-WSDL/Makefile b/textproc/p5-Pod-WSDL/Makefile
index 6ccf56b39bd2..543a7e1f90e0 100644
--- a/textproc/p5-Pod-WSDL/Makefile
+++ b/textproc/p5-Pod-WSDL/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Create WSDL documents from (extended) pod
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-XML-Writer>=0.531:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-XML-XPath>=1.13:${PORTSDIR}/textproc/p5-XML-XPath
+BUILD_DEPENDS=	p5-IO-stringy>=2.110:devel/p5-IO-stringy \
+		p5-XML-Writer>=0.531:textproc/p5-XML-Writer \
+		p5-XML-XPath>=1.13:textproc/p5-XML-XPath
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Pod-WikiDoc/Makefile b/textproc/p5-Pod-WikiDoc/Makefile
index a815a7aa948c..d3cbf2e21148 100644
--- a/textproc/p5-Pod-WikiDoc/Makefile
+++ b/textproc/p5-Pod-WikiDoc/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Generate Pod from inline wiki style text
 LICENSE=	APACHE20
 
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
-		p5-Getopt-Lucid>=0.14:${PORTSDIR}/textproc/p5-Getopt-Lucid \
-		p5-IPC-Run3>=0.033:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-Parse-RecDescent>=1.967.006:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Probe-Perl>=0.01:${PORTSDIR}/sysutils/p5-Probe-Perl
+RUN_DEPENDS=	p5-File-pushd>=0:devel/p5-File-pushd \
+		p5-Getopt-Lucid>=0.14:textproc/p5-Getopt-Lucid \
+		p5-IPC-Run3>=0.033:devel/p5-IPC-Run3 \
+		p5-Parse-RecDescent>=1.967.006:devel/p5-Parse-RecDescent \
+		p5-Probe-Perl>=0.01:sysutils/p5-Probe-Perl
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Pod-XML/Makefile b/textproc/p5-Pod-XML/Makefile
index 8eebd6fc03b5..9057bae370a9 100644
--- a/textproc/p5-Pod-XML/Makefile
+++ b/textproc/p5-Pod-XML/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module to convert POD to XML
 
-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}
-TEST_DEPENDS=	p5-Test-File-Contents>=0:${PORTSDIR}/devel/p5-Test-File-Contents
+TEST_DEPENDS=	p5-Test-File-Contents>=0:devel/p5-Test-File-Contents
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Pod-Xhtml/Makefile b/textproc/p5-Pod-Xhtml/Makefile
index 6395a0980162..86649819059c 100644
--- a/textproc/p5-Pod-Xhtml/Makefile
+++ b/textproc/p5-Pod-Xhtml/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate well-formed XHTML documents from POD format documentation
 
-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-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/textproc/p5-RADIUS-UserFile/Makefile b/textproc/p5-RADIUS-UserFile/Makefile
index 9511c1c5df90..388e707c4eab 100644
--- a/textproc/p5-RADIUS-UserFile/Makefile
+++ b/textproc/p5-RADIUS-UserFile/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension for manipulating a RADIUS users file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+BUILD_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index 04314d0643a1..0e1e226a1a3c 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object oriented Perl modules for handling tasks related to RDF
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index e1503cba8f01..e680cb4059e0 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	RDF Notation3 parser
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-RDF-Core>=0:${PORTSDIR}/textproc/p5-RDF-Core \
-		p5-RDFStore>=0:${PORTSDIR}/textproc/p5-RDFStore
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-RDF-Core>=0:textproc/p5-RDF-Core \
+		p5-RDFStore>=0:textproc/p5-RDFStore
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-RDF-Simple/Makefile b/textproc/p5-RDF-Simple/Makefile
index ee2d4c2bb6e3..107ac33fb199 100644
--- a/textproc/p5-RDF-Simple/Makefile
+++ b/textproc/p5-RDF-Simple/Makefile
@@ -12,15 +12,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read and write RDF without complication
 
-RUN_DEPENDS=	p5-Class-MakeMethods>=0:${PORTSDIR}/devel/p5-Class-MakeMethods \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-IO-CaptureOutput>0:${PORTSDIR}/devel/p5-IO-CaptureOutput \
-		p5-Test-File>=0:${PORTSDIR}/devel/p5-Test-File
+TEST_DEPENDS=	p5-IO-CaptureOutput>0:devel/p5-IO-CaptureOutput \
+		p5-Test-File>=0:devel/p5-Test-File
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-RDF-Trine/Makefile b/textproc/p5-RDF-Trine/Makefile
index aa3d5a41dad5..4874e1b6ef21 100644
--- a/textproc/p5-RDF-Trine/Makefile
+++ b/textproc/p5-RDF-Trine/Makefile
@@ -14,36 +14,36 @@ COMMENT=	RDF Framework for Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Combinatorics>=0:${PORTSDIR}/math/p5-Algorithm-Combinatorics \
-		p5-Cache-LRU>=0.04:${PORTSDIR}/devel/p5-Cache-LRU \
-		p5-DBD-SQLite>=1.14:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-DBIx-Connector>=0:${PORTSDIR}/databases/p5-DBIx-Connector \
-		p5-Data-UUID>=0:${PORTSDIR}/devel/p5-Data-UUID \
-		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-HTTP-Negotiate>=0:${PORTSDIR}/www/p5-HTTP-Negotiate \
-		p5-JSON>=2.0:${PORTSDIR}/converters/p5-JSON \
-		p5-List-MoreUtils>=0.413:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Math-BigInt>=0:${PORTSDIR}/math/p5-Math-BigInt \
-		p5-Module-Load-Conditional>=0.38:${PORTSDIR}/devel/p5-Module-Load-Conditional \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-ArrayRef>=0:${PORTSDIR}/devel/p5-MooseX-ArrayRef \
-		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Text-Table>=0:${PORTSDIR}/textproc/p5-Text-Table \
-		p5-Time-HiRes>=1.9726:${PORTSDIR}/devel/p5-Time-HiRes \
-		p5-URI>=1.30:${PORTSDIR}/net/p5-URI \
-		p5-Unicode-Escape>=0.0.2:${PORTSDIR}/textproc/p5-Unicode-Escape \
-		p5-Unicode-String>=2.09:${PORTSDIR}/converters/p5-Unicode-String \
-		p5-XML-CommonNS>=0.04:${PORTSDIR}/textproc/p5-XML-CommonNS \
-		p5-XML-LibXML>=2.0124:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Namespace>=0:${PORTSDIR}/textproc/p5-XML-Namespace \
-		p5-XML-SAX>=0.96:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Algorithm-Combinatorics>=0:math/p5-Algorithm-Combinatorics \
+		p5-Cache-LRU>=0.04:devel/p5-Cache-LRU \
+		p5-DBD-SQLite>=1.14:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-DBIx-Connector>=0:databases/p5-DBIx-Connector \
+		p5-Data-UUID>=0:devel/p5-Data-UUID \
+		p5-Digest-MD5>=0:security/p5-Digest-MD5 \
+		p5-Digest-SHA>=0:security/p5-Digest-SHA \
+		p5-Error>=0:lang/p5-Error \
+		p5-HTTP-Negotiate>=0:www/p5-HTTP-Negotiate \
+		p5-JSON>=2.0:converters/p5-JSON \
+		p5-List-MoreUtils>=0.413:lang/p5-List-MoreUtils \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-Math-BigInt>=0:math/p5-Math-BigInt \
+		p5-Module-Load-Conditional>=0.38:devel/p5-Module-Load-Conditional \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-ArrayRef>=0:devel/p5-MooseX-ArrayRef \
+		p5-Set-Scalar>=0:devel/p5-Set-Scalar \
+		p5-Storable>=0:devel/p5-Storable \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV \
+		p5-Text-Table>=0:textproc/p5-Text-Table \
+		p5-Time-HiRes>=1.9726:devel/p5-Time-HiRes \
+		p5-URI>=1.30:net/p5-URI \
+		p5-Unicode-Escape>=0.0.2:textproc/p5-Unicode-Escape \
+		p5-Unicode-String>=2.09:converters/p5-Unicode-String \
+		p5-XML-CommonNS>=0.04:textproc/p5-XML-CommonNS \
+		p5-XML-LibXML>=2.0124:textproc/p5-XML-LibXML \
+		p5-XML-Namespace>=0:textproc/p5-XML-Namespace \
+		p5-XML-SAX>=0.96:textproc/p5-XML-SAX \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -52,8 +52,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/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index 850c61897ea4..3e0a0f9a4b88 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl API for RDF Storage
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-URI>=0:net/p5-URI \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-RTF-Parser/Makefile b/textproc/p5-RTF-Parser/Makefile
index d89d670aa785..718066954c44 100644
--- a/textproc/p5-RTF-Parser/Makefile
+++ b/textproc/p5-RTF-Parser/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for parsing RTF files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-RTF-Tokenizer>=1.16:${PORTSDIR}/textproc/p5-RTF-Tokenizer
+BUILD_DEPENDS=	p5-RTF-Tokenizer>=1.16:textproc/p5-RTF-Tokenizer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-RTF-Writer/Makefile b/textproc/p5-RTF-Writer/Makefile
index 82618a54e118..b7f9c3589662 100644
--- a/textproc/p5-RTF-Writer/Makefile
+++ b/textproc/p5-RTF-Writer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for generating documents in Rich Text Format
 
-BUILD_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size
+BUILD_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Regexp-Common-Email-Address/Makefile b/textproc/p5-Regexp-Common-Email-Address/Makefile
index ab3dbc3a473d..d02d894fc57a 100644
--- a/textproc/p5-Regexp-Common-Email-Address/Makefile
+++ b/textproc/p5-Regexp-Common-Email-Address/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Regex pattern for Email Addresses
 
-BUILD_DEPENDS=	p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address \
-		p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Email-Address>=0:mail/p5-Email-Address \
+		p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Regexp-Common-net-CIDR/Makefile b/textproc/p5-Regexp-Common-net-CIDR/Makefile
index c603831bb4e3..4e04caf9cc0b 100644
--- a/textproc/p5-Regexp-Common-net-CIDR/Makefile
+++ b/textproc/p5-Regexp-Common-net-CIDR/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Provide patterns for CIDR blocks
 
-BUILD_DEPENDS=	p5-Regexp-Common>0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Regexp-Common>0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Regexp-Common-profanity_us/Makefile b/textproc/p5-Regexp-Common-profanity_us/Makefile
index 7473765cd5de..ef9154dbcd46 100644
--- a/textproc/p5-Regexp-Common-profanity_us/Makefile
+++ b/textproc/p5-Regexp-Common-profanity_us/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provide regexes for U.S. profanity
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common
+BUILD_DEPENDS=	p5-Regexp-Common>=0:textproc/p5-Regexp-Common
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Regexp-Log-Common/Makefile b/textproc/p5-Regexp-Log-Common/Makefile
index d4d7d055465e..281f90cf3599 100644
--- a/textproc/p5-Regexp-Log-Common/Makefile
+++ b/textproc/p5-Regexp-Log-Common/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Regexp::Log::Common, a parser for the Common Log Format
 
 LICENSE=	ART20
 
-RUN_DEPENDS=	p5-Regexp-Log>=0:${PORTSDIR}/textproc/p5-Regexp-Log
+RUN_DEPENDS=	p5-Regexp-Log>=0:textproc/p5-Regexp-Log
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-SGML-DTDParse/Makefile b/textproc/p5-SGML-DTDParse/Makefile
index 1f03c4d82460..28e96a0a57bc 100644
--- a/textproc/p5-SGML-DTDParse/Makefile
+++ b/textproc/p5-SGML-DTDParse/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse an SGML or XML DTD
 
-BUILD_DEPENDS=	p5-DelimMatch>=1.05:${PORTSDIR}/textproc/p5-DelimMatch \
-		p5-libxml>=0.08:${PORTSDIR}/textproc/p5-libxml \
-		p5-XML-DOM>=1.44:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-XML-Parser>=2.3:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-DelimMatch>=1.05:textproc/p5-DelimMatch \
+		p5-libxml>=0.08:textproc/p5-libxml \
+		p5-XML-DOM>=1.44:textproc/p5-XML-DOM \
+		p5-XML-Parser>=2.3:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-SGML-Parser-OpenSP/Makefile b/textproc/p5-SGML-Parser-OpenSP/Makefile
index 379506748daa..003963148e7e 100644
--- a/textproc/p5-SGML-Parser-OpenSP/Makefile
+++ b/textproc/p5-SGML-Parser-OpenSP/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Parse SGML documents using OpenSP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	onsgmls:${PORTSDIR}/textproc/opensp \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	onsgmls:textproc/opensp \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix perl5
diff --git a/textproc/p5-SVG-Parser/Makefile b/textproc/p5-SVG-Parser/Makefile
index 323b060b20d6..90171a14dd3a 100644
--- a/textproc/p5-SVG-Parser/Makefile
+++ b/textproc/p5-SVG-Parser/Makefile
@@ -14,9 +14,9 @@ COMMENT=	XML Parser for SVG documents
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-SVG>=2:${PORTSDIR}/textproc/p5-SVG \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-SVG>=2:textproc/p5-SVG \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Search-Elasticsearch/Makefile b/textproc/p5-Search-Elasticsearch/Makefile
index 1a1bddc871a6..b2695c4c2e78 100644
--- a/textproc/p5-Search-Elasticsearch/Makefile
+++ b/textproc/p5-Search-Elasticsearch/Makefile
@@ -13,28 +13,28 @@ COMMENT=	ElasticSearch API
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-Any-URI-Escape>=0:${PORTSDIR}/www/p5-Any-URI-Escape \
-		p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-HTTP-Tiny>=0.043:${PORTSDIR}/www/p5-HTTP-Tiny \
-		p5-Hijk>=0.20:${PORTSDIR}/www/p5-Hijk \
-		p5-JSON-MaybeXS>=1.002002:${PORTSDIR}/converters/p5-JSON-MaybeXS \
-		p5-Log-Any>=1.02:${PORTSDIR}/devel/p5-Log-Any \
-		p5-Module-Runtime>=0:${PORTSDIR}/devel/p5-Module-Runtime \
-		p5-Moo>=1.003:${PORTSDIR}/devel/p5-Moo \
-		p5-Package-Stash>=0:${PORTSDIR}/devel/p5-Package-Stash \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-URI-Escape-XS>=0:${PORTSDIR}/www/p5-URI-Escape-XS \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Any-URI-Escape>=0:www/p5-Any-URI-Escape \
+		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-HTTP-Tiny>=0.043:www/p5-HTTP-Tiny \
+		p5-Hijk>=0.20:www/p5-Hijk \
+		p5-JSON-MaybeXS>=1.002002:converters/p5-JSON-MaybeXS \
+		p5-Log-Any>=1.02:devel/p5-Log-Any \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Moo>=1.003:devel/p5-Moo \
+		p5-Package-Stash>=0:devel/p5-Package-Stash \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Log-Any-Adapter-Callback>=0:${PORTSDIR}/devel/p5-Log-Any-Adapter-Callback \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Log-Any-Adapter-Callback>=0:devel/p5-Log-Any-Adapter-Callback \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Search-Estraier/Makefile b/textproc/p5-Search-Estraier/Makefile
index b898a9280d00..81001e6dd207 100644
--- a/textproc/p5-Search-Estraier/Makefile
+++ b/textproc/p5-Search-Estraier/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure perl module to use Hyper Estraier search engine
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	scripts/*
diff --git a/textproc/p5-Search-Odeum/Makefile b/textproc/p5-Search-Odeum/Makefile
index be42d3a4ebae..5d555468bf7c 100644
--- a/textproc/p5-Search-Odeum/Makefile
+++ b/textproc/p5-Search-Odeum/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl interface to the Odeum inverted index API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	libqdbm.so:databases/qdbm
 
 USE_PERL5=	configure
 USES=		localbase perl5
diff --git a/textproc/p5-Search-QueryParser-SQL/Makefile b/textproc/p5-Search-QueryParser-SQL/Makefile
index b7d8a73175ff..688f85638278 100644
--- a/textproc/p5-Search-QueryParser-SQL/Makefile
+++ b/textproc/p5-Search-QueryParser-SQL/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Perl module to turn free-text queries into SQL WHERE clauses
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Search-QueryParser>=0.93:${PORTSDIR}/textproc/p5-Search-QueryParser
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Search-QueryParser>=0.93:textproc/p5-Search-QueryParser
 
-RUN_DEPENDS:=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Search-QueryParser>=0.93:${PORTSDIR}/textproc/p5-Search-QueryParser
+RUN_DEPENDS:=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Search-QueryParser>=0.93:textproc/p5-Search-QueryParser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
index 5f1bb3a6b559..7cca7202bb12 100644
--- a/textproc/p5-Search-Saryer/Makefile
+++ b/textproc/p5-Search-Saryer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the Sary library
 
-LIB_DEPENDS=	libsary.so:${PORTSDIR}/textproc/sary
+LIB_DEPENDS=	libsary.so:textproc/sary
 
 USES=		perl5 pkgconfig
 USE_PERL5=	configure
diff --git a/textproc/p5-Search-VectorSpace/Makefile b/textproc/p5-Search-VectorSpace/Makefile
index 7bd28fb83d0a..429b359962c2 100644
--- a/textproc/p5-Search-VectorSpace/Makefile
+++ b/textproc/p5-Search-VectorSpace/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Very basic vector-space search engine perl module
 
-BUILD_DEPENDS=	PDL>=0:${PORTSDIR}/math/PDL \
-		p5-Lingua-Stem>=0:${PORTSDIR}/textproc/p5-Lingua-Stem
+BUILD_DEPENDS=	PDL>=0:math/PDL \
+		p5-Lingua-Stem>=0:textproc/p5-Lingua-Stem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index 12ae10d27369..6d03879e668d 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module for Embeddable Fulltext Search Engine
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	senna-cfg:${PORTSDIR}/textproc/senna
+BUILD_DEPENDS=	senna-cfg:textproc/senna
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Solr/Makefile b/textproc/p5-Solr/Makefile
index 9f833284c84b..d63dec392b2e 100644
--- a/textproc/p5-Solr/Makefile
+++ b/textproc/p5-Solr/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl extension for interfacing with Solr
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Log-Log4perl>=0:devel/p5-Log-Log4perl \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Sphinx-Config/Makefile b/textproc/p5-Sphinx-Config/Makefile
index d3975c441997..f4ca75b7bd81 100644
--- a/textproc/p5-Sphinx-Config/Makefile
+++ b/textproc/p5-Sphinx-Config/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sphinx search engine configuration file read/modify/write
 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}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Sphinx-Manager/Makefile b/textproc/p5-Sphinx-Manager/Makefile
index f4a5669bfcc4..dcbe28dbcfa8 100644
--- a/textproc/p5-Sphinx-Manager/Makefile
+++ b/textproc/p5-Sphinx-Manager/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sphinx search engine management (start/stop)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Sphinx-Config>=0.09:${PORTSDIR}/textproc/p5-Sphinx-Config
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+		p5-Sphinx-Config>=0.09:textproc/p5-Sphinx-Config
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Sphinx-Search/Makefile b/textproc/p5-Sphinx-Search/Makefile
index e940f46b1fcd..47d6f7c1ddbc 100644
--- a/textproc/p5-Sphinx-Search/Makefile
+++ b/textproc/p5-Sphinx-Search/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Sphinx search engine API Perl client
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-File-SearchPath>=0:${PORTSDIR}/devel/p5-File-SearchPath \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-File-SearchPath>=0:devel/p5-File-SearchPath \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Path-Class>=0:devel/p5-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Spork/Makefile b/textproc/p5-Spork/Makefile
index b387628b0b96..5adf4b99db3f 100644
--- a/textproc/p5-Spork/Makefile
+++ b/textproc/p5-Spork/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Creating standalone HTML slideshows from Kwiki markup
 
-BUILD_DEPENDS=	p5-Kwiki>=0.38:${PORTSDIR}/www/p5-Kwiki \
-		p5-Spoon>=0.22:${PORTSDIR}/devel/p5-Spoon
+BUILD_DEPENDS=	p5-Kwiki>=0.38:www/p5-Kwiki \
+		p5-Spoon>=0.22:devel/p5-Spoon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 92ce7cc876e0..d7d7452dbeb5 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Get information from Excel file
 
-BUILD_DEPENDS=	p5-OLE-Storage_Lite>=0.19:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-		p5-Crypt-RC4>=0:${PORTSDIR}/security/p5-Crypt-RC4 \
-		p5-Digest-Perl-MD5>=0:${PORTSDIR}/security/p5-Digest-Perl-MD5
+BUILD_DEPENDS=	p5-OLE-Storage_Lite>=0.19:devel/p5-OLE-Storage_Lite \
+		p5-Crypt-RC4>=0:security/p5-Crypt-RC4 \
+		p5-Digest-Perl-MD5>=0:security/p5-Digest-Perl-MD5
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/textproc/p5-Spreadsheet-Read/Makefile b/textproc/p5-Spreadsheet-Read/Makefile
index b15423a5d94b..7b83cf0f065e 100644
--- a/textproc/p5-Spreadsheet-Read/Makefile
+++ b/textproc/p5-Spreadsheet-Read/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Read the data from a spreadsheet
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-stringy>0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Text-CSV_XS>=0.71:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-Text-CSV>=1.33:${PORTSDIR}/textproc/p5-Text-CSV \
-		p5-Spreadsheet-ReadSXC>=0.20:${PORTSDIR}/textproc/p5-Spreadsheet-ReadSXC \
-		p5-Spreadsheet-ParseExcel>=0.13:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel
+BUILD_DEPENDS=	p5-IO-stringy>0:devel/p5-IO-stringy \
+		p5-Text-CSV_XS>=0.71:textproc/p5-Text-CSV_XS \
+		p5-Text-CSV>=1.33:textproc/p5-Text-CSV \
+		p5-Spreadsheet-ReadSXC>=0.20:textproc/p5-Spreadsheet-ReadSXC \
+		p5-Spreadsheet-ParseExcel>=0.13:textproc/p5-Spreadsheet-ParseExcel
 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 tar:tgz
 USE_PERL5=	configure
diff --git a/textproc/p5-Spreadsheet-ReadSXC/Makefile b/textproc/p5-Spreadsheet-ReadSXC/Makefile
index 7b49de9cbbf3..a75c7cdb555a 100644
--- a/textproc/p5-Spreadsheet-ReadSXC/Makefile
+++ b/textproc/p5-Spreadsheet-ReadSXC/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Extract OpenOffice 1.x spreadsheet data
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
index 15a38e3b2ac0..cede3f4b803f 100644
--- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create an Excel Spreadsheet from XML
 
-BUILD_DEPENDS=	p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
+BUILD_DEPENDS=	p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-Spreadsheet-WriteExcel>=0:textproc/p5-Spreadsheet-WriteExcel
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index 11739386f6dd..c55edad63880 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Write to a cross-platform Excel binary file
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-OLE-Storage_Lite>=0:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Date-Calc>=0:devel/p5-Date-Calc \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/textproc/p5-Spreadsheet-XLSX/Makefile b/textproc/p5-Spreadsheet-XLSX/Makefile
index 57e3803bbfd5..cfef4b2c4f20 100644
--- a/textproc/p5-Spreadsheet-XLSX/Makefile
+++ b/textproc/p5-Spreadsheet-XLSX/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-withoutworldwriteables
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl extension for reading MS Excel 2007 files
 
-BUILD_DEPENDS=	p5-Spreadsheet-ParseExcel>0:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
-		p5-Archive-Zip>0:${PORTSDIR}/archivers/p5-Archive-Zip
+BUILD_DEPENDS=	p5-Spreadsheet-ParseExcel>0:textproc/p5-Spreadsheet-ParseExcel \
+		p5-Archive-Zip>0:archivers/p5-Archive-Zip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/p5-String-Flogger/Makefile b/textproc/p5-String-Flogger/Makefile
index 1b2622f8d672..4e6ec713ae30 100644
--- a/textproc/p5-String-Flogger/Makefile
+++ b/textproc/p5-String-Flogger/Makefile
@@ -15,11 +15,11 @@ COMMENT=	String munging for loggers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Params-Util>0:${PORTSDIR}/devel/p5-Params-Util \
-		p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
+BUILD_DEPENDS=	p5-Params-Util>0:devel/p5-Params-Util \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter \
+		p5-JSON>0:converters/p5-JSON
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-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/textproc/p5-String-Fraction/Makefile b/textproc/p5-String-Fraction/Makefile
index ebf09bb29b0e..be0d9655fef6 100644
--- a/textproc/p5-String-Fraction/Makefile
+++ b/textproc/p5-String-Fraction/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convert fractions into Unicode chars
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Fraction>=0.40:${PORTSDIR}/textproc/p5-HTML-Fraction
+BUILD_DEPENDS=	p5-HTML-Fraction>=0.40:textproc/p5-HTML-Fraction
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-String-Koremutake/Makefile b/textproc/p5-String-Koremutake/Makefile
index 22be9ac3fa8f..b72c8393e37b 100644
--- a/textproc/p5-String-Koremutake/Makefile
+++ b/textproc/p5-String-Koremutake/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Convert to/from Koremutake Memorable Random Strings
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-Error>=0:lang/p5-Error \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-String-Print/Makefile b/textproc/p5-String-Print/Makefile
index f8320657fa79..bf2ad045d80c 100644
--- a/textproc/p5-String-Print/Makefile
+++ b/textproc/p5-String-Print/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Alternative of printf
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Unicode-LineBreak>=0:${PORTSDIR}/textproc/p5-Unicode-LineBreak
+BUILD_DEPENDS=	p5-Unicode-LineBreak>=0:textproc/p5-Unicode-LineBreak
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-String-RewritePrefix/Makefile b/textproc/p5-String-RewritePrefix/Makefile
index e2b93dcf87f2..1104a05258ba 100644
--- a/textproc/p5-String-RewritePrefix/Makefile
+++ b/textproc/p5-String-RewritePrefix/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Rewrite strings based on a set of known prefixes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Sub-Exporter>0:${PORTSDIR}/devel/p5-Sub-Exporter
+TEST_DEPENDS=	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-String-ShowDiff/Makefile b/textproc/p5-String-ShowDiff/Makefile
index 8d6bee324b61..5d679a1b8960 100644
--- a/textproc/p5-String-ShowDiff/Makefile
+++ b/textproc/p5-String-ShowDiff/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to help visualize differences between strings
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-Term-ANSIColor>=0:devel/p5-Term-ANSIColor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-String-ToIdentifier-EN/Makefile b/textproc/p5-String-ToIdentifier-EN/Makefile
index 3cee70adfd44..9256726b0c2a 100644
--- a/textproc/p5-String-ToIdentifier-EN/Makefile
+++ b/textproc/p5-String-ToIdentifier-EN/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Convert Strings to English Program Identifiers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-EN-Inflect-Phrase>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Phrase \
-		p5-Text-Unidecode>=0:${PORTSDIR}/converters/p5-Text-Unidecode \
-		p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS=	p5-Lingua-EN-Inflect-Phrase>=0:textproc/p5-Lingua-EN-Inflect-Phrase \
+		p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
+		p5-namespace-clean>=0:devel/p5-namespace-clean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-String-Truncate/Makefile b/textproc/p5-String-Truncate/Makefile
index 3db31410280b..a7d8be33d426 100644
--- a/textproc/p5-String-Truncate/Makefile
+++ b/textproc/p5-String-Truncate/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Module for when strings are too long to be displayed in...
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Sub-Exporter>=0.953:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Sub-Install>=0.03:${PORTSDIR}/devel/p5-Sub-Install
+RUN_DEPENDS=	p5-Sub-Exporter>=0.953:devel/p5-Sub-Exporter \
+		p5-Sub-Install>=0.03:devel/p5-Sub-Install
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-String-Urandom/Makefile b/textproc/p5-String-Urandom/Makefile
index 8465ad964302..6e0b50e6fe0f 100644
--- a/textproc/p5-String-Urandom/Makefile
+++ b/textproc/p5-String-Urandom/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Params-Validate>0:${PORTSDIR}/devel/p5-Params-Validate
+	p5-Params-Validate>0:devel/p5-Params-Validate
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-String-Util/Makefile b/textproc/p5-String-Util/Makefile
index d70161453c09..4410468d5adc 100644
--- a/textproc/p5-String-Util/Makefile
+++ b/textproc/p5-String-Util/Makefile
@@ -13,7 +13,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Number-Misc>=0:${PORTSDIR}/math/p5-Number-Misc
+	p5-Number-Misc>=0:math/p5-Number-Misc
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
index 433ce11fe234..9378ce8565c3 100644
--- a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
+++ b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Port of the syntax highlight engine of the Kate texteditor
 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 shebangfix
 SHEBANG_FILES=	bin/hlansi.pl bin/hlhtml.pl
diff --git a/textproc/p5-TeX-Encode/Makefile b/textproc/p5-TeX-Encode/Makefile
index f835ab0aadcd..ac24436e422a 100644
--- a/textproc/p5-TeX-Encode/Makefile
+++ b/textproc/p5-TeX-Encode/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Encode/decode Perl utf-8 strings into TeX
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.35:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=3.35:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Template-Declare/Makefile b/textproc/p5-Template-Declare/Makefile
index 1b395702656d..88b06079a07b 100644
--- a/textproc/p5-Template-Declare/Makefile
+++ b/textproc/p5-Template-Declare/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Perlish declarative templates
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-COMMON_DEPENDS=	p5-Test-Warn>=0.11:${PORTSDIR}/devel/p5-Test-Warn \
-		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-Data-Inheritable>0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-HTML-Lint>0:${PORTSDIR}/www/p5-HTML-Lint \
-		p5-Class-ISA>0:${PORTSDIR}/devel/p5-Class-ISA \
-		p5-String-BufferStack>=1.10:${PORTSDIR}/textproc/p5-String-BufferStack
+COMMON_DEPENDS=	p5-Test-Warn>=0.11:devel/p5-Test-Warn \
+		p5-Class-Accessor>0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>0:devel/p5-Class-Data-Inheritable \
+		p5-HTML-Lint>0:www/p5-HTML-Lint \
+		p5-Class-ISA>0:devel/p5-Class-ISA \
+		p5-String-BufferStack>=1.10:textproc/p5-String-BufferStack
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/textproc/p5-Template-Extract/Makefile b/textproc/p5-Template-Extract/Makefile
index 3c899d5b5a6a..2dbdfbaf6635 100644
--- a/textproc/p5-Template-Extract/Makefile
+++ b/textproc/p5-Template-Extract/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Use TT2 syntax to extract data from documents
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Template-Magic/Makefile b/textproc/p5-Template-Magic/Makefile
index 1d686c9b70bd..7d6b9c9671a8 100644
--- a/textproc/p5-Template-Magic/Makefile
+++ b/textproc/p5-Template-Magic/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Module with magic merger of runtime values with templates
 
-BUILD_DEPENDS=	p5-IO-Util>=0:${PORTSDIR}/devel/p5-IO-Util \
-		p5-OOTools>=0:${PORTSDIR}/devel/p5-OOTools \
-		p5-HTML-TableTiler>=0:${PORTSDIR}/www/p5-HTML-TableTiler
+BUILD_DEPENDS=	p5-IO-Util>=0:devel/p5-IO-Util \
+		p5-OOTools>=0:devel/p5-OOTools \
+		p5-HTML-TableTiler>=0:www/p5-HTML-TableTiler
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Template-Plugin-Autoformat/Makefile b/textproc/p5-Template-Plugin-Autoformat/Makefile
index 32ccb9a1ca8b..153750f44395 100644
--- a/textproc/p5-Template-Plugin-Autoformat/Makefile
+++ b/textproc/p5-Template-Plugin-Autoformat/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Template Toolkit interface to Text::Autoformat module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-Autoformat>0:${PORTSDIR}/textproc/p5-Text-Autoformat
-BUILD_DEPENDS=	p5-Template-Toolkit>=2.22:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Text-Autoformat>0:${PORTSDIR}/textproc/p5-Text-Autoformat
+RUN_DEPENDS=	p5-Template-Toolkit>=2.22:www/p5-Template-Toolkit \
+		p5-Text-Autoformat>0:textproc/p5-Text-Autoformat
+BUILD_DEPENDS=	p5-Template-Toolkit>=2.22:www/p5-Template-Toolkit \
+		p5-Text-Autoformat>0:textproc/p5-Text-Autoformat
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Template-Plugin-CSV/Makefile b/textproc/p5-Template-Plugin-CSV/Makefile
index cd819f2f580e..3dcc0d38debe 100644
--- a/textproc/p5-Template-Plugin-CSV/Makefile
+++ b/textproc/p5-Template-Plugin-CSV/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dgeo@centrale-marseille.fr
 COMMENT=	Template::Plugin::CSV - Plugin for generating CSV
 
-BUILD_DEPENDS=	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
index 038a018fb1be..d97a6924a959 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	CSS::Minifier::XS filter for Template Toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CSS-Minifier-XS>=0:${PORTSDIR}/textproc/p5-CSS-Minifier-XS \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-CSS-Minifier-XS>=0:textproc/p5-CSS-Minifier-XS \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
index e2bd245c0ed8..e8ec93accde8 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-CSS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	CSS::Minifier filter for Template Toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CSS-Minifier>=0:${PORTSDIR}/textproc/p5-CSS-Minifier \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-CSS-Minifier>=0:textproc/p5-CSS-Minifier \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
index a795039f4ca2..d98a1e0ad6d0 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript-XS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	JavaScript::Minifier::XS filter for Template Toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JavaScript-Minifier-XS>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier-XS \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-JavaScript-Minifier-XS>=0:textproc/p5-JavaScript-Minifier-XS \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
index df6aa4b2dc02..bd58e1d06525 100644
--- a/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
+++ b/textproc/p5-Template-Plugin-Filter-Minify-JavaScript/Makefile
@@ -14,8 +14,8 @@ COMMENT=	JavaScript::Minifier filter for Template Toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-JavaScript-Minifier>=0:${PORTSDIR}/textproc/p5-JavaScript-Minifier \
-		p5-Template-Toolkit>=2:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-JavaScript-Minifier>=0:textproc/p5-JavaScript-Minifier \
+		p5-Template-Toolkit>=2:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile b/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
index 036e352663ca..ce8a554b8b12 100644
--- a/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
+++ b/textproc/p5-Template-Plugin-HTML-SuperForm/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface Template Toolkit to Lingua::EN::Inflect module
 
-BUILD_DEPENDS=	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-HTML-SuperForm>0:${PORTSDIR}/textproc/p5-HTML-SuperForm
+BUILD_DEPENDS=	p5-Template-Toolkit>0:www/p5-Template-Toolkit \
+		p5-HTML-SuperForm>0:textproc/p5-HTML-SuperForm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
index 0b7220b325ee..f73d5a2f0fb8 100644
--- a/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
+++ b/textproc/p5-Template-Plugin-Lingua-EN-Inflect/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Interface Template Toolkit to Lingua::EN::Inflect module
 
-BUILD_DEPENDS=	p5-Lingua-EN-Inflect>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Lingua-EN-Inflect>=0:textproc/p5-Lingua-EN-Inflect \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Template-Plugin-XML-Escape/Makefile b/textproc/p5-Template-Plugin-XML-Escape/Makefile
index 07952866814b..56c10fdfbd7a 100644
--- a/textproc/p5-Template-Plugin-XML-Escape/Makefile
+++ b/textproc/p5-Template-Plugin-XML-Escape/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	simarg@gmail.com
 COMMENT=	Escape variables to suit being placed into XML
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=2.20:${PORTSDIR}/www/p5-Template-Toolkit
+BUILD_DEPENDS=	p5-Template-Toolkit>=2.20:www/p5-Template-Toolkit
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Template-Semantic/Makefile b/textproc/p5-Template-Semantic/Makefile
index 8283fab132f3..a41fd089b7c6 100644
--- a/textproc/p5-Template-Semantic/Makefile
+++ b/textproc/p5-Template-Semantic/Makefile
@@ -14,11 +14,11 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-HTML-Selector-XPath>=0.09:${PORTSDIR}/www/p5-HTML-Selector-XPath \
-	p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML
+	p5-HTML-Selector-XPath>=0.09:www/p5-HTML-Selector-XPath \
+	p5-XML-LibXML>=1.69:textproc/p5-XML-LibXML
 BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Text-Pipe>0:${PORTSDIR}/textproc/p5-Text-Pipe
+	p5-Text-Pipe>0:textproc/p5-Text-Pipe
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Term-QRCode/Makefile b/textproc/p5-Term-QRCode/Makefile
index 39438a6635f6..c62b2cb79afa 100644
--- a/textproc/p5-Term-QRCode/Makefile
+++ b/textproc/p5-Term-QRCode/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Generate QR Code on Terminal
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	libqrencode>=2.0.0:${PORTSDIR}/graphics/libqrencode \
-		p5-Text-QRCode>0:${PORTSDIR}/textproc/p5-Text-QRCode
+BUILD_DEPENDS=	libqrencode>=2.0.0:graphics/libqrencode \
+		p5-Text-QRCode>0:textproc/p5-Text-QRCode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Test-Groonga/Makefile b/textproc/p5-Test-Groonga/Makefile
index 800cda9e32c4..eca32ea9b9cb 100644
--- a/textproc/p5-Test-Groonga/Makefile
+++ b/textproc/p5-Test-Groonga/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-	p5-Test-TCP>=1.1:${PORTSDIR}/devel/p5-Test-TCP
+	p5-File-Which>=0:sysutils/p5-File-Which \
+	p5-Test-TCP>=1.1:devel/p5-Test-TCP
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Test-Perl-Critic/Makefile b/textproc/p5-Test-Perl-Critic/Makefile
index 9cfad2036211..4b729c27689a 100644
--- a/textproc/p5-Test-Perl-Critic/Makefile
+++ b/textproc/p5-Test-Perl-Critic/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Perl-Critic \
-		p5-MCE>=1.52:${PORTSDIR}/devel/p5-MCE
+BUILD_DEPENDS=	p5-Perl-Critic>=0:textproc/p5-Perl-Critic \
+		p5-MCE>=1.52:devel/p5-MCE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Text-Aligner/Makefile b/textproc/p5-Text-Aligner/Makefile
index 5b6b4357aadd..fc5d041cfe06 100644
--- a/textproc/p5-Text-Aligner/Makefile
+++ b/textproc/p5-Text-Aligner/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Align text in columns
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	p5-Term-ANSIColor>=2.02:${PORTSDIR}/devel/p5-Term-ANSIColor
+BUILD_DEPENDS=	p5-Term-ANSIColor>=2.02:devel/p5-Term-ANSIColor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Aspell/Makefile b/textproc/p5-Text-Aspell/Makefile
index 1c638242f4f5..81d308c38fe1 100644
--- a/textproc/p5-Text-Aspell/Makefile
+++ b/textproc/p5-Text-Aspell/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the GNU Aspell library
 
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS=	libaspell.so:textproc/aspell
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 6a71f723383f..10c7c0e191c5 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Automatic and manual text wrapping and reformating formatting
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Reform>=1.11:${PORTSDIR}/textproc/p5-Text-Reform
+BUILD_DEPENDS=	p5-Text-Reform>=1.11:textproc/p5-Text-Reform
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 343954aa9a4b..052359d4b9dd 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Manipulate BibTeX files from perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-AutoConf>=0.16:${PORTSDIR}/devel/p5-Config-AutoConf \
-		p5-ExtUtils-LibBuilder>=0.02:${PORTSDIR}/devel/p5-ExtUtils-LibBuilder
-TEST_DEPENDS=	p5-Capture-Tiny>=0.06:${PORTSDIR}/devel/p5-Capture-Tiny
+BUILD_DEPENDS=	p5-Config-AutoConf>=0.16:devel/p5-Config-AutoConf \
+		p5-ExtUtils-LibBuilder>=0.02:devel/p5-ExtUtils-LibBuilder
+TEST_DEPENDS=	p5-Capture-Tiny>=0.06:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Text-CSV-Encoded/Makefile b/textproc/p5-Text-CSV-Encoded/Makefile
index 4b65d533fe21..26b6925f5387 100644
--- a/textproc/p5-Text-CSV-Encoded/Makefile
+++ b/textproc/p5-Text-CSV-Encoded/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl module for Encoding aware CVS files parsing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Harness>=0:${PORTSDIR}/devel/p5-Test-Harness \
-		p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV
+BUILD_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple \
+		p5-Test-Harness>=0:devel/p5-Test-Harness \
+		p5-Text-CSV>=0:textproc/p5-Text-CSV
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Text-CSV-Hashify/Makefile b/textproc/p5-Text-CSV-Hashify/Makefile
index 7fb6e61e6a4a..4130ba860b25 100644
--- a/textproc/p5-Text-CSV-Hashify/Makefile
+++ b/textproc/p5-Text-CSV-Hashify/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Composition and decomposition of comma-separated values into hashes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV
+BUILD_DEPENDS=	p5-Text-CSV>=0:textproc/p5-Text-CSV
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-CSV-Simple/Makefile b/textproc/p5-Text-CSV-Simple/Makefile
index 4647f98dbab8..44ceb6517616 100644
--- a/textproc/p5-Text-CSV-Simple/Makefile
+++ b/textproc/p5-Text-CSV-Simple/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module for Simpler parsing of CSV files
 
-BUILD_DEPENDS=	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Class-Trigger>=0:${PORTSDIR}/devel/p5-Class-Trigger
+BUILD_DEPENDS=	p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Class-Trigger>=0:devel/p5-Class-Trigger
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 08b5419697e0..5440a7717dc4 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Comma-separated values manipulation routines
 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 tar:tgz
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Capitalize/Makefile b/textproc/p5-Text-Capitalize/Makefile
index 033f4c33f6aa..294b1f3acba2 100644
--- a/textproc/p5-Text-Capitalize/Makefile
+++ b/textproc/p5-Text-Capitalize/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Capitalize strings ("to WORK AS titles" becomes "To Work as Titles")
 
-TEST_DEPENDS=	p5-PerlIO-locale>=0:${PORTSDIR}/devel/p5-PerlIO-locale
+TEST_DEPENDS=	p5-PerlIO-locale>=0:devel/p5-PerlIO-locale
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-ClearSilver/Makefile b/textproc/p5-Text-ClearSilver/Makefile
index 11b26ca42e45..e1e6ad5bf0a5 100644
--- a/textproc/p5-Text-ClearSilver/Makefile
+++ b/textproc/p5-Text-ClearSilver/Makefile
@@ -14,8 +14,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Mouse>0:devel/p5-Mouse
 
 USES=		perl5 gmake
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Colorizer/Makefile b/textproc/p5-Text-Colorizer/Makefile
index 4a1da959cd7b..841f1efec3af 100644
--- a/textproc/p5-Text-Colorizer/Makefile
+++ b/textproc/p5-Text-Colorizer/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Create colored text from text and color description
 LICENSE=	ART20 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Readonly>=0:devel/p5-Readonly \
+		p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Context/Makefile b/textproc/p5-Text-Context/Makefile
index 7c3a7a42d45b..aca200c50ad1 100644
--- a/textproc/p5-Text-Context/Makefile
+++ b/textproc/p5-Text-Context/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Handle highlighting search result context snippets
 
-BUILD_DEPENDS=	p5-Text-Context-EitherSide>=1.1:${PORTSDIR}/textproc/p5-Text-Context-EitherSide \
-		p5-UNIVERSAL-require>=0.03:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Text-Context-EitherSide>=1.1:textproc/p5-Text-Context-EitherSide \
+		p5-UNIVERSAL-require>=0.03:devel/p5-UNIVERSAL-require \
+		p5-HTML-Parser>0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Decorator/Makefile b/textproc/p5-Text-Decorator/Makefile
index a50f6dded9c9..38921f03c757 100644
--- a/textproc/p5-Text-Decorator/Makefile
+++ b/textproc/p5-Text-Decorator/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Apply a chain of filters to text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find
+BUILD_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-URI-Find>=0:textproc/p5-URI-Find
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Diff-HTML/Makefile b/textproc/p5-Text-Diff-HTML/Makefile
index b06a463ff786..dc925ada9373 100644
--- a/textproc/p5-Text-Diff-HTML/Makefile
+++ b/textproc/p5-Text-Diff-HTML/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Text::Diff::HTML - XHTML format for Text::Diff::Unified
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Text-Diff>=0:textproc/p5-Text-Diff \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index 51a8c0d6a427..8f58c43eac20 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Text::Diff - Perform diffs on files and record sets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-COMMON_DEPENDS=	p5-Algorithm-Diff>=1.19:${PORTSDIR}/devel/p5-Algorithm-Diff
+COMMON_DEPENDS=	p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 
diff --git a/textproc/p5-Text-Diff3/Makefile b/textproc/p5-Text-Diff3/Makefile
index 9b839a42e441..93197213c59e 100644
--- a/textproc/p5-Text-Diff3/Makefile
+++ b/textproc/p5-Text-Diff3/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Compute three-way differences between texts
 
-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/textproc/p5-Text-Emoticon-GoogleTalk/Makefile b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
index a1fb769ac103..78d2dfff3c45 100644
--- a/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
+++ b/textproc/p5-Text-Emoticon-GoogleTalk/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Emoticon filter of GoogleTalk
 
-BUILD_DEPENDS=	p5-Text-Emoticon>=0:${PORTSDIR}/textproc/p5-Text-Emoticon
+BUILD_DEPENDS=	p5-Text-Emoticon>=0:textproc/p5-Text-Emoticon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Emoticon-MSN/Makefile b/textproc/p5-Text-Emoticon-MSN/Makefile
index 802e265d706f..a3cf72d27468 100644
--- a/textproc/p5-Text-Emoticon-MSN/Makefile
+++ b/textproc/p5-Text-Emoticon-MSN/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Emoticon filter of MSN Messenger
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Emoticon>=0.02:${PORTSDIR}/textproc/p5-Text-Emoticon
+BUILD_DEPENDS=	p5-Text-Emoticon>=0.02:textproc/p5-Text-Emoticon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Emoticon/Makefile b/textproc/p5-Text-Emoticon/Makefile
index 5aecfd32adfa..51255c43913b 100644
--- a/textproc/p5-Text-Emoticon/Makefile
+++ b/textproc/p5-Text-Emoticon/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Factory class for Yahoo! and MSN emoticons
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-EtText/Makefile b/textproc/p5-Text-EtText/Makefile
index 8a0976a54fa1..2b87cef4f17c 100644
--- a/textproc/p5-Text-EtText/Makefile
+++ b/textproc/p5-Text-EtText/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple plain-text to HTML converter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Extract-Word/Makefile b/textproc/p5-Text-Extract-Word/Makefile
index 51eee6609b61..c139963852a1 100644
--- a/textproc/p5-Text-Extract-Word/Makefile
+++ b/textproc/p5-Text-Extract-Word/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple module for extracting the text from a Microsoft Word file
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-OLE-Storage_Lite>0:${PORTSDIR}/devel/p5-OLE-Storage_Lite
+BUILD_DEPENDS=	p5-OLE-Storage_Lite>0:devel/p5-OLE-Storage_Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 51c01bb93511..61c8ccb56c77 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Chains multiple Text::Filter objects and runs them in sequence
 
-BUILD_DEPENDS=	p5-Text-Filter>=0:${PORTSDIR}/textproc/p5-Text-Filter
+BUILD_DEPENDS=	p5-Text-Filter>=0:textproc/p5-Text-Filter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 6dc6ba4c24b1..1e5ff85f5ea8 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Various niceties for p5-Text-FixedLength lovers
 
-BUILD_DEPENDS=	p5-Text-FixedLength>=0:${PORTSDIR}/textproc/p5-Text-FixedLength
+BUILD_DEPENDS=	p5-Text-FixedLength>=0:textproc/p5-Text-FixedLength
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Flow/Makefile b/textproc/p5-Text-Flow/Makefile
index 0963e5eb70ce..fcd6c035c441 100644
--- a/textproc/p5-Text-Flow/Makefile
+++ b/textproc/p5-Text-Flow/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Flexible text flowing and word wrapping for not just ASCII output
 
-BUILD_DEPENDS=	p5-Moose>=0.45:${PORTSDIR}/devel/p5-Moose
+BUILD_DEPENDS=	p5-Moose>=0.45:devel/p5-Moose
 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/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index 4fc61bd70c64..4f517552f078 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Text graphics rendering toolkit
 
-BUILD_DEPENDS=	p5-Text-Wrapper>=0:${PORTSDIR}/textproc/p5-Text-Wrapper
+BUILD_DEPENDS=	p5-Text-Wrapper>=0:textproc/p5-Text-Wrapper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Haml/Makefile b/textproc/p5-Text-Haml/Makefile
index 2fcda4d472da..81e9e38be0fe 100644
--- a/textproc/p5-Text-Haml/Makefile
+++ b/textproc/p5-Text-Haml/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for Haml parser
 
-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/textproc/p5-Text-Hatena/Makefile b/textproc/p5-Text-Hatena/Makefile
index 01374836a5da..ed4d2c1afbd2 100644
--- a/textproc/p5-Text-Hatena/Makefile
+++ b/textproc/p5-Text-Hatena/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for formatting text with Hatena Style
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Regexp-Assemble>=0.28:${PORTSDIR}/devel/p5-Regexp-Assemble
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
+		p5-Regexp-Assemble>=0.28:devel/p5-Regexp-Assemble
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-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/textproc/p5-Text-LTSV/Makefile b/textproc/p5-Text-LTSV/Makefile
index 4c2681d5e4e0..a771ddce19b9 100644
--- a/textproc/p5-Text-LTSV/Makefile
+++ b/textproc/p5-Text-LTSV/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Project-Libs>0:${PORTSDIR}/devel/p5-Project-Libs \
-	p5-Tie-IxHash>0:${PORTSDIR}/devel/p5-Tie-IxHash \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-YAML-Tiny-Color>0:${PORTSDIR}/textproc/p5-YAML-Tiny-Color
+	p5-Project-Libs>0:devel/p5-Project-Libs \
+	p5-Tie-IxHash>0:devel/p5-Tie-IxHash \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-YAML-Tiny-Color>0:textproc/p5-YAML-Tiny-Color
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Language-Guess/Makefile b/textproc/p5-Text-Language-Guess/Makefile
index b48cb045c808..b1182f666439 100644
--- a/textproc/p5-Text-Language-Guess/Makefile
+++ b/textproc/p5-Text-Language-Guess/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Trained module to guess a document's language
 
-BUILD_DEPENDS=	p5-Log-Log4perl>=1.0:${PORTSDIR}/devel/p5-Log-Log4perl \
-		p5-Text-ExtractWords>=0:${PORTSDIR}/textproc/p5-Text-ExtractWords \
-		p5-Lingua-StopWords>=0:${PORTSDIR}/textproc/p5-Lingua-StopWords
+BUILD_DEPENDS=	p5-Log-Log4perl>=1.0:devel/p5-Log-Log4perl \
+		p5-Text-ExtractWords>=0:textproc/p5-Text-ExtractWords \
+		p5-Lingua-StopWords>=0:textproc/p5-Lingua-StopWords
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Markdown/Makefile b/textproc/p5-Text-Markdown/Makefile
index 014175e0a178..45ad9b21c6c3 100644
--- a/textproc/p5-Text-Markdown/Makefile
+++ b/textproc/p5-Text-Markdown/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Markdown Perl5 module
 
 LICENSE=	BSD3CLAUSE
 
-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-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-MicroMason/Makefile b/textproc/p5-Text-MicroMason/Makefile
index ea2d0866a336..965e3d23e92c 100644
--- a/textproc/p5-Text-MicroMason/Makefile
+++ b/textproc/p5-Text-MicroMason/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-MixinFactory>=0.9:${PORTSDIR}/devel/p5-Class-MixinFactory
+	p5-Class-MixinFactory>=0.9:devel/p5-Class-MixinFactory
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-MicroTemplate-Extended/Makefile b/textproc/p5-Text-MicroTemplate-Extended/Makefile
index 2f7b997a8a09..8682e4f260ad 100644
--- a/textproc/p5-Text-MicroTemplate-Extended/Makefile
+++ b/textproc/p5-Text-MicroTemplate-Extended/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Text-MicroTemplate>=0.18:${PORTSDIR}/textproc/p5-Text-MicroTemplate
+	p5-Text-MicroTemplate>=0.18:textproc/p5-Text-MicroTemplate
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-MicroTemplate/Makefile b/textproc/p5-Text-MicroTemplate/Makefile
index 1c80f21bd5f5..304edfa80522 100644
--- a/textproc/p5-Text-MicroTemplate/Makefile
+++ b/textproc/p5-Text-MicroTemplate/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension for standalone, fast and intelligent template engine
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-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/textproc/p5-Text-MultiMarkdown/Makefile b/textproc/p5-Text-MultiMarkdown/Makefile
index 6e12f834bf6b..606049a60a5c 100644
--- a/textproc/p5-Text-MultiMarkdown/Makefile
+++ b/textproc/p5-Text-MultiMarkdown/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Convert MultiMarkdown syntax to (X)HTML
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	p5-Text-Markdown>=1.0.26:${PORTSDIR}/textproc/p5-Text-Markdown
-RUN_DEPENDS:=	p5-HTML-Parser>0:${PORTSDIR}/www/p5-HTML-Parser \
+BUILD_DEPENDS=	p5-Text-Markdown>=1.0.26:textproc/p5-Text-Markdown
+RUN_DEPENDS:=	p5-HTML-Parser>0:www/p5-HTML-Parser \
 		${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Ngram/Makefile b/textproc/p5-Text-Ngram/Makefile
index dee856d82774..6e7b389cdee8 100644
--- a/textproc/p5-Text-Ngram/Makefile
+++ b/textproc/p5-Text-Ngram/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for n-gram analysis
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Unicode-CaseFold>=1.00:${PORTSDIR}/textproc/p5-Unicode-CaseFold
+BUILD_DEPENDS=	p5-Unicode-CaseFold>=1.00:textproc/p5-Unicode-CaseFold
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Padding/Makefile b/textproc/p5-Text-Padding/Makefile
index 539413f4fd59..5fd555d7ae9a 100644
--- a/textproc/p5-Text-Padding/Makefile
+++ b/textproc/p5-Text-Padding/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple way of formatting a text
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar \
-		p5-Text-Truncate>=0:${PORTSDIR}/textproc/p5-Text-Truncate
+BUILD_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
+		p5-Text-Truncate>=0:textproc/p5-Text-Truncate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Text-ParagraphDiff/Makefile b/textproc/p5-Text-ParagraphDiff/Makefile
index b46034522ad6..08eca2c44fae 100644
--- a/textproc/p5-Text-ParagraphDiff/Makefile
+++ b/textproc/p5-Text-ParagraphDiff/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Visual difference for paragraphed text
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/textproc/p5-Text-Patch/Makefile b/textproc/p5-Text-Patch/Makefile
index 015f751f5c57..30f7f12f2e87 100644
--- a/textproc/p5-Text-Patch/Makefile
+++ b/textproc/p5-Text-Patch/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to patch text with given patch
 
-RUN_DEPENDS=	p5-Text-Diff>0:${PORTSDIR}/textproc/p5-Text-Diff
+RUN_DEPENDS=	p5-Text-Diff>0:textproc/p5-Text-Diff
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Pipe/Makefile b/textproc/p5-Text-Pipe/Makefile
index 452200dafefa..b8b2bbb5a5e8 100644
--- a/textproc/p5-Text-Pipe/Makefile
+++ b/textproc/p5-Text-Pipe/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Class-Accessor-Complex>0:${PORTSDIR}/devel/p5-Class-Accessor-Complex \
-	p5-Class-Accessor-Constructor>0:${PORTSDIR}/devel/p5-Class-Accessor-Constructor \
-	p5-Sub-Name>0:${PORTSDIR}/devel/p5-Sub-Name \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+	p5-Class-Accessor-Complex>0:devel/p5-Class-Accessor-Complex \
+	p5-Class-Accessor-Constructor>0:devel/p5-Class-Accessor-Constructor \
+	p5-Sub-Name>0:devel/p5-Sub-Name \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Prefix-XS/Makefile b/textproc/p5-Text-Prefix-XS/Makefile
index 57d6268b5b4f..9d726e4adf8e 100644
--- a/textproc/p5-Text-Prefix-XS/Makefile
+++ b/textproc/p5-Text-Prefix-XS/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Fast prefix searching
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=1:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-Digest-SHA1>=1:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.108:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0.108:devel/p5-Test-Deep
 
 USE_PERL5=	configure
 USES=		perl5 shebangfix
diff --git a/textproc/p5-Text-QRCode/Makefile b/textproc/p5-Text-QRCode/Makefile
index 3d0c5475e528..55bc3568859e 100644
--- a/textproc/p5-Text-QRCode/Makefile
+++ b/textproc/p5-Text-QRCode/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Generate text based QR Code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 USES=		perl5 pkgconfig
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Quote/Makefile b/textproc/p5-Text-Quote/Makefile
index b436f66afc05..f0861432788c 100644
--- a/textproc/p5-Text-Quote/Makefile
+++ b/textproc/p5-Text-Quote/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Quotes strings as required for perl to eval them back correctly
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Carp-Assert>=0.13:${PORTSDIR}/devel/p5-Carp-Assert
+BUILD_DEPENDS=	p5-Carp-Assert>=0.13:devel/p5-Carp-Assert
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Quoted/Makefile b/textproc/p5-Text-Quoted/Makefile
index af1571c1fc67..03a531ba61cf 100644
--- a/textproc/p5-Text-Quoted/Makefile
+++ b/textproc/p5-Text-Quoted/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Text::Quoted - Extract the structure of a quoted mail message
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-Autoformat>=0:${PORTSDIR}/textproc/p5-Text-Autoformat
+BUILD_DEPENDS=	p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index fb8593f4d2e6..e9f29c79af78 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Read record-oriented files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Pod-Markdown>=0:${PORTSDIR}/textproc/p5-Pod-Markdown \
-		p5-Pod-Readme>=0:${PORTSDIR}/textproc/p5-Pod-Readme \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-Text-Autoformat>=0:${PORTSDIR}/textproc/p5-Text-Autoformat \
-		p5-Text-TabularDisplay>=0:${PORTSDIR}/textproc/p5-Text-TabularDisplay
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Pod-Markdown>=0:textproc/p5-Pod-Markdown \
+		p5-Pod-Readme>=0:textproc/p5-Pod-Readme \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-Text-Autoformat>=0:textproc/p5-Text-Autoformat \
+		p5-Text-TabularDisplay>=0:textproc/p5-Text-TabularDisplay
 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/textproc/p5-Text-Report/Makefile b/textproc/p5-Text-Report/Makefile
index ee218f0e38a0..1cd7dfa77637 100644
--- a/textproc/p5-Text-Report/Makefile
+++ b/textproc/p5-Text-Report/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	For generating mixed columnar formatted reports and report templates
 
-RUN_DEPENDS=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS=	p5-Test-Simple>=0:devel/p5-Test-Simple
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Sass/Makefile b/textproc/p5-Text-Sass/Makefile
index c61201306d46..cb32ca2c4863 100644
--- a/textproc/p5-Text-Sass/Makefile
+++ b/textproc/p5-Text-Sass/Makefile
@@ -15,10 +15,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-	p5-Convert-Color>0:${PORTSDIR}/graphics/p5-Convert-Color
+	p5-Readonly>=1.03:devel/p5-Readonly \
+	p5-Convert-Color>0:graphics/p5-Convert-Color
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Try-Tiny>0:lang/p5-Try-Tiny
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Text-SimpleTable-AutoWidth/Makefile b/textproc/p5-Text-SimpleTable-AutoWidth/Makefile
index 097fa94f2827..e543fc8497d0 100644
--- a/textproc/p5-Text-SimpleTable-AutoWidth/Makefile
+++ b/textproc/p5-Text-SimpleTable-AutoWidth/Makefile
@@ -13,8 +13,8 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Moo>0:${PORTSDIR}/devel/p5-Moo \
-	p5-Text-SimpleTable>0:${PORTSDIR}/textproc/p5-Text-SimpleTable
+	p5-Moo>0:devel/p5-Moo \
+	p5-Text-SimpleTable>0:textproc/p5-Text-SimpleTable
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-SpellChecker-GUI/Makefile b/textproc/p5-Text-SpellChecker-GUI/Makefile
index 8cfbd424b4cc..7136298c3265 100644
--- a/textproc/p5-Text-SpellChecker-GUI/Makefile
+++ b/textproc/p5-Text-SpellChecker-GUI/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Implements a user interface to Text::SpellChecker using ZConf::GUI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Curses-UI>=0:${PORTSDIR}/devel/p5-Curses-UI \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		p5-ZConf-GUI>=0:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-Text-SpellChecker>=0:${PORTSDIR}/textproc/p5-Text-SpellChecker
+BUILD_DEPENDS=	p5-Curses-UI>=0:devel/p5-Curses-UI \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		p5-ZConf-GUI>=0:devel/p5-ZConf-GUI \
+		p5-Text-SpellChecker>=0:textproc/p5-Text-SpellChecker
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	bin/curses-textspellchecker bin/textspellchecker
diff --git a/textproc/p5-Text-SpellChecker/Makefile b/textproc/p5-Text-SpellChecker/Makefile
index a4316e7593e9..958c45f8f848 100644
--- a/textproc/p5-Text-SpellChecker/Makefile
+++ b/textproc/p5-Text-SpellChecker/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 OO interface for spell-checking a block of text
 
-RUN_DEPENDS=	p5-Text-Aspell>=0:${PORTSDIR}/textproc/p5-Text-Aspell
+RUN_DEPENDS=	p5-Text-Aspell>=0:textproc/p5-Text-Aspell
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Table/Makefile b/textproc/p5-Text-Table/Makefile
index 9f8f9b7ec7da..3d5b080573aa 100644
--- a/textproc/p5-Text-Table/Makefile
+++ b/textproc/p5-Text-Table/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Organize Data in Tables
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Text-Aligner>=0.05:${PORTSDIR}/textproc/p5-Text-Aligner
-RUN_DEPENDS=	p5-Text-Aligner>=0.05:${PORTSDIR}/textproc/p5-Text-Aligner
+BUILD_DEPENDS=	p5-Text-Aligner>=0.05:textproc/p5-Text-Aligner
+RUN_DEPENDS=	p5-Text-Aligner>=0.05:textproc/p5-Text-Aligner
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-TestBase/Makefile b/textproc/p5-Text-TestBase/Makefile
index c22137f73d9d..38fafcf0623f 100644
--- a/textproc/p5-Text-TestBase/Makefile
+++ b/textproc/p5-Text-TestBase/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Parser for Test::Base format
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:${PORTSDIR}/devel/p5-Class-Accessor-Lite
+BUILD_DEPENDS=	p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-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/textproc/p5-Text-Trac/Makefile b/textproc/p5-Text-Trac/Makefile
index ced0f65cebb1..384baf83947c 100644
--- a/textproc/p5-Text-Trac/Makefile
+++ b/textproc/p5-Text-Trac/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Perl extension for formatting text with Trac Wiki Style
 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-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-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/textproc/p5-Text-VimColor/Makefile b/textproc/p5-Text-VimColor/Makefile
index ec705cb2fe9b..443fbf52c697 100644
--- a/textproc/p5-Text-VimColor/Makefile
+++ b/textproc/p5-Text-VimColor/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Syntax color text in HTML or XML using Vim
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim
-RUN_DEPENDS=	p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim
+BUILD_DEPENDS=	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		${LOCALBASE}/bin/vim:editors/vim
+RUN_DEPENDS=	p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		${LOCALBASE}/bin/vim:editors/vim
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-WikiFormat/Makefile b/textproc/p5-Text-WikiFormat/Makefile
index 0201745c953e..fb8abbc6eb5c 100644
--- a/textproc/p5-Text-WikiFormat/Makefile
+++ b/textproc/p5-Text-WikiFormat/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Module for translating Wiki formatted text into other formats
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0.01:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=0.01:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-WordDiff/Makefile b/textproc/p5-Text-WordDiff/Makefile
index e8ce0e20fadf..d6a8a6ef39b3 100644
--- a/textproc/p5-Text-WordDiff/Makefile
+++ b/textproc/p5-Text-WordDiff/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Track changes between documents
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-WrapI18N/Makefile b/textproc/p5-Text-WrapI18N/Makefile
index de4ac6b759de..7268feae7630 100644
--- a/textproc/p5-Text-WrapI18N/Makefile
+++ b/textproc/p5-Text-WrapI18N/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Line wrapping module
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Text-CharWidth>=0.02:${PORTSDIR}/textproc/p5-Text-CharWidth
+BUILD_DEPENDS=	p5-Text-CharWidth>=0.02:textproc/p5-Text-CharWidth
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
index 9d79e2a3c3ca..3f277d754c2b 100644
--- a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
+++ b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Text-Xslate>=1.3000:${PORTSDIR}/textproc/p5-Text-Xslate
+	p5-Text-Xslate>=1.3000:textproc/p5-Text-Xslate
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Text-Xslate/Makefile b/textproc/p5-Text-Xslate/Makefile
index cc5ded7e4a56..562e65998728 100644
--- a/textproc/p5-Text-Xslate/Makefile
+++ b/textproc/p5-Text-Xslate/Makefile
@@ -14,8 +14,8 @@ COMMENT=	High performance template engine
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-MessagePack>=0.38:${PORTSDIR}/devel/p5-Data-MessagePack \
-		p5-Mouse>=0.61:${PORTSDIR}/devel/p5-Mouse
+BUILD_DEPENDS=	p5-Data-MessagePack>=0.38:devel/p5-Data-MessagePack \
+		p5-Mouse>=0.61:devel/p5-Mouse
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/textproc/p5-Text-vCard/Makefile b/textproc/p5-Text-vCard/Makefile
index b65ce06e6502..55f704874517 100644
--- a/textproc/p5-Text-vCard/Makefile
+++ b/textproc/p5-Text-vCard/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Package to parse, edit and create multiple vCards (RFC 2426)
 
-BUILD_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Text-vFile-asData>=0:${PORTSDIR}/devel/p5-Text-vFile-asData \
-		p5-Unicode-LineBreak>=0:${PORTSDIR}/textproc/p5-Unicode-LineBreak
+BUILD_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Text-vFile-asData>=0:devel/p5-Text-vFile-asData \
+		p5-Unicode-LineBreak>=0:textproc/p5-Unicode-LineBreak
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Tiffany/Makefile b/textproc/p5-Tiffany/Makefile
index bbda84c971dc..a39f8ca2746a 100644
--- a/textproc/p5-Tiffany/Makefile
+++ b/textproc/p5-Tiffany/Makefile
@@ -12,17 +12,17 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for generic interface for Perl5 template engines
 
 TEST_DEPENDS=	\
-	p5-Test-Requires>0:${PORTSDIR}/devel/p5-Test-Requires \
-	p5-Text-Xslate>0:${PORTSDIR}/textproc/p5-Text-Xslate \
-	p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-HTML-Template>0:${PORTSDIR}/www/p5-HTML-Template \
-	p5-Text-MicroTemplate>0:${PORTSDIR}/textproc/p5-Text-MicroTemplate \
-	p5-Template-Semantic>0:${PORTSDIR}/textproc/p5-Template-Semantic \
-	p5-Text-MicroMason>0:${PORTSDIR}/textproc/p5-Text-MicroMason \
-	p5-Template-Declare>0:${PORTSDIR}/textproc/p5-Template-Declare \
-	p5-Text-MicroTemplate-Extended>0:${PORTSDIR}/textproc/p5-Text-MicroTemplate-Extended \
-	p5-Text-ClearSilver>0:${PORTSDIR}/textproc/p5-Text-ClearSilver \
-	p5-HTML-Template-Pro>0:${PORTSDIR}/www/p5-HTML-Template-Pro
+	p5-Test-Requires>0:devel/p5-Test-Requires \
+	p5-Text-Xslate>0:textproc/p5-Text-Xslate \
+	p5-Template-Toolkit>0:www/p5-Template-Toolkit \
+	p5-HTML-Template>0:www/p5-HTML-Template \
+	p5-Text-MicroTemplate>0:textproc/p5-Text-MicroTemplate \
+	p5-Template-Semantic>0:textproc/p5-Template-Semantic \
+	p5-Text-MicroMason>0:textproc/p5-Text-MicroMason \
+	p5-Template-Declare>0:textproc/p5-Template-Declare \
+	p5-Text-MicroTemplate-Extended>0:textproc/p5-Text-MicroTemplate-Extended \
+	p5-Text-ClearSilver>0:textproc/p5-Text-ClearSilver \
+	p5-HTML-Template-Pro>0:www/p5-HTML-Template-Pro
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-Tk-Pod/Makefile b/textproc/p5-Tk-Pod/Makefile
index 03a99d28df79..e620fe16e65d 100644
--- a/textproc/p5-Tk-Pod/Makefile
+++ b/textproc/p5-Tk-Pod/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Pod browser with hypertext capabilities in a Toplevel widget
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tk>=800.004:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=800.004:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Tk-XMLViewer/Makefile b/textproc/p5-Tk-XMLViewer/Makefile
index 74e0412bcc50..fc69fdf41cf1 100644
--- a/textproc/p5-Tk-XMLViewer/Makefile
+++ b/textproc/p5-Tk-XMLViewer/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk::XMLViewer - Tk widget to display XML
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-Tree-Suffix/Makefile b/textproc/p5-Tree-Suffix/Makefile
index 68b28c3076b0..1bc127cfb3f5 100644
--- a/textproc/p5-Tree-Suffix/Makefile
+++ b/textproc/p5-Tree-Suffix/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl interface to the libstree library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckLib>=0:${PORTSDIR}/devel/p5-Devel-CheckLib
-LIB_DEPENDS=	libstree.so:${PORTSDIR}/textproc/libstree
+BUILD_DEPENDS=	p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib
+LIB_DEPENDS=	libstree.so:textproc/libstree
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-UML-Class-Simple/Makefile b/textproc/p5-UML-Class-Simple/Makefile
index 984ec7c5b0de..dba0c2a9ebbe 100644
--- a/textproc/p5-UML-Class-Simple/Makefile
+++ b/textproc/p5-UML-Class-Simple/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Render simple UML class diagrams, by loading the code
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Inspector>=1.16:${PORTSDIR}/devel/p5-Class-Inspector \
-		p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-IPC-Run3>0:${PORTSDIR}/devel/p5-IPC-Run3 \
-		p5-List-MoreUtils>0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-PPI>0:${PORTSDIR}/textproc/p5-PPI \
-		p5-Template-Toolkit>0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-YAML-Syck>0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		dot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS=	p5-Class-Inspector>=1.16:devel/p5-Class-Inspector \
+		p5-File-Slurp>0:devel/p5-File-Slurp \
+		p5-IPC-Run3>0:devel/p5-IPC-Run3 \
+		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
+		p5-PPI>0:textproc/p5-PPI \
+		p5-Template-Toolkit>0:www/p5-Template-Toolkit \
+		p5-XML-LibXML>0:textproc/p5-XML-LibXML \
+		p5-YAML-Syck>0:textproc/p5-YAML-Syck \
+		dot:graphics/graphviz
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-UML-Sequence/Makefile b/textproc/p5-UML-Sequence/Makefile
index c3c5e41ae53a..a71933f39dd3 100644
--- a/textproc/p5-UML-Sequence/Makefile
+++ b/textproc/p5-UML-Sequence/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that produce UML sequence diagrams
 
-BUILD_DEPENDS=	p5-XML-DOM>=1.25:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-GD>=2.30:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-TextUtil>=0.86:${PORTSDIR}/graphics/p5-GD-TextUtil
+BUILD_DEPENDS=	p5-XML-DOM>=1.25:textproc/p5-XML-DOM \
+		p5-GD>=2.30:graphics/p5-GD \
+		p5-GD-TextUtil>=0.86:graphics/p5-GD-TextUtil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-UML-State/Makefile b/textproc/p5-UML-State/Makefile
index 1ac0a76ce4cd..28ad17c187ef 100644
--- a/textproc/p5-UML-State/Makefile
+++ b/textproc/p5-UML-State/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module that produce simple UML state diagrams
 
-BUILD_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index 8bb91368c1ac..418abcc55d26 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to find URIs in arbitrary text
 
-BUILD_DEPENDS=	p5-URI>=1:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=1:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Unicode-Escape/Makefile b/textproc/p5-Unicode-Escape/Makefile
index a799d1136fef..5b965a3ff0c4 100644
--- a/textproc/p5-Unicode-Escape/Makefile
+++ b/textproc/p5-Unicode-Escape/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Escape and unescape Unicode characters other than ASCII
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS=	p5-Unicode-String>=0:converters/p5-Unicode-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-Unicode-LineBreak/Makefile b/textproc/p5-Unicode-LineBreak/Makefile
index 29ef4403793a..6c33f95c9bb6 100644
--- a/textproc/p5-Unicode-LineBreak/Makefile
+++ b/textproc/p5-Unicode-LineBreak/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Unicode-LineBreak package
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MIME-Charset>=1.006.2:${PORTSDIR}/mail/p5-MIME-Charset
+BUILD_DEPENDS=	p5-MIME-Charset>=1.006.2:mail/p5-MIME-Charset
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
@@ -30,7 +30,7 @@ OPTIONS_DEFAULT=THAI
 
 THAI_DESC=	Thai word segmentation support through libthai
 THAI_USES=	pkgconfig
-THAI_LIB_DEPENDS=	libthai.so:${PORTSDIR}/devel/libthai
+THAI_LIB_DEPENDS=	libthai.so:devel/libthai
 THAI_CONFIGURE_OFF=	--disable-libthai
 
 post-install:
diff --git a/textproc/p5-Validator-Custom/Makefile b/textproc/p5-Validator-Custom/Makefile
index 6376fc0cac00..c0ea01f4bd3d 100644
--- a/textproc/p5-Validator-Custom/Makefile
+++ b/textproc/p5-Validator-Custom/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Validator::Custom for simple data validation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Object-Simple>=3.0616:${PORTSDIR}/devel/p5-Object-Simple
+BUILD_DEPENDS=	p5-Object-Simple>=3.0616:devel/p5-Object-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
-		p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-JSON>=2:converters/p5-JSON \
+		p5-Test-Pod>=1.22:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-Version-Next/Makefile b/textproc/p5-Version-Next/Makefile
index b945d912fdf6..b336a427f4d3 100644
--- a/textproc/p5-Version-Next/Makefile
+++ b/textproc/p5-Version-Next/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Increment module version numbers simply and correctly
 
 LICENSE=	APACHE20
 
-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}
 
 USES=		perl5
diff --git a/textproc/p5-Vroom/Makefile b/textproc/p5-Vroom/Makefile
index 2ad09a355ea6..14be70aa076a 100644
--- a/textproc/p5-Vroom/Makefile
+++ b/textproc/p5-Vroom/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Slide Shows in Vim
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
-		p5-Template-Toolkit-Simple>=0:${PORTSDIR}/www/p5-Template-Toolkit-Simple \
-		p5-Term-Size>=0:${PORTSDIR}/devel/p5-Term-Size \
-		p5-YAML-LibYAML>=0:${PORTSDIR}/textproc/p5-YAML-LibYAML
+BUILD_DEPENDS=	p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-IO-All>=0:devel/p5-IO-All \
+		p5-Template-Toolkit-Simple>=0:www/p5-Template-Toolkit-Simple \
+		p5-Term-Size>=0:devel/p5-Term-Size \
+		p5-YAML-LibYAML>=0:textproc/p5-YAML-LibYAML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index af2564f5eaee..d6debc8847b0 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to parse WDDX Packets
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-WWW-Google-SiteMap/Makefile b/textproc/p5-WWW-Google-SiteMap/Makefile
index 87ec62a402fe..e67f974f3a50 100644
--- a/textproc/p5-WWW-Google-SiteMap/Makefile
+++ b/textproc/p5-WWW-Google-SiteMap/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl extension for managing Google SiteMaps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-WWW-Wordnik-API/Makefile b/textproc/p5-WWW-Wordnik-API/Makefile
index 2fec6e594719..6a89c0c74a71 100644
--- a/textproc/p5-WWW-Wordnik-API/Makefile
+++ b/textproc/p5-WWW-Wordnik-API/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Wordnik API implementation
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-WordNet-QueryData/Makefile b/textproc/p5-WordNet-QueryData/Makefile
index 4fd2082e3810..214d1f11046c 100644
--- a/textproc/p5-WordNet-QueryData/Makefile
+++ b/textproc/p5-WordNet-QueryData/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the WordNet database files
 
-LIB_DEPENDS=	libWN.so:${PORTSDIR}/textproc/wordnet
+LIB_DEPENDS=	libWN.so:textproc/wordnet
 
 WNHOME?=	${LOCALBASE}/share/WordNet
 
diff --git a/textproc/p5-WordNet-Similarity/Makefile b/textproc/p5-WordNet-Similarity/Makefile
index f81f242bdd20..788128871b13 100644
--- a/textproc/p5-WordNet-Similarity/Makefile
+++ b/textproc/p5-WordNet-Similarity/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Modules/CLI to determine semantic relatedness using the WordNet
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Text-Similarity>=0.10:${PORTSDIR}/textproc/p5-Text-Similarity \
-		p5-WordNet-QueryData>=1.49:${PORTSDIR}/textproc/p5-WordNet-QueryData
+BUILD_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Text-Similarity>=0.10:textproc/p5-Text-Similarity \
+		p5-WordNet-QueryData>=1.49:textproc/p5-WordNet-QueryData
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WNHOME?=	${LOCALBASE}/share/WordNet
diff --git a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
index 4f0b98119564..f651bbe27d61 100644
--- a/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
+++ b/textproc/p5-XML-Atom-Ext-OpenSearch/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	XML::Atom extension for OpenSearch data
 
-BUILD_DEPENDS=	p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom
+BUILD_DEPENDS=	p5-XML-Atom>=0:textproc/p5-XML-Atom
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Atom-Filter/Makefile b/textproc/p5-XML-Atom-Filter/Makefile
index e1a53d940c14..216c9fc57151 100644
--- a/textproc/p5-XML-Atom-Filter/Makefile
+++ b/textproc/p5-XML-Atom-Filter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy creation of command line Atom processing tools
 
-BUILD_DEPENDS=	p5-XML-Atom>=0:${PORTSDIR}/textproc/p5-XML-Atom
+BUILD_DEPENDS=	p5-XML-Atom>=0:textproc/p5-XML-Atom
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Atom-Stream/Makefile b/textproc/p5-XML-Atom-Stream/Makefile
index 7e956ca90cd9..e62a91f04df5 100644
--- a/textproc/p5-XML-Atom-Stream/Makefile
+++ b/textproc/p5-XML-Atom-Stream/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Client interface for AtomStream
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-SAX>=0.12:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-Handler-Trees>=0.02:${PORTSDIR}/textproc/p5-XML-Handler-Trees \
-		p5-XML-Atom>=0.20:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-XML-LibXML>=1.59:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-XML-SAX>=0.12:textproc/p5-XML-SAX \
+		p5-XML-Handler-Trees>=0.02:textproc/p5-XML-Handler-Trees \
+		p5-XML-Atom>=0.20:textproc/p5-XML-Atom \
+		p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Atom-Syndication/Makefile b/textproc/p5-XML-Atom-Syndication/Makefile
index 26faeb909e9e..5c7725077455 100644
--- a/textproc/p5-XML-Atom-Syndication/Makefile
+++ b/textproc/p5-XML-Atom-Syndication/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple lightweight client for consuming Atom syndication feeds
 
-BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-XML-Elemental>=2:${PORTSDIR}/textproc/p5-XML-Elemental \
-		p5-XML-Writer>=0.6:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-XML-Elemental>=2:textproc/p5-XML-Elemental \
+		p5-XML-Writer>=0.6:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Atom/Makefile b/textproc/p5-XML-Atom/Makefile
index 2952a2845067..cc6e5c541b87 100644
--- a/textproc/p5-XML-Atom/Makefile
+++ b/textproc/p5-XML-Atom/Makefile
@@ -11,16 +11,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 modules for Atom feed and API implementation
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-LWP-Authen-Wsse>=0:${PORTSDIR}/www/p5-LWP-Authen-Wsse \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=1.69:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-LWP-Authen-Wsse>=0:www/p5-LWP-Authen-Wsse \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=1.69:textproc/p5-XML-LibXML \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index 9fe09020fdfe..70c20dfb6661 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for DOCTYPE based XML output
 LICENSE=	ART10 GPLv1 BSD4CLAUSE
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+TEST_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Canonical/Makefile b/textproc/p5-XML-Canonical/Makefile
index b355ef6d32c1..d41460787e06 100644
--- a/textproc/p5-XML-Canonical/Makefile
+++ b/textproc/p5-XML-Canonical/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl Implementation of Canonical XML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-GDOME>=0:${PORTSDIR}/textproc/p5-XML-GDOME
-LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
+BUILD_DEPENDS=	p5-XML-GDOME>=0:textproc/p5-XML-GDOME
+LIB_DEPENDS=	libgdome.so:textproc/gdome2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-CanonicalizeXML/Makefile b/textproc/p5-XML-CanonicalizeXML/Makefile
index 397a0ebcc83e..66c93fd9f916 100644
--- a/textproc/p5-XML-CanonicalizeXML/Makefile
+++ b/textproc/p5-XML-CanonicalizeXML/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Extension for inclusive/exclusive canonicalization of XML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index f9c5a59552c5..aee8faf18650 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Resolve public identifiers and remap system identifiers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-Text-ParseWords>0:textproc/p5-Text-ParseWords \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix perl5
diff --git a/textproc/p5-XML-CommonNS/Makefile b/textproc/p5-XML-CommonNS/Makefile
index e5b9d2bd8d0d..e8da98b7b1c8 100644
--- a/textproc/p5-XML-CommonNS/Makefile
+++ b/textproc/p5-XML-CommonNS/Makefile
@@ -14,7 +14,7 @@ COMMENT=	List of commonly used namespaces
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-NamespaceFactory>=0:${PORTSDIR}/textproc/p5-XML-NamespaceFactory
+BUILD_DEPENDS=	p5-XML-NamespaceFactory>=0:textproc/p5-XML-NamespaceFactory
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Compile-Cache/Makefile b/textproc/p5-XML-Compile-Cache/Makefile
index a403f9097db2..e292edcae58c 100644
--- a/textproc/p5-XML-Compile-Cache/Makefile
+++ b/textproc/p5-XML-Compile-Cache/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Cache Compiled XML Translators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Report>=0.19:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile>=1.48:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-LibXML-Simple>=0.95:${PORTSDIR}/textproc/p5-XML-LibXML-Simple
+BUILD_DEPENDS=	p5-Log-Report>=0.19:devel/p5-Log-Report \
+		p5-XML-Compile>=1.48:textproc/p5-XML-Compile \
+		p5-XML-LibXML-Simple>=0.95:textproc/p5-XML-LibXML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-Compile-Tester>=0.02:${PORTSDIR}/devel/p5-XML-Compile-Tester
+TEST_DEPENDS=	p5-XML-Compile-Tester>=0.02:devel/p5-XML-Compile-Tester
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Compile-Dumper/Makefile b/textproc/p5-XML-Compile-Dumper/Makefile
index 0a20390d3fc2..2a3234d48da2 100644
--- a/textproc/p5-XML-Compile-Dumper/Makefile
+++ b/textproc/p5-XML-Compile-Dumper/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Dump Compiled XML Translators
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Data-Dump-Streamer>=2.08:${PORTSDIR}/devel/p5-Data-Dump-Streamer \
-		p5-Log-Report>=0.19:${PORTSDIR}/devel/p5-Log-Report \
-		p5-Test-Pod>=1.00:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-XML-Compile-Tester>=0.02:${PORTSDIR}/devel/p5-XML-Compile-Tester \
-		p5-XML-Compile>=1.1:${PORTSDIR}/textproc/p5-XML-Compile \
-		p5-XML-LibXML-Simple>=0.13:${PORTSDIR}/textproc/p5-XML-LibXML-Simple
+BUILD_DEPENDS=	p5-Data-Dump-Streamer>=2.08:devel/p5-Data-Dump-Streamer \
+		p5-Log-Report>=0.19:devel/p5-Log-Report \
+		p5-Test-Pod>=1.00:devel/p5-Test-Pod \
+		p5-XML-Compile-Tester>=0.02:devel/p5-XML-Compile-Tester \
+		p5-XML-Compile>=1.1:textproc/p5-XML-Compile \
+		p5-XML-LibXML-Simple>=0.13:textproc/p5-XML-LibXML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Compile/Makefile b/textproc/p5-XML-Compile/Makefile
index 9cca52b04041..75c80f5f76c9 100644
--- a/textproc/p5-XML-Compile/Makefile
+++ b/textproc/p5-XML-Compile/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Compilation based XML processing
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Log-Report>=1.03:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-LibXML>=2.0100:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Log-Report>=1.03:devel/p5-Log-Report \
+		p5-XML-LibXML>=2.0100:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0.095:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-XML-Compile-Tester>=0.90:${PORTSDIR}/devel/p5-XML-Compile-Tester
+TEST_DEPENDS=	p5-Test-Deep>=0.095:devel/p5-Test-Deep \
+		p5-XML-Compile-Tester>=0.90:devel/p5-XML-Compile-Tester
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/textproc/p5-XML-DBMS/Makefile b/textproc/p5-XML-DBMS/Makefile
index 049e256c1e62..d1cda9d87619 100644
--- a/textproc/p5-XML-DBMS/Makefile
+++ b/textproc/p5-XML-DBMS/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	perl-${PORTNAME:tl}-${PORTVERSION}
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl port of Java package XML-DBMS v1.0
 
-BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+BUILD_DEPENDS=	p5-libxml>=0:textproc/p5-libxml \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/textproc/p5-XML-DOM-XPath/Makefile b/textproc/p5-XML-DOM-XPath/Makefile
index e7151d37f0e0..ae89b5c19cdc 100644
--- a/textproc/p5-XML-DOM-XPath/Makefile
+++ b/textproc/p5-XML-DOM-XPath/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mauricio@arareko.net
 COMMENT=	Adds XPath support to XML::DOM, using XML::XPath engine
 
-RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-XML-XPathEngine>=0:${PORTSDIR}/textproc/p5-XML-XPathEngine
+RUN_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM \
+		p5-XML-XPathEngine>=0:textproc/p5-XML-XPathEngine
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index 070693f3311b..4b9d6542450d 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module for building DOM Level 1 compliant document structures
 
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-XML-RegExp>=0:${PORTSDIR}/textproc/p5-XML-RegExp
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-libxml>=0:textproc/p5-libxml \
+		p5-libwww>=0:www/p5-libwww \
+		p5-XML-RegExp>=0:textproc/p5-XML-RegExp
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-DOM2/Makefile b/textproc/p5-XML-DOM2/Makefile
index 76e44f437b33..256d9bddc497 100644
--- a/textproc/p5-XML-DOM2/Makefile
+++ b/textproc/p5-XML-DOM2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DOM controlled, strict XML module for extentable xml objects
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index 4f1d97507f4c..ef0f567bb49f 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl module for down translation of XML to strings
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.54:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-libwww>=1.35:${PORTSDIR}/www/p5-libwww \
-		p5-XML-DTDParser>=2.00:${PORTSDIR}/textproc/p5-XML-DTDParser
+BUILD_DEPENDS=	p5-XML-LibXML>=1.54:textproc/p5-XML-LibXML \
+		p5-libwww>=1.35:www/p5-libwww \
+		p5-XML-DTDParser>=2.00:textproc/p5-XML-DTDParser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Declare/Makefile b/textproc/p5-XML-Declare/Makefile
index d3f398db34cf..0f6a662a2db1 100644
--- a/textproc/p5-XML-Declare/Makefile
+++ b/textproc/p5-XML-Declare/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Create XML documents with declaration style
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.70:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
 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 \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-lib-abs>=0.90:devel/p5-lib-abs \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-XML-Descent/Makefile b/textproc/p5-XML-Descent/Makefile
index c49e87c9a3ba..df52bd9f3124 100644
--- a/textproc/p5-XML-Descent/Makefile
+++ b/textproc/p5-XML-Descent/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mike@urgle.com
 COMMENT=	Recursive descent XML parsing
 
-BUILD_DEPENDS=	p5-XML-TokeParser>=0:${PORTSDIR}/textproc/p5-XML-TokeParser \
-		p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences
-RUN_DEPENDS=	p5-XML-TokeParser>=0:${PORTSDIR}/textproc/p5-XML-TokeParser
+BUILD_DEPENDS=	p5-XML-TokeParser>=0:textproc/p5-XML-TokeParser \
+		p5-Test-Differences>=0:devel/p5-Test-Differences
+RUN_DEPENDS=	p5-XML-TokeParser>=0:textproc/p5-XML-TokeParser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-DifferenceMarkup/Makefile b/textproc/p5-XML-DifferenceMarkup/Makefile
index 3c421fba76ad..88314a7be063 100644
--- a/textproc/p5-XML-DifferenceMarkup/Makefile
+++ b/textproc/p5-XML-DifferenceMarkup/Makefile
@@ -13,9 +13,9 @@ COMMENT=	This module implements an XML diff producing XML output
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libdiffmark.so:${PORTSDIR}/textproc/diffmark
+LIB_DEPENDS=	libdiffmark.so:textproc/diffmark
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Directory/Makefile b/textproc/p5-XML-Directory/Makefile
index a60672281200..d878572de4a2 100644
--- a/textproc/p5-XML-Directory/Makefile
+++ b/textproc/p5-XML-Directory/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Returns a content of directory as XML
 
-BUILD_DEPENDS=	p5-RDF-Notation3>=0:${PORTSDIR}/textproc/p5-RDF-Notation3 \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-RDF-Notation3>=0:textproc/p5-RDF-Notation3 \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Driver-HTML/Makefile b/textproc/p5-XML-Driver-HTML/Makefile
index ce44e244c3a4..e6e13233c0d6 100644
--- a/textproc/p5-XML-Driver-HTML/Makefile
+++ b/textproc/p5-XML-Driver-HTML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl SAX Driver for non wellformed HTML
 
-BUILD_DEPENDS=	p5-XML-TreeBuilder>=0:${PORTSDIR}/textproc/p5-XML-TreeBuilder \
-		p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter
+BUILD_DEPENDS=	p5-XML-TreeBuilder>=0:textproc/p5-XML-TreeBuilder \
+		p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index b53a47c0ec60..bf0d063ddbd0 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for dumping Perl objects from/to XML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/p5-XML-Elemental/Makefile b/textproc/p5-XML-Elemental/Makefile
index 28f6cd304f9b..8c0f0d5e6517 100644
--- a/textproc/p5-XML-Elemental/Makefile
+++ b/textproc/p5-XML-Elemental/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generic classes for simplistic and perlish handling of XML data
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-Task-Weaken>=1.02:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-Task-Weaken>=1.02:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Encoding/Makefile b/textproc/p5-XML-Encoding/Makefile
index 7df8ea81523a..cf720c9b06ea 100644
--- a/textproc/p5-XML-Encoding/Makefile
+++ b/textproc/p5-XML-Encoding/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for parsing XML encoding maps
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Entities/Makefile b/textproc/p5-XML-Entities/Makefile
index 76b417fb203a..b3790648a151 100644
--- a/textproc/p5-XML-Entities/Makefile
+++ b/textproc/p5-XML-Entities/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Generic classes for simplistic and perlish handling of XML data
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-FOAF/Makefile b/textproc/p5-XML-FOAF/Makefile
index ea3fc7855041..7d9b8fbe73ef 100644
--- a/textproc/p5-XML-FOAF/Makefile
+++ b/textproc/p5-XML-FOAF/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	markun@onohara.to
 COMMENT=	Parse FOAF (Friend of a Friend) data
 
-RUN_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter \
-		p5-RDF-Core>=0:${PORTSDIR}/textproc/p5-RDF-Core \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-Filter>=0:devel/p5-Filter \
+		p5-RDF-Core>=0:textproc/p5-RDF-Core \
+		p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Feed-Deduper/Makefile b/textproc/p5-XML-Feed-Deduper/Makefile
index f1ca2554da46..c65cc784e60e 100644
--- a/textproc/p5-XML-Feed-Deduper/Makefile
+++ b/textproc/p5-XML-Feed-Deduper/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Remove duplicated entries from feed
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-		p5-XML-Feed>=0.41:${PORTSDIR}/textproc/p5-XML-Feed
-RUN_DEPENDS=	p5-Mouse>0:${PORTSDIR}/devel/p5-Mouse \
-		p5-XML-Feed>=0.41:${PORTSDIR}/textproc/p5-XML-Feed
+BUILD_DEPENDS=	p5-Mouse>0:devel/p5-Mouse \
+		p5-XML-Feed>=0.41:textproc/p5-XML-Feed
+RUN_DEPENDS=	p5-Mouse>0:devel/p5-Mouse \
+		p5-XML-Feed>=0.41:textproc/p5-XML-Feed
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/textproc/p5-XML-Feed/Makefile b/textproc/p5-XML-Feed/Makefile
index ba473bccb79b..b02f484a6d1d 100644
--- a/textproc/p5-XML-Feed/Makefile
+++ b/textproc/p5-XML-Feed/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Perl5 modules for Syndication feed parser and auto-discovery
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-DateTime-Format-W3CDTF>=0:${PORTSDIR}/devel/p5-DateTime-Format-W3CDTF \
-		p5-Feed-Find>=0:${PORTSDIR}/www/p5-Feed-Find \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
-		p5-XML-Atom>=0.38:${PORTSDIR}/textproc/p5-XML-Atom \
-		p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-RSS>=1.47:${PORTSDIR}/textproc/p5-XML-RSS \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
+		p5-Feed-Find>=0:www/p5-Feed-Find \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI \
+		p5-URI-Fetch>=0:www/p5-URI-Fetch \
+		p5-XML-Atom>=0.38:textproc/p5-XML-Atom \
+		p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
+		p5-XML-RSS>=1.47:textproc/p5-XML-RSS \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-RSS-LibXML>=0.30.04:${PORTSDIR}/textproc/p5-XML-RSS-LibXML
+TEST_DEPENDS=	p5-XML-RSS-LibXML>=0.30.04:textproc/p5-XML-RSS-LibXML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-FeedPP/Makefile b/textproc/p5-XML-FeedPP/Makefile
index 0d50d17ee573..1d8b9621af1e 100644
--- a/textproc/p5-XML-FeedPP/Makefile
+++ b/textproc/p5-XML-FeedPP/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Get an RSS file and parse it
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-TreePP>=0.39:${PORTSDIR}/textproc/p5-XML-TreePP
+BUILD_DEPENDS=	p5-XML-TreePP>=0.39:textproc/p5-XML-TreePP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile
index 30d677276a34..8cf4547dfb83 100644
--- a/textproc/p5-XML-Filter-BufferText/Makefile
+++ b/textproc/p5-XML-Filter-BufferText/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Filter to put all characters() in one event
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
index 70150da9e3e0..7d9084b0732e 100644
--- a/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
+++ b/textproc/p5-XML-Filter-DOMFilter-LibXML/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl SAX Filter allowing DOM processing of selected subtrees
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+TEST_DEPENDS=	p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index d125232a496f..36fd11787811 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PerlSAX filter that detects ignorable whitespace
 
-BUILD_DEPENDS=	p5-XML-Filter-SAXT>=0:${PORTSDIR}/textproc/p5-XML-Filter-SAXT
+BUILD_DEPENDS=	p5-XML-Filter-SAXT>=0:textproc/p5-XML-Filter-SAXT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-GenericChunk/Makefile b/textproc/p5-XML-Filter-GenericChunk/Makefile
index 87440cbf12e3..065c87d5d937 100644
--- a/textproc/p5-XML-Filter-GenericChunk/Makefile
+++ b/textproc/p5-XML-Filter-GenericChunk/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Base Class for SAX Filters parsing WellBallanced Chunks
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.4:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-XML-LibXML>=1.4:textproc/p5-XML-LibXML \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index 2e4a3b9042fa..3bfee7f00741 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Reformats whitespace for pretty printing XML
 
-BUILD_DEPENDS=	p5-XML-Filter-DetectWS>=0:${PORTSDIR}/textproc/p5-XML-Filter-DetectWS
+BUILD_DEPENDS=	p5-XML-Filter-DetectWS>=0:textproc/p5-XML-Filter-DetectWS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
index 20bec80dfff2..e029d98ba0a9 100644
--- a/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
+++ b/textproc/p5-XML-Filter-SAX1toSAX2/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Convert SAX1 events to SAX2
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index 8093ec387a63..a617e3f00647 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XInclude as a SAX Filter
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index f3b7b2276324..d6914c43ad27 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XSLT as a SAX Filter
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+		p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Flow/Makefile b/textproc/p5-XML-Flow/Makefile
index b8029d376196..6f55029a9096 100644
--- a/textproc/p5-XML-Flow/Makefile
+++ b/textproc/p5-XML-Flow/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store (restore) perl data structures in XML stream
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index 7507379440d0..2ac35634307b 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl module that provides the DOM Level 2 Core API for XML documents
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
-LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX
+LIB_DEPENDS=	libgdome.so:textproc/gdome2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 pkgconfig
diff --git a/textproc/p5-XML-Generator-DBI/Makefile b/textproc/p5-XML-Generator-DBI/Makefile
index 4a681195cf5b..e9109bbad6df 100644
--- a/textproc/p5-XML-Generator-DBI/Makefile
+++ b/textproc/p5-XML-Generator-DBI/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate SAX events from SQL queries
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Generator-PerlData/Makefile b/textproc/p5-XML-Generator-PerlData/Makefile
index df2a8530485b..2817f310971a 100644
--- a/textproc/p5-XML-Generator-PerlData/Makefile
+++ b/textproc/p5-XML-Generator-PerlData/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension for generating SAX2 events from Perl data structures
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-SAX-Base>=1.02:${PORTSDIR}/textproc/p5-XML-SAX-Base
+BUILD_DEPENDS=	p5-XML-SAX-Base>=1.02:textproc/p5-XML-SAX-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Generator/Makefile b/textproc/p5-XML-Generator/Makefile
index bc4fa7eb0fbb..6267f3148c88 100644
--- a/textproc/p5-XML-Generator/Makefile
+++ b/textproc/p5-XML-Generator/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ah@linux-hq.de
 COMMENT=	Simple Perl module for generating XML documents
 
-BUILD_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
-RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
+RUN_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
 
-TEST_DEPENDS=	p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+TEST_DEPENDS=	p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Grove/Makefile b/textproc/p5-XML-Grove/Makefile
index f3add6224682..ff06aa335f06 100644
--- a/textproc/p5-XML-Grove/Makefile
+++ b/textproc/p5-XML-Grove/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl-style XML objects
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS=	p5-libxml>=0:textproc/p5-libxml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
index 16f2ab0e6281..30a58c095072 100644
--- a/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2DocBook/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate a DocBook documentation from a DTD
 
-BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-XML-Handler-Dtd2Html>=0.41:${PORTSDIR}/textproc/p5-XML-Handler-Dtd2Html
+BUILD_DEPENDS=	p5-libxml>=0:textproc/p5-libxml \
+		p5-XML-Handler-Dtd2Html>=0.41:textproc/p5-XML-Handler-Dtd2Html
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Handler-Dtd2Html/Makefile b/textproc/p5-XML-Handler-Dtd2Html/Makefile
index fda8e27c078e..eb767216e313 100644
--- a/textproc/p5-XML-Handler-Dtd2Html/Makefile
+++ b/textproc/p5-XML-Handler-Dtd2Html/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SAX2 handler for generate a Html documentation from a DTD
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=1.94:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-HTML-Template>=2.8:${PORTSDIR}/www/p5-HTML-Template \
-		p5-XML-Parser>=2.3:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX-Expat>=0.37:${PORTSDIR}/textproc/p5-XML-SAX-Expat \
-		p5-XML-SAX-Writer>=0.44:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-libxml>=0.08:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS=	p5-Parse-RecDescent>=1.94:devel/p5-Parse-RecDescent \
+		p5-HTML-Template>=2.8:www/p5-HTML-Template \
+		p5-XML-Parser>=2.3:textproc/p5-XML-Parser \
+		p5-XML-SAX-Expat>=0.37:textproc/p5-XML-SAX-Expat \
+		p5-XML-SAX-Writer>=0.44:textproc/p5-XML-SAX-Writer \
+		p5-libxml>=0.08:textproc/p5-libxml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Handler-HTMLWriter/Makefile b/textproc/p5-XML-Handler-HTMLWriter/Makefile
index 0bf0d2cca444..6d174882db69 100644
--- a/textproc/p5-XML-Handler-HTMLWriter/Makefile
+++ b/textproc/p5-XML-Handler-HTMLWriter/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PerlSAX handlers for outputting HTML
 
-BUILD_DEPENDS=	p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index f40a1f995814..41e2a0c05faf 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Yet another Perl SAX XML Writer
 
-BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS=	p5-libxml>=0:textproc/p5-libxml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Hash-LX/Makefile b/textproc/p5-XML-Hash-LX/Makefile
index 1d686a2d2a83..770f185a80cf 100644
--- a/textproc/p5-XML-Hash-LX/Makefile
+++ b/textproc/p5-XML-Hash-LX/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Convert hash to xml and xml to hash using LibXML
 
-BUILD_DEPENDS=	p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-lib-abs>=0.90:devel/p5-lib-abs \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-LibXML-Cache/Makefile b/textproc/p5-XML-LibXML-Cache/Makefile
index 2228661064b6..7e919627b6f9 100644
--- a/textproc/p5-XML-LibXML-Cache/Makefile
+++ b/textproc/p5-XML-LibXML-Cache/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Document cache for XML::LibXML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-LibXML>=1.59:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-LibXSLT>=1.59:${PORTSDIR}/textproc/p5-XML-LibXSLT
+BUILD_DEPENDS=	p5-URI>=0:net/p5-URI \
+		p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML \
+		p5-XML-LibXSLT>=1.59:textproc/p5-XML-LibXSLT
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Touch>=0:${PORTSDIR}/devel/p5-File-Touch \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-File-Touch>=0:devel/p5-File-Touch \
+		p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-XML-LibXML-Iterator/Makefile b/textproc/p5-XML-LibXML-Iterator/Makefile
index 013def6b9a82..1320516ea843 100644
--- a/textproc/p5-XML-LibXML-Iterator/Makefile
+++ b/textproc/p5-XML-LibXML-Iterator/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XML::LibXML::Iterator is an iterator for XML::LibXML parsed documents
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-NodeFilter>=0:${PORTSDIR}/textproc/p5-XML-NodeFilter
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-NodeFilter>=0:textproc/p5-XML-NodeFilter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-LibXML-PrettyPrint/Makefile b/textproc/p5-XML-LibXML-PrettyPrint/Makefile
index d921dad5e33f..11777bcdb62e 100644
--- a/textproc/p5-XML-LibXML-PrettyPrint/Makefile
+++ b/textproc/p5-XML-LibXML-PrettyPrint/Makefile
@@ -15,10 +15,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0:${PORTSDIR}/devel/p5-Exporter-Tiny \
-		p5-XML-LibXML>=1.62:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0:devel/p5-Exporter-Tiny \
+		p5-XML-LibXML>=1.62:textproc/p5-XML-LibXML
 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
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile b/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
index b624b2138d18..6074e80b9af1 100644
--- a/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
+++ b/textproc/p5-XML-LibXML-SAX-ChunkParser/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Parse XML chunks via LibXML SAX
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX
 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=	modbuild
 USES=		perl5
diff --git a/textproc/p5-XML-LibXML-Simple/Makefile b/textproc/p5-XML-LibXML-Simple/Makefile
index ac2c9e168c15..c096ff7166d7 100644
--- a/textproc/p5-XML-LibXML-Simple/Makefile
+++ b/textproc/p5-XML-LibXML-Simple/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XML::LibXML clone of XML::Simple::XMLin()
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-XML-LibXML>=1.64:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-XML-LibXML>=1.64:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile
index 4ca75031e65b..84dec7d3f71d 100644
--- a/textproc/p5-XML-LibXML/Makefile
+++ b/textproc/p5-XML-LibXML/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Interface to Gnome libxml2 library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-NamespaceSupport>=1.07:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \
-		p5-XML-SAX>=0.11:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-XML-NamespaceSupport>=1.07:textproc/p5-XML-NamespaceSupport \
+		p5-XML-SAX>=0.11:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+TEST_DEPENDS=	p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_GNOME=	libxml2
diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile
index 3d65efe62cf7..0855be0951df 100644
--- a/textproc/p5-XML-LibXSLT/Makefile
+++ b/textproc/p5-XML-LibXSLT/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl interface to the GNOME XSLT library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.70:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 pkgconfig
diff --git a/textproc/p5-XML-Liberal/Makefile b/textproc/p5-XML-Liberal/Makefile
index 7b4a1a278eb8..e92def232a78 100644
--- a/textproc/p5-XML-Liberal/Makefile
+++ b/textproc/p5-XML-Liberal/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Super liberal XML parser that parses broken XML
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-Tagset>=0:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-Module-Pluggable-Fast>=0.16:${PORTSDIR}/devel/p5-Module-Pluggable-Fast \
-		p5-XML-LibXML>=1.58:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-Tagset>=0:www/p5-HTML-Tagset \
+		p5-Module-Pluggable-Fast>=0.16:devel/p5-Module-Pluggable-Fast \
+		p5-XML-LibXML>=1.58:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Literal/Makefile b/textproc/p5-XML-Literal/Makefile
index 4a160817af4b..8bfddb6d6f39 100644
--- a/textproc/p5-XML-Literal/Makefile
+++ b/textproc/p5-XML-Literal/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Syntax support for XML literals
 
-BUILD_DEPENDS=	p5-Sub-Override>=0:${PORTSDIR}/devel/p5-Sub-Override
+BUILD_DEPENDS=	p5-Sub-Override>=0:devel/p5-Sub-Override
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-MyXML/Makefile b/textproc/p5-XML-MyXML/Makefile
index 116a0c51beba..1d119d5a78ed 100644
--- a/textproc/p5-XML-MyXML/Makefile
+++ b/textproc/p5-XML-MyXML/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Simple-to-use XML module parsing and creating XML documents
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 4da9c3bd5d36..0f3552ba40d9 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to extend and simplify XML::Parser
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-NodeFilter/Makefile b/textproc/p5-XML-NodeFilter/Makefile
index e098e7a7871e..cd18762bc170 100644
--- a/textproc/p5-XML-NodeFilter/Makefile
+++ b/textproc/p5-XML-NodeFilter/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XML::NodeFilter is an object that know how to "filter out" nodes
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-OPML-LibXML/Makefile b/textproc/p5-XML-OPML-LibXML/Makefile
index 87adef84850f..3a5e5ccc25fd 100644
--- a/textproc/p5-XML-OPML-LibXML/Makefile
+++ b/textproc/p5-XML-OPML-LibXML/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to parse OPML document with LibXML parser
 
-RUN_DEPENDS=	p5-XML-LibXML>1.60:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-XML-LibXML>1.60:textproc/p5-XML-LibXML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-OPML/Makefile b/textproc/p5-XML-OPML/Makefile
index 3d64d1937f0f..0f3e7e706236 100644
--- a/textproc/p5-XML-OPML/Makefile
+++ b/textproc/p5-XML-OPML/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Creates and updates OPML (Outline Processor Markup Language) files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SimpleObject>=0:${PORTSDIR}/textproc/p5-XML-SimpleObject
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-SimpleObject>=0:textproc/p5-XML-SimpleObject
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Parser-EasyTree/Makefile b/textproc/p5-XML-Parser-EasyTree/Makefile
index e18e2b30e7fc..c95c593f144d 100644
--- a/textproc/p5-XML-Parser-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-EasyTree/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Easier tree style for XML::Parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Parser-Lite/Makefile b/textproc/p5-XML-Parser-Lite/Makefile
index 46e9cae2cf93..2035afacb04b 100644
--- a/textproc/p5-XML-Parser-Lite/Makefile
+++ b/textproc/p5-XML-Parser-Lite/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Lightweight regexp-based XML parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-XMLRPC-Lite>=0:${PORTSDIR}/net/p5-XMLRPC-Lite
+TEST_DEPENDS=	p5-Test-Requires>=0.06:devel/p5-Test-Requires \
+		p5-XMLRPC-Lite>=0:net/p5-XMLRPC-Lite
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Parser-Style-EasyTree/Makefile b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
index 0fa69f6febf5..0b47b2456ea4 100644
--- a/textproc/p5-XML-Parser-Style-EasyTree/Makefile
+++ b/textproc/p5-XML-Parser-Style-EasyTree/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Parse XML to a simple tree
 
-BUILD_DEPENDS=	p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-ex-lib>=0.03:${PORTSDIR}/devel/p5-ex-lib
+BUILD_DEPENDS=	p5-XML-Parser>0:textproc/p5-XML-Parser \
+		p5-ex-lib>=0.03:devel/p5-ex-lib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Parser-Style-Elemental/Makefile b/textproc/p5-XML-Parser-Style-Elemental/Makefile
index 96b24f38c0a8..e8085b4c76d7 100644
--- a/textproc/p5-XML-Parser-Style-Elemental/Makefile
+++ b/textproc/p5-XML-Parser-Style-Elemental/Makefile
@@ -14,7 +14,7 @@ COMMENT=	More advanced and flexible object tree style for XML::Parser
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 30fff26389ec..923dc908f0d5 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl extension interface to James Clark's XML parser, expat
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-RAI/Makefile b/textproc/p5-XML-RAI/Makefile
index 48b2d5bb29fe..6a33600c1b2a 100644
--- a/textproc/p5-XML-RAI/Makefile
+++ b/textproc/p5-XML-RAI/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.([0-9]+)$/\1/}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	RSS Abstraction Interface
 
-BUILD_DEPENDS=	p5-XML-RSS-Parser>=0:${PORTSDIR}/textproc/p5-XML-RSS-Parser \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+BUILD_DEPENDS=	p5-XML-RSS-Parser>=0:textproc/p5-XML-RSS-Parser \
+		p5-TimeDate>=0:devel/p5-TimeDate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-RSS-Feed/Makefile b/textproc/p5-XML-RSS-Feed/Makefile
index 6ef914ea0b0e..d502ac9401ff 100644
--- a/textproc/p5-XML-RSS-Feed/Makefile
+++ b/textproc/p5-XML-RSS-Feed/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Persistent XML RSS encapsulation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-RSS>=0:${PORTSDIR}/textproc/p5-XML-RSS
+BUILD_DEPENDS=	p5-Clone>=0:devel/p5-Clone \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-RSS>=0:textproc/p5-XML-RSS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-RSS-JavaScript/Makefile b/textproc/p5-XML-RSS-JavaScript/Makefile
index e1517162d829..80d7931fe806 100644
--- a/textproc/p5-XML-RSS-JavaScript/Makefile
+++ b/textproc/p5-XML-RSS-JavaScript/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl extension to serialize your RSS as JavaScript
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-XML-RSS>=1.31:${PORTSDIR}/textproc/p5-XML-RSS
+RUN_DEPENDS=	p5-XML-RSS>=1.31:textproc/p5-XML-RSS
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-RSS-LibXML/Makefile b/textproc/p5-XML-RSS-LibXML/Makefile
index e86e51dcc523..a62edf0912c5 100644
--- a/textproc/p5-XML-RSS-LibXML/Makefile
+++ b/textproc/p5-XML-RSS-LibXML/Makefile
@@ -14,15 +14,15 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-DateTime-Format-W3CDTF>=0:${PORTSDIR}/devel/p5-DateTime-Format-W3CDTF \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-		p5-XML-LibXML>=1.66:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require \
+		p5-XML-LibXML>=1.66:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Differences>=0:devel/p5-Test-Differences \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/textproc/p5-XML-RSS-Liberal/Makefile b/textproc/p5-XML-RSS-Liberal/Makefile
index f4e4bff2a095..a8c7c595decc 100644
--- a/textproc/p5-XML-RSS-Liberal/Makefile
+++ b/textproc/p5-XML-RSS-Liberal/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	XML::RSS With A Liberal Parser
 
-BUILD_DEPENDS=	p5-XML-Liberal>=0:${PORTSDIR}/textproc/p5-XML-Liberal	\
-		p5-XML-RSS-LibXML>=0:${PORTSDIR}/textproc/p5-XML-RSS-LibXML
+BUILD_DEPENDS=	p5-XML-Liberal>=0:textproc/p5-XML-Liberal	\
+		p5-XML-RSS-LibXML>=0:textproc/p5-XML-RSS-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-RSS-Parser/Makefile b/textproc/p5-XML-RSS-Parser/Makefile
index c0547340fd09..42872fb16880 100644
--- a/textproc/p5-XML-RSS-Parser/Makefile
+++ b/textproc/p5-XML-RSS-Parser/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Liberal object-oriented parser for RSS feeds
 
-RUN_DEPENDS=	p5-XML-Elemental>=0:${PORTSDIR}/textproc/p5-XML-Elemental \
-		p5-Class-XPath>=0:${PORTSDIR}/devel/p5-Class-XPath \
-		p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler
+RUN_DEPENDS=	p5-XML-Elemental>=0:textproc/p5-XML-Elemental \
+		p5-Class-XPath>=0:devel/p5-Class-XPath \
+		p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index e4819cd67e9b..7e2db2554dd1 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -10,13 +10,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Perl extension to manage RDF Site Summary (RSS) files
 
-RUN_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-Mail>=0:${PORTSDIR}/devel/p5-DateTime-Format-Mail \
-		p5-DateTime-Format-W3CDTF>=0:${PORTSDIR}/devel/p5-DateTime-Format-W3CDTF \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-XML-Parser>=2.23:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-Mail>=0:devel/p5-DateTime-Format-Mail \
+		p5-DateTime-Format-W3CDTF>=0:devel/p5-DateTime-Format-W3CDTF \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-XML-Parser>=2.23:textproc/p5-XML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-Manifest>=0.9:${PORTSDIR}/devel/p5-Test-Manifest
+BUILD_DEPENDS+=	p5-Test-Manifest>=0.9:devel/p5-Test-Manifest
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Reader/Makefile b/textproc/p5-XML-Reader/Makefile
index 667d8e966326..effc56a8606f 100644
--- a/textproc/p5-XML-Reader/Makefile
+++ b/textproc/p5-XML-Reader/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Reading XML and providing path information based on a pull-parser
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Acme-HTTP>=0:${PORTSDIR}/net/p5-Acme-HTTP
+BUILD_DEPENDS=	p5-Acme-HTTP>=0:net/p5-Acme-HTTP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-Parsepp>=0:${PORTSDIR}/textproc/p5-XML-Parsepp
+TEST_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-Parsepp>=0:textproc/p5-XML-Parsepp
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,7 +23,7 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	PP
 PP_DESC=	Use Pure Perl XML Parser (instead of compiled)
 
-PP_RUN_DEPENDS=		p5-XML-Parsepp>=0:${PORTSDIR}/textproc/p5-XML-Parsepp
-PP_RUN_DEPENDS_OFF=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+PP_RUN_DEPENDS=		p5-XML-Parsepp>=0:textproc/p5-XML-Parsepp
+PP_RUN_DEPENDS_OFF=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Rewrite/Makefile b/textproc/p5-XML-Rewrite/Makefile
index 9e9be62f8041..d9f6bc73f2b7 100644
--- a/textproc/p5-XML-Rewrite/Makefile
+++ b/textproc/p5-XML-Rewrite/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	papowell@astart.com
 COMMENT=	XML processing and rewriting
 
-RUN_DEPENDS=	p5-Log-Report>=0.21:${PORTSDIR}/devel/p5-Log-Report \
-		p5-XML-Compile-Cache>=0:${PORTSDIR}/textproc/p5-XML-Compile-Cache \
-		p5-XML-LibXML>=1.70:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-Log-Report>=0.21:devel/p5-Log-Report \
+		p5-XML-Compile-Cache>=0:textproc/p5-XML-Compile-Cache \
+		p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Rules/Makefile b/textproc/p5-XML-Rules/Makefile
index ce8d915a8b74..960d4294d691 100644
--- a/textproc/p5-XML-Rules/Makefile
+++ b/textproc/p5-XML-Rules/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Parse XML and specify rules for individual tags
 
-RUN_DEPENDS=	p5-XML-Parser>=2.00:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	p5-XML-Parser>=2.00:textproc/p5-XML-Parser
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SAX-Expat-Incremental/Makefile b/textproc/p5-XML-SAX-Expat-Incremental/Makefile
index 674b4640dfa4..66e6628e8aee 100644
--- a/textproc/p5-XML-SAX-Expat-Incremental/Makefile
+++ b/textproc/p5-XML-SAX-Expat-Incremental/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	XML::SAX::Expat subclass for non-blocking (incremental)
 
-RUN_DEPENDS=	p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX-Expat>0:${PORTSDIR}/textproc/p5-XML-SAX-Expat
+RUN_DEPENDS=	p5-XML-Parser>0:textproc/p5-XML-Parser \
+		p5-XML-SAX-Expat>0:textproc/p5-XML-SAX-Expat
 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/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index f0272594a3bc..84ead0c7b8eb 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Simple API for XML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport
+RUN_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-NamespaceSupport>=0:textproc/p5-XML-NamespaceSupport
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/textproc/p5-XML-SAX-ExpatXS/Makefile b/textproc/p5-XML-SAX-ExpatXS/Makefile
index a1fcce788071..8b5bd398540d 100644
--- a/textproc/p5-XML-SAX-ExpatXS/Makefile
+++ b/textproc/p5-XML-SAX-ExpatXS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PerlSAX2 XS extension to Expat parser
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index 53b360bc253c..ea330435d4fd 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manage collections of SAX processors
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SAX-Simple/Makefile b/textproc/p5-XML-SAX-Simple/Makefile
index 7905c415ad02..e25bf469f12d 100644
--- a/textproc/p5-XML-SAX-Simple/Makefile
+++ b/textproc/p5-XML-SAX-Simple/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-XML-Handler-Trees>=0.2:${PORTSDIR}/textproc/p5-XML-Handler-Trees \
-		p5-XML-SAX>=0.99:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-Simple>=2.22:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-XML-Handler-Trees>=0.2:textproc/p5-XML-Handler-Trees \
+		p5-XML-SAX>=0.99:textproc/p5-XML-SAX \
+		p5-XML-Simple>=2.22:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SAX-Writer/Makefile b/textproc/p5-XML-SAX-Writer/Makefile
index e61ed5f77281..293e4373a033 100644
--- a/textproc/p5-XML-SAX-Writer/Makefile
+++ b/textproc/p5-XML-SAX-Writer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	SAX2 XML Writer
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-SAX-Base>=1.01:${PORTSDIR}/textproc/p5-XML-SAX-Base \
-		p5-XML-NamespaceSupport>=1.00:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \
-		p5-XML-Filter-BufferText>=1.00:${PORTSDIR}/textproc/p5-XML-Filter-BufferText
+BUILD_DEPENDS=	p5-XML-SAX-Base>=1.01:textproc/p5-XML-SAX-Base \
+		p5-XML-NamespaceSupport>=1.00:textproc/p5-XML-NamespaceSupport \
+		p5-XML-Filter-BufferText>=1.00:textproc/p5-XML-Filter-BufferText
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 9326c835c95f..cba2f43c743d 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple API for XML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-NamespaceSupport>=0.03:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \
-		p5-XML-SAX-Base>=1.05:${PORTSDIR}/textproc/p5-XML-SAX-Base
+BUILD_DEPENDS=	p5-XML-NamespaceSupport>=0.03:textproc/p5-XML-NamespaceSupport \
+		p5-XML-SAX-Base>=1.05:textproc/p5-XML-SAX-Base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SAXDriver-CSV/Makefile b/textproc/p5-XML-SAXDriver-CSV/Makefile
index ff2ee0e0a149..8b27736fbe4b 100644
--- a/textproc/p5-XML-SAXDriver-CSV/Makefile
+++ b/textproc/p5-XML-SAXDriver-CSV/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl SAX driver for converting CSV files to XML
 
-BUILD_DEPENDS=	p5-Text-CSV_XS>=0.22:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \
-		p5-XML-SAX>=0.14:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-Text-CSV_XS>=0.22:textproc/p5-Text-CSV_XS \
+		p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter \
+		p5-XML-SAX>=0.14:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/textproc/p5-XML-SAXDriver-Excel/Makefile b/textproc/p5-XML-SAXDriver-Excel/Makefile
index 547a8895b849..be9b648c7b57 100644
--- a/textproc/p5-XML-SAXDriver-Excel/Makefile
+++ b/textproc/p5-XML-SAXDriver-Excel/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl SAX driver for converting Excel files to XML
 
-BUILD_DEPENDS=	p5-Spreadsheet-ParseExcel>=0.2603:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
-		p5-XML-SAX>=0.14:${PORTSDIR}/textproc/p5-XML-SAX
+BUILD_DEPENDS=	p5-Spreadsheet-ParseExcel>=0.2603:textproc/p5-Spreadsheet-ParseExcel \
+		p5-XML-SAX>=0.14:textproc/p5-XML-SAX
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 dos2unix
diff --git a/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index fdf73f4acbae..a2c96c84d246 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure Perl STX processor
 
-BUILD_DEPENDS=	p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport
+BUILD_DEPENDS=	p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-XML-NamespaceSupport>=0:textproc/p5-XML-NamespaceSupport
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/textproc/p5-XML-Schematron/Makefile b/textproc/p5-XML-Schematron/Makefile
index fdc58a805958..56808a421b60 100644
--- a/textproc/p5-XML-Schematron/Makefile
+++ b/textproc/p5-XML-Schematron/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl implementation of the Schematron
 
-BUILD_DEPENDS=	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml \
-		p5-Check-ISA>=0:${PORTSDIR}/devel/p5-Check-ISA \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-NonMoose>=0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-MooseX-Traits>=0:${PORTSDIR}/devel/p5-MooseX-Traits \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-XML-Filter-BufferText>=0:${PORTSDIR}/textproc/p5-XML-Filter-BufferText
+BUILD_DEPENDS=	p5-libxml>=0:textproc/p5-libxml \
+		p5-Check-ISA>=0:devel/p5-Check-ISA \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
+		p5-MooseX-Traits>=0:devel/p5-MooseX-Traits \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-XML-Filter-BufferText>=0:textproc/p5-XML-Filter-BufferText
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-SemanticDiff/Makefile b/textproc/p5-XML-SemanticDiff/Makefile
index d4f447a6f7f3..9acc27633a70 100644
--- a/textproc/p5-XML-SemanticDiff/Makefile
+++ b/textproc/p5-XML-SemanticDiff/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl extension for comparing XML documents
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Simple/Makefile b/textproc/p5-XML-Simple/Makefile
index 13520902285e..8d3d33cd4e06 100644
--- a/textproc/p5-XML-Simple/Makefile
+++ b/textproc/p5-XML-Simple/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX>=0.15:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Expat>=0:${PORTSDIR}/textproc/p5-XML-SAX-Expat
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-SAX>=0.15:textproc/p5-XML-SAX \
+		p5-XML-SAX-Expat>=0:textproc/p5-XML-SAX-Expat
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/textproc/p5-XML-SimpleObject-LibXML/Makefile b/textproc/p5-XML-SimpleObject-LibXML/Makefile
index bebc1e60b7b4..0f93672573c7 100644
--- a/textproc/p5-XML-SimpleObject-LibXML/Makefile
+++ b/textproc/p5-XML-SimpleObject-LibXML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple(r) object representation of an XML::LibXML DOM object
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-SimpleObject>=0:${PORTSDIR}/textproc/p5-XML-SimpleObject
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-SimpleObject>=0:textproc/p5-XML-SimpleObject
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-SimpleObject/Makefile b/textproc/p5-XML-SimpleObject/Makefile
index bea3a2c8ee93..c9c6b548131e 100644
--- a/textproc/p5-XML-SimpleObject/Makefile
+++ b/textproc/p5-XML-SimpleObject/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	API for accessing the structure of an XML document
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}${PORTVERSION}
diff --git a/textproc/p5-XML-Smart/Makefile b/textproc/p5-XML-Smart/Makefile
index cc0ad9fecf1d..0c24cbcb920c 100644
--- a/textproc/p5-XML-Smart/Makefile
+++ b/textproc/p5-XML-Smart/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Smart, easy and powerful way to access/create XML files/data
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Object-MultiType>=0.03:${PORTSDIR}/devel/p5-Object-MultiType \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath
+BUILD_DEPENDS=	p5-Object-MultiType>=0.03:devel/p5-Object-MultiType \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Devel-Cycle>=0:${PORTSDIR}/devel/p5-Devel-Cycle
+TEST_DEPENDS=	p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Devel-Cycle>=0:devel/p5-Devel-Cycle
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Stream/Makefile b/textproc/p5-XML-Stream/Makefile
index 5a4b37d54503..b59e4c6fbffa 100644
--- a/textproc/p5-XML-Stream/Makefile
+++ b/textproc/p5-XML-Stream/Makefile
@@ -13,7 +13,7 @@ COMMENT=	XML::Stream provides you with access to XML Stream
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+BUILD_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-TokeParser/Makefile b/textproc/p5-XML-TokeParser/Makefile
index dc75aa48033b..8d2dda9cf401 100644
--- a/textproc/p5-XML-TokeParser/Makefile
+++ b/textproc/p5-XML-TokeParser/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	mike@urgle.com
 COMMENT=	Simplified interface to XML::Parser
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-Toolkit/Makefile b/textproc/p5-XML-Toolkit/Makefile
index a643235ac94b..112aafc6757d 100644
--- a/textproc/p5-XML-Toolkit/Makefile
+++ b/textproc/p5-XML-Toolkit/Makefile
@@ -15,25 +15,25 @@ COMMENT=	Suit of XML tools with Antlers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bread-Board>=0:${PORTSDIR}/devel/p5-Bread-Board \
-		p5-Devel-PackagePath>=0.01:${PORTSDIR}/devel/p5-Devel-PackagePath \
-		p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Aliases>=0:${PORTSDIR}/devel/p5-MooseX-Aliases \
-		p5-MooseX-App-Cmd>=0:${PORTSDIR}/devel/p5-MooseX-App-Cmd \
-		p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
-		p5-MooseX-MetaDescription>=0:${PORTSDIR}/devel/p5-MooseX-MetaDescription \
-		p5-MooseX-NonMoose>=0:${PORTSDIR}/devel/p5-MooseX-NonMoose \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-XML-SAX>=0.96:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Base>=0:${PORTSDIR}/textproc/p5-XML-SAX-Base \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-aliased>=0:${PORTSDIR}/devel/p5-aliased \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+BUILD_DEPENDS=	p5-Bread-Board>=0:devel/p5-Bread-Board \
+		p5-Devel-PackagePath>=0.01:devel/p5-Devel-PackagePath \
+		p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-Aliases>=0:devel/p5-MooseX-Aliases \
+		p5-MooseX-App-Cmd>=0:devel/p5-MooseX-App-Cmd \
+		p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+		p5-MooseX-MetaDescription>=0:devel/p5-MooseX-MetaDescription \
+		p5-MooseX-NonMoose>=0:devel/p5-MooseX-NonMoose \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-XML-SAX>=0.96:textproc/p5-XML-SAX \
+		p5-XML-SAX-Base>=0:textproc/p5-XML-SAX-Base \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+		p5-aliased>=0:devel/p5-aliased \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-XML>=0:${PORTSDIR}/devel/p5-Test-XML
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-XML>=0:devel/p5-Test-XML
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 5cf13b3f111a..2ba4d68e550b 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Perl module to make XML document trees
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Tagset>=3.02:${PORTSDIR}/www/p5-HTML-Tagset \
-		p5-HTML-Tree>=4.1:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-XML-Catalog>=1.0.2:${PORTSDIR}/textproc/p5-XML-Catalog \
-		p5-XML-Parser>0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-HTML-Tagset>=3.02:www/p5-HTML-Tagset \
+		p5-HTML-Tree>=4.1:www/p5-HTML-Tree \
+		p5-XML-Catalog>=1.0.2:textproc/p5-XML-Catalog \
+		p5-XML-Parser>0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-TreePP/Makefile b/textproc/p5-XML-TreePP/Makefile
index 8402f714558e..3b1133d4a633 100644
--- a/textproc/p5-XML-TreePP/Makefile
+++ b/textproc/p5-XML-TreePP/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Pure Perl implementation for parsing/writing xml files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-libwww>=5.811:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=5.811:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-HTTP-Lite>=0:${PORTSDIR}/www/p5-HTTP-Lite \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash
+TEST_DEPENDS=	p5-HTTP-Lite>=0:www/p5-HTTP-Lite \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index d006b9975673..2208f2658716 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Process huge XML documents by chunks via a tree interface
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Tree>=3.13:${PORTSDIR}/www/p5-HTML-Tree \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-		p5-Tie-IxHash>=0:${PORTSDIR}/devel/p5-Tie-IxHash \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Tree>=3.13:www/p5-HTML-Tree \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv \
+		p5-Tie-IxHash>=0:devel/p5-Tie-IxHash \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-CaptureOutput>=0:${PORTSDIR}/devel/p5-IO-CaptureOutput \
-		p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-XML-Simple>=2:${PORTSDIR}/textproc/p5-XML-Simple
+TEST_DEPENDS=	p5-IO-CaptureOutput>=0:devel/p5-IO-CaptureOutput \
+		p5-XML-Handler-YAWriter>=0:textproc/p5-XML-Handler-YAWriter \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+		p5-XML-Simple>=2:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-XML-Validate/Makefile b/textproc/p5-XML-Validate/Makefile
index 80fc943c0013..22d95775886b 100644
--- a/textproc/p5-XML-Validate/Makefile
+++ b/textproc/p5-XML-Validate/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	XML validator factory
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-Log-TraceMessages>=0:${PORTSDIR}/devel/p5-Log-TraceMessages
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-Log-TraceMessages>=0:devel/p5-Log-TraceMessages
 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/textproc/p5-XML-Validator-Schema/Makefile b/textproc/p5-XML-Validator-Schema/Makefile
index 6bc291c41617..6713501456f9 100644
--- a/textproc/p5-XML-Validator-Schema/Makefile
+++ b/textproc/p5-XML-Validator-Schema/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for validating XML documents against a W3C XML Schema
 
-BUILD_DEPENDS=	p5-Tree-DAG_Node>=0:${PORTSDIR}/devel/p5-Tree-DAG_Node \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-Filter-BufferText>=0:${PORTSDIR}/textproc/p5-XML-Filter-BufferText
+BUILD_DEPENDS=	p5-Tree-DAG_Node>=0:devel/p5-Tree-DAG_Node \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-Filter-BufferText>=0:textproc/p5-XML-Filter-BufferText
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-XBEL/Makefile b/textproc/p5-XML-XBEL/Makefile
index c42f77f1f059..b2980ffa984a 100644
--- a/textproc/p5-XML-XBEL/Makefile
+++ b/textproc/p5-XML-XBEL/Makefile
@@ -14,8 +14,8 @@ COMMENT=	OOP for reading and writing XBEL documents
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-XML2JSON/Makefile b/textproc/p5-XML-XML2JSON/Makefile
index 6a8397562481..3c02327c7476 100644
--- a/textproc/p5-XML-XML2JSON/Makefile
+++ b/textproc/p5-XML-XML2JSON/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convert XML into JSON (and back again) using XML::LibXML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-LibXML>=1.59:${PORTSDIR}/textproc/p5-XML-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=1.59:textproc/p5-XML-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 # the order of options follows the search order of JSON module by XML::XML2JSON
@@ -30,13 +30,13 @@ NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
 
-JSON_BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
-JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW
-JSON_DWIW_RUN_DEPENDS=	p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW
-JSON_RUN_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
-JSON_SYCK_BUILD_DEPENDS=p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
-JSON_SYCK_RUN_DEPENDS=	p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
-JSON_XS_BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
-JSON_XS_RUN_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+JSON_BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON
+JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:converters/p5-JSON-DWIW
+JSON_DWIW_RUN_DEPENDS=	p5-JSON-DWIW>=0:converters/p5-JSON-DWIW
+JSON_RUN_DEPENDS=	p5-JSON>=0:converters/p5-JSON
+JSON_SYCK_BUILD_DEPENDS=p5-YAML-Syck>=0:textproc/p5-YAML-Syck
+JSON_SYCK_RUN_DEPENDS=	p5-YAML-Syck>=0:textproc/p5-YAML-Syck
+JSON_XS_BUILD_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
+JSON_XS_RUN_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index e43fdbeff481..14767de378e4 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Modules for parsing and evaluating XPath statements
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-XML-Parser>=2.23:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=2.23:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Path-Tiny>=0.076:${PORTSDIR}/devel/p5-Path-Tiny
+TEST_DEPENDS=	p5-Path-Tiny>=0.076:devel/p5-Path-Tiny
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/textproc/p5-XML-XQL/Makefile b/textproc/p5-XML-XQL/Makefile
index 8c9882c4dbb5..2e01412b6e37 100644
--- a/textproc/p5-XML-XQL/Makefile
+++ b/textproc/p5-XML-XQL/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for querying XML tree structures with XQL
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-XML-DOM>=0:textproc/p5-XML-DOM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-XSH/Makefile b/textproc/p5-XML-XSH/Makefile
index 19f630f63e79..c0a502468bf1 100644
--- a/textproc/p5-XML-XSH/Makefile
+++ b/textproc/p5-XML-XSH/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	This is xsh - an XML Editing Shell
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-LibXSLT>=0:${PORTSDIR}/textproc/p5-XML-LibXSLT \
-		p5-XML-LibXML-Iterator>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Iterator \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-XML-XUpdate-LibXML>=0:${PORTSDIR}/textproc/p5-XML-XUpdate-LibXML
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-LibXSLT>=0:textproc/p5-XML-LibXSLT \
+		p5-XML-LibXML-Iterator>=0:textproc/p5-XML-LibXML-Iterator \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+		p5-XML-XUpdate-LibXML>=0:textproc/p5-XML-XUpdate-LibXML
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index 7b0bed72c898..59bce44f8a5c 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -14,7 +14,7 @@ COMMENT=	XML::XSLT - A perl module for processing XSLT
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+BUILD_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-XML-XUpdate-LibXML/Makefile b/textproc/p5-XML-XUpdate-LibXML/Makefile
index 9499c49c5740..272e8090e35d 100644
--- a/textproc/p5-XML-XUpdate-LibXML/Makefile
+++ b/textproc/p5-XML-XUpdate-LibXML/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Simple implementation of XUpdate format based on and XML::LibXML
 
-BUILD_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-LibXML-Iterator>=0:${PORTSDIR}/textproc/p5-XML-LibXML-Iterator
+BUILD_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-LibXML-Iterator>=0:textproc/p5-XML-LibXML-Iterator
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-YAML-LibYAML/Makefile b/textproc/p5-YAML-LibYAML/Makefile
index c41a83e0065f..2d74d5fc0d6b 100644
--- a/textproc/p5-YAML-LibYAML/Makefile
+++ b/textproc/p5-YAML-LibYAML/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl YAML Serialization using XS and libyaml
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Filter>=0:${PORTSDIR}/devel/p5-Filter
+TEST_DEPENDS=	p5-Filter>=0:devel/p5-Filter
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-YAML-Shell/Makefile b/textproc/p5-YAML-Shell/Makefile
index 3fd851f675b8..51b333994642 100644
--- a/textproc/p5-YAML-Shell/Makefile
+++ b/textproc/p5-YAML-Shell/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	YAML Test Shell
 
-BUILD_DEPENDS=	p5-YAML>=0.67:${PORTSDIR}/textproc/p5-YAML
-RUN_DEPENDS=	p5-YAML>=0.67:${PORTSDIR}/textproc/p5-YAML
+BUILD_DEPENDS=	p5-YAML>=0.67:textproc/p5-YAML
+RUN_DEPENDS=	p5-YAML>=0.67:textproc/p5-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-YAML-Tiny-Color/Makefile b/textproc/p5-YAML-Tiny-Color/Makefile
index 8934d1e73152..1d713e59c6d6 100644
--- a/textproc/p5-YAML-Tiny-Color/Makefile
+++ b/textproc/p5-YAML-Tiny-Color/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl extension to dump YAML with color
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-Scalar-Util-LooksLikeNumber>0:${PORTSDIR}/devel/p5-Scalar-Util-LooksLikeNumber
+RUN_DEPENDS=	p5-Scalar-Util-LooksLikeNumber>0:devel/p5-Scalar-Util-LooksLikeNumber
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-YAML/Makefile b/textproc/p5-YAML/Makefile
index 4f2768821934..c4dcf7244ad3 100644
--- a/textproc/p5-YAML/Makefile
+++ b/textproc/p5-YAML/Makefile
@@ -12,7 +12,7 @@ COMMENT=	YAML implementation in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-YAML>=1.05:${PORTSDIR}/devel/p5-Test-YAML
+TEST_DEPENDS=	p5-Test-YAML>=1.05:devel/p5-Test-YAML
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-YAPE-Regex-Explain/Makefile b/textproc/p5-YAPE-Regex-Explain/Makefile
index 234171092199..2f9fb08aaa9d 100644
--- a/textproc/p5-YAPE-Regex-Explain/Makefile
+++ b/textproc/p5-YAPE-Regex-Explain/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Explanation of a Regular Expression
 
-RUN_DEPENDS=	p5-YAPE-Regex>=0:${PORTSDIR}/textproc/p5-YAPE-Regex
+RUN_DEPENDS=	p5-YAPE-Regex>=0:textproc/p5-YAPE-Regex
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-libsoldout/Makefile b/textproc/p5-libsoldout/Makefile
index 2d9d114aea98..fbee3f7ec02e 100644
--- a/textproc/p5-libsoldout/Makefile
+++ b/textproc/p5-libsoldout/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Convert Markdown text in (X)HTML
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libsoldout.so:${PORTSDIR}/textproc/libsoldout
+LIB_DEPENDS=	libsoldout.so:textproc/libsoldout
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index 079e4112a7f2..c8844a89e8a5 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	libxml-perl-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Collection of Perl5 modules for working with XML
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-pod2pdf/Makefile b/textproc/p5-pod2pdf/Makefile
index bcafb85f4f79..7b8467ea73c4 100644
--- a/textproc/p5-pod2pdf/Makefile
+++ b/textproc/p5-pod2pdf/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Converts POD to PDF format
 
-RUN_DEPENDS=	p5-PDF-API2>=0.60:${PORTSDIR}/textproc/p5-PDF-API2 \
-		p5-Pod-Escapes>0:${PORTSDIR}/textproc/p5-Pod-Escapes \
-		p5-Getopt-ArgvFile>0:${PORTSDIR}/devel/p5-Getopt-ArgvFile
+RUN_DEPENDS=	p5-PDF-API2>=0.60:textproc/p5-PDF-API2 \
+		p5-Pod-Escapes>0:textproc/p5-Pod-Escapes \
+		p5-Getopt-ArgvFile>0:devel/p5-Getopt-ArgvFile
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index 5ff1b6c04617..a671f5c0589b 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -14,38 +14,38 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 XMLTV_DEPENDS=	\
-	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-	p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-	p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-	p5-PerlIO-gzip>=0:${PORTSDIR}/archivers/p5-PerlIO-gzip \
-	p5-CGI>=0:${PORTSDIR}/www/p5-CGI \
-	p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \
-	p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \
-	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
-	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-	p5-Tk-TableMatrix>=0:${PORTSDIR}/x11-toolkits/p5-Tk-TableMatrix \
-	ja-p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi \
-	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-	p5-HTML-TableExtract>=0:${PORTSDIR}/www/p5-HTML-TableExtract \
-	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-	p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
-	p5-Lingua-Preferred>=0:${PORTSDIR}/textproc/p5-Lingua-Preferred \
-	p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String \
-	p5-Unicode-UTF8simple>=0:${PORTSDIR}/converters/p5-Unicode-UTF8simple \
-	p5-Lingua-EN-Numbers-Ordinate>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Numbers-Ordinate \
-	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-	p5-HTTP-Cache-Transparent>=0:${PORTSDIR}/www/p5-HTTP-Cache-Transparent \
-	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-	p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
-	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+	p5-XML-Twig>=0:textproc/p5-XML-Twig \
+	p5-XML-Writer>=0:textproc/p5-XML-Writer \
+	p5-Date-Manip>=0:devel/p5-Date-Manip \
+	p5-PerlIO-gzip>=0:archivers/p5-PerlIO-gzip \
+	p5-CGI>=0:www/p5-CGI \
+	p5-IO-Compress>=0:archivers/p5-IO-Compress \
+	p5-Data-Dumper>=0:devel/p5-Data-Dumper \
+	p5-libwww>=0:www/p5-libwww \
+	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+	p5-HTML-Tree>=0:www/p5-HTML-Tree \
+	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+	p5-Tk-TableMatrix>=0:x11-toolkits/p5-Tk-TableMatrix \
+	ja-p5-Text-Kakasi>=0:japanese/p5-Text-Kakasi \
+	p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+	p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+	p5-HTML-TableExtract>=0:www/p5-HTML-TableExtract \
+	p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+	p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+	p5-Lingua-Preferred>=0:textproc/p5-Lingua-Preferred \
+	p5-Unicode-String>=0:converters/p5-Unicode-String \
+	p5-Unicode-UTF8simple>=0:converters/p5-Unicode-UTF8simple \
+	p5-Lingua-EN-Numbers-Ordinate>=0:textproc/p5-Lingua-EN-Numbers-Ordinate \
+	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+	p5-HTTP-Cache-Transparent>=0:www/p5-HTTP-Cache-Transparent \
+	p5-IO-stringy>=0:devel/p5-IO-stringy \
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-File-Slurp>=0:devel/p5-File-Slurp \
+	p5-DateTime>=0:devel/p5-DateTime \
+	p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+	p5-JSON>=0:converters/p5-JSON
 
 BUILD_DEPENDS=	${XMLTV_DEPENDS}
 RUN_DEPENDS=	${XMLTV_DEPENDS}
diff --git a/textproc/pcrs/Makefile b/textproc/pcrs/Makefile
index 1e620da981d3..f41eca405c8c 100644
--- a/textproc/pcrs/Makefile
+++ b/textproc/pcrs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl-compatible regular expression based substitutions
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index a00bcbbffa54..2df34b81ec51 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool to search text in PDF files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	libpoppler.so:graphics/poppler
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lib gmake pkgconfig
diff --git a/textproc/pdfoutline/Makefile b/textproc/pdfoutline/Makefile
index 37cfc408d716..adbde4655566 100644
--- a/textproc/pdfoutline/Makefile
+++ b/textproc/pdfoutline/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Add outlines to PDF files
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-		p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2
+BUILD_DEPENDS=	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+		p5-PDF-API2>=0:textproc/p5-PDF-API2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/textproc/pear-Numbers_Words/Makefile b/textproc/pear-Numbers_Words/Makefile
index 2b9030a09534..05280c721363 100644
--- a/textproc/pear-Numbers_Words/Makefile
+++ b/textproc/pear-Numbers_Words/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc pear
 MAINTAINER=	meritus@innervision.pl
 COMMENT=	PEAR package provides methods for spelling numerals in words
 
-BUILD_DEPENDS=	${PEARDIR}/Math/BigInteger.php:${PORTSDIR}/math/pear-Math_BigInteger
-RUN_DEPENDS=	${PEARDIR}/Math/BigInteger.php:${PORTSDIR}/math/pear-Math_BigInteger
+BUILD_DEPENDS=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger
+RUN_DEPENDS=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger
 
 USES=	pear
 
diff --git a/textproc/pear-Spreadsheet_Excel_Writer/Makefile b/textproc/pear-Spreadsheet_Excel_Writer/Makefile
index eda3734af121..695bdd4fecef 100644
--- a/textproc/pear-Spreadsheet_Excel_Writer/Makefile
+++ b/textproc/pear-Spreadsheet_Excel_Writer/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PEAR class for writing Microsoft Excel files
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PEARDIR}/OLE.php:${PORTSDIR}/devel/pear-OLE
-RUN_DEPENDS=	${PEARDIR}/OLE.php:${PORTSDIR}/devel/pear-OLE
+BUILD_DEPENDS=	${PEARDIR}/OLE.php:devel/pear-OLE
+RUN_DEPENDS=	${PEARDIR}/OLE.php:devel/pear-OLE
 
 USES=	pear
 
diff --git a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
index f696556d6c85..8a98b5164de7 100644
--- a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
+++ b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using RSS files
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
 
 USES=	pear
 USE_PHP=	mysql
diff --git a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
index 69236dd77103..be73221b0123 100644
--- a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
+++ b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	DataSource driver using XML files
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
 
 USES=	pear
 USE_PHP=	mysql
diff --git a/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile b/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
index 0b741f0dffa4..5b35a4ef160c 100644
--- a/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
+++ b/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Renderer driver that generates a CSV string
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
 
 USES=	pear
 
diff --git a/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile b/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
index 44896efa6552..56e0fe91996f 100644
--- a/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
+++ b/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	textproc databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Renderer driver that generates a XLS string
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/Spreadsheet/Excel/Writer.php:${PORTSDIR}/textproc/pear-Spreadsheet_Excel_Writer
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/Spreadsheet/Excel/Writer.php:${PORTSDIR}/textproc/pear-Spreadsheet_Excel_Writer
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
+		${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
+		${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer
 
 USES=	pear
 
diff --git a/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile b/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
index ca422a65aafa..8de55e68bf3e 100644
--- a/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
+++ b/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	textproc databases www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Renderer driver that generates a XML string
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:${PORTSDIR}/databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
 
 USES=	pear
 
diff --git a/textproc/pear-Symfony_Component_Yaml/Makefile b/textproc/pear-Symfony_Component_Yaml/Makefile
index 7b41ea6ec0c5..0ddcfeec3849 100644
--- a/textproc/pear-Symfony_Component_Yaml/Makefile
+++ b/textproc/pear-Symfony_Component_Yaml/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Symfony2 Yaml 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/textproc/pear-Text_Highlighter/Makefile b/textproc/pear-Text_Highlighter/Makefile
index fae79bee9b0e..dafa90919599 100644
--- a/textproc/pear-Text_Highlighter/Makefile
+++ b/textproc/pear-Text_Highlighter/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Syntax highlighting
 
-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/textproc/pear-Text_Template/Makefile b/textproc/pear-Text_Template/Makefile
index a1a753499276..eddb8c71abdd 100644
--- a/textproc/pear-Text_Template/Makefile
+++ b/textproc/pear-Text_Template/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Simple template engine
 
-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/textproc/pear-XML_Beautifier/Makefile b/textproc/pear-XML_Beautifier/Makefile
index 7ff830db5b4d..617c00342e80 100644
--- a/textproc/pear-XML_Beautifier/Makefile
+++ b/textproc/pear-XML_Beautifier/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	textproc devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to format XML documents
 
-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/textproc/pear-XML_DTD/Makefile b/textproc/pear-XML_DTD/Makefile
index 85957c97ab0f..860e549184df 100644
--- a/textproc/pear-XML_DTD/Makefile
+++ b/textproc/pear-XML_DTD/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Parsing of DTD files and DTD validation of XML files
 
-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=		dos2unix pear
 
diff --git a/textproc/pear-XML_Wddx/Makefile b/textproc/pear-XML_Wddx/Makefile
index 0590152a1cad..0963ffb777d3 100644
--- a/textproc/pear-XML_Wddx/Makefile
+++ b/textproc/pear-XML_Wddx/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	textproc devel pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR Wddx pretty serializer and deserializer
 
-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/textproc/pear-YAML/Makefile b/textproc/pear-YAML/Makefile
index ffb6c1f5dd8b..c785563b5a2d 100644
--- a/textproc/pear-YAML/Makefile
+++ b/textproc/pear-YAML/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	pear-
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	The Symfony YAML Component
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony-project.com.reg:${PORTSDIR}/devel/pear-channel-symfony
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony-project.com.reg:${PORTSDIR}/devel/pear-channel-symfony
+BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony
+RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony
 
 USES=	pear
 PEAR_CHANNEL=	symfony
diff --git a/textproc/pecl-cld/Makefile b/textproc/pecl-cld/Makefile
index 9b8f0f2801f7..505689ed9c78 100644
--- a/textproc/pecl-cld/Makefile
+++ b/textproc/pecl-cld/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP Bindings for Chromium Compact Language Detector
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcld.so:${PORTSDIR}/devel/cld
+LIB_DEPENDS=	libcld.so:devel/cld
 
 CONFIGURE_ARGS=	--enable-cld --with-libcld-dir=${LOCALBASE}/lib
 USES=		tar:tgz
diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile
index 6017e0fe0389..d783285c1b36 100644
--- a/textproc/pecl-ctemplate/Makefile
+++ b/textproc/pecl-ctemplate/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	PECL extension for ctemplate library
 
-LIB_DEPENDS=	libctemplate.so:${PORTSDIR}/textproc/google-ctemplate
+LIB_DEPENDS=	libctemplate.so:textproc/google-ctemplate
 
 USES=		tar:xz
 USE_PHP=	yes
diff --git a/textproc/pecl-enchant/Makefile b/textproc/pecl-enchant/Makefile
index bf33d1cfee30..b0dd2fc71106 100644
--- a/textproc/pecl-enchant/Makefile
+++ b/textproc/pecl-enchant/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Libenchant Binder that Support Near All Spelling Tools
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/textproc/pecl-html_parse/Makefile b/textproc/pecl-html_parse/Makefile
index 60580410830e..54f3e287819b 100644
--- a/textproc/pecl-html_parse/Makefile
+++ b/textproc/pecl-html_parse/Makefile
@@ -13,8 +13,8 @@ COMMENT=	PECL extension for the ekhtml library
 
 LICENSE=	PHP30
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libekhtml.a:${PORTSDIR}/textproc/ekhtml
-RUN_DEPENDS=	${LOCALBASE}/lib/libekhtml.a:${PORTSDIR}/textproc/ekhtml
+BUILD_DEPENDS=	${LOCALBASE}/lib/libekhtml.a:textproc/ekhtml
+RUN_DEPENDS=	${LOCALBASE}/lib/libekhtml.a:textproc/ekhtml
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/textproc/pecl-syck/Makefile b/textproc/pecl-syck/Makefile
index f7231b4a885a..6dd3d9612442 100644
--- a/textproc/pecl-syck/Makefile
+++ b/textproc/pecl-syck/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension which facilitates YAML parsing
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libsyck.a:${PORTSDIR}/textproc/syck
+BUILD_DEPENDS=	${LOCALBASE}/lib/libsyck.a:textproc/syck
 
 USES=		tar:tgz
 USE_PHP=	spl hash
diff --git a/textproc/pecl-wbxml/Makefile b/textproc/pecl-wbxml/Makefile
index 61eb5ad60f51..3509541e14ea 100644
--- a/textproc/pecl-wbxml/Makefile
+++ b/textproc/pecl-wbxml/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	PECL extension that provides WBXML conversion capabilities
 
-LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
+LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
 USES=tar:tgz
 
diff --git a/textproc/pecl-xdiff/Makefile b/textproc/pecl-xdiff/Makefile
index 15d1678e91b4..83eb1017a606 100644
--- a/textproc/pecl-xdiff/Makefile
+++ b/textproc/pecl-xdiff/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PECL extension to create/apply binary and text patches
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libxdiff.so:${PORTSDIR}/textproc/libxdiff
+LIB_DEPENDS=	libxdiff.so:textproc/libxdiff
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/textproc/pecl-yaml/Makefile b/textproc/pecl-yaml/Makefile
index be8d8d15f99e..c9a4589a21c1 100644
--- a/textproc/pecl-yaml/Makefile
+++ b/textproc/pecl-yaml/Makefile
@@ -14,7 +14,7 @@ COMMENT=	YAML-1.1 parser and emitter
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/textproc/peco/Makefile b/textproc/peco/Makefile
index d5ccaedd0757..2d2af4af0a62 100644
--- a/textproc/peco/Makefile
+++ b/textproc/peco/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Simplistic interactive filtering tool
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/jessevdk/go-flags.a:${PORTSDIR}/devel/go-flags \
-		${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:${PORTSDIR}/devel/go-runewidth \
-		${LOCALBASE}/${GO_LIBDIR}/github.com/nsf/termbox-go.a:${PORTSDIR}/devel/go-termbox \
-		${LOCALBASE}/${GO_LIBDIR}/github.com/google/btree.a:${PORTSDIR}/devel/go-btree
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/github.com/jessevdk/go-flags.a:devel/go-flags \
+		${LOCALBASE}/${GO_LIBDIR}/github.com/mattn/go-runewidth.a:devel/go-runewidth \
+		${LOCALBASE}/${GO_LIBDIR}/github.com/nsf/termbox-go.a:devel/go-termbox \
+		${LOCALBASE}/${GO_LIBDIR}/github.com/google/btree.a:devel/go-btree
 
 USE_GITHUB=	yes
 
diff --git a/textproc/php-mecab/Makefile b/textproc/php-mecab/Makefile
index 363dc0fd9a14..65bf0af64924 100644
--- a/textproc/php-mecab/Makefile
+++ b/textproc/php-mecab/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PHP bindings of the MeCab
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libmecab.so:${PORTSDIR}/japanese/mecab
+LIB_DEPENDS=	libmecab.so:japanese/mecab
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsky
diff --git a/textproc/plover/Makefile b/textproc/plover/Makefile
index 39b45351babe..0c460a603737 100644
--- a/textproc/plover/Makefile
+++ b/textproc/plover/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Open source solution for stenography
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>=0:${PORTSDIR}/x11-toolkits/py-xlib \
-		${PYTHON_PKGNAMEPREFIX}serial>=0:${PORTSDIR}/comms/py-serial \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib \
+		${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 045f50962d2d..5e957982b482 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Brings gettext translation tools to all kinds of docs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \
-		libtext-wrapi18n-perl>=0.06:${PORTSDIR}/textproc/libtext-wrapi18n-perl \
-		p5-SGMLSpm>=1.03:${PORTSDIR}/textproc/p5-SGMLSpm \
-		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		jade>=0:${PORTSDIR}/textproc/jade \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	p5-Term-ReadKey>=2.30:devel/p5-Term-ReadKey \
+		libtext-wrapi18n-perl>=0.06:textproc/libtext-wrapi18n-perl \
+		p5-SGMLSpm>=1.03:textproc/p5-SGMLSpm \
+		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
+		jade>=0:textproc/jade \
+		xsltproc:textproc/libxslt \
+		docbook-xsl>0:textproc/docbook-xsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gettext perl5
diff --git a/textproc/pootle/Makefile b/textproc/pootle/Makefile
index c16a228b0004..3fa611d0c238 100644
--- a/textproc/pootle/Makefile
+++ b/textproc/pootle/Makefile
@@ -14,17 +14,17 @@ COMMENT=	User-friendly web portal for simple translation process
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	translate-toolkit>=1.11.0:${PORTSDIR}/textproc/translate-toolkit \
-		${PYTHON_PKGNAMEPREFIX}south>=0.7.6:${PORTSDIR}/databases/py-south\
-		${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:${PORTSDIR}/www/py-cssmin \
-		${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}argparse>=0:${PORTSDIR}/devel/py-argparse \
-		${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:${PORTSDIR}/www/py-django-taggit \
-		${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:${PORTSDIR}/www/py-django-assets \
-		${PYTHON_PKGNAMEPREFIX}south>=0.7.6:${PORTSDIR}/databases/py-south \
-		${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:${PORTSDIR}/www/py-django-voting \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:${PORTSDIR}/textproc/py-diff-match-patch
+RUN_DEPENDS=	translate-toolkit>=1.11.0:textproc/translate-toolkit \
+		${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south\
+		${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin \
+		${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse \
+		${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit \
+		${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets \
+		${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south \
+		${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch
 # actually diff-match-patch is a dependency of translate-toolkit,
 # but only this port uses it.
 
@@ -50,16 +50,16 @@ MEMCACHED_DESC=	Use memcached to improve performance
 
 MYSQL_USE=	MYSQL=yes
 
-LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>0:${PORTSDIR}/devel/py-ldap2
+LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2
 
-MEMCACHED_LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
-MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:${PORTSDIR}/databases/py-python-memcached
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached
 
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb
 
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
 
-SUBVERSION_RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
+SUBVERSION_RUN_DEPENDS=	svn:devel/subversion
 
 pre-configure:
 	@${REINPLACE_CMD} -e "s/,<0.11.2//g" \
diff --git a/textproc/py-chardet/Makefile b/textproc/py-chardet/Makefile
index f47b3da9fe3c..ca41302a77ac 100644
--- a/textproc/py-chardet/Makefile
+++ b/textproc/py-chardet/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Universal encoding detector for Python 2 and 3
 LICENSE=	LGPL21
 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_GITHUB=	yes
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index 52bb710e32b2..d01b2955a570 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sphinx theme
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index c136e4d8d8ee..471b432f6dc4 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Markup converter in pure Python
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-curator/Makefile b/textproc/py-curator/Makefile
index db845d7ed25f..37ac0c4f4bb6 100644
--- a/textproc/py-curator/Makefile
+++ b/textproc/py-curator/Makefile
@@ -12,9 +12,9 @@ COMMENT=		Python index manager for Elasticsearch
 
 LICENSE=		APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:${PORTSDIR}/net/py-urllib3 \
-		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:${PORTSDIR}/textproc/py-elasticsearch-py \
-		${PYTHON_PKGNAMEPREFIX}click>=3.3:${PORTSDIR}/devel/py-click
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3 \
+		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py \
+		${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index c0167efddd7f..cf9eeeafa3dd 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -24,7 +24,7 @@ BIN_SCRIPTS=	rst2html.py rst2s5.py rst2latex.py rst2xetex.py \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYGMENTS}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments
 .endif
 
 post-install:
diff --git a/textproc/py-elasticsearch-dsl-py/Makefile b/textproc/py-elasticsearch-dsl-py/Makefile
index f1f566bb68bd..615bf29d9934 100644
--- a/textproc/py-elasticsearch-dsl-py/Makefile
+++ b/textproc/py-elasticsearch-dsl-py/Makefile
@@ -11,7 +11,7 @@ COMMENT=	High level Python client for Elasticsearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:${PORTSDIR}/textproc/py-elasticsearch-py
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
diff --git a/textproc/py-elasticsearch-py/Makefile b/textproc/py-elasticsearch-py/Makefile
index c2b4e3814f1f..2b1ddd8e0908 100644
--- a/textproc/py-elasticsearch-py/Makefile
+++ b/textproc/py-elasticsearch-py/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Official Python low-level client for Elasticsearch
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:${PORTSDIR}/net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elasticsearch
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index 047295d75d40..f63c3373a7a4 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Spellchecking library for Python based on the Enchant library
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
+LIB_DEPENDS=	libenchant.so:textproc/enchant
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index e3bd3c83664d..29245ef31d45 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -23,7 +23,7 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBABEL}
-RUN_DEPENDS+=	${PKGNAMEPREFIX}Babel>=0.9.6:${PORTSDIR}/devel/py-babel
+RUN_DEPENDS+=	${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/py-libtre/Makefile b/textproc/py-libtre/Makefile
index a7d14ee2f71d..5ced1e699cd2 100644
--- a/textproc/py-libtre/Makefile
+++ b/textproc/py-libtre/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	tre-${PORTVERSION}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Python interface for the tre regular expressions library
 
-LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libtre.so:textproc/libtre
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/textproc/py-ltxml/Makefile b/textproc/py-ltxml/Makefile
index f73ed2c50a51..466289c6b4f4 100644
--- a/textproc/py-ltxml/Makefile
+++ b/textproc/py-ltxml/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	PyLTXML-${PORTVERSION}
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	Python bindings to the LT XML toolkit
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ltxml12/lt-safe.h:${PORTSDIR}/textproc/ltxml
+BUILD_DEPENDS=	${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/textproc/py-mako/Makefile b/textproc/py-mako/Makefile
index c2df25dfdccf..0043b70ef9df 100644
--- a/textproc/py-mako/Makefile
+++ b/textproc/py-mako/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Super-fast templating language in Python
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beaker>=1.1:${PORTSDIR}/www/py-beaker \
-		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:${PORTSDIR}/textproc/py-MarkupSafe \
-		${PYTHON_PKGNAMEPREFIX}Babel>0:${PORTSDIR}/devel/py-babel
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \
+		${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index c6c62c181d88..148d563862e0 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Python implementation of Markdown
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}pytidylib>0:${PORTSDIR}/textproc/py-pytidylib \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index 4be5ed898855..2ca58918f4d9 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fastest markdown parser in pure Python
 LICENSE=	BSD3CLAUSE
 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 distutils
diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile
index e659e3a13a69..9a266d3566f8 100644
--- a/textproc/py-nltk/Makefile
+++ b/textproc/py-nltk/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Natural language toolkit written in python
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.09:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index 1956fb41b439..f7a7d06304b0 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python library to read/write Excel 2007 xlsx/xlsm files
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jdcal>=0:${PORTSDIR}/devel/py-jdcal \
-		${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:${PORTSDIR}/textproc/py-et_xmlfile
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal \
+		${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}openpyxl1-[0-9]*
 
diff --git a/textproc/py-paragrep/Makefile b/textproc/py-paragrep/Makefile
index e69626f9a066..8f3519446506 100644
--- a/textproc/py-paragrep/Makefile
+++ b/textproc/py-paragrep/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Paragraph Grep Utility
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:${PORTSDIR}/devel/py-grizzled
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/textproc/py-pyctpp2/Makefile b/textproc/py-pyctpp2/Makefile
index 6ba34091527f..329e2e371e9b 100644
--- a/textproc/py-pyctpp2/Makefile
+++ b/textproc/py-pyctpp2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python interface to CTPP2 library
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libctpp2.so:${PORTSDIR}/textproc/ctpp2
+LIB_DEPENDS=	libctpp2.so:textproc/ctpp2
 
 # Python3 ready
 USES=		python
diff --git a/textproc/py-pyelasticsearch/Makefile b/textproc/py-pyelasticsearch/Makefile
index d77ac78664a7..ca74cc8fea49 100644
--- a/textproc/py-pyelasticsearch/Makefile
+++ b/textproc/py-pyelasticsearch/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Flexible, high-scale API to elasticsearch
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:${PORTSDIR}/security/py-certifi \
-		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:${PORTSDIR}/textproc/py-elasticsearch-py \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:${PORTSDIR}/net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi \
+		${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-pyes/Makefile b/textproc/py-pyes/Makefile
index 17421f505fa7..f28d716c4abf 100644
--- a/textproc/py-pyes/Makefile
+++ b/textproc/py-pyes/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Python connector for ElasticSearch - the pythonic way to use ElasticSearch
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}urllib3>=0:${PORTSDIR}/net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-pyhwp/Makefile b/textproc/py-pyhwp/Makefile
index 8c9758ed9939..40ec70ab471e 100644
--- a/textproc/py-pyhwp/Makefile
+++ b/textproc/py-pyhwp/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	HWP Document Format v5 parser & processor
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}wheel>0:${PORTSDIR}/devel/py-wheel \
-		${PYTHON_PKGNAMEPREFIX}olefile>=0.40:${PORTSDIR}/devel/py-olefile \
-		${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:${PORTSDIR}/textproc/py-hypua2jamo \
-		${PYTHON_PKGNAMEPREFIX}docopt>0:${PORTSDIR}/devel/py-docopt
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel \
+		${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile \
+		${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo \
+		${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		python zip
diff --git a/textproc/py-pyscss/Makefile b/textproc/py-pyscss/Makefile
index 38af9e8dde53..f75fbd9c07ed 100644
--- a/textproc/py-pyscss/Makefile
+++ b/textproc/py-pyscss/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Compiler for SCSS flavor of the Sass language
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+LIB_DEPENDS=	libpcre.so:devel/pcre
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Kronuz
diff --git a/textproc/py-pysrt/Makefile b/textproc/py-pysrt/Makefile
index 6808466e8bfc..c359a834f03f 100644
--- a/textproc/py-pysrt/Makefile
+++ b/textproc/py-pysrt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	SubRip (.srt) subtitle parser and writer
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-python-augeas/Makefile b/textproc/py-python-augeas/Makefile
index 961419e9eeee..62e1f04f46d3 100644
--- a/textproc/py-python-augeas/Makefile
+++ b/textproc/py-python-augeas/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Pure python bindings for Augeas
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaugeas.so:${PORTSDIR}/textproc/augeas
+LIB_DEPENDS=	libaugeas.so:textproc/augeas
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/textproc/py-python-docx/Makefile b/textproc/py-python-docx/Makefile
index bae630f2df5c..1e01cb2d2f6a 100644
--- a/textproc/py-python-docx/Makefile
+++ b/textproc/py-python-docx/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python library for creating and updating Microsoft Word files
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml
 
 # Python3 ready
 USES=		python
diff --git a/textproc/py-pytidylib/Makefile b/textproc/py-pytidylib/Makefile
index 919db37d0d74..628c78e859ea 100644
--- a/textproc/py-pytidylib/Makefile
+++ b/textproc/py-pytidylib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python wrapper for HTML Tidy (tidylib)
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index 2494aa326845..29972c528297 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -12,8 +12,8 @@ COMMENT=	QR Code image generator
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-qt4-xml/Makefile b/textproc/py-qt4-xml/Makefile
index f061ab48a5e0..77e4215503a5 100644
--- a/textproc/py-qt4-xml/Makefile
+++ b/textproc/py-qt4-xml/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtXml 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/textproc/py-qt4-xmlpatterns/Makefile b/textproc/py-qt4-xmlpatterns/Makefile
index 22a34fe2f2dc..27af639456b2 100644
--- a/textproc/py-qt4-xmlpatterns/Makefile
+++ b/textproc/py-qt4-xmlpatterns/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtXmlPatterns 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/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index 1851bf85dc03..1ec5ca6887e1 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtXml 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/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index b7a9e65828d5..2f183406642c 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -20,7 +20,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtXmlPatterns 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/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index 34491a5fa11e..55fecf1712bc 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python library for RDF manipulation
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}isodate>=0:${PORTSDIR}/devel/py-isodate \
-	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:${PORTSDIR}/devel/py-pyparsing \
-	${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:${PORTSDIR}/textproc/py-sparqlwrapper \
-	${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate \
+	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \
+	${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper \
+	${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index ac8e727e8cc0..b9655b7b93ae 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Produces HTML5 documents from reStructuredText sources
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:${PORTSDIR}/textproc/py-genshi \
-	${PYTHON_PKGNAMEPREFIX}pygments>=2.0:${PORTSDIR}/textproc/py-pygments \
-	${PYTHON_PKGNAMEPREFIX}docutils>=0.12:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi \
+	${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \
+	${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 66c63f7c98fb..ca7ab14fb88b 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Embed YouTube videos in reStructuredText documents
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils
 
 USES=	python:2
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-snowballstemmer/Makefile b/textproc/py-snowballstemmer/Makefile
index fcb092ca1972..f382e1606294 100644
--- a/textproc/py-snowballstemmer/Makefile
+++ b/textproc/py-snowballstemmer/Makefile
@@ -22,7 +22,7 @@ PYSTEMMER_DESC=	Use PyStemmer to accelerate
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYSTEMMER}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pystemmer>0:${PORTSDIR}/textproc/py-pystemmer
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx-intl/Makefile b/textproc/py-sphinx-intl/Makefile
index c1366e187ce6..1dde6d4f6c77 100644
--- a/textproc/py-sphinx-intl/Makefile
+++ b/textproc/py-sphinx-intl/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Sphinx-intl translation features
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx \
-		${PKGNAMEPREFIX}polib>=1.0.6:${PORTSDIR}/devel/py-polib \
-		${PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx \
+		${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib \
+		${PKGNAMEPREFIX}six>=1.8.0:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 8060c72fe761..afa813cd5e57 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -15,18 +15,18 @@ COMMENT=	Python documentation generator
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel\
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
-		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:${PORTSDIR}/textproc/py-sphinx_rtd_theme \
-		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:${PORTSDIR}/textproc/py-alabaster \
-		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:${PORTSDIR}/textproc/py-snowballstemmer \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel\
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme \
+		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster \
+		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-sphinx_numfig/Makefile b/textproc/py-sphinx_numfig/Makefile
index 72eac0707b2e..c27e9e13ef21 100644
--- a/textproc/py-sphinx_numfig/Makefile
+++ b/textproc/py-sphinx_numfig/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Autonumbering figures in Sphinx
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:${PORTSDIR}/textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx
 
 USES=		python tar:tgz
 NO_BUILD=	yes
diff --git a/textproc/py-sphinx_wikipedia/Makefile b/textproc/py-sphinx_wikipedia/Makefile
index ed539a77a18c..4186f6c15869 100644
--- a/textproc/py-sphinx_wikipedia/Makefile
+++ b/textproc/py-sphinx_wikipedia/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Sphinx extension which adds role to create links to Wikipedia articles
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:${PORTSDIR}/textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx
 
 USES=		python
 NO_BUILD=	yes
diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile
index 6d10e49bcd30..9e75feaab94e 100644
--- a/textproc/py-sphinxcontrib-adadomain/Makefile
+++ b/textproc/py-sphinxcontrib-adadomain/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Sphinx Adadomain Extension
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-bitbucket/Makefile b/textproc/py-sphinxcontrib-bitbucket/Makefile
index f1585dc4c3cc..c5a1a8b3befd 100644
--- a/textproc/py-sphinxcontrib-bitbucket/Makefile
+++ b/textproc/py-sphinxcontrib-bitbucket/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Sphinx/BitBucket integration
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-httpdomain/Makefile b/textproc/py-sphinxcontrib-httpdomain/Makefile
index b886d1b5c762..4f12e11b019a 100644
--- a/textproc/py-sphinxcontrib-httpdomain/Makefile
+++ b/textproc/py-sphinxcontrib-httpdomain/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Sphinx domain for HTTP APIs
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-sphinxcontrib-programoutput/Makefile b/textproc/py-sphinxcontrib-programoutput/Makefile
index 0c3e135eed96..fc13be4a8494 100644
--- a/textproc/py-sphinxcontrib-programoutput/Makefile
+++ b/textproc/py-sphinxcontrib-programoutput/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Sphinx extension to include program output
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:${PORTSDIR}/textproc/py-sphinx
+RUN_DEPENDS=	${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-syck/Makefile b/textproc/py-syck/Makefile
index b76bd894bb60..569c549c6604 100644
--- a/textproc/py-syck/Makefile
+++ b/textproc/py-syck/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	PySyck-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python binding for Syck, a YAML parser and emitter
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libsyck.a:${PORTSDIR}/textproc/syck
+BUILD_DEPENDS=	${LOCALBASE}/lib/libsyck.a:textproc/syck
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-toronado/Makefile b/textproc/py-toronado/Makefile
index 388c29b704d8..e784ffe3bcc5 100644
--- a/textproc/py-toronado/Makefile
+++ b/textproc/py-toronado/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Fast lxml-based CSS stylesheet inliner
 
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}cssselect>=0:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-transifex-client/Makefile b/textproc/py-transifex-client/Makefile
index 2b4c9ad05efc..a7d23e86c2df 100644
--- a/textproc/py-transifex-client/Makefile
+++ b/textproc/py-transifex-client/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Command line interface for Transifex
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:${PORTSDIR}/net/py-urllib3
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/textproc/py-wicked/Makefile b/textproc/py-wicked/Makefile
index d00a75a9df06..afddd45c4109 100644
--- a/textproc/py-wicked/Makefile
+++ b/textproc/py-wicked/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Compact syntax for doing wiki-like content linking and creation
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:${PORTSDIR}/devel/py-zope.lifecycleevent \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile
index 0615109d4368..176132d82bdc 100644
--- a/textproc/py-wtforms/Makefile
+++ b/textproc/py-wtforms/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Flexible forms validation and rendering library for python
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:${PORTSDIR}/devel/py-babel
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:${PORTSDIR}/devel/py-coverage \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:${PORTSDIR}/databases/py-sqlalchemy-devel \
-		${PYTHON_PKGNAMEPREFIX}pep8>0:${PORTSDIR}/devel/pep8 \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy08>0:databases/py-sqlalchemy-devel \
+		${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 OPTIONS_DEFINE=		DOCS
 
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 7122c554a7fd..4fbb190fc92d 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Utilities for working with Excel files that require both xlrd and xlwt
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:${PORTSDIR}/textproc/py-xlrd \
-				${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:${PORTSDIR}/textproc/py-xlwt
+BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd \
+				${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt
 RUN_DEPENDS:=   ${BUILD_DEPENDS}
 
 USES=		python:2
diff --git a/textproc/py-zope.app.i18n/Makefile b/textproc/py-zope.app.i18n/Makefile
index 363429629299..76c488ddcca0 100644
--- a/textproc/py-zope.app.i18n/Makefile
+++ b/textproc/py-zope.app.i18n/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Persistent translation domains and message catalogs
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${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.security>=0:${PORTSDIR}/security/py-zope.security \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${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.security>=0:security/py-zope.security \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-zope.app.locales/Makefile b/textproc/py-zope.app.locales/Makefile
index c13045569d93..278a8bc1b760 100644
--- a/textproc/py-zope.app.locales/Makefile
+++ b/textproc/py-zope.app.locales/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Zope locale extraction and management utilities
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:${PORTSDIR}/textproc/py-zope.tal \
-		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:${PORTSDIR}/devel/py-zope.app.applicationcontrol \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:${PORTSDIR}/devel/py-zope.app.appsetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \
+		${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/py-zope.tal/Makefile b/textproc/py-zope.tal/Makefile
index 1232116ec407..492609142e41 100644
--- a/textproc/py-zope.tal/Makefile
+++ b/textproc/py-zope.tal/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Zope Template Application Language (TAL)
 
 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 zip
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/pychm/Makefile b/textproc/pychm/Makefile
index 7d539349484c..82718ae604bd 100644
--- a/textproc/pychm/Makefile
+++ b/textproc/pychm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bindings for CHMLIB library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	libchm.so:misc/chmlib
 
 NO_BUILD=	yes
 USES=		python:2
diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile
index ee5cda9b9067..74a5b09a84fd 100644
--- a/textproc/queequeg/Makefile
+++ b/textproc/queequeg/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Tiny English grammar checker
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	wn:${PORTSDIR}/textproc/wordnet \
-		${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
+BUILD_DEPENDS=	wn:textproc/wordnet \
+		${PYTHON_SITELIBDIR}/cdbmodule.so:databases/py-cdb
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cdbmodule.so:databases/py-cdb
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	*.py misc/*.py qq
diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile
index e678b3120663..1da07c538f6c 100644
--- a/textproc/randlm/Makefile
+++ b/textproc/randlm/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A toolkit for building randomized language models
 
-BUILD_DEPENDS=	${LOCALBASE}/include/google/sparse_hash_map:${PORTSDIR}/devel/google-sparsehash
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/include/google/sparse_hash_map:${PORTSDIR}/devel/google-sparsehash
+BUILD_DEPENDS=	${LOCALBASE}/include/google/sparse_hash_map:devel/google-sparsehash
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/include/google/sparse_hash_map:devel/google-sparsehash
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	run
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 736d412fc395..7177769ba5e1 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RDF Parser Toolkit for Redland
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		libtool pathfix
 USE_GNOME=	libxml2
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 95ee671d3c7e..783503a42b57 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -16,9 +16,9 @@ COMMENT=	RDF Parser Toolkit for Redland
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libicuuc.so:${PORTSDIR}/devel/icu \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libicuuc.so:devel/icu \
+		libyajl.so:devel/yajl
 
 CONFLICTS=	raptor-1.4.1[0-9]* raptor-1.4.21
 
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 088122b328a6..a59d5cd5df25 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -11,13 +11,13 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OMF help system based on the Freedesktop specification
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+		docbook-xml>0:textproc/docbook-xml \
+		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/bin/getopt:misc/getopt \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+		docbook-xml>0:textproc/docbook-xml
 
 DOCBOOK_VERSION=4.2
 
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index d73f0e962773..6a90a700329e 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -15,8 +15,8 @@ COMMENT=	High-level interface for RDF
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libraptor2.so:${PORTSDIR}/textproc/raptor2 \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libraptor2.so:textproc/raptor2 \
+		libpcre.so:devel/pcre
 
 USES=		gmake libtool pathfix perl5 pkgconfig
 USE_OPENSSL=	yes
@@ -31,9 +31,9 @@ GMP_DESC=	Use GMP library for decimals
 MPFR_DESC=	Use MPFR library for decimals
 
 GMP_CONFIGURE_ON=	--with-decimal=gmp --with-gmp=${LOCALBASE}
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 MPFR_CONFIGURE_ON=	--with-decimal=mpfr --with-mpfr=${LOCALBASE}
-MPFR_LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+MPFR_LIB_DEPENDS=	libmpfr.so:math/mpfr
 
 .include <bsd.port.options.mk>
 
diff --git a/textproc/re_graph/Makefile b/textproc/re_graph/Makefile
index c229a8780bf6..f929d7a162f7 100644
--- a/textproc/re_graph/Makefile
+++ b/textproc/re_graph/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Regular Expression Graphing Program
 
-RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-Arrow>=0:${PORTSDIR}/graphics/p5-GD-Arrow
+RUN_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-GD-Arrow>=0:graphics/p5-GD-Arrow
 
 USES=		perl5
 NO_WRKSUBDIR=	yes
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index d16ce3ba1ea9..d2d8eadebd20 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.billposer.org/Software/Downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual regexp development and execution
 
-RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
+RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index aa62d9108c4f..14e7bdd03aaf 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Language bindings for the Redland package
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	librdf.so:${PORTSDIR}/textproc/redland
+LIB_DEPENDS=	librdf.so:textproc/redland
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index 8f9bb18c8d29..9647e70f9b7c 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -15,9 +15,9 @@ COMMENT=	High-level interface for RDF
 LICENSE=	APACHE20 GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libraptor2.so:${PORTSDIR}/textproc/raptor2 \
-		librasqal.so:${PORTSDIR}/textproc/rasqal
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libraptor2.so:textproc/raptor2 \
+		librasqal.so:textproc/rasqal
 
 USE_PERL5=	build
 USES=		gmake libtool pathfix perl5 pkgconfig shebangfix
@@ -70,7 +70,7 @@ PLIST_SUB+=	SQLITE="@comment "
 
 #.if defined(WITH_VIRTUOSO)
 #CONFIGURE_ARGS+=--with-virtuoso=yes
-#LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+#LIB_DEPENDS+=	iodbc.3:databases/libiodbc
 #PLIST_SUB+=	VIRTUOSO=""
 #.else
 CONFIGURE_ARGS+=--with-virtuoso=no
diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index 28fdc9e17b13..6330c2b53bbc 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
 MAINTAINER=	ohartman@zedat.fu-berlin.de
 COMMENT=	Bibliographic reference database
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libbtparse.so:${PORTSDIR}/textproc/btparse \
-		libdbi.so:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libbtparse.so:textproc/btparse \
+		libdbi.so:databases/libdbi
 
 USES=		gmake iconv readline perl5 libtool pkgconfig pathfix shebangfix
 HAS_CONFIGURE=	yes
@@ -35,8 +35,8 @@ OPTIONS_EXCLUDE=	CATALOG 	# may not be implemented correctly
 CATALOG_DESC=		Install SGML catalog
 
 OPTIONS_DEFAULT=	PGSQL
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-			docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+			docbook-xsl>=0:textproc/docbook-xsl
 
 SHEBANG_FILES=	${WRKSRC}/scripts/*
 
@@ -50,7 +50,7 @@ USE_MYSQL=	yes
 .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdmysql.so)
 IGNORE=		rebuild databases/libdbi-drivers with MySQL support
 .elif !exists(${LOCALBASE}/lib/dbd)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:${PORTSDIR}/databases/libdbi-drivers
+BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:databases/libdbi-drivers
 .endif
 CONFIGURE_ARGS+=	--with-db-server=mysql
 
@@ -60,17 +60,17 @@ USES+=	pgsql
 .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdpgsql.so)
 IGNORE=		rebuild databases/libdbi-drivers with PostgreSQL support
 .elif !exists(${LOCALBASE}/lib/dbd)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:${PORTSDIR}/databases/libdbi-drivers
+BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:databases/libdbi-drivers
 .endif
 CONFIGURE_ARGS+=	--with-db-server=pgsql
 
 .elif ${PORT_OPTIONS:MSQLITE}
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 # If libdbi-drivers has been built without SQLite driver, abort
 .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdsqlite3.so)
 IGNORE=		rebuild databases/libdbi-drivers with SQLite support
 .elif !exists(${LOCALBASE}/lib/dbd)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:${PORTSDIR}/databases/libdbi-drivers
+BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:databases/libdbi-drivers
 .endif
 CONFIGURE_ARGS+=	--with-db-server=sqlite
 .endif
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--disable-docs
 .endif
 
 .if ${PORT_OPTIONS:MCATALOG}
-RUN_DEPENDS+=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS+=	xmlcatmgr:textproc/xmlcatmgr
 .endif
 
 post-patch:
diff --git a/textproc/resume-extensions/Makefile b/textproc/resume-extensions/Makefile
index 1070a987dcd1..25cb61f18036 100644
--- a/textproc/resume-extensions/Makefile
+++ b/textproc/resume-extensions/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	xml${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extends the XML Resume library
 
-RUN_DEPENDS=	resume>0:${PORTSDIR}/textproc/resume \
-		${LOCALBASE}/share/xsl/string/print-n-times.xsl:${PORTSDIR}/textproc/print-n-times \
-		${LOCALBASE}/share/xsl/xhtml/add-css-links.xsl:${PORTSDIR}/textproc/add-css-links
+RUN_DEPENDS=	resume>0:textproc/resume \
+		${LOCALBASE}/share/xsl/string/print-n-times.xsl:textproc/print-n-times \
+		${LOCALBASE}/share/xsl/xhtml/add-css-links.xsl:textproc/add-css-links
 
 NO_BUILD=	yes
 
diff --git a/textproc/rfcdiff/Makefile b/textproc/rfcdiff/Makefile
index be48d2a156e8..c9ad393d3851 100644
--- a/textproc/rfcdiff/Makefile
+++ b/textproc/rfcdiff/Makefile
@@ -12,9 +12,9 @@ EXTRACT_SUFX=
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	Compare two versions of an Internet Draft and produce a diff
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		gawk:${PORTSDIR}/lang/gawk \
-		wdiff:${PORTSDIR}/textproc/wdiff
+RUN_DEPENDS=	bash:shells/bash \
+		gawk:lang/gawk \
+		wdiff:textproc/wdiff
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
diff --git a/textproc/rnv/Makefile b/textproc/rnv/Makefile
index b5fc0694c974..1df91804a66d 100644
--- a/textproc/rnv/Makefile
+++ b/textproc/rnv/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Relax NG Compact Syntax validator
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		tar:xz
 GNU_CONFIGURE=	yes
diff --git a/textproc/rss2html/Makefile b/textproc/rss2html/Makefile
index de157213a20c..1b1415ca6441 100644
--- a/textproc/rss2html/Makefile
+++ b/textproc/rss2html/Makefile
@@ -12,7 +12,7 @@ COMMENT=	RSS to HTML converter
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	"-I${LOCALBASE}/include" "-L${LOCALBASE}/lib"
diff --git a/textproc/rtfx/Makefile b/textproc/rtfx/Makefile
index d203bcba8b15..271d03818aa1 100644
--- a/textproc/rtfx/Makefile
+++ b/textproc/rtfx/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://thewalter.net/stef/software/rtfx/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RTF to XML converter
 
-LIB_DEPENDS=	libmba.so:${PORTSDIR}/devel/libmba \
-		libdomc.so:${PORTSDIR}/textproc/domc
+LIB_DEPENDS=	libmba.so:devel/libmba \
+		libdomc.so:textproc/domc
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/textproc/ruby-htmlrepair/Makefile b/textproc/ruby-htmlrepair/Makefile
index 0b41f28e74d7..8ba465e6fe67 100644
--- a/textproc/ruby-htmlrepair/Makefile
+++ b/textproc/ruby-htmlrepair/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby library to repair unclosed tags in an HTML document
 
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/htmlsplit.rb:${PORTSDIR}/textproc/ruby-htmlsplit
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/htmlsplit.rb:textproc/ruby-htmlsplit
 
 PLIST_FILES=	%%RUBY_SITELIBDIR%%/htmlrepair.rb
 USES=		zip
diff --git a/textproc/ruby-rd-mode.el/Makefile b/textproc/ruby-rd-mode.el/Makefile
index 34dbe3bcca33..fe1d80c2c10f 100644
--- a/textproc/ruby-rd-mode.el/Makefile
+++ b/textproc/ruby-rd-mode.el/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	# none
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Emacs lisp module for editing RD files
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/textproc/ruby-rdtool:patch
+BUILD_DEPENDS=	${NONEXISTENT}:textproc/ruby-rdtool:patch
 
 USE_RUBY=	yes
 
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index de47c2224f52..0508769b470e 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	RD to HTML/man/etc. converter (RD is to Ruby as POD is to Perl)
 
-BUILD_DEPENDS=	racc:${PORTSDIR}/devel/rubygem-racc
+BUILD_DEPENDS=	racc:devel/rubygem-racc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	uwabami
diff --git a/textproc/ruby-rss.alt/Makefile b/textproc/ruby-rss.alt/Makefile
index 089b7b3a5e12..e8172481afa4 100644
--- a/textproc/ruby-rss.alt/Makefile
+++ b/textproc/ruby-rss.alt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Ruby library for handling RSS (alternative impl.)
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	ja-${RUBY_PKGNAMEPREFIX}uconv>=0:${PORTSDIR}/japanese/ruby-uconv
+RUN_DEPENDS=	ja-${RUBY_PKGNAMEPREFIX}uconv>=0:japanese/ruby-uconv
 
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
diff --git a/textproc/ruby-rss/Makefile b/textproc/ruby-rss/Makefile
index 89f8be1aee6c..c3891518628a 100644
--- a/textproc/ruby-rss/Makefile
+++ b/textproc/ruby-rss/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Ruby library for parsing, creating, downloading, and caching RSS
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmlparser.so:${PORTSDIR}/textproc/ruby-xmlparser
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmlparser.so:textproc/ruby-xmlparser
 
 CONFLICTS=	ruby-rss.alt-*
 
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index 6d33a0e61c5f..080ea9bdf161 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Ruby interface to the Sary library
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libsary.so:${PORTSDIR}/textproc/sary
+LIB_DEPENDS=	libsary.so:textproc/sary
 
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 470fb18c63f4..1a14f750c6c8 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby module to access James Clark XML Parser ToolKit ("expat")
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+LIB_DEPENDS=	libexpat.so:textproc/expat2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/uconv.so:japanese/ruby-uconv \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 # to utilize encoding maps included in p5-XML-Parser
 
 USES=		perl5
diff --git a/textproc/rubygem-actionpack-xml_parser/Makefile b/textproc/rubygem-actionpack-xml_parser/Makefile
index bcb9737f56fb..a4ebb1fc9b4c 100644
--- a/textproc/rubygem-actionpack-xml_parser/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XML parameters parser for Action Pack
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:${PORTSDIR}/www/rubygem-actionpack4
+RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-albino/Makefile b/textproc/rubygem-albino/Makefile
index 713eb51b01db..e1130ae7272b 100644
--- a/textproc/rubygem-albino/Makefile
+++ b/textproc/rubygem-albino/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby wrapper for pygmentize
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
-		${PYTHON_PKGNAMEPREFIX}pygments>=0.8:${PORTSDIR}/textproc/py-pygments
+RUN_DEPENDS=	rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0.8:textproc/py-pygments
 
 USES=		python
 NO_ARCH=	yes
diff --git a/textproc/rubygem-amatch/Makefile b/textproc/rubygem-amatch/Makefile
index 4a1c2e093df8..b15e61c53b24 100644
--- a/textproc/rubygem-amatch/Makefile
+++ b/textproc/rubygem-amatch/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby library for approximate string matching and searching
 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
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/textproc/rubygem-autoprefixer-rails/Makefile b/textproc/rubygem-autoprefixer-rails/Makefile
index 1133d12dfeb1..b5c960200703 100644
--- a/textproc/rubygem-autoprefixer-rails/Makefile
+++ b/textproc/rubygem-autoprefixer-rails/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Parse CSS and add vendor prefixes to CSS rules
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-execjs>=0:${PORTSDIR}/devel/rubygem-execjs
+RUN_DEPENDS=	rubygem-execjs>=0:devel/rubygem-execjs
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-charlock_holmes/Makefile b/textproc/rubygem-charlock_holmes/Makefile
index 8566a81be2a4..c56ef351df38 100644
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Gems for character encoding detection
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/textproc/rubygem-compass-core/Makefile b/textproc/rubygem-compass-core/Makefile
index 822ebe824121..a6dd208519c0 100644
--- a/textproc/rubygem-compass-core/Makefile
+++ b/textproc/rubygem-compass-core/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Compass core stylesheet library and minimum required ruby extensions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-multi_json>=1.0:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-sass>=3.3.0:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-multi_json>=1.0:devel/rubygem-multi_json \
+		rubygem-sass>=3.3.0:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-compass-import-once/Makefile b/textproc/rubygem-compass-import-once/Makefile
index 6fdf44a3d727..6ffdbc0dafe1 100644
--- a/textproc/rubygem-compass-import-once/Makefile
+++ b/textproc/rubygem-compass-import-once/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Compass core stylesheet library and minimum required ruby extensions
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-sass>=3.2:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-sass>=3.2:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-compass-rails/Makefile b/textproc/rubygem-compass-rails/Makefile
index 01941603b77c..a61b29c3ce04 100644
--- a/textproc/rubygem-compass-rails/Makefile
+++ b/textproc/rubygem-compass-rails/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Integrate Compass into Rails 2.3 and up
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-compass>=1.0.0:${PORTSDIR}/textproc/rubygem-compass \
-		rubygem-sass-rails5>=0:${PORTSDIR}/textproc/rubygem-sass-rails5 \
-		rubygem-sprockets3>=0:${PORTSDIR}/devel/rubygem-sprockets3
+RUN_DEPENDS=	rubygem-compass>=1.0.0:textproc/rubygem-compass \
+		rubygem-sass-rails5>=0:textproc/rubygem-sass-rails5 \
+		rubygem-sprockets3>=0:devel/rubygem-sprockets3
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-compass/Makefile b/textproc/rubygem-compass/Makefile
index 07b952b0ac0d..8a5f4651c3f9 100644
--- a/textproc/rubygem-compass/Makefile
+++ b/textproc/rubygem-compass/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Provides an open-source CSS authoring framework
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.markdown
 
-RUN_DEPENDS=	rubygem-chunky_png>=1.2:${PORTSDIR}/graphics/rubygem-chunky_png \
-		rubygem-compass-core>=1.0.2:${PORTSDIR}/textproc/rubygem-compass-core \
-		rubygem-compass-import-once>=1.0.5:${PORTSDIR}/textproc/rubygem-compass-import-once \
-		rubygem-rb-fsevent>=0.9.3:${PORTSDIR}/devel/rubygem-rb-fsevent \
-		rubygem-rb-inotify>=0.9:${PORTSDIR}/devel/rubygem-rb-inotify \
-		rubygem-sass>=3.3.13:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-chunky_png>=1.2:graphics/rubygem-chunky_png \
+		rubygem-compass-core>=1.0.2:textproc/rubygem-compass-core \
+		rubygem-compass-import-once>=1.0.5:textproc/rubygem-compass-import-once \
+		rubygem-rb-fsevent>=0.9.3:devel/rubygem-rb-fsevent \
+		rubygem-rb-inotify>=0.9:devel/rubygem-rb-inotify \
+		rubygem-sass>=3.3.13:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-css_parser/Makefile b/textproc/rubygem-css_parser/Makefile
index 4e00e2667c0a..b62b5190d5ec 100644
--- a/textproc/rubygem-css_parser/Makefile
+++ b/textproc/rubygem-css_parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Set of classes for parsing CSS in Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-addressable>=0:${PORTSDIR}/www/rubygem-addressable
+RUN_DEPENDS=	rubygem-addressable>=0:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-elasticsearch-api/Makefile b/textproc/rubygem-elasticsearch-api/Makefile
index 1414a9e1cfea..9831807f5d59 100644
--- a/textproc/rubygem-elasticsearch-api/Makefile
+++ b/textproc/rubygem-elasticsearch-api/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Ruby API for Elasticsearch
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-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/textproc/rubygem-elasticsearch-transport/Makefile b/textproc/rubygem-elasticsearch-transport/Makefile
index 022ffb0f5d0d..dbae4cdd3050 100644
--- a/textproc/rubygem-elasticsearch-transport/Makefile
+++ b/textproc/rubygem-elasticsearch-transport/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Ruby client for Elasticsearch
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-faraday>=0:${PORTSDIR}/www/rubygem-faraday \
-		rubygem-multi_json>=0:${PORTSDIR}/devel/rubygem-multi_json
+RUN_DEPENDS=	rubygem-faraday>=0:www/rubygem-faraday \
+		rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-elasticsearch/Makefile b/textproc/rubygem-elasticsearch/Makefile
index 4e3cb92ff996..2cb76013eae7 100644
--- a/textproc/rubygem-elasticsearch/Makefile
+++ b/textproc/rubygem-elasticsearch/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Ruby integrations for Elasticsearch
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-elasticsearch-api=${PORTVERSION}:${PORTSDIR}/textproc/rubygem-elasticsearch-api \
-		rubygem-elasticsearch-transport=${PORTVERSION}:${PORTSDIR}/textproc/rubygem-elasticsearch-transport
+RUN_DEPENDS=	rubygem-elasticsearch-api=${PORTVERSION}:textproc/rubygem-elasticsearch-api \
+		rubygem-elasticsearch-transport=${PORTVERSION}:textproc/rubygem-elasticsearch-transport
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-emot/Makefile b/textproc/rubygem-emot/Makefile
index e0cf0cba6572..97d3e6d23290 100644
--- a/textproc/rubygem-emot/Makefile
+++ b/textproc/rubygem-emot/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Yet another emoji handler
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-thor>=0:${PORTSDIR}/devel/rubygem-thor
+RUN_DEPENDS=	rubygem-thor>=0:devel/rubygem-thor
 
 NO_ARCH=	yes
 
diff --git a/textproc/rubygem-fast_xs073/Makefile b/textproc/rubygem-fast_xs073/Makefile
index ee9145399341..5b6419b67997 100644
--- a/textproc/rubygem-fast_xs073/Makefile
+++ b/textproc/rubygem-fast_xs073/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Systems integration framework. Expander
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hoe>=2.3.2:${PORTSDIR}/devel/rubygem-hoe
+RUN_DEPENDS=	rubygem-hoe>=2.3.2:devel/rubygem-hoe
 
 PORTSCOUT=	limit:^0.7
 
diff --git a/textproc/rubygem-fog-xml/Makefile b/textproc/rubygem-fog-xml/Makefile
index 98c159d38c61..a6298672fb7b 100644
--- a/textproc/rubygem-fog-xml/Makefile
+++ b/textproc/rubygem-fog-xml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extraction of the XML parsing tools shared among 'fog' providers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-fog-core>=0:${PORTSDIR}/devel/rubygem-fog-core \
-		rubygem-nokogiri>=1.5.11:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
+		rubygem-nokogiri>=1.5.11:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-gitlab-grit/Makefile b/textproc/rubygem-gitlab-grit/Makefile
index bf4005004ab9..d9ad184b76e9 100644
--- a/textproc/rubygem-gitlab-grit/Makefile
+++ b/textproc/rubygem-gitlab-grit/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Library for extracting information from a git repository
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-charlock_holmes>=0.6:${PORTSDIR}/textproc/rubygem-charlock_holmes \
-		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:${PORTSDIR}/devel/rubygem-posix-spawn
+RUN_DEPENDS=	rubygem-charlock_holmes>=0.6:textproc/rubygem-charlock_holmes \
+		rubygem-diff-lcs>=1.1:textproc/rubygem-diff-lcs \
+		rubygem-mime-types1>=1.15:misc/rubygem-mime-types1 \
+		rubygem-posix-spawn>=0.3:devel/rubygem-posix-spawn
 
 NO_ARCH=	yes
 
diff --git a/textproc/rubygem-gitlab-linguist/Makefile b/textproc/rubygem-gitlab-linguist/Makefile
index f550ecfa2ecb..0bb1e963bd95 100644
--- a/textproc/rubygem-gitlab-linguist/Makefile
+++ b/textproc/rubygem-gitlab-linguist/Makefile
@@ -10,9 +10,9 @@ COMMENT=	GitHub Language detection
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-charlock_holmes>=0.6.6:${PORTSDIR}/textproc/rubygem-charlock_holmes \
-		rubygem-escape_utils-rails4>=0.2.4:${PORTSDIR}/textproc/rubygem-escape_utils-rails4 \
-		rubygem-mime-types1>=1.19:${PORTSDIR}/misc/rubygem-mime-types1
+RUN_DEPENDS=	rubygem-charlock_holmes>=0.6.6:textproc/rubygem-charlock_holmes \
+		rubygem-escape_utils-rails4>=0.2.4:textproc/rubygem-escape_utils-rails4 \
+		rubygem-mime-types1>=1.19:misc/rubygem-mime-types1
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-html-pipeline-gitlab/Makefile b/textproc/rubygem-html-pipeline-gitlab/Makefile
index 2b1dfea60fd6..1a716b42faec 100644
--- a/textproc/rubygem-html-pipeline-gitlab/Makefile
+++ b/textproc/rubygem-html-pipeline-gitlab/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Extension filters for html-pipeline used by GitLab
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack4>=4:${PORTSDIR}/www/rubygem-actionpack4 \
-		rubygem-gitlab_emoji>=0.1:${PORTSDIR}/graphics/rubygem-gitlab_emoji \
-		rubygem-html-pipeline>=1.11.0:${PORTSDIR}/textproc/rubygem-html-pipeline \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-sanitize>=2.1:${PORTSDIR}/textproc/rubygem-sanitize
+RUN_DEPENDS=	rubygem-actionpack4>=4:www/rubygem-actionpack4 \
+		rubygem-gitlab_emoji>=0.1:graphics/rubygem-gitlab_emoji \
+		rubygem-html-pipeline>=1.11.0:textproc/rubygem-html-pipeline \
+		rubygem-mime-types>=0:misc/rubygem-mime-types \
+		rubygem-sanitize>=2.1:textproc/rubygem-sanitize
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-html-pipeline/Makefile b/textproc/rubygem-html-pipeline/Makefile
index e775110f8ce3..ea9382040966 100644
--- a/textproc/rubygem-html-pipeline/Makefile
+++ b/textproc/rubygem-html-pipeline/Makefile
@@ -11,8 +11,8 @@ COMMENT=	GitHub HTML processing filters and utilities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=2:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-activesupport4>=2:devel/rubygem-activesupport4 \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-html-pipeline1/Makefile b/textproc/rubygem-html-pipeline1/Makefile
index 5cd98fa67ae4..f1fdcb0ee900 100644
--- a/textproc/rubygem-html-pipeline1/Makefile
+++ b/textproc/rubygem-html-pipeline1/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GitHub HTML processing filters and utilities
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=2:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-nokogiri>=1.4:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-activesupport4>=2:devel/rubygem-activesupport4 \
+		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jekyll-assets/Makefile b/textproc/rubygem-jekyll-assets/Makefile
index 043f2aa3924b..5adac6ac107d 100644
--- a/textproc/rubygem-jekyll-assets/Makefile
+++ b/textproc/rubygem-jekyll-assets/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Create javascript/CSS assets for Jekyll sites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-fastimage>=1.8:${PORTSDIR}/graphics/rubygem-fastimage \
-		rubygem-jekyll>=3.0:${PORTSDIR}/www/rubygem-jekyll \
-		rubygem-sprockets3>=3.3:${PORTSDIR}/devel/rubygem-sprockets3 \
-		rubygem-sprockets-helpers>=1.2:${PORTSDIR}/devel/rubygem-sprockets-helpers \
-		rubygem-tilt>=2.0:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-fastimage>=1.8:graphics/rubygem-fastimage \
+		rubygem-jekyll>=3.0:www/rubygem-jekyll \
+		rubygem-sprockets3>=3.3:devel/rubygem-sprockets3 \
+		rubygem-sprockets-helpers>=1.2:devel/rubygem-sprockets-helpers \
+		rubygem-tilt>=2.0:devel/rubygem-tilt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jekyll-gist/Makefile b/textproc/rubygem-jekyll-gist/Makefile
index 5ecebf51c028..cee75bc2df12 100644
--- a/textproc/rubygem-jekyll-gist/Makefile
+++ b/textproc/rubygem-jekyll-gist/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Liquid tag for displaying GitHub Gists in Jekyll sites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-octokit>=4.2:${PORTSDIR}/net/rubygem-octokit
+RUN_DEPENDS=	rubygem-octokit>=4.2:net/rubygem-octokit
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jekyll-mentions/Makefile b/textproc/rubygem-jekyll-mentions/Makefile
index c4dd56f0d1e4..9aee63b364ee 100644
--- a/textproc/rubygem-jekyll-mentions/Makefile
+++ b/textproc/rubygem-jekyll-mentions/Makefile
@@ -10,8 +10,8 @@ COMMENT=	At-mention support for Jekyll sites
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-html-pipeline>=2.3:${PORTSDIR}/textproc/rubygem-html-pipeline \
-		rubygem-jekyll>=3.0:${PORTSDIR}/www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-html-pipeline>=2.3:textproc/rubygem-html-pipeline \
+		rubygem-jekyll>=3.0:www/rubygem-jekyll
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jekyll-redirect-from/Makefile b/textproc/rubygem-jekyll-redirect-from/Makefile
index 13b697468ad6..f3e1eddee12a 100644
--- a/textproc/rubygem-jekyll-redirect-from/Makefile
+++ b/textproc/rubygem-jekyll-redirect-from/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Handles redirection URLs for jekyll pages and posts
 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/textproc/rubygem-jekyll-sass-converter/Makefile b/textproc/rubygem-jekyll-sass-converter/Makefile
index 1f4807f43ddd..7cc7e7fddc6b 100644
--- a/textproc/rubygem-jekyll-sass-converter/Makefile
+++ b/textproc/rubygem-jekyll-sass-converter/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Basic Sass converter for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-sass>=3.4:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-sass>=3.4:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-jemoji/Makefile b/textproc/rubygem-jemoji/Makefile
index b145a4ea3472..08447db42867 100644
--- a/textproc/rubygem-jemoji/Makefile
+++ b/textproc/rubygem-jemoji/Makefile
@@ -10,9 +10,9 @@ COMMENT=	GitHub-flavored emoji plugin for Jekyll
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-gemoji>=2.0:${PORTSDIR}/textproc/rubygem-gemoji \
-		rubygem-html-pipeline>=2.2:${PORTSDIR}/textproc/rubygem-html-pipeline \
-		rubygem-jekyll>=3.0:${PORTSDIR}/www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-gemoji>=2.0:textproc/rubygem-gemoji \
+		rubygem-html-pipeline>=2.2:textproc/rubygem-html-pipeline \
+		rubygem-jekyll>=3.0:www/rubygem-jekyll
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-linguistics/Makefile b/textproc/rubygem-linguistics/Makefile
index 05d9fbc0387e..a796c3355874 100644
--- a/textproc/rubygem-linguistics/Makefile
+++ b/textproc/rubygem-linguistics/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Framework for extending Ruby objects with linguistic methods
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-loggability>=0.11:${PORTSDIR}/textproc/rubygem-loggability
+RUN_DEPENDS=	rubygem-loggability>=0.11:textproc/rubygem-loggability
 
 NO_ARCH=	yes
 
diff --git a/textproc/rubygem-loofah/Makefile b/textproc/rubygem-loofah/Makefile
index fb3c504bccc4..5cd0483fc899 100644
--- a/textproc/rubygem-loofah/Makefile
+++ b/textproc/rubygem-loofah/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for manipulating HTML/XML documents and fragments
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.5.9:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=1.5.9:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-markaby/Makefile b/textproc/rubygem-markaby/Makefile
index d884aa2bd3f7..a33a417f2eee 100644
--- a/textproc/rubygem-markaby/Makefile
+++ b/textproc/rubygem-markaby/Makefile
@@ -12,7 +12,7 @@ COMMENT=	HTML Markup as Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-builder32>=0:${PORTSDIR}/devel/rubygem-builder32
+RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-multi_xml/Makefile b/textproc/rubygem-multi_xml/Makefile
index 75b29e6b433a..3568fd6ea052 100644
--- a/textproc/rubygem-multi_xml/Makefile
+++ b/textproc/rubygem-multi_xml/Makefile
@@ -19,6 +19,6 @@ USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
-NOKOGIRI_RUN_DEPENDS=	rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
+NOKOGIRI_RUN_DEPENDS=	rubygem-nokogiri>=0:textproc/rubygem-nokogiri
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-nokogiri-diff/Makefile b/textproc/rubygem-nokogiri-diff/Makefile
index f9ec8dd4dea2..140c92f804c4 100644
--- a/textproc/rubygem-nokogiri-diff/Makefile
+++ b/textproc/rubygem-nokogiri-diff/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Calculate the differences between two XML/HTML documents
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.5:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-tdiff>=0.3.2:${PORTSDIR}/devel/rubygem-tdiff
+RUN_DEPENDS=	rubygem-nokogiri>=1.5:textproc/rubygem-nokogiri \
+		rubygem-tdiff>=0.3.2:devel/rubygem-tdiff
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-nokogumbo/Makefile b/textproc/rubygem-nokogumbo/Makefile
index 1d21357be991..25fc9d1836db 100644
--- a/textproc/rubygem-nokogumbo/Makefile
+++ b/textproc/rubygem-nokogumbo/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Nokogiri interface to the Gumbo HTML5 parser
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=0:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/textproc/rubygem-octopress-escape-code/Makefile b/textproc/rubygem-octopress-escape-code/Makefile
index d3d59bc2ed66..6ec7b294141c 100644
--- a/textproc/rubygem-octopress-escape-code/Makefile
+++ b/textproc/rubygem-octopress-escape-code/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Adds escape sequences for code blocks in Jekyll
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-jekyll>=3.0:${PORTSDIR}/www/rubygem-jekyll
+RUN_DEPENDS=	rubygem-jekyll>=3.0:www/rubygem-jekyll
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-org-ruby/Makefile b/textproc/rubygem-org-ruby/Makefile
index e7e0b0a28851..a99380c86b28 100644
--- a/textproc/rubygem-org-ruby/Makefile
+++ b/textproc/rubygem-org-ruby/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Org mode parser written in Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-rubypants>=0.2.0:${PORTSDIR}/textproc/rubygem-rubypants
+RUN_DEPENDS=	rubygem-rubypants>=0.2.0:textproc/rubygem-rubypants
 
 NO_ARCH=	yes
 
diff --git a/textproc/rubygem-parslet/Makefile b/textproc/rubygem-parslet/Makefile
index 33255d0edf13..b6437bb16a97 100644
--- a/textproc/rubygem-parslet/Makefile
+++ b/textproc/rubygem-parslet/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Parser construction library with great error reporting in Ruby
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-blankslate>=2:${PORTSDIR}/devel/rubygem-blankslate
+RUN_DEPENDS=	rubygem-blankslate>=2:devel/rubygem-blankslate
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-rails-dom-testing/Makefile b/textproc/rubygem-rails-dom-testing/Makefile
index e19871af1b41..1b83d4334f0f 100644
--- a/textproc/rubygem-rails-dom-testing/Makefile
+++ b/textproc/rubygem-rails-dom-testing/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Analyse and compare DOMs using Nokogiri
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activesupport4>=4.2.0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-nokogiri>=1.6:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rails-deprecated_sanitizer>=1.0.1:${PORTSDIR}/devel/rubygem-rails-deprecated_sanitizer
+RUN_DEPENDS=	rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \
+		rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
+		rubygem-rails-deprecated_sanitizer>=1.0.1:devel/rubygem-rails-deprecated_sanitizer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-rails-html-sanitizer/Makefile b/textproc/rubygem-rails-html-sanitizer/Makefile
index 55472142c039..af680c703ffe 100644
--- a/textproc/rubygem-rails-html-sanitizer/Makefile
+++ b/textproc/rubygem-rails-html-sanitizer/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Sanitize HTML fragments in Rails applications
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-loofah>=2.0:${PORTSDIR}/textproc/rubygem-loofah
+RUN_DEPENDS=	rubygem-loofah>=2.0:textproc/rubygem-loofah
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-reverse_markdown/Makefile b/textproc/rubygem-reverse_markdown/Makefile
index 48a42441b99f..5af4c01f2345 100644
--- a/textproc/rubygem-reverse_markdown/Makefile
+++ b/textproc/rubygem-reverse_markdown/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Convert html code into markdown
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.6.6.2:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=1.6.6.2:textproc/rubygem-nokogiri
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-rich/Makefile b/textproc/rubygem-rich/Makefile
index 3aa763e660a5..7f4b62003ab4 100644
--- a/textproc/rubygem-rich/Makefile
+++ b/textproc/rubygem-rich/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Opinionated WYSIWYG editor for Rails based on CKEditor
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-jquery-rails>=0:${PORTSDIR}/www/rubygem-jquery-rails \
-		rubygem-kaminari>=0:${PORTSDIR}/www/rubygem-kaminari \
-		rubygem-mime-types>=0:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-paperclip>=0:${PORTSDIR}/devel/rubygem-paperclip \
-		rubygem-rack-raw-upload>=0:${PORTSDIR}/devel/rubygem-rack-raw-upload \
-		rubygem-rails>=3.2.0:${PORTSDIR}/www/rubygem-rails \
-		rubygem-sass-rails>=0:${PORTSDIR}/textproc/rubygem-sass-rails
+RUN_DEPENDS=	rubygem-jquery-rails>=0:www/rubygem-jquery-rails \
+		rubygem-kaminari>=0:www/rubygem-kaminari \
+		rubygem-mime-types>=0:misc/rubygem-mime-types \
+		rubygem-paperclip>=0:devel/rubygem-paperclip \
+		rubygem-rack-raw-upload>=0:devel/rubygem-rack-raw-upload \
+		rubygem-rails>=3.2.0:www/rubygem-rails \
+		rubygem-sass-rails>=0:textproc/rubygem-sass-rails
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-ruby-augeas/Makefile b/textproc/rubygem-ruby-augeas/Makefile
index 110572114073..7a190a92e87a 100644
--- a/textproc/rubygem-ruby-augeas/Makefile
+++ b/textproc/rubygem-ruby-augeas/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby bindings for Augeas
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libaugeas.so:${PORTSDIR}/textproc/augeas
+LIB_DEPENDS=	libaugeas.so:textproc/augeas
 
 CONFIGURE_ARGS=	--with-opt-include="${LOCALBASE}/include/libxml2"
 USE_GNOME=	libxml2
diff --git a/textproc/rubygem-sanitize/Makefile b/textproc/rubygem-sanitize/Makefile
index 289b1e21e89b..0307059f2e47 100644
--- a/textproc/rubygem-sanitize/Makefile
+++ b/textproc/rubygem-sanitize/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Whitelist based HTML sanitizer
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-crass>=1.0.2:${PORTSDIR}/www/rubygem-crass \
-		rubygem-nokogiri>=1.4.4:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-nokogumbo>=1.4.1:${PORTSDIR}/textproc/rubygem-nokogumbo
+RUN_DEPENDS=	rubygem-crass>=1.0.2:www/rubygem-crass \
+		rubygem-nokogiri>=1.4.4:textproc/rubygem-nokogiri \
+		rubygem-nokogumbo>=1.4.1:textproc/rubygem-nokogumbo
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-sass-rails/Makefile b/textproc/rubygem-sass-rails/Makefile
index 20eaf2ee9f71..f27d969dce8f 100644
--- a/textproc/rubygem-sass-rails/Makefile
+++ b/textproc/rubygem-sass-rails/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Sass adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-railties>=3.2.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-sass>=3.3.4:${PORTSDIR}/textproc/rubygem-sass \
-		rubygem-tilt>=2.0.1:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-railties>=3.2.0:www/rubygem-railties \
+		rubygem-sass>=3.3.4:textproc/rubygem-sass \
+		rubygem-tilt>=2.0.1:devel/rubygem-tilt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-sass-rails4/Makefile b/textproc/rubygem-sass-rails4/Makefile
index c34e55f767f9..0e86ed3db029 100644
--- a/textproc/rubygem-sass-rails4/Makefile
+++ b/textproc/rubygem-sass-rails4/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sass adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS?=	rubygem-railties4>=4.0.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-sass>=3.2.2:${PORTSDIR}/textproc/rubygem-sass \
-		rubygem-sprockets>=2.8:${PORTSDIR}/devel/rubygem-sprockets \
-		rubygem-sprockets-rails>=2.0:${PORTSDIR}/devel/rubygem-sprockets-rails
+RUN_DEPENDS?=	rubygem-railties4>=4.0.0:www/rubygem-railties4 \
+		rubygem-sass>=3.2.2:textproc/rubygem-sass \
+		rubygem-sprockets>=2.8:devel/rubygem-sprockets \
+		rubygem-sprockets-rails>=2.0:devel/rubygem-sprockets-rails
 
 PORTSCOUT=	limit:^4\.
 
diff --git a/textproc/rubygem-sass-rails5/Makefile b/textproc/rubygem-sass-rails5/Makefile
index 9466bc7f4c4b..3d35215d1a1f 100644
--- a/textproc/rubygem-sass-rails5/Makefile
+++ b/textproc/rubygem-sass-rails5/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Sass adapter for the Rails asset pipeline
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-railties4>=4.0.0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-sass>=3.1:${PORTSDIR}/textproc/rubygem-sass \
-		rubygem-sprockets3>=3.0.3:${PORTSDIR}/devel/rubygem-sprockets3 \
-		rubygem-sprockets-rails>=2.0:${PORTSDIR}/devel/rubygem-sprockets-rails \
-		rubygem-tilt>=1.1:${PORTSDIR}/devel/rubygem-tilt
+RUN_DEPENDS=	rubygem-railties4>=4.0.0:www/rubygem-railties4 \
+		rubygem-sass>=3.1:textproc/rubygem-sass \
+		rubygem-sprockets3>=3.0.3:devel/rubygem-sprockets3 \
+		rubygem-sprockets-rails>=2.0:devel/rubygem-sprockets-rails \
+		rubygem-tilt>=1.1:devel/rubygem-tilt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-scss_lint/Makefile b/textproc/rubygem-scss_lint/Makefile
index 72e156747848..dbf74f21a6a6 100644
--- a/textproc/rubygem-scss_lint/Makefile
+++ b/textproc/rubygem-scss_lint/Makefile
@@ -11,8 +11,8 @@ COMMENT=	SCSS linter
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-rake>=0.9:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-sass>=3.4.15:${PORTSDIR}/textproc/rubygem-sass
+RUN_DEPENDS=	rubygem-rake>=0.9:devel/rubygem-rake \
+		rubygem-sass>=3.4.15:textproc/rubygem-sass
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-termcolor/Makefile b/textproc/rubygem-termcolor/Makefile
index 39356545fe21..061c6da5c23b 100644
--- a/textproc/rubygem-termcolor/Makefile
+++ b/textproc/rubygem-termcolor/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for ANSII color formatting like HTML for output in terminal
 
 LICENSE=	MIT
 
-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/textproc/rubygem-twitter-text/Makefile b/textproc/rubygem-twitter-text/Makefile
index 7c93ee7fc67a..bdbc28e2152a 100644
--- a/textproc/rubygem-twitter-text/Makefile
+++ b/textproc/rubygem-twitter-text/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby gem for handling of Twitter texts
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-unf>=0.1.0:${PORTSDIR}/textproc/rubygem-unf
+RUN_DEPENDS=	rubygem-unf>=0.1.0:textproc/rubygem-unf
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-unf/Makefile b/textproc/rubygem-unf/Makefile
index 1d48311d77e8..060b930bf327 100644
--- a/textproc/rubygem-unf/Makefile
+++ b/textproc/rubygem-unf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Wrapper library to bring Unicode Normalization Form support
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-unf_ext>=0:${PORTSDIR}/textproc/rubygem-unf_ext
+RUN_DEPENDS=	rubygem-unf_ext>=0:textproc/rubygem-unf_ext
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-wikicloth/Makefile b/textproc/rubygem-wikicloth/Makefile
index 86a3ff0d65b2..1bb059569760 100644
--- a/textproc/rubygem-wikicloth/Makefile
+++ b/textproc/rubygem-wikicloth/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Ruby parser for the MediaWiki markup language
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-builder>=0:${PORTSDIR}/devel/rubygem-builder \
-		rubygem-expression_parser>=0:${PORTSDIR}/math/rubygem-expression_parser \
-		rubygem-htmlentities>=0:${PORTSDIR}/textproc/rubygem-htmlentities \
-		rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-twitter-text>=0:${PORTSDIR}/textproc/rubygem-twitter-text
+RUN_DEPENDS=	rubygem-builder>=0:devel/rubygem-builder \
+		rubygem-expression_parser>=0:math/rubygem-expression_parser \
+		rubygem-htmlentities>=0:textproc/rubygem-htmlentities \
+		rubygem-nokogiri>=0:textproc/rubygem-nokogiri \
+		rubygem-twitter-text>=0:textproc/rubygem-twitter-text
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/textproc/rubygem-yard-chef/Makefile b/textproc/rubygem-yard-chef/Makefile
index 820a0e37eae4..c67389ae5041 100644
--- a/textproc/rubygem-yard-chef/Makefile
+++ b/textproc/rubygem-yard-chef/Makefile
@@ -11,7 +11,7 @@ COMMENT=	YARD plugin for Chef
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-yard>=0.8:${PORTSDIR}/textproc/rubygem-yard
+RUN_DEPENDS=	rubygem-yard>=0.8:textproc/rubygem-yard
 
 NO_ARCH=	yes
 
diff --git a/textproc/rubygem-zmq/Makefile b/textproc/rubygem-zmq/Makefile
index 165d1f6e921f..6f5cb23390b9 100644
--- a/textproc/rubygem-zmq/Makefile
+++ b/textproc/rubygem-zmq/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby ZeroMQ gem
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libzmq.so:${PORTSDIR}/net/libzmq2
+LIB_DEPENDS=	libzmq.so:net/libzmq2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/textproc/s5/Makefile b/textproc/s5/Makefile
index 2f36cc421259..d313775647f2 100644
--- a/textproc/s5/Makefile
+++ b/textproc/s5/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Simple HTML-based presentation system
 LICENSE=	BSD2CLAUSE PD
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:archivers/unzip
 
 USES=		dos2unix zip
 DOS2UNIX_REGEX=	.*\.(css|htc|html|js|txt)
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 50e364a6fffb..b8171cca3e59 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -13,7 +13,7 @@ COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
 LICENSE=	MPL GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	DEBUGGER DISABLE_META DOCS DOCUMENT_ERRORS DOM
 
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT=	DOM DOCUMENT_ERRORS
 
 DEBUGGER_CONFIGURE_ENABLE=	debugger
 DISABLE_META_CONFIGURE_ON=	--disable-adding-meta
-DOCS_BUILD_DEPENDS=		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+DOCS_BUILD_DEPENDS=		p5-XML-Parser>=0:textproc/p5-XML-Parser
 DOCS_CONFIGURE_ON=		--with-html-dir=${DOCSDIR}
 DOCS_USES=			perl5
 DOCS_USE=			PERL5=build
diff --git a/textproc/sansi/Makefile b/textproc/sansi/Makefile
index d499ce7a440d..a897992c29b2 100644
--- a/textproc/sansi/Makefile
+++ b/textproc/sansi/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Removes ANSI control sequences/characters, from files
 LICENSE=	ART20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	p5-PerlIO-eol>=0:${PORTSDIR}/devel/p5-PerlIO-eol \
-		p5-Modern-Perl>=0:${PORTSDIR}/lang/p5-Modern-Perl
+RUN_DEPENDS=	p5-PerlIO-eol>=0:devel/p5-PerlIO-eol \
+		p5-Modern-Perl>=0:lang/p5-Modern-Perl
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/textproc/sarep/Makefile b/textproc/sarep/Makefile
index 36e45825eab0..bb42848d2ca9 100644
--- a/textproc/sarep/Makefile
+++ b/textproc/sarep/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line search and replace tool; written in Perl; handles regexps
 
-RUN_DEPENDS=	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS
+RUN_DEPENDS=	p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
diff --git a/textproc/sassc/Makefile b/textproc/sassc/Makefile
index 3faab51f804b..ae84645cbbeb 100644
--- a/textproc/sassc/Makefile
+++ b/textproc/sassc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Wrapper around libsass
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libsass.so:${PORTSDIR}/textproc/libsass
+LIB_DEPENDS=	libsass.so:textproc/libsass
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sass
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index ce300c35e73c..be6d60254a28 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -36,17 +36,17 @@ PORTDOCS=	*
 
 .if ${PORT_OPTIONS:MJDOM}
 JARFILES+=	saxon9-jdom.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom
+RUN_DEPENDS+=	${JAVALIBDIR}/jdom.jar:java/jdom
 .endif
 
 .if ${PORT_OPTIONS:MDOM4J}
 JARFILES+=	saxon9-dom4j.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/dom4j.jar:${PORTSDIR}/textproc/dom4j
+RUN_DEPENDS+=	${JAVALIBDIR}/dom4j.jar:textproc/dom4j
 .endif
 
 .if ${PORT_OPTIONS:MXOM}
 JARFILES+=	saxon9-xom.jar
-RUN_DEPENDS+=	${JAVALIBDIR}/xom.jar:${PORTSDIR}/textproc/xom
+RUN_DEPENDS+=	${JAVALIBDIR}/xom.jar:textproc/xom
 .endif
 
 SUB_FILES=	saxon.sh
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index d55400d63053..a54e434b047c 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple C Expat Wrapper
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -32,7 +32,7 @@ post-install:
 .endfor
 
 .ifdef MAINTAINER_MODE
-LIB_DEPENDS+=	libcheck.so:${PORTSDIR}/devel/libcheck
+LIB_DEPENDS+=	libcheck.so:devel/libcheck
 regression-test: build
 	${MAKE_CMD} -C ${WRKSRC}/tests check
 .endif
diff --git a/textproc/scim-bridge-qt4/Makefile b/textproc/scim-bridge-qt4/Makefile
index fbd46a4de82b..785bd4e4879e 100644
--- a/textproc/scim-bridge-qt4/Makefile
+++ b/textproc/scim-bridge-qt4/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/doc/LICENSE.GPL
 LICENSE_FILE_LGPL21=	${WRKSRC}/doc/LICENSE.LGPL
 
-RUN_DEPENDS=	scim-bridge:${PORTSDIR}/textproc/scim-bridge
+RUN_DEPENDS=	scim-bridge:textproc/scim-bridge
 
 USE_QT4=	corelib gui moc_build
 QT_NONSTANDARD=	yes
diff --git a/textproc/scim-bridge/Makefile b/textproc/scim-bridge/Makefile
index 96c0d3a475e0..e2049cb97bc5 100644
--- a/textproc/scim-bridge/Makefile
+++ b/textproc/scim-bridge/Makefile
@@ -14,7 +14,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/doc/LICENSE.GPL
 LICENSE_FILE_LGPL21=	${WRKSRC}/doc/LICENSE.LGPL
 
-LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+LIB_DEPENDS=	libscim-1.0.so:textproc/scim
 
 USES=		gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index b97030bf3622..e9d5a1edc185 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/scim/${PORTNAME}/0.1.3/ \
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	SCIM add-on to input various symbols with customisable on-screen pad
 
-LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+LIB_DEPENDS=	libscim-1.0.so:textproc/scim
 
 USE_LDCONFIG=	yes
 USES=		gmake pkgconfig libtool
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 898bb9b1b002..c5c3895baa69 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -12,14 +12,14 @@ DIST_SUBDIR=	kmfl
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	SCIM KMFL IMEngine platform for Keyman (KMN) language keyboards
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libkmfl.so:${PORTSDIR}/textproc/libkmfl \
-		libkmflcomp.so:${PORTSDIR}/textproc/kmflcomp \
-		libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
-		scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS=	scim:textproc/scim
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libkmfl.so:textproc/libkmfl \
+		libkmflcomp.so:textproc/kmflcomp \
+		libpng.so:graphics/png
+RUN_DEPENDS=	kmflcomp:textproc/kmflcomp \
+		scim:textproc/scim
 
 USE_XORG=	x11 xkbfile xproto
 USE_GNOME=	glib20 gtk20 intlhack
diff --git a/textproc/scim-m17n/Makefile b/textproc/scim-m17n/Makefile
index 284c2126e00c..03dd3233794f 100644
--- a/textproc/scim-m17n/Makefile
+++ b/textproc/scim-m17n/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	SCIM IMEngine module which uses m17n library as the backend
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
-		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
-RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS=	scim:textproc/scim \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libm17n.so:devel/m17n-lib
+RUN_DEPENDS=	scim:textproc/scim
 
 USES=		gmake pkgconfig libtool:keepla
 GNU_CONFIGURE=	yes
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 594df523f4bd..e46c4f26a9bd 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -11,11 +11,11 @@ DISTNAME=	openvanilla-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM OpenVanilla input method (IM)/output filter (OF) framework
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim	\
-		${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
-RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	scim:textproc/scim	\
+		${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:textproc/openvanilla-framework
+RUN_DEPENDS=	scim:textproc/scim
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/Loaders/SCIM
 USES=		pkgconfig gettext iconv gmake libtool:keepla
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 78da9a24efb7..d787ab44b619 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	scim-tables-${PORTVERSION}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	SCIM table based input method engine
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
-RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS=	scim:textproc/scim
+RUN_DEPENDS=	scim:textproc/scim
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool:keepla pkgconfig
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index ca5b90ddf9b9..2b147ac9025a 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -13,12 +13,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open Document Cataloging Project
 
-BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
-RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	intltool-extract:textproc/intltool \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+		docbook-xml>0:textproc/docbook-xml
+RUN_DEPENDS=	intltool-extract:textproc/intltool \
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
+		docbook-xml>0:textproc/docbook-xml
 
 DOCBOOK_VERSION=4.2
 
diff --git a/textproc/scss/Makefile b/textproc/scss/Makefile
index 4ad7b3a8833e..5ddc53ef9784 100644
--- a/textproc/scss/Makefile
+++ b/textproc/scss/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Scheme module for W3C Cascading Stylesheets recommendation
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	guile:lang/guile
 
 NO_BUILD=	yes
 
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index fc5b8462a05d..542708071120 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	docbook-simple-${PORTVERSION}
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	"Simplified" DocBook XML DTD
 
-RUN_DEPENDS+=	${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS+=	${LOCALBASE}/${XMLCATMGR}:textproc/xmlcatmgr
 
 USES=		zip
 NO_MTREE=	yes
diff --git a/textproc/sdom/Makefile b/textproc/sdom/Makefile
index 438d1625bf13..f2ed396ac7b6 100644
--- a/textproc/sdom/Makefile
+++ b/textproc/sdom/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Implementation of the W3C DOM recommendation in Scheme
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	guile-lib>=0:${PORTSDIR}/devel/guile-lib
+RUN_DEPENDS=	guile-lib>=0:devel/guile-lib
 
 NO_BUILD=	yes
 
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 1d41a2e5118d..1ee9ab863a84 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -35,7 +35,7 @@ BROKEN=		Does not compile on ${ARCH}
 
 .if ${PORT_OPTIONS:MMECAB}
 CONFIGURE_ARGS+=	--with-mecab
-LIB_DEPENDS+=	libmecab.so:${PORTSDIR}/japanese/mecab
+LIB_DEPENDS+=	libmecab.so:japanese/mecab
 .else
 CONFIGURE_ARGS+=	--without-mecab
 .endif
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 4f0835988b36..a51ed4e70cdb 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -24,12 +24,12 @@ WITH_OPENJADE=	yes
 .endif
 
 .if defined(WITH_OPENJADE)
-RUN_DEPENDS=	openjade>0:${PORTSDIR}/textproc/openjade
+RUN_DEPENDS=	openjade>0:textproc/openjade
 .else
-RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/jade
+RUN_DEPENDS=	nsgmls:textproc/jade
 .endif
-RUN_DEPENDS+=	linuxdoc>0:${PORTSDIR}/textproc/linuxdoc \
-		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
+RUN_DEPENDS+=	linuxdoc>0:textproc/linuxdoc \
+		docbook-sgml>0:textproc/docbook-sgml
 
 .if defined(WITH_OPENJADE)
 post-patch:
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 4235a8b54636..bc9eccc4a363 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -10,9 +10,9 @@ COMMENT=	WYSIWYG ePub editor
 
 LICENSE=	GPLv3+
 
-LIB_DEPENDS=	libminizip.so:${PORTSDIR}/archivers/minizip \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+LIB_DEPENDS=	libminizip.so:archivers/minizip \
+		libpcre.so:devel/pcre \
+		libhunspell-1.3.so:textproc/hunspell
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Sigil-Ebook
diff --git a/textproc/simplexml/Makefile b/textproc/simplexml/Makefile
index ecf2ce49ef9a..66dca76d9e6c 100644
--- a/textproc/simplexml/Makefile
+++ b/textproc/simplexml/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	konstantin.lepa@gmail.com
 COMMENT=	C++ XML parser library
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		cmake iconv
 USE_LDCONFIG=	yes
diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile
index 270c545bebcb..9b30cb7805a8 100644
--- a/textproc/slides/Makefile
+++ b/textproc/slides/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Doctype and stylesheets for making slides
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl
+RUN_DEPENDS=	docbook-xml>0:textproc/docbook-xml \
+		docbook-xsl>0:textproc/docbook-xsl
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index f75dd860e10f..c6b794cd18c8 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Intelligent predictive text entry platform
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USES=		libtool pkgconfig sqlite
 GNU_CONFIGURE=	yes
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index de80412cd13b..2e5c8ffbe00b 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/Soprano/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt/C++ RDF framework
 
-LIB_DEPENDS=	libraptor2.so:${PORTSDIR}/textproc/raptor2 \
-		librdf.so:${PORTSDIR}/textproc/redland \
-		libiodbc.so:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS=	libraptor2.so:textproc/raptor2 \
+		librdf.so:textproc/redland \
+		libiodbc.so:databases/libiodbc
 
 USE_QT4=	corelib dbus network qtestlib_build xml \
 		qmake_build moc_build uic_build rcc_build
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index fee82b2a4091..1ffa7f3100c5 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU/src-highlite
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	C/C++ and Java sources to HTML converter
 
-BUILD_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
-LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	exctags:devel/ctags
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	BASH DOCS EXAMPLES
 
 BROKEN_sparc64=	Does not compile with GCC 4.2
 
-BASH_RUN_DEPENDS=	${LOCALBASE}/etc/bash_completion:${PORTSDIR}/shells/bash-completion
+BASH_RUN_DEPENDS=	${LOCALBASE}/etc/bash_completion:shells/bash-completion
 BASH_CONFIGURE_WITH=	--with-bash-completion
 
 OPTIONS_SUB=	yes
diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile
index 9e161583e6cf..fe5bf61a995f 100644
--- a/textproc/sowing/Makefile
+++ b/textproc/sowing/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://ftp.mcs.anl.gov/pub/sowing/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text processing tools to generate documentation from source files
 
-BUILD_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
+BUILD_DEPENDS=	ppmtogif:graphics/netpbm
+RUN_DEPENDS=	ppmtogif:graphics/netpbm
 
 USES=		ghostscript gmake perl5
 USE_TEX=	latex dvipsk
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index 0700a4d158ad..66e149baed67 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -24,7 +24,7 @@ LICENSE=	GPLv2
 # If expat is present on the system and configure finds it, it will
 # unconditionally link the output binary against it.  There's no way
 # of turning this off.  So for consistency, make sure it's always on.
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
 		SYSLOG UNIXODBC DOCS EXAMPLES
@@ -81,7 +81,7 @@ SYSLOG_DESC=		Enable logging via syslog
 SYSLOG_CONFIGURE_WITH=	syslog
 
 UNIXODBC_CONFIGURE_WITH=unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 CONFLICTS=	sphinxsearch-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
 		swish++-[0-9]* xaira-[0-9]*
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 62ba345228e4..14f089345c02 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -21,7 +21,7 @@ LICENSE=	GPLv2
 # If expat is present on the system and configure finds it, it will
 # unconditionally link the output binary against it.  There's no way
 # of turning this off.  So for consistency, make sure it's always on.
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
 		RE2 SYSLOG UNIXODBC DOCS
@@ -78,13 +78,13 @@ PGSQL_USES=		pgsql
 
 RE2_DESC=		Enable re2 regular expression library
 RE2_CONFIGURE_WITH=	re2
-RE2_BUILD_DEPENDS=	${LOCALBASE}/lib/libre2.a:${PORTSDIR}/devel/re2
+RE2_BUILD_DEPENDS=	${LOCALBASE}/lib/libre2.a:devel/re2
 
 SYSLOG_DESC=		Enable logging via syslog
 SYSLOG_CONFIGURE_WITH=	syslog
 
 UNIXODBC_CONFIGURE_WITH=unixodbc
-UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 CONFLICTS=	sphinxsearch-devel-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \
 		swish++-[0-9]* xaira-[0-9]*
diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile
index df43c174d586..f03528d882a9 100644
--- a/textproc/spiff/Makefile
+++ b/textproc/spiff/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	textproc
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Declarative YAML templating system tuned for BOSH deployment manifests
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cloudfoundry-incubator
diff --git a/textproc/srilm/Makefile b/textproc/srilm/Makefile
index 0e29d1f2b2d3..69a781295630 100644
--- a/textproc/srilm/Makefile
+++ b/textproc/srilm/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX?=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit for building and applying statistical language models
 
-LIB_DEPENDS=	libtcl84.so:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS=	libtcl84.so:lang/tcl84
 
 DOWNLOAD_URL?=	http://www.speech.sri.com/projects/srilm/download.html
 
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index 1702947842ef..18c836def50c 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR=	stardict
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionary lookup program written in Gtk2
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libenchant.so:${PORTSDIR}/textproc/enchant
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20 \
+		libenchant.so:textproc/enchant
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-festival \
diff --git a/textproc/svn2cl/Makefile b/textproc/svn2cl/Makefile
index d0c9c63406e8..bd8dbb6fc7ed 100644
--- a/textproc/svn2cl/Makefile
+++ b/textproc/svn2cl/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://arthurdejong.org/svn2cl/
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Subversion ChangeLog generator
 
-RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		svn:${PORTSDIR}/devel/subversion
+RUN_DEPENDS=	xsltproc:textproc/libxslt \
+		svn:devel/subversion
 
 NO_BUILD=	yes
 PORTDOCS=	ChangeLog NEWS README TODO
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index 36bc729a8f8e..820244e93214 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	textproc tcl
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Tcl interface to Expat library
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USE_LDCONFIG=	yes
 
diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile
index 79b33772d7f8..c4ef8b5e29b3 100644
--- a/textproc/te-hunspell/Makefile
+++ b/textproc/te-hunspell/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Telugu hunspell dictionaries
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	prezip-bin:${PORTSDIR}/textproc/aspell \
-		wordlist2hunspell:${PORTSDIR}/textproc/hunspell
+BUILD_DEPENDS=	prezip-bin:textproc/aspell \
+		wordlist2hunspell:textproc/hunspell
 
 NO_ARCH=	yes
 USES=		tar:bzip2
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index af35ef12caab..74933b821e86 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	TECkit_${PORTVERSION:S|.|_|g}
 MAINTAINER=	nikola.lecic@anthesphoria.net
 COMMENT=	Toolkit for converting data between 8-bit legacy encodings and Unicode
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/textproc/templates_parser/Makefile b/textproc/templates_parser/Makefile
index 4badbc38f8de..16dde2063619 100644
--- a/textproc/templates_parser/Makefile
+++ b/textproc/templates_parser/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Web page template engine module for the Ada Web Server
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild \
-		xmlada>=4.4:${PORTSDIR}/textproc/xmlada
-RUN_DEPENDS=	xmlada>=4.4:${PORTSDIR}/textproc/xmlada
+BUILD_DEPENDS=	gprbuild:devel/gprbuild \
+		xmlada>=4.4:textproc/xmlada
+RUN_DEPENDS=	xmlada>=4.4:textproc/xmlada
 
 USES=		ada gmake tar:bzip2
 DESTINC=	${STAGEDIR}${PREFIX}/include/templates_parser
@@ -28,7 +28,7 @@ MAKE_ARGS+=	PROCESSORS=${MAKE_JOBS_NUMBER} \
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DOCS
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
 do-build:
 	# Override build target to avoid -jX getting passed to makefile
diff --git a/textproc/tex2im/Makefile b/textproc/tex2im/Makefile
index 3c2a1dbbf7d4..9df1be9be6c2 100644
--- a/textproc/tex2im/Makefile
+++ b/textproc/tex2im/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.nought.de/
 MAINTAINER=	TsurutaniNaoki@gmail.com
 COMMENT=	Converts LaTeX formulas into high resolution pixmap graphics
 
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	convert:graphics/ImageMagick \
+		bash:shells/bash
 
 USE_TEX=	latex
 NO_BUILD=	yes
diff --git a/textproc/texi2db/Makefile b/textproc/texi2db/Makefile
index 0cc123d59fb5..00346205dcc1 100644
--- a/textproc/texi2db/Makefile
+++ b/textproc/texi2db/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.tldp.org/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts a Texinfo file into DocBook XML
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/textogif/Makefile b/textproc/textogif/Makefile
index d91f134ce0c3..3d935b910e22 100644
--- a/textproc/textogif/Makefile
+++ b/textproc/textogif/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Perl script to convert LaTeX formulas into GIFs
 
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	ppmtogif:graphics/netpbm
 
 NO_BUILD=	yes
 USE_TEX=	latex dvipsk
diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index ea245816c085..51d6386dde68 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Code-searching tool similar to ack but faster
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ggreer
diff --git a/textproc/tkxmlive/Makefile b/textproc/tkxmlive/Makefile
index a3e033650a95..7574a9ec1f84 100644
--- a/textproc/tkxmlive/Makefile
+++ b/textproc/tkxmlive/Makefile
@@ -11,7 +11,7 @@ DISTNAME=		tkxmlive-0.1.5-1
 MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		Tcl/Tk XML intelligence visual editor
 
-RUN_DEPENDS+=		${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget
+RUN_DEPENDS+=		${LOCALBASE}/lib/bwidget/pkgIndex.tcl:x11-toolkits/bwidget
 
 NO_BUILD=		yes
 USES=			tk:run
diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index 1732a777b69c..2838a2baf8bf 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Full-text search system based on Tokyo Cabinet
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index b33224309364..9ec42670131a 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -9,16 +9,16 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Converts between many translation formats
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0:${PORTSDIR}/deskutils/py-vobject \
-		msghack:${PORTSDIR}/devel/gettext-msghack \
-		${PYTHON_PKGNAMEPREFIX}iniparse>=0:${PORTSDIR}/devel/py-iniparse \
-		${PYTHON_PKGNAMEPREFIX}levenshtein>=0:${PORTSDIR}/devel/py-levenshtein \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		iso-codes>=1.3:${PORTSDIR}/misc/iso-codes \
-		bash:${PORTSDIR}/shells/bash \
-		${PYTHON_PKGNAMEPREFIX}utidy>=0:${PORTSDIR}/www/py-utidy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject \
+		msghack:devel/gettext-msghack \
+		${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse \
+		${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		iso-codes>=1.3:misc/iso-codes \
+		bash:shells/bash \
+		${PYTHON_PKGNAMEPREFIX}utidy>=0:www/py-utidy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 # Can use psyco (on i386)
 
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index 5991f6b8f3a7..54a72717b08f 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	tth_C
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	TeX to HTML translator
 
-RUN_DEPENDS=	ppmtogif:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	ppmtogif:graphics/netpbm
 
 USES=		ghostscript:run shebangfix tar:tgz
 #USE_TEX=	latex
diff --git a/textproc/turboxsl/Makefile b/textproc/turboxsl/Makefile
index 766d45fb8a3e..f931ee262391 100644
--- a/textproc/turboxsl/Makefile
+++ b/textproc/turboxsl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Fast, multithreaded XML+XSLT transformation library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libck.so:${PORTSDIR}/devel/concurrencykit \
-		libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS=	libck.so:devel/concurrencykit \
+		libmemcached.so:databases/libmemcached
 
 ONLY_FOR_ARCHS=	amd64 ia64 powerpc64 sparc64
 USES=		autoreconf libtool pkgconfig
diff --git a/textproc/txt2html/Makefile b/textproc/txt2html/Makefile
index c3a6b08ad4a0..92b57911c8cc 100644
--- a/textproc/txt2html/Makefile
+++ b/textproc/txt2html/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Convert raw text to something with a little HTML formatting
 
-BUILD_DEPENDS=	p5-Getopt-ArgvFile>=0:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Getopt-ArgvFile>=0:devel/p5-Getopt-ArgvFile \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/textproc/txt2man/Makefile b/textproc/txt2man/Makefile
index c3befe9fdde6..b3dffa5737f4 100644
--- a/textproc/txt2man/Makefile
+++ b/textproc/txt2man/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Converts flat ASCII text to man page format
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cpe gmake
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 88d90accbfc2..71f300bab66c 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -17,7 +17,7 @@ CONFLICTS?=	uim-el-xemacs21-mule-[0-9]* \
 		uim-el-emacs22-[0-9]* \
 		uim-el-emacs21-[0-9]*
 
-RUN_DEPENDS=	uim-el-agent:${PORTSDIR}/textproc/uim
+RUN_DEPENDS=	uim-el-agent:textproc/uim
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 27ee3cc549a4..529a2d15ac9c 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-gtk
 COMMENT=	GTK+ modules of uim input method
 
 USE_GNOME=	gtk20
-LIB_DEPENDS=	libuim.so:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	libuim.so:textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile
index 0c28077dabd8..66b5168c034f 100644
--- a/textproc/uim-gtk3/Makefile
+++ b/textproc/uim-gtk3/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX=	-gtk3
 COMMENT=	GTK+ 3.x modules of uim input method
 
 USE_GNOME=	gtk30
-LIB_DEPENDS=	libuim.so:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	libuim.so:textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index ed33f95e5166..d8c4ed46c66e 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -5,9 +5,9 @@ PKGNAMESUFFIX=	-kde4
 
 COMMENT=	KDE4 panel applet of uim input method
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	libuim.so:${PORTSDIR}/textproc/uim
-RUN_DEPENDS=	uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4
+BUILD_DEPENDS=	cmake:devel/cmake
+LIB_DEPENDS=	libuim.so:textproc/uim
+RUN_DEPENDS=	uim-pref-qt4:textproc/uim-qt4
 
 USE_GCC=	any
 USE_KDE4=	kdeprefix kdelibs automoc4
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 0df0541486ec..1a58bd7ac424 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -10,13 +10,13 @@ PKGNAMESUFFIX=	-m17nlib
 
 COMMENT=	Uim plugin using m17n library input method
 
-BUILD_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
-LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib \
-		libuim.so:${PORTSDIR}/textproc/uim
-RUN_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
+BUILD_DEPENDS=	m17n-db:devel/m17n-db
+LIB_DEPENDS=	libm17n.so:devel/m17n-lib \
+		libuim.so:textproc/uim
+RUN_DEPENDS=	m17n-db:devel/m17n-db
 
 .if !defined(WITHOUT_M17NCONTRIB)
-RUN_DEPENDS+=	${LOCALBASE}/share/m17n/icons/as-phonetic.png:${PORTSDIR}/devel/m17n-db
+RUN_DEPENDS+=	${LOCALBASE}/share/m17n/icons/as-phonetic.png:devel/m17n-db
 .endif
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index e2e7f202a427..b972163c8790 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -5,7 +5,7 @@ PKGNAMESUFFIX=	-qt4
 
 COMMENT=	Qt4 modules of uim input method
 
-LIB_DEPENDS=	libuim.so:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	libuim.so:textproc/uim
 
 USE_QT4=	qmake_build moc_build qt3support uic
 USES=		iconv libtool
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index b390087c164a..f234faf5743d 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT=	X11
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libXft.so:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS+=	libXft.so:x11-fonts/libXft
 CONFIGURE_ARGS+=	--with-x --with-xft
 .endif
 
diff --git a/textproc/unoconv/Makefile b/textproc/unoconv/Makefile
index cc3d469e2036..bdc83b76158c 100644
--- a/textproc/unoconv/Makefile
+++ b/textproc/unoconv/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Convert any document from and to any LibreOffice supported format
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+RUN_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		python
 NO_BUILD=	yes
diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index 58566b8b7efe..f93e38ec47f1 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -16,7 +16,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programmable troff translator with backend for HTML
 
-LIB_DEPENDS=	libelk.so:${PORTSDIR}/lang/elk
+LIB_DEPENDS=	libelk.so:lang/elk
 
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DBSD"	\
diff --git a/textproc/wa-hunspell/Makefile b/textproc/wa-hunspell/Makefile
index 292299158b0b..d3d0d868a116 100644
--- a/textproc/wa-hunspell/Makefile
+++ b/textproc/wa-hunspell/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Wallon hunspell dictionaries
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	aspell:textproc/aspell
 
 ALL_TARGET=	myspell
 NO_ARCH=	yes
diff --git a/textproc/wbxml2/Makefile b/textproc/wbxml2/Makefile
index db5da73f16d0..1ad07acfeb1f 100644
--- a/textproc/wbxml2/Makefile
+++ b/textproc/wbxml2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library & tools for converting wbxml<->xml
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		cmake:outsource iconv tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/textproc/website/Makefile b/textproc/website/Makefile
index 1195e5d984a9..57e524a2a085 100644
--- a/textproc/website/Makefile
+++ b/textproc/website/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Doctype and stylesheets for making websites
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl
+RUN_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/textproc/wiggle/Makefile b/textproc/wiggle/Makefile
index 28101b1e01a2..f1ee4cea3254 100644
--- a/textproc/wiggle/Makefile
+++ b/textproc/wiggle/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Apply rejected patches and perform word-wise diffs
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USES=		compiler:nestedfct gmake ncurses
 
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index cdf41e9a4d39..5d0a27893a40 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.abisource.com/downloads/wv/${PORTVERSION}/
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Library and executables to access Microsoft Word files
 
-LIB_DEPENDS=	libwmf.so:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS=	libwmf.so:graphics/libwmf
 
 USE_GNOME=	libgsf
 GNU_CONFIGURE=	yes
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 3a451b7ed7ba..4ad8c4b20eef 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XSLT processor from the Apache XML Project
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
+LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool localbase pathfix
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index ca5d2124e471..198fa06da79c 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Apache XSLT processor for transforming XML documents
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
+RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/textproc/xhtml-11/Makefile b/textproc/xhtml-11/Makefile
index 25d1171081b5..8ee952bbf90c 100644
--- a/textproc/xhtml-11/Makefile
+++ b/textproc/xhtml-11/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	W3C's XHTML 1.1 DTD
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 RECDATE=	20070216
 
diff --git a/textproc/xhtml-basic/Makefile b/textproc/xhtml-basic/Makefile
index 957d70a40714..642f7c836f73 100644
--- a/textproc/xhtml-basic/Makefile
+++ b/textproc/xhtml-basic/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	W3C's XHTML Basic DTD
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr \
-		${LOCALBASE}/share/xml/dtd/xhtml-modularization/catalog.xml:${PORTSDIR}/textproc/xhtml-modularization
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr \
+		${LOCALBASE}/share/xml/dtd/xhtml-modularization/catalog.xml:textproc/xhtml-modularization
 
 RECDATE=	20001219
 
diff --git a/textproc/xhtml-modularization/Makefile b/textproc/xhtml-modularization/Makefile
index a9f792705e1f..79064c7bc155 100644
--- a/textproc/xhtml-modularization/Makefile
+++ b/textproc/xhtml-modularization/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	W3C's Modularization of XHTML DTDs and docs
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 USES=		tar:tgz
 
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index 873e7e9c9d82..6ddbca27c72d 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	xhtml1-20020801
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	W3C's XHTML DTD
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 USES=		zip
 NO_MTREE=	YES
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index 9dccd80f2e57..1f2d9eb7aba1 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-1.0d11
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java-based XInclude processors
 
-RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \
-		${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j
+RUN_DEPENDS=	${JAVALIBDIR}/jdom.jar:java/jdom \
+		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index ec76840a4c36..222eca5261dd 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tool to create RFCs and related documents from XML, as per RFC2629
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index 8a061a923d93..45ac797202bf 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -32,7 +32,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 ALL_TARGET+=	docs
 .endif
 
diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index fd8c74d9a1ca..24a541211ca5 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	XML character entities
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/textproc/xmldiff/Makefile b/textproc/xmldiff/Makefile
index a4fef44a340d..cdb58222854f 100644
--- a/textproc/xmldiff/Makefile
+++ b/textproc/xmldiff/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	xmldiff.pl
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display meaningful differences between XML files
 
-RUN_DEPENDS=	xmlprpr:${PORTSDIR}/textproc/xmlprpr
+RUN_DEPENDS=	xmlprpr:textproc/xmlprpr
 
 USES=		shebangfix perl5
 NO_BUILD=	yes
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index 575b14a6a99b..2b7ab2d554db 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 MAINTAINER=	hsmtkk@gmail.com
 COMMENT=	XML-Conscious PPM Compression
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		iconv gmake
 MAKE_ARGS=	CC="${CXX}" CFLAGS="${CXXFLAGS}" \
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index ce02b557d022..fc3721c10ba9 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -13,7 +13,7 @@ COMMENT=	XSL formatter that produces PDF and PostScript
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 USES=		gmake libtool pkgconfig pathfix
 USE_GNOME=	libgnomeprint libxslt \
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index b4d454207eb2..91814ad3b723 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -18,14 +18,14 @@ COMMENT=	Front-end to an XSL toolchain
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${BASH_CMD}:${PORTSDIR}/shells/bash \
-		${GETOPT_CMD}:${PORTSDIR}/misc/getopt \
-		xmllint:${PORTSDIR}/textproc/libxml2 \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		paperconf:${PORTSDIR}/print/libpaper \
-		w3m:${PORTSDIR}/www/w3m \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
+BUILD_DEPENDS=	${BASH_CMD}:shells/bash \
+		${GETOPT_CMD}:misc/getopt \
+		xmllint:textproc/libxml2 \
+		xsltproc:textproc/libxslt \
+		docbook-xsl>0:textproc/docbook-xsl \
+		paperconf:print/libpaper \
+		w3m:www/w3m \
+		docbook-xml>0:textproc/docbook-xml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES=	pkg-message
@@ -60,12 +60,12 @@ USE_TEX+=	xmltex
 .endif
 
 .if ${PORT_OPTIONS:MFOP}
-RUN_DEPENDS+=	fop>=0.90:${PORTSDIR}/textproc/fop
+RUN_DEPENDS+=	fop>=0.90:textproc/fop
 CONFIGURE_ARGS+=	--with-backend=fop
 .endif
 
 .if ${PORT_OPTIONS:MDBLATEX}
-RUN_DEPENDS+=	${LOCALBASE}/bin/dblatex:${PORTSDIR}/textproc/dblatex
+RUN_DEPENDS+=	${LOCALBASE}/bin/dblatex:textproc/dblatex
 .if ! ${PORT_OPTIONS:MFOP}
 CONFIGURE_ARGS+=	--with-backend=dblatex
 .endif
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index c8bd803d2439..df32dce86154 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Modern style C++ library for working with XML data
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs
 
 OPTIONS_DEFINE=	XSLT DOCS
 XSLT_DESC=	Build libxsltwrap library (requires libxslt)
diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile
index ac3c62508bb9..ba88aa297656 100644
--- a/textproc/xom/Makefile
+++ b/textproc/xom/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.cafeconleche.org/XOM/
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Open source (LGPL), tree-based API for processing XML with Java
 
-RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \
-		${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
+RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j \
+		${JAVALIBDIR}/xalan.jar:textproc/xalan-j
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile
index 7955e9cc029f..61bc33281bed 100644
--- a/textproc/xqilla/Makefile
+++ b/textproc/xqilla/Makefile
@@ -14,8 +14,8 @@ COMMENT=	XQuery and XPath2 library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
-		libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS=	libxerces-c.so.3:textproc/xerces-c3 \
+		libtidy.so:www/tidy-lib
 
 USES=		libtool
 GNU_CONFIGURE=	yes
@@ -27,8 +27,8 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DOXYGEN
 
-DOCYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOCYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 DOCYGEN_ALL_TARGET=	all docs
 
 post-patch:
diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile
index 9413e7fad730..bb80d13183ef 100644
--- a/textproc/xslint/Makefile
+++ b/textproc/xslint/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XSL(T) stylesheet checker
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
+RUN_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM
 
 USES=		shebangfix perl5 zip
 USE_PERL5=	run
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index c30ca6728218..80d92ab8ca4f 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -12,7 +12,7 @@ COMMENT=	XML Schema Validator
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ltxml>0:${PORTSDIR}/textproc/py-ltxml
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 7e2e8efe4fd6..e8c1b26d1977 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XSL Transformations (XSLT) implementation in Java
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \
-		${JAVALIBDIR}/xp.jar:${PORTSDIR}/textproc/xp
+RUN_DEPENDS=	${JAVALIBDIR}/xml-apis.jar:textproc/xerces-j \
+		${JAVALIBDIR}/xp.jar:textproc/xp
 
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+
diff --git a/textproc/xxdiff-scripts/Makefile b/textproc/xxdiff-scripts/Makefile
index 4fec70cbdbfb..2af28b0d5e34 100644
--- a/textproc/xxdiff-scripts/Makefile
+++ b/textproc/xxdiff-scripts/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Helper scripts for xxdiff
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	xxdiff:${PORTSDIR}/textproc/xxdiff
+RUN_DEPENDS=	xxdiff:textproc/xxdiff
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	autoplist distutils
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index a809e0a5726b..8cefe20598b0 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 
 # base flex(1) v2.5.4 is not sufficient
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 
 post-patch:
 	@${REINPLACE_CMD} -e 's!flex!${LOCALBASE}/bin/&!' \
diff --git a/textproc/yali/Makefile b/textproc/yali/Makefile
index 9fd4ff6ffb3a..34f10cadef6a 100644
--- a/textproc/yali/Makefile
+++ b/textproc/yali/Makefile
@@ -14,8 +14,8 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	tsparks@appliedops.net
 COMMENT=	YALI: Yet Another LOLCODE Interpreter
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 
 USES=		perl5 dos2unix shebangfix
 USE_PERL5=	run
diff --git a/textproc/yamcha/Makefile b/textproc/yamcha/Makefile
index 19be2b89495e..64fbc3e77431 100644
--- a/textproc/yamcha/Makefile
+++ b/textproc/yamcha/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://chasen.org/~taku/software/yamcha/src/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet Another Multipurpose CHunk Annotator
 
-BUILD_DEPENDS=	svm_learn:${PORTSDIR}/science/svmlight
+BUILD_DEPENDS=	svm_learn:science/svmlight
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index 961e304e7652..73c3d8c9808b 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Utilities to help manage documentation for Yelp and the web
 
-BUILD_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	yelp-xsl>=0:textproc/yelp-xsl \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile
index f85fadba7feb..ee9bbe30620d 100644
--- a/textproc/yelp-xsl/Makefile
+++ b/textproc/yelp-xsl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DocBook XSLT stylesheets for yelp
 
 PORTSCOUT=	limitw:1,even
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 USES=		gettext gmake gnome pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intlhack libxml2 libxslt
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index ab78c8ca09a5..ec53cd8b10c8 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Easy to use but powerful document formatting/preparation language
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt
-BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
-		bash:${PORTSDIR}/shells/bash \
-		gsed:${PORTSDIR}/textproc/gsed
+RUN_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/bin/getopt:misc/getopt
+BUILD_DEPENDS=	icmake:devel/icmake \
+		bash:shells/bash \
+		gsed:textproc/gsed
 
 USES=		perl5 shebangfix compiler:c++11-lib
 USE_PERL5=	build
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 97b043cf2a9d..4189de4dd558 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -13,19 +13,19 @@ COMMENT=	General purpose C++ XQuery processor
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
-		libicudata.so:${PORTSDIR}/devel/icu \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libtidy.so:${PORTSDIR}/www/tidy-lib \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-RUN_DEPENDS=	fop:${PORTSDIR}/textproc/fop
+LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3 \
+		libicudata.so:devel/icu \
+		libcurl.so:ftp/curl \
+		libtidy.so:www/tidy-lib \
+		libuuid.so:misc/e2fsprogs-libuuid
+RUN_DEPENDS=	fop:textproc/fop
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS+=	doxygen:devel/doxygen
 PHP_CMAKE_ON=		-DWITH_PHP5:BOOL=true
 PHP_CMAKE_OFF=		-DWITH_PHP5:BOOL=false
 PYTHON_CMAKE_ON=	-DWITH_PYTHON:BOOL=true
@@ -91,7 +91,7 @@ CMAKE_ARGS+=	-DJAVA_LIBDIR:PATH=${JAVALIBDIR}
 .endif
 
 .if defined(WITH_SWIG)
-BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS+=	swig2.0:devel/swig20
 .endif
 
 post-patch:
diff --git a/ukrainian/gd/Makefile b/ukrainian/gd/Makefile
index 0da2cc450d19..8784c399c4cb 100644
--- a/ukrainian/gd/Makefile
+++ b/ukrainian/gd/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	ukrainian
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Graphics library for fast image creation with KOI8-U support
 
-BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/x11-fonts/geminifonts:fetch
+BUILD_DEPENDS=  ${NONEXISTENT}:x11-fonts/geminifonts:fetch
 GD_FONTS=	${DISTDIR}/x-koi8u.tgz koi6x10.bdf koi6x13.bdf \
 		koi10x16b.bdf koi9x15.bdf koi10x20.bdf
 
diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile
index 27dd97b9942b..a40fd147d071 100644
--- a/ukrainian/monacofonts/Makefile
+++ b/ukrainian/monacofonts/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Collection of 5 "fixed" fonts for X11 from www.brama.com
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
 
 USES=		fonts zip
 
diff --git a/ukrainian/webalizer/Makefile b/ukrainian/webalizer/Makefile
index 87c8bda78f05..150531903eea 100644
--- a/ukrainian/webalizer/Makefile
+++ b/ukrainian/webalizer/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	ukrainian
 
 MAINTAINER=	mikef@LITech.lviv.ua
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/ukrainian/gd
+LIB_DEPENDS=	libgd.so:ukrainian/gd
 
 WEBALIZER_LANG=	ukrainian