Index: Mk/Uses/ada.mk
===================================================================
--- Mk/Uses/ada.mk
+++ Mk/Uses/ada.mk
@@ -28,10 +28,10 @@
 . endif
 
 . if ${ada_ARGS:Mrun}
-RUN_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
+RUN_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
 . endif
 
-BUILD_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
+BUILD_DEPENDS+=	${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
 MAKE_ENV+=	PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
 		ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 CONFIGURE_ENV+=	PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
Index: Mk/Uses/autoreconf.mk
===================================================================
--- Mk/Uses/autoreconf.mk
+++ Mk/Uses/autoreconf.mk
@@ -54,14 +54,14 @@
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
-BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR}/devel/autoconf \
-		autoheader-2.69:${PORTSDIR}/devel/autoconf \
-		autoreconf-2.69:${PORTSDIR}/devel/autoconf \
-		aclocal-1.15:${PORTSDIR}/devel/automake \
-		automake-1.15:${PORTSDIR}/devel/automake
+BUILD_DEPENDS+=	autoconf-2.69:devel/autoconf \
+		autoheader-2.69:devel/autoconf \
+		autoreconf-2.69:devel/autoconf \
+		aclocal-1.15:devel/automake \
+		automake-1.15:devel/automake
 
 .if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
-BUILD_DEPENDS+=	libtoolize:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS+=	libtoolize:devel/libtool
 .endif
 
 .endif
Index: Mk/Uses/bison.mk
===================================================================
--- Mk/Uses/bison.mk
+++ Mk/Uses/bison.mk
@@ -11,7 +11,7 @@
 .if !defined(_INCLUDE_USES_BISON_MK)
 _INCLUDE_USES_BISON_MK=	yes
 
-_BISON_DEPENDS=	bison:${PORTSDIR}/devel/bison
+_BISON_DEPENDS=	bison:devel/bison
 
 .if empty(bison_ARGS)
 bison_ARGS=	build
Index: Mk/Uses/blaslapack.mk
===================================================================
--- Mk/Uses/blaslapack.mk
+++ Mk/Uses/blaslapack.mk
@@ -24,23 +24,23 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${blaslapack_ARGS} == atlas
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:/math/atlas
 _BLASLIB=	ptf77blas
 LAPACKLIB=	-lalapack -lptcblas
 _ATLASLIB=	atlas
 ATLASLIB=	-l${_ATLASLIB}
 .elif ${blaslapack_ARGS} == gotoblas
-LIB_DEPENDS+=	libgoto2.so:${PORTSDIR}/math/gotoblas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libgoto2.so:math/gotoblas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 _BLASLIB=	goto2p
 LAPACKLIB=	-lgoto2p
 .elif ${blaslapack_ARGS} == netlib
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas
+LIB_DEPENDS+=	liblapack.so:math/lapack
 _BLASLIB=	blas
 LAPACKLIB=	-llapack
 .elif ${blaslapack_ARGS} == openblas
-LIB_DEPENDS+=	libopenblas.so:${PORTSDIR}/math/openblas
+LIB_DEPENDS+=	libopenblas.so:math/openblas
 _BLASLIB=	openblasp
 LAPACKLIB=	-lopenblasp
 .else
Index: Mk/Uses/cmake.mk
===================================================================
--- Mk/Uses/cmake.mk
+++ Mk/Uses/cmake.mk
@@ -48,10 +48,10 @@
 .endfor
 
 CMAKE_BIN=		${LOCALBASE}/bin/cmake
-BUILD_DEPENDS+=		${CMAKE_BIN}:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+=		${CMAKE_BIN}:devel/cmake
 
 .if ${cmake_ARGS:Mrun}
-RUN_DEPENDS+=		${CMAKE_BIN}:${PORTSDIR}/devel/cmake
+RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake
 .endif
 
 .if defined(WITH_DEBUG)
Index: Mk/Uses/compiler.mk
===================================================================
--- Mk/Uses/compiler.mk
+++ Mk/Uses/compiler.mk
@@ -153,7 +153,7 @@
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang36:${PORTSDIR}/lang/clang36
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang36:lang/clang36
 CPP=	${LOCALBASE}/bin/clang-cpp36
 CC=	${LOCALBASE}/bin/clang36
 CXX=	${LOCALBASE}/bin/clang++36
@@ -179,7 +179,7 @@
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34
 CPP=	${LOCALBASE}/bin/clang-cpp34
 CC=	${LOCALBASE}/bin/clang34
 CXX=	${LOCALBASE}/bin/clang++34
