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

With hat: portmgr Sponsored by: Absolight
author: mat <mat@FreeBSD.org> 2016-04-01 22:25:16 +0800
committer: mat <mat@FreeBSD.org> 2016-04-01 22:25:16 +0800
commit: 2ff80f55375ee2811ca2895a06b853699c3e0915 (patch)
tree: eb9a806366343ecfc3a5146e70b637f09d4e62c7 /security
parent: c60c1d09235abbfd733e901b1872b86adc82027c (diff)
download: freebsd-ports-graphics-2ff80f55375ee2811ca2895a06b853699c3e0915.tar.gz
freebsd-ports-graphics-2ff80f55375ee2811ca2895a06b853699c3e0915.tar.zst
freebsd-ports-graphics-2ff80f55375ee2811ca2895a06b853699c3e0915.zip
567 files changed, 2076 insertions, 2076 deletions
diff --git a/security/R-cran-ROAuth/Makefile b/security/R-cran-ROAuth/Makefile
index ceadc767bd0..c622d247eaa 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 e5130c8a00d..632de33b099 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 4ef6968f735..a18e4b92dca 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 9a3f8ffc753..49519996137 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 ff71538c813..12512fad0d3 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 9351baeee75..5bebf3ff042 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 b175a5c40ab..5e905563b60 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 6f927ccd039..761b65d8d7e 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 f841a75106b..0eeb426ea19 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 6ea0679289a..e6386ace43a 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 3f1d532d1cf..495a6838acd 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 f15999aa677..45c46a42154 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 7aa49216f08..d3b1969f432 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 45e66cc4fb2..4b5f72273c2 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 8f9463cc047..526aad48858 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 6544e4c3eea..aa9de1de565 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 a17a380c81e..12086a0bc2c 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 a6b85b5a5e5..201e071b9cd 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 64b3825ef9f..3420f2ce72f 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 a87d6a60891..e7c60f9cb0b 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 d117a23a117..6a4f8f0c004 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 30dc00830fe..94f5328d5f9 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 bbc88b6341d..f1613d399ca 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 507ed7f2471..38906f47b3c 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 2a2168b5e59..9a0415e7f1e 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 b2f68a649a2..d2e6c1fc889 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 f83f8dd585c..5465eaf5e96 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 cbfd2ca1377..10a24a154b7 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 0b6d7687f38..d7922bdf0d1 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 4289dcf1e99..f870eb20d4c 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 a08a336f9d4..2830d934672 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 a566dc71e7e..0b40456ffa7 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 24f57950a5e..3cfa6734508 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 eb28439f9fb..22bc89ff26f 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 91d85edd297..ed1777d1e56 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 be3bc78cd8d..ee815c0b17c 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 1ed2af4f54b..c52c7bc1072 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 874cc791513..c5f586078a0 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 93ce91a8f7b..07e75cdd250 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 5238c4e7491..f12ae7d209e 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 32d3d7caa77..90c235578a3 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 ed936965f84..a9c4d61c228 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 8475dffb5fb..e206c821787 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 f312d238611..d8f9c5c9d44 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 95c3a27bb36..01eb34fd87c 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 4e9262aba35..6516a22e1d1 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 34395ff2c58..88b65df5ba2 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 147f14b9952..3f4227ee805 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 32c4b18785c..0b589b4f362 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 0b11ba20b4e..e1dc8a5165d 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 e572d33a723..f7e42abde40 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 515a52dd98f..b11fbb53cef 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 0d24d41fb26..39b1309581e 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 d9cc38ef14b..7e0a2afce4a 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 31baf2f636b..6f7954b323c 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 1470e770aab..52992912358 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 0c5d94b497d..2fec881bd71 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 7903b1af404..4f1d9d14ea5 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 585734c2c85..435165786bd 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 60d1c644602..14277fa7809 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 5b40ead7336..da1147d77dd 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 57182701568..62715b5bb0c 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 b4d272c0c13..23af3db7ae0 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 4eb254b8cec..bc2500afb92 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 ff171f285c0..ffb6a612d10 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 7ff52f7f39d..d823dd1e52e 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 56ea95446d2..e1a53a8b98f 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 58b86a5e85b..b901a1a1636 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 067fd1a6e97..2ad44a1ceef 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 34ff14568cd..ae3218ce42a 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 d1baa96b392..356014a2704 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 ad3049b838a..db988bf68d3 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 ebc9484c5e7..d3d07215e1b 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 4a84239180c..4d2c219456c 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 d6f086b654b..da82423bd53 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 54f96123b6f..36f4edc4ecb 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 1e21175fb2a..ca098264d59 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 36e3481fb87..a9db54caca9 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 07fbfc88dac..0517154e91e 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 732819c1df2..ce5597d5438 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 beb4b3eb152..2cc7d2791cd 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 3afa5341f6e..6b1f0a0c852 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 350bd6a34cc..fb478649f7f 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 1e0765de0a3..62c5314b00f 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 5aceaf792fd..89c88c5325a 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 3d1b85eca73..bc4b6f823a9 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 4e3eed9b751..89681f6246f 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 f2a87321005..fcdd83005c0 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 1cfde3b106b..9dea19cd9e9 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 fe9ad1b8d19..6f679709c47 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 3f6a7dfc7e3..fcc7f1c25fa 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 19703ed3b47..b11657491ed 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 0830f0576c1..fd33d66ad23 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 58a6e94b4a6..464f2e31e67 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 40113116960..0ea8aeb1d75 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 3717fb81d74..f1cd8ca8d07 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 7114fa173bc..fecfdf0e628 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 e1a72d35a98..96fe523203a 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 f97fa89392d..8bec36d6327 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 57307f47784..9c6abdb5db7 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 f75d07c05fe..895f2adfdbe 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 33ce177469b..f703dd50e33 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 242329ee09c..9333e39fdce 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 1e629af821c..84b96dc7e91 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 69323c3387b..579a8fe777c 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 ed9082f8ce3..c6fa79d6d63 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 906ac2cd977..5615f54fcf5 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 0afdde6d9df..68734eb28b8 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 879f907af6e..b75919a0a8a 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 b68a0c0d105..04f7745a5c8 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 1afdf873d46..d5f1fd7aa62 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 965f71fc2e5..a2654317cbc 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 9deb90b77ec..89cd69e7634 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 eb5d5aa6d19..a47d12402d2 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 2aa856b3cb3..328b312045b 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 045e9851663..b0a867a94a0 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 aaee5ffd440..25bce68d7e9 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 5eb50ac7156..b1498fe2dbd 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 ec38115c176..d83daf603d7 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 a0d66687e59..4aca0f98557 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 6b2c8fe21fc..107d3848dd4 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 d654f737865..d239934e6ff 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 b409e1b6de4..04c41de7e71 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 c79c5d55a52..bcce006d0a1 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 c12283e855f..6ebd6a5cffd 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 92251dd091f..c16a1cb10e5 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 22e6785e002..e94dd00dd26 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 8baa100121c..4acc6786f2a 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 b2d91159b25..00740d3f36f 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 c5bf7a0a286..cb534d11eb2 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 9eeb0ce918f..eb76971fcbf 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 650f1a9ec5a..f9cc108faad 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 c6014ec82dc..5be215e14ca 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 538179cbff8..68ce809e725 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 073c2001605..8c90c470467 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 ab2f2325c72..5a425ab876d 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 aa659632612..6db66e28204 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 dd4589e6c0c..28a6ee26d4c 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 af1b0a845de..a6200cb1b51 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 d17e7fe686c..bb8c162cbe0 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 ad437a51ce2..499da8899d4 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 dd9904530db..7c0314fdee8 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 0fdaa5d987d..a7ec771aac0 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 51e0c911930..ca5585cb320 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 1a562ef7023..b3e765d1142 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 328c4c85571..2dbf372db0f 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 f4d32346b7a..82def177c59 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 9e88a89e860..23a8fde51db 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 2bb8b1c96a1..4db5d911c79 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 5240372c84c..4023efafa7a 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 d324732312e..ce9fba2bcca 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 f2de0e3295e..519bee93110 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 7403a09980e..e20fbab0292 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 7ca896b7659..ddcd1174595 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 94d411ace56..c6bdd35eed8 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 9c8536782d5..5e8ad97536f 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 718d16ef2a8..8db33ab2c21 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 994e45ba4cc..805bbe5fc30 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 e71a844c89c..7db65fe4d04 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 2b63833dc1f..90c1342d769 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 abe66418e3d..883edad3cb4 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 3a72651e18e..08b1da048c1 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 169a37630de..647db6b2620 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 abce958baee..ac74f4a36ef 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 9ef82c5f2c8..06043f0f71b 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 a59fa78ef18..001d074257b 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 9004ad56bb2..aadee7be744 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 3fe976e9608..078a97245f3 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 72a606d2365..16b5c625e03 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 84cf9eaa349..37ce76cd4d1 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 1410bd0ff17..d806c6758fc 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 31d05c1a7d0..0f6ebc903e9 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 c66f4367d30..1412c81347c 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 6640c589e9a..47331813754 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 dccc565687e..7971f9bc6ee 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 d23402b1129..62cd8f40682 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 def0180058e..59d4a4f83fa 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 107f4ceda27..2198b8434bd 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 730b57b3811..273254c54d8 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 1f87427fcec..e56a5d80be3 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 d1a12fea9a5..30bafaccfb1 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 cac00a1ac74..0dc3700d335 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 454a739dd28..9cc726ce943 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 a4861f7a09b..2ff62682303 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 27fcd428240..463a295296f 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 5ac41b9a501..213c2077bfc 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 05fa3588058..08ce269d498 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 eb2fd4e6b0f..73e4abe6394 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 257df33bde3..2e14d8986b2 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 1bb341b8f66..d5a8eabaa4e 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 18ed1cf05ea..1c1dbd506e2 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 002192708d9..eb9d74372a0 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 1a0569fa14a..0fde3b705fb 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 0506f1384f1..356d75e049f 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 3c562803d40..194fa8fd2bb 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 b8572acd510..4d39360fce8 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 5e6f0e91d40..70d658564ee 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 ffd7cf62c19..1b07d36d5e7 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 d869768fb2c..62270ef2bf0 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 e71a6e6fbee..54f34f2aa18 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 5ed2c0968eb..331ccbadb11 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 3182d1081d3..31e83511afc 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 59799114e14..5e587120c40 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 66fab05172c..f56a063c52e 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 8d236c3834a..14325194c13 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 0a7a349fcb7..d5a26b91606 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 adf531dbd99..c74ff143312 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 78896355498..53f4fc30f24 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 a4de187f236..bc5fedf5407 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 24fe18a5dbb..d6017d5596a 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 8e9c9b0f0f5..65fa0633a73 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 0d43813297d..af294cbafe0 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 72fde4f69cf..99ca3ad4c1f 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 d36620c5c39..2a38ec3f3eb 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 d9852d28658..86d3d94fe96 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 84900890a18..68212514e3f 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 2e346b99373..c495cc1cd7b 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 476eef664ef..031a7a6175c 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 10ee5b8f59c..3db8bdd740a 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 37edb915565..2aa30dc992b 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 c5f2924d971..1a8ea2fa439 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 c29f3785fe5..ed3ac976482 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 95601003e12..eee906c449d 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 4d0f4c7e1e9..0ceff0ed81b 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 e5b0c64a71d..787854800c8 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 156c87fa356..25adaa91746 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 7d07d381c96..8b2d0dcf94f 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 637ea8c7657..42b9044c782 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 99052aaa01b..d1ff247a278 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 e71ce673350..08db65f82d1 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 a6f884ed8b8..5f6beea5aab 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 c6fd08588ac..0523ce29b34 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 e376e532f62..dfc2de2ec35 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 a06d9454ab0..28ae2dada0c 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 cceba173014..3f721b96844 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 27321e3bbe4..1116f5bf3ce 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 61b58b258d8..b81f6cec01c 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 4967f0a3811..be94d4b9d9a 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 a12fa6cac68..fd37db677ec 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 b4cea1fc4f4..bf0d0b525da 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 1ee070695e5..f3ac1329555 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 c66ddb1f881..76cf3dd0dd1 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 64de4f7fb14..f47f6386531 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 a382f743f3b..2aba6afa87a 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 5f853560afe..2d59829dbd3 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 7eeb074ef0a..16e3eca4641 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 933ecb5a30c..f53cc14ccde 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 504fa42c9cd..a93b856ca92 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 e7344b7198d..fc17588793b 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 398660dac0d..868bfb8b6c8 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 bc5c186de6c..eece0e46888 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 f544e74126c..ca94115e4a7 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 798ed8f5e10..7710eee5f01 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 17401179ad2..4af6e6c7e8d 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 ca50d524f32..2f120d04241 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 a5b5ca613d5..5290f0e36f1 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 2daa917434f..1fd157045b2 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 84182311d30..469a8162bcf 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 27dbae576dd..5fc2f7daab0 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 c1d7547e2cf..cbe3c8605ce 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 5db09fff2bf..ecd4b64549a 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 41441da53cf..243da4c51a1 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 b705dddf61c..73cbb68ff65 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 79e17d46304..3b84f2f7a80 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 d78471da6a3..05b5e80e6b3 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 ba3321a64f7..f6ede53bbd9 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 590b476a37a..b2d22e122a0 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 9317eb991a3..fe9d4d92596 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 61cdd206057..20a63b39aa2 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 77437faae75..9646b1db2ee 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 e68d486ff56..6c87653a4e0 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 ee63dbd8e68..1d266e1d06d 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 648b87644e6..8bbe0f145cd 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 429f8e42b4a..13edbd45414 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 9e10a41035a..27f171a1c08 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 e1acec4c557..91230181455 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 02f75e05de9..3da58c8081d 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 fabc830dce5..48d7d029a77 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 a78ea930c03..d9c45c0c79f 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 01c1ed3ca57..ab83c462243 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 8370a0e7097..83486ae5e1b 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 9742401d3b5..d0eaeafaa26 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 615d1154781..9919252e575 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 498445f8a9e..ace5500344b 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 34f577d0a99..f544761ea67 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 d147a85369d..e6461fd6531 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 e18a41e9d42..6cc5e8deabc 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 ba01528c1fb..d003447fb25 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 147eb1ec8d3..ea1e55b0cae 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 2f4c2bf0984..2b482faf475 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 778baf6271f..73347ea3cc2 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 7f64de5232f..8ee9748aa93 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 322c31c60ff..1959179564b 100644
--- a/security/p5-IO-Async-SSL/Makefile
+++ b/security/p5-IO-Async-SSL/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Use SSL/TLS with IO::Async
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Future>=0.33:${PORTSDIR}/devel/p5-Future \
-		p5-IO-Async>=0.66:${PORTSDIR}/devel/p5-IO-Async\
-		p5-IO-Socket-SSL>=1.968:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-Future>=0.33:devel/p5-Future \
+		p5-IO-Async>=0.66:devel/p5-IO-Async\
+		p5-IO-Socket-SSL>=1.968:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Identity>=0:${PORTSDIR}/devel/p5-Test-Identity \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		socat:${PORTSDIR}/net/socat
+TEST_DEPENDS=	p5-Test-Identity>=0:devel/p5-Test-Identity \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		socat:net/socat
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index c41133f3d6d..dd076fc98e9 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl5 interface to SSL sockets
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Net-SSLeay>=1.59:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-Mozilla-CA>=20130114:${PORTSDIR}/www/p5-Mozilla-CA
+BUILD_DEPENDS=	p5-Net-SSLeay>=1.59:security/p5-Net-SSLeay \
+		p5-Mozilla-CA>=20130114:www/p5-Mozilla-CA
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
@@ -30,10 +30,10 @@ PORTEXAMPLES=	*
 
 SHEBANG_FILES=	example/ssl_mitm.pl
 
-IDN_BUILD_DEPENDS=	p5-URI>=1.50:${PORTSDIR}/net/p5-URI
+IDN_BUILD_DEPENDS=	p5-URI>=1.50:net/p5-URI
 IDN_RUN_DEPENDS=	${IDN_BUILD_DEPENDS}
-IPV6_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.31:${PORTSDIR}/net/p5-IO-Socket-IP \
-			p5-Socket>=1.95:${PORTSDIR}/net/p5-Socket
+IPV6_BUILD_DEPENDS=	p5-IO-Socket-IP>=0.31:net/p5-IO-Socket-IP \
+			p5-Socket>=1.95:net/p5-Socket
 IPV6_RUN_DEPENDS=	${IPV6_BUILD_DEPENDS}
 
 post-install:
diff --git a/security/p5-Mcrypt/Makefile b/security/p5-Mcrypt/Makefile
index 72c77c739a1..a9230488f80 100644
--- a/security/p5-Mcrypt/Makefile
+++ b/security/p5-Mcrypt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl extension for the Mcrypt cryptography library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt
 
 CONFIGURE_ENV=	MCRYPT_CPPFLAGS=${CPPFLAGS}
 USE_PERL5=	configure
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index f8171d6bfe3..7b6f10282a7 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Module signature file manipulation
 
 LICENSE=	CC0-1.0
 
-BUILD_DEPENDS=	p5-PAR-Dist>=0:${PORTSDIR}/devel/p5-PAR-Dist
+BUILD_DEPENDS=	p5-PAR-Dist>=0:devel/p5-PAR-Dist
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+TEST_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run
 
 CONFIGURE_ENV=	PERL_MM_USE_DEFAULT="yes"
 NO_ARCH=	yes
@@ -28,10 +28,10 @@ OPTIONS_MULTI_GPG=	GPG1 GPG2
 GPG1_DESC=	Use GnuPG version 1
 GPG2_DESC=	Use GnuPG version 2
 
-GPG1_BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+GPG1_BUILD_DEPENDS=	gpgv:security/gnupg1
 GPG1_RUN_DEPENDS=	${GPG1_BUILD_DEPENDS}
 
