37 files changed, 89 insertions, 89 deletions

diff --git a/ftp/R-cran-RCurl/Makefile b/ftp/R-cran-RCurl/Makefile
index 230d4e71f849..c60dea835f5e 100644
--- a/ftp/R-cran-RCurl/Makefile
+++ b/ftp/R-cran-RCurl/Makefile
@@ -11,9 +11,9 @@ COMMENT=	General network client interface for R
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	R-cran-bitops>0:${PORTSDIR}/devel/R-cran-bitops
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	curl-config:ftp/curl
+RUN_DEPENDS=	R-cran-bitops>0:devel/R-cran-bitops
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=	cran:auto-plist
 
diff --git a/ftp/R-cran-curl/Makefile b/ftp/R-cran-curl/Makefile
index 6b1ea751a4a0..15f7a03fd520 100644
--- a/ftp/R-cran-curl/Makefile
+++ b/ftp/R-cran-curl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Modern and Flexible Web Client for R
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:${PORTSDIR}/ftp/curl
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	${LOCALBASE}/include/curl/curl.h:ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=	cran:auto-plist
 
diff --git a/ftp/bareftp/Makefile b/ftp/bareftp/Makefile
index 5db45e832e77..abe526cbfc19 100644
--- a/ftp/bareftp/Makefile
+++ b/ftp/bareftp/Makefile
@@ -30,8 +30,8 @@ OPTIONS_DEFAULT=GNOMEKEYRING
 OPTIONS_SUB=	yes
 
 GNOMEKEYRING_CONFIGURE_WITH=	gnomekeyring
-GNOMEKEYRING_BUILD_DEPENDS=	gnome-keyring-sharp>0:${PORTSDIR}/security/gnome-keyring-sharp
-GNOMEKEYRING_RUN_DEPENDS=	gnome-keyring-sharp>0:${PORTSDIR}/security/gnome-keyring-sharp
+GNOMEKEYRING_BUILD_DEPENDS=	gnome-keyring-sharp>0:security/gnome-keyring-sharp
+GNOMEKEYRING_RUN_DEPENDS=	gnome-keyring-sharp>0:security/gnome-keyring-sharp
 NLS_CONFIGURE_ENABLE=	nls
 
 # TODO
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 8c43c0dd0a83..d90503ba35b0 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -73,14 +73,14 @@ SLAVEDIRS=	ftp/curl-hiphop
 
 CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 CARES_CONFIGURE_ENABLE=	ares
-CARES_LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
+CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 COOKIES_CONFIGURE_ENABLE=	cookies
 CURL_DEBUG_CONFIGURE_ENABLE=	curldebug
 DEBUG_CONFIGURE_ENABLE=	debug
 GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_BASE_CPPFLAGS=	${GSSAPICPPFLAGS}
 GSSAPI_BASE_LDFLAGS=	${GSSAPILDFLAGS}
@@ -97,25 +97,25 @@ GSSAPI_MIT_LDFLAGS=	${GSSAPILDFLAGS}
 GSSAPI_MIT_LIBS=	${GSSAPILIBS}
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
-HTTP2_BUILD_DEPENDS=	nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
+HTTP2_BUILD_DEPENDS=	nghttp2>=1.0.0:www/nghttp2
 HTTP2_CONFIGURE_WITH=	nghttp2
-HTTP2_LIB_DEPENDS=	libnghttp2.so:${PORTSDIR}/www/nghttp2
-HTTP2_RUN_DEPENDS=	nghttp2>=1.0.0:${PORTSDIR}/www/nghttp2
+HTTP2_LIB_DEPENDS=	libnghttp2.so:www/nghttp2
+HTTP2_RUN_DEPENDS=	nghttp2>=1.0.0:www/nghttp2
 HTTP2_USES=		pkgconfig
 IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_ENABLE=	ipv6
 LDAP_CONFIGURE_ENABLE=	ldap
 LDAP_USE=		OPENLDAP=yes
 LDAPS_CONFIGURE_ENABLE=	ldaps
 LIBSSH2_CONFIGURE_WITH=	libssh2
