0 files changed, 0 insertions, 0 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