-GPG2_BUILD_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
+GPG2_BUILD_DEPENDS=	gpgv2:security/gnupg
 GPG2_RUN_DEPENDS=	${GPG2_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/security/p5-Net-Daemon-SSL/Makefile b/security/p5-Net-Daemon-SSL/Makefile
index 9330bded13f..80a652bac15 100644
--- a/security/p5-Net-Daemon-SSL/Makefile
+++ b/security/p5-Net-Daemon-SSL/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl5 extension for portable daemons
 USES=		perl5
 USE_PERL5=	configure
 
-BUILD_DEPENDS+=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS+=	p5-Net-Daemon>=0:${PORTSDIR}/net/p5-Net-Daemon \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	p5-Net-Daemon>=0:net/p5-Net-Daemon \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-Net-Daemon>=0:net/p5-Net-Daemon \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
 
 .include <bsd.port.mk>
diff --git a/security/p5-Net-OpenID-Common/Makefile b/security/p5-Net-OpenID-Common/Makefile
index f1497f02bcb..da28d3faa5a 100644
--- a/security/p5-Net-OpenID-Common/Makefile
+++ b/security/p5-Net-OpenID-Common/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Libraries shared between Net::OpenID::Consumer and Net::OpenID::Server
 
 LICENSE=	ARTPERL10
 
-BUILD_DEPENDS=	p5-Crypt-DH-GMP>=0:${PORTSDIR}/net/p5-Crypt-DH-GMP \
-		p5-Email-MIME-ContentType>=0:${PORTSDIR}/mail/p5-Email-MIME-ContentType \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-Crypt-DH-GMP>=0:net/p5-Crypt-DH-GMP \
+		p5-Email-MIME-ContentType>=0:mail/p5-Email-MIME-ContentType \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Net-OpenID-JanRain/Makefile b/security/p5-Net-OpenID-JanRain/Makefile
index 4f7030b8786..4ac8fd3e323 100644
--- a/security/p5-Net-OpenID-JanRain/Makefile
+++ b/security/p5-Net-OpenID-JanRain/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OpenID JanRain and Consumer with JanRain API
 
-BUILD_DEPENDS=	p5-Crypt-DH>=0:${PORTSDIR}/security/p5-Crypt-DH \
-		p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
-		p5-LWPx-ParanoidAgent>=0:${PORTSDIR}/www/p5-LWPx-ParanoidAgent \
-		p5-Net-Yadis>=0:${PORTSDIR}/net/p5-Net-Yadis \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Crypt-DH>=0:security/p5-Crypt-DH \
+		p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+		p5-LWPx-ParanoidAgent>=0:www/p5-LWPx-ParanoidAgent \
+		p5-Net-Yadis>=0:net/p5-Net-Yadis \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Net-OpenID-Server/Makefile b/security/p5-Net-OpenID-Server/Makefile
index 59134779feb..a928dbe97a9 100644
--- a/security/p5-Net-OpenID-Server/Makefile
+++ b/security/p5-Net-OpenID-Server/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Reference implementation of OpenID server
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-OpenID-Common>=1.11:${PORTSDIR}/security/p5-Net-OpenID-Common \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Net-OpenID-Common>=1.11:security/p5-Net-OpenID-Common \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INSTALL_TARGET=	pure_install
diff --git a/security/p5-Net-Radius-Server/Makefile b/security/p5-Net-Radius-Server/Makefile
index 2df56237919..8711cb87103 100644
--- a/security/p5-Net-Radius-Server/Makefile
+++ b/security/p5-Net-Radius-Server/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Framework for RADIUS Servers
 
-RUN_DEPENDS=	p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM \
-		p5-Class-Accessor>=0.27:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-		p5-Net-Radius>=1.52:${PORTSDIR}/net/p5-Net-Radius \
-		p5-Net-Server>=0.94:${PORTSDIR}/net/p5-Net-Server \
-		p5-NetAddr-IP>=4:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
+RUN_DEPENDS=	p5-Authen-PAM>=0:security/p5-Authen-PAM \
+		p5-Class-Accessor>=0.27:devel/p5-Class-Accessor \
+		p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+		p5-Net-Radius>=1.52:net/p5-Net-Radius \
+		p5-Net-Server>=0.94:net/p5-Net-Server \
+		p5-NetAddr-IP>=4:net-mgmt/p5-NetAddr-IP \
+		p5-perl-ldap>=0:net/p5-perl-ldap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index 739ac5e66b4..f7bf18460c5 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl extension for using SAML SSO
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libzxid.so:${PORTSDIR}/security/zxid
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libzxid.so:security/zxid
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/security/p5-Net-SSL-ExpireDate/Makefile b/security/p5-Net-SSL-ExpireDate/Makefile
index 093d67be007..0860e3ac8bf 100644
--- a/security/p5-Net-SSL-ExpireDate/Makefile
+++ b/security/p5-Net-SSL-ExpireDate/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Obtain expiration date of certificate
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Crypt-OpenSSL-X509>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-X509 \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Time-Duration-Parse>=0:${PORTSDIR}/devel/p5-Time-Duration-Parse \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-UNIVERSAL-require>=0:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Crypt-OpenSSL-X509>=0:security/p5-Crypt-OpenSSL-X509 \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Time-Duration-Parse>=0:devel/p5-Time-Duration-Parse \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-UNIVERSAL-require>=0:devel/p5-UNIVERSAL-require
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Net-SSLGlue/Makefile b/security/p5-Net-SSLGlue/Makefile
index 3f661288ab4..69fe0d17d65 100644
--- a/security/p5-Net-SSLGlue/Makefile
+++ b/security/p5-Net-SSLGlue/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Add/extend SSL support for common perl modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.190:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.190:security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile
index 7fac088cef7..35c71bb1581 100644
--- a/security/p5-Net-SSLeay/Makefile
+++ b/security/p5-Net-SSLeay/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl5 interface to SSL
 
 LICENSE=	OpenSSL
 
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
index f28ed571b10..12b721c59b5 100644
--- a/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
+++ b/security/p5-Net-Server-Mail-ESMTP-AUTH/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Plain and login auth methods for Net::Server::Mail::ESMTP
 
-BUILD_DEPENDS=	p5-Net-Server-Mail>=0:${PORTSDIR}/mail/p5-Net-Server-Mail \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-Net-Server-Mail>=0:mail/p5-Net-Server-Mail \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Net-SinFP/Makefile b/security/p5-Net-SinFP/Makefile
index 33409c5d373..c7ebb13c508 100644
--- a/security/p5-Net-SinFP/Makefile
+++ b/security/p5-Net-SinFP/Makefile
@@ -30,10 +30,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 .if ${PORTNAME} == "Net-SinFP"
 PKGNAMEPREFIX=	p5-
 
-BUILD_DEPENDS+=	p5-Class-Gomor>=1.00:${PORTSDIR}/devel/p5-Class-Gomor \
-		p5-DBIx-SQLite-Simple>=0.33:${PORTSDIR}/databases/p5-DBIx-SQLite-Simple \
-		p5-Net-Packet>=3.00:${PORTSDIR}/net/p5-Net-Packet \
-		p5-Net-Packet-Target>=1.00:${PORTSDIR}/net/p5-Net-Packet-Target
+BUILD_DEPENDS+=	p5-Class-Gomor>=1.00:devel/p5-Class-Gomor \
+		p5-DBIx-SQLite-Simple>=0.33:databases/p5-DBIx-SQLite-Simple \
+		p5-Net-Packet>=3.00:net/p5-Net-Packet \
+		p5-Net-Packet-Target>=1.00:net/p5-Net-Packet-Target
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Nmap-Parser/Makefile b/security/p5-Nmap-Parser/Makefile
index f46b81186f9..4cded0c448f 100644
--- a/security/p5-Nmap-Parser/Makefile
+++ b/security/p5-Nmap-Parser/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Parse nmap scan data with perl
 
-BUILD_DEPENDS=	p5-XML-Twig>=3.16:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-Storable>=2:${PORTSDIR}/devel/p5-Storable
+BUILD_DEPENDS=	p5-XML-Twig>=3.16:textproc/p5-XML-Twig \
+		p5-Storable>=2:devel/p5-Storable
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		nmap:${PORTSDIR}/security/nmap
+		nmap:security/nmap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Nmap-Scanner/Makefile b/security/p5-Nmap-Scanner/Makefile
index 7fdcc32f1ee..d84934d86d3 100644
--- a/security/p5-Nmap-Scanner/Makefile
+++ b/security/p5-Nmap-Scanner/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perform and manipulate nmap scans using perl
 
-BUILD_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-		p5-Class-Generate>=0:${PORTSDIR}/devel/p5-Class-Generate \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	nmap:security/nmap \
+		p5-Class-Generate>=0:devel/p5-Class-Generate \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-OpenCA-OpenSSL/Makefile b/security/p5-OpenCA-OpenSSL/Makefile
index 021f92dc3ea..71c1ee21d16 100644
--- a/security/p5-OpenCA-OpenSSL/Makefile
+++ b/security/p5-OpenCA-OpenSSL/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl crypto extension to OpenSSL
 
-BUILD_DEPENDS=	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-OpenCA-PKCS7/Makefile b/security/p5-OpenCA-PKCS7/Makefile
index 351e590a536..54869b8ef47 100644
--- a/security/p5-OpenCA-PKCS7/Makefile
+++ b/security/p5-OpenCA-PKCS7/Makefile
@@ -13,9 +13,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for basic handling PKCS\#7 Signatures
 
-BUILD_DEPENDS=	p5-OpenCA-OpenSSL>=0:${PORTSDIR}/security/p5-OpenCA-OpenSSL \
-		p5-OpenCA-X509>=0:${PORTSDIR}/security/p5-OpenCA-X509 \
-		p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-OpenCA-OpenSSL>=0:security/p5-OpenCA-OpenSSL \
+		p5-OpenCA-X509>=0:security/p5-OpenCA-X509 \
+		p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.9.13
diff --git a/security/p5-OpenCA-REQ/Makefile b/security/p5-OpenCA-REQ/Makefile
index 6a69aa46d5c..9d3ec6ffa8a 100644
--- a/security/p5-OpenCA-REQ/Makefile
+++ b/security/p5-OpenCA-REQ/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/0$//}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to easily manage Cert REQUESTs
 
-BUILD_DEPENDS=	p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-OpenCA-X509/Makefile b/security/p5-OpenCA-X509/Makefile
index 8bc39a864b7..5591e9b3553 100644
--- a/security/p5-OpenCA-X509/Makefile
+++ b/security/p5-OpenCA-X509/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for handling X509 Certificates
 
-BUILD_DEPENDS=	p5-X500-DN>=0:${PORTSDIR}/net/p5-X500-DN
+BUILD_DEPENDS=	p5-X500-DN>=0:net/p5-X500-DN
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 0c930aac798..a9b121166c6 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -26,11 +26,11 @@ OPTIONS_SINGLE=	DEFAULTPGP
 OPTIONS_SINGLE_DEFAULTPGP=	GNUPG PGP2
 OPTIONS_DEFAULT=	GNUPG
 PGP2_DESC=	PGP2 support
-GNUPG_BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+GNUPG_BUILD_DEPENDS=	gpg:security/gnupg
 GNUPG_CONFIGURE_ON=	PGP=${LOCALBASE}/bin/gpg PGPSTYLE=GPG
-GNUPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
-PGP2_BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+GNUPG_RUN_DEPENDS=	gpg:security/gnupg
+PGP2_BUILD_DEPENDS=	pgp:security/pgp
 PGP2_CONFIGURE_ON=	PGP=${LOCALBASE}/bin/pgp PGPSTYLE=PGP2
-PGP2_RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+PGP2_RUN_DEPENDS=	pgp:security/pgp
 
 .include <bsd.port.mk>
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 1eef688eb9f..60c57d380ea 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl5 module to work with PGP messages
 
-RUN_DEPENDS=	pgpin:${PORTSDIR}/security/pgpin
+RUN_DEPENDS=	pgpin:security/pgpin
 
 PORTSCOUT=	skipv:1.0
 
diff --git a/security/p5-POE-Component-SSLify/Makefile b/security/p5-POE-Component-SSLify/Makefile
index a6b22fc1251..a0ae9a8947f 100644
--- a/security/p5-POE-Component-SSLify/Makefile
+++ b/security/p5-POE-Component-SSLify/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Integrate SSL into POE
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Net-SSLeay>=1.36:${PORTSDIR}/security/p5-Net-SSLeay \
-		p5-POE>=1.267:${PORTSDIR}/devel/p5-POE \
-		p5-Task-Weaken>=1.03:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-Net-SSLeay>=1.36:security/p5-Net-SSLeay \
+		p5-POE>=1.267:devel/p5-POE \
+		p5-Task-Weaken>=1.03:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings
 
 USES=		perl5
 USE_PERL5=	modbuildtiny
@@ -25,7 +25,7 @@ USE_PERL5=	modbuildtiny
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+=	p5-Test-Simple>=1.001.002:${PORTSDIR}/devel/p5-Test-Simple
+TEST_DEPENDS+=	p5-Test-Simple>=1.001.002:devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Parse-Snort/Makefile b/security/p5-Parse-Snort/Makefile
index 7b4516c7e9f..f725623398c 100644
--- a/security/p5-Parse-Snort/Makefile
+++ b/security/p5-Parse-Snort/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Perl module to parse and create Snort rules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-PerlCryptLib/Makefile b/security/p5-PerlCryptLib/Makefile
index d2f3386cefd..d652ce0cfe7 100644
--- a/security/p5-PerlCryptLib/Makefile
+++ b/security/p5-PerlCryptLib/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to Peter Guttman cryptlib API
 
-LIB_DEPENDS=	libcl.so:${PORTSDIR}/security/cryptlib
+LIB_DEPENDS=	libcl.so:security/cryptlib
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-SHA/Makefile b/security/p5-SHA/Makefile
index 3d034a1d590..26ae2538180 100644
--- a/security/p5-SHA/Makefile
+++ b/security/p5-SHA/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the SHA1 algorithm
 
-RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+RUN_DEPENDS=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Sudo/Makefile b/security/p5-Sudo/Makefile
index 16de09dfedb..624f0b66f37 100644
--- a/security/p5-Sudo/Makefile
+++ b/security/p5-Sudo/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for running a command line sudo
 
-BUILD_DEPENDS=	p5-Term-ReadPassword>=0:${PORTSDIR}/devel/p5-Term-ReadPassword \
-		p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	p5-Term-ReadPassword>=0:devel/p5-Term-ReadPassword \
+		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index 87f97d847ab..84fe6f6fd5d 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Hashes (and objects based on hashes) with encrypting fields
 
-BUILD_DEPENDS=	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC
+BUILD_DEPENDS=	p5-Crypt-CBC>=0:security/p5-Crypt-CBC
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Crypt-Blowfish>=0:${PORTSDIR}/security/p5-Crypt-Blowfish \
-		p5-Crypt-DES>=0:${PORTSDIR}/security/p5-Crypt-DES
+TEST_DEPENDS=	p5-Crypt-Blowfish>=0:security/p5-Crypt-Blowfish \
+		p5-Crypt-DES>=0:security/p5-Crypt-DES
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/p5-Tree-Authz/Makefile b/security/p5-Tree-Authz/Makefile
index dec3289e946..def1d50878f 100644
--- a/security/p5-Tree-Authz/Makefile
+++ b/security/p5-Tree-Authz/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Role-Based Access Control authorization scheme
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-Lingua-EN-Inflect-Number>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Inflect-Number
+BUILD_DEPENDS=	p5-Class-Data-Inheritable>=0:devel/p5-Class-Data-Inheritable \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-Lingua-EN-Inflect-Number>=0:textproc/p5-Lingua-EN-Inflect-Number
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/security/p5-Unix-Passwd-File/Makefile b/security/p5-Unix-Passwd-File/Makefile
index ff68309c87b..8a6a114c091 100644
--- a/security/p5-Unix-Passwd-File/Makefile
+++ b/security/p5-Unix-Passwd-File/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Manipulate passwd and group entries
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Crypt-Password-Util>=0.06:${PORTSDIR}/security/p5-Crypt-Password-Util \
-		p5-File-Flock-Retry>=0:${PORTSDIR}/devel/p5-File-Flock-Retry \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-Log-Any-IfLOG>=0:${PORTSDIR}/devel/p5-Log-Any-IfLOG
+BUILD_DEPENDS=	p5-Crypt-Password-Util>=0.06:security/p5-Crypt-Password-Util \
+		p5-File-Flock-Retry>=0:devel/p5-File-Flock-Retry \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-Log-Any-IfLOG>=0:devel/p5-Log-Any-IfLOG
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Class-Load>=0:${PORTSDIR}/devel/p5-Class-Load \
-		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Slurp-Tiny>=0:${PORTSDIR}/devel/p5-File-Slurp-Tiny \
-		p5-File-chdir>=0:${PORTSDIR}/devel/p5-File-chdir \
-		p5-namespace-autoclean>=0:${PORTSDIR}/devel/p5-namespace-autoclean
+TEST_DEPENDS=	p5-Class-Load>=0:devel/p5-Class-Load \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
+		p5-File-Slurp-Tiny>=0:devel/p5-File-Slurp-Tiny \
+		p5-File-chdir>=0:devel/p5-File-chdir \
+		p5-namespace-autoclean>=0:devel/p5-namespace-autoclean
 
 NO_ARCH=	yes
 USES=		perl5
@@ -31,8 +31,8 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+=	p5-experimental>=0:${PORTSDIR}/devel/p5-experimental
-RUN_DEPENDS+=	p5-experimental>=0:${PORTSDIR}/devel/p5-experimental
+BUILD_DEPENDS+=	p5-experimental>=0:devel/p5-experimental
+RUN_DEPENDS+=	p5-experimental>=0:devel/p5-experimental
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/p5-Yahoo-BBAuth/Makefile b/security/p5-Yahoo-BBAuth/Makefile
index 721a6d788a2..7620f6464d9 100644
--- a/security/p5-Yahoo-BBAuth/Makefile
+++ b/security/p5-Yahoo-BBAuth/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl interface to the Yahoo! Browser-Based Authentication
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-libwww>=5.6:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-libwww>=5.6:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/p5-dicewaregen/Makefile b/security/p5-dicewaregen/Makefile
index 5722da7958c..c536251edc6 100644
--- a/security/p5-dicewaregen/Makefile
+++ b/security/p5-dicewaregen/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	graudeejs@gmail.com
 COMMENT=	Simple perl script to generate Diceware dictionaries for passwords
 
-LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 USES=		perl5
 USE_PERL5=	run
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 55ce83478e8..622d38d4d39 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -13,58 +13,58 @@ COMMENT=	Perl based trustcenter for PKI: universal server building block
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	\
-	bash:${PORTSDIR}/shells/bash \
-	openca-tools-forked>=1.4.0:${PORTSDIR}/security/openca-tools-forked \
-	p5-CGI-Fast>=2.10:${PORTSDIR}/www/p5-CGI-Fast \
-	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
-	p5-CGI>=4.21:${PORTSDIR}/www/p5-CGI \
-	p5-Class-Accessor-Chained>=0:${PORTSDIR}/devel/p5-Class-Accessor-Chained \
-	p5-Class-Std>=0:${PORTSDIR}/devel/p5-Class-Std \
-	p5-Config-GitLike>=0:${PORTSDIR}/devel/p5-Config-GitLike \
-	p5-Config-Merge>=0:${PORTSDIR}/devel/p5-Config-Merge \
-	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
-	p5-Connector>=0:${PORTSDIR}/devel/p5-Connector \
-	p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
-	p5-Crypt-OpenSSL-AES>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-AES \
-	p5-Crypt-PKCS10>=1.3:${PORTSDIR}/security/p5-Crypt-PKCS10 \
-	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-	p5-DBD-Mock>=0:${PORTSDIR}/databases/p5-DBD-Mock \
-	p5-Data-Password>=0:${PORTSDIR}/security/p5-Data-Password \
-	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer \
-	p5-DateTime-Format-DateParse>=0:${PORTSDIR}/devel/p5-DateTime-Format-DateParse \
-	p5-IO-Prompt>=0:${PORTSDIR}/devel/p5-IO-Prompt \
-	p5-IPC-ShareLite>=0:${PORTSDIR}/devel/p5-IPC-ShareLite \
-	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-	p5-LWP-Protocol-connect>=0:${PORTSDIR}/www/p5-LWP-Protocol-connect \
-	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-	p5-Locale-libintl>=0:${PORTSDIR}/devel/p5-Locale-libintl \
-	p5-Mail-RFC822-Address>=0:${PORTSDIR}/mail/p5-Mail-RFC822-Address \
-	p5-Math-BigInt>=1.9993:${PORTSDIR}/math/p5-Math-BigInt \
-	p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-	p5-Net-DNS>0.83:${PORTSDIR}/dns/p5-Net-DNS \
-	p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
-	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
-	p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
-	p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-	p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-	p5-Proc-SafeExec>=0:${PORTSDIR}/devel/p5-Proc-SafeExec \
-	p5-RT-Client-REST>=0:${PORTSDIR}/www/p5-RT-Client-REST \
-	p5-Regexp-Common>=0:${PORTSDIR}/textproc/p5-Regexp-Common \
-	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-	p5-Switch>=0:${PORTSDIR}/lang/p5-Switch \
-	p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \
-	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-	p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-	p5-Test-Prereq>=0:${PORTSDIR}/devel/p5-Test-Prereq \
-	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-Workflow>=0.31:${PORTSDIR}/devel/p5-Workflow \
-	p5-XML-Filter-XInclude>=0:${PORTSDIR}/textproc/p5-XML-Filter-XInclude \
-	p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-	p5-XML-Validator-Schema>=0:${PORTSDIR}/textproc/p5-XML-Validator-Schema \
-	p5-openxpki-i18n>=0.20.0.1:${PORTSDIR}/security/p5-openxpki-i18n \
-	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \
+	bash:shells/bash \
+	openca-tools-forked>=1.4.0:security/openca-tools-forked \
+	p5-CGI-Fast>=2.10:www/p5-CGI-Fast \
+	p5-CGI-Session>=0:www/p5-CGI-Session \
+	p5-CGI>=4.21:www/p5-CGI \
+	p5-Class-Accessor-Chained>=0:devel/p5-Class-Accessor-Chained \
+	p5-Class-Std>=0:devel/p5-Class-Std \
+	p5-Config-GitLike>=0:devel/p5-Config-GitLike \
+	p5-Config-Merge>=0:devel/p5-Config-Merge \
+	p5-Config-Std>=0:devel/p5-Config-Std \
+	p5-Connector>=0:devel/p5-Connector \
+	p5-Crypt-CBC>=0:security/p5-Crypt-CBC \
+	p5-Crypt-OpenSSL-AES>=0:security/p5-Crypt-OpenSSL-AES \
+	p5-Crypt-PKCS10>=1.3:security/p5-Crypt-PKCS10 \
+	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+	p5-DBD-Mock>=0:databases/p5-DBD-Mock \
+	p5-Data-Password>=0:security/p5-Data-Password \
+	p5-Data-Serializer>=0:devel/p5-Data-Serializer \
+	p5-DateTime-Format-DateParse>=0:devel/p5-DateTime-Format-DateParse \
+	p5-IO-Prompt>=0:devel/p5-IO-Prompt \
+	p5-IPC-ShareLite>=0:devel/p5-IPC-ShareLite \
+	p5-JSON>=0:converters/p5-JSON \
+	p5-LWP-Protocol-connect>=0:www/p5-LWP-Protocol-connect \
+	p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
+	p5-Mail-RFC822-Address>=0:mail/p5-Mail-RFC822-Address \
+	p5-Math-BigInt>=1.9993:math/p5-Math-BigInt \
+	p5-Moose>=0:devel/p5-Moose \
+	p5-Net-DNS>0.83:dns/p5-Net-DNS \
+	p5-Net-IP>=0:net-mgmt/p5-Net-IP \
+	p5-Net-Server>=0:net/p5-Net-Server \
+	p5-NetAddr-IP>=0:net-mgmt/p5-NetAddr-IP \
+	p5-Path-Class>=0:devel/p5-Path-Class \
+	p5-Proc-ProcessTable>=0:devel/p5-Proc-ProcessTable \
+	p5-Proc-SafeExec>=0:devel/p5-Proc-SafeExec \
+	p5-RT-Client-REST>=0:www/p5-RT-Client-REST \
+	p5-Regexp-Common>=0:textproc/p5-Regexp-Common \
+	p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+	p5-Switch>=0:lang/p5-Switch \
+	p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \
+	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+	p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage \
+	p5-Test-Pod>=0:devel/p5-Test-Pod \
+	p5-Test-Prereq>=0:devel/p5-Test-Prereq \
+	p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-Workflow>=0.31:devel/p5-Workflow \
+	p5-XML-Filter-XInclude>=0:textproc/p5-XML-Filter-XInclude \
+	p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+	p5-XML-Validator-Schema>=0:textproc/p5-XML-Validator-Schema \
+	p5-openxpki-i18n>=0.20.0.1:security/p5-openxpki-i18n \
+	p5-perl-ldap>=0:net/p5-perl-ldap \
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -90,8 +90,8 @@ GROUPS=	openxpki
 OPTIONS_DEFINE=	GRAPHVIZ DOCS EXAMPLES
 
 GRAPHVIZ_DESC=	With graphical visualization of workflows?
-GRAPHVIZ_RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
-			imgsize:${PORTSDIR}/graphics/p5-Image-Size
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz \
+			imgsize:graphics/p5-Image-Size
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|..ENV{PERL} .vergen --format version.|"${PORTVERSION}"|g' ${WRKSRC}/Makefile.PL
diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile
index ec997b81284..ceec54ab06e 100644
--- a/security/pam-pgsql/Makefile
+++ b/security/pam-pgsql/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PAM module for authenticating with PostgreSQL
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmhash.so:${PORTSDIR}/security/mhash \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libmhash.so:security/mhash \
+		libgcrypt.so:security/libgcrypt
 
 USES=		libtool pgsql
 GNU_CONFIGURE=	yes
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index d1ee036309a..8a210ec585d 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:C/_/-/}_${PORTVERSION}+git.orig
 MAINTAINER=	lichray@gmail.com
 COMMENT=	PAM module offering finger print authentication using libfprint
 
-LIB_DEPENDS=	libfprint.so:${PORTSDIR}/security/libfprint
+LIB_DEPENDS=	libfprint.so:security/libfprint
 
 USE_AUTOTOOLS=	autoconf automake
 AUTOMAKE_ARGS=	-a
diff --git a/security/pam_p11/Makefile b/security/pam_p11/Makefile
index 4cd21f1b198..3595b885bbb 100644
--- a/security/pam_p11/Makefile
+++ b/security/pam_p11/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PAM module using crypto tokens for auth
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libp11.so:${PORTSDIR}/security/libp11
+LIB_DEPENDS=	libp11.so:security/libp11
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/security/pam_yubico/Makefile b/security/pam_yubico/Makefile
index 761df074d08..a6bd26b33fa 100644
--- a/security/pam_yubico/Makefile
+++ b/security/pam_yubico/Makefile
@@ -11,8 +11,8 @@ COMMENT=	PAM module for authenticating with a Yubico YubiKey
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libykclient.so:${PORTSDIR}/security/ykclient \
-		libyubikey.so:${PORTSDIR}/security/libyubikey
+LIB_DEPENDS=	libykclient.so:security/ykclient \
+		libyubikey.so:security/libyubikey
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig
@@ -27,7 +27,7 @@ CR_DESC=	Include Challenge/response support
 OPTIONS_DEFAULT=	CR
 
 CR_CONFIGURE_WITH=	cr