-LIBSSH2_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 METALINK_CONFIGURE_WITH=libmetalink
-METALINK_LIB_DEPENDS=	libmetalink.so:${PORTSDIR}/misc/libmetalink
+METALINK_LIB_DEPENDS=	libmetalink.so:misc/libmetalink
 METALINK_LIBS=		-lcrypto
 NSS_CONFIGURE_WITH=	nss
-NSS_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+NSS_LIB_DEPENDS=	libnss3.so:security/nss
 NSS_USES=		pkgconfig
 OPENSSL_CONFIGURE_OFF=	--without-ssl
 OPENSSL_CONFIGURE_ON=	--with-ssl=${OPENSSLBASE}
@@ -123,17 +123,17 @@ OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_USE=		OPENSSL=yes
 POLARSSL_CONFIGURE_WITH=polarssl
-POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:${PORTSDIR}/security/polarssl13
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
 PROXY_CONFIGURE_ENABLE=	proxy
 PSL_CONFIGURE_WITH=	libpsl
-PSL_LIB_DEPENDS=	libpsl.so:${PORTSDIR}/dns/libpsl
+PSL_LIB_DEPENDS=	libpsl.so:dns/libpsl
 RTMP_CONFIGURE_WITH=	librtmp
-RTMP_LIB_DEPENDS=	librtmp.so:${PORTSDIR}/multimedia/librtmp
+RTMP_LIB_DEPENDS=	librtmp.so:multimedia/librtmp
 RTMP_USES=		pkgconfig
 THREADED_RESOLVER_CONFIGURE_ENABLE=	threaded-resolver
 TLS_SRP_CONFIGURE_ENABLE=	tls-srp
 WOLFSSL_CONFIGURE_WITH=	cyassl
-WOLFSSL_LIB_DEPENDS=	libwolfssl.so:${PORTSDIR}/security/wolfssl
+WOLFSSL_LIB_DEPENDS=	libwolfssl.so:security/wolfssl
 
 .include <bsd.port.options.mk>
 
diff --git a/ftp/curlpp/Makefile b/ftp/curlpp/Makefile
index c623a3ae88fa..6fd218cd4f73 100644
--- a/ftp/curlpp/Makefile
+++ b/ftp/curlpp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ wrapper for libcurl
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	BOOST DOCS EXAMPLES
 
@@ -30,7 +30,7 @@ PORTEXAMPLES=	*
 GH_ACCOUNT=	jpbarrette
 USE_GITHUB=	yes
 
-BOOST_BUILD_DEPENDS=	boost-libs>=1.20.0:${PORTSDIR}/devel/boost-libs
+BOOST_BUILD_DEPENDS=	boost-libs>=1.20.0:devel/boost-libs
 BOOST_RUN_DEPENDS=	${BOOST_BUILD_DEPENDS}
 BOOST_CONFIGURE_ON=	--with-boost=${LOCALBASE}
 BOOST_CONFIGURE_OFF=	--without-boost
diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 6bb399c04310..baafbcda2b37 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Fast and reliable cross-platform FTP, FTPS, and SFTP client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-LIB_DEPENDS=	libfilezilla.so:${PORTSDIR}/ftp/libfilezilla \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libidn.so:${PORTSDIR}/dns/libidn \
-		libpugixml.so:${PORTSDIR}/textproc/pugixml
+LIB_DEPENDS=	libfilezilla.so:ftp/libfilezilla \
+		libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls \
+		libidn.so:dns/libidn \
+		libpugixml.so:textproc/pugixml
 
 BROKEN_FreeBSD_9=	requires C++14 complier, 9.x lacks C++11 standard library
 
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	DBUS NLS
 OPTIONS_DEFAULT=DBUS NLS
 OPTIONS_SUB=	yes
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
 
 NLS_USES=		gettext
