92 files changed, 291 insertions, 291 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 51cacaddaee8..725a703b3070 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -11,13 +11,13 @@ DISTNAME=	AfterStep-${PORTVERSION}
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Stable version of the AfterStep window manager
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	xli:${PORTSDIR}/graphics/xli
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
+RUN_DEPENDS=	xli:graphics/xli
 
 USES=		execinfo gmake jpeg pkgconfig shebangfix tar:bzip2
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 librsvg2 pango
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 1eb25313fb9d..4e5846562186 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	AfterStep-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Window manager originally based on the Bowman NeXTstep clone
 
-RUN_DEPENDS=	asclock:${PORTSDIR}/x11-clocks/asclock
+RUN_DEPENDS=	asclock:x11-clocks/asclock
 
 CONFLICTS?=	afterstep-2*
 PORTSCOUT=	limit:^1\.[0-9.]*$$
diff --git a/x11-wm/awesome-vicious/Makefile b/x11-wm/awesome-vicious/Makefile
index 4e01098b172f..ca6a7cc50c54 100644
--- a/x11-wm/awesome-vicious/Makefile
+++ b/x11-wm/awesome-vicious/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Widgets for the awesome window manager
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	awesome:${PORTSDIR}/x11-wm/awesome
+RUN_DEPENDS=	awesome:x11-wm/awesome
 
 USES=		tar:xz
 NO_BUILD=	yes
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 8ef260e2907c..9b3fab75caa3 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Tiling window manager initially based on a dwm code rewriting
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xmlto:${PORTSDIR}/textproc/xmlto
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+		xmlto:textproc/xmlto
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
+		libcairo.so:graphics/cairo \
+		libfreetype.so:print/freetype2 \
+		libImlib2.so:graphics/imlib2
 
 USES=		iconv pkgconfig python:build
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/bbkeys/Makefile b/x11-wm/bbkeys/Makefile
index 384a9f69e956..64bdd1551a35 100644
--- a/x11-wm/bbkeys/Makefile
+++ b/x11-wm/bbkeys/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Keygrabber for the Blackbox window manager
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
+BUILD_DEPENDS=	blackbox:x11-wm/blackbox
 
 USES=		perl5 pkgconfig
 USE_PERL5=	build
diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 01c3bd51005b..18920a42f187 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Pager for the Blackbox window manager
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
-BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
+BUILD_DEPENDS=	blackbox:x11-wm/blackbox
 
 USES=		pathfix pkgconfig
 USE_XORG=	xext sm x11 xau xcursor xi
diff --git a/x11-wm/bspwm/Makefile b/x11-wm/bspwm/Makefile
index 6aa94d8d3066..a72c6f6048f7 100644
--- a/x11-wm/bspwm/Makefile
+++ b/x11-wm/bspwm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Tiling window manager based on binary space partitioning
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
-RUN_DEPENDS=	sxhkd:${PORTSDIR}/x11/sxhkd
+LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
+RUN_DEPENDS=	sxhkd:x11/sxhkd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	baskerville
diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile
index ac84ec263a36..edb40aab043d 100644
--- a/x11-wm/ccsm/Makefile
+++ b/x11-wm/ccsm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Python/GTK based settings manager for CompizConfig
 
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x11-wm/compizconfig-python
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:x11-wm/compizconfig-python
 
 USES=		gettext gmake python:2 tar:bzip2
 USE_GNOME=	intltool pygtk2
diff --git a/x11-wm/clementine-wm/Makefile b/x11-wm/clementine-wm/Makefile
index a8bf05aa840e..8cdbcef1a1d8 100644
--- a/x11-wm/clementine-wm/Makefile
+++ b/x11-wm/clementine-wm/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Window manager based on aewm with title bars, iconization, and styles
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv \
-		rxvt:${PORTSDIR}/x11/rxvt
+RUN_DEPENDS=	xv:graphics/xv \
+		rxvt:x11/rxvt
 
 USES=		gmake
 USE_XORG=	x11
diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
index dcdabd9564d9..3688c72cd591 100644
--- a/x11-wm/compiz-fusion/Makefile
+++ b/x11-wm/compiz-fusion/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	x11-wm
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Metaport of compiz-fusion
 
-LIB_DEPENDS=	libcompizconfig.so:${PORTSDIR}/x11-wm/libcompizconfig
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \
-		${LOCALBASE}/lib/compiz/libanimation.so:${PORTSDIR}/x11-wm/compiz-plugins-main \
-		${LOCALBASE}/bin/ccsm:${PORTSDIR}/x11-wm/ccsm
+LIB_DEPENDS=	libcompizconfig.so:x11-wm/libcompizconfig
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
+		${LOCALBASE}/lib/compiz/libanimation.so:x11-wm/compiz-plugins-main \
+		${LOCALBASE}/bin/ccsm:x11-wm/ccsm
 
 USES=		metaport
 
@@ -23,11 +23,11 @@ EXTRA_DESC=	Enable extra plugins
 UNSUP_DESC=	Enable unsupported plugins
 EMERALD_DESC=	Enable emerald window decorator
 