-CR_LIB_DEPENDS=	libykpers-1.so:${PORTSDIR}/security/ykpers
+CR_LIB_DEPENDS=	libykpers-1.so:security/ykpers
 CR_PLIST_FILES=	bin/ykpamcfg \
 		man/man1/ykpamcfg.1.gz
 
diff --git a/security/passivedns/Makefile b/security/passivedns/Makefile
index ef1a9a80e68..32b50f5e811 100644
--- a/security/passivedns/Makefile
+++ b/security/passivedns/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Network sniffer that logs DNS replies for use in passive DNS setups
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+LIB_DEPENDS=	libldns.so:dns/ldns
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gamelinux
diff --git a/security/pbc/Makefile b/security/pbc/Makefile
index 5978f62ae58..9e784fd35a1 100644
--- a/security/pbc/Makefile
+++ b/security/pbc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library of pairing-based cryptosystems
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		bison libtool
 GNU_CONFIGURE=	yes
diff --git a/security/pbnj/Makefile b/security/pbnj/Makefile
index d5330ff3798..03b83abf177 100644
--- a/security/pbnj/Makefile
+++ b/security/pbnj/Makefile
@@ -10,15 +10,15 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Suite of tools to monitor changes on a network
 
-BUILD_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-Nmap-Parser>=0:${PORTSDIR}/security/p5-Nmap-Parser \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-File-HomeDir>=0:${PORTSDIR}/devel/p5-File-HomeDir \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-Nmap-Parser>=0:security/p5-Nmap-Parser \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Text-CSV_XS>=0:textproc/p5-Text-CSV_XS \
+		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
+		p5-File-Which>=0:sysutils/p5-File-Which
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		nmap:${PORTSDIR}/security/nmap
+		nmap:security/nmap
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 1e4c900a14a..98cdb7125fc 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Tools to test a PCSC driver, card, or reader
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS=	p5-PCSC-Card>=0:${PORTSDIR}/devel/p5-PCSC-Card \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
+RUN_DEPENDS=	p5-PCSC-Card>=0:devel/p5-PCSC-Card \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USES=		gmake pkgconfig
 
diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index bd6e70a282b..9d405e8fa4b 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -25,17 +25,17 @@ PEAR_FILE_SMBPASSWD_DESC=	PEAR::File_SMBPasswd support
 PEAR_SOAP_DESC=	PEAR::SOAP support
 PEAR_NET_VPOPMAILD_DESC=	PEAR::Net_Vpopmaild support
 
-PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log/syslog.php:${PORTSDIR}/sysutils/pear-Log
-PEAR_FILE_PASSWD_RUN_DEPENDS=	${PEARDIR}/File/Passwd.php:${PORTSDIR}/security/pear-File_Passwd
-PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
-PEAR_NET_POP3_RUN_DEPENDS=	${PEARDIR}/Net/POP3.php:${PORTSDIR}/net/pear-Net_POP3
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_AUTH_RADIUS_RUN_DEPENDS=	${PEARDIR}/Auth/RADIUS.php:${PORTSDIR}/net/pear-Auth_RADIUS
-PEAR_FILE_SMBPASSWD_RUN_DEPENDS=	${PEARDIR}/File/SMBPasswd.php:${PORTSDIR}/security/pear-File_SMBPasswd
-PEAR_SOAP_RUN_DEPENDS=	${PEARDIR}/SOAP/Base.php:${PORTSDIR}/net/pear-SOAP
-PEAR_NET_VPOPMAILD_RUN_DEPENDS=	${PEARDIR}/Net/Vpopmaild.php:${PORTSDIR}/net/pear-Net_Vpopmaild
+PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log/syslog.php:sysutils/pear-Log
+PEAR_FILE_PASSWD_RUN_DEPENDS=	${PEARDIR}/File/Passwd.php:security/pear-File_Passwd
+PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
+PEAR_NET_POP3_RUN_DEPENDS=	${PEARDIR}/Net/POP3.php:net/pear-Net_POP3
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_AUTH_RADIUS_RUN_DEPENDS=	${PEARDIR}/Auth/RADIUS.php:net/pear-Auth_RADIUS
+PEAR_FILE_SMBPASSWD_RUN_DEPENDS=	${PEARDIR}/File/SMBPasswd.php:security/pear-File_SMBPasswd
+PEAR_SOAP_RUN_DEPENDS=	${PEARDIR}/SOAP/Base.php:net/pear-SOAP
+PEAR_NET_VPOPMAILD_RUN_DEPENDS=	${PEARDIR}/Net/Vpopmaild.php:net/pear-Net_Vpopmaild
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Auth.php
diff --git a/security/pear-Auth_OpenID/Makefile b/security/pear-Auth_OpenID/Makefile
index 0812d06b575..ce83bfa08c9 100644
--- a/security/pear-Auth_OpenID/Makefile
+++ b/security/pear-Auth_OpenID/Makefile
@@ -28,8 +28,8 @@ PEAR_DB_DESC=	Support SQL stores
 
 USE_PHP=	curl dom
 
-PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
 
 .include <bsd.port.options.mk>
 
diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index 0418cedf4db..95c31e66593 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR abstraction of various SASL mechanism responses
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-Auth>=0:${PORTSDIR}/security/pear-Auth
+BUILD_DEPENDS=	pear-Auth>=0:security/pear-Auth
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/pear-Crypt_GPG/Makefile b/security/pear-Crypt_GPG/Makefile
index 04ca8644218..5346d550345 100644
--- a/security/pear-Crypt_GPG/Makefile
+++ b/security/pear-Crypt_GPG/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GNU Privacy Guard (GPG)
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.10:${PORTSDIR}/devel/pear-Console_CommandLine
+BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile
index a0b84d46873..633814b9c80 100644
--- a/security/pear-File_Passwd/Makefile
+++ b/security/pear-File_Passwd/Makefile
@@ -13,6 +13,6 @@ USES=	pear
 OPTIONS_DEFINE=	PEAR_CRYPT_CHAP
 PEAR_CRYPT_CHAP_DESC=	PEAR::Crypt_CHAP support
 
-PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
+PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
 
 .include <bsd.port.mk>
diff --git a/security/pear-File_SMBPasswd/Makefile b/security/pear-File_SMBPasswd/Makefile
index c752352e2f4..cf257f7911f 100644
--- a/security/pear-File_SMBPasswd/Makefile
+++ b/security/pear-File_SMBPasswd/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class for managing SAMBA style password files
 
-BUILD_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
-RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
+BUILD_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
+RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
 
 USES=	pear
 USE_PHP=	mhash
diff --git a/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile
index b7f5021f348..5aa0afb0add 100644
--- a/security/pear-LiveUser/Makefile
+++ b/security/pear-LiveUser/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR user authentication and permission management framework
 
-BUILD_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
-RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
+BUILD_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
+RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
 
 PORTSCOUT=	skipv:0.61
 
@@ -23,11 +23,11 @@ PEAR_LOG_DESC=	PEAR::Log support
 PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
 PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_LOG_RUN_DEPENDS=	 ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
-PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_LOG_RUN_DEPENDS=	 ${PEARDIR}/Log/null.php:sysutils/pear-Log
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
+PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4
 
 .include <bsd.port.mk>
diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile
index 6ef36533374..4d5def0d676 100644
--- a/security/pear-LiveUser_Admin/Makefile
+++ b/security/pear-LiveUser_Admin/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR user authentication and permission management framework
 
-BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:${PORTSDIR}/security/pear-LiveUser
-RUN_DEPENDS=	${PEARDIR}/LiveUser.php:${PORTSDIR}/security/pear-LiveUser
+BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser
+RUN_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser
 
 OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_LOG PEAR_XML_TREE PEAR_CRYPT_RC4
 
@@ -23,11 +23,11 @@ PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
 USES=	pear
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
-PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
-PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
+PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4
 
 .include <bsd.port.mk>
diff --git a/security/pecl-crack/Makefile b/security/pecl-crack/Makefile
index 4b1c4ac5f33..a9081c98203 100644
--- a/security/pecl-crack/Makefile
+++ b/security/pecl-crack/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL extension to cracklib
 
 LICENSE=	PHP30
 
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+LIB_DEPENDS=	libcrack.so:security/cracklib
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index 8418623cbc6..761a816249b 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PECL wrapper around the gpgme library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 CONFIGURE_ARGS=	--with-gnupg=${LOCALBASE}/include
 IGNORE_WITH_PHP=70
diff --git a/security/pecl-ssh2/Makefile b/security/pecl-ssh2/Makefile
index 271fc98b1eb..e7371dbf066 100644
--- a/security/pecl-ssh2/Makefile
+++ b/security/pecl-ssh2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PECL extension to the libssh2 library
 
 LICENSE=	PHP301
 
-LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIB_DEPENDS=	libssh2.so:security/libssh2
 
 USES=		tar:tgz
 USE_PHP=	yes
diff --git a/security/pev/Makefile b/security/pev/Makefile
index eb7f1cbd473..f46891e1bb0 100644
--- a/security/pev/Makefile
+++ b/security/pev/Makefile
@@ -12,7 +12,7 @@ COMMENT=	PE analysis toolkit
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/security/pgpgpg/Makefile b/security/pgpgpg/Makefile
index fdba7ac8fc8..37490f04d12 100644
--- a/security/pgpgpg/Makefile
+++ b/security/pgpgpg/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Wrapper for GnuPG to simulate PGP 2.6.x
 # if it can't find gpg.  RUN_DEPENDS is necessary to make the package
 # dependency register correctly.  Hence the apparent redundancy.
 
-BUILD_DEPENDS=	${PREFIX}/bin/gpgv:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	${PREFIX}/bin/gpgv:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	${PREFIX}/bin/gpgv:security/gnupg1
+RUN_DEPENDS=	${PREFIX}/bin/gpgv:security/gnupg1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gpg-path=${PREFIX}/bin/gpg
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 50275468db6..e449ee31638 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	perlfu@gmail.com
 COMMENT=	Encryption Plugin for the Pidgin instant messenger client
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libpurple.so:${PORTSDIR}/net-im/libpurple \
-		libnss3.so:${PORTSDIR}/security/nss
+BUILD_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin
+RUN_DEPENDS=	${LOCALBASE}/bin/pidgin:net-im/pidgin
+LIB_DEPENDS=	libpurple.so:net-im/libpurple \
+		libnss3.so:security/nss
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
diff --git a/security/pidgin-otr/Makefile b/security/pidgin-otr/Makefile
index 500a9052390..6326d755248 100644
--- a/security/pidgin-otr/Makefile
+++ b/security/pidgin-otr/Makefile
@@ -14,10 +14,10 @@ LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # explicitly use libotr.so.5 (see ports/186944)
-BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libotr.so.5:${PORTSDIR}/security/libotr \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libpurple.so:${PORTSDIR}/net-im/libpurple
+BUILD_DEPENDS=	pidgin:net-im/pidgin
+LIB_DEPENDS=	libotr.so.5:security/libotr \
+		libgcrypt.so:security/libgcrypt \
+		libpurple.so:net-im/libpurple
 
 USES=		cpe gmake libtool pkgconfig
 CPE_VENDOR=	cypherpunks
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index b7ec53dcee5..a99dd6b40be 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -26,23 +26,23 @@ FRONTEND_DESC=	Default frontend
 
 TTY_DESC=	Console version
 PINENTRY_TTY=	pinentry-tty
-TTY_RUN_DEPENDS=	${PINENTRY_TTY}:${PORTSDIR}/security/pinentry-tty
+TTY_RUN_DEPENDS=	${PINENTRY_TTY}:security/pinentry-tty
 
 NCURSES_DESC=	Curses frontend
 PINENTRY_NCURSES=	pinentry-curses
-NCURSES_RUN_DEPENDS=	${PINENTRY_NCURSES}:${PORTSDIR}/security/pinentry-curses
+NCURSES_RUN_DEPENDS=	${PINENTRY_NCURSES}:security/pinentry-curses
 
 GTK2_DESC=	Gtk+ 2 frontend
 PINENTRY_GTK2=	pinentry-gtk-2
-GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:${PORTSDIR}/security/pinentry-gtk2
+GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:security/pinentry-gtk2
 
 QT4_DESC=	Qt 4 frontend
 PINENTRY_QT4=	pinentry-qt
-QT4_RUN_DEPENDS=	${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4
+QT4_RUN_DEPENDS=	${PINENTRY_QT4}:security/pinentry-qt4
 
 GNOME3_DESC=	GNOME 3 frontend
 PINENTRY_GNOME3=	pinentry-gnome3
-GNOME3_RUN_DEPENDS=	${PINENTRY_GNOME3}:${PORTSDIR}/security/pinentry-gnome3
+GNOME3_RUN_DEPENDS=	${PINENTRY_GNOME3}:security/pinentry-gnome3
 
 .include <bsd.port.options.mk>
 
@@ -58,9 +58,9 @@ do-install:
 
 .else # !defined(PINENTRY_GUI)
 PKGNAMESUFFIX=	-${PINENTRY_GUI}
-LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libksba.so:${PORTSDIR}/security/libksba
+LIB_DEPENDS=	libassuan.so:security/libassuan \
+		libgcrypt.so:security/libgcrypt \
+		libksba.so:security/libksba
 
 USES+=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes
@@ -73,12 +73,12 @@ OPTIONS_DEFINE=	LIBSECRET
 
 LIBSECRET_DESC=	Saving the passphrase with libsecret
 LIBSECRET_CONFIGURE_ENABLE=	libsecret
-LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
 
 .if ${PINENTRY_GUI} == "gnome3"
 OPTIONS_SLAVE=	LIBSECRET
 USE_GNOME+=	gtk20
-LIB_DEPENDS+=	libgcr-base-3.so:${PORTSDIR}/security/gcr
+LIB_DEPENDS+=	libgcr-base-3.so:security/gcr
 PLIST_FILES=	bin/pinentry-gnome3
 .else
 CONFIGURE_ARGS+=--disable-pinentry-gnome3
diff --git a/security/pond/Makefile b/security/pond/Makefile
index cd2ea62bda9..02f40eefff7 100644
--- a/security/pond/Makefile
+++ b/security/pond/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Forward secure, asynchronous messenger
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:${PORTSDIR}/security/go.crypto \
-		${LOCALBASE}/${GO_LIBDIR}/github.com/golang/protobuf/proto.a:${PORTSDIR}/devel/goprotobuf \
-		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:${PORTSDIR}/net/go.net
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
-		libtspi.so:${PORTSDIR}/security/trousers
+BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/go.crypto \
+		${LOCALBASE}/${GO_LIBDIR}/github.com/golang/protobuf/proto.a:devel/goprotobuf \
+		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:net/go.net
+RUN_DEPENDS=	tor:security/tor
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell \
+		libtspi.so:security/trousers
 
 PLIST_FILES=	bin/pond-server bin/pond
 USE_GNOME=	gtk30
diff --git a/security/ppars/Makefile b/security/ppars/Makefile
index 27f48395619..1491c841ee2 100644
--- a/security/ppars/Makefile
+++ b/security/ppars/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	ppars1@a1poweruser.com
 COMMENT=	Proactive Probing Abuse Reporting System
 
-RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
+RUN_DEPENDS=	p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask
 
 USES=		perl5 shebangfix tar:bzip2
 NO_BUILD=	yes
diff --git a/security/proftpd-mod_clamav/Makefile b/security/proftpd-mod_clamav/Makefile
index 3dfd166b6e6..369497f151b 100644
--- a/security/proftpd-mod_clamav/Makefile
+++ b/security/proftpd-mod_clamav/Makefile
@@ -19,7 +19,7 @@ MASTERDIR=	${.CURDIR}/../../ftp/proftpd
 GH_TAGNAME=	v${DISTVERSION}
 GIT_REVISION=	f0cad45
 
-RUN_DEPENDS+=	clamd:${PORTSDIR}/security/clamav
+RUN_DEPENDS+=	clamd:security/clamav
 _PROFTPD_MODULE_DISTFILES=	mod_clamav-v0.13${EXTRACT_SUFX}:clamav
 _PROFTPD_MODULE_EXTRACT_ONLY= 	mod_clamav-v0.13${EXTRACT_SUFX}
 _PROFTPD_MODULE_MASTER_SITES=	https://codeload.github.com/jbenden/mod_clamav/legacy.tar.gz/${GH_TAGNAME}?dummy=/:clamav
diff --git a/security/pssh/Makefile b/security/pssh/Makefile
index 48f46b9d021..3945ba9fd09 100644
--- a/security/pssh/Makefile
+++ b/security/pssh/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Parallel versions of the openssh tools
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	rsync:net/rsync
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index 1f97812b9ba..7ba43522f69 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Console password management application based on gpg(me)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:security/gnupg1
 
 USES=		ncurses
 USE_GNOME=	libxml2
diff --git a/security/pwman3/Makefile b/security/pwman3/Makefile
index b135bce195a..a1637ea016e 100644
--- a/security/pwman3/Makefile
+++ b/security/pwman3/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	Pwman3-${PORTVERSION}
 MAINTAINER=	yarodin@gmail.com
 COMMENT=	Console password management application with sql storage
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-AccessControl/Makefile b/security/py-AccessControl/Makefile
index 56add7a616e..867663162f2 100644
--- a/security/py-AccessControl/Makefile
+++ b/security/py-AccessControl/Makefile
@@ -13,23 +13,23 @@ COMMENT=	Security framework for Zope2
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>=0:${PORTSDIR}/devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:${PORTSDIR}/devel/py-ExtensionClass \
-		${PYTHON_PKGNAMEPREFIX}Persistence>=0:${PORTSDIR}/devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}Record>=0:${PORTSDIR}/devel/py-Record \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:${PORTSDIR}/devel/py-zExceptions \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:${PORTSDIR}/devel/py-zope.testing
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \
+		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \
+		${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \
+		${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing
 
 USES=		python:2.7
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-Products.PlonePAS/Makefile b/security/py-Products.PlonePAS/Makefile
index 4aa40d577ec..dc226e99224 100644
--- a/security/py-Products.PlonePAS/Makefile
+++ b/security/py-Products.PlonePAS/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Adapts the PluggableAuthService for use by Plone
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}plone.session>=0:${PORTSDIR}/security/py-plone.session \
-		${PYTHON_PKGNAMEPREFIX}plone.i18n>0:${PORTSDIR}/www/py-plone.i18n \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:${PORTSDIR}/devel/py-Products.CMFDefault \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \
+		${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
 
 NO_ARCH=	yes
 USES=		python:2.7 zope
diff --git a/security/py-Products.PluggableAuthService/Makefile b/security/py-Products.PluggableAuthService/Makefile
index fc2ecdb4e91..fb54937a052 100644
--- a/security/py-Products.PluggableAuthService/Makefile
+++ b/security/py-Products.PluggableAuthService/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pluggable Zope2 authentication / authorization framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:${PORTSDIR}/devel/py-Products.PluginRegistry \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup
 
 USES=		python:2 zope
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-SecretStorage/Makefile b/security/py-SecretStorage/Makefile
index 1d0b304625c..ecbe206e3e1 100644
--- a/security/py-SecretStorage/Makefile
+++ b/security/py-SecretStorage/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Store passwords using the SecretService DBus API
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 NO_ARCH=	yes
 USES=		python
@@ -21,9 +21,9 @@ USE_PYTHON=	autoplist distutils
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} > 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:${PORTSDIR}/devel/py3-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py3-dbus
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index ea8af18f819..0e123568da6 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -13,18 +13,18 @@ COMMENT=	ACME protocol implementation in Python
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:${PORTSDIR}/net/py-ndg_httpsclient \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:${PORTSDIR}/devel/py-pyrfc3339 \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}werkzeug>0:${PORTSDIR}/www/py-werkzeug \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index a400747dcc7..8e641a59dbc 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -14,7 +14,7 @@ COMMENT=	ForensicArtifacts.com Artifact Repository
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-borg.localrole/Makefile b/security/py-borg.localrole/Makefile
index 27ac4e82c34..1cf649c8c30 100644
--- a/security/py-borg.localrole/Makefile
+++ b/security/py-borg.localrole/Makefile
@@ -13,16 +13,16 @@ COMMENT=	PAS plugin which can manage local roles via an adapter lookup
 
 LICENSE=	LGPL20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:${PORTSDIR}/devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/py-Products.GenericSetup \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:${PORTSDIR}/www/py-plone.memoize \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 905e2a6ac0c..6d432d0580d 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -19,7 +19,7 @@ BROKEN=		unfetchable
 DEPRECATED=	Not updated since 2008 by upstream and abandoned in favor of pyClamd (security/py-pyclamd)
 EXPIRATION_DATE=	2016-03-31
 
-LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	libclamav.so:security/clamav
 
 DIST_SUBDIR=	python
 USES=		python
diff --git a/security/py-cracklib/Makefile b/security/py-cracklib/Makefile
index 2bd53a4d41a..e4ebac8668a 100644
--- a/security/py-cracklib/Makefile
+++ b/security/py-cracklib/Makefile
@@ -6,7 +6,7 @@ COMMENT=	Python bindings for cracklib
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+LIB_DEPENDS=	libcrack.so:security/cracklib
 
 MASTERDIR=	${.CURDIR}/../cracklib
 BUILD_WRKSRC=	${WRKSRC}/python