diff --git a/ftp/fpc-libcurl/Makefile b/ftp/fpc-libcurl/Makefile
index f0a86318a2df..c6eb56166ede 100644
--- a/ftp/fpc-libcurl/Makefile
+++ b/ftp/fpc-libcurl/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBCURL
 LIBCURL_DESC=	Install curl tools and library
 OPTIONS_DEFAULT=	LIBCURL
 
-LIBCURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIBCURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include "${MASTERDIR}/Makefile"
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 82b95ac62b14..0da378ae3d72 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to mirror directory hierarchy with FTP
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	p5-Socket6>=0:${PORTSDIR}/net/p5-Socket6
+RUN_DEPENDS=	p5-Socket6>=0:net/p5-Socket6
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/ftp/ftpsync/Makefile b/ftp/ftpsync/Makefile
index 4841a8e5b1aa..75bf24516800 100644
--- a/ftp/ftpsync/Makefile
+++ b/ftp/ftpsync/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Synchronizes a local and a remote FTP directory trees
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=5.805:www/p5-libwww
 
 USES=		perl5 shebangfix tar:bzip2
 NO_BUILD=	yes
diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile
index b647f95a8f71..08579c740c41 100644
--- a/ftp/gwget/Makefile
+++ b/ftp/gwget/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME wget front-end
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	wget:ftp/wget
 
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
@@ -29,8 +29,8 @@ CONFIGURE_ARGS=	--disable-epiphany-extension
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 
 NOTIFY_CONFIGURE_ENABLE=	libnotify
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-NOTIFY_RUN_DEPENDS=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+NOTIFY_RUN_DEPENDS=	${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon
 
 post-patch:
 	@${REINPLACE_CMD} 's|glib/gerror|glib|' \
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index ac8476dd0a4e..a070bff22172 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Haskell binding to libcurl
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile
index 2835b26ee72a..c2b5a44235b7 100644
--- a/ftp/hsftp/Makefile
+++ b/ftp/hsftp/Makefile
@@ -23,7 +23,7 @@ MAKEFILE=	makefile
 
 PLIST_FILES=	bin/hsftp man/man1/hsftp.1.gz
 
-OPENSSH_RUN_DEPENDS=		ssh:${PORTSDIR}/security/openssh-portable
+OPENSSH_RUN_DEPENDS=		ssh:security/openssh-portable
 OPENSSH_CONFIGURE_WITH=		openssh
 
 READLINE_USES=			readline
diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile
index 1a4a5a0d3ba2..45f25c555c9a 100644
--- a/ftp/lftp/Makefile
+++ b/ftp/lftp/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Shell-like command line ftp client
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		charsetfix iconv libtool localbase readline shebangfix
 GNU_CONFIGURE=	yes
@@ -42,7 +42,7 @@ NLS_CONFIGURE_ENABLE=	nls
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USE=	OPENSSL=yes
 GNUTLS_CONFIGURE_WITH=	gnutls
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=	pkgconfig
 
 .include <bsd.port.options.mk>
diff --git a/ftp/ocaml-ocurl/Makefile b/ftp/ocaml-ocurl/Makefile
index 0bb54074b181..6d54a5acbccf 100644
--- a/ftp/ocaml-ocurl/Makefile
+++ b/ftp/ocaml-ocurl/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Interface for OCaml to the curl lib
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
+BUILD_DEPENDS=	ocamlc:lang/ocaml \
+		ocamlfind:devel/ocaml-findlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake
 GNU_CONFIGURE=	yes
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	LWT
 OPTIONS_DEFAULT=LWT
 OPTIONS_SUB=	yes
 LWT_DESC=	Include threading support (ocaml-lwt)
-LWT_RUN_DEPENDS=${LOCALBASE}/${OCAML_SITELIBDIR}/lwt/lwt.a:${PORTSDIR}/devel/ocaml-lwt
+LWT_RUN_DEPENDS=${LOCALBASE}/${OCAML_SITELIBDIR}/lwt/lwt.a:devel/ocaml-lwt
 LWT_BUILD_DEPENDS=${LWT_RUN_DEPENDS}
 
 post-install:
diff --git a/ftp/p5-Net-FTP-Common/Makefile b/ftp/p5-Net-FTP-Common/Makefile
index 691e7cb38437..6b55ff955b16 100644
--- a/ftp/p5-Net-FTP-Common/Makefile
+++ b/ftp/p5-Net-FTP-Common/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to provide simplify common usages of Net::FTP
 
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/ftp/p5-Net-FTP-Recursive/Makefile b/ftp/p5-Net-FTP-Recursive/Makefile
index b01c502ce95c..94d190e8dfe2 100644
--- a/ftp/p5-Net-FTP-Recursive/Makefile
+++ b/ftp/p5-Net-FTP-Recursive/Makefile
@@ -10,8 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module to provide recursive FTP client class
 
-BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
-RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	p5-Net>=0:net/p5-Net
+RUN_DEPENDS=	p5-Net>=0:net/p5-Net
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/ftp/p5-Net-FTPSSL/Makefile b/ftp/p5-Net-FTPSSL/Makefile
index 8c4ae48e12f6..c07b7536dd11 100644
--- a/ftp/p5-Net-FTPSSL/Makefile
+++ b/ftp/p5-Net-FTPSSL/Makefile
@@ -13,8 +13,8 @@ COMMENT=	FTP over SSL/TLS class
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.26:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.26:security/p5-IO-Socket-SSL \
+		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index da0d63686308..979297fcd5fd 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Full-featured, secure, extensible, and configurable Perl FTP server
 
-RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM \
-		p5-BSD-Resource>=0:${PORTSDIR}/devel/p5-BSD-Resource \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		p5-File-Sync>=0:${PORTSDIR}/devel/p5-File-Sync \
-		p5-IO-stringy>=1.126:${PORTSDIR}/devel/p5-IO-stringy
+RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Authen-PAM>=0:security/p5-Authen-PAM \
+		p5-BSD-Resource>=0:devel/p5-BSD-Resource \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-File-Sync>=0:devel/p5-File-Sync \
+		p5-IO-stringy>=1.126:devel/p5-IO-stringy
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 MAKE_ENV+=	NOCONF=1
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 4e5d9bd86c4e..864b3813bbec 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implements an FTP client POE Component
 
-BUILD_DEPENDS=	p5-POE>=0:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/ftp/p5-SOAP-Transport-FTP/Makefile b/ftp/p5-SOAP-Transport-FTP/Makefile
index 44673dab88c5..57e996568dbf 100644
--- a/ftp/p5-SOAP-Transport-FTP/Makefile
+++ b/ftp/p5-SOAP-Transport-FTP/Makefile
@@ -13,7 +13,7 @@ COMMENT=	FTP Client support for SOAP::Lite
 
 LICENSE=	ART10
 
-BUILD_DEPENDS=	p5-SOAP-Lite>=0.711:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	p5-SOAP-Lite>=0.711:net/p5-SOAP-Lite
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index 821608cb8c95..f7de08d99765 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Parallel ftp-fetching program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker
+BUILD_DEPENDS=	p5-Class-MethodMaker>=0:devel/p5-Class-MethodMaker
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+		p5-URI>=0:net/p5-URI \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index daafa550a49e..9ce7a348a55b 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -34,7 +34,7 @@ GTK2_USE=		GNOME=gtk20
 DANTE_CONFIGURE_ENABLE=	socks
 DANTE_CONFIGURE_ON=	--with-socks-includes=${LOCALBASE}/include \
 			--with-socks-libraries=${LOCALBASE}/lib
-DANTE_LIB_DEPENDS=	libsocks.so:${PORTSDIR}/net/dante
+DANTE_LIB_DEPENDS=	libsocks.so:net/dante
 
 pre-patch:
 	@${FIND}  ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/ftp/proftpd-mod_geoip/Makefile b/ftp/proftpd-mod_geoip/Makefile
index c721531d9fd1..6fe8339830e7 100644
--- a/ftp/proftpd-mod_geoip/Makefile
+++ b/ftp/proftpd-mod_geoip/Makefile
@@ -10,7 +10,7 @@ COMMENT=	GeoIP ProFTPD module
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
 DESCR=		${.CURDIR}/pkg-descr
 
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index c89ff7be2cf4..d150d4300952 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -22,8 +22,8 @@ LICENSE?=	GPLv2
 LICENSE_FILE?=	${WRKSRC}/COPYING
 
 .if defined(_BUILDING_PROFTPD_MODULE)
-BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
-RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd
+BUILD_DEPENDS+=	${LOCALBASE}/sbin/proftpd:ftp/proftpd
+RUN_DEPENDS+=	${LOCALBASE}/sbin/proftpd:ftp/proftpd
 .endif
 
 PROFTPD_VERSION=	1.3.5a
@@ -157,7 +157,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
@@ -166,7 +166,7 @@ CONFIGURE_ARGS+=	--disable-pcre
 .if ${PORT_OPTIONS:MMEMCACHE}
 MODULES+=		mod_memcache \
 			mod_tls_memcache
-LIB_DEPENDS+=		libmemcached.so:${PORTSDIR}/databases/libmemcached
+LIB_DEPENDS+=		libmemcached.so:databases/libmemcached
 CONFIGURE_ARGS+=	--enable-memcache
 LIBS+=			-L${LOCALBASE}/lib -lmemcached -lmemcachedutil
 PLIST_SUB+=	MEMCACHE=""
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index 2ab2fa8fdf73..c2d01e32c0d3 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION:S/p/-pre/}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FXP (server-to-server FTP) client
 
