Remove ${PORTSDIR}/ from dependencies, categories h, i, j, k, and l.

With hat: portmgr Sponsored by: Absolight
author: mat <mat@FreeBSD.org> 2016-04-01 14:08:37 +0000
committer: mat <mat@FreeBSD.org> 2016-04-01 14:08:37 +0000
commit: 0e1e582c065e8fdcb4c8070ec1b22a3d70aa3a7c (patch)
tree: 23607acdfffe977946d3c7bb877bab60e64640e7 /lang
parent: 148314483d3098c0d6a33944f1190842e671502f (diff)
download: FreeBSD-ports-0e1e582c065e8fdcb4c8070ec1b22a3d70aa3a7c.zip
FreeBSD-ports-0e1e582c065e8fdcb4c8070ec1b22a3d70aa3a7c.tar.gz
190 files changed, 642 insertions, 642 deletions
diff --git a/lang/adacontrol/Makefile b/lang/adacontrol/Makefile
index 0e25d32..c00fc7f 100644
--- a/lang/adacontrol/Makefile
+++ b/lang/adacontrol/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Tool for detecting use or non-use of specific Ada constructs
 LICENSE=	GPLv2 GMGPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	asis>=2013:${PORTSDIR}/lang/asis
+BUILD_DEPENDS=	asis>=2013:lang/asis
 
 USES=		ada tar:tgz
 WRKSRC=		${WRKDIR}/adactl-${PORTVERSION}
diff --git a/lang/alchemist.el/Makefile b/lang/alchemist.el/Makefile
index 8d0f083..e6e8913 100644
--- a/lang/alchemist.el/Makefile
+++ b/lang/alchemist.el/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Elixir Tooling Integration Into Emacs
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	elixir-mode.el>=0:${PORTSDIR}/lang/elixir-mode.el
+RUN_DEPENDS=	elixir-mode.el>=0:lang/elixir-mode.el
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonini
diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index eea1b84..3b2549e 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	http://jmvdveer.home.xs4all.nl/
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Algol 68 Genie compiler
 
-LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS=	libgsl.so:math/gsl
 
 OPTIONS_DEFINE=	PLOTUTILS PGSQL
 OPTIONS_DEFAULT=PLOTUTILS PGSQL
 
 PLOTUTILS_DESC=		Plotting support via plotutils
-PLOTUTILS_LIB_DEPENDS=	libplot.so:${PORTSDIR}/graphics/plotutils
+PLOTUTILS_LIB_DEPENDS=	libplot.so:graphics/plotutils
 PLOTUTILS_CONFIGURE_ENABLE=plotutils
 
 PGSQL_USES=		pgsql
diff --git a/lang/arena/Makefile b/lang/arena/Makefile
index 374a23d..2c9814a 100644
--- a/lang/arena/Makefile
+++ b/lang/arena/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C-like scripting language with automatic memory management
 GNU_CONFIGURE=	yes
 
 .if defined(WITH_PCRE)
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 CONFIGURE_ARGS+=	--enable-pcre
 .endif
 
diff --git a/lang/asis/Makefile b/lang/asis/Makefile
index 79800dd..9e16629 100644
--- a/lang/asis/Makefile
+++ b/lang/asis/Makefile
@@ -12,10 +12,10 @@ COMMENT=	GNAT implementation of Ada Semantic Interface Specification
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gprbuild>=20130416:${PORTSDIR}/devel/gprbuild \
-		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
-		${GUSTATIC}:${PORTSDIR}/lang/gnat_util
-RUN_DEPENDS=	${GUSTATIC}:${PORTSDIR}/lang/gnat_util
+BUILD_DEPENDS=	gprbuild>=20130416:devel/gprbuild \
+		xmlada>=3.2:textproc/xmlada \
+		${GUSTATIC}:lang/gnat_util
+RUN_DEPENDS=	${GUSTATIC}:lang/gnat_util
 
 USES=		ada gmake
 NO_MTREE=	yes
diff --git a/lang/ats/Makefile b/lang/ats/Makefile
index a31b724..d98d8b3 100644
--- a/lang/ats/Makefile
+++ b/lang/ats/Makefile
@@ -23,8 +23,8 @@ PORTEXAMPLES=	AUP INTRO KernighanRitchie MISC MULTICORE TEST
 
 OPTIONS_DEFINE=	GMP PCRE DOCS EXAMPLES
 OPTIONS_DEFAULT=	GMP PCRE
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk
index afb64d0..78bb435 100644
--- a/lang/ats/bsd.ats.mk
+++ b/lang/ats/bsd.ats.mk
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	${ATS_CTRBPREFIX}
 ATS_CTRBPREFIX=	ats-contrib-
 ATS_CTRBEXAMPLEDIR=	${PREFIX}/share/examples/${ATS_CTRBPREFIX}${PORTNAME}
 
-FETCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/lang/ats:patch
-BUILD_DEPENDS+=	${LOCALBASE}/bin/atscc:${PORTSDIR}/lang/ats
+FETCH_DEPENDS+=	${NONEXISTENT}:lang/ats:patch
+BUILD_DEPENDS+=	${LOCALBASE}/bin/atscc:lang/ats
 
 USES=		gmake
 MAKE_ENV+=	ATSHOME=${ATS_LIBDIR} ATSHOMERELOC=ATS-${ATS_VER}
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index 3dc8b89..4875590 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Easy to use BASIC language and IDE for education
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	espeak:${PORTSDIR}/audio/espeak \
-		sqlite3:${PORTSDIR}/databases/sqlite3 \
-		flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	espeak:audio/espeak \
+		sqlite3:databases/sqlite3 \
+		flex:textproc/flex
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile
index 1c91e0a..71c0474 100644
--- a/lang/beignet/Makefile
+++ b/lang/beignet/Makefile
@@ -10,11 +10,11 @@ DISTVERSIONSUFFIX=	-source
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenCL library for Intel GPUs
 
-BUILD_DEPENDS=	clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER} \
-		opencl>=0:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd \
-		libdrm.so:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	clang${LLVMVER}:lang/clang${LLVMVER} \
+		opencl>=0:devel/opencl
+LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \
+		libdrm.so:graphics/libdrm
+RUN_DEPENDS=	opencl>=0:devel/opencl
 
 WRKSRC=		${WRKDIR}/Beignet-${PORTVERSION}-Source
 
diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 2c31b94..51486ac 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Scheme interpreter and native code compiler
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgmp.so:math/gmp
 
 USES=		compiler:c++0x gmake
 USE_EMACS=	yes
@@ -48,21 +48,21 @@ OPTIONS_DEFINE=		ALSA AVAHI CUSTOMGC DOCS FLAC GSTREAMER MPG123 \
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-alsa --disable-wav
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_OFF=	--disable-avahi
 CUSTOMGC_DESC=		Build with custom garbage collector
 CUSTOMGC_LIB_DEPENDS_OFF=\
-			libgc.so:${PORTSDIR}/devel/boehm-gc
+			libgc.so:devel/boehm-gc
 CUSTOMGC_CONFIGURE_OFF=	--customgc=no \
 			--gcincdir=${LOCALBASE}/include \
 			--gclibdir=${LOCALBASE}/lib
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_OFF=	--disable-flac
 GSTREAMER_USE=		GSTREAMER=yes
 GSTREAMER_CONFIGURE_OFF=--disable-gstreamer
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CONFIGURE_OFF=	--disable-mpg123
 OPENSSL_USE=		OPENSSL=yes
 OPENSSL_CONFIGURE_OFF=	--disable-ssl