-EXTRA_RUN_DEPENDS=	${LOCALBASE}/lib/compiz/libaddhelper.so:${PORTSDIR}/x11-wm/compiz-plugins-extra
-UNSUP_RUN_DEPENDS=	${LOCALBASE}/lib/compiz/libfakeargb.so:${PORTSDIR}/x11-wm/compiz-plugins-unsupported
-EMERALD_RUN_DEPENDS=	${LOCALBASE}/bin/emerald:${PORTSDIR}/x11-wm/emerald \
-		${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.ini:${PORTSDIR}/x11-themes/emerald-themes
+EXTRA_RUN_DEPENDS=	${LOCALBASE}/lib/compiz/libaddhelper.so:x11-wm/compiz-plugins-extra
+UNSUP_RUN_DEPENDS=	${LOCALBASE}/lib/compiz/libfakeargb.so:x11-wm/compiz-plugins-unsupported
+EMERALD_RUN_DEPENDS=	${LOCALBASE}/bin/emerald:x11-wm/emerald \
+		${LOCALBASE}/share/emerald/themes/Adonis_Mod/theme.ini:x11-themes/emerald-themes
 
-GCONF_RUN_DEPENDS=	${LOCALBASE}/lib/compizconfig/backends/libgconf.so:${PORTSDIR}/x11-wm/compizconfig-backend-gconf
+GCONF_RUN_DEPENDS=	${LOCALBASE}/lib/compizconfig/backends/libgconf.so:x11-wm/compizconfig-backend-gconf
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 9ea324eb863c..07d4ee273b1a 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Plugins for Compiz Composite Window Manager
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \
-		${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop \
-		${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:${PORTSDIR}/x11-wm/compiz-plugins-main
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libnotify.so:devel/libnotify
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
+		${LOCALBASE}/libdata/pkgconfig/bcop.pc:devel/compiz-bcop \
+		${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:x11-wm/compiz-plugins-main
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 02ae664a043d..23b2f3dd2060 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Plugins for Compiz Composite Window Manager
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \
-		${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libpangocairo-1.0.so:x11-toolkits/pango
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
+		${LOCALBASE}/libdata/pkgconfig/bcop.pc:devel/compiz-bcop
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 27eecfc8afa1..49e1d254b09b 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Plugins for Compiz Composite Window Manager
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \
-		${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop \
-		${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:${PORTSDIR}/x11-wm/compiz-plugins-main
+LIB_DEPENDS=	libcairo.so:graphics/cairo
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
+		${LOCALBASE}/libdata/pkgconfig/bcop.pc:devel/compiz-bcop \
+		${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:x11-wm/compiz-plugins-main
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 53ff580fb59c..22b295b07a06 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Compiz Composite/Window Manager
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	glxinfo:${PORTSDIR}/graphics/mesa-demos \
-		nvidia-settings:${PORTSDIR}/x11/nvidia-settings
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libgtop-2.0.so:devel/libgtop \
+		libstartup-notification-1.so:x11/startup-notification
+RUN_DEPENDS=	glxinfo:graphics/mesa-demos \
+		nvidia-settings:x11/nvidia-settings
 
 XORG_CAT=	app
 GNU_CONFIGURE=	yes
@@ -98,12 +98,12 @@ CONFIGURE_ARGS+=	--disable-metacity
 
 .if ${PORT_OPTIONS:MDBUS}
 CONFIGURE_ARGS+=	--enable-dbus
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
 .if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGNOME}
 CONFIGURE_ARGS+=	--enable-dbus-glib
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index d9cc535445b1..dd876172fce6 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	The gconf backend for CompizConfig
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
-LIB_DEPENDS=	libcompizconfig.so:${PORTSDIR}/x11-wm/libcompizconfig
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz
+LIB_DEPENDS=	libcompizconfig.so:x11-wm/libcompizconfig
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 6387c319bf2b..52582b828e46 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -11,9 +11,9 @@ MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Python bindings for the compizconfig library
 
 BUILD_DEPENDS=	\
-	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \
-	${LOCALBASE}/libdata/pkgconfig/libcompizconfig.pc:${PORTSDIR}/x11-wm/libcompizconfig \
-	${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex
+	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \
+	${LOCALBASE}/libdata/pkgconfig/libcompizconfig.pc:x11-wm/libcompizconfig \
+	${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:devel/pyrex
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index 95a8744f3e28..a61d62b7dee6 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -9,9 +9,9 @@ COMMENT=	Feature-rich compositing window manager for X11
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig
-RUN_DEPENDS=	xprop:${PORTSDIR}/x11/xprop \
-		xwininfo:${PORTSDIR}/x11/xwininfo
+LIB_DEPENDS=	libconfig.so:devel/libconfig
+RUN_DEPENDS=	xprop:x11/xprop \
+		xwininfo:x11/xwininfo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chjj
@@ -34,13 +34,13 @@ DOCS_DESC=	Build manpages (requires AsciiDoc/DocBook)
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:devel/pcre
 .else
 MAKE_ARGS+=	NO_REGEX_PCRE=yes
 .endif
 
 .if ${PORT_OPTIONS:MDRM}
-LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm
+LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 .else
 MAKE_ARGS+=	NO_VSYNC_DRM=yes
 .endif
@@ -52,16 +52,16 @@ MAKE_ARGS+=	NO_VSYNC_OPENGL=yes
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	libdbus-1.so:devel/dbus
 .else
 MAKE_ARGS+=	NO_DBUS=yes
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	a2x:${PORTSDIR}/textproc/asciidoc \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	a2x:textproc/asciidoc \
+		xsltproc:textproc/libxslt \
+		docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MAKE_ARGS+=	DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1
 ALL_TARGET+=	docs
 PLIST_FILES+=	man/man1/compton.1.gz man/man1/compton-trans.1.gz
diff --git a/x11-wm/cwm/Makefile b/x11-wm/cwm/Makefile
index 5218732bac58..abcdd6a3156e 100644
--- a/x11-wm/cwm/Makefile
+++ b/x11-wm/cwm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Minimalistic window manager for X11 based on evilwm
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 
 USES=		pkgconfig:build
 USE_XORG=	x11 xft xinerama xrandr
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index a8e807be9088..b7407e694951 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Window manipulation tool
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libwnck-3.so:${PORTSDIR}/x11-toolkits/libwnck3
+LIB_DEPENDS=	libwnck-3.so:x11-toolkits/libwnck3
 
 USES=		gettext gmake pkgconfig tar:xz
 USE_GNOME=	libwnck intltool
diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index 80e3cad68276..d2d1a316a947 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Dynamic, small, fast and simple window manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	XINERAMA DOCS
 OPTIONS_DEFAULT=XINERAMA
diff --git a/x11-wm/e-module-alarm/Makefile b/x11-wm/e-module-alarm/Makefile
index 8f65e65d1188..c8abbe8851a2 100644
--- a/x11-wm/e-module-alarm/Makefile
+++ b/x11-wm/e-module-alarm/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Module to set Alarms in Enlightenment
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-cpu/Makefile b/x11-wm/e-module-cpu/Makefile
index 109d2d7918d3..eb6227108710 100644
--- a/x11-wm/e-module-cpu/Makefile
+++ b/x11-wm/e-module-cpu/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment module which allows users to monitor cpu load
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-deskshow/Makefile b/x11-wm/e-module-deskshow/Makefile
index df0b1a0c039c..765444636720 100644
--- a/x11-wm/e-module-deskshow/Makefile
+++ b/x11-wm/e-module-deskshow/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	e-module-
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment module that minimizes windows to show the desktop
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-everything-places/Makefile b/x11-wm/e-module-everything-places/Makefile
index 1146db84bfa7..3bac3acd9243 100644
--- a/x11-wm/e-module-everything-places/Makefile
+++ b/x11-wm/e-module-everything-places/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment places plugin for the "everything" module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-everything-websearch/Makefile b/x11-wm/e-module-everything-websearch/Makefile
index f08c675d38d8..07ee6c17f226 100644
--- a/x11-wm/e-module-everything-websearch/Makefile
+++ b/x11-wm/e-module-everything-websearch/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment websearch plugin for the "everything" module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-forecasts/Makefile b/x11-wm/e-module-forecasts/Makefile
index 567f7ad99462..b27b0aeba1b4 100644
--- a/x11-wm/e-module-forecasts/Makefile
+++ b/x11-wm/e-module-forecasts/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment weather forecast display module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-mem/Makefile b/x11-wm/e-module-mem/Makefile
index d1ae90c41b8a..8c7bb0c43b4c 100644
--- a/x11-wm/e-module-mem/Makefile
+++ b/x11-wm/e-module-mem/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment memory monitoring module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-mpdule/Makefile b/x11-wm/e-module-mpdule/Makefile
index 250bade5e61a..ab7f26e6347f 100644
--- a/x11-wm/e-module-mpdule/Makefile
+++ b/x11-wm/e-module-mpdule/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	MPD module for Enlightenment
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
+LIB_DEPENDS=	libmpd.so:audio/libmpd
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-net/Makefile b/x11-wm/e-module-net/Makefile
index d4c737fd257e..a4b8b91b64dd 100644
--- a/x11-wm/e-module-net/Makefile
+++ b/x11-wm/e-module-net/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment NIC monitoring module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-penguins/Makefile b/x11-wm/e-module-penguins/Makefile
index 635615569784..6179f65d765c 100644
--- a/x11-wm/e-module-penguins/Makefile
+++ b/x11-wm/e-module-penguins/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment module that displays penguins on your desktop
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-places/Makefile b/x11-wm/e-module-places/Makefile
index be4dbb3e056c..8ae5350e5e26 100644
--- a/x11-wm/e-module-places/Makefile
+++ b/x11-wm/e-module-places/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment module to manage disk volumes
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-rmb/Makefile b/x11-wm/e-module-rmb/Makefile
index ef646aa8db7b..ab460bacba8c 100644
--- a/x11-wm/e-module-rmb/Makefile
+++ b/x11-wm/e-module-rmb/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Enlightenment module to emulate right mouse button
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-tclock/Makefile b/x11-wm/e-module-tclock/Makefile
index 499858130d15..c8b183b16a88 100644
--- a/x11-wm/e-module-tclock/Makefile
+++ b/x11-wm/e-module-tclock/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Digital clock gadget module for Enlightenment
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/e-module-wlan/Makefile b/x11-wm/e-module-wlan/Makefile
index 6a839f8f148f..cfda91d9a5bd 100644
--- a/x11-wm/e-module-wlan/Makefile
+++ b/x11-wm/e-module-wlan/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	LOCAL/gblach/enlightenment/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment wlan devices monitoring module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS=	enlightenment:x11-wm/enlightenment
+RUN_DEPENDS=	enlightenment:x11-wm/enlightenment
 
 DIST_SUBDIR=	enlightenment
 USES=		gmake libtool pkgconfig tar:xz
diff --git a/x11-wm/e-modules/Makefile b/x11-wm/e-modules/Makefile
index c9dd90ddbe44..dbce94782c9f 100644
--- a/x11-wm/e-modules/Makefile
+++ b/x11-wm/e-modules/Makefile
@@ -33,7 +33,7 @@ ${M:tu:S,-,_,g}_DESC=	Install ${M} module
 ${M:tu:S,-,_,g}_PATH=	${M}
 . endif
 . if ${PORT_OPTIONS:M${M:tu:S,-,_,g}}
-RUN_DEPENDS+=	${LOCALBASE}/lib/enlightenment/modules/${${M:tu:S,-,_,g}_PATH}/${ENLIGHTENMENT_ARCH}/module.so:${PORTSDIR}/x11-wm/e-module-${M}
+RUN_DEPENDS+=	${LOCALBASE}/lib/enlightenment/modules/${${M:tu:S,-,_,g}_PATH}/${ENLIGHTENMENT_ARCH}/module.so:x11-wm/e-module-${M}
 . endif
 .endfor
 
diff --git a/x11-wm/e16-docs/Makefile b/x11-wm/e16-docs/Makefile
index 61896c4e0c85..5041786b4ace 100644
--- a/x11-wm/e16-docs/Makefile
+++ b/x11-wm/e16-docs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/enlightenment/e16-docs/${PORTVERSION}
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Data files of enlightenment DOX
 
-RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/e16
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:x11-wm/e16
 
 USES=		gmake
 USE_XORG=	x11
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 604c36548b0f..69c43dd54d04 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Enlightenment DR16 window manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 OPTIONS_DEFINE=		DOCS NLS SOUND
 OPTIONS_SUB=		yes
 SOUND_DESC=		Sound support via pulseaudio/libsndfile
-SOUND_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio \
-			libsndfile.so:${PORTSDIR}/audio/libsndfile
+SOUND_LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
+			libsndfile.so:audio/libsndfile
 SOUND_CONFIGURE_ON=	--enable-sound \
 			--enable-sound-pulse \
 			--with-sndldr=sndfile
diff --git a/x11-wm/echinus/Makefile b/x11-wm/echinus/Makefile
index 4689df44ba37..c34d23caf2f3 100644
--- a/x11-wm/echinus/Makefile
+++ b/x11-wm/echinus/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://plhk.ru/static/echinus/
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	Dynamic window manager for X11 based on dwm
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		pkgconfig
 USE_XORG=	x11 xau xcb xdmcp xext xft xrender xrandr
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index cdd31458a1e6..4d5a95d008c7 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -16,12 +16,12 @@ COMMENT=	Equinox Desktop Environment
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-		jam:${PORTSDIR}/devel/jam
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+BUILD_DEPENDS=	doxygen:devel/doxygen \
+		jam:devel/jam
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libcurl.so:ftp/curl \
+		libstartup-notification-1.so:x11/startup-notification \
+		libfltk.so:x11-toolkits/fltk
 
 USES=		fam gettext iconv:translit pathfix pkgconfig python:2 \
 		shared-mime-info shebangfix
@@ -43,7 +43,7 @@ CONFLICTS_INSTALL=	pekwm-[0-9]*
 
 OPTIONS_DEFINE=		HAL
 
-HAL_LIB_DEPENDS=	libhal.so.1:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so.1:sysutils/hal
 HAL_CONFIGURE_ENABLE=	hal
 
 EDELIB_NAME=	edelib
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 569fae68ae7e..dc12dce588cd 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Emerald Window Decorator
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INSTALLS_ICONS=	yes
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 73c344dd673e..ac3a1413dd14 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Artistic X window manager
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libelementary.so:${PORTSDIR}/x11-toolkits/elementary \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
-RUN_DEPENDS=	${LOCALBASE}/lib/evas/utils/evas_image_loader.svg:${PORTSDIR}/graphics/evas_generic_loaders-svg
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libelementary.so:x11-toolkits/elementary \
+		libxcb-keysyms.so:x11/xcb-util-keysyms
+RUN_DEPENDS=	${LOCALBASE}/lib/evas/utils/evas_image_loader.svg:graphics/evas_generic_loaders-svg
 
 GNU_CONFIGURE=	yes
 USES=		alias autoreconf desktop-file-utils execinfo gettext-tools \
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 89768f11137f..4822086649c0 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Collection of Enlightenment dock applications
 
-BUILD_DEPENDS=	e16:${PORTSDIR}/x11-wm/e16
-LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
-RUN_DEPENDS=	e16:${PORTSDIR}/x11-wm/e16 \
-		import:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	e16:x11-wm/e16
+LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
+RUN_DEPENDS=	e16:x11-wm/e16 \
+		import:graphics/ImageMagick
 
 USES=		gmake libtool pkgconfig
 USE_XORG=	xext
diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 6c0fbdfd82fe..d50c3332d307 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://darkshed.net/files/c_cpp/fbcmd/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Commandline utility for controlling fluxbox
 
-RUN_DEPENDS=	fluxbox:${PORTSDIR}/x11-wm/fluxbox
+RUN_DEPENDS=	fluxbox:x11-wm/fluxbox
 
 USES=		gmake tar:bzip2
 ALL_TARGET=	first
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 169e9f38f788..b4c3f5aeea18 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Small and fast window manager based on BlackBox
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	xmessage:${PORTSDIR}/x11/xmessage
-LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+RUN_DEPENDS=	xmessage:x11/xmessage
+LIB_DEPENDS=	libfribidi.so:converters/fribidi
 
 USE_XORG=	xextproto xft xpm xrandr
 USES=		gmake pkgconfig
@@ -64,7 +64,7 @@ PLIST_SUB+=		DOCPDF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIMLIB2}
-LIB_DEPENDS+=		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=		libImlib2.so:graphics/imlib2
 CONFIGURE_ARGS+=	--enable-imlib2
 .else
 CONFIGURE_ARGS+=	--disable-imlib2
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index b969d1b2f069..9add95fcf442 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -10,7 +10,7 @@ COMMENT=	The Fast Light Window Manager
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk-devel
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk-devel
 
 USES=		autoreconf gmake
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index 6bdad0bd8762..c81ef6c1d923 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://download.gna.org/fvwm-crystal/${PORTVERSION}/
 MAINTAINER=	giacomomariani@yahoo.it
 COMMENT=	Easy, eye-candy, light, and powerful window manager for X11
 
-RUN_DEPENDS=	fvwm>=2.5:${PORTSDIR}/x11-wm/fvwm2 \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	fvwm>=2.5:x11-wm/fvwm2 \
+		bash:shells/bash
 
 USES=		gettext gmake python shebangfix
 SHEBANG_FILES=	addons/* bin/* fvwm/scripts/speed_value
@@ -30,13 +30,13 @@ TRAYER_DESC=		Tray (notification area) support
 SUDO_DESC=		Run text-based applications as superuser
 HSETROOT_DESC=		Allow to set desktop wallpaper
 CMUS_DESC=		Play music via audio/cmus player
-MROX_RUN_DEPENDS=	rox:${PORTSDIR}/x11-fm/rox-filer
-IMAGEMAGICK_RUN_DEPENDS=	display:${PORTSDIR}/graphics/ImageMagick
-XSCREENSAVER_RUN_DEPENDS=	xscreensaver:${PORTSDIR}/x11/xscreensaver
-TRAYER_RUN_DEPENDS=	trayer:${PORTSDIR}/x11/trayer
-SUDO_RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
-SETROOT_RUN_DEPENDS=	hsetroot:${PORTSDIR}/graphics/hsetroot
-CMUS_RUN_DEPENDS=	cmus:${PORTSDIR}/audio/cmus
+MROX_RUN_DEPENDS=	rox:x11-fm/rox-filer
+IMAGEMAGICK_RUN_DEPENDS=	display:graphics/ImageMagick
+XSCREENSAVER_RUN_DEPENDS=	xscreensaver:x11/xscreensaver
+TRAYER_RUN_DEPENDS=	trayer:x11/trayer
+SUDO_RUN_DEPENDS=	sudo:security/sudo
+SETROOT_RUN_DEPENDS=	hsetroot:graphics/hsetroot
+CMUS_RUN_DEPENDS=	cmus:audio/cmus
 DOCS_INSTALL_TARGET=	install-doc
 
 post-extract:
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 5f285354b8ff..e218c320736d 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Popular virtual window manager for X
 
-RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS=	gm4:devel/m4
 
 # Other ports this port cannot coexist with
 CONFLICTS?=	fvwm-1.* fvwm-2.[457].*
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--disable-iconv
 .endif
 
 .if ${PORT_OPTIONS:MSTROKE}
-LIB_DEPENDS+=	libstroke.so:${PORTSDIR}/devel/libstroke
+LIB_DEPENDS+=	libstroke.so:devel/libstroke
 CONFIGURE_ARGS+=	--with-stroke-library=${LOCALBASE}/lib \
 			--with-stroke-includes=${LOCALBASE}/include
 .else
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--without-stroke-library
 .endif
 
 .if ${PORT_OPTIONS:MRPLAY}
-LIB_DEPENDS+=	librplay.so:${PORTSDIR}/audio/rplay
+LIB_DEPENDS+=	librplay.so:audio/rplay
 CONFIGURE_ARGS+=	--with-rplay-library=${LOCALBASE}/lib \
 			--with-rplay-includes=${LOCALBASE}/include
 .else
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-sm
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 CONFIGURE_ARGS+=	--with-png-includes=${LOCALBASE}/include \
 			--with-png-library=${LOCALBASE}/lib
 .else
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=	--disable-rsvg
 .endif
 
 .if ${PORT_OPTIONS:MBIDI}
-LIB_DEPENDS+=	libfribidi.so:${PORTSDIR}/converters/fribidi
+LIB_DEPENDS+=	libfribidi.so:converters/fribidi
 CONFIGURE_ARGS+=	--enable-bidi \
 			--with-bidi-bindir=${LOCALBASE}/bin
 .else
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index b59a8d6a27d2..cc66d6000698 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME interface to xcompmgr
 
-RUN_DEPENDS=	xcompmgr:${PORTSDIR}/x11-wm/xcompmgr
+RUN_DEPENDS=	xcompmgr:x11-wm/xcompmgr
 
 GNU_CONFIGURE=	yes
 LIBS+=		-L${LOCALBASE}/lib -lX11
diff --git a/x11-wm/genmenu/Makefile b/x11-wm/genmenu/Makefile
index c633f52234d8..fcb0693cd6b3 100644
--- a/x11-wm/genmenu/Makefile
+++ b/x11-wm/genmenu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://gtk.no/archive/genmenu/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Generating menus for Bbox, Fbox, Obox, WM and E
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		shebangfix
 NO_BUILD=	yes
diff --git a/x11-wm/herbstluftwm/Makefile b/x11-wm/herbstluftwm/Makefile
index 981a85a77aec..e3b21bcd1e68 100644
--- a/x11-wm/herbstluftwm/Makefile
+++ b/x11-wm/herbstluftwm/Makefile
@@ -25,7 +25,7 @@ DEFAULTCONF_DESC=Install default configuration (requires bash)
 OPTIONS_DEFAULT+=DEFAULTCONF
 OPTIONS_SUB=	yes
 
-DEFAULTCONF_RUN_DEPENDS=bash:${PORTSDIR}/shells/bash
+DEFAULTCONF_RUN_DEPENDS=bash:shells/bash
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 561c6254dd39..2ddf946732e6 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -14,7 +14,7 @@ USE_CABAL=	extensible-exceptions mtl>=1 old-time random utf8-string \
 		X11>=1.6.1 xmonad>=0.11
 USE_XORG=	x11
 
-RUN_DEPENDS+=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS+=	bash:shells/bash
 
 FLAGS_DEFINE=		XFT
 FLAGS_DEFAULT=		XFT
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index ebbd18a143c4..d519fab59a6a 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -11,20 +11,20 @@ COMMENT=	Improved dynamic tiling window manager
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libxcb-util.so:${PORTSDIR}/x11/xcb-util \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libev.so:${PORTSDIR}/devel/libev \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libxcb-cursor.so:${PORTSDIR}/x11/xcb-util-cursor \
-		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
-RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-AnyEvent-I3>=0:${PORTSDIR}/devel/p5-AnyEvent-I3
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libxcb-util.so:x11/xcb-util \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libev.so:devel/libev \
+		libyajl.so:devel/yajl \
+		libcairo.so:graphics/cairo \
+		libpangocairo-1.0.so:x11-toolkits/pango \
+		libpcre.so:devel/pcre \
+		libxcb-cursor.so:x11/xcb-util-cursor \
+		libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3
 
 USE_XORG=	xcb
 USES=		pkgconfig iconv gmake perl5 tar:bzip2
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 437eb8b09335..b420d63ce2b9 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -43,7 +43,7 @@ MENUFIX_DESC=		MenuIconSize fix
 MENUFIX_EXTRA_PATCHES=	${FILESDIR}/extra-menu-icon-fix.patch
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-XFT_LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
+XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 XFT_CONFIGURE_OFF=	--enable-corefonts --disable-xfreetype
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_ENABLE=	xinerama
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 115c2d7b48e3..4f076213603b 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -25,13 +25,13 @@ CAIRO_USE=		GNOME=cairo
 CAIRO_CONFIGURE_ENABLE=	cairo
 DEBUG_CONFIGURE_ENABLE=	debug
 FRIBIDI_DESC=		Unicode Bidirectional Algorithm support
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 FRIBIDI_CONFIGURE_ENABLE=fribidi
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ENABLE=	png
 SVG_USE=		GNOME=librsvg2
 SVG_CONFIGURE_ENABLE=	rsvg
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index cf4a234d5b00..4ae6109abfd0 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Alternative configuration system for Compiz
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	INOTIFY
 OPTIONS_DEFAULT=	INOTIFY
 INOTIFY_DESC?=	Enable inotify support
 
-INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_LDFLAGS=	-linotify
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 20265d548bbf..0b65fb10b005 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Window Maker raster graphics library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libjbig.so:graphics/jbigkit \
+		libtiff.so:graphics/tiff \
+		libwebp.so:graphics/webp \
+		libMagickWand-6.so:graphics/ImageMagick
 
 USES=		jpeg libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/x11-wm/lxmed/Makefile b/x11-wm/lxmed/Makefile
index 8e643cfa7627..d4714e6a1ce7 100644
--- a/x11-wm/lxmed/Makefile
+++ b/x11-wm/lxmed/Makefile
@@ -13,7 +13,7 @@ COMMENT=	LXDE Main Menu Editor
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	gksu:${PORTSDIR}/sysutils/gksu
+RUN_DEPENDS=	gksu:sysutils/gksu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index 8f28caa432d8..471a5b810799 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/lxde/LXSession%20%28session%20manager%29/LXSession%20${PORTVERS
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	LXDE Session Manager
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libhal.so:sysutils/hal \
+		libgee-0.8.so:devel/libgee \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gmake iconv pkgconfig
 USE_GNOME=	gtk20 intlhack libxslt
diff --git a/x11-wm/marco/Makefile b/x11-wm/marco/Makefile
index fe7f09abaebe..6ab8987fe231 100644
--- a/x11-wm/marco/Makefile
+++ b/x11-wm/marco/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window manager for the adult in you
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		zenity>=3.0.0:${PORTSDIR}/x11/zenity
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop
-RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		zenity>=3.0.0:x11/zenity
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libcanberra-gtk.so:audio/libcanberra \
+		libgtop-2.0.so:devel/libgtop
+RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-wm/mcwm/Makefile b/x11-wm/mcwm/Makefile
index f71aebe67e73..5c6686becd53 100644
--- a/x11-wm/mcwm/Makefile
+++ b/x11-wm/mcwm/Makefile
@@ -13,9 +13,9 @@ LICENSE=	ISCL
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-icccm.so:x11/xcb-util-wm
 
 USE_XORG=	x11 xrandr
 USES=		tar:bzip2
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index a5ca511e64e2..26b1a34efd1d 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -10,14 +10,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window manager for the adult in you
 
-BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		itstool:${PORTSDIR}/textproc/itstool \
-		gsettings-desktop-schemas>=3.3.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		gsettings-desktop-schemas>=3.3.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		itstool:textproc/itstool \
+		gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libgtop-2.0.so:devel/libgtop \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
+RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		gsettings-desktop-schemas>=3.3.0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 95b6b81f528b..bfd7224d7e9f 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -9,14 +9,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Compositing window manager forked from Mutter for use with Cinnamon
 
-BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop
-RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity
+BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libclutter-glx-1.0.so:graphics/clutter \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libcinnamon-desktop.so:x11/cinnamon-desktop
+RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 USES=		autoreconf:build execinfo gettext libtool gmake \
 		pathfix pkgconfig python:2
diff --git a/x11-wm/musca/Makefile b/x11-wm/musca/Makefile
index 1d21ebed5cb6..9abfe508ff9c 100644
--- a/x11-wm/musca/Makefile
+++ b/x11-wm/musca/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple window manager for X, with features from ratpoison and dwm
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
+RUN_DEPENDS=	dmenu:x11/dmenu
 
 USE_XORG=	x11
 MAKE_ARGS=	CFLAGS="-I${LOCALBASE}/include \
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index c82478e7d730..668d98c3d2f9 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Window and compositing manager based on Clutter
 
-BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower
-RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		gsettings-desktop-schemas>=3.4.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libclutter-1.0.so:graphics/clutter \
+		libxkbcommon.so:x11/libxkbcommon \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libupower-glib.so:sysutils/upower
+RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-wm/obapps/Makefile b/x11-wm/obapps/Makefile
index 6cfc39ef36e5..d40100c37cac 100644
--- a/x11-wm/obapps/Makefile
+++ b/x11-wm/obapps/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Graphical editor for Openbox application settings
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>=0:${PORTSDIR}/x11-toolkits/py-xlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index b58b9f53fd85..6f12e20bfa3f 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://openbox.org/dist/obconf/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Preferences manager for the Openbox window manager
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libobrender.so:${PORTSDIR}/x11-wm/openbox
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libobrender.so:x11-wm/openbox
 
 USES=		pkgconfig desktop-file-utils shared-mime-info
 USE_GNOME=	libglade2
diff --git a/x11-wm/obkey/Makefile b/x11-wm/obkey/Makefile
index 15d3382442f6..801f65c4e32b 100644
--- a/x11-wm/obkey/Makefile
+++ b/x11-wm/obkey/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Openbox hotkey editor, written in Python and PyGTK
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	py27-gtk2>=2.14:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	py27-gtk2>=2.14:x11-toolkits/py-gtk2
 
 USES=		gettext python
 USE_PYTHON=	distutils
diff --git a/x11-wm/obpager/Makefile b/x11-wm/obpager/Makefile
index c2d1ede0e479..eccbc5bcd7eb 100644
--- a/x11-wm/obpager/Makefile
+++ b/x11-wm/obpager/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Lightweight pager for netwm compatible window managers
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
+BUILD_DEPENDS=	gsed:textproc/gsed
 
 USES=		gmake
 USE_XORG=	x11 xext
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 5433da5ef51f..d53b07f774f6 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -19,7 +19,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	OpenLook Virtual Window manager
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 REINPLACE_ARGS= -i ""
 NO_WRKSUBDIR=	yes
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 507f9389c4a6..ec34457dd651 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -33,11 +33,11 @@ NLS_CONFIGURE_OFF=	--disable-nls
 PANGO_USE=		GNOME=pango
 PANG_CONFIGURE_OFF=	--disable-pango
 
-NOTIFY_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+NOTIFY_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 NOTIFY_CONFIGURE_OFF=	--disable-startup-notification
 
 IMLIB_CONFIGURE_ENABLE=	imlib2
-IMLIB_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+IMLIB_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 SVG_USE=	GNOME=librsvg2
 SVG_CONFIGURE_ENABLE=	librsvg
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 9cca7dae8572..e6ccc91550a1 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	sawfish-pager-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pager for sawfish without GNOME
 
-BUILD_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
-RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
+BUILD_DEPENDS=	sawfish:x11-wm/sawfish
+RUN_DEPENDS=	sawfish:x11-wm/sawfish
 
 USE_GNOME=	gtk20
 USES=		gmake pkgconfig tar:xz
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 9b96a8d49969..ed9e35125f29 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	https://pekwm.org/projects/3/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Light, Unobtrusive, and configurable windowmanager
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake iconv:wchar_t jpeg pkgconfig tar:bzip2
 USE_XORG=	xft xpm x11
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 05e0214aa237..ff18cf8e9edb 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window manager that emphasizes efficiency, speed, and beauty
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/plank/Makefile b/x11-wm/plank/Makefile
index 1568f8998ac2..e1afb29d69fb 100644
--- a/x11-wm/plank/Makefile
+++ b/x11-wm/plank/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Elegant, simple, and clean dock
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libbamf3.so:${PORTSDIR}/sysutils/bamf \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee
+BUILD_DEPENDS=	vapigen:lang/vala
+LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
+		libgee-0.8.so:devel/libgee
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
@@ -42,7 +42,7 @@ NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
-DBUSMENU_LIB_DEPENDS=		libdbusmenu-gtk3.so:${PORTSDIR}/devel/libdbusmenu
+DBUSMENU_LIB_DEPENDS=		libdbusmenu-gtk3.so:devel/libdbusmenu
 DBUSMENU_CONFIGURE_ENABLE=	dbusmenu
 
 .include <bsd.port.mk>
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index 25c57e7dba52..b99130d371f2 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Window manager construction kit
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:${PORTSDIR}/x11-toolkits/py-xlib
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:${PORTSDIR}/x11-toolkits/py-xlib
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib
 
 NO_ARCH=	yes
 
diff --git a/x11-wm/qtile/Makefile b/x11-wm/qtile/Makefile
index 533cf68ec8fc..2b0ec71c10e7 100644
--- a/x11-wm/qtile/Makefile
+++ b/x11-wm/qtile/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Small, flexible, scriptable tiling window manager written in Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xpyb>0:${PORTSDIR}/x11/xpyb \
-		${PYTHON_PKGNAMEPREFIX}cairo>0:${PORTSDIR}/graphics/py-cairo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb \
+		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	qtile
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index b589e3d64a86..e5b92134aa65 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Extensible window manager using Lisp-based scripting language
 LICENSE=	ART20 GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
-LIB_DEPENDS=	librep.so:${PORTSDIR}/lang/librep
-RUN_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
+BUILD_DEPENDS=	rep-gtk2>=0.90:x11-toolkits/rep-gtk2
+LIB_DEPENDS=	librep.so:lang/librep
+RUN_DEPENDS=	rep-gtk2>=0.90:x11-toolkits/rep-gtk2
 
 USES=		gmake libtool makeinfo pathfix pkgconfig tar:xz
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst
diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile
index 9753bd94ed93..e6f880541cdf 100644
--- a/x11-wm/simple-ccsm/Makefile
+++ b/x11-wm/simple-ccsm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 MAINTAINER=	freebsd-ports@dan.me.uk
 COMMENT=	Python/GTK based settings manager for CompizConfig
 
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x11-wm/compizconfig-python
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:x11-wm/compizconfig-python
 
 USES=		gettext gmake pkgconfig python:2 tar:bzip2
 USE_GNOME=	intltool pygtk2
diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index da1a0f6caa08..74c0bbc9edb1 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Small, dynamic tiling window manager for X11
 
 LICENSE=	ISCL
 
-LIB_DEPENDS+=	libxcb-util.so:${PORTSDIR}/x11/xcb-util \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
-RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
+LIB_DEPENDS+=	libxcb-util.so:x11/xcb-util \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libxcb-keysyms.so:x11/xcb-util-keysyms
+RUN_DEPENDS+=	dmenu:x11/dmenu
 
 USE_XORG=	x11 xcb xcursor xft xrandr xt
 
diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index 838ff133a4d3..1fefd0d72fa0 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Twm with a virtual desktop and optional Motif-like features
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=	pkgconfig tar:xz
 
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	SOUND
 SOUND_DESC=	Sound support (via rplay)
 
 SOUND_CONFIGURE_ENABLE=	sound
-SOUND_LIB_DEPENDS=	librplay.so:${PORTSDIR}/audio/rplay
+SOUND_LIB_DEPENDS=	librplay.so:audio/rplay
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|\$${datadir}/X11/vtwm|\$${prefix}/etc|' ${WRKSRC}/Makefile.in
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 148a3f76a56f..629b6827b7a1 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -13,14 +13,14 @@ COMMENT=	GNUstep-compliant NeXTstep window manager clone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libwraster.so.5:${PORTSDIR}/x11-wm/libwraster
-RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libjbig.so:graphics/jbigkit \
+		libtiff.so:graphics/tiff \
+		libwebp.so:graphics/webp \
+		libMagickWand-6.so:graphics/ImageMagick \
+		libwraster.so.5:x11-wm/libwraster
+RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
 
 USES=		jpeg libtool shebangfix pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 0e2ebe9d09a8..b67fc24a2f31 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple window manager for X
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 USE_XORG=	x11 xext xmu
 ALL_TARGET=	depend wm2
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 83b41b7a92fd..99388f465049 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Configuration tool for Window Maker
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libWINGs.so:${PORTSDIR}/x11-wm/windowmaker
-RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm4
+LIB_DEPENDS=	libWINGs.so:x11-wm/windowmaker
+RUN_DEPENDS=	rpm:archivers/rpm4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 693f6585016d..b7a47e5d08fe 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 window manager selector
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT=ADDONS
 ADDONS_DESC=	Install the helper scripts and manpages
 OPTIONS_SUB=	yes
 
-ADDONS_RUNDEPENDS=	wmanager-loop:${PORTSDIR}/x11-wm/wmanager-addons
+ADDONS_RUNDEPENDS=	wmanager-loop:x11-wm/wmanager-addons
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${STAGEDIR}${PREFIX}/bin
diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index 5f120b338970..e987f288cff6 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Floating and tiling Window Manager From Scratch
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xorg62
@@ -34,7 +34,7 @@ XRANDR_USE=		XORG=xrandr
 XRANDR_CONFIGURE_OFF=	--without-xrandr
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_CONFIGURE_OFF=	--without-xinerama
-IMLIB_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+IMLIB_LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 IMLIB_CONFIGURE_OFF=	--without-imlib2
 
 post-patch:
diff --git a/x11-wm/wmii-devel/Makefile b/x11-wm/wmii-devel/Makefile
index 84a71bf1a561..68f1306b44eb 100644
--- a/x11-wm/wmii-devel/Makefile
+++ b/x11-wm/wmii-devel/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Dynamic, minimalist window manager for X11
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libixp.so:${PORTSDIR}/devel/libixp
+LIB_DEPENDS=	libixp.so:devel/libixp
 
 CONFLICTS=	wmii-3.6*
 
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 5959e2a5d9fa..78f655ab6099 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Dynamic, minimalist window manager for X11
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libixp.so:${PORTSDIR}/devel/libixp
-RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
+LIB_DEPENDS=	libixp.so:devel/libixp
+RUN_DEPENDS=	dmenu:x11/dmenu
 
 CONFLICTS=	wmii-3.9*
 
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 7947f7243a19..fd9a08a6590a 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Xfce's desktop manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index d3e3b48904ca..b2b13d3770b7 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB=	multi
 LICENSE_DISTFILES=	${WRKSRC}/COPYING \
 	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		desktop-file-utils gmake libtool pathfix gettext-tools perl5 \
 		pkgconfig tar:bzip2
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index a28c478d6ce1..f303d29aca2c 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Xfce's session manager
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	iceauth:${PORTSDIR}/x11/iceauth
-RUN_DEPENDS=	iceauth:${PORTSDIR}/x11/iceauth \
-		console-kit-daemon:${PORTSDIR}/sysutils/consolekit
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
+BUILD_DEPENDS=	iceauth:x11/iceauth
+RUN_DEPENDS=	iceauth:x11/iceauth \
+		console-kit-daemon:sysutils/consolekit
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libupower-glib.so:sysutils/upower \
+		libpolkit-gobject-1.so:sysutils/polkit
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 749436a4cde1..0768054b04e9 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Xfce's window manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 CONFIGURE_ARGS=	--enable-xsync \
 		--enable-render \
@@ -33,11 +33,11 @@ OPTIONS_DEFINE=		DRM NLS STARTUP
 OPTIONS_DEFAULT=	NLS STARTUP
 DRM_DESC=	Direct Rendering Module service
 STARTUP_DESC=	Startup notification
-DRM_LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm
+DRM_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 DRM_CONFIGURE_ENABLE=	libdrm
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 OPTIONS_SUB=	yes
 
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index deb186d7474b..43cbeb07e643 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -9,34 +9,34 @@ CATEGORIES=	x11-wm xfce
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	The "meta-port" for the Xfce Desktop Environment
 
-RUN_DEPENDS=	xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
-		xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
-		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
-		xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
-		xfsettingsd:${PORTSDIR}/sysutils/xfce4-settings \
-		gtk-xfce-engine>0:${PORTSDIR}/x11-themes/gtk-xfce-engine
+RUN_DEPENDS=	xfwm4:x11-wm/xfce4-wm \
+		xfce4-session:x11-wm/xfce4-session \
+		xfce4-panel:x11-wm/xfce4-panel \
+		xfdesktop:x11-wm/xfce4-desktop \
+		xfsettingsd:sysutils/xfce4-settings \
+		gtk-xfce-engine>0:x11-themes/gtk-xfce-engine
 
 USES=	metaport
 
 OPTIONS_DEFINE=	APPFINDER ICONS MIXER MOUSEPAD NOTIFY ORAGE PRINT SLIM SQUEEZE TERMINAL XPM
 OPTIONS_DEFAULT=	APPFINDER ICONS MOUSEPAD NOTIFY ORAGE TERMINAL
-APPFINDER_RUN_DEPENDS=	xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder
+APPFINDER_RUN_DEPENDS=	xfce4-appfinder:misc/xfce4-appfinder
 APPFINDER_DESC=	Launcher and finder
-ICONS_RUN_DEPENDS=	adwaita-icon-theme>0:${PORTSDIR}/x11-themes/adwaita-icon-theme
-MIXER_RUN_DEPENDS=	xfce4-mixer:${PORTSDIR}/audio/xfce4-mixer
-MOUSEPAD_RUN_DEPENDS=	mousepad:${PORTSDIR}/editors/mousepad
+ICONS_RUN_DEPENDS=	adwaita-icon-theme>0:x11-themes/adwaita-icon-theme
+MIXER_RUN_DEPENDS=	xfce4-mixer:audio/xfce4-mixer
+MOUSEPAD_RUN_DEPENDS=	mousepad:editors/mousepad
 MOUSEPAD_DESC=	Text editor
-NOTIFY_RUN_DEPENDS=	xfce4-notifyd-config:${PORTSDIR}/deskutils/xfce4-notifyd
-ORAGE_RUN_DEPENDS=	orage:${PORTSDIR}/deskutils/orage
+NOTIFY_RUN_DEPENDS=	xfce4-notifyd-config:deskutils/xfce4-notifyd
+ORAGE_RUN_DEPENDS=	orage:deskutils/orage
 ORAGE_DESC=	Calendar
-PRINT_RUN_DEPENDS=	xfprint4:${PORTSDIR}/print/xfce4-print
-SLIM_RUN_DEPENDS=	slim:${PORTSDIR}/x11/slim
+PRINT_RUN_DEPENDS=	xfprint4:print/xfce4-print
+SLIM_RUN_DEPENDS=	slim:x11/slim
 SLIM_DESC=	SLiM, login manager
-SQUEEZE_RUN_DEPENDS=	squeeze:${PORTSDIR}/archivers/squeeze
+SQUEEZE_RUN_DEPENDS=	squeeze:archivers/squeeze
 SQUEEZE_DESC=	Archive manager
-TERMINAL_RUN_DEPENDS=	xfce4-terminal:${PORTSDIR}/x11/xfce4-terminal
+TERMINAL_RUN_DEPENDS=	xfce4-terminal:x11/xfce4-terminal
 TERMINAL_DESC=	Terminal emulator
-XPM_RUN_DEPENDS=	xfce4-power-manager:${PORTSDIR}/sysutils/xfce4-power-manager
+XPM_RUN_DEPENDS=	xfce4-power-manager:sysutils/xfce4-power-manager
 XPM_DESC=	Power manager
 
 do-install:	# empty