-RUN_DEPENDS=	p5-SOCKS>=0:${PORTSDIR}/net/p5-Socks \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:${PORTSDIR}/devel/p5-ReadLine-Perl
+RUN_DEPENDS=	p5-SOCKS>=0:net/p5-Socks \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index a56cf46c1acd..62292ff116eb 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -77,7 +77,7 @@ PERUSERLIMITS_CONFIGURE_WITH=	peruserlimits
 PGSQL_CONFIGURE_WITH=	pgsql
 PGSQL_USES=		pgsql
 PRIVSEP_CONFIGURE_WITH=	privsep
-SCRYPT_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
+SCRYPT_LIB_DEPENDS=	libsodium.so:security/libsodium
 SENDFILE_CONFIGURE_WITH=sendfile
 THROTTLING_CONFIGURE_WITH=	throttling
 TLS_CONFIGURE_WITH=	tls
diff --git a/ftp/py-pycurl/Makefile b/ftp/py-pycurl/Makefile
index a70274d4b5a4..406133e21347 100644
--- a/ftp/py-pycurl/Makefile
+++ b/ftp/py-pycurl/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Python interface to libcurl
 LICENSE=	LGPL21 MIT
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_PYTHON=	autoplist concurrent distutils
 USES=		python
diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile
index 135e6a2a3b5d..a900da7ac3e3 100644
--- a/ftp/py-pyftpdlib/Makefile
+++ b/ftp/py-pyftpdlib/Makefile
@@ -21,8 +21,8 @@ OPTIONS_DEFAULT=	SENDFILE OPENSSL
 SENDFILE_DESC=		Enable sendfile(2) support
 OPENSSL_DESC=		Enable FTP over SSL/TLS (RFC4217)
 
-SENDFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysendfile>0:${PORTSDIR}/net/py-pysendfile
-OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl
+SENDFILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile
+OPENSSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
diff --git a/ftp/rubygem-curb/Makefile b/ftp/rubygem-curb/Makefile
index 9ccead1c15c0..fb18bef6f47f 100644
--- a/ftp/rubygem-curb/Makefile
+++ b/ftp/rubygem-curb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby bindings for libcurl
 LICENSE=	RUBY
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index 0db32c4b11be..9a6455986d38 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Simple, secure, efficient FTP server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bg-installer:${PORTSDIR}/devel/bglibs
-LIB_DEPENDS=	libcvm-v2client.so:${PORTSDIR}/security/cvm
+BUILD_DEPENDS=	${LOCALBASE}/bin/bg-installer:devel/bglibs
+LIB_DEPENDS=	libcvm-v2client.so:security/cvm
 
 USES=		localbase
 
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index d2a705a39501..b93dc7141d7a 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/urlget/Urlgfe%20%28legacy%29/${PORTVERSION}
 MAINTAINER=	chip-set@mail.ru
 COMMENT=	Download manager
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		dos2unix libtool pkgconfig
diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
index 3edd1258b4cb..b914e01312c9 100644
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@@ -42,7 +42,7 @@ CONFLICTS=	vsftpd-3* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-3*
 .if exists(/usr/bin/clang)
 CC=		clang
 .else
-BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
+BUILD_DEPENDS+=	clang33:lang/clang33
 CC=		clang33
 .endif
 .endif
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 79daa47dafa4..6a59f31f38bf 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -34,11 +34,11 @@ NLS_CPPFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 IDN_USES=		iconv
-IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
+IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_CONFIGURE_ENABLE=	iri
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
 
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CPPFLAGS=		-I${LOCALBASE}/include
 PCRE_LDFLAGS=		-L${LOCALBASE}/lib
 PCRE_CONFIGURE_ENV_OFF=	ac_cv_header_pcre_h=no
@@ -52,7 +52,7 @@ CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 .elif ${PORT_OPTIONS:MGNUTLS}
 USES+=		pkgconfig
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/ftp/wmget/Makefile b/ftp/wmget/Makefile
index f651de8c0fc8..1a5318182148 100644
--- a/ftp/wmget/Makefile
+++ b/ftp/wmget/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Dock app for Window Maker providing wget functionality
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_XORG=	x11 xpm
 USES=		gmake
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index 1ac2bfcad0c8..f1aa1d92ea95 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	TLS NLS DOCS EXAMPLES
 OPTIONS_DEFAULT=TLS
 OPTIONS_SUB=	yes
 
-TLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+TLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 TLS_CONFIGURE_WITH=	ssl
 NLS_USES=		gettext iconv
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index e0c3ce743971..dd938426da7f 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -44,7 +44,7 @@ OPENSSL_CONFIGURE_ENABLE=	openssl
 OPENSSL_USE=		OPENSSL=yes
 
 GNUTLS_CONFIGURE_ENABLE=	gnutls
-GNUTLS_LIB_DEPENDS=		libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
@@ -62,12 +62,12 @@ SQLITE_CONFIGURE_ENABLE=	sqlite3
 SQLITE_USE=			SQLITE=3
 
 AVAHI_CONFIGURE_ON=	--with-zeroconf --enable-avahi
-AVAHI_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-			libavahi-core.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+			libavahi-core.so:net/avahi-app
 
 HOWL_CONFIGURE_ON=	--with-zeroconf --enable-howl
 HOWL_CPPFLAGS=		-I${LOCALBASE}/include/howl
-HOWL_LIB_DEPENDS=	libhowl.so:${PORTSDIR}/net/howl
+HOWL_LIB_DEPENDS=	libhowl.so:net/howl
 
 .include <bsd.port.options.mk>
 
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 07522d5eee37..6fd832c30635 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -39,7 +39,7 @@ NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/yafc.mo \
 READLINE_USES=		readline
 READLINE_CONFIGURE_WITH=readline
 
-SSH_LIB_DEPENDS=	libssh.so:${PORTSDIR}/security/libssh
+SSH_LIB_DEPENDS=	libssh.so:security/libssh
 SSH_CONFIGURE_OFF=	--without-ssh
 
 BASH_CONFIGURE_ON=	--with-bash-completion=yes