Index: head/Mk/Uses/ada.mk
===================================================================
--- head/Mk/Uses/ada.mk
+++ head/Mk/Uses/ada.mk
@@ -29,10 +29,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: head/Mk/Uses/autoreconf.mk
===================================================================
--- head/Mk/Uses/autoreconf.mk
+++ head/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
 
 AUTORECONF?=	${LOCALBASE}/bin/autoreconf
Index: head/Mk/Uses/bison.mk
===================================================================
--- head/Mk/Uses/bison.mk
+++ head/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: head/Mk/Uses/blaslapack.mk
===================================================================
--- head/Mk/Uses/blaslapack.mk
+++ head/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: head/Mk/Uses/cmake.mk
===================================================================
--- head/Mk/Uses/cmake.mk
+++ head/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: head/Mk/Uses/compiler.mk
===================================================================
--- head/Mk/Uses/compiler.mk
+++ head/Mk/Uses/compiler.mk
@@ -161,7 +161,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
@@ -183,7 +183,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
@@ -205,7 +205,7 @@
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34
 CHOSEN_COMPILER_TYPE=	clang
 CPP=	${LOCALBASE}/bin/clang-cpp34
 CC=	${LOCALBASE}/bin/clang34
@@ -227,7 +227,7 @@
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34
 CHOSEN_COMPILER_TYPE=	clang
 CPP=	${LOCALBASE}/bin/clang-cpp34
 CC=	${LOCALBASE}/bin/clang34
@@ -243,7 +243,7 @@
 .if ${COMPILER_FEATURES:Mlibc++}
 LDFLAGS+=	-L${LOCALBASE}/lib/c++
 CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
+BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
 .endif
 .endif
 
Index: head/Mk/Uses/cran.mk
===================================================================
--- head/Mk/Uses/cran.mk
+++ head/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: head/Mk/Uses/desktop-file-utils.mk
===================================================================
--- head/Mk/Uses/desktop-file-utils.mk
+++ head/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: head/Mk/Uses/display.mk
===================================================================
--- head/Mk/Uses/display.mk
+++ head/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: head/Mk/Uses/drupal.mk
===================================================================
--- head/Mk/Uses/drupal.mk
+++ head/Mk/Uses/drupal.mk
@@ -78,7 +78,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: head/Mk/Uses/elixir.mk
===================================================================
--- head/Mk/Uses/elixir.mk
+++ head/Mk/Uses/elixir.mk
@@ -58,15 +58,15 @@
 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}
-RUN_DEPENDS+=	${depend:T}>=0:${PORTSDIR}/${depend}
+RUN_DEPENDS+=	${depend:T}>=0:${depend}
 .endfor
 
 .if !target(do-build)