Index: Mk/Uses/cran.mk
===================================================================
--- Mk/Uses/cran.mk
+++ Mk/Uses/cran.mk
@@ -28,8 +28,8 @@
 
 MASTER_SITES?=	${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-RUN_DEPENDS+=	${LOCALBASE}/bin/R:${PORTSDIR}/math/R
+BUILD_DEPENDS+=	${LOCALBASE}/bin/R:math/R
+RUN_DEPENDS+=	${LOCALBASE}/bin/R:math/R
 
 PKGNAMEPREFIX?=	R-cran-
 
Index: Mk/Uses/desktop-file-utils.mk
===================================================================
--- Mk/Uses/desktop-file-utils.mk
+++ Mk/Uses/desktop-file-utils.mk
@@ -15,8 +15,8 @@
 IGNORE=	USES=desktop-file-utils does not require args
 .endif
 
-BUILD_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
-RUN_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
+BUILD_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
+RUN_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
 PLIST_FILES+=	"@desktop-file-utils"
 
 .endif
Index: Mk/Uses/display.mk
===================================================================
--- Mk/Uses/display.mk
+++ Mk/Uses/display.mk
@@ -16,11 +16,11 @@
 .endif
 
 .if !defined(DISPLAY)
-BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-	${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
-	${LOCALBASE}/share/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
-	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
-	xkbcomp:${PORTSDIR}/x11/xkbcomp
+BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver \
+	${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
+	${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
+	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
+	xkbcomp:x11/xkbcomp
 
 XVFBPORT!=	port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port
 XVFBPIDFILE=	/tmp/.xvfb-${XVFBPORT}.pid
Index: Mk/Uses/drupal.mk
===================================================================
--- Mk/Uses/drupal.mk
+++ Mk/Uses/drupal.mk
@@ -81,7 +81,7 @@
 NO_BUILD?=	yes
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}
-RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE}
+RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${DRUPAL_BASE}
 
 PLIST_SUB+=	DRUPAL_MODDIR=${DRUPAL_MODDIR}
 PLIST_FILES+=	"@owner www" \
Index: Mk/Uses/elixir.mk
===================================================================
--- Mk/Uses/elixir.mk
+++ Mk/Uses/elixir.mk
@@ -58,11 +58,11 @@
 MIX_EXTRA_DIRS?=
 MIX_EXTRA_FILES?=
 
-BUILD_DEPENDS+=	elixir:${PORTSDIR}/lang/elixir
-RUN_DEPENDS+=	elixir:${PORTSDIR}/lang/elixir
+BUILD_DEPENDS+=	elixir:lang/elixir
+RUN_DEPENDS+=	elixir:lang/elixir
 
 .for depend in ${MIX_BUILD_DEPS}
-BUILD_DEPENDS+=	${depend:T}>=0:${PORTSDIR}/${depend}
+BUILD_DEPENDS+=	${depend:T}>=0:${depend}
 .endfor
 
 .for depend in ${MIX_RUN_DEPS}
Index: Mk/Uses/erlang.mk
===================================================================
--- Mk/Uses/erlang.mk
+++ Mk/Uses/erlang.mk
@@ -38,23 +38,23 @@
 # VERSION is used in every Erlang pkg-plist
 PLIST_SUB+=		VERSION="${PORTVERSION}"
 
-BUILD_DEPENDS+=	erl:${PORTSDIR}/lang/erlang
-RUN_DEPENDS+=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS+=	erl:lang/erlang
+RUN_DEPENDS+=	erl:lang/erlang
 
 .if ${erlang_ARGS:Mrebar}
-BUILD_DEPENDS+=	rebar>=0:${PORTSDIR}/devel/rebar
+BUILD_DEPENDS+=	rebar>=0:devel/rebar
 .endif
 
 .if ${erlang_ARGS:Mrebar3}
-BUILD_DEPENDS+=	rebar3>=0:${PORTSDIR}/devel/rebar3
+BUILD_DEPENDS+=	rebar3>=0:devel/rebar3
 .endif
 
 .for depend in ${ERL_BUILD_DEPS}
-BUILD_DEPENDS+=	${depend:T}>=0:${PORTSDIR}/${depend}
+BUILD_DEPENDS+=	${depend:T}>=0:${depend}
 .endfor
 
 .for depend in ${ERL_RUN_DEPS}
-RUN_DEPENDS+=	${depend:T}>=0:${PORTSDIR}/${depend}
+RUN_DEPENDS+=	${depend:T}>=0:${depend}
 .endfor
 
 .if ${erlang_ARGS:Mrebar}
Index: Mk/Uses/execinfo.mk
===================================================================
--- Mk/Uses/execinfo.mk
+++ Mk/Uses/execinfo.mk
@@ -19,7 +19,7 @@
 _INCLUDE_USES_EXECINFO_MK=	yes
 
 .if !exists(/usr/lib/libexecinfo.so)
-LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS+=	libexecinfo.so:devel/libexecinfo
 EXECINFO_CPPFLAGS=	-I${LOCALBASE}/include
 EXECINFO_LDFLAGS=	-L${LOCALBASE}/lib
 .endif
Index: Mk/Uses/fakeroot.mk
===================================================================
--- Mk/Uses/fakeroot.mk
+++ Mk/Uses/fakeroot.mk
@@ -10,7 +10,7 @@
 
 .if !defined(_INCLUDE_USES_FAKEROOT_MK)
 _INCLUDE_USES_FAKEROOT_MK=	yes
-BUILD_DEPENDS+=	fakeroot:${PORTSDIR}/security/fakeroot
+BUILD_DEPENDS+=	fakeroot:security/fakeroot
 .if ${UID} != 0
 FAKEROOT?=	fakeroot
 .endif
Index: Mk/Uses/fam.mk
===================================================================
--- Mk/Uses/fam.mk
+++ Mk/Uses/fam.mk
@@ -15,8 +15,8 @@
 .if !defined(_INCLUDE_USES_FAM_MK)
 _INCLUDE_USES_FAM_MK=	yes
 
-_fam_DEPENDS=	libfam.so.0:${PORTSDIR}/devel/fam
-_gamin_DEPENDS=	libfam.so.0:${PORTSDIR}/devel/gamin
+_fam_DEPENDS=	libfam.so.0:devel/fam
+_gamin_DEPENDS=	libfam.so.0:devel/gamin
 
 _FAM_SYSTEMS=	fam gamin
 _DEFAULT_FAM=	gamin
Index: Mk/Uses/fmake.mk
===================================================================
--- Mk/Uses/fmake.mk
+++ Mk/Uses/fmake.mk
@@ -16,7 +16,7 @@
 
 .if defined(.PARSEDIR)
 FMAKE=			${LOCALBASE}/bin/fmake
-BUILD_DEPENDS+=		${FMAKE}:${PORTSDIR}/devel/fmake
+BUILD_DEPENDS+=		${FMAKE}:devel/fmake
 CONFIGURE_ENV+=		MAKE=${FMAKE}
 MAKE_CMD=		${FMAKE}
 .endif
Index: Mk/Uses/fonts.mk
===================================================================
--- Mk/Uses/fonts.mk
+++ Mk/Uses/fonts.mk
@@ -51,11 +51,11 @@
 .endif
 
 .if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfcfontsdir)
-RUN_DEPENDS+=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS+=	fc-cache:x11-fonts/fontconfig
 .endif
 .if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
-RUN_DEPENDS+=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS+=	mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
 .endif
 
 FONTNAME?=	${PORTNAME}
Index: Mk/Uses/fortran.mk
===================================================================
--- Mk/Uses/fortran.mk
+++ Mk/Uses/fortran.mk
@@ -19,11 +19,11 @@
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 _GCC_VER=	${GCC_DEFAULT:S/.//}
 .if ${GCC_DEFAULT} == ${LANG_GCC_IS}
-BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
-RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
+BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc
+RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc
 .else
-BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
-RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
+BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
+RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
 .endif
 USE_BINUTILS=	yes
 F77=		gfortran${_GCC_VER}
@@ -33,8 +33,8 @@
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
 .elif ${fortran_ARGS} == ifort
-BUILD_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
-RUN_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
+BUILD_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
+RUN_DEPENDS+=	${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
 F77=		${LOCALBASE}/intel_fc_80/bin/ifort
 FC=		${LOCALBASE}/intel_fc_80/bin/ifort
 .else
Index: Mk/Uses/fuse.mk
===================================================================
--- Mk/Uses/fuse.mk
+++ Mk/Uses/fuse.mk
@@ -15,9 +15,9 @@
 IGNORE=	USES=fuse does not require args
 .endif
 
-LIB_DEPENDS+=	libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
 .if !exists(/sbin/mount_fusefs)
-RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
+RUN_DEPENDS+=	mount_fusefs:sysutils/fusefs-kmod
 .endif
 
 .endif
Index: Mk/Uses/gecko.mk
===================================================================
--- Mk/Uses/gecko.mk
+++ Mk/Uses/gecko.mk
@@ -31,8 +31,8 @@
 XPIDL?=		${LOCALBASE}/lib/${GECKO}/xpidl
 XPIDL_INCL?=	`${GECKO_CONFIG} --idlflags`
 
-BUILD_DEPENDS+=	libxul>=38:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	libxul>=38:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+=	libxul>=38:www/libxul
+RUN_DEPENDS+=	libxul>=38:www/libxul
 
 .elif ${gecko_ARGS:Mfirefox}
 
@@ -41,8 +41,8 @@
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
-38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-41_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
+41_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
@@ -61,7 +61,7 @@
 .endif
 
 # Dependence lines for different Seamonkey versions
-33_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+33_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
 
 .elif ${gecko_ARGS:Mthunderbird}
 
@@ -75,7 +75,7 @@
 .endif
 
 # Dependence lines for different Thunderbird versions
-38_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+38_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:mail/thunderbird
 
 .else
 IGNORE=	Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird
Index: Mk/Uses/gettext-runtime.mk
===================================================================
--- Mk/Uses/gettext-runtime.mk
+++ Mk/Uses/gettext-runtime.mk
@@ -16,13 +16,13 @@
 .endif
 
 .if ${gettext-runtime_ARGS:Mlib}
-LIB_DEPENDS+=	libintl.so:${PORTSDIR}/devel/gettext-runtime
+LIB_DEPENDS+=	libintl.so:devel/gettext-runtime
 .endif
 .if ${gettext-runtime_ARGS:Mbuild}
-BUILD_DEPENDS+=	gettext:${PORTSDIR}/devel/gettext-runtime
+BUILD_DEPENDS+=	gettext:devel/gettext-runtime
 .endif
 .if ${gettext-runtime_ARGS:Mrun}
-RUN_DEPENDS+=	gettext:${PORTSDIR}/devel/gettext-runtime
+RUN_DEPENDS+=	gettext:devel/gettext-runtime
 .endif
 
 .endif
Index: Mk/Uses/gettext-tools.mk
===================================================================
--- Mk/Uses/gettext-tools.mk
+++ Mk/Uses/gettext-tools.mk
@@ -16,10 +16,10 @@
 .endif
 
 .if ${gettext-tools_ARGS:Mbuild}
-BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext-tools
+BUILD_DEPENDS+=	msgfmt:devel/gettext-tools
 .endif
 .if ${gettext-tools_ARGS:Mrun}
-RUN_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext-tools
+RUN_DEPENDS+=	msgfmt:devel/gettext-tools
 .endif
 
 .endif
Index: Mk/Uses/ghostscript.mk
===================================================================
--- Mk/Uses/ghostscript.mk
+++ Mk/Uses/ghostscript.mk
@@ -101,9 +101,9 @@
 
 .for type in BUILD RUN
 .if defined(_GS_${type}_DEP)
-${type}_DEPENDS+=	${_GS_PORT}>=${_GS_VERSION_MINOR}:${PORTSDIR}/print/${_GS_PORT}
+${type}_DEPENDS+=	${_GS_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_PORT}
 .if ${_GS_ARGS:Mx11}
-${type}_DEPENDS+=	${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:${PORTSDIR}/print/${_GS_X11_PORT}
+${type}_DEPENDS+=	${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT}
 .endif
 .endif
 .endfor
Index: Mk/Uses/gmake.mk
===================================================================
--- Mk/Uses/gmake.mk
+++ Mk/Uses/gmake.mk
@@ -22,7 +22,7 @@
 _GMAKE_EXT=	-lite
 .endif
 
-BUILD_DEPENDS+=		gmake${_GMAKE_EXT}:${PORTSDIR}/devel/gmake${_GMAKE_EXT}
+BUILD_DEPENDS+=		gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT}
 CONFIGURE_ENV+=		MAKE=gmake${_GMAKE_EXT}
 MAKE_CMD=		gmake${_GMAKE_EXT}
 
Index: Mk/Uses/gnustep.mk
===================================================================
--- Mk/Uses/gnustep.mk
+++ Mk/Uses/gnustep.mk
@@ -42,7 +42,7 @@
 MAKE_ARGS+=messages=yes
 
 MAKEFILE=	GNUmakefile
-#MAKE_ENV+=	GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf
+#MAKE_ENV+=	GNUSTEP_CONFIG_FILE=devel/gnustep-make/files/GNUstep.conf
 GNU_CONFIGURE_PREFIX=	${GNUSTEP_PREFIX}
 
 .if ${MACHINE_ARCH} == "i386"
@@ -58,7 +58,7 @@
 
 .if defined(USE_GNUSTEP)
 .  if ${USE_GNUSTEP:Mbase}
-LIB_DEPENDS+=	libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+LIB_DEPENDS+=	libgnustep-base.so:lang/gnustep-base
 .  endif
 
 .  if ${USE_GNUSTEP:Mbuild}
@@ -69,17 +69,17 @@
 # conflicts.
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 CONFIGURE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
-BUILD_DEPENDS+=	gnustep-make>0:${PORTSDIR}/devel/gnustep-make
+BUILD_DEPENDS+=	gnustep-make>0:devel/gnustep-make
 .include "${USESDIR}/objc.mk"
 .  endif
 
 .  if ${USE_GNUSTEP:Mgui}
-LIB_DEPENDS+=	libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
+LIB_DEPENDS+=	libgnustep-gui.so:x11-toolkits/gnustep-gui
 .  endif
 
 .  if ${USE_GNUSTEP:Mback}
-BUILD_DEPENDS+=	gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back
-RUN_DEPENDS+=	gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back
+BUILD_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
+RUN_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
 .  endif
 
 .endif
Index: Mk/Uses/gperf.mk
===================================================================
--- Mk/Uses/gperf.mk
+++ Mk/Uses/gperf.mk
@@ -11,7 +11,7 @@
 _INCLUDE_USES_GPERF_MK=	yes
 
 .if !exists(/usr/bin/gperf)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gperf:devel/gperf
 GPERF=	${LOCALBASE}/bin/gperf
 .else
 _GPERF_VERSION!=	/usr/bin/gperf --version | head -1 || true
@@ -22,7 +22,7 @@
 .endif
 
 .if ${_GPERF_MAJ_VERSION} < 3
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gperf:devel/gperf
 GPERF=	${LOCALBASE}/bin/gperf
 .else
 GPERF=	/usr/bin/gperf
Index: Mk/Uses/gssapi.mk
===================================================================
--- Mk/Uses/gssapi.mk
+++ Mk/Uses/gssapi.mk
@@ -75,8 +75,8 @@
 .if !defined(_INCLUDE_USES_GSSAPI_MK)
 _INCLUDE_USES_GSSAPI_MK=	yes
 
-_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:${PORTSDIR}/security/heimdal
-_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5
+_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal
+_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5
 _HEADERS=	sys/types.h sys/stat.h stdint.h
 
 .undef _FIXUP_KRB5CONFIG
Index: Mk/Uses/horde.mk
===================================================================
--- Mk/Uses/horde.mk
+++ Mk/Uses/horde.mk
@@ -11,8 +11,8 @@
 
 MASTER_SITES?=	http://pear.horde.org/get/
 
-BUILD_DEPENDS+=	${PEARDIR}/.channels/pear.horde.org.reg:${PORTSDIR}/devel/pear-channel-horde
-RUN_DEPENDS+=	${PEARDIR}/.channels/pear.horde.org.reg:${PORTSDIR}/devel/pear-channel-horde
+BUILD_DEPENDS+=	${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
+RUN_DEPENDS+=	${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
 
 PKGNAMEPREFIX?=	pear-
 HORDE_DIR?=	www/horde
@@ -24,118 +24,118 @@
 DIST_SUBDIR=	Horde
 PEAR_CHANNEL=	horde
 
-horde-Horde_ActiveSync-DEPEND=	${PEARDIR}/Horde/ActiveSync.php:${PORTSDIR}/comms/pear-Horde_ActiveSync
-horde-Horde_Alarm-DEPEND=	${PEARDIR}/Horde/Alarm.php:${PORTSDIR}/devel/pear-Horde_Alarm
-horde-Horde_Auth-DEPEND=	${PEARDIR}/Horde/Auth.php:${PORTSDIR}/security/pear-Horde_Auth
-horde-Horde_Autoloader-DEPEND=	${PEARDIR}/Horde/Autoloader.php:${PORTSDIR}/devel/pear-Horde_Autoloader
-horde-Horde_Autoloader_Cache-DEPEND=	${PEARDIR}/Horde/Autoloader/Cache.php:${PORTSDIR}/devel/pear-Horde_Autoloader_Cache
-horde-Horde_Argv-DEPEND=	${PEARDIR}/Horde/Argv/Parser.php:${PORTSDIR}/devel/pear-Horde_Argv
-horde-Horde_Browser-DEPEND=	${PEARDIR}/Horde/Browser.php:${PORTSDIR}/www/pear-Horde_Browser
-horde-Horde_Cache-DEPEND=	${PEARDIR}/Horde/Cache.php:${PORTSDIR}/devel/pear-Horde_Cache
-horde-Horde_Cli-DEPEND=		${PEARDIR}/Horde/Cli.php:${PORTSDIR}/devel/pear-Horde_Cli
-horde-Horde_Compress-DEPEND=	${PEARDIR}/Horde/Compress.php:${PORTSDIR}/archivers/pear-Horde_Compress
-horde-Horde_Compress_Fast-DEPEND=	${PEARDIR}/Horde/Compress/Fast.php:${PORTSDIR}/archivers/pear-Horde_Compress_Fast
-horde-Horde_Constraint-DEPEND=	${PEARDIR}/Horde/Constraint.php:${PORTSDIR}/devel/pear-Horde_Constraint
-horde-Horde_Controller-DEPEND=	${PEARDIR}/Horde/Controller.php:${PORTSDIR}/devel/pear-Horde_Controller
-horde-Horde_Core-DEPEND=	${PEARDIR}/Horde.php:${PORTSDIR}/devel/pear-Horde_Core
-horde-Horde_Crypt-DEPEND=	${PEARDIR}/Horde/Crypt.php:${PORTSDIR}/security/pear-Horde_Crypt
-horde-Horde_Crypt_Blowfish-DEPEND=	${PEARDIR}/Horde/Crypt/Blowfish.php:${PORTSDIR}/security/pear-Horde_Crypt_Blowfish
-horde-Horde_CssMinify-DEPEND=	${PEARDIR}/Horde/CssMinify.php:${PORTSDIR}/textproc/pear-Horde_CssMinify
-horde-Horde_Css_Parser-DEPEND=	${PEARDIR}/Horde/Css/Parser.php:${PORTSDIR}/www/pear-Horde_Css_Parser
-horde-Horde_Data-DEPEND=	${PEARDIR}/Horde/Data.php:${PORTSDIR}/devel/pear-Horde_Data
-horde-Horde_Date-DEPEND=	${PEARDIR}/Horde/Date.php:${PORTSDIR}/devel/pear-Horde_Date
-horde-Horde_Date_Parser-DEPEND=	${PEARDIR}/Horde/Date/Parser.php:${PORTSDIR}/devel/pear-Horde_Date_Parser
-horde-Horde_Dav-DEPEND=		${PEARDIR}/Horde/Dav/Client.php:${PORTSDIR}/www/pear-Horde_Dav
-horde-Horde_Db-DEPEND=		${PEARDIR}/Horde/Db.php:${PORTSDIR}/databases/pear-Horde_Db
-horde-Horde_Editor-DEPEND=	${PEARDIR}/Horde/Editor.php:${PORTSDIR}/www/pear-Horde_Editor
-horde-Horde_Exception-DEPEND=	${PEARDIR}/Horde/Exception.php:${PORTSDIR}/devel/pear-Horde_Exception	
-horde-Horde_Feed-DEPEND=	${PEARDIR}/Horde/Feed.php:${PORTSDIR}/www/pear-Horde_Feed
-horde-Horde_Form-DEPEND=	${PEARDIR}/Horde/Form.php:${PORTSDIR}/www/pear-Horde_Form
-horde-Horde_Group-DEPEND=	${PEARDIR}/Horde/Group/Base.php:${PORTSDIR}/security/pear-Horde_Group
-horde-Horde_HashTable-DEPEND=	${PEARDIR}/Horde/HashTable/Base.php:${PORTSDIR}/databases/pear-Horde_HashTable
-horde-Horde_History-DEPEND=	${PEARDIR}/Horde/History.php:${PORTSDIR}/devel/pear-Horde_History
-horde-Horde_Http-DEPEND=	${PEARDIR}/Horde/Http.php:${PORTSDIR}/www/pear-Horde_Http
-horde-Horde_Icalendar-DEPEND=	${PEARDIR}/Horde/Icalendar.php:${PORTSDIR}/devel/pear-Horde_Icalendar
-horde-Horde_Idna-DEPEND=	${PEARDIR}/Horde/Idna.php:${PORTSDIR}/dns/pear-Horde_Idna
-horde-Horde_Image-DEPEND=	${PEARDIR}/Horde/Image.php:${PORTSDIR}/graphics/pear-Horde_Image
-horde-Horde_Imap_Client-DEPEND=	${PEARDIR}/Horde/Imap/Client.php:${PORTSDIR}/mail/pear-Horde_Imap_Client
-horde-Horde_Imsp-DEPEND=	${PEARDIR}/Horde/Imsp.php:${PORTSDIR}/databases/pear-Horde_Imsp
-horde-Horde_Itip-DEPEND=	${PEARDIR}/Horde/Itip.php:${PORTSDIR}/devel/pear-Horde_Itip
-horde-Horde_Injector-DEPEND=	${PEARDIR}/Horde/Injector.php:${PORTSDIR}/devel/pear-Horde_Injector
-horde-Horde_JavascriptMinify-DEPEND=	${PEARDIR}/Horde/JavascriptMinify.php:${PORTSDIR}/textproc/pear-Horde_JavascriptMinify
-horde-Horde_Kolab_Format-DEPEND=	${PEARDIR}/Horde/Kolab/Format.php:${PORTSDIR}/textproc/pear-Horde_Kolab_Format
-horde-Horde_Kolab_Server-DEPEND=	${PEARDIR}/Horde/Kolab/Server/Factory.php:${PORTSDIR}/net/pear-Horde_Kolab_Server
-horde-Horde_Kolab_Session-DEPEND=	${PEARDIR}/Horde/Kolab/Session.php:${PORTSDIR}/net/pear-Horde_Kolab_Session
-horde-Horde_Kolab_Storage-DEPEND=	${PEARDIR}/Horde/Kolab/Storage.php:${PORTSDIR}/mail/pear-Horde_Kolab_Storage
-horde-Horde_Ldap-DEPEND=	${PEARDIR}/Horde/Ldap.php:${PORTSDIR}/net/pear-Horde_Ldap
-horde-Horde_ListHeaders-DEPEND=	${PEARDIR}/Horde/ListHeaders.php:${PORTSDIR}/mail/pear-Horde_ListHeaders
-horde-Horde_Lock-DEPEND=	${PEARDIR}/Horde/Lock.php:${PORTSDIR}/devel/pear-Horde_Lock
-horde-Horde_Log-DEPEND=		${PEARDIR}/Horde/Log.php:${PORTSDIR}/sysutils/pear-Horde_Log
-horde-Horde_LoginTasks-DEPEND=	${PEARDIR}/Horde/LoginTasks.php:${PORTSDIR}/devel/pear-Horde_LoginTasks
-horde-Horde_Mail-DEPEND=	${PEARDIR}/Horde/Mail/Transport.php:${PORTSDIR}/mail/pear-Horde_Mail
-horde-Horde_Mail_Autoconfig-DEPEND=	${PEARDIR}/Horde/Mail/Autoconfig.php:${PORTSDIR}/mail/pear-Horde_Mail_Autoconfig
-horde-Horde_Mapi-DEPEND=	${PEARDIR}/Horde/Mapi.php:${PORTSDIR}/mail/pear-Horde_Mapi
-horde-Horde_Memcache-DEPEND=	${PEARDIR}/Horde/Memcache.php:${PORTSDIR}/databases/pear-Horde_Memcache
-horde-Horde_Mime-DEPEND=	${PEARDIR}/Horde/Mime.php:${PORTSDIR}/mail/pear-Horde_Mime
-horde-Horde_Mime_Viewer-DEPEND=	${PEARDIR}/Horde/Mime/Viewer.php:${PORTSDIR}/mail/pear-Horde_Mime_Viewer
-horde-Horde_Mongo-DEPEND=	${PEARDIR}/Horde/Mongo/Client.php:${PORTSDIR}/databases/pear-Horde_Mongo
-horde-Horde_Nls-DEPEND=		${PEARDIR}/Horde/Nls.php:${PORTSDIR}/devel/pear-Horde_Nls
-horde-Horde_Notification-DEPEND=	${PEARDIR}/Horde/Notification.php:${PORTSDIR}/devel/pear-Horde_Notification
-horde-Horde_Oauth-DEPEND=	${PEARDIR}/Horde/Oauth/Consumer.php:${PORTSDIR}/security/pear-Horde_Oauth
-horde-Horde_Pack-DEPEND=	${PEARDIR}/Horde/Pack.php:${PORTSDIR}/archivers/pear-Horde_Pack
-horde-Horde_Pdf-DEPEND=		${PEARDIR}/Horde/Pdf/Writer.php:${PORTSDIR}/textproc/pear-Horde_Pdf
-horde-Horde_Perms-DEPEND=	${PEARDIR}/Horde/Perms.php:${PORTSDIR}/security/pear-Horde_Perms
-horde-Horde_Prefs-DEPEND=	${PEARDIR}/Horde/Prefs.php:${PORTSDIR}/devel/pear-Horde_Prefs
-horde-Horde_Queue-DEPEND=	${PEARDIR}/Horde/Queue/Runner.php:${PORTSDIR}/devel/pear-Horde_Queue
-horde-Horde_Rdo-DEPEND=		${PEARDIR}/Horde/Rdo.php:${PORTSDIR}/devel/pear-Horde_Rdo
-horde-Horde_Role-DEPEND=	${PEARDIR}/PEAR/Installer/Role/Horde/Role.php:${PORTSDIR}/devel/pear-Horde_Role
-horde-Horde_Rpc-DEPEND=		${PEARDIR}/Horde/Rpc.php:${PORTSDIR}/net/pear-Horde_Rpc
-horde-Horde_Routes-DEPEND=	${PEARDIR}/Horde/Routes/Route.php:${PORTSDIR}/www/pear-Horde_Routes
-horde-Horde_Secret-DEPEND=	${PEARDIR}/Horde/Secret.php:${PORTSDIR}/security/pear-Horde_Secret
-horde-Horde_Serialize-DEPEND=	${PEARDIR}/Horde/Serialize.php:${PORTSDIR}/devel/pear-Horde_Serialize
-horde-Horde_SessionHandler-DEPEND=	${PEARDIR}/Horde/SessionHandler.php:${PORTSDIR}/www/pear-Horde_SessionHandler
-horde-Horde_Scheduler-DEPEND=	${PEARDIR}/Horde/Scheduler.php:${PORTSDIR}/devel/pear-Horde_Scheduler
-horde-Horde_Scribe-DEPEND=	${PEARDIR}/Horde/Scribe.php:${PORTSDIR}/net/pear-Horde_Scribe
-horde-Horde_Share-DEPEND=	${PEARDIR}/Horde/Share/Base.php:${PORTSDIR}/security/pear-Horde_Share
-horde-Horde_Smtp-DEPEND=	${PEARDIR}/Horde/Smtp.php:${PORTSDIR}/mail/pear-Horde_Smtp
-horde-Horde_Socket_Client-DEPEND=	${PEARDIR}/Horde/Socket/Client.php:${PORTSDIR}/net/pear-Horde_Socket_Client
-horde-Horde_SpellChecker-DEPEND=	${PEARDIR}/Horde/SpellChecker.php:${PORTSDIR}/textproc/pear-Horde_SpellChecker
-horde-Horde_Stream-DEPEND=	${PEARDIR}/Horde/Stream.php:${PORTSDIR}/devel/pear-Horde_Stream
-horde-Horde_Stream_Filter-DEPEND=	${PEARDIR}/Horde/Stream/Filter/Crc32.php:${PORTSDIR}/devel/pear-Horde_Stream_Filter
-horde-Horde_Stream_Wrapper-DEPEND=	${PEARDIR}/Horde/Stream/Wrapper/StringStream.php:${PORTSDIR}/devel/pear-Horde_Stream_Wrapper
-horde-Horde_Service_Facebook-DEPEND=	${PEARDIR}/Horde/Service/Facebook.php:${PORTSDIR}/www/pear-Horde_Service_Facebook
-horde-Horde_Service_Twitter-DEPEND=	${PEARDIR}/Horde/Service/Twitter.php:${PORTSDIR}/www/pear-Horde_Service_Twitter
-horde-Horde_Service_UrlShortener-DEPEND=	${PEARDIR}/Horde/Service/UrlShortener.php:${PORTSDIR}/www/pear-Horde_Service_UrlShortener
-horde-Horde_Service_Weather-DEPEND=	${PEARDIR}/Horde/Service/Weather.php:${PORTSDIR}/www/pear-Horde_Service_Weather
-horde-Horde_Support-DEPEND=	${PEARDIR}/Horde/Support/Array.php:${PORTSDIR}/devel/pear-Horde_Support
-horde-Horde_SyncMl-DEPEND=	${PEARDIR}/Horde/SyncMl.php:${PORTSDIR}/comms/pear-Horde_SyncMl
-horde-Horde_Url-DEPEND=		${PEARDIR}/Horde/Url.php:${PORTSDIR}/net/pear-Horde_Url	
-horde-Horde_Util-DEPEND=	${PEARDIR}/Horde/Util.php:${PORTSDIR}/devel/pear-Horde_Util	
-horde-Horde_Template-DEPEND=	${PEARDIR}/Horde/Template.php:${PORTSDIR}/www/pear-Horde_Template
-horde-Horde_Text_Diff-DEPEND=	${PEARDIR}/Horde/Text/Diff.php:${PORTSDIR}/textproc/pear-Horde_Text_Diff
-horde-Horde_Text_Filter-DEPEND=	${PEARDIR}/Horde/Text/Filter.php:${PORTSDIR}/textproc/pear-Horde_Text_Filter
-horde-Horde_Text_Filter_Csstidy-DEPEND=	${PEARDIR}/Horde/Text/Filter/Csstidy.php:${PORTSDIR}/textproc/pear-Horde_Text_Filter_Csstidy
-horde-Horde_Text_Flowed-DEPEND=	${PEARDIR}/Horde/Text/Flowed.php:${PORTSDIR}/textproc/pear-Horde_Text_Flowed
-horde-Horde_Thrift-DEPEND=	${PEARDIR}/Horde/Thrift.php:${PORTSDIR}/devel/pear-Horde_Thrift
-horde-Horde_Timezone-DEPEND=	${PEARDIR}/Horde/Timezone.php:${PORTSDIR}/devel/pear-Horde_Timezone
-horde-Horde_Token-DEPEND=	${PEARDIR}/Horde/Token.php:${PORTSDIR}/devel/pear-Horde_Token
-horde-Horde_Translation-DEPEND=	${PEARDIR}/Horde/Translation.php:${PORTSDIR}/devel/pear-Horde_Translation
-horde-Horde_Tree-DEPEND=	${PEARDIR}/Horde/Tree.php:${PORTSDIR}/devel/pear-Horde_Tree
-horde-Horde_Vfs-DEPEND=		${PEARDIR}/Horde/Vfs.php:${PORTSDIR}/sysutils/pear-Horde_Vfs
-horde-Horde_View-DEPEND=	${PEARDIR}/Horde/View.php:${PORTSDIR}/devel/pear-Horde_View
-horde-Horde_Xml_Element-DEPEND=	${PEARDIR}/Horde/Xml/Element.php:${PORTSDIR}/textproc/pear-Horde_Xml_Element
-horde-Horde_Xml_Wbxml-DEPEND=	${PEARDIR}/Horde/Xml/Wbxml.php:${PORTSDIR}/textproc/pear-Horde_Xml_Wbxml
-horde-content-DEPEND=		${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:${PORTSDIR}/devel/horde-content
-horde-gollem-DEPEND=		${LOCALBASE}/${HORDE_DIR}/gollem/index.php:${PORTSDIR}/ftp/horde-gollem
-horde-horde-DEPEND=		${LOCALBASE}/${HORDE_DIR}/index.php:${PORTSDIR}/www/horde-base
-horde-imp-DEPEND=		${LOCALBASE}/${HORDE_DIR}/imp/index.php:${PORTSDIR}/mail/horde-imp
-horde-ingo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/ingo/index.php:${PORTSDIR}/mail/horde-ingo
-horde-kronolith-DEPEND=		${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde-kronolith
-horde-mnemo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde-mnemo
-horde-nag-DEPEND=		${LOCALBASE}/${HORDE_DIR}/nag/index.php:${PORTSDIR}/deskutils/horde-nag
-horde-timeobjects-DEPEND=	${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:${PORTSDIR}/devel/horde-timeobjects
-horde-trean-DEPEND=		${LOCALBASE}/${HORDE_DIR}/trean/index.php:${PORTSDIR}/www/horde-trean
-horde-turba-DEPEND=		${LOCALBASE}/${HORDE_DIR}/turba/index.php:${PORTSDIR}/mail/horde-turba
+horde-Horde_ActiveSync-DEPEND=	${PEARDIR}/Horde/ActiveSync.php:comms/pear-Horde_ActiveSync
+horde-Horde_Alarm-DEPEND=	${PEARDIR}/Horde/Alarm.php:devel/pear-Horde_Alarm
+horde-Horde_Auth-DEPEND=	${PEARDIR}/Horde/Auth.php:security/pear-Horde_Auth
+horde-Horde_Autoloader-DEPEND=	${PEARDIR}/Horde/Autoloader.php:devel/pear-Horde_Autoloader
+horde-Horde_Autoloader_Cache-DEPEND=	${PEARDIR}/Horde/Autoloader/Cache.php:devel/pear-Horde_Autoloader_Cache
+horde-Horde_Argv-DEPEND=	${PEARDIR}/Horde/Argv/Parser.php:devel/pear-Horde_Argv
+horde-Horde_Browser-DEPEND=	${PEARDIR}/Horde/Browser.php:www/pear-Horde_Browser
+horde-Horde_Cache-DEPEND=	${PEARDIR}/Horde/Cache.php:devel/pear-Horde_Cache
+horde-Horde_Cli-DEPEND=		${PEARDIR}/Horde/Cli.php:devel/pear-Horde_Cli
+horde-Horde_Compress-DEPEND=	${PEARDIR}/Horde/Compress.php:archivers/pear-Horde_Compress
+horde-Horde_Compress_Fast-DEPEND=	${PEARDIR}/Horde/Compress/Fast.php:archivers/pear-Horde_Compress_Fast
+horde-Horde_Constraint-DEPEND=	${PEARDIR}/Horde/Constraint.php:devel/pear-Horde_Constraint
+horde-Horde_Controller-DEPEND=	${PEARDIR}/Horde/Controller.php:devel/pear-Horde_Controller
+horde-Horde_Core-DEPEND=	${PEARDIR}/Horde.php:devel/pear-Horde_Core
+horde-Horde_Crypt-DEPEND=	${PEARDIR}/Horde/Crypt.php:security/pear-Horde_Crypt
+horde-Horde_Crypt_Blowfish-DEPEND=	${PEARDIR}/Horde/Crypt/Blowfish.php:security/pear-Horde_Crypt_Blowfish
+horde-Horde_CssMinify-DEPEND=	${PEARDIR}/Horde/CssMinify.php:textproc/pear-Horde_CssMinify
+horde-Horde_Css_Parser-DEPEND=	${PEARDIR}/Horde/Css/Parser.php:www/pear-Horde_Css_Parser
+horde-Horde_Data-DEPEND=	${PEARDIR}/Horde/Data.php:devel/pear-Horde_Data
+horde-Horde_Date-DEPEND=	${PEARDIR}/Horde/Date.php:devel/pear-Horde_Date
+horde-Horde_Date_Parser-DEPEND=	${PEARDIR}/Horde/Date/Parser.php:devel/pear-Horde_Date_Parser
+horde-Horde_Dav-DEPEND=		${PEARDIR}/Horde/Dav/Client.php:www/pear-Horde_Dav
+horde-Horde_Db-DEPEND=		${PEARDIR}/Horde/Db.php:databases/pear-Horde_Db
+horde-Horde_Editor-DEPEND=	${PEARDIR}/Horde/Editor.php:www/pear-Horde_Editor
+horde-Horde_Exception-DEPEND=	${PEARDIR}/Horde/Exception.php:devel/pear-Horde_Exception	
+horde-Horde_Feed-DEPEND=	${PEARDIR}/Horde/Feed.php:www/pear-Horde_Feed
+horde-Horde_Form-DEPEND=	${PEARDIR}/Horde/Form.php:www/pear-Horde_Form
+horde-Horde_Group-DEPEND=	${PEARDIR}/Horde/Group/Base.php:security/pear-Horde_Group
+horde-Horde_HashTable-DEPEND=	${PEARDIR}/Horde/HashTable/Base.php:databases/pear-Horde_HashTable
+horde-Horde_History-DEPEND=	${PEARDIR}/Horde/History.php:devel/pear-Horde_History
+horde-Horde_Http-DEPEND=	${PEARDIR}/Horde/Http.php:www/pear-Horde_Http
+horde-Horde_Icalendar-DEPEND=	${PEARDIR}/Horde/Icalendar.php:devel/pear-Horde_Icalendar
+horde-Horde_Idna-DEPEND=	${PEARDIR}/Horde/Idna.php:dns/pear-Horde_Idna
+horde-Horde_Image-DEPEND=	${PEARDIR}/Horde/Image.php:graphics/pear-Horde_Image
+horde-Horde_Imap_Client-DEPEND=	${PEARDIR}/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client
+horde-Horde_Imsp-DEPEND=	${PEARDIR}/Horde/Imsp.php:databases/pear-Horde_Imsp
+horde-Horde_Itip-DEPEND=	${PEARDIR}/Horde/Itip.php:devel/pear-Horde_Itip
+horde-Horde_Injector-DEPEND=	${PEARDIR}/Horde/Injector.php:devel/pear-Horde_Injector
+horde-Horde_JavascriptMinify-DEPEND=	${PEARDIR}/Horde/JavascriptMinify.php:textproc/pear-Horde_JavascriptMinify
+horde-Horde_Kolab_Format-DEPEND=	${PEARDIR}/Horde/Kolab/Format.php:textproc/pear-Horde_Kolab_Format
+horde-Horde_Kolab_Server-DEPEND=	${PEARDIR}/Horde/Kolab/Server/Factory.php:net/pear-Horde_Kolab_Server
+horde-Horde_Kolab_Session-DEPEND=	${PEARDIR}/Horde/Kolab/Session.php:net/pear-Horde_Kolab_Session
+horde-Horde_Kolab_Storage-DEPEND=	${PEARDIR}/Horde/Kolab/Storage.php:mail/pear-Horde_Kolab_Storage
+horde-Horde_Ldap-DEPEND=	${PEARDIR}/Horde/Ldap.php:net/pear-Horde_Ldap
+horde-Horde_ListHeaders-DEPEND=	${PEARDIR}/Horde/ListHeaders.php:mail/pear-Horde_ListHeaders
+horde-Horde_Lock-DEPEND=	${PEARDIR}/Horde/Lock.php:devel/pear-Horde_Lock
+horde-Horde_Log-DEPEND=		${PEARDIR}/Horde/Log.php:sysutils/pear-Horde_Log
+horde-Horde_LoginTasks-DEPEND=	${PEARDIR}/Horde/LoginTasks.php:devel/pear-Horde_LoginTasks
+horde-Horde_Mail-DEPEND=	${PEARDIR}/Horde/Mail/Transport.php:mail/pear-Horde_Mail
+horde-Horde_Mail_Autoconfig-DEPEND=	${PEARDIR}/Horde/Mail/Autoconfig.php:mail/pear-Horde_Mail_Autoconfig
+horde-Horde_Mapi-DEPEND=	${PEARDIR}/Horde/Mapi.php:mail/pear-Horde_Mapi
+horde-Horde_Memcache-DEPEND=	${PEARDIR}/Horde/Memcache.php:databases/pear-Horde_Memcache
+horde-Horde_Mime-DEPEND=	${PEARDIR}/Horde/Mime.php:mail/pear-Horde_Mime
+horde-Horde_Mime_Viewer-DEPEND=	${PEARDIR}/Horde/Mime/Viewer.php:mail/pear-Horde_Mime_Viewer
+horde-Horde_Mongo-DEPEND=	${PEARDIR}/Horde/Mongo/Client.php:databases/pear-Horde_Mongo
+horde-Horde_Nls-DEPEND=		${PEARDIR}/Horde/Nls.php:devel/pear-Horde_Nls
+horde-Horde_Notification-DEPEND=	${PEARDIR}/Horde/Notification.php:devel/pear-Horde_Notification
+horde-Horde_Oauth-DEPEND=	${PEARDIR}/Horde/Oauth/Consumer.php:security/pear-Horde_Oauth
+horde-Horde_Pack-DEPEND=	${PEARDIR}/Horde/Pack.php:archivers/pear-Horde_Pack
+horde-Horde_Pdf-DEPEND=		${PEARDIR}/Horde/Pdf/Writer.php:textproc/pear-Horde_Pdf
+horde-Horde_Perms-DEPEND=	${PEARDIR}/Horde/Perms.php:security/pear-Horde_Perms
+horde-Horde_Prefs-DEPEND=	${PEARDIR}/Horde/Prefs.php:devel/pear-Horde_Prefs
+horde-Horde_Queue-DEPEND=	${PEARDIR}/Horde/Queue/Runner.php:devel/pear-Horde_Queue
+horde-Horde_Rdo-DEPEND=		${PEARDIR}/Horde/Rdo.php:devel/pear-Horde_Rdo
+horde-Horde_Role-DEPEND=	${PEARDIR}/PEAR/Installer/Role/Horde/Role.php:devel/pear-Horde_Role
+horde-Horde_Rpc-DEPEND=		${PEARDIR}/Horde/Rpc.php:net/pear-Horde_Rpc
+horde-Horde_Routes-DEPEND=	${PEARDIR}/Horde/Routes/Route.php:www/pear-Horde_Routes
+horde-Horde_Secret-DEPEND=	${PEARDIR}/Horde/Secret.php:security/pear-Horde_Secret
+horde-Horde_Serialize-DEPEND=	${PEARDIR}/Horde/Serialize.php:devel/pear-Horde_Serialize
+horde-Horde_SessionHandler-DEPEND=	${PEARDIR}/Horde/SessionHandler.php:www/pear-Horde_SessionHandler
+horde-Horde_Scheduler-DEPEND=	${PEARDIR}/Horde/Scheduler.php:devel/pear-Horde_Scheduler
+horde-Horde_Scribe-DEPEND=	${PEARDIR}/Horde/Scribe.php:net/pear-Horde_Scribe
+horde-Horde_Share-DEPEND=	${PEARDIR}/Horde/Share/Base.php:security/pear-Horde_Share
+horde-Horde_Smtp-DEPEND=	${PEARDIR}/Horde/Smtp.php:mail/pear-Horde_Smtp
+horde-Horde_Socket_Client-DEPEND=	${PEARDIR}/Horde/Socket/Client.php:net/pear-Horde_Socket_Client
+horde-Horde_SpellChecker-DEPEND=	${PEARDIR}/Horde/SpellChecker.php:textproc/pear-Horde_SpellChecker
+horde-Horde_Stream-DEPEND=	${PEARDIR}/Horde/Stream.php:devel/pear-Horde_Stream
+horde-Horde_Stream_Filter-DEPEND=	${PEARDIR}/Horde/Stream/Filter/Crc32.php:devel/pear-Horde_Stream_Filter
+horde-Horde_Stream_Wrapper-DEPEND=	${PEARDIR}/Horde/Stream/Wrapper/StringStream.php:devel/pear-Horde_Stream_Wrapper
+horde-Horde_Service_Facebook-DEPEND=	${PEARDIR}/Horde/Service/Facebook.php:www/pear-Horde_Service_Facebook
+horde-Horde_Service_Twitter-DEPEND=	${PEARDIR}/Horde/Service/Twitter.php:www/pear-Horde_Service_Twitter
+horde-Horde_Service_UrlShortener-DEPEND=	${PEARDIR}/Horde/Service/UrlShortener.php:www/pear-Horde_Service_UrlShortener
+horde-Horde_Service_Weather-DEPEND=	${PEARDIR}/Horde/Service/Weather.php:www/pear-Horde_Service_Weather
+horde-Horde_Support-DEPEND=	${PEARDIR}/Horde/Support/Array.php:devel/pear-Horde_Support
+horde-Horde_SyncMl-DEPEND=	${PEARDIR}/Horde/SyncMl.php:comms/pear-Horde_SyncMl
+horde-Horde_Url-DEPEND=		${PEARDIR}/Horde/Url.php:net/pear-Horde_Url	
+horde-Horde_Util-DEPEND=	${PEARDIR}/Horde/Util.php:devel/pear-Horde_Util	
+horde-Horde_Template-DEPEND=	${PEARDIR}/Horde/Template.php:www/pear-Horde_Template
+horde-Horde_Text_Diff-DEPEND=	${PEARDIR}/Horde/Text/Diff.php:textproc/pear-Horde_Text_Diff
+horde-Horde_Text_Filter-DEPEND=	${PEARDIR}/Horde/Text/Filter.php:textproc/pear-Horde_Text_Filter
+horde-Horde_Text_Filter_Csstidy-DEPEND=	${PEARDIR}/Horde/Text/Filter/Csstidy.php:textproc/pear-Horde_Text_Filter_Csstidy
+horde-Horde_Text_Flowed-DEPEND=	${PEARDIR}/Horde/Text/Flowed.php:textproc/pear-Horde_Text_Flowed
+horde-Horde_Thrift-DEPEND=	${PEARDIR}/Horde/Thrift.php:devel/pear-Horde_Thrift
+horde-Horde_Timezone-DEPEND=	${PEARDIR}/Horde/Timezone.php:devel/pear-Horde_Timezone
+horde-Horde_Token-DEPEND=	${PEARDIR}/Horde/Token.php:devel/pear-Horde_Token
+horde-Horde_Translation-DEPEND=	${PEARDIR}/Horde/Translation.php:devel/pear-Horde_Translation
+horde-Horde_Tree-DEPEND=	${PEARDIR}/Horde/Tree.php:devel/pear-Horde_Tree
+horde-Horde_Vfs-DEPEND=		${PEARDIR}/Horde/Vfs.php:sysutils/pear-Horde_Vfs
+horde-Horde_View-DEPEND=	${PEARDIR}/Horde/View.php:devel/pear-Horde_View
+horde-Horde_Xml_Element-DEPEND=	${PEARDIR}/Horde/Xml/Element.php:textproc/pear-Horde_Xml_Element
+horde-Horde_Xml_Wbxml-DEPEND=	${PEARDIR}/Horde/Xml/Wbxml.php:textproc/pear-Horde_Xml_Wbxml
+horde-content-DEPEND=		${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:devel/horde-content
+horde-gollem-DEPEND=		${LOCALBASE}/${HORDE_DIR}/gollem/index.php:ftp/horde-gollem
+horde-horde-DEPEND=		${LOCALBASE}/${HORDE_DIR}/index.php:www/horde-base
+horde-imp-DEPEND=		${LOCALBASE}/${HORDE_DIR}/imp/index.php:mail/horde-imp
+horde-ingo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/ingo/index.php:mail/horde-ingo
+horde-kronolith-DEPEND=		${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:deskutils/horde-kronolith
+horde-mnemo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:deskutils/horde-mnemo
+horde-nag-DEPEND=		${LOCALBASE}/${HORDE_DIR}/nag/index.php:deskutils/horde-nag
+horde-timeobjects-DEPEND=	${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:devel/horde-timeobjects
+horde-trean-DEPEND=		${LOCALBASE}/${HORDE_DIR}/trean/index.php:www/horde-trean
+horde-turba-DEPEND=		${LOCALBASE}/${HORDE_DIR}/turba/index.php:mail/horde-turba
 
 .if defined(USE_HORDE_RUN)
 . for DEP in ${USE_HORDE_RUN}
Index: Mk/Uses/iconv.mk
===================================================================
--- Mk/Uses/iconv.mk
+++ Mk/Uses/iconv.mk
@@ -24,11 +24,11 @@
 ICONV_LIB_PATH=		${LOCALBASE}/lib/libiconv.so
 
 .if ${iconv_ARGS:Mbuild}
-BUILD_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS+=	${ICONV_CMD}:converters/libiconv
 .elif ${iconv_ARGS:Mpatch}
-PATCH_DEPENDS+=	${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+PATCH_DEPENDS+=	${ICONV_CMD}:converters/libiconv
 .else
-LIB_DEPENDS+=	libiconv.so:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+=	libiconv.so:converters/libiconv
 .endif
 
 .else
@@ -44,7 +44,7 @@
 .if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
  || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
  || exists(${LOCALBASE}/include/iconv.h)
-BUILD_DEPENDS+=	libiconv>=1.14_9:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS+=	libiconv>=1.14_9:converters/libiconv
 CPPFLAGS+=	-DLIBICONV_PLUG
 CFLAGS+=	-DLIBICONV_PLUG
 CXXFLAGS+=	-DLIBICONV_PLUG
Index: Mk/Uses/imake.mk
===================================================================
--- Mk/Uses/imake.mk
+++ Mk/Uses/imake.mk
@@ -18,7 +18,7 @@
 IGNORE=		USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
 .endif
 
-BUILD_DEPENDS+=		imake:${PORTSDIR}/devel/imake
+BUILD_DEPENDS+=		imake:devel/imake
 
 .if defined(USE_GCC)
 IMAKECPP=		${CPP}
@@ -26,7 +26,7 @@
 .else
 IMAKECPP=		tradcpp
 IMAKECPPFLAGS=		-DCppCmd=tradcpp -DCcCmd=${CC} -DCplusplusCmd=${CXX}
-BUILD_DEPENDS+=		tradcpp:${PORTSDIR}/devel/tradcpp
+BUILD_DEPENDS+=		tradcpp:devel/tradcpp
 .endif
 MAKE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
 CONFIGURE_ENV+=		IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
Index: Mk/Uses/jpeg.mk
===================================================================
--- Mk/Uses/jpeg.mk
+++ Mk/Uses/jpeg.mk
@@ -23,14 +23,14 @@
 .endif
 
 .if ${jpeg_ARGS} == lib
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/${JPEG_PORT}
+LIB_DEPENDS+=	libjpeg.so:${JPEG_PORT}
 .elif ${jpeg_ARGS} == build
-BUILD_DEPENDS+=	cjpeg:${PORTSDIR}/${JPEG_PORT}
+BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
 .elif ${jpeg_ARGS} == run
-RUN_DEPENDS+=	cjpeg:${PORTSDIR}/${JPEG_PORT}
+RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
 .elif ${jpeg_ARGS} == both
-BUILD_DEPENDS+=	cjpeg:${PORTSDIR}/${JPEG_PORT}
-RUN_DEPENDS+=	cjpeg:${PORTSDIR}/${JPEG_PORT}
+BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
+RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
 .else
 IGNORE=		USES=jpeg - invalid args: [${jpeg_ARGS}] specified
 .endif
Index: Mk/Uses/lha.mk
===================================================================
--- Mk/Uses/lha.mk
+++ Mk/Uses/lha.mk
@@ -14,7 +14,7 @@
 IGNORE=	Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha'
 .endif
 
-EXTRACT_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
+EXTRACT_DEPENDS+=	lha:archivers/lha
 EXTRACT_CMD?=		${LHA_CMD}
 EXTRACT_BEFORE_ARGS?=	xfpw=${WRKDIR}
 EXTRACT_AFTER_ARGS?=
Index: Mk/Uses/libarchive.mk
===================================================================
--- Mk/Uses/libarchive.mk
+++ Mk/Uses/libarchive.mk
@@ -12,5 +12,5 @@
 _INCLUDE_USES_LIBARCHIVE_MK=	yes
 .include "${USESDIR}/localbase.mk"
 
-LIB_DEPENDS+=	libarchive.so.13:${PORTSDIR}/archivers/libarchive
+LIB_DEPENDS+=	libarchive.so.13:archivers/libarchive
 .endif
Index: Mk/Uses/libedit.mk
===================================================================
--- Mk/Uses/libedit.mk
+++ Mk/Uses/libedit.mk
@@ -12,5 +12,5 @@
 _INCLUDE_USES_LIBEDIT_MK=	yes
 .include "${USESDIR}/localbase.mk"
 
-LIB_DEPENDS+=	libedit.so.0:${PORTSDIR}/devel/libedit
+LIB_DEPENDS+=	libedit.so.0:devel/libedit
 .endif
Index: Mk/Uses/libtool.mk
===================================================================
--- Mk/Uses/libtool.mk
+++ Mk/Uses/libtool.mk
@@ -18,7 +18,7 @@
 _USES_POST+=	libtool
 
 .if ${libtool_ARGS:Mbuild}
-BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS+=	libtool:devel/libtool
 .endif
 .endif
 
Index: Mk/Uses/lua.mk
===================================================================
--- Mk/Uses/lua.mk
+++ Mk/Uses/lua.mk
@@ -97,11 +97,11 @@
 		LUA_LIBDIR=${LUA_LIBDIR}
 
 .if ${lua_ARGS:Mbuild}
-BUILD_DEPENDS+=	${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
+BUILD_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
 .elif ${lua_ARGS:Mrun}
-RUN_DEPENDS+=	${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
+RUN_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
 .else
-LIB_DEPENDS+=	liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR}
+LIB_DEPENDS+=	liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
 .endif
 
 .endif
Index: Mk/Uses/makeinfo.mk
===================================================================
--- Mk/Uses/makeinfo.mk
+++ Mk/Uses/makeinfo.mk
@@ -16,7 +16,7 @@
 .endif
 
 .if !exists(/usr/bin/makeinfo)
-BUILD_DEPENDS+=	makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS+=	makeinfo:print/texinfo
 .endif
 
 .endif
Index: Mk/Uses/makeself.mk
===================================================================
--- Mk/Uses/makeself.mk
+++ Mk/Uses/makeself.mk
@@ -14,7 +14,7 @@
 IGNORE=	Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments
 .endif
 
-EXTRACT_DEPENDS+=	${UNMAKESELF_CMD}:${PORTSDIR}/archivers/unmakeself
+EXTRACT_DEPENDS+=	${UNMAKESELF_CMD}:archivers/unmakeself
 
 EXTRACT_CMD=	${UNMAKESELF_CMD}
 EXTRACT_BEFORE_ARGS=
Index: Mk/Uses/mono.mk
===================================================================
--- Mk/Uses/mono.mk
+++ Mk/Uses/mono.mk
@@ -19,8 +19,8 @@
 MONO_SHARED_DIR=	${WRKDIR}
 CONFIGURE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}"
 MAKE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC
-BUILD_DEPENDS+=		mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS+=		mono:${PORTSDIR}/lang/mono
+BUILD_DEPENDS+=		mono:lang/mono
+RUN_DEPENDS+=		mono:lang/mono
 
 # Set the location that webaps served by XSP should use.
 XSP_DOCROOT=		${PREFIX}/www/xsp
Index: Mk/Uses/motif.mk
===================================================================
--- Mk/Uses/motif.mk
+++ Mk/Uses/motif.mk
@@ -18,10 +18,10 @@
 .endif
 
 .if defined(WANT_LESSTIF)
-LIB_DEPENDS+=		libXm.so:${PORTSDIR}/x11-toolkits/lesstif
+LIB_DEPENDS+=		libXm.so:x11-toolkits/lesstif
 .else
 USE_XORG+=	xpm
-LIB_DEPENDS+=		libXm.so.4:${PORTSDIR}/x11-toolkits/open-motif
+LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
 .endif
 
 MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp
Index: Mk/Uses/ncurses.mk
===================================================================
--- Mk/Uses/ncurses.mk
+++ Mk/Uses/ncurses.mk
@@ -73,8 +73,8 @@
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	5
 
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
-RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
+RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 NCURSESRPATH=		${NCURSESBASE}/lib
 
 .else
Index: Mk/Uses/ninja.mk
===================================================================
--- Mk/Uses/ninja.mk
+++ Mk/Uses/ninja.mk
@@ -21,7 +21,7 @@
 MAKE_ARGS+=	-v
 .endif
 
-BUILD_DEPENDS+=	ninja:${PORTSDIR}/devel/ninja
+BUILD_DEPENDS+=	ninja:devel/ninja
 
 CMAKE_ARGS+=	-GNinja
 MAKEFILE=
Index: Mk/Uses/objc.mk
===================================================================
--- Mk/Uses/objc.mk
+++ Mk/Uses/objc.mk
@@ -46,7 +46,7 @@
 CPP=	/usr/bin/clang-cpp
 CXX=	/usr/bin/clang++
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34
 CPP=	${LOCALBASE}/bin/clang-cpp34
 CC=	${LOCALBASE}/bin/clang34
 CXX=	${LOCALBASE}/bin/clang++34
@@ -58,7 +58,7 @@
 .endif
 
 .if ! ${objc_ARGS:Mcompiler}
-LIB_DEPENDS+=	libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
+LIB_DEPENDS+=	libobjc.so.4.6:lang/libobjc2
 OBJCFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
Index: Mk/Uses/openal.mk
===================================================================
--- Mk/Uses/openal.mk
+++ Mk/Uses/openal.mk
@@ -17,9 +17,9 @@
 
 _valid_ARGS=	al si soft alut
 
-_si_DEPENDS=	libopenal.so.0:${PORTSDIR}/audio/openal
-_soft_DEPENDS=	libopenal.so.1:${PORTSDIR}/audio/openal-soft
-_alut_DEPENDS=	libalut.so.0:${PORTSDIR}/audio/freealut
+_si_DEPENDS=	libopenal.so.0:audio/openal
+_soft_DEPENDS=	libopenal.so.1:audio/openal-soft
+_alut_DEPENDS=	libalut.so.0:audio/freealut
 
 _OPENAL_LIBS=	si soft
 _DEFAULT_OPENAL=	soft
Index: Mk/Uses/pear.mk
===================================================================
--- Mk/Uses/pear.mk
+++ Mk/Uses/pear.mk
@@ -23,8 +23,8 @@
 EXTRACT_SUFX?=	.tgz
 DIST_SUBDIR?=	PEAR
 
-BUILD_DEPENDS+=	pear:${PORTSDIR}/devel/pear
-RUN_DEPENDS+=	pear:${PORTSDIR}/devel/pear
+BUILD_DEPENDS+=	pear:devel/pear
+RUN_DEPENDS+=	pear:devel/pear
 
 .if !defined(USE_PHPIZE)
 NO_BUILD=	yes
@@ -76,7 +76,7 @@
 		TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
 		SCRIPTFILESDIR=${LCRIPTSDIR}
 
-PKGINSTALL?=	${PORTSDIR}/devel/pear/pear-install
+PKGINSTALL?=	devel/pear/pear-install
 PKGDEINSTALL?=	${WRKDIR}/pear-deinstall
 
 .endif
@@ -139,7 +139,7 @@
 .endif
 
 do-generate-deinstall-script:
-	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${PORTSDIR}/devel/pear/pear-deinstall.in > ${WRKDIR}/pear-deinstall
+	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' devel/pear/pear-deinstall.in > ${WRKDIR}/pear-deinstall
 
 pear-post-install:
 	@${MKDIR} ${STAGEDIR}${PKGREGDIR}
Index: Mk/Uses/perl5.mk
===================================================================
--- Mk/Uses/perl5.mk
+++ Mk/Uses/perl5.mk
@@ -200,13 +200,13 @@
 DESTDIRNAME=	--destdir
 .if ${_USE_PERL5:Mmodbuild}
 .if ${PORTNAME} != Module-Build
-BUILD_DEPENDS+=	p5-Module-Build>=0.4206:${PORTSDIR}/devel/p5-Module-Build
+BUILD_DEPENDS+=	p5-Module-Build>=0.4206:devel/p5-Module-Build
 .endif
 CONFIGURE_ARGS+=--create_packlist 1
 .endif
 .if ${_USE_PERL5:Mmodbuildtiny}
 .if ${PORTNAME} != Module-Build-Tiny
-BUILD_DEPENDS+=	p5-Module-Build-Tiny>=0.039:${PORTSDIR}/devel/p5-Module-Build-Tiny
+BUILD_DEPENDS+=	p5-Module-Build-Tiny>=0.039:devel/p5-Module-Build-Tiny
 .endif
 CONFIGURE_ARGS+=--create_packlist 1
 .endif
@@ -226,19 +226,19 @@
 .endif # configure
 
 .if ${_USE_PERL5:Mextract}
-EXTRACT_DEPENDS+=	${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+EXTRACT_DEPENDS+=	${PERL5_DEPEND}:lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mpatch}
-PATCH_DEPENDS+=		${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+PATCH_DEPENDS+=		${PERL5_DEPEND}:lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mbuild}
-BUILD_DEPENDS+=		${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+BUILD_DEPENDS+=		${PERL5_DEPEND}:lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mrun}
-RUN_DEPENDS+=		${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+RUN_DEPENDS+=		${PERL5_DEPEND}:lang/${PERL_PORT}
 .endif
 
 .if ${_USE_PERL5:Mconfigure}
Index: Mk/Uses/pgsql.mk
===================================================================
--- Mk/Uses/pgsql.mk
+++ Mk/Uses/pgsql.mk
@@ -122,7 +122,7 @@
 .    endif # IGNORE_WITH_PGSQL
 
 .if !defined(WANT_PGSQL) || ${WANT_PGSQL} == lib
-LIB_DEPENDS+=	libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-client
+LIB_DEPENDS+=	libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client
 .endif
 
 _USE_PGSQL_DEP=		client contrib docs pgtcl pltcl plperl server
@@ -136,10 +136,10 @@
 .    if defined(WANT_PGSQL)
 .      for depend in ${_USE_PGSQL_DEP}
 .        if ${WANT_PGSQL:M${depend}}
-BUILD_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}
-RUN_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}
+BUILD_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend}
+RUN_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend}
 .        elif ${WANT_PGSQL:M${depend}\:*}
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}:${WANT_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
+BUILD_DEPENDS+=	${NONEXISTENT}:databases/postgresql${PGSQL_VER_NODOT}-${depend}:${WANT_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
 .        endif
 .      endfor
 .    endif
Index: Mk/Uses/pkgconfig.mk
===================================================================
--- Mk/Uses/pkgconfig.mk
+++ Mk/Uses/pkgconfig.mk
@@ -11,7 +11,7 @@
 .if !defined(_INCLUDE_USES_PKGCONFIG_MK)
 _INCLUDE_USES_PKGCONFIG_MK=	yes
 
-_PKGCONFIG_DEPENDS=	pkgconf:${PORTSDIR}/devel/pkgconf
+_PKGCONFIG_DEPENDS=	pkgconf:devel/pkgconf
 
 .if empty(pkgconfig_ARGS)
 pkgconfig_ARGS=	build
Index: Mk/Uses/pure.mk
===================================================================
--- Mk/Uses/pure.mk
+++ Mk/Uses/pure.mk
@@ -23,11 +23,11 @@
 .    endif
 .endfor
 
-LIB_DEPENDS+=	libpure.so:${PORTSDIR}/lang/pure
+LIB_DEPENDS+=	libpure.so:lang/pure
 .include "${USESDIR}/gmake.mk"
 
 .if ${pure_ARGS:Mffi}
-RUN_DEPENDS+=	${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi
+RUN_DEPENDS+=	${LOCALBASE}/lib/pure/ffi.pure:devel/pure-ffi
 .endif
 
 MAKE_ARGS+=	prefix=${PREFIX} mandir=${PREFIX}/man \
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -220,7 +220,7 @@
 _PYTHON_VERSIONS=		2.7 3.4 3.5 3.3 3.2	# preferred first
 _PYTHON_PORTBRANCH=		2.7		# ${_PYTHON_VERSIONS:[1]}
 _PYTHON_BASECMD=		${LOCALBASE}/bin/python
-_PYTHON_RELPORTDIR=		${PORTSDIR}/lang/python
+_PYTHON_RELPORTDIR=		lang/python
 
 # Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
 .for var in ${USE_PYTHON}
@@ -382,7 +382,7 @@
 PYTHON_REL=		# empty
 PYTHON_ABIVER=		# empty
 PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
-PYTHON_PORTVERSION!=	${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR}
+PYTHON_PORTVERSION!=	${MAKE} -V PORTVERSION -C ${PORTSDIR}/${PYTHON_PORTSDIR}
 # Create a 4 integer version string, prefixing 0 to the last token if
 # it's a single character. Only use the the first 3 tokens of
 # PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
@@ -448,8 +448,8 @@
 _CURRENTPORT:=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 .if defined(_PYTHON_FEATURE_DISTUTILS) && \
 	${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools
-BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
+BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
 .endif
 
 # distutils support
@@ -535,9 +535,9 @@
 CMAKE_ARGS+=	-DPython_ADDITIONAL_VERSIONS=${PYTHON_VER}
 
 # Python 3rd-party modules
-PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
-PYNUMERIC=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
-PYNUMPY=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
+PYGAME=		${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
+PYNUMERIC=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:math/py-numeric
+PYNUMPY=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
 
 # dependencies
 .if defined(_PYTHON_BUILD_DEP)
Index: Mk/Uses/qmail.mk
===================================================================
--- Mk/Uses/qmail.mk
+++ Mk/Uses/qmail.mk
@@ -53,9 +53,9 @@
 .  endif
 
 .  if defined(QMAIL_SLAVEPORT)
-_QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:tl}
+_QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:mail/qmail-${QMAIL_SLAVEPORT:tl}
 .  else
-_QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
+_QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:mail/qmail
 .  endif
 
 .endif
Index: Mk/Uses/readline.mk
===================================================================
--- Mk/Uses/readline.mk
+++ Mk/Uses/readline.mk
@@ -16,7 +16,7 @@
 .endif
 
 .if ${readline_ARGS} == port
-LIB_DEPENDS+=		libreadline.so.6:${PORTSDIR}/devel/readline
+LIB_DEPENDS+=		libreadline.so.6:devel/readline
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 .endif
Index: Mk/Uses/scons.mk
===================================================================
--- Mk/Uses/scons.mk
+++ Mk/Uses/scons.mk
@@ -22,7 +22,7 @@
 LIBPATH?=		${LOCALBASE}/lib
 CPPPATH?=		${LOCALBASE}/include
 SCONS=			${LOCALBASE}/bin/scons
-BUILD_DEPENDS+=		${SCONS}:${PORTSDIR}/devel/scons
+BUILD_DEPENDS+=		${SCONS}:devel/scons
 MAKE_CMD=		${SCONS}
 MAKE_ARGS+=	CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}"  \
Index: Mk/Uses/shared-mime-info.mk
===================================================================
--- Mk/Uses/shared-mime-info.mk
+++ Mk/Uses/shared-mime-info.mk
@@ -15,8 +15,8 @@
 IGNORE=	USES=shared-mime-info does not require args
 .endif
 
-BUILD_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
-RUN_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+BUILD_DEPENDS+=	update-mime-database:misc/shared-mime-info
+RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info
 PLIST_FILES+=	"@shared-mime-info share/mime"
 
 .endif
Index: Mk/Uses/tcl.mk
===================================================================
--- Mk/Uses/tcl.mk
+++ Mk/Uses/tcl.mk
@@ -172,19 +172,19 @@
 # Construct the correct dependency lines (wrapper)
 .if ${tcl_ARGS:Mwrapper}
 .  if ${_TCLTK_PORT} == "tcl"
-_TCLTK_WRAPPER_PORT=	tclsh:${PORTSDIR}/lang/tcl-wrapper
+_TCLTK_WRAPPER_PORT=	tclsh:lang/tcl-wrapper
 .  elif ${_TCLTK_PORT} == "tk"
-_TCLTK_WRAPPER_PORT=	wish:${PORTSDIR}/x11-toolkits/tk-wrapper
+_TCLTK_WRAPPER_PORT=	wish:x11-toolkits/tk-wrapper
 .  endif
 .endif
 
 # Construct the correct dependency lines (Tcl/Tk)
 .  if ${_TCLTK_PORT} == "tcl"
-_TCLTK_EXE_LINE=	tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${_TCLTK_WANTED_VERSION}
-_TCLTK_LIB_LINE=	libtcl${TCL_SHLIB_VER}.so:${PORTSDIR}/lang/tcl${_TCLTK_WANTED_VERSION}
+_TCLTK_EXE_LINE=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
+_TCLTK_LIB_LINE=	libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
 .  elif ${_TCLTK_PORT} == "tk"
-_TCLTK_EXE_LINE=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}
-_TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}
+_TCLTK_EXE_LINE=	wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
+_TCLTK_LIB_LINE=	libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
 .endif
 
 .if ${tcl_ARGS:Mbuild}
Index: Mk/Uses/twisted.mk
===================================================================
--- Mk/Uses/twisted.mk
+++ Mk/Uses/twisted.mk
@@ -26,25 +26,25 @@
 
 # If neither build nor run are specified add both.
 .if ${twisted_ARGS:Mbuild} || empty(twisted_ARGS:Mrun)
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:devel/py-twistedCore
 .endif
 .if ${twisted_ARGS:Mrun} || empty(twisted_ARGS:Mbuild)
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:devel/py-twistedCore
 .endif
 
 _TWISTED_COMPONENTS=	conch flow lore mail names news pair runner web web2 words
 
-conch_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
-flow_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:${PORTSDIR}/devel/py-twistedFlow
-lore_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:${PORTSDIR}/textproc/py-twistedLore
-mail_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
-names_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames
-news_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/news/__init__.py:${PORTSDIR}/news/py-twistedNews
-pair_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:${PORTSDIR}/net/py-twistedPair
-runner_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:${PORTSDIR}/devel/py-twistedRunner
-web2_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:${PORTSDIR}/www/py-twistedWeb2
-web_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
-words_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
+conch_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:security/py-twistedConch
+flow_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:devel/py-twistedFlow
+lore_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:textproc/py-twistedLore
+mail_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:mail/py-twistedMail
+names_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/names/__init__.py:dns/py-twistedNames
+news_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/news/__init__.py:news/py-twistedNews
+pair_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:net/py-twistedPair
+runner_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:devel/py-twistedRunner
+web2_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:www/py-twistedWeb2
+web_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/web/__init__.py:www/py-twistedWeb
+words_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/words/__init__.py:net-im/py-twistedWords
 
 .for component in ${twisted_ARGS:Nbuild:Nrun}
 .  if ${_TWISTED_COMPONENTS:M${component}}==""
Index: Mk/Uses/xfce.mk
===================================================================
--- Mk/Uses/xfce.mk
+++ Mk/Uses/xfce.mk
@@ -27,33 +27,33 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=	-L${LOCALBASE}/lib
 
-garcon_LIB_DEPENDS=	libgarcon-1.so:${PORTSDIR}/sysutils/garcon
+garcon_LIB_DEPENDS=	libgarcon-1.so:sysutils/garcon
 garcon_USE_XFCE_REQ=	libmenu
 
-libexo_LIB_DEPENDS=	libexo-1.so:${PORTSDIR}/x11/libexo
+libexo_LIB_DEPENDS=	libexo-1.so:x11/libexo
 libexo_USE_XFCE_REQ=	libmenu
 
-libgui_LIB_DEPENDS=	libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_LIB_DEPENDS=	libxfcegui4.so:x11-toolkits/libxfce4gui
 libgui_USE_XFCE_REQ=	libutil
 
-libmenu_LIB_DEPENDS=	libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_LIB_DEPENDS=	libxfce4ui-1.so:x11/libxfce4menu
 libmenu_DETECT=	${LOCALBASE}/lib/libxfce4ui-1.so
 libmenu_GTK3_DETECT=	${LOCALBASE}/lib/libxfce4ui-2.so
 libmenu_USE_XFCE_REQ=	xfconf
 
-libutil_LIB_DEPENDS=	libxfce4util.so:${PORTSDIR}/x11/libxfce4util
+libutil_LIB_DEPENDS=	libxfce4util.so:x11/libxfce4util
 
-panel_LIB_DEPENDS=	libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_LIB_DEPENDS=	libxfce4panel-1.0.so:x11-wm/xfce4-panel
+panel_RUN_DEPENDS=	xfce4-panel:x11-wm/xfce4-panel
 panel_DETECT=	${LOCALBASE}/lib/libxfce4panel-1.0.so
 panel_GTK3_DETECT=	${LOCALBASE}/lib/libxfce4panel-2.0.so
 panel_USE_XFCE_REQ=	garcon libexo xfconf
 
-thunar_LIB_DEPENDS=	libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS=	Thunar:${PORTSDIR}/x11-fm/thunar
+thunar_LIB_DEPENDS=	libthunarx-2.so:x11-fm/thunar
+thunar_RUN_DEPENDS=	Thunar:x11-fm/thunar
 thunar_USE_XFCE_REQ=	xfconf libmenu
 
-xfconf_LIB_DEPENDS=	libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf
+xfconf_LIB_DEPENDS=	libxfconf-0.so:x11/xfce4-conf
 xfconf_USE_XFCE_REQ=	libutil
 
 .if defined(USE_XFCE)
Index: Mk/Uses/zip.mk
===================================================================
--- Mk/Uses/zip.mk
+++ Mk/Uses/zip.mk
@@ -18,7 +18,7 @@
 .if empty(zip_ARGS)
 EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
 .elif ${zip_ARGS} == "infozip"
-EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 EXTRACT_CMD?=		${UNZIP_CMD}
 .else
 IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
Index: Mk/Uses/zope.mk
===================================================================
--- Mk/Uses/zope.mk
+++ Mk/Uses/zope.mk
@@ -77,7 +77,7 @@
 
 # Zope-related variables
 .if ${ZOPE_VERSION} == ${_ZOPE_PORTBRANCH}
-RUN_DEPENDS+=	zope213>0:${PORTSDIR}/www/zope213
+RUN_DEPENDS+=	zope213>0:www/zope213
 .else
 _USES_sanity+=	300:check-makevars-zope
 check-makevars-zope:
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1556,7 +1556,7 @@
 				PORTSDIR="${PORTSDIR}"
 
 .if defined(X_BUILD_FOR)
-BUILD_DEPENDS+=	${X_BUILD_FOR}-cc:${PORTSDIR}/devel/${X_BUILD_FOR}-xdev
+BUILD_DEPENDS+=	${X_BUILD_FOR}-cc:devel/${X_BUILD_FOR}-xdev
 PKG_ENV+=		ABI_FILE=${X_SYSROOT}/usr/lib/crt1.o
 MAKE_ENV+=		NM=${NM} \
 				STRIPBIN=${X_BUILD_FOR}-strip \
@@ -1650,7 +1650,7 @@
 MAKE_ENV+=		SHELL=${MAKE_SHELL} NO_LINT=YES
 
 .if defined(PATCHFILES) && ${PATCHFILES:M*.zip}
-PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:archivers/unzip
 .endif
 
 # Check the compatibility layer for amd64/ia64
@@ -1689,7 +1689,7 @@
 .endif
 
 .if !defined(PKG_DEPENDS) && !defined(CLEAN_FETCH_ENV)
-PKG_DEPENDS+=	${LOCALBASE}/sbin/pkg:${PORTSDIR}/${PKG_ORIGIN}
+PKG_DEPENDS+=	${LOCALBASE}/sbin/pkg:${PKG_ORIGIN}
 .endif
 
 .if defined(USE_GCC)
@@ -1697,7 +1697,7 @@
 .endif
 
 .if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 BINUTILS?=	ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \
 	READELF SIZE STRINGS
 BINUTILS_NO_MAKE_ENV?=
@@ -1763,13 +1763,13 @@
 # don't forget to update the Handbook!
 
 .	if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX})
-LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
+LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:emulators/linux_base-${USE_LINUX}
 .	else
 .		if ${USE_LINUX:tl} == "yes"
 USE_LINUX=	c6
-LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
+LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6
 .		elif ${USE_LINUX} == "c6_64"
-LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:${PORTSDIR}/emulators/linux_base-c6
+LINUX_BASE_PORT=	${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6
 .		else
 IGNORE=		cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
 .		endif
@@ -1793,19 +1793,19 @@
 
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 
-_GL_gbm_LIB_DEPENDS=		libgbm.so:${PORTSDIR}/graphics/gbm
-_GL_glesv2_BUILD_DEPENDS=		libglesv2>0:${PORTSDIR}/graphics/libglesv2
-_GL_glesv2_RUN_DEPENDS=		libglesv2>0:${PORTSDIR}/graphics/libglesv2
-_GL_egl_BUILD_DEPENDS=		libEGL>0:${PORTSDIR}/graphics/libEGL
-_GL_egl_RUN_DEPENDS=		libEGL>0:${PORTSDIR}/graphics/libEGL
-_GL_gl_BUILD_DEPENDS=		libGL>0:${PORTSDIR}/graphics/libGL
-_GL_gl_RUN_DEPENDS=		libGL>0:${PORTSDIR}/graphics/libGL
+_GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/gbm
+_GL_glesv2_BUILD_DEPENDS=		libglesv2>0:graphics/libglesv2
+_GL_glesv2_RUN_DEPENDS=		libglesv2>0:graphics/libglesv2
+_GL_egl_BUILD_DEPENDS=		libEGL>0:graphics/libEGL
+_GL_egl_RUN_DEPENDS=		libEGL>0:graphics/libEGL
+_GL_gl_BUILD_DEPENDS=		libGL>0:graphics/libGL
+_GL_gl_RUN_DEPENDS=		libGL>0:graphics/libGL
 _GL_gl_USE_XORG=		glproto dri2proto
-_GL_glew_LIB_DEPENDS=		libGLEW.so:${PORTSDIR}/graphics/glew
-_GL_glu_LIB_DEPENDS=		libGLU.so:${PORTSDIR}/graphics/libGLU
+_GL_glew_LIB_DEPENDS=		libGLEW.so:graphics/glew
+_GL_glu_LIB_DEPENDS=		libGLU.so:graphics/libGLU
 _GL_glu_USE_XORG=		glproto dri2proto
-_GL_glw_LIB_DEPENDS=		libGLw.so:${PORTSDIR}/graphics/libGLw
-_GL_glut_LIB_DEPENDS=		libglut.so:${PORTSDIR}/graphics/freeglut
+_GL_glw_LIB_DEPENDS=		libGLw.so:graphics/libGLw
+_GL_glut_LIB_DEPENDS=		libglut.so:graphics/freeglut
 
 .if defined(USE_GL)
 . if ${USE_GL:tl} == "yes"
@@ -2673,7 +2673,7 @@
 .endif
 
 .if defined(INFO)
-RUN_DEPENDS+=	indexinfo:${PORTSDIR}/print/indexinfo
+RUN_DEPENDS+=	indexinfo:print/indexinfo
 
 . for D in ${INFO:H}
 RD:=	${D}
@@ -4425,7 +4425,7 @@
 
 # Used by fetch-required and fetch-required list, this script looks
 # at each of the dependencies. If 3 items are specified in the tuple,
-# such as foo:${PORTSDIR}/graphics/foo:extract, the first item (foo)
+# such as foo:graphics/foo:extract, the first item (foo)
 # is examined. Only if it begins with a / and does not exist on the
 # file-system will ``make targ'' proceed.
 # For more usual (dual-item) dependency tuples, the ``make targ''
@@ -4703,12 +4703,12 @@
 # first to avoid gratuitous breakage.
 
 . if !target(describe)
-_EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u}
-_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u}
-_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u}
-_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u}
-_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} ${_LIB_DEPENDS}
-_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u} ${_LIB_DEPENDS}
+_EXTRACT_DEPENDS=${EXTRACT_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
+_PATCH_DEPENDS=${PATCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
+_FETCH_DEPENDS=${FETCH_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
+_LIB_DEPENDS=${LIB_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,}
+_BUILD_DEPENDS=${BUILD_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
+_RUN_DEPENDS=${RUN_DEPENDS:C/^[^ :]+:([^ :]+)(:[^ :]+)?/\1/:O:u:C,(^[^/]),${PORTSDIR}/\1,} ${_LIB_DEPENDS}
 . if exists(${DESCR})
 _DESCR=${DESCR}
 . else
Index: Mk/bsd.qt.mk
===================================================================
--- Mk/bsd.qt.mk
+++ Mk/bsd.qt.mk
@@ -542,8 +542,8 @@
 
 _USE_QT_ALL+=	${_USE_QT${_QT_VERSION:R:R}_ONLY}
 .for comp in ${_USE_QT_ALL}
-${comp}_BUILD_DEPENDS?=	${${comp}_PATH}:${PORTSDIR}/${${comp}_PORT}
-${comp}_RUN_DEPENDS?=	${${comp}_PATH}:${PORTSDIR}/${${comp}_PORT}
+${comp}_BUILD_DEPENDS?=	${${comp}_PATH}:${${comp}_PORT}
+${comp}_RUN_DEPENDS?=	${${comp}_PATH}:${${comp}_PORT}
 ${comp}_build_BUILD_DEPENDS?=	${${comp}_BUILD_DEPENDS}
 ${comp}_run_RUN_DEPENDS?=	${${comp}_RUN_DEPENDS}
 _USE_QT_ALL_SUFFIXED+=	${comp} ${comp}_build ${comp}_run
Index: Mk/bsd.ruby.mk
===================================================================
--- Mk/bsd.ruby.mk
+++ Mk/bsd.ruby.mk
@@ -305,9 +305,9 @@
 RUBY_RDTOOL_PORT?=	textproc/ruby-rdtool
 
 # Depends
-DEPEND_LIBRUBY?=	lib${RUBY_NAME}.so.${RUBY_SHLIBVER}:${PORTSDIR}/${RUBY_PORT}
-DEPEND_RUBY?=		${RUBY}:${PORTSDIR}/${RUBY_PORT}
-DEPEND_RUBY_RDTOOL?=	${RUBY_RD2}:${PORTSDIR}/${RUBY_RDTOOL_PORT}
+DEPEND_LIBRUBY?=	lib${RUBY_NAME}.so.${RUBY_SHLIBVER}:${RUBY_PORT}
+DEPEND_RUBY?=		${RUBY}:${RUBY_PORT}
+DEPEND_RUBY_RDTOOL?=	${RUBY_RD2}:${RUBY_RDTOOL_PORT}
 
 # Directories
 RUBY_LIBDIR?=		${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
@@ -412,15 +412,15 @@
 #
 .if defined(USE_RUBYGEMS)
 
-BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+BUILD_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
+RUN_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 
 PKGNAMEPREFIX?=	rubygem-
 EXTRACT_SUFX=	.gem
 EXTRACT_ONLY=
 DIST_SUBDIR=	rubygem
 
-EXTRACT_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+EXTRACT_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
 GEMS_DIR=	${GEMS_BASE_DIR}/gems
 DOC_DIR=	${GEMS_BASE_DIR}/doc
@@ -584,7 +584,7 @@
 .endif
 
 .if defined(USE_RAKE)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:devel/rubygem-rake
 RAKE_BIN=	${LOCALBASE}/bin/rake
 .endif
 
Index: Mk/bsd.sdl.mk
===================================================================
--- Mk/bsd.sdl.mk
+++ Mk/bsd.sdl.mk
@@ -46,7 +46,7 @@
 #
 # Variables used to determine what is needed:
 # _SUBDIR_xxx	subdirectory below ${PORTSDIR} (required)
-# _PORTDIR_xxx	subdirectory below ${PORTSDIR}/${_SUBDIR_xxx}
+# _PORTDIR_xxx	subdirectory below ${_SUBDIR_xxx}
 # _LIB_xxx		name of the shared lib
 # _REQUIRES_xxx	also needs these SDL libraries
 #
@@ -192,20 +192,20 @@
 # Finally make the list of libs required
 #
 .for component in ${__USE_SDL}
-LIB_DEPENDS+=	${_LIB_${component}}:${PORTSDIR}/${_SUBDIR_${component}}/${_PORTDIR_${component}}
+LIB_DEPENDS+=	${_LIB_${component}}:${_SUBDIR_${component}}/${_PORTDIR_${component}}
 .endfor
 
 #
 # "Normal" dependencies and variables
 #
 .if ${__USE_SDL:Msdl} != ""
-BUILD_DEPENDS+=	${SDL_CONFIG}:${PORTSDIR}/${_SUBDIR_sdl}/${_PORTDIR_sdl}
+BUILD_DEPENDS+=	${SDL_CONFIG}:${_SUBDIR_sdl}/${_PORTDIR_sdl}
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl-config
 CONFIGURE_ENV+=	SDL_CONFIG=${SDL_CONFIG}
 MAKE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 .endif
 .if ${__USE_SDL:Msdl2} != ""
-BUILD_DEPENDS+=	${SDL2_CONFIG}:${PORTSDIR}/${_SUBDIR_sdl2}/${_PORTDIR_sdl2}
+BUILD_DEPENDS+=	${SDL2_CONFIG}:${_SUBDIR_sdl2}/${_PORTDIR_sdl2}
 SDL2_CONFIG?=	${LOCALBASE}/bin/sdl2-config
 CONFIGURE_ENV+=	SDL2_CONFIG=${SDL2_CONFIG}
 MAKE_ENV+=		SDL2_CONFIG=${SDL2_CONFIG}
Index: Mk/bsd.tex.mk
===================================================================
--- Mk/bsd.tex.mk
+++ Mk/bsd.tex.mk
@@ -195,11 +195,11 @@
 _V:=${_UU:C/[<>=][^\:]*//:C/\:.*$//}
 .  if defined(_USE_TEX_${_V}_PORT)
 .   if !empty(_VOP)
-.    for _T in ${_USE_TEX_${_V}_PKGNAME}${_VOP}:${PORTSDIR}/${_USE_TEX_${_V}_PORT}
+.    for _T in ${_USE_TEX_${_V}_PKGNAME}${_VOP}:${_USE_TEX_${_V}_PORT}
 TEX_${_CC}_DEPENDS+=	${_T}
 .    endfor
 .   else
-.    for _T in ${_USE_TEX_${_V}_DEP}:${PORTSDIR}/${_USE_TEX_${_V}_PORT}
+.    for _T in ${_USE_TEX_${_V}_DEP}:${_USE_TEX_${_V}_PORT}
 TEX_${_CC}_DEPENDS+=	${_T}
 .    endfor
 .   endif
Index: Mk/bsd.wx.mk
===================================================================
--- Mk/bsd.wx.mk
+++ Mk/bsd.wx.mk
@@ -475,13 +475,13 @@
 .	for comp_part in ${_WX_COMP}
 .		if ${_WX_DEP_TYPE} == "lib"
 .			if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
-LIB_DEPENDS+=		lib${_WX_LIB_${comp_part}_${_WX_VER}}.so:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
+LIB_DEPENDS+=		lib${_WX_LIB_${comp_part}_${_WX_VER}}.so:${_WX_PORT_${comp_part}_${_WX_VER}}
 .			else
-BUILD_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
-RUN_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
+BUILD_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
+RUN_DEPENDS+=		${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
 .			endif
 .		else
-${_WX_DEP_TYPE:tu}_DEPENDS+=	${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}}
+${_WX_DEP_TYPE:tu}_DEPENDS+=	${_WX_FILE_${comp_part}_${_WX_VER}}:${_WX_PORT_${comp_part}_${_WX_VER}}
 .		endif
 .	endfor
 .endfor
Index: Mk/bsd.xorg.mk
===================================================================
--- Mk/bsd.xorg.mk
+++ Mk/bsd.xorg.mk
@@ -76,8 +76,8 @@
 CONFIGURE_ENV+=	FONTROOTDIR=${PREFIX}/share/fonts
 .    if !defined(NOFONT)
 USES+=	fonts
-BUILD_DEPENDS+=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-				bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS+=	mkfontdir:x11-fonts/mkfontdir \
+				bdftopcf:x11-fonts/bdftopcf
 PLIST_FILES+=	"@comment ${FONTSDIR}/fonts.dir" \
 				"@comment ${FONTSDIR}/fonts.scale"
 .    endif
@@ -100,7 +100,7 @@
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb \
 					--with-fontrootdir=${LOCALBASE}/share/fonts
 
-LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
+LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/dri
 USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
 . endif
 
@@ -201,91 +201,91 @@
 				xxf86misc \
 				xxf86vm
 
-bigreqsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:${PORTSDIR}/x11/bigreqsproto
-compositeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:${PORTSDIR}/x11/compositeproto
-damageproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTSDIR}/x11/damageproto
-dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
-dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
-dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
-dri3proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:${PORTSDIR}/x11/dri3proto
-evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
-fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
-fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
-fontenc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc
-fontsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontsproto.pc:${PORTSDIR}/x11-fonts/fontsproto
-fontutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util
-glproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/glproto.pc:${PORTSDIR}/x11/glproto
-ice_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE
-inputproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/inputproto.pc:${PORTSDIR}/x11/inputproto
-kbproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/kbproto.pc:${PORTSDIR}/x11/kbproto
-libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS
-oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
-pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
-pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
-presentproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/presentproto.pc:${PORTSDIR}/x11/presentproto
-printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
-randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
-recordproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
-renderproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/renderproto.pc:${PORTSDIR}/x11/renderproto
-resourceproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/resourceproto.pc:${PORTSDIR}/x11/resourceproto
-scrnsaverproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/scrnsaverproto.pc:${PORTSDIR}/x11/scrnsaverproto
-sm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM
-trapproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/trapproto.pc:${PORTSDIR}/x11/trapproto
-videoproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/videoproto.pc:${PORTSDIR}/x11/videoproto
-x11_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11
-xau_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
+bigreqsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/bigreqsproto.pc:x11/bigreqsproto
+compositeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compositeproto.pc:x11/compositeproto
+damageproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/damageproto.pc:x11/damageproto
+dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx
+dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:x11/dmxproto
+dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:x11/dri2proto
+dri3proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:x11/dri3proto
+evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:x11/evieext
+fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:x11/fixesproto
+fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:x11-fonts/fontcacheproto
+fontenc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc
+fontsproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontsproto.pc:x11-fonts/fontsproto
+fontutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util
+glproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/glproto.pc:x11/glproto
+ice_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE
+inputproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/inputproto.pc:x11/inputproto
+kbproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/kbproto.pc:x11/kbproto
+libfs_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS
+oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX
+pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:devel/libpciaccess
+pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman
+presentproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/presentproto.pc:x11/presentproto
+printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:x11/printproto
+randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:x11/randrproto
+recordproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/recordproto.pc:x11/recordproto
+renderproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/renderproto.pc:x11/renderproto
+resourceproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/resourceproto.pc:x11/resourceproto
+scrnsaverproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/scrnsaverproto.pc:x11/scrnsaverproto
+sm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM
+trapproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/trapproto.pc:x11/trapproto
+videoproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/videoproto.pc:x11/videoproto
+x11_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11
+xau_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xau.pc:x11/libXau
 xaw_LIB_PC_DEPENDS=		${xaw7_LIB_PC_DEPENDS}
-xaw6_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw
-xaw7_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw
-xbitmaps_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps
-xcb_LIB_PC_DEPENDS=			${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-xcmiscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto
-xcomposite_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite
-xcursor_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor
-xdamage_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage
-xdmcp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp
-xevie_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie
-xext_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext
-xextproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xextproto.pc:${PORTSDIR}/x11/xextproto
-xf86bigfontproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86bigfontproto.pc:${PORTSDIR}/x11-fonts/xf86bigfontproto
-xf86dgaproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86dgaproto.pc:${PORTSDIR}/x11/xf86dgaproto
-xf86driproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86driproto.pc:${PORTSDIR}/x11/xf86driproto
-xf86miscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86miscproto.pc:${PORTSDIR}/x11/xf86miscproto
-xf86rushproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86rushproto.pc:${PORTSDIR}/x11/xf86rushproto
-xf86vidmodeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86vidmodeproto.pc:${PORTSDIR}/x11/xf86vidmodeproto
-xfixes_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes
-xfont_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont
-xfontcache_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache
-xft_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft
-xi_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi
-xinerama_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama
-xineramaproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xineramaproto.pc:${PORTSDIR}/x11/xineramaproto
-xkbfile_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
-xkbui_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui
-xmu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu
-xmuu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmuu.pc:${PORTSDIR}/x11-toolkits/libXmu
-xorg-macros_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:${PORTSDIR}/devel/xorg-macros
-xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:${PORTSDIR}/x11-servers/xorg-server
-xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp
-xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm
-xprintapputil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil
-xprintutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil
-xproto_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xproto.pc:${PORTSDIR}/x11/xproto
-xproxymngproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xproxymngproto.pc:${PORTSDIR}/x11/xproxymanagementprotocol
-xrandr_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr
-xrender_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender
-xres_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
-xscrnsaver_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
-xt_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
-xshmfence_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:${PORTSDIR}/x11/libxshmfence
-xtrans_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
-xtrap_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
-xtst_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst
-xv_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv
-xvmc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC
-xxf86dga_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga
-xxf86misc_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc
-xxf86vm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
+xaw6_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw6.pc:x11-toolkits/libXaw
+xaw7_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw
+xbitmaps_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps
+xcb_LIB_PC_DEPENDS=			${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb
+xcmiscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:x11/xcmiscproto
+xcomposite_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite
+xcursor_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor
+xdamage_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage
+xdmcp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp
+xevie_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xevie.pc:x11/libXevie
+xext_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext
+xextproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xextproto.pc:x11/xextproto
+xf86bigfontproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86bigfontproto.pc:x11-fonts/xf86bigfontproto
+xf86dgaproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86dgaproto.pc:x11/xf86dgaproto
+xf86driproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86driproto.pc:x11/xf86driproto
+xf86miscproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86miscproto.pc:x11/xf86miscproto
+xf86rushproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86rushproto.pc:x11/xf86rushproto
+xf86vidmodeproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xf86vidmodeproto.pc:x11/xf86vidmodeproto
+xfixes_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes
+xfont_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont
+xfontcache_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:x11-fonts/libXfontcache
+xft_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft
+xi_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi
+xinerama_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama
+xineramaproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xineramaproto.pc:x11/xineramaproto
+xkbfile_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile
+xkbui_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:x11/libxkbui
+xmu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu
+xmuu_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu
+xorg-macros_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros
+xorg-server_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server
+xp_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp
+xpm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm
+xprintapputil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:x11/libXprintAppUtil
+xprintutil_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:x11/libXprintUtil
+xproto_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xproto.pc:x11/xproto
+xproxymngproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xproxymngproto.pc:x11/xproxymanagementprotocol
+xrandr_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr
+xrender_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender
+xres_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xres.pc:x11/libXres
+xscrnsaver_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:x11/libXScrnSaver
+xt_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt
+xshmfence_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:x11/libxshmfence
+xtrans_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:x11/xtrans
+xtrap_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:x11/libXTrap
+xtst_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtst.pc:x11/libXtst
+xv_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xv.pc:x11/libXv
+xvmc_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:x11/libXvMC
+xxf86dga_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86dga
+xxf86misc_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc
+xxf86vm_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm
 
 .for _module in ${USE_XORG:M*\:both:C/\:.*//g}
 . if ${XORG_MODULES:M${_module}} == ""