diff --git a/security/py-crits/Makefile b/security/py-crits/Makefile
index ef98e2b9dcd..92f961981d9 100644
--- a/security/py-crits/Makefile
+++ b/security/py-crits/Makefile
@@ -21,49 +21,49 @@ USE_PYTHON=		autoplist
 
 USE_APACHE_RUN=	22+
 
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre  \
-		libcurl.so:${PORTSDIR}/ftp/curl    \
-		libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS+=	libpcre.so:devel/pcre  \
+		libcurl.so:ftp/curl    \
+		libpcap.so:net/libpcap
 
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip     \
-		unrar:${PORTSDIR}/archivers/unrar  \
-		upx:${PORTSDIR}/archivers/upx	   \
-		zip:${PORTSDIR}/archivers/zip	   \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson  \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl             \
-		${PYTHON_PKGNAMEPREFIX}pydot>=0:${PORTSDIR}/graphics/py-pydot         \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml               \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}numpy>0:${PORTSDIR}/math/py-numpy                   \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib         \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml                    \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:${PORTSDIR}/devel/py-dateutil         \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto         \
-		mongodb>2.6.4:${PORTSDIR}/databases/mongodb                                \
-		${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:${PORTSDIR}/databases/pymongo        \
-		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:${PORTSDIR}/devel/py-defusedxml   \
-		${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:${PORTSDIR}/www/py-django16         \
-		${PYTHON_PKGNAMEPREFIX}django-tastypie16>0:${PORTSDIR}/www/py-django16-tastypie \
-		${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine16>=0.4.5:${PORTSDIR}/devel/py-django16-tastypie-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:${PORTSDIR}/devel/py-mongoengine \
-		${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:${PORTSDIR}/security/py-pydeep          \
-		${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:${PORTSDIR}/devel/py-pefile      \
-		${PYTHON_PKGNAMEPREFIX}yara>=2.1.0:${PORTSDIR}/security/py-yara            \
-		${PYTHON_PKGNAMEPREFIX}pynids>=0.6.1:${PORTSDIR}/net/pynids                \
-		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:${PORTSDIR}/devel/py-anyjson         \
-		${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:${PORTSDIR}/net/py-amqp                 \
-		${PYTHON_PKGNAMEPREFIX}billiard>=2.7.3.19:${PORTSDIR}/devel/py-billiard    \
-		${PYTHON_PKGNAMEPREFIX}kombu>=2.5.4:${PORTSDIR}/net/py-kombu               \
-		${PYTHON_PKGNAMEPREFIX}celery>=3.0.12:${PORTSDIR}/devel/py-celery          \
-		${PYTHON_PKGNAMEPREFIX}requests1>=1.1.0_9:${PORTSDIR}/www/py-requests1     \
-		${PKGNAMEPREFIX}pillow>=2.4.0:${PORTSDIR}/graphics/py-pillow               \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:${PORTSDIR}/devel/py-pyparsing     \
-		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.15:${PORTSDIR}/net/py-ldap                \
-		${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic                  \
-		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:${PORTSDIR}/devel/py-mimeparse     \
-		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.5:${PORTSDIR}/security/py-cybox        \
-		${PYTHON_PKGNAMEPREFIX}stix>=1.1.1.0:${PORTSDIR}/security/py-stix          \
-		${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:${PORTSDIR}/www/mod_wsgi4
+RUN_DEPENDS+=	7z:archivers/p7zip     \
+		unrar:archivers/unrar  \
+		upx:archivers/upx	   \
+		zip:archivers/zip	   \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson  \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl             \
+		${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot         \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml               \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy                   \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib         \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml                    \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil         \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto         \
+		mongodb>2.6.4:databases/mongodb                                \
+		${PYTHON_PKGNAMEPREFIX}pymongo>=2.7.1:databases/pymongo        \
+		${PYTHON_PKGNAMEPREFIX}defusedxml>=0.4.1:devel/py-defusedxml   \
+		${PYTHON_PKGNAMEPREFIX}django16>=1.6.5:www/py-django16         \
+		${PYTHON_PKGNAMEPREFIX}django-tastypie16>0:www/py-django16-tastypie \
+		${PYTHON_PKGNAMEPREFIX}django-tastypie-mongoengine16>=0.4.5:devel/py-django16-tastypie-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \
+		${PYTHON_PKGNAMEPREFIX}pydeep>=0.2:security/py-pydeep          \
+		${PYTHON_PKGNAMEPREFIX}pefile>=1.2.10.114:devel/py-pefile      \
+		${PYTHON_PKGNAMEPREFIX}yara>=2.1.0:security/py-yara            \
+		${PYTHON_PKGNAMEPREFIX}pynids>=0.6.1:net/pynids                \
+		${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson         \
+		${PYTHON_PKGNAMEPREFIX}amqp>=1.0.6:net/py-amqp                 \
+		${PYTHON_PKGNAMEPREFIX}billiard>=2.7.3.19:devel/py-billiard    \
+		${PYTHON_PKGNAMEPREFIX}kombu>=2.5.4:net/py-kombu               \
+		${PYTHON_PKGNAMEPREFIX}celery>=3.0.12:devel/py-celery          \
+		${PYTHON_PKGNAMEPREFIX}requests1>=1.1.0_9:www/py-requests1     \
+		${PKGNAMEPREFIX}pillow>=2.4.0:graphics/py-pillow               \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing     \
+		${PYTHON_PKGNAMEPREFIX}ldap>=2.4.15:net/py-ldap                \
+		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic                  \
+		${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse     \
+		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.5:security/py-cybox        \
+		${PYTHON_PKGNAMEPREFIX}stix>=1.1.1.0:security/py-stix          \
+		${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:www/mod_wsgi4
 
 NO_BUILD=	YES
 
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile
index 97fd2341e66..6bfa1cd7d98 100644
--- a/security/py-cryptography/Makefile
+++ b/security/py-cryptography/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Cryptographic recipes and primitives for Python developers
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:${PORTSDIR}/devel/py-cffi
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:${PORTSDIR}/devel/py-cffi \
-		${PYTHON_PKGNAMEPREFIX}idna>=2.0:${PORTSDIR}/dns/py-idna
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}iso8601>0:${PORTSDIR}/devel/py-iso8601
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \
+		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601
 
 USES=		python
 USE_OPENSSL=	yes
@@ -32,11 +32,11 @@ LDFLAGS+=	-L${OPENSSLLIB}
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>0:${PORTSDIR}/net/py-ipaddress
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress
 .endif
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 post-install:
diff --git a/security/py-cybox/Makefile b/security/py-cybox/Makefile
index 93dbbf5875e..4d2895b9a3d 100644
--- a/security/py-cybox/Makefile
+++ b/security/py-cybox/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python library for parsing, manipulating, and generating CybOX content
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:${PORTSDIR}/devel/py-lxml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile
index a0d6b1a5dc1..2b80c123879 100644
--- a/security/py-dfvfs/Makefile
+++ b/security/py-dfvfs/Makefile
@@ -15,20 +15,20 @@ COMMENT=	Digital Forensics Virtual File System
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	libbde>=a:${PORTSDIR}/devel/libbde \
-		libewf>=0:${PORTSDIR}/devel/libewf \
-		libfsntfs>=e:${PORTSDIR}/devel/libfsntfs \
-		libqcow>=a:${PORTSDIR}/devel/libqcow \
-		libsigscan>=e:${PORTSDIR}/devel/libsigscan \
-		libsmdev>=a:${PORTSDIR}/devel/libsmdev \
-		libsmraw>=a:${PORTSDIR}/devel/libsmraw \
-		libvhdi>=e:${PORTSDIR}/devel/libvhdi \
-		libvmdk>=e:${PORTSDIR}/devel/libvmdk \
-		libvshadow>=0:${PORTSDIR}/devel/libvshadow \
-		${PYTHON_PKGNAMEPREFIX}construct>=0:${PORTSDIR}/devel/py-construct \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=0:${PORTSDIR}/devel/py-protobuf \
-		${PYTHON_PKGNAMEPREFIX}pytsk>=0:${PORTSDIR}/sysutils/py-pytsk \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	libbde>=a:devel/libbde \
+		libewf>=0:devel/libewf \
+		libfsntfs>=e:devel/libfsntfs \
+		libqcow>=a:devel/libqcow \
+		libsigscan>=e:devel/libsigscan \
+		libsmdev>=a:devel/libsmdev \
+		libsmraw>=a:devel/libsmraw \
+		libvhdi>=e:devel/libvhdi \
+		libvmdk>=e:devel/libvmdk \
+		libvshadow>=0:devel/libvshadow \
+		${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index fc192e58e45..83430b1bb01 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Scans log files and bans IP that makes too many password failures
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USES=		python shebangfix
 USE_GITHUB=	yes
diff --git a/security/py-flask-httpauth/Makefile b/security/py-flask-httpauth/Makefile
index 05fee223c56..4bcd0e7ac9a 100644
--- a/security/py-flask-httpauth/Makefile
+++ b/security/py-flask-httpauth/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Basic and Digest HTTP authentication for Flask routes
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:${PORTSDIR}/www/py-flask
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index 9332511b850..58237d3a692 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python wrapper for GnuPG
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:${PORTSDIR}/sysutils/py-psutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile
index b2e1a9ff516..58c8d5bf481 100644
--- a/security/py-gnutls/Makefile
+++ b/security/py-gnutls/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python wrapper for the GNUTLS library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-gpsoauth/Makefile b/security/py-gpsoauth/Makefile
index 77a2a7cd047..15f16a6fc70 100644
--- a/security/py-gpsoauth/Makefile
+++ b/security/py-gpsoauth/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Python client library for Google Play Services OAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:${PORTSDIR}/net/py-ndg_httpsclient \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simon-weber
diff --git a/security/py-itsdangerous/Makefile b/security/py-itsdangerous/Makefile
index f5b305351c8..84b7d32bcc1 100644
--- a/security/py-itsdangerous/Makefile
+++ b/security/py-itsdangerous/Makefile
@@ -17,6 +17,6 @@ USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	JSON
 
-JSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:${PORTSDIR}/devel/py-simplejson
+JSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson
 
 .include <bsd.port.mk>
diff --git a/security/py-keyczar/Makefile b/security/py-keyczar/Makefile
index 119618cc3cd..2022faa9d78 100644
--- a/security/py-keyczar/Makefile
+++ b/security/py-keyczar/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Toolkit for safe and simple cryptography
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto
 
 NO_ARCH=	yes
 USES=		python:2
diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 5ce9b7b81a4..4e9791a872e 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Store and access your passwords safely
 
 LICENSE=	PSFL
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:devel/py-setuptools_scm
 
 NO_ARCH=	yes
 USES=		python
@@ -24,8 +24,8 @@ OPTIONS_DEFAULT=	KEYRINGS_ALT
 DBUS_DESC=		Install Python DBUS to support the kwallet backend
 SECRET_SERVICE_DESC=	Install SecretStorage to support the SecretService backend
 
-DBUS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
-KEYRINGS_ALT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:${PORTSDIR}/security/py-keyrings.alt
-SECRET_SERVICE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:${PORTSDIR}/security/py-SecretStorage
+DBUS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+KEYRINGS_ALT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt
+SECRET_SERVICE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage
 
 .include <bsd.port.mk>
diff --git a/security/py-keyrings.alt/Makefile b/security/py-keyrings.alt/Makefile
index 1d297be565b..b90f0009111 100644
--- a/security/py-keyrings.alt/Makefile
+++ b/security/py-keyrings.alt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Alternate Python keyring implementations
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:${PORTSDIR}/devel/py-setuptools_scm
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.9:devel/py-setuptools_scm
 
 NO_ARCH=	yes
 USES=		python
@@ -25,10 +25,10 @@ KDE_KWALLET_DESC=	Install KDE KWallet to support the kwallet backend
 KEYCZAR_DESC=		Install keyczar to support keyring encryption
 PYFS_DESC=		Install pyfilesystem to support the pyfs backend
 
-ENCRYPTED_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+ENCRYPTED_FILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto
 GNOME_KEYRING_USE=		GNOME=pygobject3
 KDE_KWALLET_USE=		KDE4=pykde4
-KEYCZAR_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:${PORTSDIR}/security/py-keyczar
-PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:${PORTSDIR}/devel/py-fs
+KEYCZAR_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar
+PYFS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs
 
 .include <bsd.port.mk>
diff --git a/security/py-letsencrypt/Makefile b/security/py-letsencrypt/Makefile
index af042454ee0..5d64410fa51 100644
--- a/security/py-letsencrypt/Makefile
+++ b/security/py-letsencrypt/Makefile
@@ -13,21 +13,21 @@ COMMENT=	Let's Encrypt client
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme==${PORTVERSION}:${PORTSDIR}/security/py-acme \
-		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:${PORTSDIR}/devel/py-configargparse \
-		${PYTHON_PKGNAMEPREFIX}configobj>0:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=0.7:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}parsedatetime>0:${PORTSDIR}/devel/py-parsedatetime \
-		${PYTHON_PKGNAMEPREFIX}psutil>=2.1.0:${PORTSDIR}/sysutils/py-psutil \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:${PORTSDIR}/devel/py-pyrfc3339 \
-		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:${PORTSDIR}/devel/py-python2-pythondialog \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}zope.component>0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme==${PORTVERSION}:security/py-acme \
+		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=0.7:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}parsedatetime>0:devel/py-parsedatetime \
+		${PYTHON_PKGNAMEPREFIX}psutil>=2.1.0:sysutils/py-psutil \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
+		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-libnacl/Makefile b/security/py-libnacl/Makefile
index ff7b73f63c7..643f583adbb 100644
--- a/security/py-libnacl/Makefile
+++ b/security/py-libnacl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for libsodium/tweetnacl based on ctypes
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile
index 1d5a2ffb8dc..f427a08f8a5 100644
--- a/security/py-m2crypto/Makefile
+++ b/security/py-m2crypto/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Crypto and SSL toolkit for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
+BUILD_DEPENDS=	swig3.0:devel/swig30
 
 PYDISTUTILS_BUILDARGS=	build_ext --openssl=${OPENSSLBASE} --swig=${LOCALBASE}/bin/swig3.0
 USE_OPENSSL=	yes
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 2cd5d8f0dbe..4516483dc3c 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Comprehensive Python interface to the mcrypt library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 6b50227fdce..450e0616f10 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python mhash module
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmhash.so:security/mhash
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-oauth2client/Makefile b/security/py-oauth2client/Makefile
index 8100fe21ae2..2734fbce362 100644
--- a/security/py-oauth2client/Makefile
+++ b/security/py-oauth2client/Makefile
@@ -12,11 +12,11 @@ COMMENT=	OAuth 2.0 client library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:${PORTSDIR}/devel/py-pyasn1-modules \
-		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:${PORTSDIR}/www/py-httplib2 \
-		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:${PORTSDIR}/security/py-rsa \
-		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \
+		${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \
+		${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index 51599acbb5d..4d0978b6939 100644
--- a/security/py-oauthlib/Makefile
+++ b/security/py-oauthlib/Makefile
@@ -13,10 +13,10 @@ COMMENT=	RFC-compliant implementation of the OAuth request-signing logic
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:${PORTSDIR}/www/py-pyjwt \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt \
+		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker
 
 OPTIONS_DEFINE=		RSA SIGNALS SIGNEDTOKEN
 OPTIONS_DEFAULT=	RSA SIGNALS SIGNEDTOKEN
@@ -25,10 +25,10 @@ RSA_DESC=		Enable RSA Support
 SIGNALS_DESC=		Enable signal support
 SIGNEDTOKEN_DESC=	Support for Signed Token
 
-RSA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography
-SIGNALS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker
-SIGNEDTOKEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:${PORTSDIR}/security/py-cryptography \
-				${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:${PORTSDIR}/www/py-pyjwt
+RSA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography
+SIGNALS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker
+SIGNEDTOKEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \
+				${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -38,8 +38,8 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3000
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 post-extract:
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index 094503d0b8d..4335ad3a5c6 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python interface to the OpenSSL library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:${PORTSDIR}/security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index 25e9e479b72..33162ddf1c1 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Python SSH2 protocol library
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}ecdsa>0:${PORTSDIR}/security/py-ecdsa
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile
index 1d93935937b..2b08a28899e 100644
--- a/security/py-passlib/Makefile
+++ b/security/py-passlib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python password hashing framework supporting over 30 schemes
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.1:${PORTSDIR}/devel/py-nose
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile
index 8dbe167bdf8..fac69dc438e 100644
--- a/security/py-plaso/Makefile
+++ b/security/py-plaso/Makefile
@@ -14,38 +14,38 @@ COMMENT=	Automatic creation of a super timeline
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	hachoir-core>=0:${PORTSDIR}/devel/hachoir-core \
-		hachoir-metadata>=0:${PORTSDIR}/sysutils/hachoir-metadata \
-		hachoir-parser>=0:${PORTSDIR}/devel/hachoir-parser \
-		libesedb>=e:${PORTSDIR}/devel/libesedb \
-		libevt>=a:${PORTSDIR}/devel/libevt \
-		libevtx>=a:${PORTSDIR}/devel/libevtx \
-		libfwsi>=e:${PORTSDIR}/devel/libfwsi \
-		liblnk>=0:${PORTSDIR}/devel/liblnk \
-		libmsiecf>=a:${PORTSDIR}/devel/libmsiecf \
-		libolecf>=a:${PORTSDIR}/devel/libolecf \
-		libregf>=a:${PORTSDIR}/devel/libregf \
-		${PYTHON_PKGNAMEPREFIX}artifacts>=0:${PORTSDIR}/security/py-artifacts \
-		${PYTHON_PKGNAMEPREFIX}bencode>=0:${PORTSDIR}/converters/py-bencode \
-		${PYTHON_PKGNAMEPREFIX}binplist>=0:${PORTSDIR}/devel/py-binplist \
-		${PYTHON_PKGNAMEPREFIX}construct>=0:${PORTSDIR}/devel/py-construct \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:${PORTSDIR}/security/py-dfvfs \
-		${PYTHON_PKGNAMEPREFIX}dpkt>=0:${PORTSDIR}/net/py-dpkt \
-		${PYTHON_PKGNAMEPREFIX}ipython>=0:${PORTSDIR}/devel/ipython \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:${PORTSDIR}/devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}pefile>=0:${PORTSDIR}/devel/py-pefile \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=0:${PORTSDIR}/devel/py-protobuf \
-		${PYTHON_PKGNAMEPREFIX}psutil121>=0:${PORTSDIR}/sysutils/py-psutil121 \
-		${PYTHON_PKGNAMEPREFIX}pyelasticsearch>=0:${PORTSDIR}/textproc/py-pyelasticsearch \
-		${PYTHON_PKGNAMEPREFIX}pytsk>=0:${PORTSDIR}/sysutils/py-pytsk \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:${PORTSDIR}/net/py-pyzmq \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:${PORTSDIR}/textproc/py-xlsxwriter \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock
+RUN_DEPENDS=	hachoir-core>=0:devel/hachoir-core \
+		hachoir-metadata>=0:sysutils/hachoir-metadata \
+		hachoir-parser>=0:devel/hachoir-parser \
+		libesedb>=e:devel/libesedb \
+		libevt>=a:devel/libevt \
+		libevtx>=a:devel/libevtx \
+		libfwsi>=e:devel/libfwsi \
+		liblnk>=0:devel/liblnk \
+		libmsiecf>=a:devel/libmsiecf \
+		libolecf>=a:devel/libolecf \
+		libregf>=a:devel/libregf \
+		${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts \
+		${PYTHON_PKGNAMEPREFIX}bencode>=0:converters/py-bencode \
+		${PYTHON_PKGNAMEPREFIX}binplist>=0:devel/py-binplist \
+		${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs \
+		${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt \
+		${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \
+		${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \
+		${PYTHON_PKGNAMEPREFIX}pyelasticsearch>=0:textproc/py-pyelasticsearch \
+		${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock
 
 NO_ARCH=	yes
 USES=		python:2.7
diff --git a/security/py-plone.app.openid/Makefile b/security/py-plone.app.openid/Makefile
index 6b9335ff17d..f7c48560573 100644
--- a/security/py-plone.app.openid/Makefile
+++ b/security/py-plone.app.openid/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Plone OpenID authentication support
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.openid>=0:${PORTSDIR}/security/py-plone.openid \
-		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:${PORTSDIR}/www/py-plone.portlets \
-		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:${PORTSDIR}/www/py-plone.app.portlets \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Products.CMFCore \
-		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:${PORTSDIR}/security/py-Products.PlonePAS \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid \
+		${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \
+		${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \
+		${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/security/py-plone.keyring/Makefile b/security/py-plone.keyring/Makefile
index 46bddd86918..4019ecdd7f2 100644
--- a/security/py-plone.keyring/Makefile
+++ b/security/py-plone.keyring/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Manage secrets
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-plone.openid/Makefile b/security/py-plone.openid/Makefile
index d90979ba0d6..a8a6bc18f0e 100644
--- a/security/py-plone.openid/Makefile
+++ b/security/py-plone.openid/Makefile
@@ -13,11 +13,11 @@ COMMENT=	OpenID authentication support for PAS
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-openid>=0:${PORTSDIR}/security/py-python-openid \
-		${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:${PORTSDIR}/devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService \
-		zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid \
+		${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \
+		zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/security/py-plone.protect/Makefile b/security/py-plone.protect/Makefile
index 28c79c6698b..4179be79369 100644
--- a/security/py-plone.protect/Makefile
+++ b/security/py-plone.protect/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Security for browser forms
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:${PORTSDIR}/security/py-plone.keyring \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/security/py-plone.session/Makefile b/security/py-plone.session/Makefile
index 0f5a715816d..e09d48804f9 100644
--- a/security/py-plone.session/Makefile
+++ b/security/py-plone.session/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Session based authentication for Zope
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.protect>=0:${PORTSDIR}/security/py-plone.protect \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:${PORTSDIR}/security/py-Products.PluggableAuthService
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index a7dfad131b6..368ff6cd763 100644
--- a/security/py-potr/Makefile
+++ b/security/py-potr/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pure Python Off-The-Record encryption
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
 
 USES=		python zip
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-pyaff4/Makefile b/security/py-pyaff4/Makefile
index fe3a7ea812f..da9bc1ce730 100644
--- a/security/py-pyaff4/Makefile
+++ b/security/py-pyaff4/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python Advanced Forensic Format Version 4 library
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:${PORTSDIR}/devel/py-intervaltree \
-		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:${PORTSDIR}/archivers/py-python-snappy \
-		${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:${PORTSDIR}/textproc/py-rdflib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \
+		${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:archivers/py-python-snappy \
+		${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:textproc/py-rdflib
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile
index 87e3bffd14d..a1fa4f46bec 100644
--- a/security/py-pycrypto/Makefile
+++ b/security/py-pycrypto/Makefile
@@ -23,7 +23,7 @@ GMP_DESC=		Use GMP for faster DSA/RSA operations
 GMP_CONFIGURE_WITH=	gmp
 GMP_CPPFLAGS=		-I${LOCALBASE}/include
 GMP_LDFLAGS=		-L${LOCALBASE}/lib
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 pre-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/setup.py
diff --git a/security/py-pycryptopp/Makefile b/security/py-pycryptopp/Makefile
index 8de478b8c29..0340a0d3211 100644
--- a/security/py-pycryptopp/Makefile
+++ b/security/py-pycryptopp/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python Wrappers for the Crypto++ Library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}darcsver>0:${PORTSDIR}/devel/py-darcsver \
-		${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:${PORTSDIR}/devel/py-setuptools_darcs
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver \
+		${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/security/py-pydeep/Makefile b/security/py-pydeep/Makefile
index 9b9c2315c6e..3f3ccc0aa1a 100644
--- a/security/py-pydeep/Makefile
+++ b/security/py-pydeep/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for ssdeep
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libfuzzy.so:${PORTSDIR}/security/ssdeep
+LIB_DEPENDS=	libfuzzy.so:security/ssdeep
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-pyelliptic/Makefile b/security/py-pyelliptic/Makefile
index 61d79bf4e2c..e928fa3ab1b 100644
--- a/security/py-pyelliptic/Makefile
+++ b/security/py-pyelliptic/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python OpenSSL wrapper
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yann2192
diff --git a/security/py-pymacaroons-pynacl/Makefile b/security/py-pymacaroons-pynacl/Makefile
index a275e01acca..05c11bcd570 100644
--- a/security/py-pymacaroons-pynacl/Makefile
+++ b/security/py-pymacaroons-pynacl/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Macaroon library for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:${PORTSDIR}/security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:${PORTSDIR}/devel/py-six
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:${PORTSDIR}/devel/py-hypothesis \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
+		${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=           python
 USE_GITHUB=	yes
diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile
index d88ccdf8626..6287d86c37f 100644
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python interface to GPGME library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+BUILD_DEPENDS=	swig1.3:devel/swig13
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 USES=		gmake python:2
 USE_PYTHON=	distutils
diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile
index ed748d50635..31251dafa60 100644
--- a/security/py-pynacl/Makefile
+++ b/security/py-pynacl/Makefile
@@ -15,10 +15,10 @@ COMMENT=	PyNaCl is a Python binding to the Networking and Cryptography library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:${PORTSDIR}/devel/py-cffi \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile
index 2c67ddfb819..22a9ffabadb 100644
--- a/security/py-pysaml2/Makefile
+++ b/security/py-pysaml2/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Python implementation of SAML Version 2
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}requests>1.0.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}Paste>0:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}repoze.who>0:${PORTSDIR}/devel/py-repoze.who \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		xmlsec1:${PORTSDIR}/security/xmlsec1
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}responses>0:${PORTSDIR}/devel/py-responses
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		xmlsec1:security/xmlsec1
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-pyscard/Makefile b/security/py-pyscard/Makefile
index b8726382a97..3901e3edaa6 100644
--- a/security/py-pyscard/Makefile
+++ b/security/py-pyscard/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Smartcard module for Python
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/swig13 \
-		pcsc-lite>0:${PORTSDIR}/devel/pcsc-lite
-RUN_DEPENDS=	pcsc-lite>0:${PORTSDIR}/devel/pcsc-lite
+BUILD_DEPENDS=	swig1.3:devel/swig13 \
+		pcsc-lite>0:devel/pcsc-lite
+RUN_DEPENDS=	pcsc-lite>0:devel/pcsc-lite
 
 ## Python3 is supported
 USES=		python:2.7+
diff --git a/security/py-python-registry/Makefile b/security/py-python-registry/Makefile
index 14feb902c69..b1fd19dd463 100644
--- a/security/py-python-registry/Makefile
+++ b/security/py-python-registry/Makefile
@@ -28,7 +28,7 @@ PORTEXAMPLES=	*
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>=0:${PORTSDIR}/devel/py-enum34
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34
 .endif
 
 post-install:
diff --git a/security/py-python-social-auth/Makefile b/security/py-python-social-auth/Makefile
index fcf7ce7baed..65eeeee4ad0 100644
--- a/security/py-python-social-auth/Makefile
+++ b/security/py-python-social-auth/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Python Social Auth is a social authentication/registration mechanism
 
-RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:${PORTSDIR}/security/py-python-openid \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:${PORTSDIR}/security/py-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:${PORTSDIR}/www/py-requests-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:${PORTSDIR}/www/py-pyjwt
+RUN_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-rekall-core/Makefile b/security/py-rekall-core/Makefile
index 9f876d7808e..9bf633a43fe 100644
--- a/security/py-rekall-core/Makefile
+++ b/security/py-rekall-core/Makefile
@@ -12,18 +12,18 @@ COMMENT=	CORE component of the Rekall framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
-		${PYTHON_PKGNAMEPREFIX}acora>=1.8:${PORTSDIR}/textproc/py-acora \
-		${PYTHON_PKGNAMEPREFIX}PyAFF4>=0.17:${PORTSDIR}/security/py-pyaff4 \
-		${PYTHON_PKGNAMEPREFIX}capstone>=0:${PORTSDIR}/devel/py-capstone \
-		${PYTHON_PKGNAMEPREFIX}distorm>=0:${PORTSDIR}/devel/py-distorm \
-		${PYTHON_PKGNAMEPREFIX}efilter>=1438631774:${PORTSDIR}/devel/py-efilter \
-		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.0.4:${PORTSDIR}/devel/py-intervaltree \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.3.1:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.22:${PORTSDIR}/devel/py-pyelftools \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2012:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}yaml>=2.10:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:${PORTSDIR}/security/py-yara
+RUN_DEPENDS=	cabextract:archivers/cabextract \
+		${PYTHON_PKGNAMEPREFIX}acora>=1.8:textproc/py-acora \
+		${PYTHON_PKGNAMEPREFIX}PyAFF4>=0.17:security/py-pyaff4 \
+		${PYTHON_PKGNAMEPREFIX}capstone>=0:devel/py-capstone \
+		${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \
+		${PYTHON_PKGNAMEPREFIX}efilter>=1438631774:devel/py-efilter \
+		${PYTHON_PKGNAMEPREFIX}intervaltree>=2.0.4:devel/py-intervaltree \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.3.1:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.22:devel/py-pyelftools \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}yaml>=2.10:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-rekall/Makefile b/security/py-rekall/Makefile
index 65fc331406d..a703637234b 100644
--- a/security/py-rekall/Makefile
+++ b/security/py-rekall/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Memory forensics analysis framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:${PORTSDIR}/security/py-rekall-core \
-		${PYTHON_PKGNAMEPREFIX}rekall_gui>=1.4.0:${PORTSDIR}/security/py-rekall_gui
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:security/py-rekall-core \
+		${PYTHON_PKGNAMEPREFIX}rekall_gui>=1.4.0:security/py-rekall_gui
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-rekall_gui/Makefile b/security/py-rekall_gui/Makefile
index 27165340cad..e281e9c0a2d 100644
--- a/security/py-rekall_gui/Makefile
+++ b/security/py-rekall_gui/Makefile
@@ -13,13 +13,13 @@ COMMENT=	GUI component of the Rekall framework
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codegen>=1.0:${PORTSDIR}/devel/py-codegen \
-		${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:${PORTSDIR}/www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:${PORTSDIR}/www/py-flask-sockets \
-		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:${PORTSDIR}/devel/py-gevent \
-		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:${PORTSDIR}/www/py-gevent-websocket \
-		${PYTHON_PKGNAMEPREFIX}ipython>=3.0.0:${PORTSDIR}/devel/ipython \
-		${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:${PORTSDIR}/security/py-rekall-core
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}codegen>=1.0:devel/py-codegen \
+		${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \
+		${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:www/py-flask-sockets \
+		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:www/py-gevent-websocket \
+		${PYTHON_PKGNAMEPREFIX}ipython>=3.0.0:devel/ipython \
+		${PYTHON_PKGNAMEPREFIX}rekall-core>=1.4.0:security/py-rekall-core
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	manuskript/static/bower_components/bootstrap/test-infra/uncached-npm-install.sh
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 5ac314d7c66..4ceeb08f521 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Kerberos authentication handler for python-requests
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>1.1.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:${PORTSDIR}/security/py-kerberos
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index df0802c2bb7..a9e02e4091b 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pure-Python RSA implementation
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:${PORTSDIR}/devel/py-pyasn1
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-scrypt/Makefile b/security/py-scrypt/Makefile
index c73dee81ff7..e7f4cf0e060 100644
--- a/security/py-scrypt/Makefile
+++ b/security/py-scrypt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Bindings for the scrypt key derivation function library
 
 LICENSE=	BSD2CLAUSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index c75fc9e4ed7..2bab7ac8a47 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Service identity verification for pyOpenSSL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=15.2:${PORTSDIR}/devel/py-attrs \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0.15:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:${PORTSDIR}/devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:${PORTSDIR}/devel/py-pyasn1-modules \
-		${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:${PORTSDIR}/devel/py-characteristic
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \
+		${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules \
+		${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic
 
 NO_ARCH=	yes
 USES=		python
diff --git a/security/py-signedjson/Makefile b/security/py-signedjson/Makefile
index 41672c6fd4b..ff41765821b 100644
--- a/security/py-signedjson/Makefile
+++ b/security/py-signedjson/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Sign JSON with Ed25519 signatures
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:${PORTSDIR}/security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:${PORTSDIR}/devel/py-unpaddedbase64 \
-		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:${PORTSDIR}/devel/py-canonicaljson
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \
+		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64 \
+		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
 
 USES=		python
 USE_GITHUB=	yes
diff --git a/security/py-ssh/Makefile b/security/py-ssh/Makefile
index ad34ca20696..cc6550a4f4e 100644
--- a/security/py-ssh/Makefile
+++ b/security/py-ssh/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Python SSH2 protocol library
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-sslstrip/Makefile b/security/py-sslstrip/Makefile
index 978536ec6ac..e541a5dbcea 100644
--- a/security/py-sslstrip/Makefile
+++ b/security/py-sslstrip/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	kitchetech@gmail.com
 COMMENT=	Python program for SSL stripping
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 USES=		python twisted:web
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-stix/Makefile b/security/py-stix/Makefile
index 4e11fd2b71f..c0ca4da74e3 100644
--- a/security/py-stix/Makefile
+++ b/security/py-stix/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python library for parsing, manipulating, and generating STIX content
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.9:${PORTSDIR}/security/py-cybox
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.9:security/py-cybox
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index fdf7898030b..e6c813775dc 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SSH and SFTP protocol implementation with clients and servers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.0.9a:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.0.9a:devel/py-pyasn1
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-volatility/Makefile b/security/py-volatility/Makefile
index 55d2eb1b9c7..01094ade6e6 100644
--- a/security/py-volatility/Makefile
+++ b/security/py-volatility/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Advanced memory forensics framework
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}distorm>=0:${PORTSDIR}/devel/py-distorm \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:${PORTSDIR}/security/py-yara \
-		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:${PORTSDIR}/textproc/py-openpyxl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \
+		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara \
+		${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile
index 63d0229b0c3..a29d5a9ab74 100644
--- a/security/py-xmlsec/Makefile
+++ b/security/py-xmlsec/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Python bindings for XML Security Library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxmlsec1.so:${PORTSDIR}/security/xmlsec1
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+LIB_DEPENDS=	libxmlsec1.so:security/xmlsec1
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/security/py-yara-editor/Makefile b/security/py-yara-editor/Makefile
index 2d25e6a43a6..d8c99bf0916 100644
--- a/security/py-yara-editor/Makefile
+++ b/security/py-yara-editor/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Editor for yara rules
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}yara>=0:${PORTSDIR}/security/py-yara
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-yara/Makefile b/security/py-yara/Makefile
index 4a935453183..234122fa3c0 100644
--- a/security/py-yara/Makefile
+++ b/security/py-yara/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python bindings for yara
 USE_GITHUB=	yes
 GH_ACCOUNT=	plusvic
 
-LIB_DEPENDS=	libyara.so:${PORTSDIR}/security/yara
+LIB_DEPENDS=	libyara.so:security/yara
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.authentication/Makefile b/security/py-zope.app.authentication/Makefile
index e206ec24cdf..803268f390e 100644
--- a/security/py-zope.app.authentication/Makefile
+++ b/security/py-zope.app.authentication/Makefile
@@ -13,25 +13,25 @@ COMMENT=	Principals and groups management for the pluggable authentication
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:${PORTSDIR}/devel/py-zope.dublincore \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0.2:${PORTSDIR}/devel/py-zope.formlib \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:${PORTSDIR}/security/py-zope.password \
-		${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:${PORTSDIR}/security/py-zope.pluggableauth \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing \
-		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:${PORTSDIR}/devel/py-zope.app.container \
-		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:${PORTSDIR}/devel/py-zope.app.component
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0.2:devel/py-zope.formlib \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \
+		${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \
+		${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \
+		${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.localpermission/Makefile b/security/py-zope.app.localpermission/Makefile
index 1d2cf748894..5a1f334ee33 100644
--- a/security/py-zope.app.localpermission/Makefile
+++ b/security/py-zope.app.localpermission/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Local Persistent Permissions for zope.security
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.principalannotation/Makefile b/security/py-zope.app.principalannotation/Makefile
index 3ef2e0eeddf..6bf8ce331a9 100644
--- a/security/py-zope.app.principalannotation/Makefile
+++ b/security/py-zope.app.principalannotation/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Bootstrap subscriber and browser menu item for zope.principalannotation
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:${PORTSDIR}/devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:${PORTSDIR}/devel/py-zope.app.appsetup \
-		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:${PORTSDIR}/devel/py-zope.processlifetime \
-		${PYTHON_PKGNAMEPREFIX}zope.principalannotation>=0:${PORTSDIR}/security/py-zope.principalannotation
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
+		${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup \
+		${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \
+		${PYTHON_PKGNAMEPREFIX}zope.principalannotation>=0:security/py-zope.principalannotation
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.security/Makefile b/security/py-zope.app.security/Makefile
index 9053aa02dc3..fefaf856e04 100644
--- a/security/py-zope.app.security/Makefile
+++ b/security/py-zope.app.security/Makefile
@@ -13,18 +13,18 @@ COMMENT=	ZMI Views For Zope3 Security Components
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:${PORTSDIR}/security/py-zope.app.localpermission \
-		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:${PORTSDIR}/devel/py-zope.app.pagetemplate \
-		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:${PORTSDIR}/devel/py-zope.app.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.principalregistry>=0:${PORTSDIR}/security/py-zope.principalregistry \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:${PORTSDIR}/security/py-zope.securitypolicy \
-		${PYTHON_PKGNAMEPREFIX}zope.login>=0:${PORTSDIR}/security/py-zope.login
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission \
+		${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \
+		${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.principalregistry>=0:security/py-zope.principalregistry \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy \
+		${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.app.securitypolicy/Makefile b/security/py-zope.app.securitypolicy/Makefile
index 092a27d5ae9..9c71eecba14 100644
--- a/security/py-zope.app.securitypolicy/Makefile
+++ b/security/py-zope.app.securitypolicy/Makefile
@@ -13,21 +13,21 @@ COMMENT=	ZMI-based management views for zope.securitypolicy
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:${PORTSDIR}/security/py-zope.app.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:${PORTSDIR}/devel/py-zope.app.form \
-		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:${PORTSDIR}/security/py-zope.app.security \
-		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:${PORTSDIR}/devel/py-zope.exceptions \
-		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:${PORTSDIR}/devel/py-zope.i18n \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:${PORTSDIR}/security/py-zope.securitypolicy
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \
+		${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \
+		${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \
+		${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.authentication/Makefile b/security/py-zope.authentication/Makefile
index b826b2928eb..0b46d99bb4b 100644
--- a/security/py-zope.authentication/Makefile
+++ b/security/py-zope.authentication/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Definition of authentication basics for the Zope Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.browser \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.login/Makefile b/security/py-zope.login/Makefile
index 1360369cb5b..22890dcb9fc 100644
--- a/security/py-zope.login/Makefile
+++ b/security/py-zope.login/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Login helpers for zope.publisher / authentication
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher
 
 USES=		python zip
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.password/Makefile b/security/py-zope.password/Makefile
index 9cfc82447b0..f57d6aa8c9c 100644
--- a/security/py-zope.password/Makefile
+++ b/security/py-zope.password/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Password encoding and checking utilities
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.pluggableauth/Makefile b/security/py-zope.pluggableauth/Makefile
index a492e9216c7..a9b1c1d47f4 100644
--- a/security/py-zope.pluggableauth/Makefile
+++ b/security/py-zope.pluggableauth/Makefile
@@ -13,20 +13,20 @@ COMMENT=	Pluggable Authentication Utility
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.container>=0:${PORTSDIR}/devel/py-zope.container \
-		${PYTHON_PKGNAMEPREFIX}zope.event>=0:${PORTSDIR}/devel/py-zope.event \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:${PORTSDIR}/security/py-zope.password \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.session>=0:${PORTSDIR}/security/py-zope.session \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site \
-		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:${PORTSDIR}/devel/py-zope.traversing
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \
+		${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \
+		${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.principalannotation/Makefile b/security/py-zope.principalannotation/Makefile
index 0ca39d7a952..832add9268d 100644
--- a/security/py-zope.principalannotation/Makefile
+++ b/security/py-zope.principalannotation/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Annotations for Zope Principals
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.site>=0:${PORTSDIR}/devel/py-zope.site
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.principalregistry/Makefile b/security/py-zope.principalregistry/Makefile
index 482fd6b716a..2c02d354978 100644
--- a/security/py-zope.principalregistry/Makefile
+++ b/security/py-zope.principalregistry/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Global principal registry component for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.password>=0:${PORTSDIR}/security/py-zope.password \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.security/Makefile b/security/py-zope.security/Makefile
index eb6bcf67bcd..64f4e14ba07 100644
--- a/security/py-zope.security/Makefile
+++ b/security/py-zope.security/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Zope Security Framework
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:${PORTSDIR}/net/py-zope.proxy \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:${PORTSDIR}/security/py-RestrictedPython \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.securitypolicy/Makefile b/security/py-zope.securitypolicy/Makefile
index 01b5678ac1d..80ce543eed7 100644
--- a/security/py-zope.securitypolicy/Makefile
+++ b/security/py-zope.securitypolicy/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Default security policy for Zope3
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:${PORTSDIR}/devel/py-zope.annotation \
-		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:${PORTSDIR}/security/py-zope.authentication \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:${PORTSDIR}/devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:${PORTSDIR}/devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:${PORTSDIR}/security/py-zope.security \
-		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:${PORTSDIR}/devel/py-zope.dublincore
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \
+		${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \
+		${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/py-zope.session/Makefile b/security/py-zope.session/Makefile
index 92fc48ac8eb..75f2c06e086 100644
--- a/security/py-zope.session/Makefile
+++ b/security/py-zope.session/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Client identification and sessions for Zope
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:${PORTSDIR}/databases/zodb3 \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=0:${PORTSDIR}/devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:${PORTSDIR}/textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.location>=0:${PORTSDIR}/devel/py-zope.location \
-		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:${PORTSDIR}/devel/py-zope.publisher \
-		${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:${PORTSDIR}/devel/py-zope.minmax
+RUN_DEPENDS=	zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+		${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \
+		${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \
+		${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index e38766c397a..4719eb52bc4 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -42,7 +42,7 @@ PORTEXAMPLES=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCI}
-RUN_DEPENDS+=	${KMODDIR}/quantis.ko:${PORTSDIR}/security/quantis-kmod
+RUN_DEPENDS+=	${KMODDIR}/quantis.ko:security/quantis-kmod
 .else
 CMAKE_ARGS+=	-DDISABLE_QUANTIS_PCI=1
 .endif
@@ -69,7 +69,7 @@ PLIST_SUB+=	COMPAT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTOOL}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libboost_date_time.a:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libboost_date_time.a:devel/boost-libs
 CXXFLAGS+=	-I${LOCALBASE}/include
 
 . if ${PORT_OPTIONS:MGUI}
diff --git a/security/rats/Makefile b/security/rats/Makefile
index 7878919cc78..bb6f337f4b5 100644
--- a/security/rats/Makefile
+++ b/security/rats/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Source code auditing tool
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/security/razorback-api/Makefile b/security/razorback-api/Makefile
index 2dc03d19d7d..649cf301d03 100644
--- a/security/razorback-api/Makefile
+++ b/security/razorback-api/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Framework for an intelligence driven security solution - API
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	libconfig.so:devel/libconfig \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libcurl.so:ftp/curl \
+		libjson-c.so:devel/json-c
 
 OPTIONS_DEFINE=	DEBUG ASSERT CNC_DEBUG STOMP_DEBUG
 
diff --git a/security/razorback-archiveInflate/Makefile b/security/razorback-archiveInflate/Makefile
index b8353695e6b..74695583b06 100644
--- a/security/razorback-archiveInflate/Makefile
+++ b/security/razorback-archiveInflate/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Archive Inflator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-clamavNugget/Makefile b/security/razorback-clamavNugget/Makefile
index a376fb1c22f..0fd1349a864 100644
--- a/security/razorback-clamavNugget/Makefile
+++ b/security/razorback-clamavNugget/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Framework for an intelligence driven security - ClamAV Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libclamav.so:${PORTSDIR}/security/clamav
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libclamav.so:security/clamav
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 USES=		autoreconf libtool pkgconfig
 RB_LIBDIR?=	${PREFIX}/lib/razorback
diff --git a/security/razorback-dispatcher/Makefile b/security/razorback-dispatcher/Makefile
index cf39fc7f078..5087391e5e0 100644
--- a/security/razorback-dispatcher/Makefile
+++ b/security/razorback-dispatcher/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Dispatcher
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libmemcached.so:${PORTSDIR}/databases/libmemcached \
-		libcli.so:${PORTSDIR}/devel/libcli
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libmemcached.so:databases/libmemcached \
+		libcli.so:devel/libcli
 
 USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
@@ -41,7 +41,7 @@ DEBUG_CONFIGURE_ENABLE=	debug
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MACTIVEMQ}
-RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/activemq:${PORTSDIR}/net/activemq
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/activemq:net/activemq
 SUB_LIST=	ACTIVEMQ="activemq " ACTIVEMQ_LOC="local" \
 		ACTIVEMQ_LOCATION="in the ActiveMQ configuration directory:" \
 		ACTIVEMQ_CONFIG="${LOCALBASE}/etc/activemq/"
diff --git a/security/razorback-fileInject/Makefile b/security/razorback-fileInject/Makefile
index bb518f52dbe..b462e75e4c4 100644
--- a/security/razorback-fileInject/Makefile
+++ b/security/razorback-fileInject/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Framework for an intelligence driven security - File Injector
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
 
 OPTIONS_DEFINE=	DEBUG ASSERT
 
diff --git a/security/razorback-fsMonitor/Makefile b/security/razorback-fsMonitor/Makefile
index ed55bec0ea6..3bc1957ed6a 100644
--- a/security/razorback-fsMonitor/Makefile
+++ b/security/razorback-fsMonitor/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Framework for an intelligence driven security - File System Monitor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libfam.so:${PORTSDIR}/devel/fam
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libfam.so:devel/fam
 
 USES=		autoreconf libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-fsWalk/Makefile b/security/razorback-fsWalk/Makefile
index 0415f47db21..3de8f78fed1 100644
--- a/security/razorback-fsWalk/Makefile
+++ b/security/razorback-fsWalk/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Framework for an intelligence driven security - File System Walker
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf libtool pkgconfig
diff --git a/security/razorback-masterNugget/Makefile b/security/razorback-masterNugget/Makefile
index 806b3fc6d6d..7916efd1d11 100644
--- a/security/razorback-masterNugget/Makefile
+++ b/security/razorback-masterNugget/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Framework for an intelligence driven security - Master Nugget
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
 
 USES=		autoreconf libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-officeCat/Makefile b/security/razorback-officeCat/Makefile
index aa534e2c31b..d1f9332d908 100644
--- a/security/razorback-officeCat/Makefile
+++ b/security/razorback-officeCat/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Framework for an intelligence driven security - OfficeCat Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
-		wine:${PORTSDIR}/emulators/wine
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
-		wine:${PORTSDIR}/emulators/wine
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget \
+		wine:emulators/wine
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget \
+		wine:emulators/wine
 
 USES=		autoreconf libtool pkgconfig
 
diff --git a/security/razorback-pdfFox/Makefile b/security/razorback-pdfFox/Makefile
index 38cffdabd8e..c8ff92711b7 100644
--- a/security/razorback-pdfFox/Makefile
+++ b/security/razorback-pdfFox/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - PDF Fox
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-scriptNugget/Makefile b/security/razorback-scriptNugget/Makefile
index ea267e67b90..68b22022b19 100644
--- a/security/razorback-scriptNugget/Makefile
+++ b/security/razorback-scriptNugget/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Framework for an intelligence driven security - Scripting Interface
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget \
-		rubygem-razorback-scriptNugget>=0.5.0:${PORTSDIR}/security/rubygem-razorback-scriptNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget \
+		rubygem-razorback-scriptNugget>=0.5.0:security/rubygem-razorback-scriptNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 USES=		autoreconf libtool pkgconfig
diff --git a/security/razorback-swfScanner/Makefile b/security/razorback-swfScanner/Makefile
index 0662c9308ec..9d121737703 100644
--- a/security/razorback-swfScanner/Makefile
+++ b/security/razorback-swfScanner/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - SWF Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-syslogNugget/Makefile b/security/razorback-syslogNugget/Makefile
index 49363b489c2..c623a25a911 100644
--- a/security/razorback-syslogNugget/Makefile
+++ b/security/razorback-syslogNugget/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Syslog Output
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 USES=		autoreconf libtool pkgconfig
 RB_LIBDIR?=	${PREFIX}/lib/razorback
diff --git a/security/razorback-virusTotal/Makefile b/security/razorback-virusTotal/Makefile
index 32f7916bc0d..286c883a64d 100644
--- a/security/razorback-virusTotal/Makefile
+++ b/security/razorback-virusTotal/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Framework for an intelligence driven security - Virus Total Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/razorback-yaraNugget/Makefile b/security/razorback-yaraNugget/Makefile
index 7e25b5f9dcc..3fa9a40352d 100644
--- a/security/razorback-yaraNugget/Makefile
+++ b/security/razorback-yaraNugget/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Framework for an intelligence driven security - Yara Detection
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libpcre.so:${PORTSDIR}/devel/pcre
-BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
-RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
+LIB_DEPENDS=	librazorback_api.so:security/razorback-api \
+		libjson-c.so:devel/json-c \
+		libpcre.so:devel/pcre
+BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
+RUN_DEPENDS=	razorback-masterNugget>=0.5.0:security/razorback-masterNugget
 
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
diff --git a/security/regripper/Makefile b/security/regripper/Makefile
index 50d44e05cc4..a92c62bd4f7 100644
--- a/security/regripper/Makefile
+++ b/security/regripper/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tool for registry analysis in forensics examinations
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry
+RUN_DEPENDS=	p5-Parse-Win32Registry>=0:devel/p5-Parse-Win32Registry
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keydet89
diff --git a/security/reop/Makefile b/security/reop/Makefile
index 8859860078c..f9890865844 100644
--- a/security/reop/Makefile
+++ b/security/reop/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	security
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Reasonable Expectation Of Privacy
 
-LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+LIB_DEPENDS=	libsodium.so:security/libsodium
 
 USES=		gmake
 USE_GITHUB=	yes
diff --git a/security/retranslator/Makefile b/security/retranslator/Makefile
index 2d66833cce5..0b50c588f2e 100644
--- a/security/retranslator/Makefile
+++ b/security/retranslator/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-LIB_DEPENDS+=	libm.so:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS+=	libm.so:misc/compat6x
 
 do-configure:
 
diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 1286369e25d..67b7d95ec64 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Password manager for the GNOME 2 desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+LIB_DEPENDS=	libcrack.so:security/cracklib
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}cracklib>0:${PORTSDIR}/security/py-cracklib
+		${PYTHON_PKGNAMEPREFIX}cracklib>0:security/py-cracklib
 
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig python \
 		shared-mime-info shebangfix tar:bzip2
diff --git a/security/rkhunter/Makefile b/security/rkhunter/Makefile
index fdaa1ba85c0..fae6d557846 100644
--- a/security/rkhunter/Makefile
+++ b/security/rkhunter/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	LSOF NMAP DOCS
 OPTIONS_DEFAULT=LSOF
 
-RUN_DEPENDS+=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS+=	p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		${LOCALBASE}/bin/wget:ftp/wget
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	files/check_modules.pl files/filehashsha.pl \
@@ -26,8 +26,8 @@ SUB_FILES=	415.${PORTNAME}
 
 PORTDOCS=	ACKNOWLEDGMENTS CHANGELOG FAQ LICENSE README
 
-LSOF_RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
-NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
+LSOF_RUN_DEPENDS=	lsof:sysutils/lsof
+NMAP_RUN_DEPENDS=	nmap:security/nmap
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|{SHAREDIR}/man/man8|{PREFIX}/man/man8|g' \
diff --git a/security/ruby-password/Makefile b/security/ruby-password/Makefile
index 2cbdd40af3f..4c18a996be9 100644
--- a/security/ruby-password/Makefile
+++ b/security/ruby-password/Makefile
@@ -14,8 +14,8 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby library to create, verify, and manipulate passwords
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
-LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
-RUN_DEPENDS=	rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios
+LIB_DEPENDS=	libcrack.so:security/cracklib
+RUN_DEPENDS=	rubygem-ruby-termios>=0:comms/rubygem-ruby-termios
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 1fee3582bed..72eb15cfee4 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	TCP wrappers library for Ruby
 
-LIB_DEPENDS=	libident.so:${PORTSDIR}/security/libident
+LIB_DEPENDS=	libident.so:security/libident
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/security/rubygem-bcrypt-ruby/Makefile b/security/rubygem-bcrypt-ruby/Makefile
index 5da50b7b054..e21a6ee1f5f 100644
--- a/security/rubygem-bcrypt-ruby/Makefile
+++ b/security/rubygem-bcrypt-ruby/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Sophisticated and secure hash algorithm for passwords
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-bcrypt>=3.1.3:${PORTSDIR}/security/rubygem-bcrypt
+RUN_DEPENDS=	rubygem-bcrypt>=3.1.3:security/rubygem-bcrypt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-devise-two-factor/Makefile b/security/rubygem-devise-two-factor/Makefile
index f84c8757f7f..89c72ad83d5 100644
--- a/security/rubygem-devise-two-factor/Makefile
+++ b/security/rubygem-devise-two-factor/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Barebones two-factor authentication with Devise
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=0:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-attr_encrypted>=1.3:${PORTSDIR}/security/rubygem-attr_encrypted \
-		rubygem-devise-rails4>=3.5:${PORTSDIR}/devel/rubygem-devise-rails4 \
-		rubygem-railties4>=0:${PORTSDIR}/www/rubygem-railties4 \
-		rubygem-rotp>=2.0:${PORTSDIR}/devel/rubygem-rotp
+RUN_DEPENDS=	rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
+		rubygem-attr_encrypted>=1.3:security/rubygem-attr_encrypted \
+		rubygem-devise-rails4>=3.5:devel/rubygem-devise-rails4 \
+		rubygem-railties4>=0:www/rubygem-railties4 \
+		rubygem-rotp>=2.0:devel/rubygem-rotp
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-doorkeeper/Makefile b/security/rubygem-doorkeeper/Makefile
index fbe34533d28..8b2da8ee4c7 100644
--- a/security/rubygem-doorkeeper/Makefile
+++ b/security/rubygem-doorkeeper/Makefile
@@ -19,8 +19,8 @@ RAILTIES4_DESC=	Use Railties 4
 
 OPTIONS_DEFAULT=	RAILTIES4
 
-RAILTIES_RUN_DEPENDS=	rubygem-railties>=3.2:${PORTSDIR}/www/rubygem-railties
-RAILTIES4_RUN_DEPENDS=	rubygem-railties4>=4.0:${PORTSDIR}/www/rubygem-railties4
+RAILTIES_RUN_DEPENDS=	rubygem-railties>=3.2:www/rubygem-railties
+RAILTIES4_RUN_DEPENDS=	rubygem-railties4>=4.0:www/rubygem-railties4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-gpgr/Makefile b/security/rubygem-gpgr/Makefile
index bbf5d506f4c..f61fb7fc1e4 100644
--- a/security/rubygem-gpgr/Makefile
+++ b/security/rubygem-gpgr/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Very light interface to the command-line GPG tool
 
 LICENSE=	RUBY
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg:security/gnupg
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-gssapi/Makefile b/security/rubygem-gssapi/Makefile
index df9c16216f8..62d56d38c47 100644
--- a/security/rubygem-gssapi/Makefile
+++ b/security/rubygem-gssapi/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby FFI Library wrapper for GSSAPI
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-ffi>=1.9.3:${PORTSDIR}/devel/rubygem-ffi
+RUN_DEPENDS=	rubygem-ffi>=1.9.3:devel/rubygem-ffi
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-jugyo-twitter_oauth/Makefile b/security/rubygem-jugyo-twitter_oauth/Makefile
index 5c481cd9432..1b9fc7203cf 100644
--- a/security/rubygem-jugyo-twitter_oauth/Makefile
+++ b/security/rubygem-jugyo-twitter_oauth/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fork of Twitter OAuth REST API client library for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.1.9:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-oauth>=0.4.1:${PORTSDIR}/net/rubygem-oauth
+RUN_DEPENDS=	rubygem-json>=1.1.9:devel/rubygem-json \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-oauth>=0.4.1:net/rubygem-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-metasploit-concern/Makefile b/security/rubygem-metasploit-concern/Makefile
index 7e8320c8500..8022ee037c6 100644
--- a/security/rubygem-metasploit-concern/Makefile
+++ b/security/rubygem-metasploit-concern/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Automatically include Modules from app/concerns
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport>=3.0.0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-activesupport>=3.0.0:devel/rubygem-activesupport \
+		rubygem-railties>=3.0.0:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-metasploit-credential/Makefile b/security/rubygem-metasploit-credential/Makefile
index 299b686e642..e6d92b2c41a 100644
--- a/security/rubygem-metasploit-credential/Makefile
+++ b/security/rubygem-metasploit-credential/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Credential models for metasploit-framework and Metasploit Pro
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-metasploit-concern>=0.4.0:${PORTSDIR}/security/rubygem-metasploit-concern \
-		rubygem-metasploit_data_models>=0.24.0,2:${PORTSDIR}/security/rubygem-metasploit_data_models \
-		rubygem-metasploit-model>=0.29.0:${PORTSDIR}/security/rubygem-metasploit-model \
-		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-rubyntlm>=0:${PORTSDIR}/net/rubygem-rubyntlm \
-		rubygem-rubyzip>=1.1:${PORTSDIR}/archivers/rubygem-rubyzip
+RUN_DEPENDS=	rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-concern \
+		rubygem-metasploit_data_models>=0.24.0,2:security/rubygem-metasploit_data_models \
+		rubygem-metasploit-model>=0.29.0:security/rubygem-metasploit-model \
+		rubygem-pg>=0:databases/rubygem-pg \
+		rubygem-railties>=3.0.0:www/rubygem-railties \
+		rubygem-rubyntlm>=0:net/rubygem-rubyntlm \
+		rubygem-rubyzip>=1.1:archivers/rubygem-rubyzip
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-metasploit-model/Makefile b/security/rubygem-metasploit-model/Makefile
index ee75b1773cb..68c2aafa178 100644
--- a/security/rubygem-metasploit-model/Makefile
+++ b/security/rubygem-metasploit-model/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Metasploit Model Mixins and Validators
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties
+RUN_DEPENDS=	rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-railties>=3.0.0:www/rubygem-railties
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-metasploit_data_models/Makefile b/security/rubygem-metasploit_data_models/Makefile
index c6bafda2467..a160231614a 100644
--- a/security/rubygem-metasploit_data_models/Makefile
+++ b/security/rubygem-metasploit_data_models/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Database layer for Metasploit
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord>=3.2.13:${PORTSDIR}/databases/rubygem-activerecord \
-		rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
-		rubygem-arel-helpers>=0:${PORTSDIR}/databases/rubygem-arel-helpers \
-		rubygem-metasploit-concern>=0.4.0:${PORTSDIR}/security/rubygem-metasploit-concern \
-		rubygem-metasploit-model>=0.29.0:${PORTSDIR}/security/rubygem-metasploit-model \
-		rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg \
-		rubygem-railties>=3.0.0:${PORTSDIR}/www/rubygem-railties \
-		rubygem-recog>=1.0:${PORTSDIR}/security/rubygem-recog
+RUN_DEPENDS=	rubygem-activerecord>=3.2.13:databases/rubygem-activerecord \
+		rubygem-activesupport>=0:devel/rubygem-activesupport \
+		rubygem-arel-helpers>=0:databases/rubygem-arel-helpers \
+		rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-concern \
+		rubygem-metasploit-model>=0.29.0:security/rubygem-metasploit-model \
+		rubygem-pg>=0:databases/rubygem-pg \
+		rubygem-railties>=3.0.0:www/rubygem-railties \
+		rubygem-recog>=1.0:security/rubygem-recog
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-scp/Makefile b/security/rubygem-net-scp/Makefile
index 82d3460a96a..702413d34ad 100644
--- a/security/rubygem-net-scp/Makefile
+++ b/security/rubygem-net-scp/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Non-interactive SCP processing
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index 32dc9d9da18..f726097ac03 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Implementation of the SFTP client protocol
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-ssh-gateway/Makefile b/security/rubygem-net-ssh-gateway/Makefile
index 9249d96abe5..d4718cb2576 100644
--- a/security/rubygem-net-ssh-gateway/Makefile
+++ b/security/rubygem-net-ssh-gateway/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Establish Net::SSH connections through firewalls
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-ssh-multi/Makefile b/security/rubygem-net-ssh-multi/Makefile
index c6231da1813..8206dd38d32 100644
--- a/security/rubygem-net-ssh-multi/Makefile
+++ b/security/rubygem-net-ssh-multi/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SSH connection multiplexing library for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:${PORTSDIR}/security/rubygem-net-ssh \
-		rubygem-net-ssh-gateway>=1.2.0:${PORTSDIR}/security/rubygem-net-ssh-gateway
+RUN_DEPENDS=	rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh \
+		rubygem-net-ssh-gateway>=1.2.0:security/rubygem-net-ssh-gateway
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index a32d53b2908..ab0239d259d 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -24,6 +24,6 @@ RUBYGEM_AUTOPLIST=	yes
 USES=		shebangfix
 SHEBANG_FILES=	support/ssh_tunnel_bug.rb
 
-PROMPT_PASSPHRASES_RUN_DEPENDS=	rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios
+PROMPT_PASSPHRASES_RUN_DEPENDS=	rubygem-ruby-termios>=0:comms/rubygem-ruby-termios
 
 .include <bsd.port.mk>
diff --git a/security/rubygem-nmap-parser/Makefile b/security/rubygem-nmap-parser/Makefile
index e2b8020eb21..157c22ff391 100644
--- a/security/rubygem-nmap-parser/Makefile
+++ b/security/rubygem-nmap-parser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby interface to Nmap scan data
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	nmap:security/nmap
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-omniauth-bitbucket/Makefile b/security/rubygem-omniauth-bitbucket/Makefile
index b1ed6b401f1..6575a2b3501 100644
--- a/security/rubygem-omniauth-bitbucket/Makefile
+++ b/security/rubygem-omniauth-bitbucket/Makefile
@@ -10,9 +10,9 @@ COMMENT=	OmniAuth strategy for Bitbucket
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-multi_json>=1.7:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-omniauth>=1.1:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth>=1.0:${PORTSDIR}/net/rubygem-omniauth-oauth
+RUN_DEPENDS=	rubygem-multi_json>=1.7:devel/rubygem-multi_json \
+		rubygem-omniauth>=1.1:security/rubygem-omniauth \
+		rubygem-omniauth-oauth>=1.0:net/rubygem-omniauth-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-cas3/Makefile b/security/rubygem-omniauth-cas3/Makefile
index 82a95884166..9d3db1bce7e 100644
--- a/security/rubygem-omniauth-cas3/Makefile
+++ b/security/rubygem-omniauth-cas3/Makefile
@@ -12,9 +12,9 @@ COMMENT=	CAS 3.0 Strategy for OmniAuth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-addressable>=2.3:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-nokogiri>=1.6.6:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-omniauth>=1.2:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable \
+		rubygem-nokogiri>=1.6.6:textproc/rubygem-nokogiri \
+		rubygem-omniauth>=1.2:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-gitlab/Makefile b/security/rubygem-omniauth-gitlab/Makefile
index a891cd1eafc..51882c45998 100644
--- a/security/rubygem-omniauth-gitlab/Makefile
+++ b/security/rubygem-omniauth-gitlab/Makefile
@@ -11,8 +11,8 @@ COMMENT=	OmniAuth strategy for GitLab
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-omniauth-oauth2>=1.0:${PORTSDIR}/net/rubygem-omniauth-oauth2
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
+		rubygem-omniauth-oauth2>=1.0:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-multipassword/Makefile b/security/rubygem-omniauth-multipassword/Makefile
index b747e6bcab3..60f73fb9668 100644
--- a/security/rubygem-omniauth-multipassword/Makefile
+++ b/security/rubygem-omniauth-multipassword/Makefile
@@ -11,7 +11,7 @@ COMMENT=	OmniAuth strategy using different passwort strategies
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 
diff --git a/security/rubygem-omniauth-saml/Makefile b/security/rubygem-omniauth-saml/Makefile
index 7783ca7e3ee..3d80dcb39dd 100644
--- a/security/rubygem-omniauth-saml/Makefile
+++ b/security/rubygem-omniauth-saml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	OmniAuth strategy for SAML
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-omniauth>=1.3:${PORTSDIR}/security/rubygem-omniauth \
-		rubygem-ruby-saml>=1.1.1:${PORTSDIR}/security/rubygem-ruby-saml
+RUN_DEPENDS=	rubygem-omniauth>=1.3:security/rubygem-omniauth \
+		rubygem-ruby-saml>=1.1.1:security/rubygem-ruby-saml
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth-shibboleth/Makefile b/security/rubygem-omniauth-shibboleth/Makefile
index 0dbd531e254..1945fa59e21 100644
--- a/security/rubygem-omniauth-shibboleth/Makefile
+++ b/security/rubygem-omniauth-shibboleth/Makefile
@@ -10,7 +10,7 @@ COMMENT=	OmniAuth Shibboleth strategies for OmniAuth 1.x
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-omniauth>=1.0:${PORTSDIR}/security/rubygem-omniauth
+RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-omniauth/Makefile b/security/rubygem-omniauth/Makefile
index cb0af0d0c05..67020a53b1a 100644
--- a/security/rubygem-omniauth/Makefile
+++ b/security/rubygem-omniauth/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Generalized Rack framework for multiple-provider authentication
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-hashie>=1.2:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-rack16>=1.0:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-hashie>=1.2:devel/rubygem-hashie \
+		rubygem-rack16>=1.0:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-rack-oauth2/Makefile b/security/rubygem-rack-oauth2/Makefile
index 25dc263fd88..5061be5b17d 100644
--- a/security/rubygem-rack-oauth2/Makefile
+++ b/security/rubygem-rack-oauth2/Makefile
@@ -11,11 +11,11 @@ COMMENT=	OAuth 2.0 Server & Client Library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport4>=2.3:${PORTSDIR}/devel/rubygem-activesupport4 \
-		rubygem-attr_required>=0.0.5:${PORTSDIR}/devel/rubygem-attr_required \
-		rubygem-httpclient>=2.4:${PORTSDIR}/www/rubygem-httpclient \
-		rubygem-multi_json>=1.3.6:${PORTSDIR}/devel/rubygem-multi_json \
-		rubygem-rack16>=1.1:${PORTSDIR}/www/rubygem-rack16
+RUN_DEPENDS=	rubygem-activesupport4>=2.3:devel/rubygem-activesupport4 \
+		rubygem-attr_required>=0.0.5:devel/rubygem-attr_required \
+		rubygem-httpclient>=2.4:www/rubygem-httpclient \
+		rubygem-multi_json>=1.3.6:devel/rubygem-multi_json \
+		rubygem-rack16>=1.1:www/rubygem-rack16
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-recog/Makefile b/security/rubygem-recog/Makefile
index 73951b5f127..4132a5abe70 100644
--- a/security/rubygem-recog/Makefile
+++ b/security/rubygem-recog/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Framework for fingerprinting products
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-nokogiri>=0:${PORTSDIR}/textproc/rubygem-nokogiri
+RUN_DEPENDS=	rubygem-nokogiri>=0:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/security/rubygem-ruby-saml/Makefile b/security/rubygem-ruby-saml/Makefile
index 3d28473033c..220b6009fbf 100644
--- a/security/rubygem-ruby-saml/Makefile
+++ b/security/rubygem-ruby-saml/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SAML toolkit for Ruby on Rails
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-nokogiri>=1.5.10:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-uuid>=2.3:${PORTSDIR}/devel/rubygem-uuid
+RUN_DEPENDS=	rubygem-nokogiri>=1.5.10:textproc/rubygem-nokogiri \
+		rubygem-uuid>=2.3:devel/rubygem-uuid
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-scrypt/Makefile b/security/rubygem-scrypt/Makefile
index bd3dfe40110..288ec0baecf 100644
--- a/security/rubygem-scrypt/Makefile
+++ b/security/rubygem-scrypt/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Scrypt key derivation function
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-ffi-compiler>=0.0.2:${PORTSDIR}/devel/rubygem-ffi-compiler \
-		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
+RUN_DEPENDS=	rubygem-ffi-compiler>=0.0.2:devel/rubygem-ffi-compiler \
+		rubygem-rake>=0:devel/rubygem-rake
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-sshkit/Makefile b/security/rubygem-sshkit/Makefile
index bd6cf1dd2f5..2b39df0900b 100644
--- a/security/rubygem-sshkit/Makefile
+++ b/security/rubygem-sshkit/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Toolkit for remotely running commands on groups of servers
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	rubygem-net-scp>=1.1.2:${PORTSDIR}/security/rubygem-net-scp \
-		rubygem-net-ssh>=2.8.0:${PORTSDIR}/security/rubygem-net-ssh
+RUN_DEPENDS=	rubygem-net-scp>=1.1.2:security/rubygem-net-scp \
+		rubygem-net-ssh>=2.8.0:security/rubygem-net-ssh
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/rubygem-twitter_oauth/Makefile b/security/rubygem-twitter_oauth/Makefile
index f9c7e99d0a0..a35290689d4 100644
--- a/security/rubygem-twitter_oauth/Makefile
+++ b/security/rubygem-twitter_oauth/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Twitter OAuth REST API client library for Ruby
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-json>=1.8.0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
-		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth
+RUN_DEPENDS=	rubygem-json>=1.8.0:devel/rubygem-json \
+		rubygem-mime-types>=1.16:misc/rubygem-mime-types \
+		rubygem-oauth>=0.4.7:net/rubygem-oauth
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/security/samba-virusfilter/Makefile b/security/samba-virusfilter/Makefile
index f0921ed6095..4a2991e5fb3 100644
--- a/security/samba-virusfilter/Makefile
+++ b/security/samba-virusfilter/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	GHC
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	On-access anti-virus filter for Samba
 
-PATCH_DEPENDS=	smbclient:${PORTSDIR}/net/${SAMBA_PORT}
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/${SAMBA_PORT}:configure
-RUN_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
+PATCH_DEPENDS=	smbclient:net/${SAMBA_PORT}
+BUILD_DEPENDS=	${NONEXISTENT}:net/${SAMBA_PORT}:configure
+RUN_DEPENDS=	ksh:shells/pdksh
 
 GNU_CONFIGURE=	yes
 USES=		gmake shebangfix tar:bzip2
diff --git a/security/sasp/Makefile b/security/sasp/Makefile
index b71afc7d656..77b7b138e99 100644
--- a/security/sasp/Makefile
+++ b/security/sasp/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	LOCAL/ahze \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool that permits to use a gateway whatever IP we have
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	sbin/sasp
diff --git a/security/scamp/Makefile b/security/scamp/Makefile
index 7fd5e395c45..37325f90f9c 100644
--- a/security/scamp/Makefile
+++ b/security/scamp/Makefile
@@ -11,15 +11,15 @@ COMMENT=	Download & Install additional definition files for Clamav
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	bash>=4.2.42:${PORTSDIR}/shells/bash \
-		clamav>=0.97.8:${PORTSDIR}/security/clamav \
-		gnupg>=2.0.19:${PORTSDIR}/security/gnupg \
-		rsync>=3.0.9:${PORTSDIR}/net/rsync
+RUN_DEPENDS=	bash>=4.2.42:shells/bash \
+		clamav>=0.97.8:security/clamav \
+		gnupg>=2.0.19:security/gnupg \
+		rsync>=3.0.9:net/rsync
 
 .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
-RUN_DEPENDS+=	wget>=1.14:${PORTSDIR}/ftp/wget
+RUN_DEPENDS+=	wget>=1.14:ftp/wget
 .else
-RUN_DEPENDS+=	curl>=7.24.0_2:${PORTSDIR}/ftp/curl
+RUN_DEPENDS+=	curl>=7.24.0_2:ftp/curl
 .endif
 
 NO_BUILD=	yes
diff --git a/security/scanlogd/Makefile b/security/scanlogd/Makefile
index b31591170a6..2017b231f72 100644
--- a/security/scanlogd/Makefile
+++ b/security/scanlogd/Makefile
@@ -32,8 +32,8 @@ NIDS_DESC=	Use net/libnet for packet capture
 PCAP_BASE_ALL_TARGET=	libpcap
 
 NIDS_ALL_TARGET=	libnids
-NIDS_BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
-NIDS_LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+NIDS_BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:net/libnids
+NIDS_LIB_DEPENDS=	libnet.so:net/libnet
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scanlogd ${STAGEDIR}${PREFIX}/bin
diff --git a/security/scanssh/Makefile b/security/scanssh/Makefile
index bb6f04bfdb9..08c0d523ecc 100644
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.monkey.org/~provos/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scans networks for open proxies, SSH, web, and SMTP servers
 
-LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libdnet.so:net/libdnet \
+		libevent.so:devel/libevent2
 
 GNU_CONFIGURE=	YES
 PLIST_FILES=	bin/scanssh man/man1/scanssh.1.gz
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index d81d01281bf..1d06bf4a190 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -10,14 +10,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME application for managing encryption keys (PGP, SSH)
 
-BUILD_DEPENDS=	gnupg>=2.1.4:${PORTSDIR}/security/gnupg \
-		valac:${PORTSDIR}/lang/vala \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
-RUN_DEPENDS=	gnupg>=2.1.4:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS=	gnupg>=2.1.4:security/gnupg \
+		valac:lang/vala \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libgcr-3.so:security/gcr \
+		libsecret-1.so:security/libsecret \
+		libsoup-2.4.so:devel/libsoup
+RUN_DEPENDS=	gnupg>=2.1.4:security/gnupg
 
 PORTSCOUT=	limitw:1,even
 
@@ -42,6 +42,6 @@ LDAP_USE=	OPENLDAP=yes
 LDAP_DESC=	LDAP keyserver support (for gpg)
 AVAHI_DESC=	DNS-SD key sharing
 AVAHI_CONFIGURE_ENABLE=	sharing
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 .include <bsd.port.mk>
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index cafa19fd454..b0d1d2de84b 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Elliptic Curve Crypto Utility for Reliable Encryption
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
 USE_GCC=	any
 
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 4a46c93006a..fe953d6da3d 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GUI for managing and running ssh and related utilities
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
+RUN_DEPENDS=	ssh-askpass:security/openssh-askpass
 
 WRKSRC=		${WRKDIR}/usr/local
 NO_BUILD=	yes
diff --git a/security/sectok/Makefile b/security/sectok/Makefile
index d3cc082b893..47430307a6c 100644
--- a/security/sectok/Makefile
+++ b/security/sectok/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ISO 7816 Smartcard Utility
 
-LIB_DEPENDS=	libsectok.so:${PORTSDIR}/security/libsectok
+LIB_DEPENDS=	libsectok.so:security/libsectok
 
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/security/sguil/Makefile b/security/sguil/Makefile
index fb45f462e7c..25ca1297f83 100644
--- a/security/sguil/Makefile
+++ b/security/sguil/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Sguil is a network security monitoring program
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	tcltls>=0:${PORTSDIR}/devel/tcltls \
-		${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX
+RUN_DEPENDS=	tcltls>=0:devel/tcltls \
+		${LOCALBASE}/lib/tclx8.4/tclx.tcl:lang/tclX
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bammv
@@ -39,19 +39,19 @@ SANCP_SENSOR_DESC=	Include sancp sensor
 WIRESHARK_DESC=		Install wireshark
 
 CLIENT_USES=		tk:wrapper
-SERVER_RUN_DEPENDS=	p0f:${PORTSDIR}/net-mgmt/p0f \
-	                tcpflow:${PORTSDIR}/net/tcpflow \
-	                dtplite:${PORTSDIR}/devel/tcllib
-CLIENT_RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib \
-			iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets \
-			gpg2:${PORTSDIR}/security/gnupg
-SENSOR_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2-sguil
-MYSQL_LIB_DEPENDS=	mysqltcl>=3.052:${PORTSDIR}/databases/mysqltcl
-AUDIO_RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
-SANCP_RUN_DEPENDS=	sancp:${PORTSDIR}/security/sancp
-WIRESHARK_RUN_DEPENDS=	wireshark:${PORTSDIR}/net/wireshark
-PADS_SENSOR_RUN_DEPENDS=	pads:${PORTSDIR}/net-mgmt/pads
-SANCP_SENSOR_RUN_DEPENDS=	sancp:${PORTSDIR}/security/sancp
+SERVER_RUN_DEPENDS=	p0f:net-mgmt/p0f \
+	                tcpflow:net/tcpflow \
+	                dtplite:devel/tcllib
+CLIENT_RUN_DEPENDS=	dtplite:devel/tcllib \
+			iwidgets>0:x11-toolkits/iwidgets \
+			gpg2:security/gnupg
+SENSOR_RUN_DEPENDS=	barnyard2:security/barnyard2-sguil
+MYSQL_LIB_DEPENDS=	mysqltcl>=3.052:databases/mysqltcl
+AUDIO_RUN_DEPENDS=	festival:audio/festival
+SANCP_RUN_DEPENDS=	sancp:security/sancp
+WIRESHARK_RUN_DEPENDS=	wireshark:net/wireshark
+PADS_SENSOR_RUN_DEPENDS=	pads:net-mgmt/pads
+SANCP_SENSOR_RUN_DEPENDS=	sancp:security/sancp
 
 NO_BUILD=	yes
 TCL_VER=	8.5
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 42cbf6f76dd..60538f3f715 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://shibboleth.net/downloads/service-provider/${PORTVERSION}/
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	C++ Shibboleth Service Provider (Internet2) for Apache
 
-BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libsaml.so.8:${PORTSDIR}/security/opensaml2 libodbc.so:${PORTSDIR}/databases/unixODBC
+BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
+LIB_DEPENDS=	libsaml.so.8:security/opensaml2 libodbc.so:${PORTSDIR}/databases/unixODBC
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index 8000eb457e0..b32fcf793f1 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Free implementation of the Kerberos 5 network security system
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libtasn1.so:${PORTSDIR}/security/libtasn1 \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libtasn1.so:security/libtasn1 \
+		libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls
 
 USES=		iconv libtool makeinfo pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index 0f1baa6cbd3..1b251619a62 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -11,17 +11,17 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Various OpenPGP related tools
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
-		p5-Net-IDN-Encode>=0:${PORTSDIR}/textproc/p5-Net-IDN-Encode \
-		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-GnuPG-Interface>=0:${PORTSDIR}/security/p5-GnuPG-Interface \
-		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-		p5-Convert-Recode>=0:${PORTSDIR}/converters/p5-Convert-Recode \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS=	gpg:security/gnupg \
+		p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode \
+		p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-GnuPG-Interface>=0:security/p5-GnuPG-Interface \
+		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
+		p5-MIME-Tools>=0:mail/p5-MIME-Tools \
+		p5-Convert-Recode>=0:converters/p5-Convert-Recode \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-Template>=0:textproc/p5-Text-Template \
+		p5-GD>=0:graphics/p5-GD
 
 CONFLICTS_INSTALL=sig2dot-[0-9]* springgraph-[0-9]*
 
diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 376dd0ca8a1..55a6d4e8ed6 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -18,10 +18,10 @@ LICENSE_FILE_GPLR=	${WRKSRC}/doc/LICENSE.txt
 LICENSE_FILE_GPLv2=	${WRKSRC}/doc/GPL.txt
 LICENSE_PERMS_GPLR=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2 \
-		libfixbuf.so:${PORTSDIR}/net/libfixbuf
-BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
-RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
+		libfixbuf.so:net/libfixbuf
+BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lzo=${LOCALBASE} --enable-packing-tools
diff --git a/security/sinfp/Makefile b/security/sinfp/Makefile
index 9a1ac5bb1ee..47a0d45c5c3 100644
--- a/security/sinfp/Makefile
+++ b/security/sinfp/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Full operating system stack fingerprinting suite
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-Net-SinFP>=2.02:${PORTSDIR}/security/p5-Net-SinFP
+BUILD_DEPENDS=	p5-Net-SinFP>=2.02:security/p5-Net-SinFP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST=		""
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index 6b26ccf9fde..a495ecf2001 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fully automated, active web application security reconnaissance tool
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libpcre.so:devel/pcre
 
 USES=		gmake tar:tgz
 USE_OPENSSL=	yes
diff --git a/security/smtpscan/Makefile b/security/smtpscan/Makefile
index 2617e8bc5b8..4248f503314 100644
--- a/security/smtpscan/Makefile
+++ b/security/smtpscan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Remote SMTP server version detector
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 1708ba48aae..d623767f5a0 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -17,10 +17,10 @@ COMMENT=	Lightweight network intrusion detection system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libdnet.so:${PORTSDIR}/net/libdnet
-BUILD_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
-RUN_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libdnet.so:net/libdnet
+BUILD_DEPENDS=	daq>=2.0.0:net/daq
+RUN_DEPENDS=	daq>=2.0.0:net/daq
 
 OPTIONS_DEFINE=		IPV6 GRE HA NORMALIZER DOCS APPID \
 			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \
@@ -62,9 +62,9 @@ APPID_CONFIGURE_ENABLE=		open-appid
 HA_CONFIGURE_ENABLE=		ha
 FILEINSPECT_CONFIGURE_ENABLE=	file-inspect
 
-BARNYARD_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2
-PULLEDPORK_RUN_DEPENDS=	pulledpork.pl:${PORTSDIR}/security/pulledpork
-APPID_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+BARNYARD_RUN_DEPENDS=	barnyard2:security/barnyard2
+PULLEDPORK_RUN_DEPENDS=	pulledpork.pl:security/pulledpork
+APPID_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 APPID_CONFIGURE_ENV+=	luajit_CFLAGS="-I${LOCALBASE}/include/luajit-2.0" \
 			luajit_LIBS="-L${LOCALBASE}/lib -lluajit-5.1"
 
diff --git a/security/snortreport/Makefile b/security/snortreport/Makefile
index 3180a08b798..e212725abb7 100644
--- a/security/snortreport/Makefile
+++ b/security/snortreport/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=		BARNYARD JPGRAPH MYSQL PGSQL DOCS
 BARNYARD_DESC=		Depend on Barnyard2
 JPGRAPH_DESC=		Graphical charting
 
-BARNYARD_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2
-JPGRAPH_RUN_DEPENDS=	${LOCALBASE}/share/jpgraph/jpgraph.php:${PORTSDIR}/graphics/jpgraph2
+BARNYARD_RUN_DEPENDS=	barnyard2:security/barnyard2
+JPGRAPH_RUN_DEPENDS=	${LOCALBASE}/share/jpgraph/jpgraph.php:graphics/jpgraph2
 .include <bsd.port.options.mk>
 
 NO_BUILD=	yes
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index a2144d50abe..1fbcb6eb79f 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Generate HTML report summaries from snort incident alerts
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	snortsnarf.pl
diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index 4d1e545504e..e1362d6e5fe 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libbotan-1.10.so:security/botan110 \
+		libsqlite3.so:databases/sqlite3
 
 GNU_CONFIGURE=	yes
 # !!!!!!!!!!!!
diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index ef6cd5a1889..a519524e341 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Software implementation of a Hardware Security Module (HSM)
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var"
@@ -33,7 +33,7 @@ CRYP_BOTAN_DESC=	Build with Botan crypto library
 OPTIONS_DEFAULT=	CRYP_OPEN
 
 CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
-CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
+CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:security/botan110
 CRYP_OPEN_USE=		openssl=yes
 CRYP_OPEN_VARS=		WITH_OPENSSL_PORT=yes
 CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
diff --git a/security/spass/Makefile b/security/spass/Makefile
index 03bbf4e22dc..00bab937fc9 100644
--- a/security/spass/Makefile
+++ b/security/spass/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Secure password generator with a true random number generator
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libboost_program_options.so:devel/boost-libs
 
 BROKEN_sparc64=	cannot link with boost
 
diff --git a/security/spike-proxy/Makefile b/security/spike-proxy/Makefile
index 0a6af93bb57..95a9e1dca23 100644
--- a/security/spike-proxy/Makefile
+++ b/security/spike-proxy/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tool looking for vulnerabilities in web applications
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl
 
 USES=		python shebangfix tar:tgz
 SHEBANG_FILES=	*.py
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index f9809fca35e..6fe131d768e 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web proxy to detect malware
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 OPTIONS_DEFINE=	CLAMAV
 CLAMAV_DESC=	Enable CLAMAV support
@@ -20,7 +20,7 @@ CLAMAV_DESC=	Enable CLAMAV support
 USE_RC_SUBR=	spybye
 GNU_CONFIGURE=	yes
 
-CLAMAV_LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+CLAMAV_LIB_DEPENDS=	libclamav.so:security/clamav
 CLAMAV_CONFIGURE_ON=	--with-libclamav=${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/security/sqlmap/Makefile b/security/sqlmap/Makefile
index fa0ddb3496d..fea2122c2ed 100644
--- a/security/sqlmap/Makefile
+++ b/security/sqlmap/Makefile
@@ -26,7 +26,7 @@ MSF_DESC=	Enable Metasploit Framework integration
 .include <bsd.port.options.mk>
 
 .if  ${PORT_OPTIONS:MMSF}
-RUN_DEPENDS+=	${LOCALBASE}/bin/msfcli:${PORTSDIR}/security/metasploit
+RUN_DEPENDS+=	${LOCALBASE}/bin/msfcli:security/metasploit
 .endif
 
 post-patch:
diff --git a/security/sqlninja/Makefile b/security/sqlninja/Makefile
index b47a60d4705..0ed5c225fe0 100644
--- a/security/sqlninja/Makefile
+++ b/security/sqlninja/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Sql Server exploit toolkit
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
-		p5-Net-Pcap>=0:${PORTSDIR}/net/p5-Net-Pcap \
-		p5-Net-RawIP>=0:${PORTSDIR}/net/p5-Net-RawIP \
-		p5-NetPacket>=0:${PORTSDIR}/net/p5-NetPacket
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Net-DNS>=0:dns/p5-Net-DNS \
+		p5-Net-Pcap>=0:net/p5-Net-Pcap \
+		p5-Net-RawIP>=0:net/p5-Net-RawIP \
+		p5-NetPacket>=0:net/p5-NetPacket
 
 USES=		perl5 tar:tgz
 NO_BUILD=	yes
diff --git a/security/sshblock/Makefile b/security/sshblock/Makefile
index cd372d96268..9a0e2610b23 100644
--- a/security/sshblock/Makefile
+++ b/security/sshblock/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.pl
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Block abusive SSH login attempts
 
-RUN_DEPENDS=	p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+RUN_DEPENDS=	p5-File-Tail>=0:devel/p5-File-Tail
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index 85e2be5d220..3540786bba6 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Checks for SSH/FTP bruteforce and blocks given IPs
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
-		p5-IPC-Shareable>=0:${PORTSDIR}/devel/p5-IPC-Shareable \
-		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
+RUN_DEPENDS=	p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \
+		p5-IPC-Shareable>=0:devel/p5-IPC-Shareable \
+		p5-Proc-PID-File>=0:devel/p5-Proc-PID-File
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/security/ssl-admin/Makefile b/security/ssl-admin/Makefile
index 9a83e68cad8..dc08e8540b2 100644
--- a/security/ssl-admin/Makefile
+++ b/security/ssl-admin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	OpenSSL certificate manager with OpenVPN support
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS=	zip:archivers/zip
 
 USES=		perl5 shebangfix tar:xz
 SHEBANG_FILES=	ssl-admin
diff --git a/security/sslsplit/Makefile b/security/sslsplit/Makefile
index 363316b049e..9ca53b0d287 100644
--- a/security/sslsplit/Makefile
+++ b/security/sslsplit/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://mirror.roe.ch/rel/sslsplit/
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Transparent and scalable SSL/TLS interception
 
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:devel/libevent2
 
 USES=		gmake pkgconfig tar:bzip2
 MAKEFILE=	GNUmakefile
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 67b99d0867d..03b922934f7 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -14,25 +14,25 @@ COMMENT=	System Security Services Daemon
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libtalloc.so:${PORTSDIR}/devel/talloc \
-		libtevent.so:${PORTSDIR}/devel/tevent \
-		libtdb.so:${PORTSDIR}/databases/tdb \
-		libldb.so:${PORTSDIR}/databases/ldb \
-		libcares.so:${PORTSDIR}/dns/c-ares \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdhash.so:${PORTSDIR}/devel/ding-libs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libunistring.so:${PORTSDIR}/devel/libunistring \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libinotify.so:${PORTSDIR}/devel/libinotify
-BUILD_DEPENDS=	xmlcatalog:${PORTSDIR}/textproc/libxml2 \
-		docbook-xsl>=1:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr \
-		krb5>=1.10:${PORTSDIR}/security/krb5 \
-		nsupdate:${PORTSDIR}/dns/bind99
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libtalloc.so:devel/talloc \
+		libtevent.so:devel/tevent \
+		libtdb.so:databases/tdb \
+		libldb.so:databases/ldb \
+		libcares.so:dns/c-ares \
+		libdbus-1.so:devel/dbus \
+		libdhash.so:devel/ding-libs \
+		libpcre.so:devel/pcre \
+		libunistring.so:devel/libunistring \
+		libnss3.so:security/nss \
+		libsasl2.so:security/cyrus-sasl2 \
+		libinotify.so:devel/libinotify
+BUILD_DEPENDS=	xmlcatalog:textproc/libxml2 \
+		docbook-xsl>=1:textproc/docbook-xsl \
+		xsltproc:textproc/libxslt \
+		xmlcatmgr:textproc/xmlcatmgr \
+		krb5>=1.10:security/krb5 \
+		nsupdate:dns/bind99
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-selinux=no --with-semanage=no \
@@ -71,7 +71,7 @@ OPTIONS_DEFAULT=	DOCS
 OPTIONS_SUB=	yes
 
 SMB_DESC=		Install IPA and AD providers (requires Samba4)
-SMB_BUILD_DEPENDS=	samba41>=4.1.0:${PORTSDIR}/net/samba41
+SMB_BUILD_DEPENDS=	samba41>=4.1.0:net/samba41
 SMB_CONFIGURE_WITH=	samba
 
 .include <bsd.port.options.mk>
diff --git a/security/ssss/Makefile b/security/ssss/Makefile
index 877cd638097..3994eaa55f6 100644
--- a/security/ssss/Makefile
+++ b/security/ssss/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://point-at-infinity.org/ssss/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Shamir's Secret Sharing Scheme
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 PLIST_FILES=	bin/ssss-combine bin/ssss-split man/man1/ssss.1.gz
 
diff --git a/security/sst/Makefile b/security/sst/Makefile
index 7836c68e784..70471e7d33e 100644
--- a/security/sst/Makefile
+++ b/security/sst/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Simple SSL tunneling tool (uses netcat)
 
 .if !exists(/usr/bin/nc)
-RUN_DEPENDS=	netcat:${PORTSDIR}/net/netcat
+RUN_DEPENDS=	netcat:net/netcat
 .endif
 
 MAKEFILE=	${FILESDIR}/Makefile
diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index 576887f0363..bddeb45ebbc 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFAULT=	X11
 
 OPTIONS_SUB=	yes
 
-X11_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+X11_LIB_DEPENDS=	libevent.so:devel/libevent2
 X11_USE=	gnome=gtk12
 X11_CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
 
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index a8fa03f9d97..06014a69d8a 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Steganography tool to hide data in binary files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
-		libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt \
+		libmhash.so:security/mhash
 
 USES=		gmake jpeg libtool:build perl5
 GNU_CONFIGURE=	yes
diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index c913a6573f6..9c5bf04e92a 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Software Token for UNIX compatible with RSA SecurID
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtomcrypt.so:${PORTSDIR}/security/libtomcrypt
+LIB_DEPENDS=	libtomcrypt.so:security/libtomcrypt
 
 OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index 6e544cc3289..18b57c4c441 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -73,9 +73,9 @@ VSTR_DESC=	Use devel/vstr printf hooks
 
 # Extra options
 CURL_CONFIGURE_ON=	--enable-curl
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 EAPAKA3GPP2_CONFIGURE_ON=	--enable-eap-aka --enable-eap-aka-3gpp2
-EAPAKA3GPP2_LIB_DEPENDS=libgmp.so:${PORTSDIR}/math/gmp
+EAPAKA3GPP2_LIB_DEPENDS=libgmp.so:math/gmp
 EAPDYNAMIC_CONFIGURE_ON=--enable-eap-dynamic
 EAPRADIUS_CONFIGURE_ON=	--enable-eap-radius
 EAPSIMFILE_CONFIGURE_ON=--enable-eap-sim --enable-eap-sim-file
@@ -88,17 +88,17 @@ LDAP_CONFIGURE_ON=	--enable-ldap
 LDAP_USE=		OPENLDAP=yes
 MYSQL_CONFIGURE_ON=	--enable-mysql
 MYSQL_USE=		MYSQL=yes
-SMP_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
+SMP_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 SMP_CONFIGURE_ON=	--enable-smp
 SWANCTL_CONFIGURE_ON=	--enable-swanctl
 SWANCTL_IMPLIES=	VICI
 SQLITE_CONFIGURE_ON=	--enable-sqlite
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 TESTVECTOR_CONFIGURE_ON=--enable-test-vectors
 PKI_CONFIGURE_OFF=	--disable-pki
 SCEP_CONFIGURE_OFF=	--disable-scepclient
 UNBOUND_CONFIGURE_ON=	--enable-unbound
-UNBOUND_LIB_DEPENDS=	libunbound.so:${PORTSDIR}/dns/unbound
+UNBOUND_LIB_DEPENDS=	libunbound.so:dns/unbound
 UNITY_CONFIGURE_ON=	--enable-unity
 VICI_CONFIGURE_ON=	--enable-vici
 XAUTH_CONFIGURE_ON=	--enable-xauth-eap --enable-xauth-generic
diff --git a/security/stud/Makefile b/security/stud/Makefile
index 50336c18e4b..5d4dd50310e 100644
--- a/security/stud/Makefile
+++ b/security/stud/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Scalable TLS Unwrapping Daemon
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+LIB_DEPENDS=	libev.so:devel/libev
 
 USES=		gmake
 USE_GITHUB=	yes
diff --git a/security/subversion-gnome-keyring/Makefile b/security/subversion-gnome-keyring/Makefile
index 571939bb182..633230e6772 100644
--- a/security/subversion-gnome-keyring/Makefile
+++ b/security/subversion-gnome-keyring/Makefile
@@ -18,7 +18,7 @@ SVN_BUILD_ADDONS=	yes
 
 .include "${MASTERDIR}/Makefile.common"
 
-LIB_DEPENDS+=		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS+=		libgnome-keyring.so:security/libgnome-keyring
 
 CONFIGURE_ARGS+=	--with-gnome-keyring
 
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 4d3b9944a42..82280c07154 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -71,7 +71,7 @@ AUDIT_CONFIGURE_WITH=	bsm-audit
 OPIE_CONFIGURE_ON=	--with-opie
 OPIE_CONFIGURE_OFF=	--with-pam
 SSSD_CONFIGURE_ON=	--with-sssd
-SSSD_RUN_DEPENDS=	sssd:${PORTSDIR}/security/sssd
+SSSD_RUN_DEPENDS=	sssd:security/sssd
 
 .include <bsd.port.options.mk>
 
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index edeebcf92da..3609e34823d 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -13,9 +13,9 @@ COMMENT=	High Performance Network IDS, IPS and Security Monitoring engine
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libnet.so:${PORTSDIR}/net/libnet \
-		libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libnet.so:net/libnet \
+		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -50,10 +50,10 @@ PRELUDE_DESC=		Prelude support for NIDS alerts
 SC_DESC=		Suricata socket client (suricatasc)
 TESTS_DESC=		Unit tests in suricata binary
 
-GEOIP_LIB_DEPENDS=		libGeoIP.so:${PORTSDIR}/net/GeoIP
+GEOIP_LIB_DEPENDS=		libGeoIP.so:net/GeoIP
 GEOIP_CONFIGURE_ON=		--enable-geoip
 
-HTP_PORT_LIB_DEPENDS=		libhtp.so:${PORTSDIR}/devel/libhtp
+HTP_PORT_LIB_DEPENDS=		libhtp.so:devel/libhtp
 HTP_PORT_CONFIGURE_ON=		--enable-non-bundled-htp
 HTP_PORT_CONFIGURE_OFF=		--enable-bundled-htp
 HTP_PORT_CONFLICTS_INSTALL_OFF=	libhtp-[0-9]* libhtp-suricata
@@ -61,7 +61,7 @@ HTP_PORT_USES_OFF=		iconv:translit
 
 IPFW_CONFIGURE_ON=		--enable-ipfw
 
-JSON_LIB_DEPENDS=		libjansson.so:${PORTSDIR}/devel/jansson
+JSON_LIB_DEPENDS=		libjansson.so:devel/jansson
 JSON_CONFIGURE_ON=		--with-libjansson-includes=${LOCALBASE}/include \
 				--with-libjansson-libraries=${LOCALBASE}/lib
 
@@ -70,11 +70,11 @@ LUA_CONFIGURE_ON=		--enable-lua \
 				--with-liblua-includes=${LUA_INCDIR} \
 				--with-liblua-libraries=${LUA_LIBDIR}
 
-LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
 LUAJIT_CONFIGURE_ON=		--enable-luajit
 
-NSS_LIB_DEPENDS=		libnss3.so:${PORTSDIR}/security/nss \
-				libnspr4.so:${PORTSDIR}/devel/nspr
+NSS_LIB_DEPENDS=		libnss3.so:security/nss \
+				libnspr4.so:devel/nspr
 NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
 				--with-libnss-libraries=${LOCALBASE}/lib \
 				--with-libnspr-libraries=${LOCALBASE}/lib \
@@ -82,13 +82,13 @@ NSS_CONFIGURE_ON=		--with-libnss-includes=${LOCALBASE}/include/nss/nss \
 
 NETMAP_CONFIGURE_ENABLE=	netmap
 
-PORTS_PCAP_LIB_DEPENDS=		libpcap.so:${PORTSDIR}/net/libpcap
+PORTS_PCAP_LIB_DEPENDS=		libpcap.so:net/libpcap
 PORTS_PCAP_CONFIGURE_ON=	--with-libpcap-includes=${LOCALBASE}/include \
 				--with-libpcap-libraries=${LOCALBASE}/lib
 PORTS_PCAP_CONFIGURE_OFF=	--with-libpcap-includes=/usr/include \
 				--with-libpcap-libraries=/usr/lib
 
-PRELUDE_LIB_DEPENDS=		libprelude.so:${PORTSDIR}/security/libprelude
+PRELUDE_LIB_DEPENDS=		libprelude.so:security/libprelude
 PRELUDE_CONFIGURE_ENABLE=	prelude
 PRELUDE_CONFIGURE_ON=		--with-libprelude-prefix=${LOCALBASE}
 
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index d927f0101d4..0027fe34b3e 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	The Simple WATCHer and filter
 
 BUILD_DEPENDS=	\
-	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
-	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
-	p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
+	p5-TimeDate>=0:devel/p5-TimeDate \
+	p5-Date-Manip>=0:devel/p5-Date-Manip \
+	p5-Date-Calc>=0:devel/p5-Date-Calc \
+	p5-File-Tail>=0:devel/p5-File-Tail
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/security/tclgpg/Makefile b/security/tclgpg/Makefile
index 3af4926a18f..fa6c5a29298 100644
--- a/security/tclgpg/Makefile
+++ b/security/tclgpg/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tcl interface to GNU Privacy Guard with interface similar to TclGPGME
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	dtplite:devel/tcllib
+RUN_DEPENDS=	gpg:security/gnupg1
 
 USES=		autoreconf gmake tcl
 GNU_CONFIGURE=	yes
diff --git a/security/tclsasl/Makefile b/security/tclsasl/Makefile
index 9b24c7a18ab..69f94bbb76e 100644
--- a/security/tclsasl/Makefile
+++ b/security/tclsasl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://beepcore-tcl.sourceforge.net/
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Tcl interface to the Cyrus SASLv2 library
 
-LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 USES=		tcl libtool tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 837b841f2c1..9b14a5cf8e2 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Virtual Private Network (VPN) daemon
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 USES=		cpe makeinfo
 CPE_VENDOR=	tinc-vpn
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index d36a5131aee..333719718e2 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Simple graphical interface to manage a small Certification Authority
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		zip:${PORTSDIR}/archivers/zip \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		zip:archivers/zip \
+		p5-MIME-Base64>=0:converters/p5-MIME-Base64
 
 USES=		perl5 tar:xz shebangfix
 USE_OPENSSL=	yes
diff --git a/security/tmux-cssh/Makefile b/security/tmux-cssh/Makefile
index a864c6a0cf9..efebcc1fbe4 100644
--- a/security/tmux-cssh/Makefile
+++ b/security/tmux-cssh/Makefile
@@ -10,7 +10,7 @@ COMMENT=	ClusterSSH features using tmux, but not X11
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	${LOCALBASE}/bin/tmux:${PORTSDIR}/sysutils/tmux
+RUN_DEPENDS=	${LOCALBASE}/bin/tmux:sysutils/tmux
 
 NO_BUILD=	YES
 
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index e8cba5fcd95..e6b32f95b28 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
@@ -81,7 +81,7 @@ TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=		libevent.so:devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
@@ -91,9 +91,9 @@ TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
-LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
diff --git a/security/tor/Makefile b/security/tor/Makefile
index 146c04a300d..90efb63716f 100644
--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
 TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
@@ -78,7 +78,7 @@ TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS+=		libevent.so:devel/libevent2
 TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
@@ -88,9 +88,9 @@ TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools
 .else
-LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
diff --git a/security/tpm-tools/Makefile b/security/tpm-tools/Makefile
index 3ee259b06ca..e240f2487f8 100644
--- a/security/tpm-tools/Makefile
+++ b/security/tpm-tools/Makefile
@@ -15,10 +15,10 @@ LICENSE_NAME=	Common Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
-BUILD_DEPENDS=	pkcsconf:${PORTSDIR}/security/opencryptoki
-RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:${PORTSDIR}/security/trousers \
-		${LOCALBASE}/lib/pkcs11/libopencryptoki.so:${PORTSDIR}/security/opencryptoki
+LIB_DEPENDS=	libtspi.so:security/trousers
+BUILD_DEPENDS=	pkcsconf:security/opencryptoki
+RUN_DEPENDS=	${LOCALBASE}/sbin/tcsd:security/trousers \
+		${LOCALBASE}/lib/pkcs11/libopencryptoki.so:security/opencryptoki
 
 USES=		gettext gmake iconv libtool
 USE_LDCONFIG=	YES
diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index 7f5a80d0453..f54ac2c9214 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -12,7 +12,7 @@ COMMENT=	TPM Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
+LIB_DEPENDS=	libtspi.so:security/trousers
 
 USES=		qmake
 USE_QT4=	gui moc_build rcc_build uic_build
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index d14826c6adb..13637364a58 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -42,7 +42,7 @@ DEBUG_CONFIGURE_ENABLE=	debug
 
 .if ${PORT_OPTIONS:MEMULATOR}
 PKGNAMESUFFIX+=	-no_tddl
-LIB_DEPENDS+=	libtddl.so:${PORTSDIR}/emulators/tpm-emulator
+LIB_DEPENDS+=	libtddl.so:emulators/tpm-emulator
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src-tcs-Makefile.am \
 		${FILESDIR}/extra-patch-src-tcsd-Makefile.am \
diff --git a/security/truecrypt/Makefile b/security/truecrypt/Makefile
index a34b284705b..8f778d9c18c 100644
--- a/security/truecrypt/Makefile
+++ b/security/truecrypt/Makefile
@@ -18,8 +18,8 @@ EXTRACT_ONLY=	${TC_SRCFILE} wxWidgets-${WX_VER}.tar.bz2
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Free open-source disk encryption software
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
+BUILD_DEPENDS=	nasm:devel/nasm
+RUN_DEPENDS=	sudo:security/sudo
 
 WRKSRC=		${WRKDIR}/truecrypt-${PORTVERSION}-source
 
diff --git a/security/tsshbatch/Makefile b/security/tsshbatch/Makefile
index 9ba567627c9..33149918224 100644
--- a/security/tsshbatch/Makefile
+++ b/security/tsshbatch/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	tsshbatch
 LICENSE_FILE=	${WRKSRC}/tsshbatch-license.txt
 LICENSE_PERMS=	auto-accept
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko
 
 USES=		python:run
 NO_ARCH=	yes
diff --git a/security/umit/Makefile b/security/umit/Makefile
index 3157c3993a9..e8ca3c5fc2c 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Nmap frontend developed with Python and PyGTK
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${LOCALBASE}/bin/nmap:security/nmap
 
 NO_ARCH=	yes
 
@@ -31,7 +31,7 @@ DESKTOP_ENTRIES="Umit" "GUI frontend for Nmap security/port scanner" "umit" \
 
 OPTIONS_DEFINE=		DOCS
 
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/security/unicornscan/Makefile b/security/unicornscan/Makefile
index aafdf96ece3..57a9eb3b0b9 100644
--- a/security/unicornscan/Makefile
+++ b/security/unicornscan/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Asynchronous TCP and UDP port scanner
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 USES=		gmake
 CFLAGS+=	-DWITH_LONGOPTS
diff --git a/security/unssh/Makefile b/security/unssh/Makefile
index 9c8473035f9..7e0cf8e077b 100644
--- a/security/unssh/Makefile
+++ b/security/unssh/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.semprixd.com/shares/ports/
 MAINTAINER=	semprix@gmx.com
 COMMENT=	Fast way to delete entries from OpenSSH known_hosts file
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		shebangfix
 NO_BUILD=	yes
diff --git a/security/vault/Makefile b/security/vault/Makefile
index 45eabb55d99..736970245b0 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tool for securely accessing secrets
 
 LICENSE=	MPL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index f52e4ee7b2d..1e32181ce85 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Forensics tool to examine Thumbs.db files
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index 8fe75ad835e..f159e7a86b8 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -31,7 +31,7 @@ ROOTPWD_DESC=	Enable unlock using root password
 ROOTPWD_CONFIGURE_ENABLE=	root-password
 VLOCKSCRIPTS_DESC=	Install sample hook scripts
 CACASAVER_DESC=	Enable libcaca screensaver
-CACASAVER_BUILD_DEPENDS=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+CACASAVER_BUILD_DEPENDS=	${LOCALBASE}/lib/libcaca.a:graphics/libcaca
 
 # Default scripts/modules
 VLOCKSCRIPTS=
diff --git a/security/vm-to-tor/Makefile b/security/vm-to-tor/Makefile
index 2153dff00f1..1a681a851ef 100644
--- a/security/vm-to-tor/Makefile
+++ b/security/vm-to-tor/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Connect virtual machines to the tor network
 
 LICENSE=	BSD4CLAUSE
 
-RUN_DEPENDS=	tor:${PORTSDIR}/security/tor \
-		tiny-dhcp-server:${PORTSDIR}/net/tiny-network-utilities
+RUN_DEPENDS=	tor:security/tor \
+		tiny-dhcp-server:net/tiny-network-utilities
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yurivict
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 72e26eebfe3..9629a8d51f6 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	vpnc-script:${PORTSDIR}/sysutils/vpnc-scripts
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+RUN_DEPENDS=	vpnc-script:sysutils/vpnc-scripts
 
 USES=		shebangfix gmake perl5
 USE_PERL5=	build
diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index ec3d13e350b..98070b6de36 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -16,9 +16,9 @@ COMMENT=	Vulnerability and eXposure Markup Language DTD
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr \
-		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:${PORTSDIR}/textproc/xhtml-modularization \
-		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:${PORTSDIR}/textproc/xhtml-basic
+RUN_DEPENDS=	${XMLCATMGR}:textproc/xmlcatmgr \
+		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:textproc/xhtml-modularization \
+		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:textproc/xhtml-basic
 
 USES=		python:run
 
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index 4339eaa0b27..99882ef9eb5 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -12,18 +12,18 @@ COMMENT=	Web Application Attack and Audit Framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}soappy>=0:${PORTSDIR}/net/py-soappy \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}fpconst>0:${PORTSDIR}/math/py-fpconst \
-		${PYTHON_PKGNAMEPREFIX}nltk>0:${PORTSDIR}/textproc/py-nltk \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst \
+		${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk \
 		${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}pdf>0:${PORTSDIR}/print/py-pdf \
-		scapy>0:${PORTSDIR}/net/scapy \
-		${PYTHON_PKGNAMEPREFIX}wordnet>0:${PORTSDIR}/textproc/py-wordnet \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml
+		${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf \
+		scapy>0:net/scapy \
+		${PYTHON_PKGNAMEPREFIX}wordnet>0:textproc/py-wordnet \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -32,7 +32,7 @@ USES=		gettext python tar:bzip2
 OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
-GUI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>0:${PORTSDIR}/graphics/py-graphviz
+GUI_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>0:graphics/py-graphviz
 GUI_USE=	GNOME=pygtk2
 
 .include <bsd.port.options.mk>
diff --git a/security/wapiti/Makefile b/security/wapiti/Makefile
index 6e38c5923d1..c9aba0fc2f2 100644
--- a/security/wapiti/Makefile
+++ b/security/wapiti/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Wapiti is a vulnerability scanner for web applications
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/security/webshag/Makefile b/security/webshag/Makefile
index d964bb30725..cd6c789e2a1 100644
--- a/security/webshag/Makefile
+++ b/security/webshag/Makefile
@@ -25,7 +25,7 @@ OPTIONS_SUB=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNMAP}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/nmap:${PORTSDIR}/security/nmap
+BUILD_DEPENDS+=	${LOCALBASE}/bin/nmap:security/nmap
 .endif
 
 .if ${PORT_OPTIONS:MWXGTK}
diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index 1ba36f26305..d2d5fa27521 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -90,7 +90,7 @@ TNC_DESC=		Trusted Network Connect
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSIM} || ${PORT_OPTIONS:MAKA} || ${PORT_OPTIONS:MAKA_PRIME}
-LIB_DEPENDS+=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+LIB_DEPENDS+=	libpcsclite.so:devel/pcsc-lite
 CFLAGS+=	-I${LOCALBASE}/include/PCSC
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
diff --git a/security/xca/Makefile b/security/xca/Makefile
index 284638f2cad..ae989b77991 100644
--- a/security/xca/Makefile
+++ b/security/xca/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphical certification authority
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		desktop-file-utils gmake localbase pkgconfig shared-mime-info
 USE_OPENSSL=	yes
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index 6e9982db499..c8def9db1c8 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	${PORTNAME}-src-${DISTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java library for XML Signature and Encryption
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/xalan.jar:textproc/xalan-j
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
 
 LICENSE=	APACHE20
 
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index bd5939726c5..edbd4c21339 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	http://www.aleksey.com/xmlsec/download/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	XML Security Library
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 OPTIONS_DEFINE=	DOCS GNUTLS NSS
 OPTIONS_SUB=	yes
 GNUTLS_DESC=		Enable GNUTLS support
 GNUTLS_CONFIGURE_WITH=	gnutls="${LOCALBASE}"
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 NSS_DESC=		Enable Mozilla's NSS support
 NSS_CONFIGURE_WITH=	nss="${LOCALBASE}" nspr="${LOCALBASE}"
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index 238679045d8..ac5b099e0a0 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.yersinia.net/download/
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
 
-LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
+LIB_DEPENDS=	libnet.so:net/libnet
 
 .if !defined(WITHOUT_GTK)
 .if exists(${LOCALBASE}/include/gtk-2.0/gtk/gtk.h)
diff --git a/security/ykclient/Makefile b/security/ykclient/Makefile
index 721ed2ff694..0b7b699ae48 100644
--- a/security/ykclient/Makefile
+++ b/security/ykclient/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Yubico C client library
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl \
-		help2man:${PORTSDIR}/misc/help2man
+LIB_DEPENDS=	libcurl.so:ftp/curl
+BUILD_DEPENDS=	curl-config:ftp/curl \
+		help2man:misc/help2man
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig
diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile
index 69b1f139449..1f1df7d7f8a 100644
--- a/security/ykpers/Makefile
+++ b/security/ykpers/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Library and tool for personalization of Yubico's YubiKey
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libyubikey.so:${PORTSDIR}/security/libyubikey
+LIB_DEPENDS=	libyubikey.so:security/libyubikey
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/security/yubikey-personalization-gui/Makefile b/security/yubikey-personalization-gui/Makefile
index d30c28354e4..c3ee5601bf7 100644
--- a/security/yubikey-personalization-gui/Makefile
+++ b/security/yubikey-personalization-gui/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Graphical YubiKey personalization tool
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libykpers-1.so:${PORTSDIR}/security/ykpers
+LIB_DEPENDS=	libykpers-1.so:security/ykpers
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yubico
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index b3949814911..e8d2fcc5ea1 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -18,8 +18,8 @@ COMMENT=	GUI frontend for the Nmap scanning utility
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	nmap:security/nmap \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
diff --git a/security/zxid/Makefile b/security/zxid/Makefile
index 4cc086312c7..853a2710c6b 100644
--- a/security/zxid/Makefile
+++ b/security/zxid/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	End2End Trust Architecture (e2eta) Software Copying
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	# none
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake localbase tar:tgz
 USE_OPENSSL=	yes
author	mat <mat@FreeBSD.org>	2016-04-01 22:25:16 +0800
committer	mat <mat@FreeBSD.org>	2016-04-01 22:25:16 +0800
commit	2ff80f55375ee2811ca2895a06b853699c3e0915 (patch)
tree	eb9a806366343ecfc3a5146e70b637f09d4e62c7 /security
parent	c60c1d09235abbfd733e901b1872b86adc82027c (diff)
download	freebsd-ports-graphics-2ff80f55375ee2811ca2895a06b853699c3e0915.tar.gz freebsd-ports-graphics-2ff80f55375ee2811ca2895a06b853699c3e0915.tar.zst freebsd-ports-graphics-2ff80f55375ee2811ca2895a06b853699c3e0915.zip