Index: head/Mk/Uses/erlang.mk
===================================================================
--- head/Mk/Uses/erlang.mk
+++ head/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: head/Mk/Uses/execinfo.mk
===================================================================
--- head/Mk/Uses/execinfo.mk
+++ head/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: head/Mk/Uses/fakeroot.mk
===================================================================
--- head/Mk/Uses/fakeroot.mk
+++ head/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: head/Mk/Uses/fam.mk
===================================================================
--- head/Mk/Uses/fam.mk
+++ head/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: head/Mk/Uses/firebird.mk
===================================================================
--- head/Mk/Uses/firebird.mk
+++ head/Mk/Uses/firebird.mk
@@ -16,7 +16,7 @@
 FIREBIRD_VER?=	${FIREBIRD_DEFAULT:S/.//}
 
 .if ${FIREBIRD_VER} == 25
-LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird25-client
+LIB_DEPENDS+=	libfbclient.so:databases/firebird25-client
 .else
 IGNORE=		cannot install: unknown Firebird version: ${FIREBIRD_VER}
 .endif
Index: head/Mk/Uses/fmake.mk
===================================================================
--- head/Mk/Uses/fmake.mk
+++ head/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: head/Mk/Uses/fonts.mk
===================================================================
--- head/Mk/Uses/fonts.mk
+++ head/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: head/Mk/Uses/fortran.mk
===================================================================
--- head/Mk/Uses/fortran.mk
+++ head/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: head/Mk/Uses/fuse.mk
===================================================================
--- head/Mk/Uses/fuse.mk
+++ head/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: head/Mk/Uses/gettext-runtime.mk
===================================================================
--- head/Mk/Uses/gettext-runtime.mk
+++ head/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: head/Mk/Uses/gettext-tools.mk
===================================================================
--- head/Mk/Uses/gettext-tools.mk
+++ head/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: head/Mk/Uses/ghostscript.mk
===================================================================
--- head/Mk/Uses/ghostscript.mk
+++ head/Mk/Uses/ghostscript.mk
@@ -92,9 +92,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: head/Mk/Uses/gmake.mk
===================================================================
--- head/Mk/Uses/gmake.mk
+++ head/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: head/Mk/Uses/gnome.mk
===================================================================
--- head/Mk/Uses/gnome.mk
+++ head/Mk/Uses/gnome.mk
@@ -117,314 +117,314 @@
 			   --with-gconf-source=${GCONF_CONFIG_SOURCE}
 
 atkmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/atkmm-1.6.pc
-atkmm_LIB_DEPENDS=	libatkmm-1.6.so:${PORTSDIR}/accessibility/atkmm
+atkmm_LIB_DEPENDS=	libatkmm-1.6.so:accessibility/atkmm
 atkmm_USE_GNOME_IMPL=	glibmm atk
 
 libxml++26_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxml++-2.6.pc
-libxml++26_LIB_DEPENDS=		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+libxml++26_LIB_DEPENDS=		libxml++-2.6.so:textproc/libxml++26
 libxml++26_USE_GNOME_IMPL=	glibmm libxml2
 
 cairo_DETECT=		${LOCALBASE}/libdata/pkgconfig/cairo.pc
-cairo_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 cairomm_DETECT=		${LOCALBASE}/libdata/pkgconfig/cairomm-1.0.pc
-cairomm_LIB_DEPENDS=	libcairomm-1.0.so:${PORTSDIR}/graphics/cairomm
+cairomm_LIB_DEPENDS=	libcairomm-1.0.so:graphics/cairomm
 cairomm_USE_GNOME_IMPL=	cairo libxml++26
 
 gconfmm26_DETECT=		${LOCALBASE}/libdata/pkgconfig/gconfmm-2.6.pc
-gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26
+gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:devel/gconfmm26
 gconfmm26_USE_GNOME_IMPL=	glibmm gconf2
 
 glibmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc
-glibmm_LIB_DEPENDS=	libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
+glibmm_LIB_DEPENDS=	libglibmm-2.4.so:devel/glibmm
 glibmm_USE_GNOME_IMPL=	libsigc++20 glib20
 
 gsound_DETECT=		${LOCALBASE}/libdata/pkgconfig/gsound.pc
-gsound_BUILD_DEPENDS=	gsound-play:${PORTSDIR}/audio/gsound
-gsound_LIB_DEPENDS=	libgsound.so:${PORTSDIR}/audio/gsound
-gsound_RUN_DEPENDS=	gsound-play:${PORTSDIR}/audio/gsound
+gsound_BUILD_DEPENDS=	gsound-play:audio/gsound
+gsound_LIB_DEPENDS=	libgsound.so:audio/gsound
+gsound_RUN_DEPENDS=	gsound-play:audio/gsound
 gsound_USE_GNOME_IMPL=	glib20
 
 gtkmm20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc
-gtkmm20_LIB_DEPENDS=	libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20
+gtkmm20_LIB_DEPENDS=	libgtkmm-2.0.so:x11-toolkits/gtkmm20
 gtkmm20_USE_GNOME_IMPL=	libsigc++12 gtk20
 
 gtkmm24_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc
-gtkmm24_LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+gtkmm24_LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 gtkmm24_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk20
 
 gtkmm30_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc
-gtkmm30_LIB_DEPENDS=	libgtkmm-3.0.so:${PORTSDIR}/x11-toolkits/gtkmm30
+gtkmm30_LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30
 gtkmm30_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk30
 
 gtksourceviewmm3_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-3.0.pc
-gtksourceviewmm3_LIB_DEPENDS=		libgtksourceviewmm-3.0.so:${PORTSDIR}/x11-toolkits/gtksourceviewmm3
+gtksourceviewmm3_LIB_DEPENDS=		libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
 gtksourceviewmm3_USE_GNOME_IMPL=	gtkmm30 gtksourceview3
 
 libgdamm_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgdamm-4.0.pc
-libgdamm_LIB_DEPENDS=	libgdamm-4.0.so:${PORTSDIR}/databases/libgdamm
+libgdamm_LIB_DEPENDS=	libgdamm-4.0.so:databases/libgdamm
 libgdamm_USE_GNOME_IMPL=libgda4 glibmm
 
 libgdamm5_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgdamm-5.0.pc
-libgdamm5_LIB_DEPENDS=		libgdamm-5.0.so:${PORTSDIR}/databases/libgdamm5
+libgdamm5_LIB_DEPENDS=		libgdamm-5.0.so:databases/libgdamm5
 libgdamm5_USE_GNOME_IMPL=	libgda5 glibmm
 
 libgtksourceviewmm_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtksourceviewmm-2.0.pc
-libgtksourceviewmm_LIB_DEPENDS=		libgtksourceviewmm-2.0.so:${PORTSDIR}/x11-toolkits/libgtksourceviewmm
+libgtksourceviewmm_LIB_DEPENDS=		libgtksourceviewmm-2.0.so:x11-toolkits/libgtksourceviewmm
 libgtksourceviewmm_USE_GNOME_IMPL=	gtksourceview2 gtkmm24
 
 libsigc++12_DETECT=		${LOCALBASE}/libdata/pkgconfig/sigc++-1.2.pc
-libsigc++12_LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
+libsigc++12_LIB_DEPENDS=	libsigc-1.2.so:devel/libsigc++12
 
 libsigc++20_DETECT=		${LOCALBASE}/libdata/pkgconfig/sigc++-2.0.pc
-libsigc++20_LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+libsigc++20_LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 pangomm_DETECT=		${LOCALBASE}/libdata/pkgconfig/pangomm-1.4.pc
-pangomm_LIB_DEPENDS=	libpangomm-1.4.so:${PORTSDIR}/x11-toolkits/pangomm
+pangomm_LIB_DEPENDS=	libpangomm-1.4.so:x11-toolkits/pangomm
 pangomm_USE_GNOME_IMPL=	pango glibmm cairomm
 
 ESD_CONFIG?=		${LOCALBASE}/bin/esd-config
-esound_LIB_DEPENDS=	libesd.so:${PORTSDIR}/audio/esound
+esound_LIB_DEPENDS=	libesd.so:audio/esound
 esound_CONFIGURE_ENV=	ESD_CONFIG="${ESD_CONFIG}"
 esound_MAKE_ENV=	ESD_CONFIG="${ESD_CONFIG}"
 esound_DETECT=		${ESD_CONFIG}
 
 GLIB_CONFIG?=		${LOCALBASE}/bin/glib-config
-glib12_LIB_DEPENDS=	libglib.so:${PORTSDIR}/devel/glib12
+glib12_LIB_DEPENDS=	libglib.so:devel/glib12
 glib12_CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 glib12_MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 glib12_DETECT=		${GLIB_CONFIG}
 
 GTK_CONFIG?=		${LOCALBASE}/bin/gtk-config
-gtk12_LIB_DEPENDS=	libgtk.so:${PORTSDIR}/x11-toolkits/gtk12
+gtk12_LIB_DEPENDS=	libgtk.so:x11-toolkits/gtk12
 gtk12_CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 gtk12_MAKE_ENV=		GTK_CONFIG="${GTK_CONFIG}"
 gtk12_DETECT=		${GTK_CONFIG}
 gtk12_USE_GNOME_IMPL=	glib12
 
 GDK_PIXBUF_CONFIG?=	${LOCALBASE}/bin/gdk-pixbuf-config
-gdkpixbuf_LIB_DEPENDS=	libgdk_pixbuf.so:${PORTSDIR}/graphics/gdk-pixbuf
+gdkpixbuf_LIB_DEPENDS=	libgdk_pixbuf.so:graphics/gdk-pixbuf
 gdkpixbuf_CONFIGURE_ENV=GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
 gdkpixbuf_MAKE_ENV=	GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
 gdkpixbuf_DETECT=	${GDK_PIXBUF_CONFIG}
 gdkpixbuf_USE_GNOME_IMPL=gtk12
 
 gnomemimedata_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
-gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
-gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnome-mime-data
+gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:misc/gnome-mime-data
+gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:misc/gnome-mime-data
 
-glib20_LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
+glib20_LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 glib20_DETECT=		${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc
 
-atk_LIB_DEPENDS=	libatk-1.0.so:${PORTSDIR}/accessibility/atk
+atk_LIB_DEPENDS=	libatk-1.0.so:accessibility/atk
 atk_DETECT=		${LOCALBASE}/libdata/pkgconfig/atk.pc
 atk_USE_GNOME_IMPL=	glib20
 
-dconf_BUILD_DEPENDS=	dconf:${PORTSDIR}/devel/dconf
-dconf_LIB_DEPENDS=	libdconf.so:${PORTSDIR}/devel/dconf
-dconf_RUN_DEPENDS=	dconf:${PORTSDIR}/devel/dconf
+dconf_BUILD_DEPENDS=	dconf:devel/dconf
+dconf_LIB_DEPENDS=	libdconf.so:devel/dconf
+dconf_RUN_DEPENDS=	dconf:devel/dconf
 dconf_DETECT=		${LOCALBASE}/libdata/pkgconfig/dconf.pc
 dconf_USE_GNOME_IMPL=	glib20
 
-pango_LIB_DEPENDS=	libpango-1.0.so:${PORTSDIR}/x11-toolkits/pango
+pango_LIB_DEPENDS=	libpango-1.0.so:x11-toolkits/pango
 pango_DETECT=		${LOCALBASE}/libdata/pkgconfig/pango.pc
 pango_USE_GNOME_IMPL=	glib20
 
-pangox-compat_LIB_DEPENDS=	libpangox-1.0.so:${PORTSDIR}/x11-toolkits/pangox-compat
+pangox-compat_LIB_DEPENDS=	libpangox-1.0.so:x11-toolkits/pangox-compat
 pangox-compat_DETECT=		${LOCALBASE}/libdata/pkgconfig/pangox.pc
 pangox-compat_USE_GNOME_IMPL=	glib20 pango
 
-gdkpixbuf2_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:${PORTSDIR}/graphics/gdk-pixbuf2
+gdkpixbuf2_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
 gdkpixbuf2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gdk-pixbuf-2.0.pc
 gdkpixbuf2_USE_GNOME_IMPL=glib20
 
-gtk-update-icon-cache_BUILD_DEPENDS=	gtk-update-icon-cache:${PORTSDIR}/graphics/gtk-update-icon-cache
-gtk-update-icon-cache_RUN_DEPENDS=	gtk-update-icon-cache:${PORTSDIR}/graphics/gtk-update-icon-cache
+gtk-update-icon-cache_BUILD_DEPENDS=	gtk-update-icon-cache:graphics/gtk-update-icon-cache
+gtk-update-icon-cache_RUN_DEPENDS=	gtk-update-icon-cache:graphics/gtk-update-icon-cache
 gtk-update-icon-cache_DETECT=		${LOCALBASE}/bin/gtk-update-icon-cache
 gtk-update-icon-cache_USE_GNOME_IMPL=	atk pango gdkpixbuf2
 
-gtk20_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
+gtk20_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
 gtk20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtk+-x11-2.0.pc
 gtk20_USE_GNOME_IMPL=	atk pango
 GTK2_VERSION=		2.10.0
 
-gtk30_LIB_DEPENDS=	libgtk-3.so:${PORTSDIR}/x11-toolkits/gtk30
+gtk30_LIB_DEPENDS=	libgtk-3.so:x11-toolkits/gtk30
 gtk30_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtk+-3.0.pc
 gtk30_USE_GNOME_IMPL=	atk pango
 GTK3_VERSION=		3.0.0
 
-libidl_LIB_DEPENDS=	libIDL-2.so:${PORTSDIR}/devel/libIDL
+libidl_LIB_DEPENDS=	libIDL-2.so:devel/libIDL
 libidl_DETECT=		${LOCALBASE}/libdata/pkgconfig/libIDL-2.0.pc
 libidl_USE_GNOME_IMPL=	glib20
 
-orbit2_LIB_DEPENDS=	libORBit-2.so:${PORTSDIR}/devel/ORBit2
+orbit2_LIB_DEPENDS=	libORBit-2.so:devel/ORBit2
 orbit2_DETECT=		${LOCALBASE}/libdata/pkgconfig/ORBit-2.0.pc
 orbit2_USE_GNOME_IMPL=	libidl
 
-libglade2_LIB_DEPENDS=	libglade-2.0.so:${PORTSDIR}/devel/libglade2
+libglade2_LIB_DEPENDS=	libglade-2.0.so:devel/libglade2
 libglade2_DETECT=	${LOCALBASE}/libdata/pkgconfig/libglade-2.0.pc
 libglade2_USE_GNOME_IMPL=libxml2 gtk20
 
-libxml2_BUILD_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2
-libxml2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
-libxml2_RUN_DEPENDS=	xml2-config:${PORTSDIR}/textproc/libxml2
+libxml2_BUILD_DEPENDS=	xml2-config:textproc/libxml2
+libxml2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
+libxml2_RUN_DEPENDS=	xml2-config:textproc/libxml2
 libxml2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc
 
-libxslt_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-libxslt_LIB_DEPENDS=	libxslt.so:${PORTSDIR}/textproc/libxslt
+libxslt_BUILD_DEPENDS=	xsltproc:textproc/libxslt
+libxslt_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 libxslt_RUN_DEPENDS=	${libxslt_BUILD_DEPENDS}
 libxslt_DETECT=		${LOCALBASE}/libdata/pkgconfig/libxslt.pc
 libxslt_USE_GNOME_IMPL=	libxml2
 
-libbonobo_LIB_DEPENDS=	libbonobo-2.so:${PORTSDIR}/devel/libbonobo
+libbonobo_LIB_DEPENDS=	libbonobo-2.so:devel/libbonobo
 libbonobo_DETECT=	${LOCALBASE}/libdata/pkgconfig/libbonobo-2.0.pc
 libbonobo_USE_GNOME_IMPL=libxml2 orbit2
 
 introspection_DETECT=		${LOCALBASE}/libdata/pkgconfig/gobject-introspection-1.0.pc
-introspection_BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-introspection_LIB_DEPENDS=	libgirepository-1.0.so:${PORTSDIR}/devel/gobject-introspection
-introspection_RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+introspection_BUILD_DEPENDS=	g-ir-scanner:devel/gobject-introspection
+introspection_LIB_DEPENDS=	libgirepository-1.0.so:devel/gobject-introspection
+introspection_RUN_DEPENDS=	g-ir-scanner:devel/gobject-introspection
 introspection_USE_GNOME_IMPL=	glib20
 introspection_MAKE_ENV=		GI_SCANNER_DISABLE_CACHE=1 XDG_CACHE_HOME=${WRKDIR}
 
-gconf2_LIB_DEPENDS=	libgconf-2.so:${PORTSDIR}/devel/gconf2
+gconf2_LIB_DEPENDS=	libgconf-2.so:devel/gconf2
 gconf2_DETECT=		${LOCALBASE}/libdata/pkgconfig/gconf-2.0.pc
 gconf2_USE_GNOME_IMPL=	orbit2 libxml2 gtk20
 
-gnomevfs2_LIB_DEPENDS=	libgnomevfs-2.so:${PORTSDIR}/devel/gnome-vfs
+gnomevfs2_LIB_DEPENDS=	libgnomevfs-2.so:devel/gnome-vfs
 gnomevfs2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-vfs-2.0.pc
 gnomevfs2_USE_GNOME_IMPL=gconf2 gnomemimedata
 
-libgnomecanvas_LIB_DEPENDS=	libgnomecanvas-2.so:${PORTSDIR}/graphics/libgnomecanvas
+libgnomecanvas_LIB_DEPENDS=	libgnomecanvas-2.so:graphics/libgnomecanvas
 libgnomecanvas_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomecanvas-2.0.pc
 libgnomecanvas_USE_GNOME_IMPL=	libglade2 libartlgpl2
 
-libartlgpl2_LIB_DEPENDS=	libart_lgpl_2.so:${PORTSDIR}/graphics/libart_lgpl
+libartlgpl2_LIB_DEPENDS=	libart_lgpl_2.so:graphics/libart_lgpl
 libartlgpl2_DETECT=		${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc
 
-libgnomeprint_LIB_DEPENDS=	libgnomeprint-2-2.so:${PORTSDIR}/print/libgnomeprint
+libgnomeprint_LIB_DEPENDS=	libgnomeprint-2-2.so:print/libgnomeprint
 libgnomeprint_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomeprint-2.2.pc
 libgnomeprint_USE_GNOME_IMPL=	libbonobo libartlgpl2 gtk20
 
-libgnomeprintui_LIB_DEPENDS=	libgnomeprintui-2-2.so:${PORTSDIR}/x11-toolkits/libgnomeprintui
+libgnomeprintui_LIB_DEPENDS=	libgnomeprintui-2-2.so:x11-toolkits/libgnomeprintui
 libgnomeprintui_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomeprintui-2.2.pc
 libgnomeprintui_USE_GNOME_IMPL=	libgnomeprint libgnomecanvas
 
-libgnome_LIB_DEPENDS=	libgnome-2.so:${PORTSDIR}/x11/libgnome
+libgnome_LIB_DEPENDS=	libgnome-2.so:x11/libgnome
 libgnome_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgnome-2.0.pc
 libgnome_USE_GNOME_IMPL=gnomevfs2 esound libbonobo
 
-libbonoboui_LIB_DEPENDS=	libbonoboui-2.so:${PORTSDIR}/x11-toolkits/libbonoboui
+libbonoboui_LIB_DEPENDS=	libbonoboui-2.so:x11-toolkits/libbonoboui
 libbonoboui_DETECT=		${LOCALBASE}/libdata/pkgconfig/libbonoboui-2.0.pc
 libbonoboui_USE_GNOME_IMPL=	libgnomecanvas libgnome
 
-libgnomeui_LIB_DEPENDS=		libgnomeui-2.so:${PORTSDIR}/x11-toolkits/libgnomeui
+libgnomeui_LIB_DEPENDS=		libgnomeui-2.so:x11-toolkits/libgnomeui
 libgnomeui_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomeui-2.0.pc
 libgnomeui_USE_GNOME_IMPL=	libbonoboui
 
-atspi_LIB_DEPENDS=	libspi.so:${PORTSDIR}/accessibility/at-spi
+atspi_LIB_DEPENDS=	libspi.so:accessibility/at-spi
 atspi_DETECT=		${LOCALBASE}/libdata/pkgconfig/cspi-1.0.pc
 atspi_USE_GNOME_IMPL=	gtk20 libbonobo
 
-libgtkhtml_LIB_DEPENDS=	libgtkhtml-2.so:${PORTSDIR}/www/libgtkhtml
+libgtkhtml_LIB_DEPENDS=	libgtkhtml-2.so:www/libgtkhtml
 libgtkhtml_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgtkhtml-2.0.pc
 libgtkhtml_USE_GNOME_IMPL=libxslt gnomevfs2
 
-gnomedesktop3_LIB_DEPENDS=	libgnome-desktop-3.so:${PORTSDIR}/x11/gnome-desktop
+gnomedesktop3_LIB_DEPENDS=	libgnome-desktop-3.so:x11/gnome-desktop
 gnomedesktop3_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-desktop-3.0.pc
 gnomedesktop3_USE_GNOME_IMPL=	gtk30
 
-libwnck_LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck
+libwnck_LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck
 libwnck_DETECT=		${LOCALBASE}/libdata/pkgconfig/libwnck-1.0.pc
 libwnck_USE_GNOME_IMPL=	gtk20
 
-libwnck3_LIB_DEPENDS=	libwnck-3.so:${PORTSDIR}/x11-toolkits/libwnck3
+libwnck3_LIB_DEPENDS=	libwnck-3.so:x11-toolkits/libwnck3
 libwnck3_DETECT=	${LOCALBASE}/libdata/pkgconfig/libwnck-3.0.pc
 libwnck3_USE_GNOME_IMPL=gtk30
 
-vte_LIB_DEPENDS=	libvte.so:${PORTSDIR}/x11-toolkits/vte
+vte_LIB_DEPENDS=	libvte.so:x11-toolkits/vte
 vte_DETECT=		${LOCALBASE}/libdata/pkgconfig/vte.pc
 vte_USE_GNOME_IMPL=	gtk20
 
-vte3_LIB_DEPENDS=	libvte-2.91.so:${PORTSDIR}/x11-toolkits/vte3
+vte3_LIB_DEPENDS=	libvte-2.91.so:x11-toolkits/vte3
 vte3_DETECT=		${LOCALBASE}/libdata/pkgconfig/vte-2.91.pc
 vte3_USE_GNOME_IMPL=	gtk30
 
-librsvg2_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 librsvg2_DETECT=	${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc
 librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango
 
-nautilus3_LIB_DEPENDS=	libnautilus-extension.so:${PORTSDIR}/x11-fm/nautilus
+nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
 nautilus3_DETECT=	${LOCALBASE}/share/gir-1.0/Nautilus-3.0.gir
 nautilus3_USE_GNOME_IMPL=gnomedesktop3 gvfs libxml2
 
-metacity_LIB_DEPENDS=	libmetacity-private.so:${PORTSDIR}/x11-wm/metacity
+metacity_LIB_DEPENDS=	libmetacity-private.so:x11-wm/metacity
 metacity_DETECT=	${LOCALBASE}/libdata/pkgconfig/libmetacity-private.pc
 
-gal2_LIB_DEPENDS=	libgal-2.4.so:${PORTSDIR}/x11-toolkits/gal2
+gal2_LIB_DEPENDS=	libgal-2.4.so:x11-toolkits/gal2
 gal2_DETECT=		${LOCALBASE}/libdata/pkgconfig/gal-2.4.pc
 gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui
 
 gnomecontrolcenter3_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc
-gnomecontrolcenter3_BUILD_DEPENDS=	${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center
-gnomecontrolcenter3_RUN_DEPENDS=	${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center
+gnomecontrolcenter3_BUILD_DEPENDS=	${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center
+gnomecontrolcenter3_RUN_DEPENDS=	${gnomecontrolcenter3_DETECT}:sysutils/gnome-control-center
 gnomecontrolcenter3_USE_GNOME_IMPL=	gnomedesktop3
 
-libgda4_LIB_DEPENDS=	libgda-4.0.so:${PORTSDIR}/databases/libgda4
+libgda4_LIB_DEPENDS=	libgda-4.0.so:databases/libgda4
 libgda4_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgda-4.0.pc
 libgda4_USE_GNOME_IMPL=	glib20 libxslt
 
-libgda5_LIB_DEPENDS=	libgda-5.0.so:${PORTSDIR}/databases/libgda5
+libgda5_LIB_DEPENDS=	libgda-5.0.so:databases/libgda5
 libgda5_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgda-5.0.pc
 libgda5_USE_GNOME_IMPL=	glib20 libxslt
 
-libgda5-ui_LIB_DEPENDS=	libgda-ui-5.0.so:${PORTSDIR}/databases/libgda5-ui
+libgda5-ui_LIB_DEPENDS=	libgda-ui-5.0.so:databases/libgda5-ui
 libgda5-ui_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgda-ui-5.0.pc
 libgda5-ui_USE_GNOME_IMPL=glib20 libxslt libgda5
 
-gtksourceview_LIB_DEPENDS=	libgtksourceview-1.0.so:${PORTSDIR}/x11-toolkits/gtksourceview
+gtksourceview_LIB_DEPENDS=	libgtksourceview-1.0.so:x11-toolkits/gtksourceview
 gtksourceview_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-1.0.pc
 gtksourceview_USE_GNOME_IMPL=libgnome libgnomeprintui
 
-gtksourceview2_LIB_DEPENDS=	libgtksourceview-2.0.so:${PORTSDIR}/x11-toolkits/gtksourceview2
+gtksourceview2_LIB_DEPENDS=	libgtksourceview-2.0.so:x11-toolkits/gtksourceview2
 gtksourceview2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksourceview-2.0.pc
 gtksourceview2_USE_GNOME_IMPL=gtk20 libxml2
 
-gtksourceview3_LIB_DEPENDS=	libgtksourceview-3.0.so:${PORTSDIR}/x11-toolkits/gtksourceview3
+gtksourceview3_LIB_DEPENDS=	libgtksourceview-3.0.so:x11-toolkits/gtksourceview3
 gtksourceview3_DETECT=	${LOCALBASE}/libdata/pkgconfig/gtksoureview-3.0.pc
 gtksourceview3_USE_GNOME_IMPL=gtk30 libxml2
 
-libgsf_LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
+libgsf_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 libgsf_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgsf-1.pc
 libgsf_USE_GNOME_IMPL=	glib20 libxml2
 
 pygobject_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc
-pygobject_BUILD_DEPENDS=	pygobject-codegen-2.0:${PORTSDIR}/devel/py-gobject
-pygobject_RUN_DEPENDS=		pygobject-codegen-2.0:${PORTSDIR}/devel/py-gobject
+pygobject_BUILD_DEPENDS=	pygobject-codegen-2.0:devel/py-gobject
+pygobject_RUN_DEPENDS=		pygobject-codegen-2.0:devel/py-gobject
 pygobject_USE_GNOME_IMPL=	glib20
 
 py3gobject3_DETECT=		${LOCALBASE}/share/py3gobject3/.keep
-py3gobject3_BUILD_DEPENDS=	py3?-gobject3>=0:${PORTSDIR}/devel/py3-gobject3
-py3gobject3_RUN_DEPENDS=	py3?-gobject3>=0:${PORTSDIR}/devel/py3-gobject3
+py3gobject3_BUILD_DEPENDS=	py3?-gobject3>=0:devel/py3-gobject3
+py3gobject3_RUN_DEPENDS=	py3?-gobject3>=0:devel/py3-gobject3
 py3gobject3_USE_GNOME_IMPL=	glib20
 
 pygobject3_DETECT=		${LOCALBASE}/share/pygobject3/.keep
-pygobject3_BUILD_DEPENDS=	py2?-gobject3>=0:${PORTSDIR}/devel/py-gobject3
-pygobject3_RUN_DEPENDS=		py2?-gobject3>=0:${PORTSDIR}/devel/py-gobject3
+pygobject3_BUILD_DEPENDS=	py2?-gobject3>=0:devel/py-gobject3
+pygobject3_RUN_DEPENDS=		py2?-gobject3>=0:devel/py-gobject3
 pygobject3_USE_GNOME_IMPL=	glib20
 
 pygtk2_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc
-pygtk2_BUILD_DEPENDS=	${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2
-pygtk2_RUN_DEPENDS=	${pygtk2_DETECT}:${PORTSDIR}/x11-toolkits/py-gtk2
+pygtk2_BUILD_DEPENDS=	${pygtk2_DETECT}:x11-toolkits/py-gtk2
+pygtk2_RUN_DEPENDS=	${pygtk2_DETECT}:x11-toolkits/py-gtk2
 pygtk2_USE_GNOME_IMPL=	libglade2 pygobject
 
 pygnome2_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-python-2.0.pc
-pygnome2_BUILD_DEPENDS=	${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2
-pygnome2_RUN_DEPENDS=	${pygnome2_DETECT}:${PORTSDIR}/x11-toolkits/py-gnome2
+pygnome2_BUILD_DEPENDS=	${pygnome2_DETECT}:x11-toolkits/py-gnome2
+pygnome2_RUN_DEPENDS=	${pygnome2_DETECT}:x11-toolkits/py-gnome2
 pygnome2_USE_GNOME_IMPL=libgnomeui pygtk2
 
 intltool_DETECT=	${LOCALBASE}/bin/intltool-extract
-intltool_BUILD_DEPENDS=	${intltool_DETECT}:${PORTSDIR}/textproc/intltool
+intltool_BUILD_DEPENDS=	${intltool_DETECT}:textproc/intltool
 
 intlhack_PRE_PATCH=	${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} \
 			's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
@@ -435,59 +435,59 @@
 			's/DATADIRNAME=lib/DATADIRNAME=share/'
 intlhack_USE_GNOME_IMPL=intltool
 
-gtkhtml3_LIB_DEPENDS=	libgtkhtml-3.14.so:${PORTSDIR}/www/gtkhtml3
+gtkhtml3_LIB_DEPENDS=	libgtkhtml-3.14.so:www/gtkhtml3
 gtkhtml3_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgtkhtml-3.14.pc
 gtkhtml3_USE_GNOME_IMPL=libglade2
 
-gtkhtml4_LIB_DEPENDS=	libgtkhtml-4.0.so:${PORTSDIR}/www/gtkhtml4
+gtkhtml4_LIB_DEPENDS=	libgtkhtml-4.0.so:www/gtkhtml4
 gtkhtml4_DETECT=	${LOCALBASE}/libdata/pkgconfig/libgtkhtml-4.0.pc
 gtkhtml4_USE_GNOME_IMPL=gtk30 libxml2
 
-gnomespeech_LIB_DEPENDS=libgnomespeech.so:${PORTSDIR}/accessibility/gnome-speech
+gnomespeech_LIB_DEPENDS=libgnomespeech.so:accessibility/gnome-speech
 gnomespeech_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-speech-1.0.pc
 gnomespeech_USE_GNOME_IMPL=libbonobo
 
-evolutiondataserver3_LIB_DEPENDS=	libedataserver-1.2.so:${PORTSDIR}/databases/evolution-data-server
+evolutiondataserver3_LIB_DEPENDS=	libedataserver-1.2.so:databases/evolution-data-server
 evolutiondataserver3_DETECT=		${LOCALBASE}/libdata/pkgconfig/libedataserverui-3.0.pc
 evolutiondataserver3_USE_GNOME_IMPL=	libxml2 gtk30
 
-gnomemenus3_BUILD_DEPENDS=	gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus
-gnomemenus3_RUN_DEPENDS=	gnome-menus>=3.2.0:${PORTSDIR}/x11/gnome-menus
+gnomemenus3_BUILD_DEPENDS=	gnome-menus>=3.2.0:x11/gnome-menus
+gnomemenus3_RUN_DEPENDS=	gnome-menus>=3.2.0:x11/gnome-menus
 gnomemenus3_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnome-menu-3.0.pc
 gnomemenus3_USE_GNOME_IMPL=	glib20
 
 gnomedocutils_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-doc-utils.pc
-gnomedocutils_BUILD_DEPENDS=	${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
-gnomedocutils_RUN_DEPENDS=	${gnomedocutils_DETECT}:${PORTSDIR}/textproc/gnome-doc-utils
+gnomedocutils_BUILD_DEPENDS=	${gnomedocutils_DETECT}:textproc/gnome-doc-utils
+gnomedocutils_RUN_DEPENDS=	${gnomedocutils_DETECT}:textproc/gnome-doc-utils
 gnomedocutils_USE_GNOME_IMPL=	libxslt
 
 gtksharp10_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtk-sharp.pc
-gtksharp10_BUILD_DEPENDS=	${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10
-gtksharp10_RUN_DEPENDS=		${gtksharp10_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp10
+gtksharp10_BUILD_DEPENDS=	${gtksharp10_DETECT}:x11-toolkits/gtk-sharp10
+gtksharp10_RUN_DEPENDS=		${gtksharp10_DETECT}:x11-toolkits/gtk-sharp10
 gtksharp10_USE_GNOME_IMPL=	gtk20
 
 gtksharp20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gtk-sharp-2.0.pc
-gtksharp20_BUILD_DEPENDS=	${gtksharp20_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp20
-gtksharp20_RUN_DEPENDS=		${gtksharp20_DETECT}:${PORTSDIR}/x11-toolkits/gtk-sharp20
+gtksharp20_BUILD_DEPENDS=	${gtksharp20_DETECT}:x11-toolkits/gtk-sharp20
+gtksharp20_RUN_DEPENDS=		${gtksharp20_DETECT}:x11-toolkits/gtk-sharp20
 gtksharp20_USE_GNOME_IMPL=	gtk20
 
 gnomesharp20_DETECT=		${LOCALBASE}/libdata/pkgconfig/gnome-sharp-2.0.pc
-gnomesharp20_BUILD_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20
-gnomesharp20_RUN_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20
+gnomesharp20_BUILD_DEPENDS=	${gnomesharp20_DETECT}:x11-toolkits/gnome-sharp20
+gnomesharp20_RUN_DEPENDS=	${gnomesharp20_DETECT}:x11-toolkits/gnome-sharp20
 gnomesharp20_USE_GNOME_IMPL=	gnomevfs2 gtkhtml3 gtksharp20 librsvg2 vte
 
 libgnomekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_LIB_DEPENDS=	libgnomekbd.so:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_LIB_DEPENDS=	libgnomekbd.so:x11/libgnomekbd
 libgnomekbd_USE_GNOME_IMPL=	gtk30 libxml2
 
 pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
-pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
-pygtksourceview_RUN_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
+pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:x11-toolkits/py-gtksourceview
+pygtksourceview_RUN_DEPENDS=	${pygtksourceview_DETECT}:x11-toolkits/py-gtksourceview
 pygtksourceview_USE_GNOME_IMPL=	gtksourceview2 pygtk2
 
 gvfs_DETECT=		${LOCALBASE}/lib/gvfs/libgvfscommon.so
-gvfs_BUILD_DEPENDS=	gvfs>=0:${PORTSDIR}/devel/gvfs
-gvfs_RUN_DEPENDS=	gvfs>=0:${PORTSDIR}/devel/gvfs
+gvfs_BUILD_DEPENDS=	gvfs>=0:devel/gvfs
+gvfs_RUN_DEPENDS=	gvfs>=0:devel/gvfs
 gvfs_USE_GNOME_IMPL=	glib20
 
 .if defined(INSTALLS_ICONS)
@@ -659,7 +659,7 @@
 
 .if defined(USE_GNOME_SUBR)
 GNOME_SUBR=		${LOCALBASE}/etc/gnome.subr
-RUN_DEPENDS+=	${GNOME_SUBR}:${PORTSDIR}/sysutils/gnome_subr
+RUN_DEPENDS+=	${GNOME_SUBR}:sysutils/gnome_subr
 SUB_LIST+=		GNOME_SUBR=${GNOME_SUBR}
 .endif
 
Index: head/Mk/Uses/gnustep.mk
===================================================================
--- head/Mk/Uses/gnustep.mk
+++ head/Mk/Uses/gnustep.mk
@@ -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: head/Mk/Uses/gperf.mk
===================================================================
--- head/Mk/Uses/gperf.mk
+++ head/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: head/Mk/Uses/gssapi.mk
===================================================================
--- head/Mk/Uses/gssapi.mk
+++ head/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: head/Mk/Uses/horde.mk
===================================================================
--- head/Mk/Uses/horde.mk
+++ head/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: head/Mk/Uses/iconv.mk
===================================================================
--- head/Mk/Uses/iconv.mk
+++ head/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: head/Mk/Uses/imake.mk
===================================================================
--- head/Mk/Uses/imake.mk
+++ head/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: head/Mk/Uses/jpeg.mk
===================================================================
--- head/Mk/Uses/jpeg.mk
+++ head/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: head/Mk/Uses/lha.mk
===================================================================
--- head/Mk/Uses/lha.mk
+++ head/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=${EXTRACT_WRKDIR}
 EXTRACT_AFTER_ARGS?=
Index: head/Mk/Uses/libarchive.mk
===================================================================
--- head/Mk/Uses/libarchive.mk
+++ head/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: head/Mk/Uses/libedit.mk
===================================================================
--- head/Mk/Uses/libedit.mk
+++ head/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: head/Mk/Uses/libtool.mk
===================================================================
--- head/Mk/Uses/libtool.mk
+++ head/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: head/Mk/Uses/lua.mk
===================================================================
--- head/Mk/Uses/lua.mk
+++ head/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: head/Mk/Uses/makeinfo.mk
===================================================================
--- head/Mk/Uses/makeinfo.mk
+++ head/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: head/Mk/Uses/makeself.mk
===================================================================
--- head/Mk/Uses/makeself.mk
+++ head/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: head/Mk/Uses/mate.mk
===================================================================
--- head/Mk/Uses/mate.mk
+++ head/Mk/Uses/mate.mk
@@ -54,38 +54,38 @@
 SCROLLKEEPER_DIR=	/var/db/rarian
 
 caja_DETECT=		${LOCALBASE}/libdata/pkgconfig/libcaja-extension.pc
-caja_BUILD_DEPENDS=	${caja_DETECT}:${PORTSDIR}/x11-fm/caja
-caja_LIB_DEPENDS=	libcaja-extension.so:${PORTSDIR}/x11-fm/caja
-caja_RUN_DEPENDS=	${caja_DETECT}:${PORTSDIR}/x11-fm/caja
+caja_BUILD_DEPENDS=	${caja_DETECT}:x11-fm/caja
+caja_LIB_DEPENDS=	libcaja-extension.so:x11-fm/caja
+caja_RUN_DEPENDS=	${caja_DETECT}:x11-fm/caja
 
 common_DETECT=		${LOCALBASE}/bin/mate-autogen
-common_BUILD_DEPENDS=	${common_DETECT}:${PORTSDIR}/devel/mate-common
-common_RUN_DEPENDS=	${common_DETECT}:${PORTSDIR}/devel/mate-common
+common_BUILD_DEPENDS=	${common_DETECT}:devel/mate-common
+common_RUN_DEPENDS=	${common_DETECT}:devel/mate-common
 
 controlcenter_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-window-settings-2.0.pc
-controlcenter_BUILD_DEPENDS=	${controlcenter_DETECT}:${PORTSDIR}/sysutils/mate-control-center
-controlcenter_LIB_DEPENDS=	libmate-window-settings.so:${PORTSDIR}/sysutils/mate-control-center
-controlcenter_RUN_DEPENDS=	${controlcenter_DETECT}:${PORTSDIR}/sysutils/mate-control-center
+controlcenter_BUILD_DEPENDS=	${controlcenter_DETECT}:sysutils/mate-control-center
+controlcenter_LIB_DEPENDS=	libmate-window-settings.so:sysutils/mate-control-center
+controlcenter_RUN_DEPENDS=	${controlcenter_DETECT}:sysutils/mate-control-center
 
 desktop_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-desktop-2.0.pc
-desktop_BUILD_DEPENDS=	${desktop_DETECT}:${PORTSDIR}/x11/mate-desktop
-desktop_LIB_DEPENDS=	libmate-desktop-2.so:${PORTSDIR}/x11/mate-desktop
-desktop_RUN_DEPENDS=	${desktop_DETECT}:${PORTSDIR}/x11/mate-desktop
+desktop_BUILD_DEPENDS=	${desktop_DETECT}:x11/mate-desktop
+desktop_LIB_DEPENDS=	libmate-desktop-2.so:x11/mate-desktop
+desktop_RUN_DEPENDS=	${desktop_DETECT}:x11/mate-desktop
 
 dialogs_DETECT=		${LOCALBASE}/bin/matedialog
-dialogs_BUILD_DEPENDS=	${dialogs_DETECT}:${PORTSDIR}/x11/mate-dialogs
-dialogs_RUN_DEPENDS=	${dialogs_DETECT}:${PORTSDIR}/x11/mate-dialogs
+dialogs_BUILD_DEPENDS=	${dialogs_DETECT}:x11/mate-dialogs
+dialogs_RUN_DEPENDS=	${dialogs_DETECT}:x11/mate-dialogs
 
 docutils_DETECT=	${LOCALBASE}/libdata/pkgconfig/mate-doc-utils.pc
-docutils_BUILD_DEPENDS=	${docutils_DETECT}:${PORTSDIR}/textproc/mate-doc-utils
-docutils_RUN_DEPENDS=	${docutils_DETECT}:${PORTSDIR}/textproc/mate-doc-utils
+docutils_BUILD_DEPENDS=	${docutils_DETECT}:textproc/mate-doc-utils
+docutils_RUN_DEPENDS=	${docutils_DETECT}:textproc/mate-doc-utils
 
 icontheme_DETECT=	${LOCALBASE}/share/icons/mate/index.theme
-icontheme_BUILD_DEPENDS=${icontheme_DETECT}:${PORTSDIR}/x11-themes/mate-icon-theme
-icontheme_RUN_DEPENDS=	${icontheme_DETECT}:${PORTSDIR}/x11-themes/mate-icon-theme
+icontheme_BUILD_DEPENDS=${icontheme_DETECT}:x11-themes/mate-icon-theme
+icontheme_RUN_DEPENDS=	${icontheme_DETECT}:x11-themes/mate-icon-theme
 
 intltool_DETECT=	${LOCALBASE}/bin/intltool-extract
-intltool_BUILD_DEPENDS=	${intltool_DETECT}:${PORTSDIR}/textproc/intltool
+intltool_BUILD_DEPENDS=	${intltool_DETECT}:textproc/intltool
 
 intlhack_PRE_PATCH=		${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \
 				's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \
@@ -97,46 +97,46 @@
 .endif
 
 libmatekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmatekbd.pc
-libmatekbd_BUILD_DEPENDS=	${libmatekbd_DETECT}:${PORTSDIR}/x11/libmatekbd
-libmatekbd_LIB_DEPENDS=		libmatekbd.so:${PORTSDIR}/x11/libmatekbd
-libmatekbd_RUN_DEPENDS=		${libmatekbd_DETECT}:${PORTSDIR}/x11/libmatekbd
+libmatekbd_BUILD_DEPENDS=	${libmatekbd_DETECT}:x11/libmatekbd
+libmatekbd_LIB_DEPENDS=		libmatekbd.so:x11/libmatekbd
+libmatekbd_RUN_DEPENDS=		${libmatekbd_DETECT}:x11/libmatekbd
 
 libmateweather_DETECT=		${LOCALBASE}/libdata/pkgconfig/mateweather.pc
-libmateweather_BUILD_DEPENDS=	${libmateweather_DETECT}:${PORTSDIR}/net/libmateweather
-libmateweather_LIB_DEPENDS=	libmateweather.so:${PORTSDIR}/net/libmateweather
-libmateweather_RUN_DEPENDS=	${libmateweather_DETECT}:${PORTSDIR}/net/libmateweather
+libmateweather_BUILD_DEPENDS=	${libmateweather_DETECT}:net/libmateweather
+libmateweather_LIB_DEPENDS=	libmateweather.so:net/libmateweather
+libmateweather_RUN_DEPENDS=	${libmateweather_DETECT}:net/libmateweather
 
 marco_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmarco-private.pc
-marco_BUILD_DEPENDS=	${marco_DETECT}:${PORTSDIR}/x11-wm/marco
-marco_LIB_DEPENDS=	libmarco-private.so:${PORTSDIR}/x11-wm/marco
-marco_RUN_DEPENDS=	${marco_DETECT}:${PORTSDIR}/x11-wm/marco
+marco_BUILD_DEPENDS=	${marco_DETECT}:x11-wm/marco
+marco_LIB_DEPENDS=	libmarco-private.so:x11-wm/marco
+marco_RUN_DEPENDS=	${marco_DETECT}:x11-wm/marco
 
 menus_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmate-menu.pc
-menus_BUILD_DEPENDS=	${menus_DETECT}:${PORTSDIR}/x11/mate-menus
-menus_LIB_DEPENDS=	libmate-menu.so:${PORTSDIR}/x11/mate-menus
-menus_RUN_DEPENDS=	${menus_DETECT}:${PORTSDIR}/x11/mate-menus
+menus_BUILD_DEPENDS=	${menus_DETECT}:x11/mate-menus
+menus_LIB_DEPENDS=	libmate-menu.so:x11/mate-menus
+menus_RUN_DEPENDS=	${menus_DETECT}:x11/mate-menus
 
 notificationdaemon_DETECT=		${LOCALBASE}/libexec/mate-notification-daemon
-notificationdaemon_BUILD_DEPENDS=	${notificationdaemon_DETECT}:${PORTSDIR}/deskutils/mate-notification-daemon
-notificationdaemon_RUN_DEPENDS=		${notificationdaemon_DETECT}:${PORTSDIR}/deskutils/mate-notification-daemon
+notificationdaemon_BUILD_DEPENDS=	${notificationdaemon_DETECT}:deskutils/mate-notification-daemon
+notificationdaemon_RUN_DEPENDS=		${notificationdaemon_DETECT}:deskutils/mate-notification-daemon
 
 panel_DETECT=		${LOCALBASE}/libdata/pkgconfig/libmatepanelapplet-4.0.pc
-panel_BUILD_DEPENDS=	${panel_DETECT}:${PORTSDIR}/x11/mate-panel
-panel_LIB_DEPENDS=	libmate-panel-applet-4.so:${PORTSDIR}/x11/mate-panel
-panel_RUN_DEPENDS=	${panel_DETECT}:${PORTSDIR}/x11/mate-panel
+panel_BUILD_DEPENDS=	${panel_DETECT}:x11/mate-panel
+panel_LIB_DEPENDS=	libmate-panel-applet-4.so:x11/mate-panel
+panel_RUN_DEPENDS=	${panel_DETECT}:x11/mate-panel
 
 polkit_DETECT=		${LOCALBASE}/libdata/pkgconfig/polkit-gtk-mate-1.pc
-polkit_BUILD_DEPENDS=	${polkit_DETECT}:${PORTSDIR}/sysutils/mate-polkit
-polkit_LIB_DEPENDS=	libpolkit-gtk-mate-1.so:${PORTSDIR}/sysutils/mate-polkit
-polkit_RUN_DEPENDS=	${polkit_DETECT}:${PORTSDIR}/sysutils/mate-polkit
+polkit_BUILD_DEPENDS=	${polkit_DETECT}:sysutils/mate-polkit
+polkit_LIB_DEPENDS=	libpolkit-gtk-mate-1.so:sysutils/mate-polkit
+polkit_RUN_DEPENDS=	${polkit_DETECT}:sysutils/mate-polkit
 
 pluma_DETECT=		${LOCALBASE}/libdata/pkgconfig/pluma.pc
-pluma_BUILD_DEPENDS=	${pluma_DETECT}:${PORTSDIR}/editors/pluma
-pluma_RUN_DEPENDS=	${pluma_DETECT}:${PORTSDIR}/editors/pluma
+pluma_BUILD_DEPENDS=	${pluma_DETECT}:editors/pluma
+pluma_RUN_DEPENDS=	${pluma_DETECT}:editors/pluma
 
 settingsdaemon_DETECT=		${LOCALBASE}/libdata/pkgconfig/mate-settings-daemon.pc
-settingsdaemon_BUILD_DEPENDS=	${settingsdaemon_DETECT}:${PORTSDIR}/sysutils/mate-settings-daemon
-settingsdaemon_RUN_DEPENDS=	${settingsdaemon_DETECT}:${PORTSDIR}/sysutils/mate-settings-daemon
+settingsdaemon_BUILD_DEPENDS=	${settingsdaemon_DETECT}:sysutils/mate-settings-daemon
+settingsdaemon_RUN_DEPENDS=	${settingsdaemon_DETECT}:sysutils/mate-settings-daemon
 
 # End component definition section
 
Index: head/Mk/Uses/mono.mk
===================================================================
--- head/Mk/Uses/mono.mk
+++ head/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: head/Mk/Uses/motif.mk
===================================================================
--- head/Mk/Uses/motif.mk
+++ head/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: head/Mk/Uses/ncurses.mk
===================================================================
--- head/Mk/Uses/ncurses.mk
+++ head/Mk/Uses/ncurses.mk
@@ -73,8 +73,8 @@
 NCURSES_PORT?=		devel/ncurses
 NCURSES_SHLIBVER?=	6
 
-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: head/Mk/Uses/ninja.mk
===================================================================
--- head/Mk/Uses/ninja.mk
+++ head/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: head/Mk/Uses/objc.mk
===================================================================
--- head/Mk/Uses/objc.mk
+++ head/Mk/Uses/objc.mk
@@ -54,7 +54,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
@@ -62,7 +62,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: head/Mk/Uses/openal.mk
===================================================================
--- head/Mk/Uses/openal.mk
+++ head/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: head/Mk/Uses/pear.mk
===================================================================
--- head/Mk/Uses/pear.mk
+++ head/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
Index: head/Mk/Uses/perl5.mk
===================================================================
--- head/Mk/Uses/perl5.mk
+++ head/Mk/Uses/perl5.mk
@@ -196,13 +196,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
@@ -222,19 +222,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: head/Mk/Uses/pgsql.mk
===================================================================
--- head/Mk/Uses/pgsql.mk
+++ head/Mk/Uses/pgsql.mk
@@ -129,7 +129,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
@@ -143,10 +143,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: head/Mk/Uses/pkgconfig.mk
===================================================================
--- head/Mk/Uses/pkgconfig.mk
+++ head/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: head/Mk/Uses/pure.mk
===================================================================
--- head/Mk/Uses/pure.mk
+++ head/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: head/Mk/Uses/pyqt.mk
===================================================================
--- head/Mk/Uses/pyqt.mk
+++ head/Mk/Uses/pyqt.mk
@@ -238,8 +238,8 @@
 _USE_PYQT_ALL+=			${_USE_PYQT${_PYQT_VERSION}_ONLY}
 .for comp in ${_USE_PYQT_ALL:O:u}
 _USE_PYQT_ALL_SUFFIXED+=		py-${comp} py-${comp}_build py-${comp}_run
-py-${comp}_BUILD_DEPENDS?=		${py-${comp}_PATH}:${PORTSDIR}/${py-${comp}_PORT}
-py-${comp}_RUN_DEPENDS?=		${py-${comp}_PATH}:${PORTSDIR}/${py-${comp}_PORT}
+py-${comp}_BUILD_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}
+py-${comp}_RUN_DEPENDS?=		${py-${comp}_PATH}:${py-${comp}_PORT}
 py-${comp}_build_BUILD_DEPENDS?=	${py-${comp}_BUILD_DEPENDS}
 py-${comp}_run_RUN_DEPENDS?=		${py-${comp}_RUN_DEPENDS}
 .endfor
Index: head/Mk/Uses/python.mk
===================================================================
--- head/Mk/Uses/python.mk
+++ head/Mk/Uses/python.mk
@@ -465,8 +465,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
@@ -552,9 +552,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: head/Mk/Uses/qmail.mk
===================================================================
--- head/Mk/Uses/qmail.mk
+++ head/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: head/Mk/Uses/readline.mk
===================================================================
--- head/Mk/Uses/readline.mk
+++ head/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: head/Mk/Uses/scons.mk
===================================================================
--- head/Mk/Uses/scons.mk
+++ head/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: head/Mk/Uses/shared-mime-info.mk
===================================================================
--- head/Mk/Uses/shared-mime-info.mk
+++ head/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: head/Mk/Uses/sqlite.mk
===================================================================
--- head/Mk/Uses/sqlite.mk
+++ head/Mk/Uses/sqlite.mk
@@ -14,9 +14,9 @@
 SQLITE_VER?=	3
 
 .if ${SQLITE_VER} == 3
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite${SQLITE_VER}
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite${SQLITE_VER}
 .elif ${SQLITE_VER} == 2
-LIB_DEPENDS+=	libsqlite.so:${PORTSDIR}/databases/sqlite${SQLITE_VER}
+LIB_DEPENDS+=	libsqlite.so:databases/sqlite${SQLITE_VER}
 .else
 IGNORE=		cannot install: unknown SQLite version: ${SQLITE_VER}
 .endif
Index: head/Mk/Uses/tcl.mk
===================================================================
--- head/Mk/Uses/tcl.mk
+++ head/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: head/Mk/Uses/twisted.mk
===================================================================
--- head/Mk/Uses/twisted.mk
+++ head/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: head/Mk/Uses/xfce.mk
===================================================================
--- head/Mk/Uses/xfce.mk
+++ head/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: head/Mk/Uses/zip.mk
===================================================================
--- head/Mk/Uses/zip.mk
+++ head/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: head/Mk/Uses/zope.mk
===================================================================
--- head/Mk/Uses/zope.mk
+++ head/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: head/Mk/bsd.apache.mk
===================================================================
--- head/Mk/bsd.apache.mk
+++ head/Mk/bsd.apache.mk
@@ -383,11 +383,11 @@
 .endif
 
 .if defined(USE_APACHE) || defined(USE_APACHE_BUILD)
-BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
 .endif
 
 .if defined(USE_APACHE) || defined(USE_APACHE_RUN)
-RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS+=	${APXS}:${APACHE_PORT}
 .endif
 
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
Index: head/Mk/bsd.autotools.mk
===================================================================
--- head/Mk/bsd.autotools.mk
+++ head/Mk/bsd.autotools.mk
@@ -126,7 +126,7 @@
 			ACLOCAL=${ACLOCAL} \
 			ACLOCAL_DIR=${ACLOCAL_DIR}
 
-AUTOMAKE_DEPENDS=	${AUTOMAKE}:${PORTSDIR}/${AUTOMAKE_PORT}
+AUTOMAKE_DEPENDS=	${AUTOMAKE}:${AUTOMAKE_PORT}
 BUILD_DEPENDS+=		${AUTOMAKE_DEPENDS}
 .endif
 
@@ -170,7 +170,7 @@
 			AUTOUPDATE=${AUTOUPDATE} \
 			AUTOCONF_VERSION=${AUTOCONF_VERSION}
 
-AUTOCONF_DEPENDS=	${AUTOCONF}:${PORTSDIR}/${AUTOCONF_PORT}
+AUTOCONF_DEPENDS=	${AUTOCONF}:${AUTOCONF_PORT}
 BUILD_DEPENDS+=		${AUTOCONF_DEPENDS}
 .endif
 
Index: head/Mk/bsd.ccache.mk
===================================================================
--- head/Mk/bsd.ccache.mk
+++ head/Mk/bsd.ccache.mk
@@ -22,7 +22,7 @@
   !defined(NO_BUILD) && !defined(NOCCACHE)
 # Avoid depends loops between ccache and pkg
 .	if ${PKGORIGIN} != devel/ccache && ${PKGORIGIN} != ${PKG_ORIGIN}
-BUILD_DEPENDS+=		${LOCALBASE}/bin/ccache:${PORTSDIR}/devel/ccache
+BUILD_DEPENDS+=		${LOCALBASE}/bin/ccache:devel/ccache
 .	endif
 
 _CCACHE_PATH=	${LOCALBASE}/libexec/ccache
Index: head/Mk/bsd.database.mk
===================================================================
--- head/Mk/bsd.database.mk
+++ head/Mk/bsd.database.mk
@@ -167,12 +167,12 @@
 .	endfor
 .endif # IGNORE_WITH_MYSQL
 .if (${USE_MYSQL} == "server" || ${USE_MYSQL} == "embedded")
-RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/${_MYSQL_SERVER}
+RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
 .if (${USE_MYSQL} == "embedded")
-BUILD_DEPENDS+=	${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/mysql/libmysqld.a:${_MYSQL_SERVER}
 .endif
 .else
-LIB_DEPENDS+=	libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/${_MYSQL_CLIENT}
+LIB_DEPENDS+=	libmysqlclient.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
 .endif
 .else
 IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
@@ -196,9 +196,9 @@
 . endif
 
 # Dependency lines for different db versions
-db48_DEPENDS=	libdb-4.8.so:${PORTSDIR}/databases/db48
-db5_DEPENDS=	libdb-5.3.so:${PORTSDIR}/databases/db5
-db6_DEPENDS=	libdb-6.1.so:${PORTSDIR}/databases/db6
+db48_DEPENDS=	libdb-4.8.so:databases/db48
+db5_DEPENDS=	libdb-5.3.so:databases/db5
+db6_DEPENDS=	libdb-6.1.so:databases/db6
 # Detect db versions by finding some files
 db48_FIND=	${LOCALBASE}/include/db48/db.h
 db5_FIND=	${LOCALBASE}/include/db5/db.h
@@ -390,10 +390,10 @@
 
 # USE_SQLITE is specified incorrectly, so mark this as IGNORE
 .if ${_SQLITE_VER} == "3"
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite${_SQLITE_VER}
 SQLITE_VER=	${_SQLITE_VER}
 .elif ${_SQLITE_VER} == "2"
-LIB_DEPENDS+=	libsqlite.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
+LIB_DEPENDS+=	libsqlite.so:databases/sqlite${_SQLITE_VER}
 SQLITE_VER=	${_SQLITE_VER}
 .else
 IGNORE=		cannot install: unknown SQLite version: ${_SQLITE_VER}
@@ -414,7 +414,7 @@
 .endif
 
 .if ${FIREBIRD_VER} == "25"
-LIB_DEPENDS+=	libfbclient.so:${PORTSDIR}/databases/firebird25-client
+LIB_DEPENDS+=	libfbclient.so:databases/firebird25-client
 .else
 IGNORE=		cannot install: unknown Firebird version: ${FIREBIRD_VER}
 .endif
Index: head/Mk/bsd.fpc.mk
===================================================================
--- head/Mk/bsd.fpc.mk
+++ head/Mk/bsd.fpc.mk
@@ -60,7 +60,7 @@
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 .endif
 
-BUILD_DEPENDS+=		${PPNAME}:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS+=		${PPNAME}:lang/fpc
 
 BUILDNAME=		${FPC_ARCH}-${OPSYS:tl}
 UNITSDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
Index: head/Mk/bsd.gcc.mk
===================================================================
--- head/Mk/bsd.gcc.mk
+++ head/Mk/bsd.gcc.mk
@@ -170,8 +170,8 @@
 .undef V
 
 .if defined(_GCC_PORT_DEPENDS)
-BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_PORT}
-RUN_DEPENDS+=	${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_PORT}
+BUILD_DEPENDS+=	${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT}
+RUN_DEPENDS+=	${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT}
 # Later GCC ports already depend on binutils; make sure whatever we
 # build leverages this as well.
 USE_BINUTILS=	yes
Index: head/Mk/bsd.gecko.mk
===================================================================
--- head/Mk/bsd.gecko.mk
+++ head/Mk/bsd.gecko.mk
@@ -152,75 +152,75 @@
 .endif
 
 .if ! ${PORT_OPTIONS:MBUNDLED_CAIRO}
-cairo_BUILD_DEPENDS=cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo
-cairo_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+cairo_BUILD_DEPENDS=cairo>=1.12.16_1,2:graphics/cairo
+cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 cairo_MOZ_OPTIONS=	--enable-system-cairo
 .endif
 
-event_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+event_LIB_DEPENDS=	libevent.so:devel/libevent2
 event_MOZ_OPTIONS=	--with-system-libevent
 
-ffi_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+ffi_LIB_DEPENDS=	libffi.so:devel/libffi
 ffi_MOZ_OPTIONS=	--enable-system-ffi
 
 .if exists(${FILESDIR}/patch-bug847568)
-graphite_LIB_DEPENDS=	libgraphite2.so:${PORTSDIR}/graphics/graphite2
+graphite_LIB_DEPENDS=	libgraphite2.so:graphics/graphite2
 graphite_MOZ_OPTIONS=	--with-system-graphite2
 
-harfbuzz_LIB_DEPENDS=	libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+harfbuzz_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 harfbuzz_MOZ_OPTIONS=	--with-system-harfbuzz
 .endif
 
-hunspell_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+hunspell_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 hunspell_MOZ_OPTIONS=	--enable-system-hunspell
 
-icu_LIB_DEPENDS=		libicui18n.so:${PORTSDIR}/devel/icu
+icu_LIB_DEPENDS=		libicui18n.so:devel/icu
 icu_MOZ_OPTIONS=		--with-system-icu --with-intl-api
 
--jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm
+-jpeg_BUILD_DEPENDS=yasm:devel/yasm
 # XXX Remove files/patch-ijg-libjpeg once -turbo is default
 jpeg_USES=		jpeg
 jpeg_MOZ_OPTIONS=	--with-system-jpeg=${LOCALBASE}
 
-nspr_LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/devel/nspr
+nspr_LIB_DEPENDS=	libnspr4.so:devel/nspr
 nspr_MOZ_OPTIONS=	--with-system-nspr
 
-nss_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
+nss_LIB_DEPENDS=	libnss3.so:security/nss
 nss_MOZ_OPTIONS=	--with-system-nss
 
 .if exists(${FILESDIR}/patch-z-bug517422) && ${MOZILLA_VER:R:R} < 45
-opus_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+opus_LIB_DEPENDS=	libopus.so:audio/opus
 opus_MOZ_OPTIONS=	--with-system-opus
 .endif
 
-pixman_LIB_DEPENDS=	libpixman-1.so:${PORTSDIR}/x11/pixman
+pixman_LIB_DEPENDS=	libpixman-1.so:x11/pixman
 pixman_MOZ_OPTIONS=	--enable-system-pixman
 
-png_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+png_LIB_DEPENDS=	libpng.so:graphics/png
 png_MOZ_OPTIONS=	--with-system-png=${LOCALBASE}
 
 .if exists(${FILESDIR}/patch-z-bug517422)
-soundtouch_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
+soundtouch_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
 soundtouch_MOZ_OPTIONS=	--with-system-soundtouch
 .endif
 
-sqlite_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+sqlite_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 sqlite_MOZ_OPTIONS=	--enable-system-sqlite
 
 .if exists(${FILESDIR}/patch-z-bug517422)
 # XXX disabled: update to 1.2.x or review backported fixes
-theora_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+theora_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 theora_MOZ_OPTIONS=	--with-system-theora
 
-tremor_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+tremor_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 tremor_MOZ_OPTIONS=	--with-system-tremor --with-system-ogg
 
-vorbis_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+vorbis_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 vorbis_MOZ_OPTIONS=	--with-system-vorbis --with-system-ogg
 .endif
 
--vpx_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
-vpx_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+-vpx_BUILD_DEPENDS=	yasm:devel/yasm
+vpx_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 vpx_MOZ_OPTIONS=	--with-system-libvpx
 
 .for use in ${USE_MOZILLA}
@@ -290,7 +290,7 @@
 USE_QT5+=	qmake_build buildtools_build gui network quick printsupport
 MOZ_EXPORT+=	HOST_QMAKE="${QMAKE}" HOST_MOC="${MOC}" HOST_RCC="${RCC}"
 .elif ${MOZ_TOOLKIT:Mcairo-gtk3}
-BUILD_DEPENDS+=	gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30
+BUILD_DEPENDS+=	gtk3>=3.14.6:x11-toolkits/gtk30
 USE_GNOME+=	gtk30
 . if ${MOZILLA_VER:R:R} >= 32
 USE_GNOME+= gtk20 # bug 624422
@@ -312,13 +312,13 @@
 .endif
 
 .if ${PORT_OPTIONS:MCANBERRA}
-RUN_DEPENDS+=	libcanberra>0:${PORTSDIR}/audio/libcanberra
+RUN_DEPENDS+=	libcanberra>0:audio/libcanberra
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-BUILD_DEPENDS+=	libnotify>0:${PORTSDIR}/devel/libnotify
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-				libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+BUILD_DEPENDS+=	libnotify>0:devel/libnotify
+LIB_DEPENDS+=	libdbus-glib-1.so:devel/dbus-glib \
+				libstartup-notification-1.so:x11/startup-notification
 MOZ_OPTIONS+=	--enable-startup-notification
 .else
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
@@ -326,13 +326,13 @@
 
 .if ${PORT_OPTIONS:MFFMPEG}
 # dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-RUN_DEPENDS+=	ffmpeg>=0.8,1:${PORTSDIR}/multimedia/ffmpeg
+RUN_DEPENDS+=	ffmpeg>=0.8,1:multimedia/ffmpeg
 .else
 MOZ_OPTIONS+=	--disable-ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
-RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
+RUN_DEPENDS+=	gstreamer1-libav>=1.2.4_1:multimedia/gstreamer1-libav
 USE_GSTREAMER1?=good libav
 MOZ_OPTIONS+=	--enable-gstreamer=1.0
 .else
@@ -362,7 +362,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MLIBPROXY}
-LIB_DEPENDS+=	libproxy.so:${PORTSDIR}/net/libproxy
+LIB_DEPENDS+=	libproxy.so:net/libproxy
 MOZ_OPTIONS+=	--enable-libproxy
 .else
 MOZ_OPTIONS+=	--disable-libproxy
@@ -377,18 +377,18 @@
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
-RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
+RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
+RUN_DEPENDS+=	alsa-lib>=1.0.27.2_1:audio/alsa-lib
 MOZ_OPTIONS+=	--enable-alsa
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 . if ${PORT_OPTIONS:MALSA}
-BUILD_DEPENDS+=	pulseaudio>0:${PORTSDIR}/audio/pulseaudio
+BUILD_DEPENDS+=	pulseaudio>0:audio/pulseaudio
 . else
 # pull pulse package if we cannot fallback to another backend
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 . endif
 MOZ_OPTIONS+=	--enable-pulseaudio
 .else
Index: head/Mk/bsd.gstreamer.mk
===================================================================
--- head/Mk/bsd.gstreamer.mk
+++ head/Mk/bsd.gstreamer.mk
@@ -393,8 +393,8 @@
 ${ext}_GST_VERSION?=	${GST_VERSION}${GST_MINOR_VERSION}
 ${ext}_NAME?=		${ext}
 . if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_DEPENDS})
-BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${${ext}_DEPENDS}
+RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME}>=${${ext}_GST_VERSION}:${${ext}_DEPENDS}
 . else
 IGNORE=	cannot install: unknown gstreamer ${GST_VERSION} plugin -- ${ext}
 . endif
@@ -408,8 +408,8 @@
 ${ext}_NAME10?=		${ext}
 ${ext}_GST_DEPENDS?=	${${ext}_DEPENDS:S,gstreamer-,gstreamer1-,}
 . if ${_USE_GSTREAMER_ALL:M${ext}}!= "" && exists(${PORTSDIR}/${${ext}_GST_DEPENDS})
-BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_GST_DEPENDS}
-RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${PORTSDIR}/${${ext}_GST_DEPENDS}
+BUILD_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${${ext}_GST_DEPENDS}
+RUN_DEPENDS+=	${${ext}_GST_PREFIX}${${ext}_NAME10}>=${${ext}_GST_VERSION}:${${ext}_GST_DEPENDS}
 . else
 IGNORE=	cannot install: unknown gstreamer ${GST1_VERSION} plugin -- ${ext}
 . endif
Index: head/Mk/bsd.java.mk
===================================================================
--- head/Mk/bsd.java.mk
+++ head/Mk/bsd.java.mk
@@ -368,7 +368,7 @@
 .		endif
 
 # Add the JDK port to the dependencies
-DEPEND_JAVA=	${JAVA}:${PORTSDIR}/${JAVA_PORT}
+DEPEND_JAVA=	${JAVA}:${JAVA_PORT}
 .		if defined(JAVA_EXTRACT)
 EXTRACT_DEPENDS+=	${DEPEND_JAVA}
 .		endif
@@ -389,7 +389,7 @@
 DESTDIRNAME?=		-Dfreebsd.ports.destdir
 ANT?=				${LOCALBASE}/bin/ant
 MAKE_ENV+=			JAVA_HOME=${JAVA_HOME}
-BUILD_DEPENDS+=		${ANT}:${PORTSDIR}/devel/apache-ant
+BUILD_DEPENDS+=		${ANT}:devel/apache-ant
 ALL_TARGET?=
 .			if !target(do-build)
 do-build:
Index: head/Mk/bsd.kde4.mk
===================================================================
--- head/Mk/bsd.kde4.mk
+++ head/Mk/bsd.kde4.mk
@@ -287,7 +287,7 @@
 . if ${_USE_KDE4_ALL:M${component}} != ""
    # Skip meta-components (e.g. kdeprefix).
 .  if defined(${component}_PORT) && defined(${component}_PATH)
-${component}_DEPENDS=	${${component}_PATH}:${PORTSDIR}/${${component}_PORT}
+${component}_DEPENDS=	${${component}_PATH}:${${component}_PORT}
     # Check if a dependency type is explicitly requested.
 .   if ${USE_KDE4:M${component}_*} != "" && ${USE_KDE4:M${component}} == ""
 ${component}_TYPE=	# empty
Index: head/Mk/bsd.ldap.mk
===================================================================
--- head/Mk/bsd.ldap.mk
+++ head/Mk/bsd.ldap.mk
@@ -89,7 +89,7 @@
 .		endif
 .	endfor
 .endif # IGNORE_WITH_OPENLDAP
-LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:${PORTSDIR}/net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
+LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
 .else
 IGNORE=		cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
 .endif # Check for correct libs
Index: head/Mk/bsd.linux-rpm.mk
===================================================================
--- head/Mk/bsd.linux-rpm.mk
+++ head/Mk/bsd.linux-rpm.mk
@@ -127,7 +127,7 @@
 EXTRACT_BEFORE_ARGS?=	--no-same-permissions --no-same-owner -xf
 EXTRACT_AFTER_ARGS?=
 .else
-EXTRACT_DEPENDS+=	rpm2archive:${PORTSDIR}/archivers/rpm4
+EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
 EXTRACT_CMD?=	rpm2archive
 EXTRACT_BEFORE_ARGS?=	<
 EXTRACT_AFTER_ARGS?=	| ${TAR} xf - --no-same-permissions --no-same-owner
Index: head/Mk/bsd.octave.mk
===================================================================
--- head/Mk/bsd.octave.mk
+++ head/Mk/bsd.octave.mk
@@ -15,10 +15,10 @@
 
 bsd_octave_mk_MAINTAINER=	stephen@FreeBSD.org
 
-BUILD_DEPENDS+=	octave:${PORTSDIR}/math/octave
-RUN_DEPENDS+=	octave:${PORTSDIR}/math/octave \
-		${LOCALBASE}/libexec/octave/load-octave-pkg:${PORTSDIR}/math/octave-forge-base
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS+=	octave:math/octave
+RUN_DEPENDS+=	octave:math/octave \
+		${LOCALBASE}/libexec/octave/load-octave-pkg:math/octave-forge-base
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 USES+=		fortran gmake
 
Index: head/Mk/bsd.openssl.mk
===================================================================
--- head/Mk/bsd.openssl.mk
+++ head/Mk/bsd.openssl.mk
@@ -117,8 +117,8 @@
 OPENSSL_SHLIBVER?=	8
 
 OPENSSLDIR?=		${OPENSSLBASE}/openssl
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}
-RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${PORTSDIR}/${OPENSSL_PORT}
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
 OPENSSLRPATH=		${LOCALBASE}/lib
 
 .endif
Index: head/Mk/bsd.php.mk
===================================================================
--- head/Mk/bsd.php.mk
+++ head/Mk/bsd.php.mk
@@ -139,20 +139,20 @@
 MOD_PHP_PORT?=	www/mod_php${PHP_VER}
 
 .if defined(USE_PHP_BUILD)
-BUILD_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PORTSDIR}/${PHP_PORT}
+BUILD_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
 .endif
-RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PORTSDIR}/${PHP_PORT}
+RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
 .if defined(WANT_PHP_MOD) || (defined(WANT_PHP_WEB) && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "")
 USE_APACHE_RUN=	22+
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
-RUN_DEPENDS+=	${PHPBASE}/${APACHEMODDIR}/libphp5.so:${PORTSDIR}/${MOD_PHP_PORT}
+RUN_DEPENDS+=	${PHPBASE}/${APACHEMODDIR}/libphp5.so:${MOD_PHP_PORT}
 .endif
 
 PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 SUB_LIST+=	PHP_EXT_DIR=${PHP_EXT_DIR}
 
 .if defined(USE_PHPIZE) || defined(USE_PHPEXT) || defined(USE_ZENDEXT)
-BUILD_DEPENDS+=	${PHPBASE}/bin/phpize:${PORTSDIR}/${PHP_PORT}
+BUILD_DEPENDS+=	${PHPBASE}/bin/phpize:${PHP_PORT}
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS+=	autoconf:env
 CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config
@@ -346,17 +346,17 @@
 .		if ${_USE_PHP_VER${PHP_VER}:M${extension}} != ""
 .			if ${PHP_EXT_INC:M${extension}} == ""
 .				if defined(USE_PHP_BUILD)
-BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
+BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS}
 .				endif
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS}
 .			endif
 .		else
 ext=		${extension}
 .			if ${ext} == "mhash"
 .				if defined(USE_PHP_BUILD)
-BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${PORTSDIR}/${hash_DEPENDS}
+BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${hash_DEPENDS}
 .				endif
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${PORTSDIR}/${hash_DEPENDS}
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${hash_DEPENDS}
 .			elif ${ext:tl} != "yes"
 check-makevars::
 			@${ECHO_CMD} "Unknown extension ${extension} for PHP ${PHP_VER}."
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1523,7 +1523,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 \
@@ -1629,7 +1629,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
@@ -1669,7 +1669,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)
@@ -1677,7 +1677,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?=
@@ -1742,13 +1742,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
@@ -1772,19 +1772,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"
@@ -1848,7 +1848,7 @@
 .endif
 
 .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
-	defined(USE_BDB) || defined(USE_SQLITE) || defined(USE_FIREBIRD)
+	defined(USE_BDB)  || defined(USE_SQLITE) || defined(USE_FIREBIRD)
 .include "${PORTSDIR}/Mk/bsd.database.mk"
 .endif
 
@@ -2647,7 +2647,7 @@
 .endif
 
 .if defined(INFO)
-RUN_DEPENDS+=	indexinfo:${PORTSDIR}/print/indexinfo
+RUN_DEPENDS+=	indexinfo:print/indexinfo
 
 . for D in ${INFO:H}
 RD:=	${D}
Index: head/Mk/bsd.qt.mk
===================================================================
--- head/Mk/bsd.qt.mk
+++ head/Mk/bsd.qt.mk
@@ -576,8 +576,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: head/Mk/bsd.ruby.mk
===================================================================
--- head/Mk/bsd.ruby.mk
+++ head/Mk/bsd.ruby.mk
@@ -316,9 +316,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}
@@ -424,15 +424,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
@@ -599,7 +599,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: head/Mk/bsd.sdl.mk
===================================================================
--- head/Mk/bsd.sdl.mk
+++ head/Mk/bsd.sdl.mk
@@ -161,20 +161,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: head/Mk/bsd.tex.mk
===================================================================
--- head/Mk/bsd.tex.mk
+++ head/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: head/Mk/bsd.wx.mk
===================================================================
--- head/Mk/bsd.wx.mk
+++ head/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: head/Mk/bsd.xorg.mk
===================================================================
--- head/Mk/bsd.xorg.mk
+++ head/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}} == ""