diff --git a/lang/c/Makefile b/lang/c/Makefile
index 33f88e6..05bf7f4 100644
--- a/lang/c/Makefile
+++ b/lang/c/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tool to compile and run C programs like a shell script
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ryanmjacobs
diff --git a/lang/cdent/Makefile b/lang/cdent/Makefile
index aa96272..bbc7595 100644
--- a/lang/cdent/Makefile
+++ b/lang/cdent/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Portable Module Programming Language
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index d52ddba..8899506 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://root.cern.ch/drupal/sites/default/files/
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	C/C++ interpreter
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 EXTRACT_SUFX=	.tgz
 HAS_CONFIGURE=	yes
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index 136471f..c31c7f1 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -9,9 +9,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	JavaScript bindings based on gobject-introspection
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libmozjs-24.so:lang/spidermonkey24
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 8e8b845..9b1a35a 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm-devel
+RUN_DEPENDS+=	clang${LLVM_SUFFIX}:devel/llvm-devel
 
 LLVM_SUFFIX=	-devel
 
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index fda254a..28e0ba0 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -22,8 +22,8 @@ WRKSRC=		${WRKDIR}/${LLVM_NAME}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
-RUN_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	${PORTVERSION:S/.//g}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
diff --git a/lang/clang34/Makefile b/lang/clang34/Makefile
index 8d87d01..b2057e8 100644
--- a/lang/clang34/Makefile
+++ b/lang/clang34/Makefile
@@ -25,8 +25,8 @@ WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
-RUN_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
diff --git a/lang/clang35/Makefile b/lang/clang35/Makefile
index 1a0aab2..c1ad8e3 100644
--- a/lang/clang35/Makefile
+++ b/lang/clang35/Makefile
@@ -25,8 +25,8 @@ WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
-RUN_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
diff --git a/lang/clang36/Makefile b/lang/clang36/Makefile
index b31d5d6..bbebaca 100644
--- a/lang/clang36/Makefile
+++ b/lang/clang36/Makefile
@@ -25,8 +25,8 @@ WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
-RUN_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	llc${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
 LLVM_RELEASE=	${PORTVERSION:C/([0-9]\.[0-9].[0-9]).*/\1/}
diff --git a/lang/clang37/Makefile b/lang/clang37/Makefile
index cf77458..8ee3252 100644
--- a/lang/clang37/Makefile
+++ b/lang/clang37/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	${PREFIX}/bin/clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	${PREFIX}/bin/clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	37
 
diff --git a/lang/clang38/Makefile b/lang/clang38/Makefile
index 0839d25..4a62da8 100644
--- a/lang/clang38/Makefile
+++ b/lang/clang38/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler (use devel/llvm${LLVM_SUFFIX})
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	38
 
diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile
index 1c4d12e..95fee8d 100644
--- a/lang/clojure/Makefile
+++ b/lang/clojure/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/clojure \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJLINE}
-RUN_DEPENDS+=	jline>=0.9.91:${PORTSDIR}/devel/jline
+RUN_DEPENDS+=	jline>=0.9.91:devel/jline
 CLOJURE_JLINE_RUNNER=jline.ConsoleRunner
 .endif
 
diff --git a/lang/clover/Makefile b/lang/clover/Makefile
index c3ac882..eb95e79 100644
--- a/lang/clover/Makefile
+++ b/lang/clover/Makefile
@@ -7,11 +7,11 @@ CATEGORIES=	lang
 
 COMMENT=	Mesa "Clover" OpenCL library
 
-BUILD_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
-LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libOpenCL.so:${PORTSDIR}/devel/ocl-icd \
-		libexpat.so:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS=	opencl>=0:${PORTSDIR}/devel/opencl
+BUILD_DEPENDS=	opencl>=0:devel/opencl
+LIB_DEPENDS=	libdrm.so:graphics/libdrm \
+		libOpenCL.so:devel/ocl-icd \
+		libexpat.so:textproc/expat2
+RUN_DEPENDS=	opencl>=0:devel/opencl
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
 		presentproto xvmc xshmfence
diff --git a/lang/cmucl-extra/Makefile b/lang/cmucl-extra/Makefile
index 81d3d41..6d27cd0 100644
--- a/lang/cmucl-extra/Makefile
+++ b/lang/cmucl-extra/Makefile
@@ -15,8 +15,8 @@ DISTNAME=	cmucl-${PORTVERSION}-x86-FreeBSD.extra
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Optional extras for the CMU implementation of Common Lisp
 
-BUILD_DEPENDS=	lisp:${PORTSDIR}/lang/cmucl
-RUN_DEPENDS=	lisp:${PORTSDIR}/lang/cmucl
+BUILD_DEPENDS=	lisp:lang/cmucl
+RUN_DEPENDS=	lisp:lang/cmucl
 
 USES=		tar:bzip2
 NO_WRKSUBDIR=	yes
diff --git a/lang/cmucl/Makefile b/lang/cmucl/Makefile
index 1b9ed98..eb37743 100644
--- a/lang/cmucl/Makefile
+++ b/lang/cmucl/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-x86-freebsd_6.3-release
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The CMU implementation of Common Lisp
 
-LIB_DEPENDS=	libc.so.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS=	libc.so.6:misc/compat6x
 
 # To make available on other archs, has to be cross-compiled (there is a
 # script for this, but a configuration file has to be written).
diff --git a/lang/cparser/Makefile b/lang/cparser/Makefile
index db59283..c5ef2fd 100644
--- a/lang/cparser/Makefile
+++ b/lang/cparser/Makefile
@@ -12,7 +12,7 @@ COMMENT=	C99 compiler using libFIRM as backend
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfirm.so:${PORTSDIR}/devel/libfirm
+LIB_DEPENDS=	libfirm.so:devel/libfirm
 
 USES=		gmake pkgconfig tar:bzip2
 
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index f570fc4..a549efe 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -12,7 +12,7 @@ COMMENT=	ANSI Common Lisp implementation
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		gmake perl5 tar:tgz
@@ -47,15 +47,15 @@ CLX_CONFIGURE_OFF=	--with-clx=no
 SOCKETS_CONFIGURE_ON=	--with-tcp=yes
 SOCKETS_CONFIGURE_OFF=	--with-tcp=no
 
-DFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+DFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 DFFI_CONFIGURE_ON=	--with-dffi=system
 DFFI_CONFIGURE_OFF=	--with-dffi=no
 
 THREADS_CONFIGURE_ON=	--enable-threads=yes
 THREADS_LDFLAGS=	-lpthread
-THREADS_LIB_DEPENDS=	libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
+THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 THREADS_CONFIGURE_OFF=	--enable-threads=no
-THREADS_LIB_DEPENDS_OFF=	libgc.so:${PORTSDIR}/devel/boehm-gc
+THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
 
 post-patch-THREADS-on:
 	@${REINPLACE_CMD} -e 's|-lgc|-lgc-threaded|' ${WRKSRC}/src/configure
diff --git a/lang/elan/Makefile b/lang/elan/Makefile
index 6d0fc8a..d95132b 100644
--- a/lang/elan/Makefile
+++ b/lang/elan/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-1.7
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	Compiler for the Elan Programming Environment
 
-LIB_DEPENDS=	libdcg.so:${PORTSDIR}/devel/mimir
+LIB_DEPENDS=	libdcg.so:devel/mimir
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/lang/elixir/Makefile b/lang/elixir/Makefile
index 124c387..ca9819e 100644
--- a/lang/elixir/Makefile
+++ b/lang/elixir/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Functional, meta-programming aware language built on top of Erlang VM
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	erlang>=18:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erlang>=18:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erlang>=18:lang/erlang
+RUN_DEPENDS=	erlang>=18:lang/erlang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 175ea27..f9b303f 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://sam.zoy.org/elk/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeddable Scheme interpreter
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libelf.so:${PORTSDIR}/devel/libelf
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libelf.so:devel/libelf
 
 USES=		libtool motif tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile
index 394a53f..f39f965 100644
--- a/lang/erlang-java/Makefile
+++ b/lang/erlang-java/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang interface for Java
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index 0ba7bd3..4f520d1 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 0fa50db..8e8da6b 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index 2006a24..ed003fc 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -125,7 +125,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile
index 17562fe..210a4fb 100644
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@@ -121,7 +121,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile
index e8f1140..f719a26 100644
--- a/lang/erlang-wx/Makefile
+++ b/lang/erlang-wx/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Erlang bindings for wxWindows
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${LOCALBASE}/bin/erl:${PORTSDIR}/lang/erlang
+RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 1c945e0..ad41b9a 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -138,7 +138,7 @@ CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
diff --git a/lang/execline/Makefile b/lang/execline/Makefile
index 2e65518..25a1092 100644
--- a/lang/execline/Makefile
+++ b/lang/execline/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Lightweight non-interactive sh(1)-like scripting language
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	skalibs>=2.3.8.3:${PORTSDIR}/devel/skalibs
+BUILD_DEPENDS=	skalibs>=2.3.8.3:devel/skalibs
 
 CONFLICTS_INSTALL=	ImageMagick-* # bin/import
 
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 35ffc07..3b103a3 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Fortran-to-C converter and its run-time libraries
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 GUNZIP_CMD=	minigzip -d
 USES=		gmake
diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile
index 391c0a8..50ec3df 100644
--- a/lang/ferite/Makefile
+++ b/lang/ferite/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Embeddable scripting language
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libxml2.so:textproc/libxml2
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 096f54e..48a4754 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -16,6 +16,6 @@ WANT_FPC_BASE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:${PORTSDIR}/lang/fpc-docs
+DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/fpdocs-${PORTVERSION}/user.pdf:lang/fpc-docs
 
 .include <bsd.port.mk>
diff --git a/lang/fpc-lua/Makefile b/lang/fpc-lua/Makefile
index 0253263..d4ca02c 100644
--- a/lang/fpc-lua/Makefile
+++ b/lang/fpc-lua/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LUA
 LUA_DESC=	Install lua library
 OPTIONS_DEFAULT=	LUA
 
-LUA_LIB_DEPENDS=	liblua-5.1.so:${PORTSDIR}/lang/lua51
+LUA_LIB_DEPENDS=	liblua-5.1.so:lang/lua51
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/fpc-rexx/Makefile b/lang/fpc-rexx/Makefile
index eb1b49c..d5969b0 100644
--- a/lang/fpc-rexx/Makefile
+++ b/lang/fpc-rexx/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	REXX_REGINA
 REXX_REGINA_DESC=	Install rexx-regina library
 OPTIONS_DEFAULT=	REXX_REGINA
 
-REXX_REGINA_RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
+REXX_REGINA_RUN_DEPENDS=	rexx:lang/rexx-regina
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index daf625d..0ef8035 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Functional and object-oriented language for the .NET platform
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	mono>=3.0:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	mono>=3.0:${PORTSDIR}/lang/mono
+BUILD_DEPENDS=	mono>=3.0:lang/mono
+RUN_DEPENDS=	mono>=3.0:lang/mono
 
 USE_GITHUB=	yes
 
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 1730bf6..53319a1 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -39,10 +39,10 @@ OPTIONS_SUB=		yes
 
 EUCJP_DESC=		EUC-JP encoding support
 EUCJP_CONFIGURE_ON=	--enable-multibyte=euc-jp
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_ON=	--with-local=${LOCALBASE}
 SLIB_DESC=		Create catalogue for SLIB port
-SLIB_BUILD_DEPENDS=	slib>0:${PORTSDIR}/lang/slib
+SLIB_BUILD_DEPENDS=	slib>0:lang/slib
 SLIB_CONFIGURE_ON=	--with-slib=${LOCALBASE}/share/slib
 SLIB_CONFIGURE_OFF=	--with-slib=${WRKDIR}
 SJIS_DESC=		Shift_JIS encoding support
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 5d31212..ebced54 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -10,14 +10,14 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU version of Awk
 
-LIB_DEPENDS=	libsigsegv.so:${PORTSDIR}/devel/libsigsegv
+LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
 
 OPTIONS_DEFINE=		NLS MPFR
 OPTIONS_SUB=		yes
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 MPFR_DESC?=		Support multiple-precision floating-point computation
-MPFR_LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
+MPFR_LIB_DEPENDS=	libmpfr.so:math/mpfr
 MPFR_CONFIGURE_OFF=	--without-gmp --without-mpfr
 
 INFO=		gawk gawkinet
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index 0b3e2c4..c831b71 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -60,7 +60,7 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.36A.tar.bz2
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .else
@@ -124,7 +124,7 @@ LANGS+=		objc
 .endif
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
-BUILD_DEPENDS+=	dejagnu>=1.4:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	dejagnu>=1.4:misc/dejagnu
 APPLY_DIFFS+=	ada-testsuite
 APPLY_DIFFS+=	fortran-testsuite
 APPLY_DIFFS+=	cxx-testsuite
diff --git a/lang/gcc-aux/Makefile.common b/lang/gcc-aux/Makefile.common
index 91843e0..4856ce3 100644
--- a/lang/gcc-aux/Makefile.common
+++ b/lang/gcc-aux/Makefile.common
@@ -2,9 +2,9 @@
 
 .include "Makefile.version"
 
-LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp
-LIB_DEPENDS+=		libmpfr.so:${PORTSDIR}/math/mpfr
-LIB_DEPENDS+=		libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=		libgmp.so:math/gmp
+LIB_DEPENDS+=		libmpfr.so:math/mpfr
+LIB_DEPENDS+=		libmpc.so:math/mpc
 
 ONLY_FOR_ARCHS= 	i386 amd64
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 8454d66..530c058 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -13,14 +13,14 @@ COMMENT=	GNU Compiler Collection 4.8
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CONFLICTS=	gcc48*
@@ -127,9 +127,9 @@ SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index aefa557..adbf058 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -15,14 +15,14 @@ COMMENT=	GNU Compiler Collection 4.6
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CPE_VENDOR=	gnu
@@ -99,9 +99,9 @@ INFO+=		gcc${SUFFIX}/libquadmath
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 7db86ea..5282f2e 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -15,14 +15,14 @@ COMMENT=	GNU Compiler Collection 4.7
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CONFLICTS=	gcc-4.7.*
@@ -108,9 +108,9 @@ SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index a7fd84a..87365ca 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -14,14 +14,14 @@ COMMENT=	GNU Compiler Collection 4.8
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CONFLICTS=	gcc-4.8.*
@@ -118,9 +118,9 @@ SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index f40dbf3..cdc2196 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -13,14 +13,14 @@ COMMENT=	GNU Compiler Collection 4.9
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CPE_VENDOR=	gnu
@@ -134,9 +134,9 @@ SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile
index 5e504be..2dc6edf 100644
--- a/lang/gcc5-aux/Makefile
+++ b/lang/gcc5-aux/Makefile
@@ -62,7 +62,7 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.41.tar.bz2
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .else
@@ -126,7 +126,7 @@ LANGS+=		objc
 .endif
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
-BUILD_DEPENDS+=	dejagnu>=1.4:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	dejagnu>=1.4:misc/dejagnu
 APPLY_DIFFS+=	ada-testsuite
 APPLY_DIFFS+=	cxx-testsuite
 APPLY_DIFFS+=	gcc-testsuite
diff --git a/lang/gcc5-aux/Makefile.common b/lang/gcc5-aux/Makefile.common
index 0c77347..3ace4a6 100644
--- a/lang/gcc5-aux/Makefile.common
+++ b/lang/gcc5-aux/Makefile.common
@@ -2,9 +2,9 @@
 
 .include "Makefile.version"
 
-LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp
-LIB_DEPENDS+=		libmpfr.so:${PORTSDIR}/math/mpfr
-LIB_DEPENDS+=		libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=		libgmp.so:math/gmp
+LIB_DEPENDS+=		libmpfr.so:math/mpfr
+LIB_DEPENDS+=		libmpc.so:math/mpc
 
 ONLY_FOR_ARCHS= 	i386 amd64
 
diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile
index 227ebce..448da07 100644
--- a/lang/gcc5-devel/Makefile
+++ b/lang/gcc5-devel/Makefile
@@ -13,14 +13,14 @@ COMMENT=	GNU Compiler Collection 5
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CPE_VENDOR=	gnu
@@ -129,15 +129,15 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
-LIB_DEPENDS+=	libisl.so:${PORTSDIR}/devel/isl
+LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index b4d4641..4a81cef 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -13,14 +13,14 @@ COMMENT=	GNU Compiler Collection 5
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CPE_VENDOR=	gnu
@@ -128,15 +128,15 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
-LIB_DEPENDS+=	libisl.so:${PORTSDIR}/devel/isl
+LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcc6-aux/Makefile b/lang/gcc6-aux/Makefile
index 2ad433d..ed100a8 100644
--- a/lang/gcc6-aux/Makefile
+++ b/lang/gcc6-aux/Makefile
@@ -62,7 +62,7 @@ BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.dragonfly.41.tar.bz2
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .else
@@ -125,7 +125,7 @@ LANGS+=		objc
 .endif
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
-BUILD_DEPENDS+=	dejagnu>=1.4:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	dejagnu>=1.4:misc/dejagnu
 APPLY_DIFFS+=	ada-testsuite
 APPLY_DIFFS+=	gcc-testsuite
 .endif
diff --git a/lang/gcc6-aux/Makefile.common b/lang/gcc6-aux/Makefile.common
index 64fff29..537da4b 100644
--- a/lang/gcc6-aux/Makefile.common
+++ b/lang/gcc6-aux/Makefile.common
@@ -2,9 +2,9 @@
 
 .include "Makefile.version"
 
-LIB_DEPENDS=		libgmp.so:${PORTSDIR}/math/gmp
-LIB_DEPENDS+=		libmpfr.so:${PORTSDIR}/math/mpfr
-LIB_DEPENDS+=		libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=		libgmp.so:math/gmp
+LIB_DEPENDS+=		libmpfr.so:math/mpfr
+LIB_DEPENDS+=		libmpc.so:math/mpc
 
 ONLY_FOR_ARCHS= 	i386 amd64
 
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index 19a0233..07811b4 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -13,14 +13,14 @@ COMMENT=	GNU Compiler Collection 6
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 
 .if defined(MAINTAINER_MODE)
-BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
+BUILD_DEPENDS+=	runtest:misc/dejagnu
 .endif
 
 CPE_VENDOR=	gnu
@@ -130,15 +130,15 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
 
 .if ${PORT_OPTIONS:MGRAPHITE}
-LIB_DEPENDS+=	libisl.so:${PORTSDIR}/devel/isl
+LIB_DEPENDS+=	libisl.so:devel/isl
 CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
-BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
-		zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 08057ce..9f26833 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GNU Common Lisp
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+BUILD_DEPENDS=	gawk:lang/gawk
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index dc34b7d..c557f98 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	http://www.complang.tuwien.ac.at/forth/gforth/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Fast and portable Forth system
 
-LIB_DEPENDS=	libffi.so.6:${PORTSDIR}/devel/libffi \
-		libltdl.so:${PORTSDIR}/devel/libltdl
-BUILD_DEPENDS=	${LOCALBASE}/include/avcall.h:${PORTSDIR}/devel/ffcall
+LIB_DEPENDS=	libffi.so.6:devel/libffi \
+		libltdl.so:devel/libltdl
+BUILD_DEPENDS=	${LOCALBASE}/include/avcall.h:devel/ffcall
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 66bdf0e..010b281 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -28,7 +28,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/ghc-${GHC_VERSION}
 
 CONFLICTS=	ghc-7.4.* ghc-7.6.* ghc-7.8.*
 
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 
 USE_PERL5=		build
 USES=			autoreconf gmake iconv:translit ncurses perl5 tar:xz
@@ -73,7 +73,7 @@ OPTIONS_DEFINE+=	BOOTH
 
 .if ${PORT_OPTIONS:MDYNAMIC}
 # The version number is needed as lang/gcc installs a different version
-LIB_DEPENDS+=	libffi.so.6:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	libffi.so.6:devel/libffi
 .endif
 
 .if empty(PORT_OPTIONS:MBOOT)
@@ -84,8 +84,8 @@ DISTFILES+=		ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
 .endif # MBOOT
 
 .if ${PORT_OPTIONS:MPCLANG}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
-RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
+RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
 CC=		${LOCALBASE}/bin/clang${LLVM_VERSION}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_VERSION}
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
@@ -132,8 +132,8 @@ CONFIGURE_ARGS+=	--with-system-libffi \
 .endif
 
 .if ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
-RUN_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
+BUILD_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
+RUN_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 
 CONFIGURE_ARGS+=	--with-opt=${LOCALBASE}/bin/opt${LLVM_VERSION} \
 			--with-llc=${LOCALBASE}/bin/llc${LLVM_VERSION}
@@ -194,8 +194,8 @@ CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 
 .endif # MBOOTH
 
-BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=	docbook-xsl>0:textproc/docbook-xsl \
+		${LOCALBASE}/bin/xsltproc:textproc/libxslt
 .endif
 
 post-extract:
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index f177174..41a1914 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -73,19 +73,19 @@ TMPDIR?=	${WRKDIR}/tmp
 .endif
 
 .if !defined(STANDALONE) || ${PORT_OPTIONS:MDYNAMIC}
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+=	ghc:lang/ghc
+BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:lang/ghc
+RUN_DEPENDS+=	ghc:lang/ghc
+RUN_DEPENDS+=	ghc>=${GHC_VERSION}:lang/ghc
 .else
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS+=	ghc:lang/ghc
+BUILD_DEPENDS+=	ghc>=${GHC_VERSION}:lang/ghc
 .endif
 
 
 .if ${PORT_OPTIONS:MPCLANG}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
-RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
+RUN_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_VERSION}:lang/clang${LLVM_VERSION}
 CC=		${LOCALBASE}/bin/clang${LLVM_VERSION}
 CXX=		${LOCALBASE}/bin/clang++${LLVM_VERSION}
 CPP=		${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
@@ -109,26 +109,26 @@ CONFIGURE_ARGS+=	--ghc-option=-fllvm \
 			--ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt${LLVM_VERSION} \
 			--ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc${LLVM_VERSION}
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
+BUILD_DEPENDS+=		${LOCALBASE}/bin/opt${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 .endif
 
 .if defined(USE_ALEX)
-BUILD_DEPENDS+=	${ALEX_CMD}:${PORTSDIR}/devel/hs-alex
+BUILD_DEPENDS+=	${ALEX_CMD}:devel/hs-alex
 CONFIGURE_ARGS+=	 --with-alex=${ALEX_CMD}
 .endif
 
 .if defined(USE_HAPPY)
-BUILD_DEPENDS+=	${HAPPY_CMD}:${PORTSDIR}/devel/hs-happy
+BUILD_DEPENDS+=	${HAPPY_CMD}:devel/hs-happy
 CONFIGURE_ARGS+=	 --with-happy=${HAPPY_CMD}
 .endif
 
 .if defined(USE_C2HS)
-BUILD_DEPENDS+=	${C2HS_CMD}:${PORTSDIR}/devel/hs-c2hs
+BUILD_DEPENDS+=	${C2HS_CMD}:devel/hs-c2hs
 CONFIGURE_ARGS+=	--with-c2hs=${C2HS_CMD}
 .endif
 
 .if defined(EXECUTABLE)
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 USES+=		iconv
 
 CONFIGURE_ARGS+=	--enable-executable-stripping
@@ -153,7 +153,7 @@ __u_h_r_version:=	${cabal_package:C/^[^<=>]*//g}
 .endif
 
 dependencies:=	${dependencies} \
-${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${PORTSDIR}/${__u_h_r_port}
+${HSPREFIX}${__u_h_r_package}${__u_h_r_version}:${__u_h_r_port}
 .endfor
 
 BUILD_DEPENDS+=	${dependencies}
@@ -171,7 +171,7 @@ RUN_DEPENDS+=	${dependencies}
 HADDOCK_OPTS=	# empty
 
 .if ${PORT_OPTIONS:MHSCOLOUR}
-BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+BUILD_DEPENDS+=	HsColour:print/hs-hscolour
 
 HSCOLOUR_DATADIR=	${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION}
 HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
@@ -181,8 +181,8 @@ HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.c
 .endif
 
 .if defined(XMLDOCS)
-BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS+=	docbook-xsl>0:textproc/docbook-xsl \
+		${LOCALBASE}/bin/xsltproc:textproc/libxslt
 
 USES+=		gmake
 
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 406c390..6fa5940 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Javascript binding
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libmozjs-24.so:lang/spidermonkey24
 
 USES=		compiler:c++11-lib gettext gmake gnome libtool \
 		pathfix pkgconfig python:build tar:xz
diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index 6b31aaf..5ce7328 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -15,8 +15,8 @@ COMMENT?=	C/Ada cross-compiler, target: Android ARMv7
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${SYSROOT}>=19:${PORTSDIR}/lang/${SYSROOT} \
-		${GDBINUTILS}>=2.21:${PORTSDIR}/lang/${GDBINUTILS}
+BUILD_DEPENDS=	${SYSROOT}>=19:lang/${SYSROOT} \
+		${GDBINUTILS}>=2.21:lang/${GDBINUTILS}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_LICENSES_INSTALL= yes
diff --git a/lang/gnatdroid-binutils/Makefile b/lang/gnatdroid-binutils/Makefile
index 50bbe69..f38ff0e 100644
--- a/lang/gnatdroid-binutils/Makefile
+++ b/lang/gnatdroid-binutils/Makefile
@@ -13,9 +13,9 @@ COMMENT?=	Infrastructure for C/Ada Android cross-compiler (ARMv7)
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${SYSROOT}>=19:${PORTSDIR}/lang/${SYSROOT} \
-		${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \
-		${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr
+BUILD_DEPENDS=	${SYSROOT}>=19:lang/${SYSROOT} \
+		${LOCALBASE}/lib/libgmp.so:math/gmp \
+		${LOCALBASE}/lib/libmpfr.so:math/mpfr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake tar:bzip2
diff --git a/lang/gnu-cobol/Makefile b/lang/gnu-cobol/Makefile
index 1f46f09..03b7848 100644
--- a/lang/gnu-cobol/Makefile
+++ b/lang/gnu-cobol/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNU/gnucobol
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Open-source COBOL compiler
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USE_BDB=	yes
 USES=		gmake libtool ncurses
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index bcf3054..2527e27 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -13,13 +13,13 @@ COMMENT=	GNUstep Foundation library
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
-LIB_DEPENDS+=	libxml2.so:${PORTSDIR}/textproc/libxml2
-LIB_DEPENDS+=	libxslt.so:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
-LIB_DEPENDS+=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	libffi.so:devel/libffi
+LIB_DEPENDS+=	libxml2.so:textproc/libxml2
+LIB_DEPENDS+=	libxslt.so:textproc/libxslt
+LIB_DEPENDS+=	libgmp.so:math/gmp
+LIB_DEPENDS+=	libgcrypt.so:security/libgcrypt
 
-RUN_DEPENDS+=	${LOCALBASE}/GNUstep/System/Library/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make
+RUN_DEPENDS+=	${LOCALBASE}/GNUstep/System/Library/Makefiles/GNUstep.sh:devel/gnustep-make
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-procfs --disable-mixedabi
@@ -46,10 +46,10 @@ ZEROCONF_DESC=		Zeroconf (Bonjour) support
 AVAHI_DESC=		Zeroconf via Avahi (preferred)
 MDNS_DESC=		Zeroconf via mDNSResponder
 
-ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CONFIGURE_OFF=	--disable-icu
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=tls
 
 OPENSSL_USE=		OPENSSL=yes
@@ -59,10 +59,10 @@ OPENSSL_CONFIGURE_OFF=	--disable-openssl
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--with-zeroconf-api=avahi
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
 .elif ${PORT_OPTIONS:MMDNS}
 CONFIGURE_ARGS+=	--with-zeroconf-api=mdns
-LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
 .else
 CONFIGURE_ARGS+=	--disable-zeroconf
 .endif
diff --git a/lang/go/Makefile b/lang/go/Makefile
index d6eef45..a408b15 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Go programming language
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	go14>=1.4:${PORTSDIR}/lang/go14
+BUILD_DEPENDS=	go14>=1.4:lang/go14
 
 USES=		shebangfix
 SHEBANG_LANG=	sh
diff --git a/lang/go/files/bsd.go.mk b/lang/go/files/bsd.go.mk
index 03302c7..384225e 100644
--- a/lang/go/files/bsd.go.mk
+++ b/lang/go/files/bsd.go.mk
@@ -41,7 +41,7 @@ GO_WRKDIR_BIN=	${WRKDIR}/bin
 GO_WRKDIR_SRC=	${WRKDIR}/src
 GO_WRKDIR_PKG=	${WRKDIR}/pkg/${OPSYS:tl}_${GOARCH}
 
-BUILD_DEPENDS+=	${GO_CMD}:${PORTSDIR}/lang/go
+BUILD_DEPENDS+=	${GO_CMD}:lang/go
 GO_ENV+=	GOPATH="${WRKDIR}:${LOCAL_GOPATH}" \
 		CGO_CFLAGS="${CGO_CFLAGS}" \
 		CGO_LDFLAGS="${CGO_LDFLAGS}" \
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index fda6e34..503da58 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libgmp.so:math/gmp
 
 CONFLICTS_INSTALL=	guile2-[0-9]*
 
diff --git a/lang/guile2/Makefile b/lang/guile2/Makefile
index 517f550..82cf829 100644
--- a/lang/guile2/Makefile
+++ b/lang/guile2/Makefile
@@ -13,10 +13,10 @@ COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libunistring.so:${PORTSDIR}/devel/libunistring \
-		libffi.so.6:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libltdl.so:devel/libltdl \
+		libunistring.so:devel/libunistring \
+		libffi.so.6:devel/libffi
 
 CONFLICTS_INSTALL=	guile-[0-9]*
 
@@ -37,8 +37,8 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 THREADS_CONFIGURE_WITH=	threads
-THREADS_LIB_DEPENDS=	libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
-THREADS_LIB_DEPENDS_OFF=	libgc.so:${PORTSDIR}/devel/boehm-gc
+THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
+THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
 
 REINPLACE_FILES=	libguile/smob.c libguile/filesys.c libguile/gc.c \
 			libguile/mallocs.c libguile/eval.c libguile/gc-malloc.c \
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index cc58a00..5e59b3a 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}-project/source/${PORTVERSION}
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Open source Clipper-compatible compiler
 
-LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2\
-		libpcre.so:${PORTSDIR}/devel/pcre
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libslang.so:devel/libslang2\
+		libpcre.so:devel/pcre
+BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	MYSQL SQLITE FIREBIRD PGSQL DOCS
@@ -104,7 +104,7 @@ MAKE_ENV+=	HB_WITH_FIREBIRD=no
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 MAKE_ENV+=	HB_WITH_SQLITE3=nolocal
 PLIST_SUB+=	SQLITE=""
 .else
diff --git a/lang/hope/Makefile b/lang/hope/Makefile
index 8074f88..34169eb 100644
--- a/lang/hope/Makefile
+++ b/lang/hope/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=	DOCS
 
 DOCS_USE=		TEX=latex:build
-DOCS_BUILD_DEPENDS=	latex2html:${PORTSDIR}/textproc/latex2html
+DOCS_BUILD_DEPENDS=	latex2html:textproc/latex2html
 DOCS_MAKE_ARGS=		WITH_DOCS=yes
 
 .include <bsd.port.mk>
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 19d9ee0..e04ad9a 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-plus-${HUGS_DATE}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Interpreter for the functional programming language Haskell 98
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index 37f2147..d1caabf 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Intels C/C++ compiler, set up to produce native FreeBSD binaries
 LICENSE=	EPL LGPL21
 LICENSE_COMB=	multi
 
-EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+EXTRACT_DEPENDS=	rpm2cpio.pl:archivers/rpm2cpio
 
 RESTRICTED=	Intel forbids any redistribution.
 
diff --git a/lang/io/Makefile.addons b/lang/io/Makefile.addons
index 46038a7..85acc3f 100644
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@@ -70,41 +70,41 @@ OPTIONAL_ADDONS=BigNum \
 
 OPTIONS_GROUP_ADDONS=${OPTIONAL_ADDONS}
 
-BigNum_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-CFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
-Clutter_LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
-DBI_LIB_DEPENDS=	libdbi.so:${PORTSDIR}/databases/libdbi
+BigNum_LIB_DEPENDS=	libgmp.so:math/gmp
+CFFI_LIB_DEPENDS=	libffi.so:devel/libffi
+Clutter_LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter
+DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 EditLine_USES=		libedit
-Font_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+Font_LIB_DEPENDS=	libfreetype.so:print/freetype2
 Font_USE=		GL=glut XORG=xmu
-GLFW_LIB_DEPENDS=	libglfw.so.0:${PORTSDIR}/graphics/glfw2
-Image_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-			libtiff.so:${PORTSDIR}/graphics/tiff
+GLFW_LIB_DEPENDS=	libglfw.so.0:graphics/glfw2
+Image_LIB_DEPENDS=	libpng.so:graphics/png \
+			libtiff.so:graphics/tiff
 Image_USES=		jpeg
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
-LibSndFile_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
+LibSndFile_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 Libxml2_USE=		GNOME=libxml2
-Loudmouth_LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth
-Memcached_LIB_DEPENDS=	libmemcached.so:${PORTSDIR}/databases/libmemcached
+Loudmouth_LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth
+Memcached_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 MySQL_USE=		MYSQL=client
-Ogg_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+Ogg_LIB_DEPENDS=	libogg.so:audio/libogg
 OpenGL_USE=		GL=glut XORG=xmu
 PostgreSQL_USES=	pgsql
 Python_USES=		python
-QDBM_LIB_DEPENDS=	libqdbm.so:${PORTSDIR}/databases/qdbm
+QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 ReadLine_USES=		readline:port
-Regex_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+Regex_LIB_DEPENDS=	libpcre.so:devel/pcre
 SQLite3_USE=		SQLITE=3
 SampleRateConverter_LIB_DEPENDS=\
-			libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-Socket_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
-TagLib_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
-Theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+			libsamplerate.so:audio/libsamplerate
+Socket_LIB_DEPENDS=	libevent.so:devel/libevent2
+TagLib_LIB_DEPENDS=	libtag.so:audio/taglib
+Theora_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 TokyoCabinet_LIB_DEPENDS=	\
-			libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
-UUID_LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-Vorbis_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-Yajl_LIB_DEPENDS=	libyajl.so:${PORTSDIR}/devel/yajl
+			libtokyocabinet.so:databases/tokyocabinet
+UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
+Vorbis_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+Yajl_LIB_DEPENDS=	libyajl.so:devel/yajl
 
 .include <bsd.port.options.mk>
 
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index c10c3d4..1521a51 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Implementation of Ruby Interpreter in Pure Java
 LICENSE=	EPL GPLv2 LGPL21
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe
 NO_BUILD=	yes
diff --git a/lang/js_of_ocaml/Makefile b/lang/js_of_ocaml/Makefile
index 39ed923..f350e61 100644
--- a/lang/js_of_ocaml/Makefile
+++ b/lang/js_of_ocaml/Makefile
@@ -8,13 +8,13 @@ CATEGORIES=	lang
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml to JavaScript compiler
 
-BUILD_DEPENDS=	ocaml-lwt>=2.3.0:${PORTSDIR}/devel/ocaml-lwt \
-		menhir:${PORTSDIR}/devel/menhir \
-		${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen \
-		${SA_DIR}/cmdliner/cmdliner.a:${PORTSDIR}/devel/ocaml-cmdliner
-RUN_DEPENDS=	ocaml-lwt>=2.3.0:${PORTSDIR}/devel/ocaml-lwt \
-		${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen \
-		${SA_DIR}/cmdliner/cmdliner.a:${PORTSDIR}/devel/ocaml-cmdliner
+BUILD_DEPENDS=	ocaml-lwt>=2.3.0:devel/ocaml-lwt \
+		menhir:devel/menhir \
+		${SA_DIR}/deriving-ocsigen/deriving.a:devel/ocaml-deriving-ocsigen \
+		${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner
+RUN_DEPENDS=	ocaml-lwt>=2.3.0:devel/ocaml-lwt \
+		${SA_DIR}/deriving-ocsigen/deriving.a:devel/ocaml-deriving-ocsigen \
+		${SA_DIR}/cmdliner/cmdliner.a:devel/ocaml-cmdliner
 
 SA_DIR=		${PREFIX}/${OCAML_SITELIBDIR}
 
diff --git a/lang/jython/Makefile b/lang/jython/Makefile
index 4f55169..9b001da 100644
--- a/lang/jython/Makefile
+++ b/lang/jython/Makefile
@@ -17,8 +17,8 @@ LICENSE_COMB=	multi
 LICENSE_FILE_PSFL=	${WRKDIR}/LICENSE.txt
 LICENSE_FILE_APACHE20=	${WRKDIR}/LICENSE_Apache.txt
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 # Extract only license files
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions \
diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index 4402ff8..763c4da 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Java-based Scheme implementation
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 USES=		gmake readline
 USE_JAVA=	yes
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 175fa6b..0648032 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Emacs Lisp like runtime library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libffi.so:${PORTSDIR}/devel/libffi \
-		libgmp.so:${PORTSDIR}/math/gmp
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libffi.so:devel/libffi \
+		libgmp.so:math/gmp
+RUN_DEPENDS=	gtar:archivers/gtar
 
 USE_CSTD=	gnu89
 
diff --git a/lang/lua-ada/Makefile b/lang/lua-ada/Makefile
index ddc3064..1017321 100644
--- a/lang/lua-ada/Makefile
+++ b/lang/lua-ada/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ada binding for Lua
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada lua
 USE_GITHUB=	yes
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index c522740..875d0b1 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -16,11 +16,11 @@ BROKEN=		unfetchable
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	libbdd.so:${PORTSDIR}/science/buddy \
-		libtecla.so:${PORTSDIR}/devel/libtecla \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
+LIB_DEPENDS=	libbdd.so:science/buddy \
+		libtecla.so:devel/libtecla \
+		libgmp.so:math/gmp \
+		libsigsegv.so:devel/libsigsegv
 
 USES=		autoreconf bison
 GNU_CONFIGURE=	yes
@@ -49,7 +49,7 @@ FULL_MAUDE=	full-maude${FULL_MAUDE_VER}.maude
 FULL_MAUDE_DIST=	${FULL_MAUDE}.zip
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${FULL_MAUDE_DIST}:fm
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_DEPENDS+=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${LOCALBASE}/bin/unzip:archivers/unzip
 PLIST_SUB+=	FULL_MAUDE=""
 PLIST_SUB+=	FULL_MAUDE_VER="${FULL_MAUDE_VER}"
 .else
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 1f331ff..aa6cf61 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -35,7 +35,7 @@ GLADE_PLIST_FILES=	bin/gmixvm \
 			%%DATADIR%%/mixgtk.glade
 
 GUILE_CONFIGURE_WITH=	guile
-GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_LIB_DEPENDS=	libguile.so:lang/guile
 GUILE_PLIST_FILES=	bin/mixguile \
 			%%DATADIR%%/mixguile.scm \
 			%%DATADIR%%/mixguile-commands.scm \
diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile
index 8fa8298..aead87e 100644
--- a/lang/micropython/Makefile
+++ b/lang/micropython/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Implementation of the Python language for microcontrollers
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 USES=		gmake pkgconfig python:3,build readline shebangfix
 
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index af76d08..6860ec4 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--without-db-4
 .if ${PORT_OPTIONS:MGDBM}
 PLIST_SUB+=	GDBM=""
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 PLIST_SUB+=	GDBM="@comment "
 CONFIGURE_ARGS+=--without-gdbm
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--without-gdbm
 .if ${PORT_OPTIONS:MMHASH}
 PLIST_SUB+=	MHASH=""
 CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}
-LIB_DEPENDS+=	libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS+=	libmhash.so:security/mhash
 .else
 PLIST_SUB+=	MHASH="@comment "
 CONFIGURE_ARGS+=--without-mhash
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=--without-mhash
 .if ${PORT_OPTIONS:MMCRYPT}
 PLIST_SUB+=	MCRYPT=""
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
-LIB_DEPENDS+=	libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+=	libmcrypt.so:security/libmcrypt
 .else
 PLIST_SUB+=	MCRYPT="@comment "
 CONFIGURE_ARGS+=--without-mcrypt
diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index 823ac6d..8d3c16b 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -21,9 +21,9 @@ EXTRACT_ONLY=	${SRC_DIST}
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Optimizing Standard ML compiler
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libgmp.so:math/gmp
+RUN_DEPENDS=	bash:shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 LICENSE_FILE=	doc/license/MLton-LICENSE
 
@@ -38,8 +38,8 @@ USE_GCC=	any
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	gsed:${PORTSDIR}/textproc/gsed \
-		htmldoc:${PORTSDIR}/textproc/htmldoc
+BUILD_DEPENDS+=	gsed:textproc/gsed \
+		htmldoc:textproc/htmldoc
 USE_TEX=	latex:build
 .else
 INSTALL_TARGET=	install-no-docs remove-docs
@@ -53,7 +53,7 @@ BROKEN=	${DISTNAME}-${PORTVERSION} does not bootstrap properly with smlnj
 .endif
 
 .if ${PORT_OPTIONS:MSMLNJ}
-BUILD_DEPENDS+=	smlnj>=110.65:${PORTSDIR}/lang/smlnj
+BUILD_DEPENDS+=	smlnj>=110.65:lang/smlnj
 BOOT_DIST=
 MAKE_ENV+=	SMLNJ_DEVEL=yes
 .if ! ${PORT_OPTIONS:MDOCS}
@@ -66,11 +66,11 @@ BOOT_DIST=	${PORTNAME}-${PORTVERSION}-1.${MACHINE_ARCH}-freebsd${OSRELMAJ}.${BOO
 .endif
 
 .if ${PORT_OPTIONS:MMINGW32}
-BUILD_DEPENDS+=	wine:${PORTSDIR}/emulators/wine \
-		mingw32-gcc:${PORTSDIR}/devel/mingw32-gcc \
-		${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/math/mingw32-libgmp
-RUN_DEPENDS+=	mingw32-gcc:${PORTSDIR}/devel/mingw32-gcc \
-		${LOCALBASE}/mingw32/lib/libgmp.a:${PORTSDIR}/math/mingw32-libgmp
+BUILD_DEPENDS+=	wine:emulators/wine \
+		mingw32-gcc:devel/mingw32-gcc \
+		${LOCALBASE}/mingw32/lib/libgmp.a:math/mingw32-libgmp
+RUN_DEPENDS+=	mingw32-gcc:devel/mingw32-gcc \
+		${LOCALBASE}/mingw32/lib/libgmp.a:math/mingw32-libgmp
 
 PLIST_SUB+=	MINGW32CROSS=""
 .else
diff --git a/lang/mmix/Makefile b/lang/mmix/Makefile
index 61b0526..9fc1e58 100644
--- a/lang/mmix/Makefile
+++ b/lang/mmix/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	mmix license
 LICENSE_FILE=	${FILESDIR}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	ctangle:${PORTSDIR}/devel/cweb
+BUILD_DEPENDS=	ctangle:devel/cweb
 
 NO_WRKSUBDIR=	yes
 FILES=		mmix.1 mmix.mp silly.out silly.run
diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile
index f64172e..f56ef13 100644
--- a/lang/modula3/Makefile
+++ b/lang/modula3/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	CM3 License defined by DEC and Critical Mass copyrights
 LICENSE_FILE=	${WRKSRC}/COM_LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 NEWBOOTDIR=	${WRKDIR}/new-bootstrap/bootstrap
 SRCDISTFILE=	modula3-cm3-${PORTVERSION}-${GH_TAGNAME}_GH0.tar.gz
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 414db2f..28764ca 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -14,8 +14,8 @@ PATCH_DIST_STRIP=-p1
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Open source implementation of .NET Development Framework
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		bash:shells/bash
 
 USES=		bison compiler:c11 cpe gettext gmake iconv libtool pathfix perl5 tar:bzip2
 USE_GNOME=	glib20
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 9c2c6c4..1a7b874 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	mos201src
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Lightweight implementation of Standard ML
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libgdbm.so:databases/gdbm
 
 RESTRICTED=	Restrictions on for-profit distribution
 
diff --git a/lang/mosh/Makefile b/lang/mosh/Makefile
index 00e6adb..1eabb14 100644
--- a/lang/mosh/Makefile
+++ b/lang/mosh/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Fast R6RS Scheme interpreter
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libonig.so:${PORTSDIR}/devel/oniguruma5
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libonig.so:devel/oniguruma5
 
 CONFLICTS_INSTALL=	mosh-1.[0-9].*
 
diff --git a/lang/mtasc/Makefile b/lang/mtasc/Makefile
index a8cf432..d9639a3 100644
--- a/lang/mtasc/Makefile
+++ b/lang/mtasc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/chinsan
 MAINTAINER=	saper@saper.info
 COMMENT=	Motion-Twin ActionScript 2 Compiler
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/extlib/IO.cmi:${PORTSDIR}/devel/ocaml-extlib
+BUILD_DEPENDS=	${LOCALBASE}/lib/ocaml/site-lib/extlib/IO.cmi:devel/ocaml-extlib
 
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=yes
diff --git a/lang/munger/Makefile b/lang/munger/Makefile
index 742b998..9063396 100644
--- a/lang/munger/Makefile
+++ b/lang/munger/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Static lisp interpreter with text processing abilities
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libtre.so:textproc/libtre
 
 USES=		ncurses
 MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile
index 415726a..fe0ed3a 100644
--- a/lang/nbc/Makefile
+++ b/lang/nbc/Makefile
@@ -20,7 +20,7 @@ WRKSRC=			${WRKDIR}/NXT
 OPTIONS_DEFINE=		DOCS ROBOCTL
 ROBOCTL_DESC=		Include roboctl to communicate with the NXT
 
-ROBOCTL_RUN_DEPENDS=	legoctl:${PORTSDIR}/devel/roboctl
+ROBOCTL_RUN_DEPENDS=	legoctl:devel/roboctl
 
 USES=			dos2unix gmake tar:tgz
 USE_FPC=		fcl-base fcl-image pasjpeg rtl-objpas
diff --git a/lang/newlisp-devel/Makefile b/lang/newlisp-devel/Makefile
index 11037f7..fdba907 100644
--- a/lang/newlisp-devel/Makefile
+++ b/lang/newlisp-devel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	LISP like scripting language
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 CONFLICTS=	newlisp-[0-9]*
 
@@ -45,7 +45,7 @@ CFLAGS+=	-DNEWLISP64
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 MODULES+=	gmp
 PLIST_SUB+=	GMP=""
 .else
@@ -53,7 +53,7 @@ PLIST_SUB+=	GMP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSL}
-LIB_DEPENDS+=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libgsl.so:math/gsl
 MODULES+=	gsl
 PLIST_SUB+=	GSL=""
 .else
diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index 5f541ab..2076ec2 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	LISP like scripting language
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 CONFLICTS=	newlisp-devel-[0-9]*
 
@@ -46,7 +46,7 @@ CFLAGS+=	-DNEWLISP64
 .endif
 
 .if ${PORT_OPTIONS:MGSL}
-LIB_DEPENDS+=	libgsl.so:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libgsl.so:math/gsl
 MODULES+=	gsl
 .endif
 
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile
index c3889ca..2f22d3e 100644
--- a/lang/ofc/Makefile
+++ b/lang/ofc/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The Objective-C Foundation Classes library
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 PROJECTHOST=	${PORTNAME}
 USE_SDL=	sdl
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	GDBM GMP
 
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
 .include <bsd.port.mk>
diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile
index 1dcb444..7d64534 100644
--- a/lang/ohugs/Makefile
+++ b/lang/ohugs/Makefile
@@ -15,9 +15,9 @@ OPTIONS_DEFINE=		X11
 
 .include <bsd.port.options.mk>
 
-LIB_DEPENDS=	libreadline.so.6:${PORTSDIR}/devel/readline
+LIB_DEPENDS=	libreadline.so.6:devel/readline
 .if empty(PORT_OPTIONS:MX11)
-LIB_DEPENDS=	libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix
+LIB_DEPENDS=	libTix8.4.3.so:x11-toolkits/tix
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/.src//}
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index a47bef3..8248280 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Embeddable stack-based threaded interpreted language
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	cook:${PORTSDIR}/devel/cook
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	cook:devel/cook
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		libedit shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index b454cb8..2701e4b 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Optimizing Oberon-2 compiler of University of Kaiserslautern, Germany
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
-LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+RUN_DEPENDS=	libtool:devel/libtool
+LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
 DOCSDIR=	lib/${PORTNAME}
 USES=		gmake libtool:build tar:bzip2
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index f0876be..651ca57 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl module inspired by the Tcl version of Expect
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-Tty>=1.11:${PORTSDIR}/devel/p5-IO-Tty
+BUILD_DEPENDS=	p5-IO-Tty>=1.11:devel/p5-IO-Tty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-Interpolation/Makefile b/lang/p5-Interpolation/Makefile
index d5db242..960c2ef 100644
--- a/lang/p5-Interpolation/Makefile
+++ b/lang/p5-Interpolation/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Implement arbitrary string interpolation semantics for Perl
 
-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/lang/p5-JSAN/Makefile b/lang/p5-JSAN/Makefile
index 0021b5f..5054a18 100644
--- a/lang/p5-JSAN/Makefile
+++ b/lang/p5-JSAN/Makefile
@@ -12,16 +12,16 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	JavaScript Archive Network (JSAN) Shell
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-DBI-DATA-Schema>=0:${PORTSDIR}/databases/p5-Class-DBI-DATA-Schema \
-		p5-Class-DBI-Loader>=0:${PORTSDIR}/databases/p5-Class-DBI-Loader \
-		p5-Class-DBI-SQLite>=0:${PORTSDIR}/databases/p5-Class-DBI-SQLite \
-		p5-Class-DBI>=0:${PORTSDIR}/databases/p5-Class-DBI \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-SQL-Translator>=0:${PORTSDIR}/databases/p5-SQL-Translator \
-		p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-DBI-DATA-Schema>=0:databases/p5-Class-DBI-DATA-Schema \
+		p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
+		p5-Class-DBI-SQLite>=0:databases/p5-Class-DBI-SQLite \
+		p5-Class-DBI>=0:databases/p5-Class-DBI \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-SQL-Translator>=0:databases/p5-SQL-Translator \
+		p5-XML-XPath>=0:textproc/p5-XML-XPath \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-JavaScript-SpiderMonkey/Makefile b/lang/p5-JavaScript-SpiderMonkey/Makefile
index e8a559a..4432d10 100644
--- a/lang/p5-JavaScript-SpiderMonkey/Makefile
+++ b/lang/p5-JavaScript-SpiderMonkey/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl interface to Mozilla JavaScript implementation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libjs.so:${PORTSDIR}/lang/spidermonkey17
-TEST_DEPENDS=	p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl
+LIB_DEPENDS=	libjs.so:lang/spidermonkey17
+TEST_DEPENDS=	p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index eb00a8e..f822319 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Provide the stuff missing in List::Util
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Exporter-Tiny>=0.038:${PORTSDIR}/devel/p5-Exporter-Tiny
+BUILD_DEPENDS=	p5-Exporter-Tiny>=0.038:devel/p5-Exporter-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-Marpa-PP/Makefile b/lang/p5-Marpa-PP/Makefile
index a5651a9..ef602fa 100644
--- a/lang/p5-Marpa-PP/Makefile
+++ b/lang/p5-Marpa-PP/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Pure Perl version of Marpa
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	p5-PPI>=1.206:${PORTSDIR}/textproc/p5-PPI \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-PPI>=1.206:textproc/p5-PPI \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Weaken>=3.004000:${PORTSDIR}/devel/p5-Test-Weaken
+TEST_DEPENDS=	p5-Test-Weaken>=3.004000:devel/p5-Test-Weaken
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/lang/p5-Marpa-XS/Makefile b/lang/p5-Marpa-XS/Makefile
index 814e109..355c59a 100644
--- a/lang/p5-Marpa-XS/Makefile
+++ b/lang/p5-Marpa-XS/Makefile
@@ -14,12 +14,12 @@ COMMENT=	XS version of Marpa
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.223:${PORTSDIR}/devel/p5-Glib2 \
-		p5-PPI>=1.206:${PORTSDIR}/textproc/p5-PPI \
-		p5-Task-Weaken>=0:${PORTSDIR}/devel/p5-Task-Weaken
+BUILD_DEPENDS=	p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.223:devel/p5-Glib2 \
+		p5-PPI>=1.206:textproc/p5-PPI \
+		p5-Task-Weaken>=0:devel/p5-Task-Weaken
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Weaken>=3.004000:${PORTSDIR}/devel/p5-Test-Weaken
+TEST_DEPENDS=	p5-Test-Weaken>=3.004000:devel/p5-Test-Weaken
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/lang/p5-Marpa/Makefile b/lang/p5-Marpa/Makefile
index 34fab07..7fe09e0 100644
--- a/lang/p5-Marpa/Makefile
+++ b/lang/p5-Marpa/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Parse any Language You Can Describe in BNF
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=3.64:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-PPI>=1.206:${PORTSDIR}/textproc/p5-PPI
+BUILD_DEPENDS=	p5-HTML-Parser>=3.64:www/p5-HTML-Parser \
+		p5-PPI>=1.206:textproc/p5-PPI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/lang/p5-Modern-Perl/Makefile b/lang/p5-Modern-Perl/Makefile
index c73f609..c5609cc 100644
--- a/lang/p5-Modern-Perl/Makefile
+++ b/lang/p5-Modern-Perl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Enable all of the features of Modern Perl with one import
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-autodie>=2.22:${PORTSDIR}/devel/p5-autodie
+BUILD_DEPENDS=	p5-autodie>=2.22:devel/p5-autodie
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/lang/p5-Parse-Perl/Makefile b/lang/p5-Parse-Perl/Makefile
index a0585e0..7ddc6fa 100644
--- a/lang/p5-Parse-Perl/Makefile
+++ b/lang/p5-Parse-Perl/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interpret string as Perl source
 
-BUILD_DEPENDS=	p5-Devel-CallChecker>=0.003:${PORTSDIR}/devel/p5-Devel-CallChecker
+BUILD_DEPENDS=	p5-Devel-CallChecker>=0.003:devel/p5-Devel-CallChecker
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Devel-Declare>=0:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Lexical-Import>=0:${PORTSDIR}/devel/p5-Lexical-Import \
-		p5-Sub-Identify>=0:${PORTSDIR}/devel/p5-Sub-Identify
+TEST_DEPENDS=	p5-Devel-Declare>=0:devel/p5-Devel-Declare \
+		p5-Lexical-Import>=0:devel/p5-Lexical-Import \
+		p5-Sub-Identify>=0:devel/p5-Sub-Identify
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/lang/p5-Perl6-Subs/Makefile b/lang/p5-Perl6-Subs/Makefile
index 30df022..fc69163 100644
--- a/lang/p5-Perl6-Subs/Makefile
+++ b/lang/p5-Perl6-Subs/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl6::Subs - Define your subroutines in the Perl 6 style
 
-BUILD_DEPENDS=	p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent
+BUILD_DEPENDS=	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-Pugs-Compiler-Rule/Makefile b/lang/p5-Pugs-Compiler-Rule/Makefile
index fa177e7..4fb88b4 100644
--- a/lang/p5-Pugs-Compiler-Rule/Makefile
+++ b/lang/p5-Pugs-Compiler-Rule/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Compiler for Perl 6 Rules
 
-RUN_DEPENDS=	p5-Cache-Cache>=1.05:${PORTSDIR}/devel/p5-Cache-Cache \
-		p5-PadWalker>=1.0:${PORTSDIR}/devel/p5-PadWalker \
-		p5-Parse-Yapp>=0:${PORTSDIR}/devel/p5-Parse-Yapp \
-		p5-YAML-Syck>=0.60:${PORTSDIR}/textproc/p5-YAML-Syck
+RUN_DEPENDS=	p5-Cache-Cache>=1.05:devel/p5-Cache-Cache \
+		p5-PadWalker>=1.0:devel/p5-PadWalker \
+		p5-Parse-Yapp>=0:devel/p5-Parse-Yapp \
+		p5-YAML-Syck>=0.60:textproc/p5-YAML-Syck
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>0:${PORTSDIR}/devel/p5-File-Slurp
+TEST_DEPENDS=	p5-File-Slurp>0:devel/p5-File-Slurp
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/lang/p5-Quantum-Superpositions/Makefile b/lang/p5-Quantum-Superpositions/Makefile
index e76f4f3..e31e7f9 100644
--- a/lang/p5-Quantum-Superpositions/Makefile
+++ b/lang/p5-Quantum-Superpositions/Makefile
@@ -14,7 +14,7 @@ COMMENT=	QM-like superpositions in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Multimethods>=0:${PORTSDIR}/devel/p5-Class-Multimethods
+BUILD_DEPENDS=	p5-Class-Multimethods>=0:devel/p5-Class-Multimethods
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index 0afb407..524bc00 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Switch - A switch statement for Perl
 
-BUILD_DEPENDS=	p5-Filter>0:${PORTSDIR}/devel/p5-Filter
+BUILD_DEPENDS=	p5-Filter>0:devel/p5-Filter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-Test-XPath/Makefile b/lang/p5-Test-XPath/Makefile
index 8122d0e..1e55531 100644
--- a/lang/p5-Test-XPath/Makefile
+++ b/lang/p5-Test-XPath/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Test XML and HTML content and structure with XPath expressions
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-XML-LibXML>=1.70:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML
 
 USES=		perl5
 USE_PERL5=	modbuild
@@ -27,12 +27,12 @@ PODT_DESC=	Include Pod package test dependencies
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCSS}
-RUN_DEPENDS+=	p5-HTML-Selector-XPath>=0.06:${PORTSDIR}/www/p5-HTML-Selector-XPath
+RUN_DEPENDS+=	p5-HTML-Selector-XPath>=0.06:www/p5-HTML-Selector-XPath
 .endif
 
 .if ${PORT_OPTIONS:MPODT}
-TEST_DEPENDS+=	p5-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Pod-Coverage \
-		p5-Test-Pod>=1.41:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS+=	p5-Pod-Coverage>=0:devel/p5-Pod-Coverage \
+		p5-Test-Pod>=1.41:devel/p5-Test-Pod
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/p5-Try-Tiny-Retry/Makefile b/lang/p5-Try-Tiny-Retry/Makefile
index c2b9fd0..da6f562 100644
--- a/lang/p5-Try-Tiny-Retry/Makefile
+++ b/lang/p5-Try-Tiny-Retry/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extends Try::Tiny to allow retries
 
-BUILD_DEPENDS=	p5-Try-Tiny>0:${PORTSDIR}/lang/p5-Try-Tiny
+BUILD_DEPENDS=	p5-Try-Tiny>0:lang/p5-Try-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-Try-Tiny/Makefile b/lang/p5-Try-Tiny/Makefile
index 3b00219..a0ad029 100644
--- a/lang/p5-Try-Tiny/Makefile
+++ b/lang/p5-Try-Tiny/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Minimal try/catch with proper localization of $$@
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	p5-Capture-Tiny>=0.12:${PORTSDIR}/devel/p5-Capture-Tiny
+TEST_DEPENDS=	p5-Capture-Tiny>=0.12:devel/p5-Capture-Tiny
 
 USES=		perl5
 USE_PERL5=	configure
@@ -21,7 +21,7 @@ USE_PERL5=	configure
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 502104
-TEST_DEPENDS+=	p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils
+TEST_DEPENDS+=	p5-Scalar-List-Utils>=0:lang/p5-Scalar-List-Utils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/p5-TryCatch/Makefile b/lang/p5-TryCatch/Makefile
index 0ca8d51..95efead 100644
--- a/lang/p5-TryCatch/Makefile
+++ b/lang/p5-TryCatch/Makefile
@@ -14,18 +14,18 @@ COMMENT=	First class try catch semantics for Perl, without source filters
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
-RUN_DEPENDS=	p5-B-Hooks-EndOfScope>=0.08:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-B-Hooks-OP-Check>=0.18:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-B-Hooks-OP-PPAddr>=0.03:${PORTSDIR}/devel/p5-B-Hooks-OP-PPAddr \
-		p5-Devel-Declare>=0.005007:${PORTSDIR}/devel/p5-Devel-Declare \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Parse-Method-Signatures>=1.003012:${PORTSDIR}/devel/p5-Parse-Method-Signatures \
-		p5-Scope-Upper>=0.06:${PORTSDIR}/devel/p5-Scope-Upper \
-		p5-Sub-Exporter>=0.979:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-Variable-Magic>=0.28:${PORTSDIR}/devel/p5-Variable-Magic
-TEST_DEPENDS=	p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
+RUN_DEPENDS=	p5-B-Hooks-EndOfScope>=0.08:devel/p5-B-Hooks-EndOfScope \
+		p5-B-Hooks-OP-Check>=0.18:devel/p5-B-Hooks-OP-Check \
+		p5-B-Hooks-OP-PPAddr>=0.03:devel/p5-B-Hooks-OP-PPAddr \
+		p5-Devel-Declare>=0.005007:devel/p5-Devel-Declare \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Parse-Method-Signatures>=1.003012:devel/p5-Parse-Method-Signatures \
+		p5-Scope-Upper>=0.06:devel/p5-Scope-Upper \
+		p5-Sub-Exporter>=0.979:devel/p5-Sub-Exporter \
+		p5-Variable-Magic>=0.28:devel/p5-Variable-Magic
+TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception
 
 OPTIONS_DEFINE=	AUTHOR
 
@@ -37,8 +37,8 @@ USE_PERL5=	configure
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAUTHOR}
-BUILD_DEPENDS+=	p5-B-Hooks-OP-Check>=0.18:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-B-Hooks-OP-PPAddr>=0.03:${PORTSDIR}/devel/p5-B-Hooks-OP-PPAddr
+BUILD_DEPENDS+=	p5-B-Hooks-OP-Check>=0.18:devel/p5-B-Hooks-OP-Check \
+		p5-B-Hooks-OP-PPAddr>=0.03:devel/p5-B-Hooks-OP-PPAddr
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/p5-signatures/Makefile b/lang/p5-signatures/Makefile
index b135352..35f5d77 100644
--- a/lang/p5-signatures/Makefile
+++ b/lang/p5-signatures/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Subroutine signatures for Perl with no source filter
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.08:${PORTSDIR}/devel/p5-B-Hooks-EndOfScope \
-		p5-B-Hooks-OP-Check>=0.17:${PORTSDIR}/devel/p5-B-Hooks-OP-Check \
-		p5-B-Hooks-OP-PPAddr>=0.03:${PORTSDIR}/devel/p5-B-Hooks-OP-PPAddr \
-		p5-B-Hooks-Parser>=0.15:${PORTSDIR}/devel/p5-B-Hooks-Parser \
-		p5-ExtUtils-Depends>=0.302:${PORTSDIR}/devel/p5-ExtUtils-Depends
+BUILD_DEPENDS=	p5-B-Hooks-EndOfScope>=0.08:devel/p5-B-Hooks-EndOfScope \
+		p5-B-Hooks-OP-Check>=0.17:devel/p5-B-Hooks-OP-Check \
+		p5-B-Hooks-OP-PPAddr>=0.03:devel/p5-B-Hooks-OP-PPAddr \
+		p5-B-Hooks-Parser>=0.15:devel/p5-B-Hooks-Parser \
+		p5-ExtUtils-Depends>=0.302:devel/p5-ExtUtils-Depends
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/p5-v6/Makefile b/lang/p5-v6/Makefile
index 448e08f..f47cae2 100644
--- a/lang/p5-v6/Makefile
+++ b/lang/p5-v6/Makefile
@@ -13,13 +13,13 @@ DISTNAME=	${PORTNAME}-alpha-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Experimental compiler for Perl 6
 
-BUILD_DEPENDS=	p5-Data-Bind>=0.28:${PORTSDIR}/devel/p5-Data-Bind \
-		p5-Devel-Caller>=0.10:${PORTSDIR}/devel/p5-Devel-Caller \
-		p5-Module-Compile>=0.20:${PORTSDIR}/devel/p5-Module-Compile \
-		p5-Moose>=0.10:${PORTSDIR}/devel/p5-Moose \
-		p5-Pugs-Compiler-Rule>=0.17:${PORTSDIR}/lang/p5-Pugs-Compiler-Rule \
-		p5-Sub-Multi>=0:${PORTSDIR}/devel/p5-Sub-Multi \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
+BUILD_DEPENDS=	p5-Data-Bind>=0.28:devel/p5-Data-Bind \
+		p5-Devel-Caller>=0.10:devel/p5-Devel-Caller \
+		p5-Module-Compile>=0.20:devel/p5-Module-Compile \
+		p5-Moose>=0.10:devel/p5-Moose \
+		p5-Pugs-Compiler-Rule>=0.17:lang/p5-Pugs-Compiler-Rule \
+		p5-Sub-Multi>=0:devel/p5-Sub-Multi \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 9efcc49..2909e20 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Parrot - virtual machine for dynamic languages
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		gm4:${PORTSDIR}/devel/m4 \
-		pcre-config:${PORTSDIR}/devel/pcre
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libicudata.so:${PORTSDIR}/devel/icu
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		gm4:devel/m4 \
+		pcre-config:devel/pcre
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libicudata.so:devel/icu
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 48c603b..93f06491 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -52,7 +52,7 @@ DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
 DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
 GDBM_CONFIGURE_ON=	-Di_gdbm
 GDBM_CONFIGURE_OFF=	-Ui_gdbm
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index b820585..196d707 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -45,7 +45,7 @@ DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
 DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
 GDBM_CONFIGURE_ON=	-Di_gdbm
 GDBM_CONFIGURE_OFF=	-Ui_gdbm
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 8ab796d..a8c9afd 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -40,7 +40,7 @@ DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
 DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
 GDBM_CONFIGURE_ON=	-Di_gdbm
 GDBM_CONFIGURE_OFF=	-Ui_gdbm
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile
index 6c03335..26611fd 100644
--- a/lang/perl5.22/Makefile
+++ b/lang/perl5.22/Makefile
@@ -40,7 +40,7 @@ DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
 DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
 GDBM_CONFIGURE_ON=	-Di_gdbm
 GDBM_CONFIGURE_OFF=	-Ui_gdbm
-GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index f9a4d6c..b9e9e20 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Minimalistic, headless, WebKit-based, JavaScript-driven tool
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libicui18n.so:${PORTSDIR}/devel/icu \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	bash:shells/bash \
+		python:lang/python
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libicui18n.so:devel/icu \
+		libpng.so:graphics/png
 
 PROJECTHOST=	phantomjs
 USES=		bison:build compiler gmake gperf jpeg perl5 pkgconfig python:build zip
diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
index 31c3aab..48fce23 100644
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Pharo is Smalltalk-inspired environment
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	squeak:${PORTSDIR}/lang/squeak
+RUN_DEPENDS=	squeak:lang/squeak
 
 SVNVERSION=	14438
 
diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index cd4aa43..1e5cc33 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -19,7 +19,7 @@ NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext
index 8c92f72..c5f4435 100644
--- a/lang/php55/Makefile.ext
+++ b/lang/php55/Makefile.ext
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
@@ -86,8 +86,8 @@ USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=--with-gd \
@@ -115,7 +115,7 @@ USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
@@ -177,14 +177,14 @@ PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+=	libltdl.so:devel/libltdl \
+		libmcrypt.so:security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
-LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libsybdb.so:databases/freetds
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
@@ -204,7 +204,7 @@ MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=--enable-odbc \
 		--with-unixODBC=${LOCALBASE}
@@ -260,7 +260,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo
@@ -303,7 +303,7 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
@@ -318,7 +318,7 @@ USES+=		readline
 .endif
 
 .if ${PHP_MODNAME} == "recode"
-LIB_DEPENDS+=	librecode.so:${PORTSDIR}/converters/recode
+LIB_DEPENDS+=	librecode.so:converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
@@ -346,7 +346,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
@@ -371,7 +371,7 @@ CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
@@ -391,7 +391,7 @@ CONFIGURE_ARGS+=--enable-sysvshm
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
-LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
@@ -477,17 +477,17 @@ USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
@@ -501,7 +501,7 @@ CONFIGURE_ARGS+=--disable-flatfile
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	libt1.so:devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
@@ -517,7 +517,7 @@ USE_XORG=	xpm
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 .	endif
@@ -525,15 +525,15 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 
 .if ${PHP_MODNAME} == "imap"
 .	if ${PORT_OPTIONS:MPANDA}
-LIB_DEPENDS+=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+LIB_DEPENDS+=	libc-client4.so.10:mail/panda-cclient
 .	else
-LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+=	libc-client4.so.9:mail/cclient
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+=	libonig.so:${PORTSDIR}/devel/oniguruma5
+LIB_DEPENDS+=	libonig.so:devel/oniguruma5
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
@@ -568,9 +568,9 @@ post-extract:
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libsybdb.so:databases/freetds
 .	else
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 .	endif
 .endif
 
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index 0fcf74c..a16ed87 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -19,7 +19,7 @@ NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext
index d03cf13..e74eccc 100644
--- a/lang/php56/Makefile.ext
+++ b/lang/php56/Makefile.ext
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
@@ -86,8 +86,8 @@ USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=--with-gd \
@@ -115,7 +115,7 @@ USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
@@ -177,14 +177,14 @@ PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+=	libltdl.so:devel/libltdl \
+		libmcrypt.so:security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "mssql"
-LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libsybdb.so:databases/freetds
 
 CONFIGURE_ARGS+=--with-mssql=${LOCALBASE}
 .endif
@@ -204,7 +204,7 @@ MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=--enable-odbc \
 		--with-unixODBC=${LOCALBASE}
@@ -260,7 +260,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo
@@ -303,7 +303,7 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
@@ -318,7 +318,7 @@ USES+=		readline
 .endif
 
 .if ${PHP_MODNAME} == "recode"
-LIB_DEPENDS+=	librecode.so:${PORTSDIR}/converters/recode
+LIB_DEPENDS+=	librecode.so:converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
@@ -346,7 +346,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
@@ -371,7 +371,7 @@ CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
@@ -391,7 +391,7 @@ CONFIGURE_ARGS+=--enable-sysvshm
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
-LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
@@ -455,7 +455,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "zip"
-LIB_DEPENDS+=	libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=--enable-zip \
 		--with-zlib-dir=/usr \
@@ -480,17 +480,17 @@ USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
@@ -504,7 +504,7 @@ CONFIGURE_ARGS+=--disable-flatfile
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	libt1.so:devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
@@ -520,7 +520,7 @@ USE_XORG=	xpm
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 .	endif
@@ -528,15 +528,15 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 
 .if ${PHP_MODNAME} == "imap"
 .	if ${PORT_OPTIONS:MPANDA}
-LIB_DEPENDS+=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+LIB_DEPENDS+=	libc-client4.so.10:mail/panda-cclient
 .	else
-LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+=	libc-client4.so.9:mail/cclient
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+=	libonig.so:${PORTSDIR}/devel/oniguruma5
+LIB_DEPENDS+=	libonig.so:devel/oniguruma5
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
@@ -571,9 +571,9 @@ post-extract:
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libsybdb.so:databases/freetds
 .	else
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 .	endif
 .endif
 
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index bbe53c0..fd49fb8 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -22,7 +22,7 @@ USE_AUTOTOOLS=	autoconf
 #USES+=		autoreconf gmake
 #GNU_CONFIGURE=	yes
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFIGURE_ARGS+=--with-layout=GNU \
 		--localstatedir=/var \
diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext
index ad0d0be..871e1ed 100644
--- a/lang/php70/Makefile.ext
+++ b/lang/php70/Makefile.ext
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 .endif
@@ -86,8 +86,8 @@ USE_OPENSSL=	yes
 .endif
 
 .if ${PHP_MODNAME} == "gd"
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=--with-gd \
@@ -115,7 +115,7 @@ USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
-LIB_DEPENDS+=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
@@ -151,7 +151,7 @@ USES+=	firebird
 
 .if ${PHP_MODNAME} == "intl"
 CONFIGURE_ARGS+=--with-intl=${LOCALBASE}
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 .endif
 
 .if ${PHP_MODNAME} == "json"
@@ -182,8 +182,8 @@ PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mcrypt"
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libmcrypt.so:${PORTSDIR}/security/libmcrypt
+LIB_DEPENDS+=	libltdl.so:devel/libltdl \
+		libmcrypt.so:security/libmcrypt
 
 CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
 .endif
@@ -196,7 +196,7 @@ MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
 CONFIGURE_ARGS+=--enable-odbc \
 		--with-unixODBC=${LOCALBASE}
@@ -242,7 +242,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo
@@ -295,7 +295,7 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 
@@ -310,7 +310,7 @@ USES+=		readline
 .endif
 
 .if ${PHP_MODNAME} == "recode"
-LIB_DEPENDS+=	librecode.so:${PORTSDIR}/converters/recode
+LIB_DEPENDS+=	librecode.so:converters/recode
 
 CONFIGURE_ARGS+=--with-recode=${LOCALBASE}
 .endif
@@ -338,7 +338,7 @@ CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
-LIB_DEPENDS+=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
 .endif
@@ -363,7 +363,7 @@ CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 
 CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE}
 .endif
@@ -383,7 +383,7 @@ CONFIGURE_ARGS+=--enable-sysvshm
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=--with-tidy=${LOCALBASE}
 
-LIB_DEPENDS+=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
@@ -447,7 +447,7 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "zip"
-LIB_DEPENDS+=	libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS+=	libzip.so:archivers/libzip
 
 CONFIGURE_ARGS+=--enable-zip \
 		--with-zlib-dir=/usr \
@@ -472,17 +472,17 @@ USE_BDB=		40+
 WITH_BDB_HIGHEST=	yes
 .	endif
 .	if ${PORT_OPTIONS:MGDBM}
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 
 CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
 
 CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MTOKYO}
-LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
 
 CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
 .	endif
@@ -496,7 +496,7 @@ CONFIGURE_ARGS+=--disable-flatfile
 
 .if ${PHP_MODNAME} == "gd"
 .	if ${PORT_OPTIONS:MT1LIB}
-LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+LIB_DEPENDS+=	libt1.so:devel/t1lib
 
 CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE}
 .	endif
@@ -512,7 +512,7 @@ USE_XORG=	xpm
 CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
 .	endif
 .	if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+LIB_DEPENDS+=	libvpx.so:multimedia/libvpx
 
 CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 .	endif
@@ -520,15 +520,15 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
 
 .if ${PHP_MODNAME} == "imap"
 .	if ${PORT_OPTIONS:MPANDA}
-LIB_DEPENDS+=	libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+LIB_DEPENDS+=	libc-client4.so.10:mail/panda-cclient
 .	else
-LIB_DEPENDS+=	libc-client4.so.9:${PORTSDIR}/mail/cclient
+LIB_DEPENDS+=	libc-client4.so.9:mail/cclient
 .	endif
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 .	if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+=	libonig.so:${PORTSDIR}/devel/oniguruma5
+LIB_DEPENDS+=	libonig.so:devel/oniguruma5
 CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
 .	else
 CONFIGURE_ARGS+=--disable-mbregex
@@ -561,9 +561,9 @@ post-extract:
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libsybdb.so:databases/freetds
 .	else
-LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=	libct.so:databases/freetds
 .	endif
 .endif
 
diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile
index 72485d6..a08f729 100644
--- a/lang/pike78/Makefile
+++ b/lang/pike78/Makefile
@@ -13,11 +13,11 @@ DISTNAME=	Pike-v${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Dynamic programming language with a syntax similar to C++
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libnettle.so:${PORTSDIR}/security/nettle
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libgdbm.so:databases/gdbm \
+		libpcre.so:devel/pcre \
+		libgmp.so:math/gmp \
+		libnettle.so:security/nettle
 
 CONFLICTS=	pike7[26]-[0-9]*
 
@@ -25,9 +25,9 @@ OPTIONS_DEFINE=	TTF FREETYPE MYSQL PGSQL
 OPTIONS_DEFAULT=TTF FREETYPE MYSQL
 NO_OPTIONS_SORT=yes
 TTF_DESC?=		Enable FreeType 1 (libttf) font rendering engine
-TTF_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+TTF_LIB_DEPENDS=	libttf.so:print/freetype
 TTF_CONFIGURE_WITH=	ttflib
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_WITH=freetype
 MYSQL_USE=		mysql=yes
 MYSQL_CONFIGURE_WITH=	mysql
diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index 0b52968..cbafc28 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Fast open-source implementation of Standard ML
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 ONLY_FOR_ARCHS=	i386 amd64
 
diff --git a/lang/pure/Makefile b/lang/pure/Makefile
index bfce164..71a2e5e 100644
--- a/lang/pure/Makefile
+++ b/lang/pure/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Modern-style functional programming language
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libpcreposix.so:${PORTSDIR}/devel/pcre \
-		libLLVM-${LLVM_VERSION:C/./&./}.so:${PORTSDIR}/devel/llvm${LLVM_VERSION}
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libpcreposix.so:devel/pcre \
+		libLLVM-${LLVM_VERSION:C/./&./}.so:devel/llvm${LLVM_VERSION}
 
 SUB_FILES=	pkg-message
 
diff --git a/lang/py-prolog/Makefile b/lang/py-prolog/Makefile
index eb82d86..c199856 100644
--- a/lang/py-prolog/Makefile
+++ b/lang/py-prolog/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	PyProlog-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python extension embedding SWI-Prolog
 
-BUILD_DEPENDS=	swipl:${PORTSDIR}/lang/swi-pl
-RUN_DEPENDS=	swipl:${PORTSDIR}/lang/swi-pl
+BUILD_DEPENDS=	swipl:lang/swi-pl
+RUN_DEPENDS=	swipl:lang/swi-pl
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index f6fb417..1cf594b 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtQml API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 7945c76..deed493 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -10,11 +10,11 @@ DISTVERSIONSUFFIX=	-src
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Fast, compliant implementation of the Python language
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libffi.so:${PORTSDIR}/devel/libffi
-TEST_DEPENDS=	${PREFIX}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.pypy-${PYPY_CFFI_VER}.so:${PORTSDIR}/databases/pypy-gdbm \
-		${PREFIX}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.pypy-${PYPY_CFFI_VER}.so:${PORTSDIR}/databases/pypy-sqlite3 \
-		${PREFIX}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.pypy-${PYPY_CFFI_VER}.so:${PORTSDIR}/x11-toolkits/pypy-tkinter
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libffi.so:devel/libffi
+TEST_DEPENDS=	${PREFIX}/${PYPY_DIR}/lib_pypy/_gdbm_cffi.pypy-${PYPY_CFFI_VER}.so:databases/pypy-gdbm \
+		${PREFIX}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.pypy-${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \
+		${PREFIX}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.pypy-${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter
 
 ONLY_FOR_ARCHS=	i386 amd64 armv6 powerpc64
 ONLY_FOR_ARCHS_REASON=	PyPy JIT only supported on these architectures
diff --git a/lang/pypy/bsd.pypy.cffi.mk b/lang/pypy/bsd.pypy.cffi.mk
index 044f706..9c03b67 100644
--- a/lang/pypy/bsd.pypy.cffi.mk
+++ b/lang/pypy/bsd.pypy.cffi.mk
@@ -3,8 +3,8 @@
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=
 
-BUILD_DEPENDS+=	pypy:${PORTSDIR}/lang/pypy
-RUN_DEPENDS+=	pypy:${PORTSDIR}/lang/pypy
+BUILD_DEPENDS+=	pypy:lang/pypy
+RUN_DEPENDS+=	pypy:lang/pypy
 
 PLIST_FILES=	%%PYPY_DIR%%/lib_pypy/${CFFI_MODULE}_cffi.pypy-%%PYPY_CFFI_VER%%.so
 
diff --git a/lang/pypy3-devel/Makefile b/lang/pypy3-devel/Makefile
index 145cdf2..11518e3 100644
--- a/lang/pypy3-devel/Makefile
+++ b/lang/pypy3-devel/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Fast, compliant implementation of the Python language
 LICENSE=	MIT PSFL
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libffi.so:${PORTSDIR}/devel/libffi \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libffi.so:devel/libffi \
+		libsqlite3.so:databases/sqlite3
 
 PYTHON_DESC=	Use Python-2.7 to translate (slowest)
 PYPY_DESC=	Use PyPy to translate (fastest, highest memory usage)
@@ -99,7 +99,7 @@ WITH_BOEHM_GC=	yes
 .endfor # inst in ${PYPY_INST}
 
 .if defined(WITH_BOEHM_GC)
-LIB_DEPENDS+=	libgc.so:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS+=	libgc.so:devel/boehm-gc
 .endif
 
 # Translate FreeBSD ARCH types to PyPy ARCH types
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 16c6bca..8be4596 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -25,9 +25,9 @@ PLIST_FILES=	bin/2to3 \
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_MAJOR_VER} == 2
-RUN_DEPENDS+=	python2:${PORTSDIR}/lang/python2
+RUN_DEPENDS+=	python2:lang/python2
 .elif ${PYTHON_MAJOR_VER} == 3
-RUN_DEPENDS+=	python3:${PORTSDIR}/lang/python3
+RUN_DEPENDS+=	python3:lang/python3
 .endif
 
 do-install:
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index eea02f1..f3a9df6 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -53,7 +53,7 @@ PYMALLOC_DESC=	Enable specialized mallocs
 DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
-LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 6fbe815..9f4a90a 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -55,7 +55,7 @@ DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
-LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index e06ac3c..286bdfa 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -64,7 +64,7 @@ DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
-LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
diff --git a/lang/python35/Makefile b/lang/python35/Makefile
index 48982ed..6d2762e 100644
--- a/lang/python35/Makefile
+++ b/lang/python35/Makefile
@@ -71,7 +71,7 @@ DEBUG_CONFIGURE_WITH=	pydebug
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBFFI_CONFIGURE_ON=	--with-system-ffi
-LIBFFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
 
 # Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
 # to break in Python 2.7, or preprocessor complaints in Python >= 3.3
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index db19af3..40eb726 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -10,10 +10,10 @@ COMMENT=	The Qore Programming Language
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libmpfr.so:${PORTSDIR}/math/mpfr
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libmpfr.so:math/mpfr
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		${LOCALBASE}/bin/bison:devel/bison
 
 USES=		gmake iconv libtool pathfix tar:bzip2
 USE_OPENSSL=	yes
diff --git a/lang/qscheme/Makefile b/lang/qscheme/Makefile
index 482eeb0..58d4548 100644
--- a/lang/qscheme/Makefile
+++ b/lang/qscheme/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Small and fast Scheme interpreter
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libavcall.a:${PORTSDIR}/devel/ffcall \
-		${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre \
-		${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp
-LIB_DEPENDS=	libgetline.so:${PORTSDIR}/devel/libgetline
+BUILD_DEPENDS=	${LOCALBASE}/lib/libavcall.a:devel/ffcall \
+		${LOCALBASE}/lib/libpcre.a:devel/pcre \
+		${LOCALBASE}/lib/libgmp.a:math/gmp
+LIB_DEPENDS=	libgetline.so:devel/libgetline
 
 USES=		gmake perl5 shebangfix
 USE_PERL5=	build
diff --git a/lang/quack/Makefile b/lang/quack/Makefile
index fa4c513..3b124e9 100644
--- a/lang/quack/Makefile
+++ b/lang/quack/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Enhanced support for editing and running Scheme code
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USE_EMACS=	yes
 
diff --git a/lang/racket-minimal/Makefile b/lang/racket-minimal/Makefile
index e63323e..b5999b3 100644
--- a/lang/racket-minimal/Makefile
+++ b/lang/racket-minimal/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Interactive, integrated, graphical Scheme programming environment
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi
 
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 042850d..c22a60e 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -16,9 +16,9 @@ DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Interactive, integrated, graphical Scheme programming environment
 
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi	\
-		libcairo.so:${PORTSDIR}/graphics/cairo	\
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libffi.so:devel/libffi	\
+		libcairo.so:graphics/cairo	\
+		libpng.so:graphics/png
 
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/lang/rexx-regutil/Makefile b/lang/rexx-regutil/Makefile
index c3c439b..c9f43dc 100644
--- a/lang/rexx-regutil/Makefile
+++ b/lang/rexx-regutil/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	regutil126
 MAINTAINER=	bob@eager.cx
 COMMENT=	Implementation of IBM's RexxUtil function library for Regina
 
-BUILD_DEPENDS=	${LOCALBASE}/include/rexxsaa.h:${PORTSDIR}/lang/rexx-regina
+BUILD_DEPENDS=	${LOCALBASE}/include/rexxsaa.h:lang/rexx-regina
 
 USES=		ncurses zip
 
diff --git a/lang/rexx-wrapper/Makefile b/lang/rexx-wrapper/Makefile
index 94cb477..cb6177e 100644
--- a/lang/rexx-wrapper/Makefile
+++ b/lang/rexx-wrapper/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Tool that wraps Rexx source or tokenised code into an executable
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
-RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-regina
+BUILD_DEPENDS=	rexx:lang/rexx-regina
+RUN_DEPENDS=	rexx:lang/rexx-regina
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rexx=regina
diff --git a/lang/rhino/Makefile b/lang/rhino/Makefile
index 73922d5..897aa59 100644
--- a/lang/rhino/Makefile
+++ b/lang/rhino/Makefile
@@ -25,7 +25,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 JAVA_VERSION=	1.6+
 
 LINEDIT_DESC=	Enable line editing in the Rhino shell
-LINEDIT_RUN_DEPENDS=	${JLINEJAR}:${PORTSDIR}/devel/jline
+LINEDIT_RUN_DEPENDS=	${JLINEJAR}:devel/jline
 LINEDIT_USE=	java=yes ant=yes
 
 MAKE_ARGS=	-Dxmlbeans.url=file://${DISTDIR}/${DIST_SUBDIR}/xmlbeans-2.5.0.zip \
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index cbab562..a59fd6c 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -14,9 +14,9 @@ COMMENT=	LLVM based ruby language implementation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bundle:${PORTSDIR}/sysutils/rubygem-bundler \
-		${LOCALBASE}/bin/llvm-config35:${PORTSDIR}/devel/llvm35 \
-		${LOCALBASE}/bin/bison:${PORTSDIR}/devel/bison
+BUILD_DEPENDS=	${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \
+		${LOCALBASE}/bin/llvm-config35:devel/llvm35 \
+		${LOCALBASE}/bin/bison:devel/bison
 
 BROKEN_FreeBSD_9=	does not build
 BROKEN_FreeBSD_11=	does not build
diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index 98eebf2..c66ecff 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -19,9 +19,9 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
-BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
-RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	libffi>=0:devel/libffi
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
+RUN_DEPENDS=	libffi>=0:devel/libffi
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
@@ -59,15 +59,15 @@ RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
-CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+CAPIDOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen \
+			dot:graphics/graphviz
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LOCALBASE}
 LIBEDIT_USES=		libedit
 RDOC_CONFIGURE_ENABLE=	install-rdoc
-READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_BUILD_DEPENDS=	readline>=0:devel/readline
 READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${LOCALBASE}
-READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_RUN_DEPENDS=	readline>=0:devel/readline
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index f5c8943..78440a4 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -19,9 +19,9 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
-BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
-RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	libffi>=0:devel/libffi
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
+RUN_DEPENDS=	libffi>=0:devel/libffi
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
@@ -60,17 +60,17 @@ RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
-CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+CAPIDOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen \
+			dot:graphics/graphviz
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 GMP_CONFIGURE_WITH=	gmp
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LOCALBASE}
 LIBEDIT_USES=		libedit
 RDOC_CONFIGURE_ENABLE=	install-rdoc
-READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_BUILD_DEPENDS=	readline>=0:devel/readline
 READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${LOCALBASE}
-READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_RUN_DEPENDS=	readline>=0:devel/readline
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index 2c136ff..b396d6a 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -19,9 +19,9 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
-BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
-RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	libffi>=0:devel/libffi
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
+RUN_DEPENDS=	libffi>=0:devel/libffi
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
@@ -60,17 +60,17 @@ RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
-CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+CAPIDOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen \
+			dot:graphics/graphviz
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 GMP_CONFIGURE_WITH=	gmp
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LOCALBASE}
 LIBEDIT_USES=		libedit
 RDOC_CONFIGURE_ENABLE=	install-rdoc
-READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_BUILD_DEPENDS=	readline>=0:devel/readline
 READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${LOCALBASE}
-READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_RUN_DEPENDS=	readline>=0:devel/readline
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
diff --git a/lang/ruby23/Makefile b/lang/ruby23/Makefile
index e7c25b5..bfab7f2 100644
--- a/lang/ruby23/Makefile
+++ b/lang/ruby23/Makefile
@@ -19,9 +19,9 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
-BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
-RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	libffi>=0:devel/libffi
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
+RUN_DEPENDS=	libffi>=0:devel/libffi
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
@@ -60,17 +60,17 @@ RDOC_DESC=		Build and install Rdoc indexes
 EDIT_DESC=		Which line editing lib to use
 LIBEDIT_DESC=		Use libedit
 READLINE_DESC=		Use libreadline
-CAPIDOCS_BUILD_DEPENDS=	doxygen>0:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+CAPIDOCS_BUILD_DEPENDS=	doxygen>0:devel/doxygen \
+			dot:graphics/graphviz
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 GMP_CONFIGURE_WITH=	gmp
-GMP_LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 LIBEDIT_CONFIGURE_ON=	--enable-libedit --with-libedit-dir=${LOCALBASE}
 LIBEDIT_USES=		libedit
 RDOC_CONFIGURE_ENABLE=	install-rdoc
-READLINE_BUILD_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_BUILD_DEPENDS=	readline>=0:devel/readline
 READLINE_CONFIGURE_ON=	--disable-libedit --with-readline-dir=${LOCALBASE}
-READLINE_RUN_DEPENDS=	readline>=0:${PORTSDIR}/devel/readline
+READLINE_RUN_DEPENDS=	readline>=0:devel/readline
 
 CPE_VENDOR=	ruby-lang
 CPE_VERSION=	${RUBY_RELVERSION}
diff --git a/lang/runawk/Makefile b/lang/runawk/Makefile
index 1f2cf75..de9ef29 100644
--- a/lang/runawk/Makefile
+++ b/lang/runawk/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Wrapper for AWK interpreter that implements a modules system
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	mk-configure>=0.26.0:${PORTSDIR}/devel/mk-configure
+BUILD_DEPENDS=	mk-configure>=0.26.0:devel/mk-configure
 
 MAKE_ENV=	DESTDIR="${STAGEDIR}" EGDIR="${EXAMPLESDIR}"
 INSTALL_TARGET=	install install-doc install-examples
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index e222020..caf0a1d 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -81,12 +81,12 @@ OPTIONS_DEFINE=		DOCS GDB LLNEXTGEN PORT_LLVM
 GDB_DESC=		Install ports gdb (necessary for debugging rust programs)
 LLNEXTGEN_DESC=		Build with grammar verification
 
-GDB_RUN_DEPENDS=		${LOCALBASE}/bin/gdb:${PORTSDIR}/devel/gdb
-LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:${PORTSDIR}/devel/llnextgen
+GDB_RUN_DEPENDS=		${LOCALBASE}/bin/gdb:devel/gdb
+LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:devel/llnextgen
 
 # Rust may pass more regression tests with bundled LLVM
 PORT_LLVM_DESC=	Build against devel/llvm${LLVM_VER} instead of bundled version
-PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:${PORTSDIR}/devel/llvm${LLVM_VER}
+PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:devel/llvm${LLVM_VER}
 PORT_LLVM_CONFIGURE_ON=		--llvm-root=${LLVM_PREFIX}
 PORT_LLVM_EXTRACT_ONLY_OFF=	${DISTFILE_llvm}
 PORT_LLVM_GH_PROJECT_OFF=	llvm:llvm
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 8936470..d854289 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -70,12 +70,12 @@ OPTIONS_DEFINE=		GDB LLNEXTGEN PORT_LLVM
 GDB_DESC=		Install ports gdb (necessary for debugging rust programs)
 LLNEXTGEN_DESC=		Build with grammar verification
 
-GDB_RUN_DEPENDS=		${LOCALBASE}/bin/gdb:${PORTSDIR}/devel/gdb
-LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:${PORTSDIR}/devel/llnextgen
+GDB_RUN_DEPENDS=		${LOCALBASE}/bin/gdb:devel/gdb
+LLNEXTGEN_BUILD_DEPENDS=	LLnextgen:devel/llnextgen
 
 # Rust may pass more regression tests with bundled LLVM
 PORT_LLVM_DESC=	Build against devel/llvm${LLVM_VER} instead of bundled version
-PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:${PORTSDIR}/devel/llvm${LLVM_VER}
+PORT_LLVM_BUILD_DEPENDS=	${LLVM_PREFIX}/bin/FileCheck:devel/llvm${LLVM_VER}
 PORT_LLVM_CONFIGURE_ON=		--llvm-root=${LLVM_PREFIX}
 LLVM_VER?=			36 # XXX Move to DEFAULT_VERSIONS
 LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_VER}
diff --git a/lang/sagittarius-scheme/Makefile b/lang/sagittarius-scheme/Makefile
index f025c05..c5251b7 100644
--- a/lang/sagittarius-scheme/Makefile
+++ b/lang/sagittarius-scheme/Makefile
@@ -14,9 +14,9 @@ COMMENT=	R6RS/R7RS Scheme system
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libffi.pc:${PORTSDIR}/devel/libffi
-LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi \
-		libgc-threaded.so:${PORTSDIR}/devel/boehm-gc-threaded
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libffi.pc:devel/libffi
+LIB_DEPENDS=	libffi.so:devel/libffi \
+		libgc-threaded.so:devel/boehm-gc-threaded
 
 USE_LDCONFIG=	yes
 USES=		cmake gmake pkgconfig
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	ODBC
 
 PLIST_SUB=	PORTNAME=sagittarius PORTVERSION=${PORTVERSION}
 
-ODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
+ODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 ODBC_CMAKE_ON=		-DODBC_INCLUDE_DIR:STRING=${LOCALBASE}/include/libiodbc
 OPTIONS_SUB=		ODBC
 
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index e11024a..bc3dadf 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -16,7 +16,7 @@ LICENSE_NAME=	public domain | FreeBSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		gmake tar:bzip2
 
diff --git a/lang/scala/Makefile b/lang/scala/Makefile
index 401b630..d3e6bd9 100644
--- a/lang/scala/Makefile
+++ b/lang/scala/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Scala Programming Language
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE.md
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index 5f6211b..7f5a081 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Small Device C Compiler
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:devel/boost-libs
 
 CONFLICTS_INSTALL=	sdcc-[0-9]*
 DESCR=		${PORTSDIR}/lang/sdcc/pkg-descr
@@ -44,8 +44,8 @@ HC08_CONFIGURE_OFF=	--disable-hc08 --disable-hc08-port		\
 			--disable-s08-port
 MCS51_CONFIGURE_OFF=	--disable-51 --disable-mcs51-port		\
 			--disable-ds390-port --disable-ds400-port
-PIC_BUILD_DEPENDS=	gputils>=1.2.0:${PORTSDIR}/devel/gputils
-PIC_RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
+PIC_BUILD_DEPENDS=	gputils>=1.2.0:devel/gputils
+PIC_RUN_DEPENDS=	gpasm:devel/gputils
 PIC_CONFIGURE_OFF=	--disable-pic14-port --disable-pic16-port
 STM8_CONFIGURE_OFF=	--disable-stm8 --disable-stm8-port
 UCSIM_CONFIGURE_OFF=	--disable-ucsim
diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile
index 09b009a..f5da1bd 100644
--- a/lang/sdcc/Makefile
+++ b/lang/sdcc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Small Device C Compiler
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/adjacency_list.hpp:devel/boost-libs
 
 CONFLICTS_INSTALL=	sdcc-[0-9]* sdcc-devel-[0-9]*
 GNU_CONFIGURE=	yes
@@ -42,8 +42,8 @@ HC08_CONFIGURE_OFF=	--disable-hc08 --disable-hc08-port		\
 			--disable-s08-port
 MCS51_CONFIGURE_OFF=	--disable-51 --disable-mcs51-port		\
 			--disable-ds390-port --disable-ds400-port
-PIC_BUILD_DEPENDS=	gputils>=1.2.0:${PORTSDIR}/devel/gputils
-PIC_RUN_DEPENDS=	gpasm:${PORTSDIR}/devel/gputils
+PIC_BUILD_DEPENDS=	gputils>=1.2.0:devel/gputils
+PIC_RUN_DEPENDS=	gpasm:devel/gputils
 PIC_CONFIGURE_OFF=	--disable-pic14-port --disable-pic16-port
 STM8_CONFIGURE_OFF=	--disable-stm8 --disable-stm8-port
 UCSIM_CONFIGURE_OFF=	--disable-ucsim
diff --git a/lang/see/Makefile b/lang/see/Makefile
index 8868bbd..7883c47 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -35,7 +35,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 DEBUG_CFLAGS_OFF=	-DNDEBUG
-GC_LIB_DEPENDS=		libgc.so:${PORTSDIR}/devel/boehm-gc
+GC_LIB_DEPENDS=		libgc.so:devel/boehm-gc
 GC_CONFIGURE_WITH=	boehm-gc
 
 post-patch:
diff --git a/lang/slib-guile/Makefile b/lang/slib-guile/Makefile
index 9128f87..d546b6b 100644
--- a/lang/slib-guile/Makefile
+++ b/lang/slib-guile/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SLIB installation for Guile
 
-BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib \
-		guile:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:lang/slib \
+		guile:lang/guile
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES+=	pkg-install pkg-deinstall
diff --git a/lang/slib-guile2/Makefile b/lang/slib-guile2/Makefile
index 6ff66ac..85dfdce 100644
--- a/lang/slib-guile2/Makefile
+++ b/lang/slib-guile2/Makefile
@@ -12,8 +12,8 @@ DISTFILES=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SLIB installation for Guile
 
-BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:${PORTSDIR}/lang/slib \
-		guile:${PORTSDIR}/lang/guile2
+BUILD_DEPENDS=	${LOCALBASE}/share/slib/require.scm:lang/slib \
+		guile:lang/guile2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 SUB_FILES+=	pkg-install pkg-deinstall
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 999cff6..3cd29fa 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	GNU
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU Smalltalk
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libcairo.so:${PORTSDIR}/graphics/cairo
+BUILD_DEPENDS=	zip:archivers/zip \
+		gawk:lang/gawk
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libcairo.so:graphics/cairo
 
 OPTIONS_DEFINE=	TK PGSQL SDL
 OPTIONS_DEFAULT=TK PGSQL SDL
diff --git a/lang/spark/Makefile b/lang/spark/Makefile
index 8da388a..fc796b9 100644
--- a/lang/spark/Makefile
+++ b/lang/spark/Makefile
@@ -19,9 +19,9 @@ BROKEN=		brutally fails test suite - with ICE
 DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2016-10-29
 
-BUILD_DEPENDS=	gnatcoll>=2014:${PORTSDIR}/devel/gnatcoll
-RUN_DEPENDS=	gnatwhy3:${PORTSDIR}/math/why3-spark \
-		alt-ergo:${PORTSDIR}/math/alt-ergo
+BUILD_DEPENDS=	gnatcoll>=2014:devel/gnatcoll
+RUN_DEPENDS=	gnatwhy3:math/why3-spark \
+		alt-ergo:math/alt-ergo
 
 USES=		ada gmake
 ALL_TARGET=	gnat2why gnatprove
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
index d8b008f..b27b993 100644
--- a/lang/spidermonkey17/Makefile
+++ b/lang/spidermonkey17/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	js-${DISTVERSION}
 MAINTAINER=	citric@cubicone.tmetic.com
 COMMENT=	Standalone JavaScript interpreter from the Mozilla project
 
-LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
+LIB_DEPENDS=	libnspr4.so:devel/nspr
 
 CONFLICTS=	njs-[0-9]*
 
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
index 07af65fe..15b9d90 100644
--- a/lang/spidermonkey170/Makefile
+++ b/lang/spidermonkey170/Makefile
@@ -11,8 +11,8 @@ DISTNAME=		mozjs${PORTVERSION}
 MAINTAINER=		kwm@FreeBSD.org
 COMMENT=		Standalone JavaScript based from Mozilla 17-esr
 
-BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS=		zip:archivers/zip
+LIB_DEPENDS=		libnspr4.so:devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile
index 528eee0..46a24c4 100644
--- a/lang/spidermonkey185/Makefile
+++ b/lang/spidermonkey185/Makefile
@@ -14,9 +14,9 @@ COMMENT=		Standalone JavaScript (1.8.5) interpreter from Mozilla
 NOT_FOR_ARCHS=		powerpc powerpc64
 NOT_FOR_ARCHS_REASON=	PowerPC is not supported; use lang/spidermonkey170
 
-BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip \
-			autoconf-2.13:${PORTSDIR}/devel/autoconf213
-LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS=		zip:archivers/zip \
+			autoconf-2.13:devel/autoconf213
+LIB_DEPENDS=		libnspr4.so:devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile
index 0c26291..1257659 100644
--- a/lang/spidermonkey24/Makefile
+++ b/lang/spidermonkey24/Makefile
@@ -12,8 +12,8 @@ DISTNAME=		mozjs-${PORTVERSION}
 MAINTAINER=		kwm@FreeBSD.org
 COMMENT=		Standalone JavaScript based from Mozilla 24-esr
 
-BUILD_DEPENDS=		zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=		libnspr4.so:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS=		zip:archivers/zip
+LIB_DEPENDS=		libnspr4.so:devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 1fc6d7c..e7e5f61 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -21,13 +21,13 @@ COMMENT=	Full Smalltalk 80 with portability to Unix, Mac, and Windows
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake \
-		v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas \
-		libffi.so:${PORTSDIR}/devel/libffi \
-		libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \
-		libv4l2.so:${PORTSDIR}/multimedia/libv4l
+BUILD_DEPENDS=	cmake:devel/cmake \
+		v4l_compat>=1.0.20120501:multimedia/v4l_compat
+LIB_DEPENDS=	libaudio.so:audio/nas \
+		libffi.so:devel/libffi \
+		libasound.so:audio/alsa-lib \
+		libpulse-simple.so:audio/pulseaudio \
+		libv4l2.so:multimedia/libv4l
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile
index a1d1fcb..df4de18 100644
--- a/lang/stalin/Makefile
+++ b/lang/stalin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Aggressive optimizing Scheme compiler
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
 USES=	tar:bzip2
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index eaa7e4e..92e40cf 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	swipl-${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Edinburgh-style Prolog compiler
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libodbc.so:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libodbc.so:databases/unixODBC
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile
index 6197e4f..d47ece1 100644
--- a/lang/tcl-wrapper/Makefile
+++ b/lang/tcl-wrapper/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Shell wrapper for ${TX_SHELL} (${TX_PORT_U})
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	shc:${PORTSDIR}/misc/shc
+BUILD_DEPENDS=	shc:misc/shc
 
 SUB_FILES=	wrapper conf.sample pkg-message
 
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index 89239c0..bb8a309 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Meta-logical framework for deductive systems
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	mlton:${PORTSDIR}/lang/mlton
-BUILD_DEPENDS=	mlton:${PORTSDIR}/lang/mlton \
-		texi2html:${PORTSDIR}/textproc/texi2html
+RUN_DEPENDS=	mlton:lang/mlton
+BUILD_DEPENDS=	mlton:lang/mlton \
+		texi2html:textproc/texi2html
 
 USES=	gmake
 ALL_TARGET=	mlton
@@ -28,7 +28,7 @@ PORTDOCS=	dvi html info pdf ps
 
 .if ${PORT_OPTIONS:MDOCS}
 USE_TEX=	tex:build dvipsk:build
-BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:print/texinfo
 .endif
 
 post-patch:
diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile
index 660b40b..5296050 100644
--- a/lang/urweb/Makefile
+++ b/lang/urweb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ultimate host for embedded domain-specific languages
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	mlton:${PORTSDIR}/lang/mlton
+BUILD_DEPENDS=	mlton:lang/mlton
 
 CONFIGURE_ENV=	CCARGS="-I${LOCALBASE}/include"
 
diff --git a/lang/v8-devel/Makefile b/lang/v8-devel/Makefile
index 8083a97..5cedd58 100644
--- a/lang/v8-devel/Makefile
+++ b/lang/v8-devel/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Open source JavaScript engine by Google
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:devel/icu
 
 CONFLICTS_INSTALL=	v8-[0-9]*
 
diff --git a/lang/whitespace/Makefile b/lang/whitespace/Makefile
index ee18c1e..ad5e22c 100644
--- a/lang/whitespace/Makefile
+++ b/lang/whitespace/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Interpreter for the Whitespace programming language
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libffi.so.6:${PORTSDIR}/devel/libffi
+BUILD_DEPENDS=	ghc:lang/ghc
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libffi.so.6:devel/libffi
 
 USES=		perl5 gmake tar:tgz
 USE_PERL5=	build
diff --git a/lang/x10/Makefile b/lang/x10/Makefile
index 2a2a532..9b38f33 100644
--- a/lang/x10/Makefile
+++ b/lang/x10/Makefile
@@ -34,8 +34,8 @@ USE_GCC=	yes
 USE_LDCONFIG=	${PREFIX}/stdlib/lib
 
 # Can't have USE_GMAKE with USE_ANT: They imply conflicting do-build actions.
-BUILD_DEPENDS+=	gmake:${PORTSDIR}/devel/gmake \
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS+=	gmake:devel/gmake \
+		bash:shells/bash
 
 WRKSRC=		${WRKDIR}/x10.dist
 
diff --git a/lang/yap-devel/Makefile b/lang/yap-devel/Makefile
index e82f3a2..fecf9c9 100644
--- a/lang/yap-devel/Makefile
+++ b/lang/yap-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	High-performance Prolog compiler
 LICENSE=	ART20 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	libgmp.so:math/gmp
 
 CONFLICTS=	yap-6.2.*
 
@@ -23,11 +23,11 @@ OPTIONS_SUB=	yes
 MYDDAS_DESC=	Enable MySQL support
 
 DOCS_USE=		TEX=formats:build,dvipsk:build
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html \
-			${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/texinfo
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:textproc/texi2html \
+			${LOCALBASE}/bin/texi2pdf:print/texinfo
 DOCS_INSTALL_TARGET=	install install_docs
 
-MYDDAS_LIB_DEPENDS=		libiodbc.so:${PORTSDIR}/databases/libiodbc
+MYDDAS_LIB_DEPENDS=		libiodbc.so:databases/libiodbc
 MYDDAS_CONFIGURE_ENABLE=	myddas myddas-top-level
 
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/yap/Makefile b/lang/yap/Makefile
index 759a277..b377318 100644
--- a/lang/yap/Makefile
+++ b/lang/yap/Makefile
@@ -16,8 +16,8 @@ CONFLICTS=	yap-6.3.*
 OPTIONS_DEFINE=	DOCS
 
 DOCS_USE=		TEX=formats:build,dvipsk:build
-DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html \
-			${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/texinfo
+DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:textproc/texi2html \
+			${LOCALBASE}/bin/texi2pdf:print/texinfo
 DOCS_INSTALL_TARGET=	install install_docs
 
 USE_LDCONFIG=	yes
author	mat <mat@FreeBSD.org>	2016-04-01 14:08:37 +0000
committer	mat <mat@FreeBSD.org>	2016-04-01 14:08:37 +0000
commit	0e1e582c065e8fdcb4c8070ec1b22a3d70aa3a7c (patch)
tree	23607acdfffe977946d3c7bb877bab60e64640e7 /lang
parent	148314483d3098c0d6a33944f1190842e671502f (diff)
download	FreeBSD-ports-0e1e582c065e8fdcb4c8070ec1b22a3d70aa3a7c.zip FreeBSD-ports-0e1e582c065e8fdcb4c8070ec1b22a3d70aa3a7c.tar.gz