Remove ${PORTSDIR}/ from dependencies, categories v, w, x, y, and z.

With hat: portmgr Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2016-04-01 14:33:55 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2016-04-01 14:33:55 +0000
commit: 72ea7e696b763bdbcef04fdbccc122c0364fa567 (patch)
tree: 38b741bb92caf8470d126310c77168cb30040476 /x11
parent: - Update to 1.2.2 (diff)
550 files changed, 1914 insertions, 1914 deletions
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index 1e412d423bd2..6f9c19348beb 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}2_0.2-1
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Analog clock plugin for gkrellm2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 ALL_TARGET=	alltraxclock.so
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 680fb6c8e6d8..210920352de9 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Xlib implementation of an attractive, configurable clock
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index ffa6da5ca54e..b74a08daa8be 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/dclock \
 OPTIONS_DEFINE=	SOX XFT DOCS
 OPTIONS_DEFAULT=SOX XFT
 SOX_DESC=	Install SOX to play audio
-SOX_RUN_DEPENDS=	play:${PORTSDIR}/audio/sox
+SOX_RUN_DEPENDS=	play:audio/sox
 
 XFT_USE=	XORG=xft
 XFT_CPPFLAGS=	$$(freetype-config --cflags) -DXFT_SUPPORT
diff --git a/x11-clocks/intclock/Makefile b/x11-clocks/intclock/Makefile
index 00bba93fbfb9..63709ecd9910 100644
--- a/x11-clocks/intclock/Makefile
+++ b/x11-clocks/intclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.peterverthez.net/projects/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-timezone clock
 
-BUILD_DEPENDS=	p5-Gtk2>=1.144:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Gtk2>=1.144:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index e1a3c04fa91f..291f9f92540a 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -14,12 +14,12 @@ OPTIONS_DEFINE=	AMOR KTEATIME KTUX
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 AMOR_DESC=		Small animation which sits on top of active window
-AMOR_RUN_DEPENDS=	${KDE4_PREFIX}/bin/amor:${PORTSDIR}/x11-clocks/amor
+AMOR_RUN_DEPENDS=	${KDE4_PREFIX}/bin/amor:x11-clocks/amor
 
 KTEATIME_DESC=		Handy timer for steeping tea
-KTEATIME_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kteatime:${PORTSDIR}/x11-clocks/kteatime
+KTEATIME_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kteatime:x11-clocks/kteatime
 
 KTUX_DESC=		Tux-in-a-Spaceship screen saver
-KTUX_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktux:${PORTSDIR}/x11-clocks/ktux
+KTUX_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktux:x11-clocks/ktux
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index 63675a9b52b0..0b5be37e442e 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	osd_clock-${PORTVERSION}
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Small clock which uses libxosd to render text to the root window
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS=	libxosd.so:misc/xosd
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpthread
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index dd97ff65824e..b2ddc9e683c5 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://buzzinhornetz.ath.cx/wmbday/files/ \
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Window Maker dock app that will remind you of birthdays
 
-BUILD_DEPENDS=	xmessage:${PORTSDIR}/x11/xmessage
+BUILD_DEPENDS=	xmessage:x11/xmessage
 
 USES=		uidfix
 HAS_CONFIGURE=	yes
diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile
index 3c89199088de..6a2cf5de92b4 100644
--- a/x11-drivers/xf86-input-evdev/Makefile
+++ b/x11-drivers/xf86-input-evdev/Makefile
@@ -11,9 +11,9 @@ COMMENT=	X.Org event device input driver
 LICENSE=	MIT # various styles
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	libevdev.so:${PORTSDIR}/devel/libevdev
-RUN_DEPENDS=	webcamd>=3.1.0.1:${PORTSDIR}/multimedia/webcamd
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
+LIB_DEPENDS=	libevdev.so:devel/libevdev
+RUN_DEPENDS=	webcamd>=3.1.0.1:multimedia/webcamd
 
 XORG_CAT=	driver
 USES=		pathfix
@@ -23,7 +23,7 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	MULTITOUCH
 
 MULTITOUCH_DESC=	XInput 2.2 multitouch support
-MULTITOUCH_LIB_DEPENDS=	libmtdev.so:${PORTSDIR}/devel/libmtdev
+MULTITOUCH_LIB_DEPENDS=	libmtdev.so:devel/libmtdev
 
 post-patch-MULTITOUCH-off:
 # XXX Convert to CONFIGURE_ENV
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index 863522ed8f16..0655a7554e7a 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vmmouse input driver
 
-LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS=	libhal.so:sysutils/hal
 
 USES=		gmake
 XORG_CAT=	driver
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 16904db63923..6809b2a9a33b 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--disable-glamor
 .include <bsd.port.options.mk>
 
 .if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
-RUN_DEPENDS+=	drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
+RUN_DEPENDS+=	drm-kmod>=9:x11-drivers/drm-kmod
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"radeonkms"|"radeonkms_port"|g' \
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 3157ebe21c35..14a103ced14f 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-drivers
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 ONLY_FOR_ARCHS=	amd64 i386
 USE_GL=		gl
@@ -36,7 +36,7 @@ INSTALL_TARGET=	install-strip
 .include <bsd.port.options.mk>
 
 .if (${OSVERSION} >= 903000 && ${OSVERSION} < 1000000)
-RUN_DEPENDS+=	drm-kmod>=9:${PORTSDIR}/x11-drivers/drm-kmod
+RUN_DEPENDS+=	drm-kmod>=9:x11-drivers/drm-kmod
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"i915kms"|"i915kms_port"|g' \
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index cd9c999d1f59..d49dc239a199 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -101,9 +101,9 @@ VIDEO_DRIVERS+=	sunffb
 . for i in ${${type:tu}_DRIVERS}
 .  if ${PORT_OPTIONS:M${i:tu}} != ""
 .   if ${QUIRKS:M${i}\:*:C/.*://} != ""
-RUN_DEPENDS+=	${${type:tu}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+RUN_DEPENDS+=	${${type:tu}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:x11-drivers/xf86-${type}-${i}
 .   else
-RUN_DEPENDS+=	${${type:tu}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+RUN_DEPENDS+=	${${type:tu}DIR}/${i}_drv.so:x11-drivers/xf86-${type}-${i}
 .   endif
 .  endif
 . endfor
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 40ca85aafb60..210de670773d 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ASFiles-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 file manager. Dockable in WindowMaker
 
-LIB_DEPENDS=	libDnd.so:${PORTSDIR}/x11/libdnd
+LIB_DEPENDS=	libDnd.so:x11/libdnd
 
 USES=		perl5
 GNU_CONFIGURE=	yes
diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index 07ef36a1e7c9..e044cb5505a8 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	File manager for the MATE desktop
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
-		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd:${PORTSDIR}/devel/gvfs
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libunique-1.0.so:x11-toolkits/unique \
+		libexempi.so:textproc/exempi
+RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd:devel/gvfs
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 6da2d24008c3..37d783465754 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -14,15 +14,15 @@ COMMENT=	DeforaOS desktop file browser
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
-		libXrandr.so:${PORTSDIR}/x11/libXrandr
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop \
+		libXrandr.so:x11/libXrandr
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=		gettext
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-    ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+    ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils pkgconfig
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 4745cbc8fc80..9fd9c9ba28ad 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Total Commander like file manager for the X Window System
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
-		fpcres:${PORTSDIR}/lang/fpc-utils
+BUILD_DEPENDS=	lazbuild:editors/lazarus \
+		fpcres:lang/fpc-utils
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -99,14 +99,14 @@ OPTIONS_DEFAULT=	GTK2 \
 			DSX_LOCATE
 
 GTK2_USE=		fpc=gtk2 gnome=gtk20
-GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 
-QT4_LIB_DEPENDS=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
-QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
+QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
 
-WCX_UNRAR_LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar
-WFX_SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-WLX_MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+WCX_UNRAR_LIB_DEPENDS=	libunrar.so:archivers/libunrar
+WFX_SAMBA_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
+WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index c29b67fe38b7..51d6783fd2ff 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -42,13 +42,13 @@ GTK2_MAKE_ENV=		WITH_GTK2=1 WITH_GTK3=0
 GTK2_USE=		GNOME=gtk20
 GTK3_MAKE_ENV=		WITH_GTK2=0 WITH_GTK3=1
 GTK3_USE=		GNOME=gtk30
-THUMB_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
+THUMB_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp
 THUMB_MAKE_ENV=		WITH_THUMB=1
 TRACKER_MAKE_ENV=	WITH_TRACKER=1
 NLS_USES=		gettext
 NLS_INSTALL_TARGET=	install_i18n
 HAL_MAKE_ENV=		WITH_HAL=1
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 
 post-patch:
 # fix cross-arch compiling, which sets ${TARGET}
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index c887a2ab7367..75b623ae8791 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	EZWGL-based file manager for X Window System
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libEZ.so:${PORTSDIR}/graphics/EZWGL
+LIB_DEPENDS=	libEZ.so:graphics/EZWGL
 
 USES=		gmake jpeg tar:tgz
 
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index b34a6e92d72c..07c6348814f5 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -14,9 +14,9 @@ COMMENT=	File manager for Gnome2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-RUN_DEPENDS=	meld:${PORTSDIR}/textproc/meld \
-		yelp:${PORTSDIR}/x11/yelp
+LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
+RUN_DEPENDS=	meld:textproc/meld \
+		yelp:x11/yelp
 
 USES=		gettext gmake libtool pathfix pkgconfig python tar:xz
 USE_GNOME=	gnomedocutils gnomeprefix gnomevfs2 intltool libgnomeui
@@ -33,17 +33,17 @@ OPTIONS_DEFINE=		CHM EXIV2 GSF POPPLER TAGLIB
 OPTIONS_DEFAULT=	CHM EXIV2 GSF POPPLER TAGLIB
 
 CHM_DESC=		CHM support via chmlib
-CHM_LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+CHM_LIB_DEPENDS=	libchm.so:misc/chmlib
 CHM_CONFIGURE_WITH=	libchm
-EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_WITH=	exiv2
 GSF_DESC=		OLE and ODF support via libgsf
-GSF_LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
+GSF_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 GSF_CONFIGURE_WITH=	libgsf
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_CONFIGURE_WITH=	poppler
 TAGLIB_DESC=		Audio metadata support via taglib
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CONFIGURE_WITH=	taglib
 
 post-patch:
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 10b8614abb48..77f38255256d 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl script for renaming multiple files
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/trunk
 
diff --git a/x11-fm/librfm/Makefile b/x11-fm/librfm/Makefile
index 2f962f8a6e79..21838afe9701 100644
--- a/x11-fm/librfm/Makefile
+++ b/x11-fm/librfm/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Basic library used by some rfm applications
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	libtubo.so:${PORTSDIR}/x11-fm/libtubo \
-		libdbh.so:${PORTSDIR}/databases/dbh \
-		libzip.so:${PORTSDIR}/archivers/libzip \
-		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+BUILD_DEPENDS=	gawk:lang/gawk
+LIB_DEPENDS=	libtubo.so:x11-fm/libtubo \
+		libdbh.so:databases/dbh \
+		libzip.so:archivers/libzip \
+		librsvg-2.so:graphics/librsvg2
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 77a95afffc63..ee75f8a5da41 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	MToolsFM-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical frontend to mtools
 
-RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
+RUN_DEPENDS=	mtools:emulators/mtools
 
 USES=		gettext pathfix
 USE_GNOME=	gtk12
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 30798e02656c..64818ad58352 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the GNOME desktop
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libnotify.so:devel/libnotify \
+		libexempi.so:textproc/exempi
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	TRACKER
 OPTIONS_DEFAULT=TRACKER
 TRACKER_DESC=	Tracker support
-TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker
+TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:sysutils/tracker
 TRACKER_CONFIGURE_ENABLE=	tracker
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index a01ea17eaacd..3990a73c3028 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -9,17 +9,17 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the Cinnamon desktop
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gtkdocize:${PORTSDIR}/textproc/gtk-doc \
-		py*-polib>=0:${PORTSDIR}/devel/py-polib \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gtkdocize:textproc/gtk-doc \
+		py*-polib>=0:devel/py-polib \
+		gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libnotify.so:devel/libnotify \
+		libexempi.so:textproc/exempi
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf:build desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig python:2 shared-mime-info
@@ -41,7 +41,7 @@ OPTIONS_SUB=			yes
 OPTIONS_DEFINE=			TRACKER
 OPTIONS_DEFAULT=		TRACKER
 TRACKER_CONFIGURE_ENABLE=	tracker
-TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker
+TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:sysutils/tracker
 TRACKER_DESC=			Integration with tracker
 
 post-patch:
diff --git a/x11-fm/p5-PerlFM/Makefile b/x11-fm/p5-PerlFM/Makefile
index 0000e91e8dc1..2eb0e4c3e8c1 100644
--- a/x11-fm/p5-PerlFM/Makefile
+++ b/x11-fm/p5-PerlFM/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Perl based file manager
 
-BUILD_DEPENDS=	p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Chmod>=0.0.0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Chmod \
-		p5-Gtk2-PathButtonBar>=0.1.2:${PORTSDIR}/x11-toolkits/p5-Gtk2-PathButtonBar \
-		p5-String-ShellQuote>=1.03:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		p5-File-Stat-Bits>=1.01:${PORTSDIR}/sysutils/p5-File-Stat-Bits \
-		p5-ZConf-Bookmarks>=0.2.3:${PORTSDIR}/net/p5-ZConf-Bookmarks \
-		p5-ZConf-Runner>=2.1.1:${PORTSDIR}/deskutils/p5-ZConf-Runner \
-		p5-Dir-Watch>=0.0.0:${PORTSDIR}/devel/p5-Dir-Watch
+BUILD_DEPENDS=	p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Chmod>=0.0.0:x11-toolkits/p5-Gtk2-Chmod \
+		p5-Gtk2-PathButtonBar>=0.1.2:x11-toolkits/p5-Gtk2-PathButtonBar \
+		p5-String-ShellQuote>=1.03:textproc/p5-String-ShellQuote \
+		p5-File-Stat-Bits>=1.01:sysutils/p5-File-Stat-Bits \
+		p5-ZConf-Bookmarks>=0.2.3:net/p5-ZConf-Bookmarks \
+		p5-ZConf-Runner>=2.1.1:deskutils/p5-ZConf-Runner \
+		p5-Dir-Watch>=0.0.0:devel/p5-Dir-Watch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 7991d47d40e4..8c34af42f6c7 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	PCMan File Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfm-gtk.so:${PORTSDIR}/x11/libfm
+LIB_DEPENDS=	libfm-gtk.so:x11/libfm
 
 USES=		autoreconf desktop-file-utils gettext gmake libtool pkgconfig \
 		tar:xz
diff --git a/x11-fm/rodent/Makefile b/x11-fm/rodent/Makefile
index 7ec8a9d14905..73fb8faea84b 100644
--- a/x11-fm/rodent/Makefile
+++ b/x11-fm/rodent/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Fast, small, and powerful file manager
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		bash:${PORTSDIR}/shells/bash \
-		intltoolize:${PORTSDIR}/textproc/intltool
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libmagic.so:${PORTSDIR}/sysutils/file \
-		librfm.so:${PORTSDIR}/x11-fm/librfm
+BUILD_DEPENDS=	gawk:lang/gawk \
+		bash:shells/bash \
+		intltoolize:textproc/intltool
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libmagic.so:sysutils/file \
+		librfm.so:x11-fm/librfm
 
 USES=		desktop-file-utils gmake libtool:keepla pkgconfig tar:bzip2 shebangfix
 USE_GNOME=	glib20 gtk20 librsvg2 libxml2
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index 4814932e9040..6f807a5e18f7 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	mime-editor-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	MIME type editor for the ROX desktop
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 USES=		python tar:bzip2
 
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 2295a5338c9b..2168a71f8e2c 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Simple session manager for the ROX desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:${PORTSDIR}/devel/py-roxlib \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus
 
 WRKSRC=		${WRKDIR}/ROX-Session
 DATADIR=	${PREFIX}/apps/ROX-Session
@@ -31,7 +31,7 @@ GDM_DESC=	Install GDM login manager
 
 SUB_FILES=	${PORTNAME} rox.desktop
 
-GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
+GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:x11/gdm
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index 89fe9aee1101..5432c505d16c 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -10,14 +10,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tool similar to Gloobus Preview that provides quick file previews
 
-LIB_DEPENDS=	libgcr-3.so:${PORTSDIR}/security/gcr \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \
-		libevdocument3.so:${PORTSDIR}/graphics/evince
-RUN_DEPENDS=	nautilus:${PORTSDIR}/x11-fm/nautilus
+LIB_DEPENDS=	libgcr-3.so:security/gcr \
+		libgjs.so:lang/gjs \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libmusicbrainz5.so:audio/libmusicbrainz5 \
+		libevdocument3.so:graphics/evince
+RUN_DEPENDS=	nautilus:x11-fm/nautilus
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 5f3304e39c0e..d1f9c26c054c 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	3D filesystem browser
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 
 USE_GL=		glut
 USE_SDL=	image sdl
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 9449adb2b1de..6eec1c2c44e7 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -14,9 +14,9 @@ COMMENT=	The virtual filesystem for Thunar
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgamin-1.so:${PORTSDIR}/devel/gamin
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libgamin-1.so:devel/gamin
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 gdkpixbuf2 intltool intlhack
@@ -32,12 +32,12 @@ OPTIONS_DEFAULT=	NLS HAL DBUS STARTUP
 STARTUP_DESC=	Startup notification
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 HAL_CONFIGURE_WITH=	volume-manager=hal
 HAL_CONFIGURE_OFF=	--with-volume-manager=freebsd
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CONFIGURE_ENABLE=	dbus
-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
 GCONF_USE=	gnome=gconf2
 GCONF_CONFIGURE_ENABLE=	gnome-thumbnailers
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 91174ba745f8..ec03490a5c60 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -15,9 +15,9 @@ LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libtumbler-1.so:${PORTSDIR}/deskutils/xfce4-tumbler \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libtumbler-1.so:deskutils/xfce4-tumbler \
+	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	pkexec:sysutils/polkit
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -44,11 +44,11 @@ PLUG_WALL_DESC=	Wallpaper plugin
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	notifications
-PLUG_APR_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+PLUG_APR_LIB_DEPENDS=	libexif.so:graphics/libexif
 PLUG_APR_CONFIGURE_ENABLE=	apr-plugin exif
-PLUG_SBR_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PLUG_SBR_LIB_DEPENDS=	libpcre.so:devel/pcre
 PLUG_SBR_CONFIGURE_ENABLE=	sbr-plugin pcre
 PLUG_TPA_USE=	gnome=gvfs xfce=panel
 PLUG_TPA_CONFIGURE_ENABLE=	tpa-plugin
diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index 5065c89fdbec..0f8754339a73 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.tundraware.com/Software/twander/
 MAINTAINER=	twander@tundraware.com
 COMMENT=	Better Filesystem Browser
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 USES=		python
 NO_ARCH=	yes
diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 22904f1d9d88..9f4f6679be75 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -26,13 +26,13 @@ PORTDOCS=	CHANGELOG.txt README.md readme_eng.txt
 OPTIONS_DEFINE=	FREETYPE SMB SSH DOCS
 OPTIONS_DEFAULT=FREETYPE SMB SSH
 
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CMAKE_ON=	-DWITH_FREETYPE=ON
 FREETYPE_CMAKE_OFF=	-DWITH_FREETYPE=OFF
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CMAKE_ON=		-DWITH_SMBCLIENT=ON
 SMB_CMAKE_OFF=		-DWITH_SMBCLIENT=OFF
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_CMAKE_ON=		-DWITH_LIBSSH2=ON
 SSH_CMAKE_OFF=		-DWITH_LIBSSH2=OFF
 
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 5fa90a8523a2..9229b73f8758 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -11,7 +11,7 @@ COMMENT=	X11 file manager based on Directory Opus of AmigaOS
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lib pkgconfig shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
@@ -28,11 +28,11 @@ OPTIONS_EXCLUDE_DragonFly=	AVFS
 INOTIFY_DESC=	Monitor directory changes via libinotify
 AVFS_DESC=	Use AVFS library to access an archives
 
-AVFS_LIB_DEPENDS=	libavfs.so:${PORTSDIR}/sysutils/avfs
+AVFS_LIB_DEPENDS=	libavfs.so:sysutils/avfs
 
-HAL_LIB_DEPENDS=	libhal-storage.so:${PORTSDIR}/sysutils/hal \
-			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+HAL_LIB_DEPENDS=	libhal-storage.so:sysutils/hal \
+			libdbus-glib-1.so:devel/dbus-glib
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_LDFLAGS=	-L${LOCALBASE}/lib
 
 LUA_CONFIGURE_OFF=	--disable-lua
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 728ba2582a70..15ad57b4fa17 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://xdiskusage.sourceforge.net/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show where disk space is taken up
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake tar:tgz
 
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 83c0494b75b3..8e1f33bed478 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast MS-Explorer like file manager for X
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 
 USES=		desktop-file-utils gmake localbase pathfix
 USE_XORG=	xft
diff --git a/x11-fonts/alfont/Makefile b/x11-fonts/alfont/Makefile
index 59cd493f67b5..63faf83dc7e0 100644
--- a/x11-fonts/alfont/Makefile
+++ b/x11-fonts/alfont/Makefile
@@ -21,9 +21,9 @@ LICENSE_NAME=	The FreeType Project LICENSE (FTL)
 LICENSE_FILE=	${WRKSRC}/docs/FTL.txt
 LICENSE_PERMS=	auto-accept
 
-EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
-LIB_DEPENDS=	liballeg.so.4:${PORTSDIR}/devel/allegro \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+EXTRACT_DEPENDS=	unrar:archivers/unrar
+LIB_DEPENDS=	liballeg.so.4:devel/allegro \
+		libfreetype.so:print/freetype2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-fonts/cantarell-fonts/Makefile b/x11-fonts/cantarell-fonts/Makefile
index c9ce9fbb81fb..d595c2079b7a 100644
--- a/x11-fonts/cantarell-fonts/Makefile
+++ b/x11-fonts/cantarell-fonts/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Cantarell, a Humanist sans-serif font family
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 
 USES=		fonts gmake gnome pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 17f488b9df95..9ff783d2d04b 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -13,8 +13,8 @@ EXTRACT_SUFX=	.bdfs.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Cyrillic X11 bitmap fonts from CYR-RFX project
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir
 
 USES=		fonts
 USE_XORG=	x11
diff --git a/x11-fonts/dina/Makefile b/x11-fonts/dina/Makefile
index 17fa9763af84..415018bc64b8 100644
--- a/x11-fonts/dina/Makefile
+++ b/x11-fonts/dina/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Monospace bitmap font, primarily aimed at programmers
 LICENSE=	MIT
 
 USES=		fonts
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 BDFLIST=	Dina_i400-10.bdf Dina_i400-8.bdf Dina_i400-9.bdf \
 		Dina_i700-10.bdf Dina_i700-8.bdf Dina_i700-9.bdf \
diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile
index 1d28a03b89c0..7ce332c60485 100644
--- a/x11-fonts/encodings/Makefile
+++ b/x11-fonts/encodings/Makefile
@@ -12,7 +12,7 @@ COMMENT=	X.Org Encoding fonts
 
 USES=		tar:bzip2
 USE_XORG=	fontutil
-BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fontrootdir=${PREFIX}/share/fonts
 
diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index 65b5c5bb682a..0ca0049dd60e 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Show Unicode coverage of a font
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	pdfoutline:${PORTSDIR}/textproc/pdfoutline
+RUN_DEPENDS=	pdfoutline:textproc/pdfoutline
 
 CONFIGURE_ARGS=	--disable-silent-rules \
 		--with-unicode-blocks=${WRKSRC}/Blocks.txt
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index f18d0249d640..1fcc7d605e6a 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Font management application for the GNOME desktop
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
@@ -31,6 +31,6 @@ OPTIONS_SUB=		yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-REPORTLAB_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/:${PORTSDIR}/print/py-reportlab2
+REPORTLAB_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/:print/py-reportlab2
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 7ff19a61cc1f..527350a4295f 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -15,8 +15,8 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2
 
 USES+=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/x11-fonts/fontmatrix/Makefile b/x11-fonts/fontmatrix/Makefile
index ad886d8fc247..bcdc7c247cfe 100644
--- a/x11-fonts/fontmatrix/Makefile
+++ b/x11-fonts/fontmatrix/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.fontmatrix.net/archives/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Graphical font manager
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 USES=		cmake
 USE_QT4=	gui svg network moc_build uic_build rcc_build qmake_build linguisttools_build
@@ -18,7 +18,7 @@ INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	FONTFORGE
 FONTFORGE_DESC=	Install FontForge editor
-FONTFORGE_RUN_DEPENDS=	${LOCALBASE}/bin/fontforge:${PORTSDIR}/print/fontforge
+FONTFORGE_RUN_DEPENDS=	${LOCALBASE}/bin/fontforge:print/fontforge
 
 post-patch:
 	cd ${WRKSRC}/src && \
diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile
index 44ca510d8f4f..0a0cff1418ff 100644
--- a/x11-fonts/fonttosfnt/Makefile
+++ b/x11-fonts/fonttosfnt/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Wrap a bitmap font in a sftn wrapper
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 XORG_CAT=	app
 USE_XORG=	xproto fontenc
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 02062448624b..35d86605b47f 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Collection of ATM fonts (not all free) from the CICA archives
 
 USES=	fonts
 
-BUILD_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
+BUILD_DEPENDS=	type1inst:x11-fonts/p5-type1inst
 
 # Some of the fonts are shareware. Some are freeware. Permission must
 # be obtained before distributing at least four (mazama.license,
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 89bb07ecc6e0..7103ccbaf049 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	x-koi8u
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Ukrainian KOI8 fonts for X11R6 (koi8-u)
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir
 
 USES=		fonts perl5 tar:tgz
 USE_PERL5=	build
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 78e75f69afd7..2ff01444dac4 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	GNU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free X11 fonts for all characters that Emacs can handle
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-RUN_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
+RUN_DEPENDS=	type1inst:x11-fonts/p5-type1inst
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index 93a46018e3d7..6ee9792a5b4a 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.jmknoble.net/fonts/
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Jim Knoble's font package for X
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir
 
 USES=		fonts imake
 
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index f842e8207b25..2cc3d7d10260 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font library
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 XORG_CAT=	lib
 USE_XORG=	xproto:both xtrans fontsproto:both fontenc
diff --git a/x11-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile
index 364dd01351ff..e9f185e3b774 100644
--- a/x11-fonts/libXfont2/Makefile
+++ b/x11-fonts/libXfont2/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X font library
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 XORG_CAT=	lib
 USE_XORG=	xproto:both xtrans fontsproto:both fontenc
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 042f51817285..e43b9f886462 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Client-sided font API for X applications
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 XORG_CAT=	lib
 USE_XORG=	xproto:both xrender
diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile
index f7ea3a3da032..fae9f8b459c3 100644
--- a/x11-fonts/mkfontdir/Makefile
+++ b/x11-fonts/mkfontdir/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Create an index of X font files in a directory
 
-RUN_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
 
 XORG_CAT=	app
 
diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile
index 5a312764f887..c1ca29de4d95 100644
--- a/x11-fonts/mkfontscale/Makefile
+++ b/x11-fonts/mkfontscale/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11-fonts
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Creates an index of scalable font files for X
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 XORG_CAT=	app
 USE_XORG=	xproto fontenc
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index 35f7ad85fcde..f86a29063b01 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	NeXFontSel-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NeXtaw based replacement for xfontsel
 
-LIB_DEPENDS=	libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
+LIB_DEPENDS=	libneXtaw.so:x11-toolkits/neXtaw
 
 USES=		imake
 USE_XORG=	xaw
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 6b80a6deb4bc..60b4b3b2acac 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Another font package for X
 
 USES=		fonts
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-fonts/p5-Font-TTF/Makefile b/x11-fonts/p5-Font-TTF/Makefile
index a0ee8c850ebb..115088db5753 100644
--- a/x11-fonts/p5-Font-TTF/Makefile
+++ b/x11-fonts/p5-Font-TTF/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Perl module for TrueType font hacking
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+BUILD_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index bb1271384c39..545073698e52 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -21,8 +21,8 @@ SHEBANG_FILES=	type1inst t1embed
 OPTIONS_DEFINE=	DOCS X11
 OPTIONS_DEFAULT=X11
 
-X11_RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-			${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+X11_RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:x11-fonts/mkfontdir \
+			${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} type1inst t1embed \
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index 70a20603e435..289d733123d3 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Fonts from the SGI ProPack 1.4 (originally for Linux)
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		fonts
 NO_ARCH=	yes
diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile
index 70ad84e337aa..dea57c9eb607 100644
--- a/x11-fonts/suxus/Makefile
+++ b/x11-fonts/suxus/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	suxus
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 font designed to be small yet easily read
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 SUB_FILES=	pkg-message
 USE_XORG=	x11
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 611c45a7027a..6cfc321ff7df 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Terminus Font - a clean fixed width font
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USES=		gmake fonts perl5
 USE_PERL5=	build
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index a5467775d77e..ea733036e801 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk based replacement for xfontsel
 
 USES+=		tk:run
-RUN_DEPENDS+=	xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts
+RUN_DEPENDS+=	xlsfonts:x11-fonts/xlsfonts
 NO_BUILD=	yes
 
 post-patch:
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index 05227b001fdd..1b278bbeec8d 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://dl.bytesex.org/releases/${PORTNAME}/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Number of fonts which are useful for TV applications
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir
 
 USES=		gmake fonts tar:bzip2
 MAKE_JOBS_UNSAFE=	yes
diff --git a/x11-fonts/uw-ttyp0/Makefile b/x11-fonts/uw-ttyp0/Makefile
index e746d65ba4c3..38b52af71411 100644
--- a/x11-fonts/uw-ttyp0/Makefile
+++ b/x11-fonts/uw-ttyp0/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME_TTYP0=	ttyp0 License
 LICENSE_FILE_TTYP0=	${WRKSRC}/LICENSE
 LICENSE_PERMS_TTYP0=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 HAS_CONFIGURE=	yes
 NO_ARCH=	yes
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 38c13c8b310b..c14335bda0fb 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	TrueType core fonts for the Web
 
-EXTRACT_DEPENDS=cabextract:${PORTSDIR}/archivers/cabextract
+EXTRACT_DEPENDS=cabextract:archivers/cabextract
 
 USES=		fonts
 NO_BUILD=	yes
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index 54afa2a5b1aa..dcf513667b26 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -20,7 +20,7 @@ DISTFILES=	wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz:bitmapfont \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU GPL-licensed font set covering CJK and other Unicode characters
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 USE_XORG=	x11
 USES=		fonts perl5
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 2d1b68b9d73d..4b356dfbbffc 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -11,12 +11,12 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org 100dpi bitmap fonts
 
-RUN_DEPENDS=	${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-100dpi \
-		${FONTDIR}/100dpi/UTBI__10.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-utopia-100dpi \
-		${FONTDIR}/100dpi/luBIS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-100dpi \
-		${FONTDIR}/100dpi/lutBS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-lucidatypewriter-100dpi \
-		${FONTDIR}/100dpi/charB08.pcf.gz:${PORTSDIR}/x11-fonts/font-bitstream-100dpi \
-		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
+RUN_DEPENDS=	${FONTDIR}/100dpi/courB08.pcf.gz:x11-fonts/font-adobe-100dpi \
+		${FONTDIR}/100dpi/UTBI__10.pcf.gz:x11-fonts/font-adobe-utopia-100dpi \
+		${FONTDIR}/100dpi/luBIS08.pcf.gz:x11-fonts/font-bh-100dpi \
+		${FONTDIR}/100dpi/lutBS08.pcf.gz:x11-fonts/font-bh-lucidatypewriter-100dpi \
+		${FONTDIR}/100dpi/charB08.pcf.gz:x11-fonts/font-bitstream-100dpi \
+		${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings
 
 CONFLICTS=	XFree86-font100dpi-*
 
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index 08fb5844ee0c..8dacd1d386a0 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -11,12 +11,12 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org 75dpi bitmap fonts
 
-RUN_DEPENDS=	${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi \
-		${FONTDIR}/75dpi/UTBI__10.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-utopia-75dpi \
-		${FONTDIR}/75dpi/luBIS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-75dpi \
-		${FONTDIR}/75dpi/lutBS08.pcf.gz:${PORTSDIR}/x11-fonts/font-bh-lucidatypewriter-75dpi \
-		${FONTDIR}/75dpi/charB08.pcf.gz:${PORTSDIR}/x11-fonts/font-bitstream-75dpi \
-		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
+RUN_DEPENDS=	${FONTDIR}/75dpi/courB08.pcf.gz:x11-fonts/font-adobe-75dpi \
+		${FONTDIR}/75dpi/UTBI__10.pcf.gz:x11-fonts/font-adobe-utopia-75dpi \
+		${FONTDIR}/75dpi/luBIS08.pcf.gz:x11-fonts/font-bh-75dpi \
+		${FONTDIR}/75dpi/lutBS08.pcf.gz:x11-fonts/font-bh-lucidatypewriter-75dpi \
+		${FONTDIR}/75dpi/charB08.pcf.gz:x11-fonts/font-bitstream-75dpi \
+		${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings
 
 CONFLICTS=	XFree86-font75dpi-*
 
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 21adb7d821f2..a8061d262a6d 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -11,11 +11,11 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Cyrillic bitmap fonts
 
-RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx-cyrillic \
-		${FONTDIR}/cyrillic/koi12x24.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-cyrillic \
-		${FONTDIR}/cyrillic/screen8x16.pcf.gz:${PORTSDIR}/x11-fonts/font-screen-cyrillic \
-		${FONTDIR}/cyrillic/proof9x16.pcf.gz:${PORTSDIR}/x11-fonts/font-winitzki-cyrillic \
-		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
+RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:x11-fonts/font-cronyx-cyrillic \
+		${FONTDIR}/cyrillic/koi12x24.pcf.gz:x11-fonts/font-misc-cyrillic \
+		${FONTDIR}/cyrillic/screen8x16.pcf.gz:x11-fonts/font-screen-cyrillic \
+		${FONTDIR}/cyrillic/proof9x16.pcf.gz:x11-fonts/font-winitzki-cyrillic \
+		${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontCyrillic-*
 
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 72c77b2b2034..bd070dcfd50f 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -10,19 +10,19 @@ DISTFILES=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org miscellaneous bitmap fonts
 
-RUN_DEPENDS=	${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-misc \
-		${FONTDIR}/misc/cursor.pcf.gz:${PORTSDIR}/x11-fonts/font-cursor-misc \
-		${FONTDIR}/misc/hanglg16.pcf.gz:${PORTSDIR}/x11-fonts/font-daewoo-misc \
-		${FONTDIR}/misc/deccurs.pcf.gz:${PORTSDIR}/x11-fonts/font-dec-misc \
-		${FONTDIR}/misc/gb16fs.pcf.gz:${PORTSDIR}/x11-fonts/font-isas-misc \
-		${FONTDIR}/misc/jiskan16.pcf.gz:${PORTSDIR}/x11-fonts/font-jis-misc \
-		${FONTDIR}/misc/micro.pcf.gz:${PORTSDIR}/x11-fonts/font-micro-misc \
-		${FONTDIR}/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \
-		${FONTDIR}/misc/cu-alt12.pcf.gz:${PORTSDIR}/x11-fonts/font-mutt-misc \
-		${FONTDIR}/misc/clB6x10.pcf.gz:${PORTSDIR}/x11-fonts/font-schumacher-misc \
-		${FONTDIR}/misc/12x24.pcf.gz:${PORTSDIR}/x11-fonts/font-sony-misc \
-		${FONTDIR}/misc/olcursor.pcf.gz:${PORTSDIR}/x11-fonts/font-sun-misc \
-		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
+RUN_DEPENDS=	${FONTDIR}/misc/arabic24.pcf.gz:x11-fonts/font-arabic-misc \
+		${FONTDIR}/misc/cursor.pcf.gz:x11-fonts/font-cursor-misc \
+		${FONTDIR}/misc/hanglg16.pcf.gz:x11-fonts/font-daewoo-misc \
+		${FONTDIR}/misc/deccurs.pcf.gz:x11-fonts/font-dec-misc \
+		${FONTDIR}/misc/gb16fs.pcf.gz:x11-fonts/font-isas-misc \
+		${FONTDIR}/misc/jiskan16.pcf.gz:x11-fonts/font-jis-misc \
+		${FONTDIR}/misc/micro.pcf.gz:x11-fonts/font-micro-misc \
+		${FONTDIR}/misc/10x20-ISO8859-1.pcf.gz:x11-fonts/font-misc-misc \
+		${FONTDIR}/misc/cu-alt12.pcf.gz:x11-fonts/font-mutt-misc \
+		${FONTDIR}/misc/clB6x10.pcf.gz:x11-fonts/font-schumacher-misc \
+		${FONTDIR}/misc/12x24.pcf.gz:x11-fonts/font-sony-misc \
+		${FONTDIR}/misc/olcursor.pcf.gz:x11-fonts/font-sun-misc \
+		${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index 9d903b655f23..01aa743ef219 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -12,11 +12,11 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org TrueType fonts
 
-RUN_DEPENDS=	${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \
-		${FONTDIR}/OTF/SyrCOMAdiabene.otf:${PORTSDIR}/x11-fonts/font-misc-meltho \
-		${FONTDIR}/TTF/GohaTibebZemen.ttf:${PORTSDIR}/x11-fonts/font-misc-ethiopic \
-		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
-		${FONTDIR}/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu
+RUN_DEPENDS=	${FONTDIR}/TTF/luximb.ttf:x11-fonts/font-bh-ttf \
+		${FONTDIR}/OTF/SyrCOMAdiabene.otf:x11-fonts/font-misc-meltho \
+		${FONTDIR}/TTF/GohaTibebZemen.ttf:x11-fonts/font-misc-ethiopic \
+		${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings \
+		${FONTDIR}/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 
 NO_BUILD=	# none
 NO_INSTALL=	yes
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index 7b5d25ee028e..d4782ec41b68 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -11,12 +11,12 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Type1 fonts
 
-RUN_DEPENDS=	${FONTDIR}/Type1/UTBI____.afm:${PORTSDIR}/x11-fonts/font-adobe-utopia-type1 \
-		${FONTDIR}/Type1/l047013t.afm:${PORTSDIR}/x11-fonts/font-bh-type1 \
-		${FONTDIR}/Type1/c0419bt_.afm:${PORTSDIR}/x11-fonts/font-bitstream-type1 \
-		${FONTDIR}/Type1/cour.afm:${PORTSDIR}/x11-fonts/font-ibm-type1 \
-		${FONTDIR}/Type1/cursor.pfa:${PORTSDIR}/x11-fonts/font-xfree86-type1 \
-		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
+RUN_DEPENDS=	${FONTDIR}/Type1/UTBI____.afm:x11-fonts/font-adobe-utopia-type1 \
+		${FONTDIR}/Type1/l047013t.afm:x11-fonts/font-bh-type1 \
+		${FONTDIR}/Type1/c0419bt_.afm:x11-fonts/font-bitstream-type1 \
+		${FONTDIR}/Type1/cour.afm:x11-fonts/font-ibm-type1 \
+		${FONTDIR}/Type1/cursor.pfa:x11-fonts/font-xfree86-type1 \
+		${FONTDIR}/encodings/encodings.dir:x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontScalable-*
 
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 629cf9ed81c2..506070f80e9b 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -11,12 +11,12 @@ COMMENT=	X.org fonts meta-port
 USES=		metaport
 USE_XORG=	fontutil
 
-RUN_DEPENDS=	xorg-fonts-100dpi>0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
-		xorg-fonts-75dpi>0:${PORTSDIR}/x11-fonts/xorg-fonts-75dpi \
-		xorg-fonts-cyrillic>0:${PORTSDIR}/x11-fonts/xorg-fonts-cyrillic \
-		xorg-fonts-miscbitmaps>0:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
-		xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
-		xorg-fonts-type1>0:${PORTSDIR}/x11-fonts/xorg-fonts-type1 \
-		font-alias>0:${PORTSDIR}/x11-fonts/font-alias
+RUN_DEPENDS=	xorg-fonts-100dpi>0:x11-fonts/xorg-fonts-100dpi \
+		xorg-fonts-75dpi>0:x11-fonts/xorg-fonts-75dpi \
+		xorg-fonts-cyrillic>0:x11-fonts/xorg-fonts-cyrillic \
+		xorg-fonts-miscbitmaps>0:x11-fonts/xorg-fonts-miscbitmaps \
+		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
+		xorg-fonts-type1>0:x11-fonts/xorg-fonts-type1 \
+		font-alias>0:x11-fonts/font-alias
 
 .include <bsd.port.mk>
diff --git a/x11-servers/x11rdp/Makefile b/x11-servers/x11rdp/Makefile
index 7b9501a6a62e..c9ded8dbb060 100644
--- a/x11-servers/x11rdp/Makefile
+++ b/x11-servers/x11rdp/Makefile
@@ -23,7 +23,7 @@ COMMENT=	X11 server for xrdp
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	xorg-fonts>=0:${PORTSDIR}/x11-fonts/xorg-fonts
+RUN_DEPENDS=	xorg-fonts>=0:x11-fonts/xorg-fonts
 
 # SVN revision of x11rdp
 X11RDPREVISION=	299
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index 7f7fb77ec1ec..0b40f8790a99 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	xephyr
 
 COMMENT=	X server from X.Org based on kdrive
 
-LIB_DEPENDS+=	libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil
+LIB_DEPENDS+=	libxcb-image.so:x11/xcb-util-image \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-render-util.so:x11/xcb-util-renderutil
 
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index de608cefb819..4985bb48d061 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	xorg/xserver
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Nesting X server from X.Org
 
-LIB_DEPENDS=	libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
+LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 
 USES=		tar:bzip2 pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index f232eb815bdf..bc12d5561842 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -14,10 +14,10 @@ COMMENT?=	X.Org X server and related programs
 
 LICENSE=	MIT
 
-LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libepoxy.so:${PORTSDIR}/graphics/libepoxy
-RUN_DEPENDS+=	xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \
-		xkbcomp:${PORTSDIR}/x11/xkbcomp
+LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
+		libepoxy.so:graphics/libepoxy
+RUN_DEPENDS+=	xkeyboard-config>=2.5:x11/xkeyboard-config \
+		xkbcomp:x11/xkbcomp
 
 XORG_CAT=	xserver
 SLAVE_PORT?=	no
@@ -72,7 +72,7 @@ CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:sysutils/hal
 CONFIGURE_ARGS+=	--enable-config-hal=yes
 .else
 CONFIGURE_ARGS+=	--enable-config-hal=no
diff --git a/x11-themes/adwaita-qt4/Makefile b/x11-themes/adwaita-qt4/Makefile
index 426a85e5c7df..bdfa17225ca5 100644
--- a/x11-themes/adwaita-qt4/Makefile
+++ b/x11-themes/adwaita-qt4/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Adwaita theme for Qt5 applications
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	adwaita-common>=0.3:${PORTSDIR}/x11-themes/adwaita-common
+RUN_DEPENDS=	adwaita-common>=0.3:x11-themes/adwaita-common
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MartinBriza
diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile
index 67f5a0c5c2f9..41d4b9ec2b78 100644
--- a/x11-themes/adwaita-qt5/Makefile
+++ b/x11-themes/adwaita-qt5/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Adwaita theme for Qt5 applications
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	adwaita-common>=0.3:${PORTSDIR}/x11-themes/adwaita-common
+RUN_DEPENDS=	adwaita-common>=0.3:x11-themes/adwaita-common
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MartinBriza
diff --git a/x11-themes/audacious-skins/Makefile b/x11-themes/audacious-skins/Makefile
index 791acb8d9d71..82c220f8664a 100644
--- a/x11-themes/audacious-skins/Makefile
+++ b/x11-themes/audacious-skins/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Collection of audacious skins
 
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
+BUILD_DEPENDS=	audacious:multimedia/audacious
 
 USES=		tar:xz
 NO_BUILD=	yes
diff --git a/x11-themes/beastie/Makefile b/x11-themes/beastie/Makefile
index c8ef14100f9d..0735a91e1470 100644
--- a/x11-themes/beastie/Makefile
+++ b/x11-themes/beastie/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	Beastie-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnome theme with FreeBSD Colors
 
-RUN_DEPENDS+=	gtk-engines2>=2.7.4_1:${PORTSDIR}/x11-themes/gtk-engines2 \
-		gnome-themes>=2.11.91:${PORTSDIR}/x11-themes/gnome-themes
+RUN_DEPENDS+=	gtk-engines2>=2.7.4_1:x11-themes/gtk-engines2 \
+		gnome-themes>=2.11.91:x11-themes/gnome-themes
 
 WRKSRC=		${WRKDIR}/Beastie
 NO_BUILD=	yes
diff --git a/x11-themes/clearlooks-phenix-theme/Makefile b/x11-themes/clearlooks-phenix-theme/Makefile
index 583d1e3e1b8f..4d365a62cc89 100644
--- a/x11-themes/clearlooks-phenix-theme/Makefile
+++ b/x11-themes/clearlooks-phenix-theme/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Gtk3 port of Clearlooks theme for the Xfce Desktop
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	gtk-engines2>=2.20.2:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS=	gtk-engines2>=2.20.2:x11-themes/gtk-engines2
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
diff --git a/x11-themes/clearlooks-themes-extras/Makefile b/x11-themes/clearlooks-themes-extras/Makefile
index 27812f87e60b..968d8f6e4189 100644
--- a/x11-themes/clearlooks-themes-extras/Makefile
+++ b/x11-themes/clearlooks-themes-extras/Makefile
@@ -19,9 +19,9 @@ THEME_DIR=	${PREFIX}/share/themes
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc) || defined(WITH_GTKENGINE)
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2
 .else
-RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libclearlooks.so:${PORTSDIR}/x11-themes/clearlooks
+RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libclearlooks.so:x11-themes/clearlooks
 .endif
 
 do-install:
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 40b9b696c19b..4ce02a014fe6 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -35,8 +35,8 @@ PLIST_SUB+=	ENGINE=""
 .else
 CONFLICTS+=	clearlooks-[0-9]*
 
-BUILD_DEPENDS+=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS+=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS+=	gtk-engines2>=2.7.5_1:x11-themes/gtk-engines2
+RUN_DEPENDS+=	gtk-engines2>=2.7.5_1:x11-themes/gtk-engines2
 
 BUILD_WRKSRC=	${WRKSRC}/themes
 INSTALL_WRKSRC=	${WRKSRC}/themes
@@ -45,7 +45,7 @@ PLIST_SUB+=	ENGINE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMETACITY} && !defined(PKGNAMESUFFIX)
-RUN_DEPENDS+=	${LOCALBASE}/share/themes/Clearlooks/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/clearlooks-metacity
+RUN_DEPENDS+=	${LOCALBASE}/share/themes/Clearlooks/metacity-1/metacity-theme-1.xml:x11-themes/clearlooks-metacity
 .endif
 
 .if ${PORT_OPTIONS:MANIMATION}
diff --git a/x11-themes/cursor-crystal-theme/Makefile b/x11-themes/cursor-crystal-theme/Makefile
index b91be154cecf..981d789b74c8 100644
--- a/x11-themes/cursor-crystal-theme/Makefile
+++ b/x11-themes/cursor-crystal-theme/Makefile
@@ -14,8 +14,8 @@ COMMENT=	KDE Crystal style X cursor theme
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
-		xcursorgen:${PORTSDIR}/x11/xcursorgen
+BUILD_DEPENDS=	convert:graphics/ImageMagick \
+		xcursorgen:x11/xcursorgen
 
 USES=		gmake tar:bzip2
 
diff --git a/x11-themes/cursor-dmz-aa-theme/Makefile b/x11-themes/cursor-dmz-aa-theme/Makefile
index 3e2ec7e00e74..1a7c552228e5 100644
--- a/x11-themes/cursor-dmz-aa-theme/Makefile
+++ b/x11-themes/cursor-dmz-aa-theme/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	Creative Commons Attribution-ShareAlike 3.0 Unported
 LICENSE_TEXT=	See http://creativecommons.org/licenses/by-sa/3.0/
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	xcursorgen:${PORTSDIR}/x11/xcursorgen
+BUILD_DEPENDS=	xcursorgen:x11/xcursorgen
 
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}/DMZ-Black
diff --git a/x11-themes/cursor-dmz-theme/Makefile b/x11-themes/cursor-dmz-theme/Makefile
index 3018dcdbea6a..849310a4ac1a 100644
--- a/x11-themes/cursor-dmz-theme/Makefile
+++ b/x11-themes/cursor-dmz-theme/Makefile
@@ -14,7 +14,7 @@ LICENSE_NAME=	Creative Commons Attribution-ShareAlike 3.0 Unported
 LICENSE_TEXT=	See http://creativecommons.org/licenses/by-sa/3.0/
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	xcursorgen:${PORTSDIR}/x11/xcursorgen
+BUILD_DEPENDS=	xcursorgen:x11/xcursorgen
 
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}/DMZ-White
diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile
index cba89355003b..dfbc083e7d97 100644
--- a/x11-themes/emerald-themes/Makefile
+++ b/x11-themes/emerald-themes/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://cgit.compiz.org/fusion/decorators/emerald-themes/snapshot/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Themes for the Emerald Window Decorator
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake shebangfix tar:bzip2
 SHEBANG_FILES=	themes/import.sh
diff --git a/x11-themes/fluxbox-tenr-styles-pack/Makefile b/x11-themes/fluxbox-tenr-styles-pack/Makefile
index 9f7535493ef1..3a8bf28e73aa 100644
--- a/x11-themes/fluxbox-tenr-styles-pack/Makefile
+++ b/x11-themes/fluxbox-tenr-styles-pack/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	tenr.de-styles-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tenner themes pack for fluxbox
 
-RUN_DEPENDS=	fluxbox:${PORTSDIR}/x11-wm/fluxbox
+RUN_DEPENDS=	fluxbox:x11-wm/fluxbox
 
 INSTALL_DIR=	${PREFIX}/share/fluxbox/styles/
 
diff --git a/x11-themes/fvwm-themes/Makefile b/x11-themes/fvwm-themes/Makefile
index 92080b5d21fb..d73f33a1ae2a 100644
--- a/x11-themes/fvwm-themes/Makefile
+++ b/x11-themes/fvwm-themes/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Themes for the Fvwm2 window manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		fvwm2:${PORTSDIR}/x11-wm/fvwm2
-RUN_DEPENDS=	fvwm2:${PORTSDIR}/x11-wm/fvwm2
+BUILD_DEPENDS=	gm4:devel/m4 \
+		fvwm2:x11-wm/fvwm2
+RUN_DEPENDS=	fvwm2:x11-wm/fvwm2
 
 USE_XORG=	xpm
 USES=		gmake perl5 shebangfix tar:bzip2
diff --git a/x11-themes/gnome-icon-theme-symbolic/Makefile b/x11-themes/gnome-icon-theme-symbolic/Makefile
index 25eff6d0d2d5..3e87e37108df 100644
--- a/x11-themes/gnome-icon-theme-symbolic/Makefile
+++ b/x11-themes/gnome-icon-theme-symbolic/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Symbolic Icons
 
-BUILD_DEPENDS=	icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
+BUILD_DEPENDS=	icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
 
 INSTALLS_ICONS=	yes
 USES=		gmake pathfix pkgconfig tar:xz
diff --git a/x11-themes/gnome-icons/Makefile b/x11-themes/gnome-icons/Makefile
index 4c3f10d5e6c0..8ac16116d680 100644
--- a/x11-themes/gnome-icons/Makefile
+++ b/x11-themes/gnome-icons/Makefile
@@ -13,19 +13,19 @@ CATEGORIES=	x11-themes gnome
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meta-port for Gnome iconsets
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/AquaFusion/index.theme:${PORTSDIR}/x11-themes/gnome-icons-aqua-fusion \
-		${LOCALBASE}/share/icons/CfG-Crystal-SVG-1.2.0/index.theme:${PORTSDIR}/x11-themes/gnome-icons-crystal \
-		${LOCALBASE}/share/icons/Gentoo-test/index.theme:${PORTSDIR}/x11-themes/gnome-icons-gentoo-test \
-		${LOCALBASE}/share/icons/Iris/index.theme:${PORTSDIR}/x11-themes/gnome-icons-iris \
-		${LOCALBASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila \
-		${LOCALBASE}/share/icons/Noia/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-full \
-		${LOCALBASE}/share/icons/NoiaWarm/index.theme:${PORTSDIR}/x11-themes/gnome-icons-noia-warm \
-		${LOCALBASE}/share/icons/gnome-rh8/index.theme:${PORTSDIR}/x11-themes/gnome-icons-refined \
-		${LOCALBASE}/share/icons/Slick/index.theme:${PORTSDIR}/x11-themes/gnome-icons-slick \
-		${LOCALBASE}/share/icons/Snow-Apple/index.theme:${PORTSDIR}/x11-themes/gnome-icons-snow-apple \
-		${LOCALBASE}/share/icons/stylish/index.theme:${PORTSDIR}/x11-themes/gnome-icons-stylish \
-		${LOCALBASE}/share/icons/ximian-south/index.theme:${PORTSDIR}/x11-themes/gnome-icons-ximian-south \
-		${LOCALBASE}/share/icons/Lila/index.theme:${PORTSDIR}/x11-themes/gnome-icons-lila
+RUN_DEPENDS=	${LOCALBASE}/share/icons/AquaFusion/index.theme:x11-themes/gnome-icons-aqua-fusion \
+		${LOCALBASE}/share/icons/CfG-Crystal-SVG-1.2.0/index.theme:x11-themes/gnome-icons-crystal \
+		${LOCALBASE}/share/icons/Gentoo-test/index.theme:x11-themes/gnome-icons-gentoo-test \
+		${LOCALBASE}/share/icons/Iris/index.theme:x11-themes/gnome-icons-iris \
+		${LOCALBASE}/share/icons/Lila/index.theme:x11-themes/gnome-icons-lila \
+		${LOCALBASE}/share/icons/Noia/index.theme:x11-themes/gnome-icons-noia-full \
+		${LOCALBASE}/share/icons/NoiaWarm/index.theme:x11-themes/gnome-icons-noia-warm \
+		${LOCALBASE}/share/icons/gnome-rh8/index.theme:x11-themes/gnome-icons-refined \
+		${LOCALBASE}/share/icons/Slick/index.theme:x11-themes/gnome-icons-slick \
+		${LOCALBASE}/share/icons/Snow-Apple/index.theme:x11-themes/gnome-icons-snow-apple \
+		${LOCALBASE}/share/icons/stylish/index.theme:x11-themes/gnome-icons-stylish \
+		${LOCALBASE}/share/icons/ximian-south/index.theme:x11-themes/gnome-icons-ximian-south \
+		${LOCALBASE}/share/icons/Lila/index.theme:x11-themes/gnome-icons-lila
 
 USES=		metaport
 
diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index c78c9f49f2ea..324650c84d35 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	More themes for the GNOME 2 desktop environment
 
-BUILD_DEPENDS=	gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2 \
-		icon-naming-utils>=0.8.1:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS=	gtk-engines2>=2.11.0:x11-themes/gtk-engines2 \
+		icon-naming-utils>=0.8.1:x11-themes/icon-naming-utils
+RUN_DEPENDS=	gtk-engines2>=2.11.0:x11-themes/gtk-engines2
 
 USES=		gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	libgnomeui intlhack
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index a46fee944be3..90bcdd09449f 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of themes and icons for GNOME2
 
-BUILD_DEPENDS=	gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 \
-		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS=	gtk-engines2>=2.15.0:x11-themes/gtk-engines2 \
+		icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS=	gtk-engines2>=2.15.0:x11-themes/gtk-engines2
 
 CONFLICTS=	clearlooks-metacity-0.*
 
diff --git a/x11-themes/greybird-theme/Makefile b/x11-themes/greybird-theme/Makefile
index b58a0d22692b..c12551c3fe55 100644
--- a/x11-themes/greybird-theme/Makefile
+++ b/x11-themes/greybird-theme/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-theme
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Gtk and xfwm4 themes for the Xfce Desktop
 
-RUN_DEPENDS=	gtk-murrine-engine>=0.98.1:${PORTSDIR}/x11-themes/gtk-murrine-engine
+RUN_DEPENDS=	gtk-murrine-engine>=0.98.1:x11-themes/gtk-murrine-engine
 
 GH_ACCOUNT=	shimmerproject
 GH_PROJECT=	Greybird
diff --git a/x11-themes/gtk-aurora-engine/Makefile b/x11-themes/gtk-aurora-engine/Makefile
index 83f92ce3ace6..ff7ac178272c 100644
--- a/x11-themes/gtk-aurora-engine/Makefile
+++ b/x11-themes/gtk-aurora-engine/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	56438-aurora-1.5.1
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Aurora GTK+ 2.x engine and "Aurora" theme
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2
 
 USES=		gmake libtool pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-blueprint-engine/Makefile b/x11-themes/gtk-blueprint-engine/Makefile
index 5bda03f67319..da28d7048856 100644
--- a/x11-themes/gtk-blueprint-engine/Makefile
+++ b/x11-themes/gtk-blueprint-engine/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Engine, and collection of icons, themes from OpenSolaris
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	icon-naming-utils>=0.8.90:${PORTSDIR}/x11-themes/icon-naming-utils
+BUILD_DEPENDS=	icon-naming-utils>=0.8.90:x11-themes/icon-naming-utils
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool perl5 pkgconfig tar:bzip2
diff --git a/x11-themes/gtk-envy-theme/Makefile b/x11-themes/gtk-envy-theme/Makefile
index ade214d7108f..e4377807941c 100644
--- a/x11-themes/gtk-envy-theme/Makefile
+++ b/x11-themes/gtk-envy-theme/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	60029-Envy
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Envy theme for GTK+ 2.0
 
-#RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
+#RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango:x11-themes/icons-tango
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index 0cd74dc8700c..66dd255df0c4 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -14,9 +14,9 @@ DISTFILES=	121881-${DISTNAME}.tar.gz \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Equinox GTK+ 2.x engine and themes
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 \
-		${LOCALBASE}/share/icons/Faenza/index.theme:${PORTSDIR}/x11-themes/gnome-icons-faenza
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2 \
+		${LOCALBASE}/share/icons/Faenza/index.theme:x11-themes/gnome-icons-faenza
 
 USES=		pkgconfig libtool
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 642d1fceabb1..366a553c4db3 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	34132-Gray
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gray theme for GTK+ 2.0
 
-RUN_DEPENDS=	icons-tango>0:${PORTSDIR}/x11-themes/icons-tango
+RUN_DEPENDS=	icons-tango>0:x11-themes/icons-tango
 
 NO_BUILD=	yes
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-murrina-aqua/Makefile b/x11-themes/gtk-murrina-aqua/Makefile
index e722a093641f..58edd67d8b52 100644
--- a/x11-themes/gtk-murrina-aqua/Makefile
+++ b/x11-themes/gtk-murrina-aqua/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	Murrina-Aqua
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	Murrina Aqua GTK+ 2.x cairo based theme
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
-RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
+BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
+RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
 
 GTKRC_DIR=	${DISTNAME}/gtk-2.0
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-murrina-fancy-clearlooks/Makefile b/x11-themes/gtk-murrina-fancy-clearlooks/Makefile
index ba416701ba33..2e7a4d497fac 100644
--- a/x11-themes/gtk-murrina-fancy-clearlooks/Makefile
+++ b/x11-themes/gtk-murrina-fancy-clearlooks/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	MurrinaFancyClearlooks_v${PORTVERSION}
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	Murrine fancy clearlooks themes pack
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
-RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
+BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
+RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
 
 WRKSRC=	${WRKDIR}/MurrinaFancyClearlooks
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-murrina-lightblue/Makefile b/x11-themes/gtk-murrina-lightblue/Makefile
index bf8110ee06c9..59763c60d2fb 100644
--- a/x11-themes/gtk-murrina-lightblue/Makefile
+++ b/x11-themes/gtk-murrina-lightblue/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	45384-MurrinaLightBlue
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	Murrina LightBlue GTK+ 2.x cairo based theme
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
-RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
+BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
+RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
 
 GTKRC_DIR=	${DISTNAME}/gtk-2.0
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-murrine-themes/Makefile b/x11-themes/gtk-murrine-themes/Makefile
index ff9ecbb8b65b..17e0f787beed 100644
--- a/x11-themes/gtk-murrine-themes/Makefile
+++ b/x11-themes/gtk-murrine-themes/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	MurrineThemePack
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	Murrine theme pack
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
-RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine
+BUILD_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
+RUN_DEPENDS=	${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
 
 GTKRC_DIR=	${DISTNAME}/gtk-2.0
 USE_GNOME=	gtk20
diff --git a/x11-themes/gtk-oxygen-engine/Makefile b/x11-themes/gtk-oxygen-engine/Makefile
index b965af20f11e..8ad62be67cd9 100644
--- a/x11-themes/gtk-oxygen-engine/Makefile
+++ b/x11-themes/gtk-oxygen-engine/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Oxygen-Gtk engine and theme
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USE_GNOME=	gtk20
 USES=		cmake pkgconfig tar:bzip2
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index 90106036d314..f17668fc756c 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Oxygen GTK+ 3 engine and theme
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USE_GNOME=	gtk30
 USES=		cmake:outsource pkgconfig tar:bzip2
diff --git a/x11-themes/icon-naming-utils/Makefile b/x11-themes/icon-naming-utils/Makefile
index a2de15874ada..aed6292cf2ee 100644
--- a/x11-themes/icon-naming-utils/Makefile
+++ b/x11-themes/icon-naming-utils/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GENTOO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities of the Tango project
 
-BUILD_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
-RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
+RUN_DEPENDS=	p5-XML-Simple>=0:textproc/p5-XML-Simple
 
 USES=		pathfix pkgconfig perl5 gmake
 GNU_CONFIGURE=	yes
diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile
index f88069a06b21..336d00944fb3 100644
--- a/x11-themes/icons-tango-extras/Makefile
+++ b/x11-themes/icons-tango-extras/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	tango-icon-theme-extras-${PORTVERSION}
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Extra set of icons from the Tango project
 
-BUILD_DEPENDS=	${LOCALBASE}/libexec/icon-name-mapping:${PORTSDIR}/x11-themes/icon-naming-utils \
-		${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:${PORTSDIR}/x11-themes/icons-tango \
-		Magick-config:${PORTSDIR}/graphics/ImageMagick
-RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:${PORTSDIR}/x11-themes/icons-tango
+BUILD_DEPENDS=	${LOCALBASE}/libexec/icon-name-mapping:x11-themes/icon-naming-utils \
+		${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:x11-themes/icons-tango \
+		Magick-config:graphics/ImageMagick
+RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:x11-themes/icons-tango
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index 70939193c473..3455168d5723 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tango-icon-theme-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Basic set of icons for the most common usage
 
-BUILD_DEPENDS=	${LOCALBASE}/libexec/icon-name-mapping:${PORTSDIR}/x11-themes/icon-naming-utils \
-		Magick-config:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS=	${LOCALBASE}/libexec/icon-name-mapping:x11-themes/icon-naming-utils \
+		Magick-config:graphics/ImageMagick
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack
diff --git a/x11-themes/irssi-themes/Makefile b/x11-themes/irssi-themes/Makefile
index c598035fcc94..723f5903d3c5 100644
--- a/x11-themes/irssi-themes/Makefile
+++ b/x11-themes/irssi-themes/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Collection of additional irssi themes
 
-RUN_DEPENDS=	irssi:${PORTSDIR}/irc/irssi
+RUN_DEPENDS=	irssi:irc/irssi
 
 NO_BUILD=	yes
 
diff --git a/x11-themes/kde4-windeco-dekorator/Makefile b/x11-themes/kde4-windeco-dekorator/Makefile
index 9e34dc2c54d0..e144a4ea5cd6 100644
--- a/x11-themes/kde4-windeco-dekorator/Makefile
+++ b/x11-themes/kde4-windeco-dekorator/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Transparent KDE4 window decoration
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqimageblitz.so:${PORTSDIR}/x11/qimageblitz
+LIB_DEPENDS=	libqimageblitz.so:x11/qimageblitz
 
 USE_KDE4=	kdelibs kdeprefix automoc4 workspace
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 597af5d03f6c..dbdc1371bc9d 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Artworks Themes
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
 
 USE_KDE4=	kdelibs kdeprefix libkexiv2 workspace automoc4
 USES=		cmake:outsource tar:xz
@@ -20,9 +20,9 @@ USE_XORG=	x11 xt
 
 OPTIONS_DEFINE=	GNOME
 GNOME_DESC=	Use Gnome screensavers
-GNOME_BUILD_DEPENDS=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+GNOME_BUILD_DEPENDS=	${LOCALBASE}/share/applications/xscreensaver-properties.desktop:x11/xscreensaver-gnome
 GNOME_RUN_DEPENDS=	${GNOME_BUILD_DEPENDS}
-GNOME_BUILD_DEPENDS_OFF=	xscreensaver:${PORTSDIR}/x11/xscreensaver
+GNOME_BUILD_DEPENDS_OFF=	xscreensaver:x11/xscreensaver
 GNOME_RUN_DEPENDS_OFF=		${GNOME_BUILD_DEPENDS_OFF}
 
 post-patch:
diff --git a/x11-themes/linux-c6-hicolor-icon-theme/Makefile b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
index 13b7f394dc45..85d9718c54c2 100644
--- a/x11-themes/linux-c6-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
@@ -14,7 +14,7 @@ COMMENT=	High-color icon theme shell from the FreeDesktop project
 
 CONFLICTS=	linux-f10-hicolor-icon-theme-[0-9]*
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 NO_BUILD=	yes
 USE_LINUX=	c6
diff --git a/x11-themes/linux-f10-hicolor-icon-theme/Makefile b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
index 34f56aa6ec66..74101a9bbbb6 100644
--- a/x11-themes/linux-f10-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
@@ -13,7 +13,7 @@ COMMENT=	High-color icon theme shell from the FreeDesktop project
 
 CONFLICTS=	linux-hicolor-icon-theme-[0-9]* linux-f8-hicolor-icon-theme-[0-9]*
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 NO_BUILD=	yes
 USE_LINUX=	f10
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
index fc02579def95..101628d8aed1 100644
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-hicolor-icon-theme/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-color icon theme shell from the FreeDesktop project
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 CONFLICTS=	linux-f8-hicolor-icon-theme-[0-9]* linux-f10-hicolor-icon-theme-[0-9]*
 
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index 9e49e19dacce..81933ad1bb86 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Desktop-independent theme switcher for GTK+
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gettext-tools gmake localbase pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/x11-themes/mate-icon-theme/Makefile b/x11-themes/mate-icon-theme/Makefile
index 3d997a6ab9ee..7d06059a3f4f 100644
--- a/x11-themes/mate-icon-theme/Makefile
+++ b/x11-themes/mate-icon-theme/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of icons for the MATE desktop
 
-BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-themes/mate-themes/Makefile b/x11-themes/mate-themes/Makefile
index 664bfefdb264..61cb186797c6 100644
--- a/x11-themes/mate-themes/Makefile
+++ b/x11-themes/mate-themes/Makefile
@@ -12,10 +12,10 @@ DISTNAME=	${PORTNAME}-gtk3.18-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of themes and icons for MATE
 
-BUILD_DEPENDS=	gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 \
-		icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	gtk-engines2>=2.15.0:${PORTSDIR}/x11-themes/gtk-engines2 \
-		gtk-murrine-engine>=0.98:${PORTSDIR}/x11-themes/gtk-murrine-engine
+BUILD_DEPENDS=	gtk-engines2>=2.15.0:x11-themes/gtk-engines2 \
+		icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS=	gtk-engines2>=2.15.0:x11-themes/gtk-engines2 \
+		gtk-murrine-engine>=0.98:x11-themes/gtk-murrine-engine
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-themes/metacity-themes/Makefile b/x11-themes/metacity-themes/Makefile
index fcfb9fe24e14..30195043f411 100644
--- a/x11-themes/metacity-themes/Makefile
+++ b/x11-themes/metacity-themes/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	# Empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meta-port for Gnome Metacity themes
 
-RUN_DEPENDS=	${LOCALBASE}/share/themes/microgui/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/metacity-theme-microgui
+RUN_DEPENDS=	${LOCALBASE}/share/themes/microgui/metacity-1/metacity-theme-1.xml:x11-themes/metacity-theme-microgui
 
 NO_BUILD=	yes
 NO_MTREE=	yes
diff --git a/x11-themes/murrine-configurator/Makefile b/x11-themes/murrine-configurator/Makefile
index a330e0b54253..c0784f44fa99 100644
--- a/x11-themes/murrine-configurator/Makefile
+++ b/x11-themes/murrine-configurator/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://cimi.netsons.org/media/download_gallery/murrine/
 MAINTAINER=	tstodgell@gmail.com
 COMMENT=	GUI gtkrc configuration tool for the Murrine GTK engine
 
-RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
-		${LOCALBASE}/lib/gtk-2.0/2.10.0/engines/libmurrine.so:${PORTSDIR}/x11-themes/gtk-murrine-engine \
-		${LOCALBASE}/bin/zenity:${PORTSDIR}/x11/zenity
+RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
+		${LOCALBASE}/lib/gtk-2.0/2.10.0/engines/libmurrine.so:x11-themes/gtk-murrine-engine \
+		${LOCALBASE}/bin/zenity:x11/zenity
 
 NO_BUILD=	yes
 USES=	tar:bzip2
diff --git a/x11-themes/nimbus/Makefile b/x11-themes/nimbus/Makefile
index 93a22ca3e1fd..1132a1d62bba 100644
--- a/x11-themes/nimbus/Makefile
+++ b/x11-themes/nimbus/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=		http://dlc.sun.com/osol/jds/downloads/extras/nimbus/ \
 MAINTAINER=		kpedersen@opencde.org
 COMMENT=		GTK+ 2.x engine from the OpenSolaris project
 
-BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/icon-naming-utils.pc:${PORTSDIR}/x11-themes/icon-naming-utils
+BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/icon-naming-utils.pc:x11-themes/icon-naming-utils
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-static
diff --git a/x11-themes/numix-theme/Makefile b/x11-themes/numix-theme/Makefile
index d51806a809bb..ae0ea0a76278 100644
--- a/x11-themes/numix-theme/Makefile
+++ b/x11-themes/numix-theme/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Gtk and Xfwm4 flat themes for the Xfce Desktop
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	gtk-murrine-engine>=0.98.1:${PORTSDIR}/x11-themes/gtk-murrine-engine
+RUN_DEPENDS=	gtk-murrine-engine>=0.98.1:x11-themes/gtk-murrine-engine
 
 GH_ACCOUNT=	shimmerproject
 GH_PROJECT=	Numix
diff --git a/x11-themes/openbox-themes/Makefile b/x11-themes/openbox-themes/Makefile
index 2c2e0af3b634..bf1dc755e56f 100644
--- a/x11-themes/openbox-themes/Makefile
+++ b/x11-themes/openbox-themes/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Themes for Openbox
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	openbox:${PORTSDIR}/x11-wm/openbox
+RUN_DEPENDS=	openbox:x11-wm/openbox
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/x11-themes/plank-theme-moka/Makefile b/x11-themes/plank-theme-moka/Makefile
index ee1c45cc1e35..b1312e0d14bc 100644
--- a/x11-themes/plank-theme-moka/Makefile
+++ b/x11-themes/plank-theme-moka/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Moka Plank theme
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	plank:${PORTSDIR}/x11-wm/plank
+RUN_DEPENDS=	plank:x11-wm/plank
 
 USES=	zip
 NO_WRKSUBDIR=	yes
diff --git a/x11-themes/qtcurve/Makefile b/x11-themes/qtcurve/Makefile
index 6e820260fc89..c3610f986fd8 100644
--- a/x11-themes/qtcurve/Makefile
+++ b/x11-themes/qtcurve/Makefile
@@ -15,10 +15,10 @@ PATCHDIR=	${MASTERDIR}/none
 OPTIONS_DEFINE=	GTK2 KDE4 QT4 QT5
 OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
 
-GTK2_RUN_DEPENDS=	gtk2-qtcurve-theme>=1.8.18:${PORTSDIR}/x11-themes/qtcurve-gtk2
-KDE4_RUN_DEPENDS=	kde4-style-qtcurve>=1.8.18:${PORTSDIR}/x11-themes/qtcurve-kde4
-QT4_RUN_DEPENDS=	qt4-style-qtcurve>=1.8.18:${PORTSDIR}/x11-themes/qtcurve-qt4
-QT5_RUN_DEPENDS=	qt5-style-qtcurve>=1.8.18:${PORTSDIR}/x11-themes/qtcurve-qt5
+GTK2_RUN_DEPENDS=	gtk2-qtcurve-theme>=1.8.18:x11-themes/qtcurve-gtk2
+KDE4_RUN_DEPENDS=	kde4-style-qtcurve>=1.8.18:x11-themes/qtcurve-kde4
+QT4_RUN_DEPENDS=	qt4-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt4
+QT5_RUN_DEPENDS=	qt5-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt5
 
 .else # !defined(QTCURVE_SLAVE)
 USE_GITHUB=	yes
@@ -53,7 +53,7 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext-tools:build
 NLS_CMAKE_OFF=	-DQTC_INSTALL_PO=Off
 .else
-LIB_DEPENDS+=	libqtcurve-utils.so:${PORTSDIR}/x11-themes/qtcurve-utils
+LIB_DEPENDS+=	libqtcurve-utils.so:x11-themes/qtcurve-utils
 .endif
 
 .if ${QTCURVE_SLAVE} == "gtk2"
diff --git a/x11-themes/sawfish-themes/Makefile b/x11-themes/sawfish-themes/Makefile
index e91843d85f02..1b5f3ec95377 100644
--- a/x11-themes/sawfish-themes/Makefile
+++ b/x11-themes/sawfish-themes/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Themes for Sawfish window manager
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
+RUN_DEPENDS=	sawfish:x11-wm/sawfish
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-themes/ubuntulooks/Makefile b/x11-themes/ubuntulooks/Makefile
index 653b2f5731c6..2e75508c93c1 100644
--- a/x11-themes/ubuntulooks/Makefile
+++ b/x11-themes/ubuntulooks/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	pneumann@gmail.com
 COMMENT=	GTK+ 2.x engine from Ubuntu Dapper
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtk-engines-2.pc:x11-themes/gtk-engines2
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile
index fb69a22d1a93..2fef2118a93b 100644
--- a/x11-themes/xcursor-themes/Makefile
+++ b/x11-themes/xcursor-themes/Makefile
@@ -10,7 +10,7 @@ COMMENT=	X.org cursors themes
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	xcursorgen:${PORTSDIR}/x11/xcursorgen
+BUILD_DEPENDS=	xcursorgen:x11/xcursorgen
 
 USE_XORG=	xextproto
 
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 9057168c3344..d2396a89e683 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://bitbucket.org/Coin3D/coin/downloads/
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GUI binding for using Open Inventor with Xt/Motif
 
-LIB_DEPENDS=	libCoin.so:${PORTSDIR}/graphics/Coin
+LIB_DEPENDS=	libCoin.so:graphics/Coin
 
 USES=		libtool motif pathfix perl5 shebangfix
 USE_GL=		yes
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 6b7773e1946f..8e7cd73022ee 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ Application Framework for use with Gtkmm
 
-LIB_DEPENDS=	libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm \
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+LIB_DEPENDS=	libgconfmm-2.6.so:devel/gconfmm26 \
+		libglademm-2.4.so:devel/libglademm24 \
+		libgnomevfsmm-2.6.so:devel/gnome-vfsmm \
+		libxml++-2.6.so:textproc/libxml++26
 
 USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack
diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile
index 2f6368affcf4..724b23aa6a06 100644
--- a/x11-toolkits/elementary/Makefile
+++ b/x11-toolkits/elementary/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple widget toolkit using EFL
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS=	libefl.so:devel/efl
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile
index d6e25d9a97da..902fb898d7df 100644
--- a/x11-toolkits/flowcanvas/Makefile
+++ b/x11-toolkits/flowcanvas/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Interactive Gtkmm/Gnomecanvasmm widget
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libgvc.so:${PORTSDIR}/graphics/graphviz \
-		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
+		libgvc.so:graphics/graphviz \
+		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		tar:bzip2 pkgconfig python:build
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile
index b55855eeddf1..08e483628a8a 100644
--- a/x11-toolkits/fltk-devel/Makefile
+++ b/x11-toolkits/fltk-devel/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	EXAMPLES
 EXAMPLES_CMAKE_OFF=	-DOPTION_BUILD_EXAMPLES:BOOL=OFF
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index e3fe04fe4ada..0f4d6bb6c719 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		jpeg pkgconfig
 USE_XORG=	xft
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 1077b64738cb..eb1c37c81f9b 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Fast and extensive C++ GUI toolkit
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 MAJORVER=	${PORTVERSION:R}
 SHVER=		${PORTVERSION:S/${MAJORVER}.//}
@@ -62,7 +62,7 @@ CONFIGURE_ARGS+=	--with-xshm=no
 .endif
 #
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcups.so:print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index d2681998ad49..691dd6566ad3 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fast and extensive C++ GUI toolkit -- ver.1.6
 
 LICENSE=	LGPL3+
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		jpeg libtool pathfix
 USE_GL=		glu
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 157a66a579fb..36d603c9ba33 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -42,19 +42,19 @@ CONFIGURE_ARGS+=--disable-jpeg
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .else
 CONFIGURE_ARGS+=--disable-png
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
 .else
 CONFIGURE_ARGS+=--disable-tiff
 .endif
 
 .if ${PORT_OPTIONS:MWEBP}
-LIB_DEPENDS+=	libwebp.so:${PORTSDIR}/graphics/webp
+LIB_DEPENDS+=	libwebp.so:graphics/webp
 .else
 CONFIGURE_ARGS+=--disable-webp
 .endif
diff --git a/x11-toolkits/fpc-xforms/Makefile b/x11-toolkits/fpc-xforms/Makefile
index e722da0ab673..be01af9ffb1b 100644
--- a/x11-toolkits/fpc-xforms/Makefile
+++ b/x11-toolkits/fpc-xforms/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	EXAMPLES XFORMS
 XFORMS_DESC=	Install xforms graphical user interface toolkit
 OPTIONS_DEFAULT=	XFORMS
 
-XFORMS_LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+XFORMS_LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 1bba49d81ae0..84ca2eaaf994 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fox toolkit reimplementation of Scintilla editing widget
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 
 USES=		libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index 00bffb3ce314..57e6d373e5af 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -13,7 +13,7 @@ COMMENT=	General Applet Interface Library
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 USES=		gettext-tools pkgconfig tar:bzip2
 USE_GL=		gl
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 11a662a75396..d8146cd62c7f 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -14,9 +14,9 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgtkimageview.so:${PORTSDIR}/x11-toolkits/gtkimageview
+LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
+		libnotify.so:devel/libnotify \
+		libgtkimageview.so:x11-toolkits/gtkimageview
 
 USES=		gmake pkgconfig tar:bzip2 tcl
 USE_GNOME=	gtk20 libglade2
diff --git a/x11-toolkits/gnome-pty-helper/Makefile b/x11-toolkits/gnome-pty-helper/Makefile
index 8836d20849f7..ab2a079a361d 100644
--- a/x11-toolkits/gnome-pty-helper/Makefile
+++ b/x11-toolkits/gnome-pty-helper/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	utmp/wtmp/lastlog helper program for the vte Terminal widget
 
-BUILD_DEPENDS+=	gnutls>=0:${PORTSDIR}/security/gnutls
+BUILD_DEPENDS+=	gnutls>=0:security/gnutls
 
 PORTSCOUT=	ignore:1
 
diff --git a/x11-toolkits/gnomemm/Makefile b/x11-toolkits/gnomemm/Makefile
index 24f575f6252b..323571b712f8 100644
--- a/x11-toolkits/gnomemm/Makefile
+++ b/x11-toolkits/gnomemm/Makefile
@@ -9,12 +9,12 @@ CATEGORIES=	x11-toolkits devel gnome
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	The "meta-port" for the powerful C++ bindings to the GNOME2 libraries
 
-LIB_DEPENDS=	libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
-		libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 \
-		libgnomemm-2.6.so:${PORTSDIR}/x11/libgnomemm26 \
-		libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
+LIB_DEPENDS=	libgconfmm-2.6.so:devel/gconfmm26 \
+		libgnomevfsmm-2.6.so:devel/gnome-vfsmm \
+		libglademm-2.4.so:devel/libglademm24 \
+		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
+		libgnomemm-2.6.so:x11/libgnomemm26 \
+		libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26
 
 USES=		metaport
 
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 4203a6e8ae0d..5dde65227003 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -11,12 +11,12 @@ COMMENT=	GNUstep GUI backend
 LICENSE_COMB=	multi
 LICENSE=	GPLv3 LGPL3
 
-LIB_DEPENDS+=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libXft.so:${PORTSDIR}/x11-fonts/libXft \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libgif.so:graphics/giflib \
+		libtiff.so:graphics/tiff \
+		libXft.so:x11-fonts/libXft \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libcairo.so:graphics/cairo
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tiff-library=${LOCALBASE}/lib \
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 6b6068a86392..35a330c38c76 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -17,15 +17,15 @@ OPTIONS_DEFINE=	DOCS CUPS ASPELL
 OPTIONS_DEFAULT=	CUPS
 OPTIONS_SUB=	yes
 
-DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html \
-			texi2pdf:${PORTSDIR}/print/texinfo
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
+			texi2pdf:print/texinfo
 
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
-LIB_DEPENDS+=	libgif.so:${PORTSDIR}/graphics/giflib
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite
+LIB_DEPENDS+=	libtiff.so:graphics/tiff
+LIB_DEPENDS+=	libpng.so:graphics/png
+LIB_DEPENDS+=	libgif.so:graphics/giflib
+LIB_DEPENDS+=	libsndfile.so:audio/libsndfile
+LIB_DEPENDS+=	libao.so:audio/libao
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libflite.a:audio/flite
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-tiff-library=${LOCALBASE}/lib
@@ -48,8 +48,8 @@ MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 
 CUPS_CONFIGURE_ENABLE=		cups
-CUPS_LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+CUPS_LIB_DEPENDS+=	libcups.so:print/cups
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ENABLE=	aspell
 
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index edd0bad0397a..082583b09fe6 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Extensions of GTK+3 toolkit
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgee-0.8.so:${PORTSDIR}/devel/libgee
-RUN_DEPENDS=	contractor:${PORTSDIR}/sysutils/contractor
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libgee-0.8.so:devel/libgee
+RUN_DEPENDS=	contractor:sysutils/contractor
 
 USES=	cmake gettext pkgconfig tar:xz
 USE_GNOME=	glib20 gtk30 introspection:build
diff --git a/x11-toolkits/gtk-sharp-beans/Makefile b/x11-toolkits/gtk-sharp-beans/Makefile
index aa994adebe33..9e60db909182 100644
--- a/x11-toolkits/gtk-sharp-beans/Makefile
+++ b/x11-toolkits/gtk-sharp-beans/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Extensions on top of GTK-sharp
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gio-sharp-2.0.pc:${PORTSDIR}/devel/gio-sharp
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gio-sharp-2.0.pc:devel/gio-sharp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 7f8bfe9cbc3b..00d6adc2b43b 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	10
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
+BUILD_DEPENDS=	mono:lang/mono
+RUN_DEPENDS=	mono:lang/mono
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 56f685bc63be..9e80d12f1bbe 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	20
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-RUN_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/gtk-sharp30/Makefile b/x11-toolkits/gtk-sharp30/Makefile
index d754240ca8fc..e2eaa2eeb3ff 100644
--- a/x11-toolkits/gtk-sharp30/Makefile
+++ b/x11-toolkits/gtk-sharp30/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	30
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GTK+ and GNOME interfaces for the .NET runtime
 
-RUN_DEPENDS=	p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
+RUN_DEPENDS=	p5-XML-LibXML>=0:textproc/p5-XML-LibXML
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 9797b9491f03..fca003e70a8f 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -21,9 +21,9 @@ PORTSCOUT=	limitw:0,even
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS+=	update-mime-database:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		python:${PORTSDIR}/lang/python
+RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info \
+		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		python:lang/python
 
 USES+=		gettext gmake libtool pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
@@ -42,7 +42,7 @@ OPTIONS_DEFINE=	CUPS DEBUG
 OPTIONS_DEFAULT=CUPS
 OPTIONS_SUB=	yes
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CONFIGURE_ON=	--enable-cups=auto
 CUPS_CONFIGURE_OFF=	--disable-cups
 DEBUG_CONFIGURE_ON=	--enable-debug=yes
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 0102d9e0defd..dae4a8092ae2 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -24,11 +24,11 @@ PORTSCOUT=	ignore:1
 .else
 PORTSCOUT=	limit:1,even
 
-BUILD_DEPENDS+=	at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
-LIB_DEPENDS=	libepoxy.so:${PORTSDIR}/graphics/libepoxy
-RUN_DEPENDS+=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \
-		adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
-		at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
+BUILD_DEPENDS+=	at-spi2-atk>=0:accessibility/at-spi2-atk
+LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
+RUN_DEPENDS+=	hicolor-icon-theme>=0:misc/hicolor-icon-theme \
+		adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
+		at-spi2-atk>=0:accessibility/at-spi2-atk
 
 USE_PERL5=	build
 USE_LDCONFIG=	yes
@@ -62,16 +62,16 @@ BROADWAY_DESC=	Enable GDK Broadway backend for showing GTK+ in the webbrowser us
 BROADWAY_CONFIGURE_ENABLE=	broadway-backend
 
 COLORD_DESC=	Color profile support
-COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
+COLORD_LIB_DEPENDS=	libcolord.so:graphics/colord
 COLORD_CONFIGURE_ENABLE=colord
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=	cups
 
 CLOUDPRINT_DESC=	Cloud printing support
 CLOUDPRINT_CONFIGURE_ENABLE=	cloudprint
-CLOUDPRINT_LIB_DEPENDS=	librest-0.7.so:${PORTSDIR}/devel/librest \
-			libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+CLOUDPRINT_LIB_DEPENDS=	librest-0.7.so:devel/librest \
+			libjson-glib-1.0.so:devel/json-glib
 
 DEBUG_CONFIGURE_ENABLE=debug
 
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index 6a6a20cd3c1e..8e3ad6ecd19a 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=		DOCS NLS EXAMPLES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/x11-toolkits/gtkada3/Makefile b/x11-toolkits/gtkada3/Makefile
index 928ad666c8f3..87471a3c1581 100644
--- a/x11-toolkits/gtkada3/Makefile
+++ b/x11-toolkits/gtkada3/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ada graphical toolkit based on Gtk3 components
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gprbuild:${PORTSDIR}/devel/gprbuild
+BUILD_DEPENDS=	gprbuild:devel/gprbuild
 
 USES=		ada gmake perl5 pkgconfig
 USE_PERL5=	build
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--with-GL=auto \
 			--enable-static
 
 OPTIONS_DEFINE=		DOCS NLS EXAMPLES DEBUG
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_DISTFILES=		gtkada-rm-${RM_VERSION}.tar.bz2
 DOCS_ALL_TARGET=	docs
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index a90b77d1ebc6..aede33f01f5f 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -32,7 +32,7 @@ GLADE_DESC=	Enable libglade2 support
 GLADE_USE=	GNOME=libglade2
 GLADE_CONFIGURE_ENABLE=	libglade
 GLADEUI_DESC=	Enable glade3 support
-GLADEUI_LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3
+GLADEUI_LIB_DEPENDS=	libgladeui-1.so:devel/glade3
 GLADEUI_CONFIGURE_ENABLE=	glade
 
 post-patch:
diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile
index 09c51daf461d..254b75327816 100644
--- a/x11-toolkits/gtkglextmm/Makefile
+++ b/x11-toolkits/gtkglextmm/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/gtkglext/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GtkGLExt
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		pathfix pkgconfig gettext gmake tar:bzip2 libtool
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 83c7fff1578f..1e4078bafe4b 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -13,10 +13,10 @@ COMMENT=	GTK Widget to Render MathML Documents
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libt1.so:${PORTSDIR}/devel/t1lib \
-		libgmetadom_gdome_cpp_smart.so:${PORTSDIR}/textproc/gmetadom
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libt1.so:devel/t1lib \
+		libgmetadom_gdome_cpp_smart.so:textproc/gmetadom
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index cbf0b13582eb..c430f3404b74 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -3,7 +3,7 @@
 
 PORTREVISION=	7
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:${PORTSDIR}/x11-toolkits/gtkmm20
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.0.pc:x11-toolkits/gtkmm20
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 531596775967..e53483d5293e 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -19,8 +19,8 @@ PORTSCOUT=	ignore:1
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libsigc-1.2.so:devel/libsigc++12
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES+=		gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index c1d4f718b768..26941dea19d9 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -3,8 +3,8 @@
 
 PORTREVISION=	1
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-2.4.pc:x11-toolkits/gtkmm24 \
+		glibmm-reference>=0:devel/glibmm-reference
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 1d8e1cb438f2..f88905a3c48b 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -19,7 +19,7 @@ PORTSCOUT=	ignore:1
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 GNU_CONFIGURE=	yes
 USES+=		gettext gmake libtool:keepla pathfix pkgconfig
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 90b0ed15e6d6..2b495483fb69 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -3,8 +3,8 @@
 
 PORTREVISION=	1
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc:${PORTSDIR}/x11-toolkits/gtkmm30 \
-		glibmm-reference>=0:${PORTSDIR}/devel/glibmm-reference
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gtkmm-3.0.pc:x11-toolkits/gtkmm30 \
+		glibmm-reference>=0:devel/glibmm-reference
 
 USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index b9c7bd13a7b9..90ff39f740a6 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -18,7 +18,7 @@ PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES+=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gtk30 glibmm cairomm atkmm pangomm
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index c6989d030d73..9e4417cfffe5 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -17,7 +17,7 @@ PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	vala:lang/vala
 
 USES+=		gettext gmake gnome libtool pathfix pkgconfig
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build \
diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index 49421cc74286..f61f4d7e8309 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Client stacker popup widget for GTK+ toolkit
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
-LIB_DEPENDS=	libcroco-0.6.so:${PORTSDIR}/textproc/libcroco
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+LIB_DEPENDS=	libcroco-0.6.so:textproc/libcroco
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
 
 USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	cairo gtk20 glib20 librsvg2 pygtk2 pango
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 22d0e90c5e93..6758400d47da 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -25,7 +25,7 @@ post-patch::
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 
 .if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
-LIB_DEPENDS+=	libc++.so.1:${PORTSDIR}/devel/libc++
+LIB_DEPENDS+=	libc++.so.1:devel/libc++
 
 .if ${OSVERSION} < 1000000
 CONFIGURE_ARGS+=	--extra-include-dirs=${LOCALBASE}/include/c++/v1
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile
index d4c233fc27ec..05bfeae4bb63 100644
--- a/x11-toolkits/irrlicht/Makefile
+++ b/x11-toolkits/irrlicht/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High performance realtime 3D engine
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/readme.txt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 DOS2UNIX_GLOB=	Makefile *.cpp *.h *.txt
 USES=		alias dos2unix gmake jpeg zip
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index b4fc01a42937..0cc8dfd3d217 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	erik@bz.bzflag.bz
 COMMENT=	Object-oriented extension to Tk [incr Tk]
 
-LIB_DEPENDS=	libitcl.so.${MAJOR}:${PORTSDIR}/lang/itcl
+LIB_DEPENDS=	libitcl.so.${MAJOR}:lang/itcl
 
 USES=		tk uidfix
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index e359db4ad189..f2b13036b85f 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	iwidgets${PORTVERSION}
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Iwidgets - [incr Widgets] companion to [incr Tk]
 
-LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
+LIB_DEPENDS=	libitk.so:x11-toolkits/itk
 
 NO_BUILD=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index fb16c6f0daf7..fa7919418677 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	SF
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	API compatible clone of the Motif toolkit
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 CONFLICTS?=	open-motif-*
 
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index e0014260ba05..d8b444d227e3 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	GDI+ API for System.Windows.Forms in Mono
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libcairo.so:graphics/cairo
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake libtool:keepla pathfix pkgconfig
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 5e6e14891dbc..ddefa5615641 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome print support library
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
 
 USES=		bison gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	x11 xpm
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index c61c3fb9881c..af078d5ee4aa 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrappers for the GNOME print support library
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		libgnomeprintmm-2.5.so:${PORTSDIR}/print/libgnomeprintmm
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24 \
+		libgnomeprintmm-2.5.so:print/libgnomeprintmm
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix libgnomeprintui
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 410ce89ce86d..2520d1fcc9a5 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -16,9 +16,9 @@ USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS+=	libgnome-keyring.so:security/libgnome-keyring \
+		libstartup-notification-1.so:x11/startup-notification
+RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:misc/gnome-icon-theme
 
 USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomeprefix intltool libbonoboui referencehack gvfs
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 6bee0604c8df..74641fe85f5f 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -12,12 +12,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libgnomeui library
 
-LIB_DEPENDS=	libgnomemm-2.6.so:${PORTSDIR}/x11/libgnomemm26 \
-		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26 \
-		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgnomemm-2.6.so:x11/libgnomemm26 \
+		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26 \
+		libgconfmm-2.6.so:devel/gconfmm26 \
+		libglademm-2.4.so:devel/libglademm24 \
+		libgnomevfsmm-2.6.so:devel/gnome-vfsmm
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	x11
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 710905de4469..bfef77b085cd 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Extension widgets for GTK+
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+LIB_DEPENDS=	libenchant.so:textproc/enchant
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index 644d1b6b6ec7..9873a5231d25 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	C++ bindings for libsexy
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libsexy.so:x11-toolkits/libsexy \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/libunique3/Makefile b/x11-toolkits/libunique3/Makefile
index 9d3d61ddaccb..1a5d45df06e9 100644
--- a/x11-toolkits/libunique3/Makefile
+++ b/x11-toolkits/libunique3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Library for single instance applications
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USE_XORG=	ice x11
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index d2ed3a6bb8a6..7ee69517f4ca 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -31,7 +31,7 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	STARTUP
 OPTIONS_DEFAULT=STARTUP
 STARTUP_DESC=	Startup notification support
-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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile
index b16f4cd0368b..e0a29f7bdefc 100644
--- a/x11-toolkits/libwnck3/Makefile
+++ b/x11-toolkits/libwnck3/Makefile
@@ -29,7 +29,7 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	STARTUP
 OPTIONS_DEFAULT=STARTUP
 STARTUP_DESC=	Startup notification support
-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
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libxaw3dxft/Makefile b/x11-toolkits/libxaw3dxft/Makefile
index 9576d37ba5a5..2c33a4c1f2b0 100644
--- a/x11-toolkits/libxaw3dxft/Makefile
+++ b/x11-toolkits/libxaw3dxft/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	libXaw3dXft-${DISTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	3D Xaw (Athena Widget Set) replacement with extended fonts
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig tar:bzip2
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 8adfc0795c1b..592615824f3d 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFAULT=	NLS STARTUP
 STARTUP_DESC=	Startup notification
 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-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index d0e7f1d252f8..6f00eb6967fe 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -19,8 +19,8 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 
-NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-			linux-c6-libGLU>0:${PORTSDIR}/graphics/linux-c6-libGLU
+NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
+			linux-c6-libGLU>0:graphics/linux-c6-libGLU
 NVIDIA_GL_USE_OFF=	linux_apps=dri
 
 USE_LINUX_APPS=	fontconfig png xorglibs png alsalib jpeg tiff qt47
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 3545ffd05bea..94d2ccc9cdb8 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://siag.nu/pub/mowitz/
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	This is the Mowitz ("More widgets") library
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USES=		libtool
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile
index a27c94e1bc97..029711a0d653 100644
--- a/x11-toolkits/nucleo/Makefile
+++ b/x11-toolkits/nucleo/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Toolkit to explore video and human-computer interaction
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		gmake jpeg libtool pathfix pkgconfig shebangfix tar:bzip2
 USE_GL=		glu
@@ -33,23 +33,23 @@ OPTIONS_RADIO_DNSSD=	AVAHI MDNSRESPONDER
 OPTIONS_SUB=	yes
 DNSSD_DESC=		Service discovery
 
-AVAHI_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/avahi-libdns
+AVAHI_LIB_DEPENDS=	libdns_sd.so:net/avahi-libdns
 AVAHI_CPPFLAGS=		-I${LOCALBASE}/include/avahi-compat-libdns_sd
 
 FFMPEG_DESC=		Build FFmpeg plugin
-FFMPEG_LIB_DEPENDS=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
 
 GD_DESC=		Build GD plugin
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
 
 QT4_DESC=		Build Qt 4 plugin
 GD_CONFIGURE_OFF=	--without-gd
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=	--without-gnutls
 
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 QT4_USE=		QT4=moc_build,corelib
 QT4_CONFIGURE_OFF=	--without-qt
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index f2cff70fb304..4cfc6b3b2b18 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -59,9 +59,9 @@ PORTEXAMPLES=	*
 
 .if ${PORT_OPTIONS:MGTKGLAREA}
 CONFIGURE_ARGS+=	--with-gl
-BUILD_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
-RUN_DEPENDS+=	lablgl:${PORTSDIR}/graphics/ocaml-lablgl
-LIB_DEPENDS+=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2
+BUILD_DEPENDS+=	lablgl:graphics/ocaml-lablgl
+RUN_DEPENDS+=	lablgl:graphics/ocaml-lablgl
+LIB_DEPENDS+=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2
 EXAMPLES_SUBDIRS+=	GL
 .else
 CONFIGURE_ARGS+=	--without-gl
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=	--without-gtksourceview2
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+LIB_DEPENDS+=	libgtkspell.so:textproc/gtkspell
 CONFIGURE_ARGS+=	--with-gtkspell
 .else
 CONFIGURE_ARGS+=	--without-gtkspell
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index edfe6abd9583..f180fdfb34c4 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif-[0-9]*
diff --git a/x11-toolkits/osm-gps-map/Makefile b/x11-toolkits/osm-gps-map/Makefile
index d9620bea8fa7..88bea77b8619 100644
--- a/x11-toolkits/osm-gps-map/Makefile
+++ b/x11-toolkits/osm-gps-map/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Gtk+ 3.0 mapping widget
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 USES=		gmake gnome libtool pkgconfig
 USE_GNOME=	cairo gtk30 introspection:build
diff --git a/x11-toolkits/p5-Alien-wxWidgets/Makefile b/x11-toolkits/p5-Alien-wxWidgets/Makefile
index d9fe9d22216c..ced905285376 100644
--- a/x11-toolkits/p5-Alien-wxWidgets/Makefile
+++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile
@@ -34,8 +34,8 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+=	p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
-RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:${PORTSDIR}/devel/p5-Module-Pluggable
+BUILD_DEPENDS+=	p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
+RUN_DEPENDS+=	p5-Module-Pluggable>=5.1:devel/p5-Module-Pluggable
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index c88ed1e3717b..3e1dab68c1bd 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -16,11 +16,11 @@ COMMENT=	Gtk2-Perl bindings to libglade2
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-Cairo>=0:graphics/p5-Cairo \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libglade2
 USES=		perl5
diff --git a/x11-toolkits/p5-Gnome2-Canvas/Makefile b/x11-toolkits/p5-Gnome2-Canvas/Makefile
index ee7cda1bf0cb..222ec04bd176 100644
--- a/x11-toolkits/p5-Gnome2-Canvas/Makefile
+++ b/x11-toolkits/p5-Gnome2-Canvas/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Allows a perl developer to use the GnomeCanvas widget with Gtk2-Perl
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Cairo>=0:graphics/p5-Cairo
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libgnomecanvas
 USES=		pkgconfig perl5
diff --git a/x11-toolkits/p5-Gnome2-VFS/Makefile b/x11-toolkits/p5-Gnome2-VFS/Makefile
index a9a5716cc97c..e5c71b50fdc2 100644
--- a/x11-toolkits/p5-Gnome2-VFS/Makefile
+++ b/x11-toolkits/p5-Gnome2-VFS/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Allows you to use the GNOME Virtual File System library from Perl
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 MAKE_JOBS_UNSAFE=	yes
 USE_GNOME=	gnomevfs2
diff --git a/x11-toolkits/p5-Gnome2-Wnck/Makefile b/x11-toolkits/p5-Gnome2-Wnck/Makefile
index a07f4b709c42..b111d97737e9 100644
--- a/x11-toolkits/p5-Gnome2-Wnck/Makefile
+++ b/x11-toolkits/p5-Gnome2-Wnck/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Perl interface to the Window Navigator Construction Kit
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig
-LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
+LIB_DEPENDS=	libwnck-1.so:x11-toolkits/libwnck
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/x11-toolkits/p5-Gnome2/Makefile b/x11-toolkits/p5-Gnome2/Makefile
index d36692c47594..4b728a7613c8 100644
--- a/x11-toolkits/p5-Gnome2/Makefile
+++ b/x11-toolkits/p5-Gnome2/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Allows a perl developer to use the Gnome libraries
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gnome2-Canvas>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-Canvas \
-		p5-Gnome2-VFS>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gnome2-Canvas>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-Canvas \
-		p5-Gnome2-VFS>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gnome2-Canvas>=0:x11-toolkits/p5-Gnome2-Canvas \
+		p5-Gnome2-VFS>=0:x11-toolkits/p5-Gnome2-VFS \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gnome2-Canvas>=0:x11-toolkits/p5-Gnome2-Canvas \
+		p5-Gnome2-VFS>=0:x11-toolkits/p5-Gnome2-VFS \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 15f10b490857..bfb665c016c6 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The base module of Gtk-Perl
 
-BUILD_DEPENDS=	p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Writer>=0:textproc/p5-XML-Writer \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USE_GNOME=	gtk12
 USES=		perl5 shebangfix
diff --git a/x11-toolkits/p5-Gtk2-Chmod/Makefile b/x11-toolkits/p5-Gtk2-Chmod/Makefile
index 439d0074f4c0..cc9e87687860 100644
--- a/x11-toolkits/p5-Gtk2-Chmod/Makefile
+++ b/x11-toolkits/p5-Gtk2-Chmod/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Provides a dialog for getting values to use with chmod
 
-BUILD_DEPENDS=	p5-File-Stat-Bits>=0:${PORTSDIR}/sysutils/p5-File-Stat-Bits \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-File-Stat-Bits>=0:sysutils/p5-File-Stat-Bits \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
index 5e26ce3e10ee..5307cb099899 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Dialogs/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Useful tools for Gnome2/Gtk2 Perl GUI design
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-File-Type>=0:${PORTSDIR}/devel/p5-File-Type \
-		p5-Gtk2-Ex-Utils>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Utils
+BUILD_DEPENDS=	p5-File-Type>=0:devel/p5-File-Type \
+		p5-Gtk2-Ex-Utils>=0:x11-toolkits/p5-Gtk2-Ex-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
index 44e38593ad25..b1d474991723 100644
--- a/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-FormFactory/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Makes building complex GUI more easy
 
-BUILD_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-Simple-List>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List
-RUN_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Ex-Simple-List>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List
+BUILD_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Ex-Simple-List>=0:x11-toolkits/p5-Gtk2-Ex-Simple-List
+RUN_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Ex-Simple-List>=0:x11-toolkits/p5-Gtk2-Ex-Simple-List
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
index db0c57d6354f..1fac4f90a682 100644
--- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Displays plain old documentation
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Gtk2-Ex-Simple-List>=0.50:${PORTSDIR}/x11-toolkits/p5-Gtk2-Ex-Simple-List \
-		p5-Pod-Simple>=0:${PORTSDIR}/textproc/p5-Pod-Simple
+BUILD_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+		p5-Gtk2-Ex-Simple-List>=0.50:x11-toolkits/p5-Gtk2-Ex-Simple-List \
+		p5-Pod-Simple>=0:textproc/p5-Pod-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
index f7f335b1c757..ab09910c3182 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Simple-List/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Simple interface to complex MVC list widget
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
index eb52917a149e..19b405e6f5b9 100644
--- a/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
+++ b/x11-toolkits/p5-Gtk2-Ex-Utils/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Extra Gtk2 utilities for Gtk2 in perl
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-ExtUtils-Depends>=0.3:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo
-RUN_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-ExtUtils-Depends>=0.3:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1.1:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-Cairo>=0:graphics/p5-Cairo
+RUN_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/x11-toolkits/p5-Gtk2-GladeXML/Makefile b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
index 269e6b36caa3..01ef99a05312 100644
--- a/x11-toolkits/p5-Gtk2-GladeXML/Makefile
+++ b/x11-toolkits/p5-Gtk2-GladeXML/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Creates users interfaces directly from Glade XML files
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-ExtUtils-Depends>=0.3:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.1:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo
-RUN_DEPENDS=	p5-Glib2>=1.00:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-ExtUtils-Depends>=0.3:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1.1:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-Cairo>=0:graphics/p5-Cairo
+RUN_DEPENDS=	p5-Glib2>=1.00:devel/p5-Glib2 \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libglade2
 
diff --git a/x11-toolkits/p5-Gtk2-Html2/Makefile b/x11-toolkits/p5-Gtk2-Html2/Makefile
index 3628c6c23de8..3b8ad762d820 100644
--- a/x11-toolkits/p5-Gtk2-Html2/Makefile
+++ b/x11-toolkits/p5-Gtk2-Html2/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Perl module for gtkhtml2 html display widget with Gtk2-Perl
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo
-RUN_DEPENDS=	p5-Glib2>=0:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Cairo>=0:graphics/p5-Cairo
+RUN_DEPENDS=	p5-Glib2>=0:devel/p5-Glib2 \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 USE_GNOME=	libgtkhtml
 USES=		pkgconfig perl5
diff --git a/x11-toolkits/p5-Gtk2-ImageView/Makefile b/x11-toolkits/p5-Gtk2-ImageView/Makefile
index 439bbf16b954..ae88efcb441b 100644
--- a/x11-toolkits/p5-Gtk2-ImageView/Makefile
+++ b/x11-toolkits/p5-Gtk2-ImageView/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings to the GtkImageView image viewer widget
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0.2:${PORTSDIR}/devel/p5-ExtUtils-Depends	\
-		p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=1.140:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libgtkimageview.so:${PORTSDIR}/x11-toolkits/gtkimageview
+BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0.2:devel/p5-ExtUtils-Depends	\
+		p5-ExtUtils-PkgConfig>=1.03:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=1.140:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libgtkimageview.so:x11-toolkits/gtkimageview
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
index 547e8e6b98f0..a3eb656eb58d 100644
--- a/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
+++ b/x11-toolkits/p5-Gtk2-PathButtonBar/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Creates a bar for path manipulation
 
-RUN_DEPENDS=	p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
index f720c3f2e35f..3ec92bcf54b7 100644
--- a/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
+++ b/x11-toolkits/p5-Gtk2-TrayIcon/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the EggTrayIcon library
 
-BUILD_DEPENDS=	p5-Cairo>=0:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends	\
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-Cairo>=0:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends	\
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Gtk2-Unique/Makefile b/x11-toolkits/p5-Gtk2-Unique/Makefile
index 526a07e6535e..823f5e6bdf90 100644
--- a/x11-toolkits/p5-Gtk2-Unique/Makefile
+++ b/x11-toolkits/p5-Gtk2-Unique/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl binding for the C library libunique
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
-LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Gtk2>=0:x11-toolkits/p5-Gtk2
+LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/x11-toolkits/p5-Gtk2/Makefile b/x11-toolkits/p5-Gtk2/Makefile
index bd9533998501..6ff346aa7264 100644
--- a/x11-toolkits/p5-Gtk2/Makefile
+++ b/x11-toolkits/p5-Gtk2/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Perl module for Gtk+ 2.x graphical user interface library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-Cairo>=1:${PORTSDIR}/graphics/p5-Cairo \
-		p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Pango>=1.220:${PORTSDIR}/x11-toolkits/p5-Pango
-RUN_DEPENDS=	p5-Cairo>=1:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2 \
-		p5-Pango>=1.220:${PORTSDIR}/x11-toolkits/p5-Pango
+BUILD_DEPENDS=	p5-Cairo>=1:graphics/p5-Cairo \
+		p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1.03:devel/p5-ExtUtils-PkgConfig \
+		p5-Glib2>=1.280:devel/p5-Glib2 \
+		p5-Pango>=1.220:x11-toolkits/p5-Pango
+RUN_DEPENDS=	p5-Cairo>=1:graphics/p5-Cairo \
+		p5-Glib2>=1.280:devel/p5-Glib2 \
+		p5-Pango>=1.220:x11-toolkits/p5-Pango
 
 CONFIGURE_ENV=	FORCE_MAKE_CMD=yes
 MAKE_ENV=	LANG=C
diff --git a/x11-toolkits/p5-Pango/Makefile b/x11-toolkits/p5-Pango/Makefile
index 1e724f9dc802..b43b0bf26bd0 100644
--- a/x11-toolkits/p5-Pango/Makefile
+++ b/x11-toolkits/p5-Pango/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Perl module for layout and render i18n text
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=1.03:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Cairo>=1:${PORTSDIR}/graphics/p5-Cairo \
-		p5-Glib2>=1.220:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS=	p5-Glib2>=1.220:${PORTSDIR}/devel/p5-Glib2
+BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.300:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=1.03:devel/p5-ExtUtils-PkgConfig \
+		p5-Cairo>=1:graphics/p5-Cairo \
+		p5-Glib2>=1.220:devel/p5-Glib2
+RUN_DEPENDS=	p5-Glib2>=1.220:devel/p5-Glib2
 
 USE_GNOME=	pango
 USES=		perl5
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index 142e820d9dde..040d27330d82 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Extensible Perl toolkit for multi-platform GUI development
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 OPTIONS_DEFINE=	GTK2 ICONV XFT
 OPTIONS_DEFAULT=ICONV XFT
diff --git a/x11-toolkits/p5-Tk-Action/Makefile b/x11-toolkits/p5-Tk-Action/Makefile
index a46d94b5cb38..f6be5f30c638 100644
--- a/x11-toolkits/p5-Tk-Action/Makefile
+++ b/x11-toolkits/p5-Tk-Action/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Action abstraction for Tk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar \
-		p5-MooseX-SemiAffordanceAccessor>=0:${PORTSDIR}/devel/p5-MooseX-SemiAffordanceAccessor \
-		p5-Tk-Sugar>=0:${PORTSDIR}/x11-toolkits/p5-Tk-Sugar
+BUILD_DEPENDS=	p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
+		p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \
+		p5-Tk-Sugar>=0:x11-toolkits/p5-Tk-Sugar
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index b80aa1c39956..59c5872021ea 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk::Autoscroll - space invaders-like scrolling
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index d66f414896b8..2e9a2a44265c 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl/Tk module providing a Colour selection dialogue box
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-Contrib/Makefile b/x11-toolkits/p5-Tk-Contrib/Makefile
index 968111d41ba1..0a363f355f95 100644
--- a/x11-toolkits/p5-Tk-Contrib/Makefile
+++ b/x11-toolkits/p5-Tk-Contrib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Contributed Tk widgets
 
-BUILD_DEPENDS=	p5-Tk>=804:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=804:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-CursorControl/Makefile b/x11-toolkits/p5-Tk-CursorControl/Makefile
index b1259e4bb8a2..82fc9c883109 100644
--- a/x11-toolkits/p5-Tk-CursorControl/Makefile
+++ b/x11-toolkits/p5-Tk-CursorControl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Manipulate the mouse cursor programmatically
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tk>=800.015:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=800.015:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 ALL_TARGETS=	pure_install
diff --git a/x11-toolkits/p5-Tk-DKW/Makefile b/x11-toolkits/p5-Tk-DKW/Makefile
index 4ee02e82cf83..51a9fe66e0d8 100644
--- a/x11-toolkits/p5-Tk-DKW/Makefile
+++ b/x11-toolkits/p5-Tk-DKW/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Collection of Tk widgets
 
-BUILD_DEPENDS=	p5-Tk>=804:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Tk-Contrib>=0.07:${PORTSDIR}/x11-toolkits/p5-Tk-Contrib
+BUILD_DEPENDS=	p5-Tk>=804:x11-toolkits/p5-Tk \
+		p5-Tk-Contrib>=0.07:x11-toolkits/p5-Tk-Contrib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-Date/Makefile b/x11-toolkits/p5-Tk-Date/Makefile
index 683f0ec7741c..22fdf74b499e 100644
--- a/x11-toolkits/p5-Tk-Date/Makefile
+++ b/x11-toolkits/p5-Tk-Date/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk::Date - a date/time widget for perl/Tk
 
-BUILD_DEPENDS=	p5-Tk-GBARR>=0:${PORTSDIR}/x11-toolkits/p5-Tk-GBARR
+BUILD_DEPENDS=	p5-Tk-GBARR>=0:x11-toolkits/p5-Tk-GBARR
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
index d0d8a232d96b..4fa7272bd2cb 100644
--- a/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
+++ b/x11-toolkits/p5-Tk-DynaTabFrame/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	NoteBook widget with orientable, dynamically stacking tabs
 
-BUILD_DEPENDS=	p5-Tk>=804.027:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=804.027:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index 62e7b3212684..2d69f258db5e 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk::Enscript - a text-to-postscript converter using Tk::Canvas
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-FileDialog/Makefile b/x11-toolkits/p5-Tk-FileDialog/Makefile
index 4557a8dcac66..9c230af440ce 100644
--- a/x11-toolkits/p5-Tk-FileDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FileDialog/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tk::FileDialog - A file selector dialog for perl/Tk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-FontDialog/Makefile b/x11-toolkits/p5-Tk-FontDialog/Makefile
index 57f6bd438432..65c4659cee92 100644
--- a/x11-toolkits/p5-Tk-FontDialog/Makefile
+++ b/x11-toolkits/p5-Tk-FontDialog/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Font dialog widget
 
-BUILD_DEPENDS=	p5-Tk>=804:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=804:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-GBARR/Makefile b/x11-toolkits/p5-Tk-GBARR/Makefile
index 96ed28da5a91..ff2e6fd2ef10 100644
--- a/x11-toolkits/p5-Tk-GBARR/Makefile
+++ b/x11-toolkits/p5-Tk-GBARR/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Some collection of Tk Widgets
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-Getopt/Makefile b/x11-toolkits/p5-Tk-Getopt/Makefile
index 7504da537da1..193f96734976 100644
--- a/x11-toolkits/p5-Tk-Getopt/Makefile
+++ b/x11-toolkits/p5-Tk-Getopt/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	User configuration window for Tk with interface to Getopt::Long
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-HistEntry/Makefile b/x11-toolkits/p5-Tk-HistEntry/Makefile
index fe9f349d739c..12498646ecd1 100644
--- a/x11-toolkits/p5-Tk-HistEntry/Makefile
+++ b/x11-toolkits/p5-Tk-HistEntry/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tk::HistEntry - Entry widget with history capability
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-JComboBox/Makefile b/x11-toolkits/p5-Tk-JComboBox/Makefile
index c58747fd6072..4609717973b7 100644
--- a/x11-toolkits/p5-Tk-JComboBox/Makefile
+++ b/x11-toolkits/p5-Tk-JComboBox/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Contains a Label or Entry, a Button, and a Listbox
 
-BUILD_DEPENDS=	p5-Tk>=804.027:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=804.027:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-ResizeButton/Makefile b/x11-toolkits/p5-Tk-ResizeButton/Makefile
index b0009150e5c1..3c72b0c721bb 100644
--- a/x11-toolkits/p5-Tk-ResizeButton/Makefile
+++ b/x11-toolkits/p5-Tk-ResizeButton/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Resizable button to be used in a Tk::HList column header
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-Role-Dialog/Makefile b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
index 5e9de3e2fea5..5eb33dff8e01 100644
--- a/x11-toolkits/p5-Tk-Role-Dialog/Makefile
+++ b/x11-toolkits/p5-Tk-Role-Dialog/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Moose role for enhanced Tk dialogs
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class \
-		p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Tk-Role-HasWidgets>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/p5-Tk-Role-HasWidgets \
-		p5-Tk-Sugar>=0:${PORTSDIR}/x11-toolkits/p5-Tk-Sugar
+BUILD_DEPENDS=	p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \
+		p5-Tk>=0:x11-toolkits/p5-Tk \
+		p5-Tk-Role-HasWidgets>=${PORTVERSION}:x11-toolkits/p5-Tk-Role-HasWidgets \
+		p5-Tk-Sugar>=0:x11-toolkits/p5-Tk-Sugar
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile b/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
index 8a5ca5672b4f..56717bfae587 100644
--- a/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
+++ b/x11-toolkits/p5-Tk-Role-HasWidgets/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Keep track of your Tk widgets
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar
+BUILD_DEPENDS=	p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/x11-toolkits/p5-Tk-Splashscreen/Makefile b/x11-toolkits/p5-Tk-Splashscreen/Makefile
index a18d86a27590..2529a14ac53d 100644
--- a/x11-toolkits/p5-Tk-Splashscreen/Makefile
+++ b/x11-toolkits/p5-Tk-Splashscreen/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Tk::Splashscreen, display a Splashscreen during program initialization
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-Sugar/Makefile b/x11-toolkits/p5-Tk-Sugar/Makefile
index 72819abd4b6b..e566ffb7049a 100644
--- a/x11-toolkits/p5-Tk-Sugar/Makefile
+++ b/x11-toolkits/p5-Tk-Sugar/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Sugar syntax for Tk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 22fc0b430b5e..0b0c559d4a13 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Table/matrix extension to perl/tk for displaying table formatted data
 
-BUILD_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=0:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk-ToolBar/Makefile b/x11-toolkits/p5-Tk-ToolBar/Makefile
index 2ccb634de41b..d8468c62e599 100644
--- a/x11-toolkits/p5-Tk-ToolBar/Makefile
+++ b/x11-toolkits/p5-Tk-ToolBar/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Toolbar widget for Perl/Tk
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Tk-CursorControl>=0:${PORTSDIR}/x11-toolkits/p5-Tk-CursorControl
+BUILD_DEPENDS=	p5-Tk-CursorControl>=0:x11-toolkits/p5-Tk-CursorControl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/x11-toolkits/p5-Tk-WaitBox/Makefile b/x11-toolkits/p5-Tk-WaitBox/Makefile
index 5e6a87eef30c..8da8eddcf8ea 100644
--- a/x11-toolkits/p5-Tk-WaitBox/Makefile
+++ b/x11-toolkits/p5-Tk-WaitBox/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wait Dialog for Perl/Tk
 
-BUILD_DEPENDS=	p5-Tk>=804.027:${PORTSDIR}/x11-toolkits/p5-Tk
+BUILD_DEPENDS=	p5-Tk>=804.027:x11-toolkits/p5-Tk
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index e9a3ad4d117f..79783edf6bd4 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Re-port of a perl5 interface to Tk8.4
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	XFT
 OPTIONS_DEFAULT=	XFT
diff --git a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
index 330f7539cad2..dc799b44bacc 100644
--- a/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
+++ b/x11-toolkits/p5-Wx-Perl-ProcessStream/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to access IO of external processes via events
 
-BUILD_DEPENDS=	p5-Wx>=0.50:${PORTSDIR}/x11-toolkits/p5-Wx
-RUN_DEPENDS=	p5-Wx>=0.50:${PORTSDIR}/x11-toolkits/p5-Wx
+BUILD_DEPENDS=	p5-Wx>=0.50:x11-toolkits/p5-Wx
+RUN_DEPENDS=	p5-Wx>=0.50:x11-toolkits/p5-Wx
 
 USE_WX=		3.0
 WX_COMPS=	wx
diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index 328c5dc17d72..7fed54f1e718 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl5 interface to the wxWidgets cross-platform GUI toolkit
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.16.03:${PORTSDIR}/devel/p5-ExtUtils-XSpp \
-		p5-Alien-wxWidgets>=0.25:${PORTSDIR}/x11-toolkits/p5-Alien-wxWidgets
+BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.16.03:devel/p5-ExtUtils-XSpp \
+		p5-Alien-wxWidgets>=0.25:x11-toolkits/p5-Alien-wxWidgets
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		compiler:c++11-lib perl5
@@ -29,8 +29,8 @@ CFLAGS+=	-pthread -Wno-write-strings
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501508
-BUILD_DEPENDS+= p5-ExtUtils-ParseXS>=3.15:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
-RUN_DEPENDS+=   p5-ExtUtils-ParseXS>=3.15:${PORTSDIR}/devel/p5-ExtUtils-ParseXS
+BUILD_DEPENDS+= p5-ExtUtils-ParseXS>=3.15:devel/p5-ExtUtils-ParseXS
+RUN_DEPENDS+=   p5-ExtUtils-ParseXS>=3.15:devel/p5-ExtUtils-ParseXS
 .endif
 
 post-configure:
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 256caf07b247..7fc9d72d8176 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -15,13 +15,13 @@ USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	fontconfig>=2.10.91:${PORTSDIR}/x11-fonts/fontconfig \
-		cairo>=1.12.10,2:${PORTSDIR}/graphics/cairo
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
-		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
+BUILD_DEPENDS=	fontconfig>=2.10.91:x11-fonts/fontconfig \
+		cairo>=1.12.10,2:graphics/cairo
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
+		${FONTENCOD}:x11-fonts/encodings
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index 058c93384f59..fdd94a74ecdf 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -16,7 +16,7 @@ USES=		tar:xz
 .if !defined(REFERENCE_PORT)
 PORTSCOUT=	limitw:1,even
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES+=		gmake libtool pathfix pkgconfig
 USE_GNOME=	cairomm glibmm pango
diff --git a/x11-toolkits/pangox-compat/Makefile b/x11-toolkits/pangox-compat/Makefile
index 3cc4fab300c4..ae5e10442142 100644
--- a/x11-toolkits/pangox-compat/Makefile
+++ b/x11-toolkits/pangox-compat/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Deprecated pangoX support
 
-BUILD_DEPENDS=	pango>=1.34.0:${PORTSDIR}/x11-toolkits/pango
+BUILD_DEPENDS=	pango>=1.34.0:x11-toolkits/pango
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_XORG=	x11 ice
diff --git a/x11-toolkits/pure-gtk/Makefile b/x11-toolkits/pure-gtk/Makefile
index bf4e5b1a298e..b49da4d0d076 100644
--- a/x11-toolkits/pure-gtk/Makefile
+++ b/x11-toolkits/pure-gtk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Set of Pure language bindings for GTK+
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 USES=		pkgconfig pure:ffi
 USE_GNOME=	glib20 gtk20 atk pango
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 7b6fb381fa2c..21fe46a36db9 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	High-level compound graphics widgets for Python
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index 57402beb9dad..2cfdcc19064a 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python interface to FLTK window toolkit
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 CFLAGS+=	-DFL_LIBRARY
 MAKE_ENV=	FLTK_HOME=${LOCALBASE}/bin
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 48b461cd161b..be57745b3273 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -18,8 +18,8 @@ OPTIONS_DEFINE=	EXAMPLES
 
 OPTIONS_SUB=	yes
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit
 
 USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 574f232b2248..ae9957581281 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -15,8 +15,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Set of Python bindings for GTK+
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo
 
 USES=		gettext gmake libtool pathfix pkgconfig python:2 tar:bzip2
 USE_GNOME=	libglade2 pygobject
diff --git a/x11-toolkits/py-gtkglext/Makefile b/x11-toolkits/py-gtkglext/Makefile
index a4a7af5c5476..f53797476f63 100644
--- a/x11-toolkits/py-gtkglext/Makefile
+++ b/x11-toolkits/py-gtkglext/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	pygtkglext-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python binding for GtkGLExt
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl
 
 USES=		gmake libtool pathfix pkgconfig python tar:bzip2
 USE_GNOME=	pygtk2
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index eba8d1ce032b..65eaf933cf6f 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	PyGUI-${PORTVERSION}-1
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Cross-platform pythonic GUI API
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:${PORTSDIR}/devel/pyrex
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:devel/pyrex
 
 OPTIONS_DEFINE=	DOCS EXAMPLES OPENGL
 
@@ -24,7 +24,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 WRKSRC=		${WRKDIR}/PyGUI-${PORTVERSION}
 
-OPENGL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
+OPENGL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"GUI.Cocoa",||g' ${WRKSRC}/setup.py
diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
index 4e8d5a4207ee..58855e6829e3 100644
--- a/x11-toolkits/py-kivy/Makefile
+++ b/x11-toolkits/py-kivy/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python NUI library for rapid application development
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
-LIB_DEPENDS=	libmtdev.so:${PORTSDIR}/devel/libmtdev
-TEST_DEPENDS=	nosetests-${PYTHON_VER}:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS=	cython:lang/cython
+LIB_DEPENDS=	libmtdev.so:devel/libmtdev
+TEST_DEPENDS=	nosetests-${PYTHON_VER}:devel/py-nose
 
 MAKE_ENV=	KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \
 		PYTHONPATH=${WRKSRC}
@@ -50,21 +50,21 @@ SPELLING_DESC=	Spell checking support
 TEXT_DESC=	Text rendering support (compulsory)
 WINDOW_DESC=	Window support (compulsory)
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 ENCHANT_DESC=		Spell checking support via Enchant
-ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:${PORTSDIR}/textproc/py-enchant
-FFMPEG_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ffmpeg/__init__.py:${PORTSDIR}/multimedia/py-ffmpeg
+ENCHANT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant
+FFMPEG_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ffmpeg/__init__.py:multimedia/py-ffmpeg
 GSTREAMER_MAKE_ENV=	USE_GSTREAMER=1
 GSTREAMER_MAKE_ENV_OFF=	USE_GSTREAMER=0
-GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:${PORTSDIR}/multimedia/gstreamer1
-GSTREAMER_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygst.py:${PORTSDIR}/multimedia/py-gstreamer
+GSTREAMER_LIB_DEPENDS=	libgstreamer-1.0.so:multimedia/gstreamer1
+GSTREAMER_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer
 GSTREAMER_USES=		pkgconfig
-OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:${PORTSDIR}/graphics/py-opencv
+OPENCV_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv
 PIL_DESC=		Text and window rendering support via PIL
-PIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging
+PIL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}imaging>0:graphics/py-imaging
 PYGAME_DESC=		Window, text and image rendering support via PyGame
-PYGAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
-PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>0:${PORTSDIR}/graphics/py-pyglet
+PYGAME_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
+PYGLET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet
 SDL2_DESC=		Simple Direct Media Layer v2.0 support
 SDL2_MAKE_ENV=		USE_SDL2=1
 SDL2_MAKE_ENV_OFF=	USE_SDL2=0
diff --git a/x11-toolkits/py-qt4-gui/Makefile b/x11-toolkits/py-qt4-gui/Makefile
index a0487b9ee454..bfe8adfee4cd 100644
--- a/x11-toolkits/py-qt4-gui/Makefile
+++ b/x11-toolkits/py-qt4-gui/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtGui API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 BROKEN_sparc64=	Does not compile on sparc64
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index 618dd400ae4f..8e50a63b83db 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtGui API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index 51cd8f61a247..2937597060f3 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Libsexy bindings for Python
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
+LIB_DEPENDS=	libsexy.so:x11-toolkits/libsexy
 
 USES=		libtool pkgconfig python
 USE_GNOME=	pygtk2
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index a317f43b4984..71d9e2eaecf1 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	TkinterTreectrl-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TkTreectrl Python bindings
 
-LIB_DEPENDS=	libtreectrl.so.1:${PORTSDIR}/x11-toolkits/tktreectrl
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/py-Pmw
+LIB_DEPENDS=	libtreectrl.so.1:x11-toolkits/tktreectrl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw
 
 USES=		python tk:run zip
 USE_PYTHON=	distutils
diff --git a/x11-toolkits/py-traitsbackendwx/Makefile b/x11-toolkits/py-traitsbackendwx/Makefile
index 6396ea5d51e8..a6a471efaad5 100644
--- a/x11-toolkits/py-traitsbackendwx/Makefile
+++ b/x11-toolkits/py-traitsbackendwx/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Wx backend for TraitsGUI
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=3.2.0:${PORTSDIR}/devel/py-traits
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>=3.2.0:devel/py-traits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/x11-toolkits/py-traitsgui/Makefile b/x11-toolkits/py-traitsgui/Makefile
index a6606ef50a9f..03e921d8fbc8 100644
--- a/x11-toolkits/py-traitsgui/Makefile
+++ b/x11-toolkits/py-traitsgui/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jacob.frelinger@duke.edu
 COMMENT=	Gui toolkit derived from the Enthought python traits library
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traitsbackendwx>=3.1.0:${PORTSDIR}/x11-toolkits/py-traitsbackendwx
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traitsbackendwx>=3.1.0:x11-toolkits/py-traitsbackendwx
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 909ca5275a47..3e8d086b26cc 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	28
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings for the wxWidgets/GTK GUI toolkit
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}opengl>=0:graphics/py-opengl
 
 WRKSRC_SUBDIR=	wxPython
 
@@ -75,8 +75,8 @@ PYDISTUTILS_BUILDARGS+=	\
 			INSTALL_MULTIVERSION=1
 .else
 ## These are shared
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:${PORTSDIR}/x11-toolkits/py-wxPython28-common \
-		${PYTHON_SITELIBDIR}/wxversion.py:${PORTSDIR}/x11-toolkits/py-wxPython-common
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:x11-toolkits/py-wxPython28-common \
+		${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common
 
 PYDISTUTILS_BUILDARGS+=	\
 			NO_HEADERS=1 \
diff --git a/x11-toolkits/py-wxPython30/Makefile b/x11-toolkits/py-wxPython30/Makefile
index 78ba52fb57e0..891bfdf299bf 100644
--- a/x11-toolkits/py-wxPython30/Makefile
+++ b/x11-toolkits/py-wxPython30/Makefile
@@ -37,7 +37,7 @@ do-install:
 WXPORT=		gtk2
 WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wxPython-common>0:${PORTSDIR}/x11-toolkits/py-wxPython-common
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common
 
 USES+=		gettext pkgconfig
 USE_WX=		3.0
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 5ab8239a63d9..8d1e32802208 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	qt4-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical user interface module
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfontconfig.so:x11-fonts/fontconfig
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib
 QT_DIST=	yes
@@ -52,12 +52,12 @@ FONTENCOD=	${LOCALBASE}/share/fonts/encodings/encodings.dir
 .include "${.CURDIR}/../../devel/qt4/files/Makefile.options"
 
 .if ${QT4_OPTIONS:MCUPS}
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
+LIB_DEPENDS+=	libcups.so:print/cups
 CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include
 .endif
 
 .if ${QT4_OPTIONS:MNAS}
-LIB_DEPENDS+=	libaudio.so:${PORTSDIR}/audio/nas
+LIB_DEPENDS+=	libaudio.so:audio/nas
 CONFIGURE_ARGS+=-system-nas-sound
 .else
 CONFIGURE_ARGS+=-no-nas-sound
@@ -71,8 +71,8 @@ CONFIGURE_ARGS+=-no-gtkstyle
 .endif
 
 .if defined(PACKAGE_BUILDING)
-RUN_DEPENDS+=	xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
-		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
+RUN_DEPENDS+=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
+		${FONTENCOD}:x11-fonts/encodings
 .endif
 
 CFLAGS_powerpc64=	-mminimal-toc
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 3bf04ae7d853..bd9c5c38c3b3 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -8,18 +8,18 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical user interface module
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libxcb.so:${PORTSDIR}/x11/libxcb \
-		libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
+		libpng.so:graphics/png \
+		libxcb.so:x11/libxcb \
+		libxcb-image.so:x11/xcb-util-image \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-render-util.so:x11/xcb-util-renderutil \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		jpeg
 USE_GL=		gl egl
@@ -61,8 +61,8 @@ QT_CONFIG=	accessibility accessibility-atspi-bridge dbus \
 
 # Inherited from Qt 4.
 .if defined(PACKAGE_BUILDING)
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
-		xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \
+		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 .endif
 
 CFLAGS_powerpc64=	-mminimal-toc
diff --git a/x11-toolkits/qtada/Makefile b/x11-toolkits/qtada/Makefile
index 4caa70de2110..9d846e3ee922 100644
--- a/x11-toolkits/qtada/Makefile
+++ b/x11-toolkits/qtada/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Ada2005 language bindings to Qt4 framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gprbuild>=20120510:${PORTSDIR}/devel/gprbuild \
-		asis>=2011:${PORTSDIR}/lang/asis
+BUILD_DEPENDS=	gprbuild>=20120510:devel/gprbuild \
+		asis>=2011:lang/asis
 
 USES=		ada gmake pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile
index c3a1394300bb..8ed13163c27c 100644
--- a/x11-toolkits/qwt5-designerplugin/Makefile
+++ b/x11-toolkits/qwt5-designerplugin/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	5-designerplugin
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Designer plugin for Qwt
 
-LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5
 
 USES=		gmake qmake tar:bzip2
 USE_QT4=	designer moc_build rcc_build
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
index 6daf833d1cbf..505c2322ae79 100644
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ b/x11-toolkits/qwt6-designerplugin/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	6-designerplugin
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Designer plugin for Qwt
 
-LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
+LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
 
 USES=		gmake qmake tar:bzip2
 USE_QT4=	designer moc_build rcc_build
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 5b80e50eef42..5ec1029d193e 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -15,7 +15,7 @@ COMMENT=	GTK+-2 bindings for rep Lisp interpreter
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librep.so:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	librep.so:lang/librep
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/rubygem-gdk3/Makefile b/x11-toolkits/rubygem-gdk3/Makefile
index 937b39722bb4..dacb8a1880e7 100644
--- a/x11-toolkits/rubygem-gdk3/Makefile
+++ b/x11-toolkits/rubygem-gdk3/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Ruby/GDK3 is a Ruby binding of GDK-3.x
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-cairo-gobject>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-cairo-gobject \
-		rubygem-gdk_pixbuf2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-gdk_pixbuf2 \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-pango>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-pango
+RUN_DEPENDS=	rubygem-cairo-gobject>=${PORTVERSION}:devel/rubygem-cairo-gobject \
+		rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2 \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango
 
 NO_ARCH=	yes
 USE_GNOME=	gtk30
diff --git a/x11-toolkits/rubygem-gtk2/Makefile b/x11-toolkits/rubygem-gtk2/Makefile
index 309ea009a881..3633db4b5a37 100644
--- a/x11-toolkits/rubygem-gtk2/Makefile
+++ b/x11-toolkits/rubygem-gtk2/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby binding for GTK+2
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:${PORTSDIR}/accessibility/rubygem-atk \
-		rubygem-gdk_pixbuf2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-gdk_pixbuf2 \
-		rubygem-pango>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-pango
+RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \
+		rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2 \
+		rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango
 
 USE_GNOME=	gtk20
 USE_RUBY=	yes
diff --git a/x11-toolkits/rubygem-gtk3/Makefile b/x11-toolkits/rubygem-gtk3/Makefile
index c3197f48fdd5..e24754603e56 100644
--- a/x11-toolkits/rubygem-gtk3/Makefile
+++ b/x11-toolkits/rubygem-gtk3/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Ruby binding for GTK+3
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:${PORTSDIR}/accessibility/rubygem-atk \
-		rubygem-gdk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gdk3 \
-		rubygem-gdk_pixbuf2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-gdk_pixbuf2 \
-		rubygem-gio2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gio2 \
-		rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2 \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-pango>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-pango
+RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \
+		rubygem-gdk3>=${PORTVERSION}:x11-toolkits/rubygem-gdk3 \
+		rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2 \
+		rubygem-gio2>=${PORTVERSION}:devel/rubygem-gio2 \
+		rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango
 
 USE_GNOME=	gtk30
 USE_RUBY=	yes
diff --git a/x11-toolkits/rubygem-gtksourceview2/Makefile b/x11-toolkits/rubygem-gtksourceview2/Makefile
index 771ed7cea4a6..6f7d1936d875 100644
--- a/x11-toolkits/rubygem-gtksourceview2/Makefile
+++ b/x11-toolkits/rubygem-gtksourceview2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for gtksourceview-2.x
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-gtk2>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk2
+RUN_DEPENDS=	rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2
 
 USE_GNOME=	gtksourceview2
 USE_RUBY=	yes
diff --git a/x11-toolkits/rubygem-gtksourceview3/Makefile b/x11-toolkits/rubygem-gtksourceview3/Makefile
index 52a51b23113e..ab75d83aab58 100644
--- a/x11-toolkits/rubygem-gtksourceview3/Makefile
+++ b/x11-toolkits/rubygem-gtksourceview3/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-3.x
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-gtk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk3
+RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
 
 NO_ARCH=	yes
 USE_GNOME=	gtksourceview3
diff --git a/x11-toolkits/rubygem-pango/Makefile b/x11-toolkits/rubygem-pango/Makefile
index c75a0e652cc0..0fe72cabeb1d 100644
--- a/x11-toolkits/rubygem-pango/Makefile
+++ b/x11-toolkits/rubygem-pango/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for Pango
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-cairo>=1.14.0:${PORTSDIR}/graphics/rubygem-cairo \
-		rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-cairo>=1.14.0:graphics/rubygem-cairo \
+		rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_GNOME=	pango
 USE_RUBY=	yes
diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile
index 4ed0a609c15e..20141d016150 100644
--- a/x11-toolkits/rubygem-poppler/Makefile
+++ b/x11-toolkits/rubygem-poppler/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Ruby binding for Poppler
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-RUN_DEPENDS=	rubygem-cairo>=1.14.0:${PORTSDIR}/graphics/rubygem-cairo \
-		rubygem-gdk_pixbuf2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-gdk_pixbuf2
+LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
+RUN_DEPENDS=	rubygem-cairo>=1.14.0:graphics/rubygem-cairo \
+		rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/x11-toolkits/rubygem-vte/Makefile b/x11-toolkits/rubygem-vte/Makefile
index 7e8310bbf190..bc1f13bfa203 100644
--- a/x11-toolkits/rubygem-vte/Makefile
+++ b/x11-toolkits/rubygem-vte/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for VTE
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-gtk2>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk2
+RUN_DEPENDS=	rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2
 
 USE_GNOME=	vte
 USE_RUBY=	yes
diff --git a/x11-toolkits/rubygem-vte3/Makefile b/x11-toolkits/rubygem-vte3/Makefile
index 6f5143545318..cd79f204c4b7 100644
--- a/x11-toolkits/rubygem-vte3/Makefile
+++ b/x11-toolkits/rubygem-vte3/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Ruby binding for VTE
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-gtk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk3
+RUN_DEPENDS=	rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
 
 NO_ARCH=	yes
 USE_GNOME=	vte3
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index 87f277b87282..c110019e33c7 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	SlingShot${PORTVERSION}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Supplemental Libraries to extend Xview
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/sspkg2.1
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 64aa7232a0a6..747b81dda076 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Qt4 toolkit library for Coin
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.GPL
 
-LIB_DEPENDS=	libCoin.so:${PORTSDIR}/graphics/Coin
+LIB_DEPENDS=	libCoin.so:graphics/Coin
 
 USES=		gmake libtool pathfix pkgconfig
 USE_QT4=	corelib opengl moc_build
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index daee31bf7e5b..38f07b140447 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -47,7 +47,7 @@ OPTIONS_DEFAULT=CAIRO GNOMEVFS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:graphics/cairo
 PLIST_FILES+=	lib/libswt-cairo-gtk-%%BUILD%%.so
 MAKE_CAIRO=	make_cairo
 .endif
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 67cde4f8c15f..03be78a04a97 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -49,7 +49,7 @@ BROWSER_DESC=	Gecko Browser Support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:graphics/cairo
 PLIST_FILES+=	lib/libswt-cairo-gtk-%%BUILD%%.so
 MAKE_CAIRO=	make_cairo
 .endif
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 22f7304b18dc..e923a5896f34 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Library for single instance applications
 
 PORTSCOUT=	ignore:1
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtk20 gnomeprefix introspection:build
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 933ded317f21..8e0ccb4ee9d3 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -17,7 +17,7 @@ PORTSCOUT=	ignore:1
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
+RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:x11-toolkits/gnome-pty-helper
 
 USES+=		cpe gettext gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/vte290/Makefile b/x11-toolkits/vte290/Makefile
index 272ddb21a685..71c2def1e578 100644
--- a/x11-toolkits/vte290/Makefile
+++ b/x11-toolkits/vte290/Makefile
@@ -21,7 +21,7 @@ PORTSCOUT=	ignore:1
 VTE3_SLAVE?=	no
 
 .if ${VTE3_SLAVE}!="yes"
-RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
+RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:x11-toolkits/gnome-pty-helper
 .endif
 
 USES+=		bison gettext gmake libtool pathfix pkgconfig
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index 1f654282c771..e746ceec75bb 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal widget with improved accessibility and I18N support
 
-BUILD_DEPENDS+= vapigen:${PORTSDIR}/lang/vala \
-		bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+BUILD_DEPENDS+= vapigen:lang/vala \
+		bash:shells/bash
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-toolkits/vtkfox/Makefile b/x11-toolkits/vtkfox/Makefile
index 74aa1de6b7c2..77bcf9d929e1 100644
--- a/x11-toolkits/vtkfox/Makefile
+++ b/x11-toolkits/vtkfox/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.gahr.ch/vtkfox/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FOX/VTK Widget and Interactor
 
-LIB_DEPENDS=	libvtkCommon.so.5:${PORTSDIR}/math/vtk5
+LIB_DEPENDS=	libvtkCommon.so.5:math/vtk5
 
 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_SINGLE=	FOX
@@ -24,12 +24,12 @@ GH_ACCOUNT=	gahr
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFOX16}
-LIB_DEPENDS+=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS+=	libFOX-1.6.so:x11-toolkits/fox16
 CMAKE_ARGS+=	-DFOX17:BOOL=FALSE
 .endif
 
 .if ${PORT_OPTIONS:MFOX17}
-LIB_DEPENDS+=	libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
+LIB_DEPENDS+=	libFOX-1.7.so:x11-toolkits/fox17
 CMAKE_ARGS+=	-DFOX17:BOOL=TRUE
 .endif
 
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index b0b8cd4ff96f..08af86e0cec4 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	wxGTK-${PORTVERSION}
 MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWidgets GUI toolkit with GTK+ bindings
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png\
-		libtiff.so:${PORTSDIR}/graphics/tiff\
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libpng.so:graphics/png\
+		libtiff.so:graphics/tiff\
+		libexpat.so:textproc/expat2
 
 USES=		compiler gmake iconv jpeg pkgconfig tar:bzip2
 USE_XORG=	x11 sm xxf86vm xinerama
@@ -57,13 +57,13 @@ PLIST_SUB+=     GSTREAMER="@comment "
 
 .if ${PORT_OPTIONS:MMSPACK}
 CONFIGURE_ARGS+=--with-libmspack
-LIB_DEPENDS+=	libmspack.so:${PORTSDIR}/archivers/libmspack
+LIB_DEPENDS+=	libmspack.so:archivers/libmspack
 .else
 CONFIGURE_ARGS+=--without-libmspack
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:x11-toolkits/wxgtk28-common
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
@@ -80,7 +80,7 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
 USE_WX=		2.8
-RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:x11-toolkits/wxgtk28-contrib-common
 WX_UNICODE=	yes
 
 pre-configure:
diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile
index 284d47fecb8d..922115bc8daf 100644
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	wxWidgets-${PORTVERSION}
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libexpat.so:textproc/expat2
 
 USES=		compiler:c++11-lib execinfo gmake iconv jpeg pkgconfig tar:bzip2
 USE_XORG=	x11 sm xxf86vm xinerama
@@ -50,10 +50,10 @@ GSTREAMER_CONFIGURE_ENABLE=	mediactrl
 GSTREAMER_USE=	GNOME=gconf2 GSTREAMER=yes
 
 MSPACK_CONFIGURE_WITH=	libmspack
-MSPACK_LIB_DEPENDS=	libmspack.so:${PORTSDIR}/archivers/libmspack
+MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
 
 WEBKIT_CONFIGURE_ENABLE=	webview
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 2f0ec94ccc15..0b8c4179bbbb 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Graphical user interface toolkit for X Window System
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 USES=		jpeg libtool
 USE_XORG=	xpm
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 6abc364fb57d..fe0f40693b6d 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Motif widget set for displaying HTML 3.2 documents
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake jpeg libtool:build motif pkgconfig tar:tgz
 USE_XORG=	xft xmu xpm xt
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index 11b1a5ab60b0..433eb538d956 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -18,7 +18,7 @@ CONFLICTS=	props-1.0
 
 MAKE_JOBS_UNSAFE=	yes
 PATCHDIR=	${PORTSDIR}/x11-toolkits/xview/files
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 USES=		imake
 USE_XORG=	x11 xext
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index b4b6d5721566..d7880d296cf0 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -15,8 +15,8 @@ COMMENT=	X Window-System-based Visual/Integrated Environment for Workstations
 
 MAKE_JOBS_UNSAFE=	yes
 
-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
 
 ONLY_FOR_ARCHS=	i386
 REINPLACE_ARGS=	-i ""
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
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index c2232965a32e..96efeb9a937f 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/desk3d/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D Virtual Desktop Switcher
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		localbase
 USE_XORG=	xmu
diff --git a/x11/arandr/Makefile b/x11/arandr/Makefile
index 532b7a5ce7bd..030f8fa9b0d0 100644
--- a/x11/arandr/Makefile
+++ b/x11/arandr/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Another XRandR GUI
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0.6:${PORTSDIR}/textproc/py-docutils
-RUN_DEPENDS=	xrandr>0:${PORTSDIR}/x11/xrandr \
-		${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils
+RUN_DEPENDS=	xrandr>0:x11/xrandr \
+		${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 0b9924fa76bf..42a6ff580630 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -41,8 +41,8 @@ TRANS_CONFIGURE_ENABLE=	transparency
 BSDEL_CONFIGURE_OFF=	--disable-backspace-key --disable-delete-key
 BSDEL_CONFIGURE_ON=	--enable-backspace-key --enable-delete-key
 MOUSE_CONFIGURE_ENABLE=	mousewheel
-BGIMG_LIB_DEPENDS=	libAfterImage.so:${PORTSDIR}/graphics/libafterimage \
-			libpng.so:${PORTSDIR}/graphics/png
+BGIMG_LIB_DEPENDS=	libAfterImage.so:graphics/libafterimage \
+			libpng.so:graphics/png
 BGIMG_USES=		jpeg
 BGIMG_CONFIGURE_ON=	--with-afterimage-config --with-png --with-jpeg
 BGIMG_CONFIGURE_OFF=	--without-afterimage-config --with-png=no --with-jpeg=no
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index b43f366b3d72..de4f89cba9e8 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Application launcher for Blackbox-like window manager
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index 3e7fe4ae5a12..0f5e1b16ba7b 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Program to handle your X background to prevent boredom
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv
+RUN_DEPENDS=	xv:graphics/xv
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	*.pl
diff --git a/x11/bgs/Makefile b/x11/bgs/Makefile
index c7f7012b5091..41b5119504e4 100644
--- a/x11/bgs/Makefile
+++ b/x11/bgs/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://s01.de/~gottox/files/bgs/ \
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Simple X11 BackGround Setter using Imlib2
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USE_XORG=	x11 xinerama
 
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index 5e8e72e5c286..64ebfcfbf55c 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for cinnamon
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
-		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
-RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
-		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		xkeyboard-config>=0:x11/xkeyboard-config \
+		libxkbfile>=0:x11/libxkbfile
+RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
+		libxkbfile>=0:x11/libxkbfile
 
 USE_XORG=	x11 xrandr xext
 USES=		autoreconf gettext gmake libtool pathfix pkgconfig \
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index 1862d1be0cca..d88f4545aa7f 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -9,11 +9,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for cinnamon
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
-		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
-RUN_DEPENDS=	xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
-		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		xkeyboard-config>=0:x11/xkeyboard-config \
+		libxkbfile>=0:x11/libxkbfile
+RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
+		libxkbfile>=0:x11/libxkbfile
 
 USES=		autoreconf gettext gmake libtool pathfix pkgconfig \
 		python:2 tar:xz
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 1cfa5d1a4600..56d059dd1b8e 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -9,14 +9,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen saver and locker
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper \
-		gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		gnome-keyring>=0:${PORTSDIR}/security/gnome-keyring
+BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
+		gnome-autogen.sh:devel/gnome-common
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	pam_helper:security/pam_helper \
+		gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
+		gnome-keyring>=0:security/gnome-keyring
 
 USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GITHUB=	yes
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index 8013a83decd7..7e11a130687c 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the cinnamon desktop
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libcanberra.so:${PORTSDIR}/audio/libcanberra
-RUN_DEPENDS=	console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
-		xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libjson-glib-1.0.so:devel/json-glib \
+		libupower-glib.so:sysutils/upower \
+		libcanberra.so:audio/libcanberra
+RUN_DEPENDS=	console-kit-daemon:sysutils/consolekit \
+		xdpyinfo:x11/xdpyinfo
 
 USES=		autoreconf:build execinfo gettext gmake libtool \
 		pathfix pkgconfig tar:xz
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index b1bf3ccb70de..44df553b474e 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -10,30 +10,30 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fork of GNOME Shell with layout similar to GNOME 2
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libcaribou.so:${PORTSDIR}/accessibility/caribou \
-		libmuffin.so:${PORTSDIR}/x11-wm/muffin \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
-		libcjs.so:${PORTSDIR}/lang/cjs \
-		libcinnamon-menu-3.so:${PORTSDIR}/x11/cinnamon-menus \
-		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice
-RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
-		cinnamon-control-center:${PORTSDIR}/sysutils/cinnamon-control-center \
-		cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations \
-		cinnamon-screensaver:${PORTSDIR}/x11/cinnamon-screensaver \
-		nemo:${PORTSDIR}/x11-fm/nemo \
-		py*-pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		gnome-autogen.sh:devel/gnome-common
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libcaribou.so:accessibility/caribou \
+		libmuffin.so:x11-wm/muffin \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libtelepathy-logger.so:net-im/telepathy-logger \
+		libfolks.so:net-im/folks \
+		libpulse.so:audio/pulseaudio \
+		libcroco-0.6.so:textproc/libcroco \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libclutter-glx-1.0.so:graphics/clutter \
+		libcjs.so:lang/cjs \
+		libcinnamon-menu-3.so:x11/cinnamon-menus \
+		libaccountsservice.so:sysutils/accountsservice
+RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
+		ca_root_nss>=0:security/ca_root_nss \
+		gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \
+		cinnamon-control-center:sysutils/cinnamon-control-center \
+		cinnamon-translations>=0:misc/cinnamon-translations \
+		cinnamon-screensaver:x11/cinnamon-screensaver \
+		nemo:x11-fm/nemo \
+		py*-pillow>=0:graphics/py-pillow \
+		py*-lxml>=0:devel/py-lxml
 
 WRKSRC=		${WRKDIR}/Cinnamon-${PORTVERSION}
 
@@ -59,7 +59,7 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.cinnamon.gschema.xml
 
 OPTIONS_DEFINE=	NLS
-NLS_RUN_DEPENDS=	cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations
+NLS_RUN_DEPENDS=	cinnamon-translations>=0:misc/cinnamon-translations
 
 post-patch:
 # we need this for intltoolize otherwise it can't copy the m4 file ...
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index 427da8dcc355..ac624e5f2f94 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple X11 mouse cursor editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20
+LIB_DEPENDS=	libgtkmm-2.0.so:x11-toolkits/gtkmm20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	danfe
diff --git a/x11/deforaos-desktop/Makefile b/x11/deforaos-desktop/Makefile
index ca6df740b09d..fad96643a0f9 100644
--- a/x11/deforaos-desktop/Makefile
+++ b/x11/deforaos-desktop/Makefile
@@ -10,18 +10,18 @@ PKGNAMEPREFIX=	deforaos-
 MAINTAINER=	olivier@FreeBSD.org
 COMMENT=	Deforaos distribution metaport
 
-RUN_DEPENDS=	${LOCALBASE}/bin/keyboard:${PORTSDIR}/x11/deforaos-keyboard \
-		${LOCALBASE}/bin/panel:${PORTSDIR}/x11/deforaos-panel \
-		${LOCALBASE}/bin/browser:${PORTSDIR}/x11-fm/deforaos-browser \
-		${LOCALBASE}/bin/locker:${PORTSDIR}/x11/deforaos-locker \
-		${LOCALBASE}/bin/pdfviewer:${PORTSDIR}/print/deforaos-pdfviewer \
-		${LOCALBASE}/bin/mailer:${PORTSDIR}/mail/deforaos-mailer \
-		${LOCALBASE}/bin/surfer:${PORTSDIR}/www/deforaos-surfer \
-		${LOCALBASE}/bin/todo:${PORTSDIR}/deskutils/deforaos-todo \
-		${LOCALBASE}/bin/player:${PORTSDIR}/multimedia/deforaos-player \
-		${LOCALBASE}/bin/mixer:${PORTSDIR}/audio/deforaos-mixer \
-		${LOCALBASE}/bin/editor:${PORTSDIR}/editors/deforaos-editor \
-		${LOCALBASE}/bin/phone:${PORTSDIR}/comms/deforaos-phone
+RUN_DEPENDS=	${LOCALBASE}/bin/keyboard:x11/deforaos-keyboard \
+		${LOCALBASE}/bin/panel:x11/deforaos-panel \
+		${LOCALBASE}/bin/browser:x11-fm/deforaos-browser \
+		${LOCALBASE}/bin/locker:x11/deforaos-locker \
+		${LOCALBASE}/bin/pdfviewer:print/deforaos-pdfviewer \
+		${LOCALBASE}/bin/mailer:mail/deforaos-mailer \
+		${LOCALBASE}/bin/surfer:www/deforaos-surfer \
+		${LOCALBASE}/bin/todo:deskutils/deforaos-todo \
+		${LOCALBASE}/bin/player:multimedia/deforaos-player \
+		${LOCALBASE}/bin/mixer:audio/deforaos-mixer \
+		${LOCALBASE}/bin/editor:editors/deforaos-editor \
+		${LOCALBASE}/bin/phone:comms/deforaos-phone
 
 USES=		metaport
 
diff --git a/x11/deforaos-keyboard/Makefile b/x11/deforaos-keyboard/Makefile
index c395adabde08..59a2b951d37b 100644
--- a/x11/deforaos-keyboard/Makefile
+++ b/x11/deforaos-keyboard/Makefile
@@ -14,7 +14,7 @@ COMMENT=	DeforaOS desktop virtual keyboardr
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils gettext pkgconfig
diff --git a/x11/deforaos-libdesktop/Makefile b/x11/deforaos-libdesktop/Makefile
index 346d15c4e5d5..a70591fd232c 100644
--- a/x11/deforaos-libdesktop/Makefile
+++ b/x11/deforaos-libdesktop/Makefile
@@ -15,7 +15,7 @@ COMMENT=	DeforaOS desktop library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem
 
 USE_GNOME=	gtk20
 USES=		pkgconfig
@@ -26,9 +26,9 @@ MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE= DOCS
 
-DOCS_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
-	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
+DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+	gtkdoc-check:textproc/gtk-doc
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/lib/|/libdata/|g' \
diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index c10ce91d6859..a2120183b871 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -14,12 +14,12 @@ COMMENT=	DeforaOS desktop screensaver
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
-		libXss.so:${PORTSDIR}/x11/libXScrnSaver
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:${PORTSDIR}/x11/deforaos-panel \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop \
+		libXss.so:x11/libXScrnSaver
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils gettext pkgconfig
diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index f65996bd3f08..882084d654c6 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -15,16 +15,16 @@ LICENSE=	GPLv3
 
 BROKEN=		fails to build
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
-BUILD_DEPENDS=	browser:${PORTSDIR}/x11-fm/deforaos-browser \
-		${LOCALBASE}/include/Desktop/Keyboard.h:${PORTSDIR}/x11/deforaos-keyboard \
-		${LOCALBASE}/include/Desktop/Player.h:${PORTSDIR}/multimedia/deforaos-player \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-RUN_DEPENDS=	keyboard:${PORTSDIR}/x11/deforaos-keyboard \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
-		sudo:${PORTSDIR}/security/sudo
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop
+BUILD_DEPENDS=	browser:x11-fm/deforaos-browser \
+		${LOCALBASE}/include/Desktop/Keyboard.h:x11/deforaos-keyboard \
+		${LOCALBASE}/include/Desktop/Player.h:multimedia/deforaos-player \
+		xsltproc:textproc/libxslt \
+		docbook-xsl>=0:textproc/docbook-xsl
+RUN_DEPENDS=	keyboard:x11/deforaos-keyboard \
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \
+		sudo:security/sudo
 
 USE_GNOME=	gtk20
 USES=		gettext pkgconfig
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 632544bb53e3..475568fcf3d9 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	GNU/../old-gnu/dgs
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display ghostscript system
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/x11/dmenu/Makefile b/x11/dmenu/Makefile
index 995c02457cdd..c2599e54e670 100644
--- a/x11/dmenu/Makefile
+++ b/x11/dmenu/Makefile
@@ -17,7 +17,7 @@ COMMENT=	X11 menu application designed for the dwm 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
 OPTIONS_DEFAULT=	XINERAMA
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index d34d66dbf105..cedcbe403837 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.vigor.nu/dxpc/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compressing X protocol proxy designed to support X11 over slow links
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index 772fe1cdbd90..5fa21eb5c7a8 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Futuristic zoomable user environment
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff \
+		libfreetype.so:print/freetype2
 
 USES=		compiler:features jpeg perl5 pkgconfig shebangfix tar:bzip2
 USE_PERL5=	build
@@ -40,9 +40,9 @@ OPTIONS_SUB=	yes
 RSVG_DESC=	SVG support through librsvg
 PDF_DESC=	PDF support through poppler-glib
 
-XINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 RSVG_USE=		GNOME=librsvg2
-PDF_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 PDF_USE=		GNOME=gtk20
 
 .include <bsd.port.pre.mk>
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
index fd6db4c58afd..213317730719 100644
--- a/x11/emprint/Makefile
+++ b/x11/emprint/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/gblach/e17/extra/
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Utility for taking screenshots for E17
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS=	libefl.so:devel/efl
 
 DIST_SUBDIR=	e17
 GNU_CONFIGURE=	yes
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index 3a2e7d89aff0..85d4345b45b8 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	LOCAL/kbyanc
 MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Simple epplet for launching arbitrary programs
 
-LIB_DEPENDS=	libepplet.so:${PORTSDIR}/x11-wm/epplets \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libepplet.so:x11-wm/epplets \
+		libImlib2.so:graphics/imlib2
 
 PLIST_FILES=	bin/E-Run.epplet
 
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 5c90dd983ed1..bd6d652ce5ba 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	Eterm-${PORTVERSION}
 MAINTAINER?=	enlightenment@FreeBSD.org
 COMMENT?=	X11 terminal emulator based on rxvt/xterm
 
-BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
-LIB_DEPENDS=	libast.so:${PORTSDIR}/devel/libast \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+BUILD_DEPENDS=	man2html:textproc/man2html
+LIB_DEPENDS=	libast.so:devel/libast \
+		libImlib2.so:graphics/imlib2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--enable-trans --enable-utmp \
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index e0a3b7fa4285..41f0c21a8642 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Fluxbox utility to create and manage icons on the desktop
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libImlib2.so:graphics/imlib2
 
 USE_XORG=	xext xft xpm xrender
 USES=		pkgconfig
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index 625963dd1ac3..93326232ce17 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://somewhere.fscked.org/proj/fireflies/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extension of xscreensaver
 
-LIB_DEPENDS=	libgfx.so:${PORTSDIR}/graphics/libgfx
+LIB_DEPENDS=	libgfx.so:graphics/libgfx
 
 GNU_CONFIGURE=	yes
 USE_GL=		yes
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index 7cb6910b8d36..250b169c4bb8 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extensible scalable virtual keyboard
 LICENSE=	GPLv2 GFDL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		gmake iconv libtool pathfix pkgconfig tar:bzip2
 USE_XORG=	xtst xext
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index 68270693f2e5..89b784f13a78 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Background changer for fluxbox/blackbox
 
-LIB_DEPENDS=	libgtkmm-2.0.so:${PORTSDIR}/x11-toolkits/gtkmm20
-RUN_DEPENDS=	fbsetbg:${PORTSDIR}/x11-wm/fluxbox
+LIB_DEPENDS=	libgtkmm-2.0.so:x11-toolkits/gtkmm20
+RUN_DEPENDS=	fbsetbg:x11-wm/fluxbox
 
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 7b76ce763ef6..3eb1fed50f3a 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Anti-aliased font support for gtk+
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 
 USE_GNOME=	gtk12
 USES=		iconv pkgconfig libtool
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2e254646f63f..345cf462ec1f 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -11,30 +11,30 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 version of xdm display manager
 
-BUILD_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		itstool:${PORTSDIR}/textproc/itstool \
-		iso-codes>=0:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libck-connector.so:${PORTSDIR}/sysutils/consolekit \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
-RUN_DEPENDS=	zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		gnome-shell>=3.15.92:${PORTSDIR}/x11/gnome-shell \
-		gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
-		gnome-keyring-3:${PORTSDIR}/security/gnome-keyring \
-		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
-		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
-		polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \
-		at-spi2-core>=0:${PORTSDIR}/accessibility/at-spi2-core \
-		iso-codes>=0:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		itstool:textproc/itstool \
+		iso-codes>=0:misc/iso-codes
+LIB_DEPENDS=	libck-connector.so:sysutils/consolekit \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libupower-glib.so:sysutils/upower \
+		libnss3.so:security/nss \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libaccountsservice.so:sysutils/accountsservice \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
+RUN_DEPENDS=	zenity>=3.0.0:x11/zenity \
+		gnome-shell>=3.15.92:x11/gnome-shell \
+		gnome-settings-daemon>=3.0.0:sysutils/gnome-settings-daemon \
+		gnome-keyring-3:security/gnome-keyring \
+		gnome-session>=3.0.0:x11/gnome-session \
+		gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
+		polkit-gnome>=0.105:sysutils/polkit-gnome \
+		at-spi2-core>=0:accessibility/at-spi2-core \
+		iso-codes>=0:misc/iso-codes
 # used in scripts
-RUN_DEPENDS+=	xrdb:${PORTSDIR}/x11/xrdb \
-		setxkbmap:${PORTSDIR}/x11/setxkbmap \
-		xmodmap:${PORTSDIR}/x11/xmodmap \
-		xterm:${PORTSDIR}/x11/xterm
+RUN_DEPENDS+=	xrdb:x11/xrdb \
+		setxkbmap:x11/setxkbmap \
+		xmodmap:x11/xmodmap \
+		xterm:x11/xterm
 
 USERS=		gdm
 GROUPS=		gdm
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index da160e8ec9f8..848039f7140c 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Customizable program to run programs, with tab-completion
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 658c28ba8c91..847852175a94 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -16,15 +16,15 @@ USES=		tar:xz
 .if !defined(REFERENCE_PORT)
 PORTSCOUT=	limitw:1,even
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
-		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile \
-		itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \
-		libxkbfile>=0:${PORTSDIR}/x11/libxkbfile
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		xkeyboard-config>=0:x11/xkeyboard-config \
+		libxkbfile>=0:x11/libxkbfile \
+		itstool:textproc/itstool
+RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		xkeyboard-config>=0:x11/xkeyboard-config \
+		libxkbfile>=0:x11/libxkbfile
 
 USES+=		bison gettext gmake gnome libtool pathfix pkgconfig python:3
 USE_GNOME=	gtk30 intlhack introspection:build referencehack
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 51db7e404702..52b8cffc9d96 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Circular application launcher
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-RUN_DEPENDS=	gnome-settings-daemon>=2.32.1_4:${PORTSDIR}/sysutils/gnome-settings-daemon
-LIB_DEPENDS=	libbamf3.so:${PORTSDIR}/sysutils/bamf \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+BUILD_DEPENDS=	valac:lang/vala
+RUN_DEPENDS=	gnome-settings-daemon>=2.32.1_4:sysutils/gnome-settings-daemon
+LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
+		libgee-0.8.so:devel/libgee \
+		libunique-1.0.so:x11-toolkits/unique
 
 DOCS_CMAKE_ON=	-DINSTALL_DOCS:BOOL=ON
 
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ca9d01ad53ce..5dc392b76ecb 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 3 desktop
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower
-RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
-		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libjson-glib-1.0.so:devel/json-glib \
+		libupower-glib.so:sysutils/upower
+RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit \
+		${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/gnome-shell-extensions/Makefile b/x11/gnome-shell-extensions/Makefile
index 8779d4879fc4..2b8e60f6c7bb 100644
--- a/x11/gnome-shell-extensions/Makefile
+++ b/x11/gnome-shell-extensions/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME desktop shell extensions
 
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
-RUN_DEPENDS=	gnome-shell>=3.12.0:${PORTSDIR}/x11/gnome-shell
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
+RUN_DEPENDS=	gnome-shell>=3.12.0:x11/gnome-shell
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index bf90492ab516..8ff3379a2991 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -11,26 +11,26 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libcaribou.so:${PORTSDIR}/accessibility/caribou \
-		libmutter.so:${PORTSDIR}/x11-wm/mutter \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libgjs.so:${PORTSDIR}/lang/gjs
-RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
-		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gkbd-keyboard-display:${PORTSDIR}/x11/libgnomekbd
+BUILD_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
+		gnome-control-center:sysutils/gnome-control-center
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libcaribou.so:accessibility/caribou \
+		libmutter.so:x11-wm/mutter \
+		libsecret-1.so:security/libsecret \
+		libgcr-3.so:security/gcr \
+		libtelepathy-glib.so:net-im/telepathy-glib \
+		libtelepathy-logger.so:net-im/telepathy-logger \
+		libfolks.so:net-im/folks \
+		libibus-1.0.so:textproc/ibus \
+		libpulse.so:audio/pulseaudio \
+		libcroco-0.6.so:textproc/libcroco \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libclutter-1.0.so:graphics/clutter \
+		libgjs.so:lang/gjs
+RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
+		gnome-control-center:sysutils/gnome-control-center \
+		ca_root_nss>=0:security/ca_root_nss \
+		gkbd-keyboard-display:x11/libgnomekbd
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 3ee5fc2a0862..78001eeb2410 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -11,13 +11,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the GNOME 3 Desktop
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		itstool:${PORTSDIR}/textproc/itstool \
-		appstream-builder:${PORTSDIR}/devel/appstream-glib \
-		vala:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
+		itstool:textproc/itstool \
+		appstream-builder:devel/appstream-glib \
+		vala:lang/vala
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libuuid.so:misc/e2fsprogs-libuuid
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
@@ -37,8 +37,8 @@ OPTIONS_DEFINE=		MIGRATION SEARCHPROVIDER
 OPTIONS_DEFAULT=	SEARCHPROVIDER
 SEARCHPROVIDER_DESC=	Gnome-shell search provider
 SEARCHPROVIDER_CONFIGURE_ENABLE=	search-provider
-SEARCHPROVIDER_BUILD_DEPENDS=	gnome-shell:${PORTSDIR}/x11/gnome-shell
-SEARCHPROVIDER_RUN_DEPENDS=	gnome-shell:${PORTSDIR}/x11/gnome-shell
+SEARCHPROVIDER_BUILD_DEPENDS=	gnome-shell:x11/gnome-shell
+SEARCHPROVIDER_RUN_DEPENDS=	gnome-shell:x11/gnome-shell
 MIGRATION_CONFIGURE_ENABLE=	migration
 MIGRATION_USE=		GNOME=gconf2
 MIGRATION_DESC=		Profile migration to gsettings (pulls in gconf2)
diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile
index 150713c7749f..7c876beefb3f 100644
--- a/x11/gnome3/Makefile
+++ b/x11/gnome3/Makefile
@@ -8,30 +8,30 @@ CATEGORIES?=	x11 gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	"meta-port" for the GNOME 3 integrated X11 desktop
 
-RUN_DEPENDS?=	dconf-editor:${PORTSDIR}/devel/dconf-editor \
-		gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
-		gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
-		gnome-icon-theme-extras>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme-extras \
-		gnome-icon-theme-symbolic>=3.0.0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
-		gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring \
-		gnome-power-manager>=3.0.0:${PORTSDIR}/sysutils/gnome-power-manager \
-		orca>=3.0.0:${PORTSDIR}/accessibility/orca \
-		gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
-		gnome-shell>=3.0.0:${PORTSDIR}/x11/gnome-shell \
-		gnome-shell-extensions>=3.0.0:${PORTSDIR}/x11/gnome-shell-extensions \
-		gnome-tweak-tool:${PORTSDIR}/deskutils/gnome-tweak-tool \
-		sushi>=0:${PORTSDIR}/x11-fm/sushi \
-		nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus \
-		${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
-		yelp>=3.0.0:${PORTSDIR}/x11/yelp \
-		zenity>=3.0.0:${PORTSDIR}/x11/zenity \
-		seahorse>=3.0.0:${PORTSDIR}/security/seahorse \
-		gnome-control-center>=3.0.0:${PORTSDIR}/sysutils/gnome-control-center \
-		${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
-		caribou>=0:${PORTSDIR}/accessibility/caribou \
-		${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme \
-		ekiga:${PORTSDIR}/net-im/ekiga
+RUN_DEPENDS?=	dconf-editor:devel/dconf-editor \
+		gnome-session>=3.0.0:x11/gnome-session \
+		gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \
+		gnome-icon-theme-extras>=3.0.0:misc/gnome-icon-theme-extras \
+		gnome-icon-theme-symbolic>=3.0.0:x11-themes/gnome-icon-theme-symbolic \
+		gnome-keyring>=3.0.0:security/gnome-keyring \
+		gnome-power-manager>=3.0.0:sysutils/gnome-power-manager \
+		orca>=3.0.0:accessibility/orca \
+		gnome-mount:sysutils/gnome-mount \
+		gnome-shell>=3.0.0:x11/gnome-shell \
+		gnome-shell-extensions>=3.0.0:x11/gnome-shell-extensions \
+		gnome-tweak-tool:deskutils/gnome-tweak-tool \
+		sushi>=0:x11-fm/sushi \
+		nautilus>=3.0.0:x11-fm/nautilus \
+		${LOCALBASE}/share/fonts/bitstream-vera/Vera.ttf:x11-fonts/bitstream-vera \
+		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:sysutils/hal-info \
+		yelp>=3.0.0:x11/yelp \
+		zenity>=3.0.0:x11/zenity \
+		seahorse>=3.0.0:security/seahorse \
+		gnome-control-center>=3.0.0:sysutils/gnome-control-center \
+		${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:x11-themes/gnome-backgrounds \
+		caribou>=0:accessibility/caribou \
+		${LOCALBASE}/share/sounds/freedesktop/index.theme:audio/freedesktop-sound-theme \
+		ekiga:net-im/ekiga
 
 CONFLICTS?=	gnome3-lite-[0-9]*
 
@@ -41,39 +41,39 @@ USES=		metaport
 OPTIONS_DEFINE+=MAPI DOCS
 MAPI_DESC=	Depend on evolution-mapi (pulls in samba4)
 
-DOCS_RUN_DEPENDS=	gnome-user-docs>=0:${PORTSDIR}/misc/gnome-user-docs
-MAPI_RUN_DEPENDS=	evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi
+DOCS_RUN_DEPENDS=	gnome-user-docs>=0:misc/gnome-user-docs
+MAPI_RUN_DEPENDS=	evolution-mapi>=3.0.0:mail/evolution-mapi
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${.CURDIR:T}!="gnome3-lite"
-RUN_DEPENDS+=	empathy>=3.0.0:${PORTSDIR}/net-im/empathy \
-		epiphany>=3.0.0:${PORTSDIR}/www/epiphany \
-		gucharmap>=3.0.0:${PORTSDIR}/deskutils/gucharmap \
-		gnome-characters>=3.0.0:${PORTSDIR}/deskutils/gnome-characters \
-		gnome-calendar>=3.0:${PORTSDIR}/deskutils/gnome-calendar \
-		eog>=3.0.0:${PORTSDIR}/graphics/eog \
-		eog-plugins>=3.0.0:${PORTSDIR}/graphics/eog-plugins \
-		gedit>=3.0.0:${PORTSDIR}/editors/gedit \
-		gedit-plugins>=3.0.0:${PORTSDIR}/editors/gedit-plugins \
-		gnome-terminal>=3.0.0:${PORTSDIR}/x11/gnome-terminal \
-		mousetweaks>=3.0.0:${PORTSDIR}/accessibility/mousetweaks \
-		brasero>=3.0.0:${PORTSDIR}/sysutils/brasero \
-		accerciser>=3.0.0:${PORTSDIR}/accessibility/accerciser \
-		gnome-calculator>=3.0.0:${PORTSDIR}/math/gnome-calculator \
-		gnome-utils>=3.6.0:${PORTSDIR}/deskutils/gnome-utils \
-		file-roller>=3.0.0:${PORTSDIR}/archivers/file-roller \
-		evince>=3.0.0:${PORTSDIR}/graphics/evince \
-		vino>=3.0.0:${PORTSDIR}/net/vino \
-		vinagre>=3.0.0:${PORTSDIR}/net/vinagre \
-		gnome-games>=3.0.0:${PORTSDIR}/games/gnome-games \
-		totem>=3.0.0:${PORTSDIR}/multimedia/totem \
-		gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor \
-		gdm>=3.0.0:${PORTSDIR}/x11/gdm \
-		gnome-color-manager>=0:${PORTSDIR}/graphics/gnome-color-manager \
-		evolution>=3.0.0:${PORTSDIR}/mail/evolution \
-		cheese>=3.0.0:${PORTSDIR}/multimedia/cheese
+RUN_DEPENDS+=	empathy>=3.0.0:net-im/empathy \
+		epiphany>=3.0.0:www/epiphany \
+		gucharmap>=3.0.0:deskutils/gucharmap \
+		gnome-characters>=3.0.0:deskutils/gnome-characters \
+		gnome-calendar>=3.0:deskutils/gnome-calendar \
+		eog>=3.0.0:graphics/eog \
+		eog-plugins>=3.0.0:graphics/eog-plugins \
+		gedit>=3.0.0:editors/gedit \
+		gedit-plugins>=3.0.0:editors/gedit-plugins \
+		gnome-terminal>=3.0.0:x11/gnome-terminal \
+		mousetweaks>=3.0.0:accessibility/mousetweaks \
+		brasero>=3.0.0:sysutils/brasero \
+		accerciser>=3.0.0:accessibility/accerciser \
+		gnome-calculator>=3.0.0:math/gnome-calculator \
+		gnome-utils>=3.6.0:deskutils/gnome-utils \
+		file-roller>=3.0.0:archivers/file-roller \
+		evince>=3.0.0:graphics/evince \
+		vino>=3.0.0:net/vino \
+		vinagre>=3.0.0:net/vinagre \
+		gnome-games>=3.0.0:games/gnome-games \
+		totem>=3.0.0:multimedia/totem \
+		gconf-editor>=3.0.0:sysutils/gconf-editor \
+		gdm>=3.0.0:x11/gdm \
+		gnome-color-manager>=0:graphics/gnome-color-manager \
+		evolution>=3.0.0:mail/evolution \
+		cheese>=3.0.0:multimedia/cheese
 
 .endif # !gnome3-lite section
 
diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index c5d71e22e627..d2abbc5e4d1e 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -12,78 +12,78 @@ COMMENT=	Metaport for GNUstep applications
 USES=		metaport gnustep
 USE_GNUSTEP=	back base gui
 
-RUN_DEPENDS=	aclock>0:${PORTSDIR}/x11-clocks/aclock \
-		addresses>0:${PORTSDIR}/mail/addresses \
-		addresses-goodies>0:${PORTSDIR}/mail/addresses-goodies \
-		affiche>0:${PORTSDIR}/deskutils/affiche \
-		appwrapper>0:${PORTSDIR}/deskutils/appwrapper \
-		batmon>0:${PORTSDIR}/sysutils/batmon \
-		biococoa>0:${PORTSDIR}/biology/biococoa \
-		camera>0:${PORTSDIR}/graphics/camera \
-		camerakit>0:${PORTSDIR}/graphics/camerakit \
-		cartotheque>0:${PORTSDIR}/deskutils/cartotheque \
-		cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle \
-		gnustep-cdplayer>0:${PORTSDIR}/audio/gnustep-cdplayer \
-		cenon>0:${PORTSDIR}/graphics/cenon \
-		displaycalibrator>0:${PORTSDIR}/deskutils/displaycalibrator \
-		duncan>0:${PORTSDIR}/textproc/duncan \
-		easydiff>0:${PORTSDIR}/textproc/easydiff \
-		edenmath>0:${PORTSDIR}/math/edenmath \
-		expense>0:${PORTSDIR}/finance/expense \
-		fortunate>0:${PORTSDIR}/games/fortunate \
-		fortytwo-bdb>0:${PORTSDIR}/databases/fortytwo-bdb \
-		fortytwo-encore>0:${PORTSDIR}/devel/fortytwo-encore \
-		fortytwo>0:${PORTSDIR}/graphics/fortytwo \
-		freetar>0:${PORTSDIR}/archivers/freetar \
-		gmastermind>0:${PORTSDIR}/games/gmastermind \
-		gmines>0:${PORTSDIR}/games/gmines \
-		gnumail>0:${PORTSDIR}/mail/gnumail \
-		gnustep-ftp>0:${PORTSDIR}/ftp/gnustep-ftp \
-		gnustep-ladder>0:${PORTSDIR}/games/gnustep-ladder \
-		gnustep-slideshowkit>0:${PORTSDIR}/graphics/gnustep-slideshowkit \
-		gnustep-slideshow>0:${PORTSDIR}/graphics/gnustep-slideshow \
-		gnustep-sudoku>0:${PORTSDIR}/games/gnustep-sudoku \
-		gnustep-wrapper>0:${PORTSDIR}/deskutils/gnustep-wrapper \
-		gorm>0:${PORTSDIR}/devel/gorm \
-		grubik>0:${PORTSDIR}/games/grubik \
-		gscheme>0:${PORTSDIR}/lang/gscheme \
-		gshisen>0:${PORTSDIR}/games/gshisen \
-		gskrab>0:${PORTSDIR}/x11/gskrab \
-		gspdf>0:${PORTSDIR}/print/gspdf \
-		gtamsanalyzer>0:${PORTSDIR}/science/gtamsanalyzer \
-		gworkspace-gwmetadata>0:${PORTSDIR}/deskutils/gworkspace-gwmetadata \
-		gworkspace>0:${PORTSDIR}/deskutils/gworkspace \
-		helpviewer>0:${PORTSDIR}/deskutils/helpviewer \
-		highlighterkit>0:${PORTSDIR}/devel/highlighterkit \
-		imageviewer>0:${PORTSDIR}/graphics/imageviewer \
-		innerspace>0:${PORTSDIR}/x11/innerspace \
-		jigsaw>0:${PORTSDIR}/games/jigsaw \
-		ja-jishyo>0:${PORTSDIR}/japanese/jishyo \
-		lapispuzzle>0:${PORTSDIR}/games/lapispuzzle \
-		laternamagica>0:${PORTSDIR}/graphics/laternamagica \
-		latex-service>0:${PORTSDIR}/textproc/latex-service \
-		localize>0:${PORTSDIR}/textproc/localize \
-		lusernet>0:${PORTSDIR}/news/lusernet \
-		mpdcon>0:${PORTSDIR}/audio/mpdcon \
-		nextgo>0:${PORTSDIR}/games/nextgo \
-		gnustep-notebook>0:${PORTSDIR}/deskutils/gnustep-notebook \
-		paje>0:${PORTSDIR}/science/paje \
-		pantomime>0:${PORTSDIR}/mail/pantomime \
-		pixen>0:${PORTSDIR}/graphics/pixen \
-		plopfolio>0:${PORTSDIR}/deskutils/plopfolio \
-		poe>0:${PORTSDIR}/multimedia/poe \
-		popup>0:${PORTSDIR}/textproc/popup \
-		gnustep-preview>0:${PORTSDIR}/graphics/preview \
-		price>0:${PORTSDIR}/graphics/price \
-		remotedesk>0:${PORTSDIR}/net/remotedesk \
-		simpleagenda>0:${PORTSDIR}/deskutils/simpleagenda \
-		systempreferences>0:${PORTSDIR}/deskutils/systempreferences \
-		terminal.app>0:${PORTSDIR}/x11/terminal.app \
-		timemon>0:${PORTSDIR}/sysutils/timemon \
-		toolboxkit>0:${PORTSDIR}/deskutils/toolboxkit \
-		waiho>0:${PORTSDIR}/ftp/waiho \
-		wizardkit>0:${PORTSDIR}/devel/wizardkit \
-		zillion>0:${PORTSDIR}/net/zillion \
-		zipper>0:${PORTSDIR}/archivers/zipper
+RUN_DEPENDS=	aclock>0:x11-clocks/aclock \
+		addresses>0:mail/addresses \
+		addresses-goodies>0:mail/addresses-goodies \
+		affiche>0:deskutils/affiche \
+		appwrapper>0:deskutils/appwrapper \
+		batmon>0:sysutils/batmon \
+		biococoa>0:biology/biococoa \
+		camera>0:graphics/camera \
+		camerakit>0:graphics/camerakit \
+		cartotheque>0:deskutils/cartotheque \
+		cddb-bundle>0:audio/cddb-bundle \
+		gnustep-cdplayer>0:audio/gnustep-cdplayer \
+		cenon>0:graphics/cenon \
+		displaycalibrator>0:deskutils/displaycalibrator \
+		duncan>0:textproc/duncan \
+		easydiff>0:textproc/easydiff \
+		edenmath>0:math/edenmath \
+		expense>0:finance/expense \
+		fortunate>0:games/fortunate \
+		fortytwo-bdb>0:databases/fortytwo-bdb \
+		fortytwo-encore>0:devel/fortytwo-encore \
+		fortytwo>0:graphics/fortytwo \
+		freetar>0:archivers/freetar \
+		gmastermind>0:games/gmastermind \
+		gmines>0:games/gmines \
+		gnumail>0:mail/gnumail \
+		gnustep-ftp>0:ftp/gnustep-ftp \
+		gnustep-ladder>0:games/gnustep-ladder \
+		gnustep-slideshowkit>0:graphics/gnustep-slideshowkit \
+		gnustep-slideshow>0:graphics/gnustep-slideshow \
+		gnustep-sudoku>0:games/gnustep-sudoku \
+		gnustep-wrapper>0:deskutils/gnustep-wrapper \
+		gorm>0:devel/gorm \
+		grubik>0:games/grubik \
+		gscheme>0:lang/gscheme \
+		gshisen>0:games/gshisen \
+		gskrab>0:x11/gskrab \
+		gspdf>0:print/gspdf \
+		gtamsanalyzer>0:science/gtamsanalyzer \
+		gworkspace-gwmetadata>0:deskutils/gworkspace-gwmetadata \
+		gworkspace>0:deskutils/gworkspace \
+		helpviewer>0:deskutils/helpviewer \
+		highlighterkit>0:devel/highlighterkit \
+		imageviewer>0:graphics/imageviewer \
+		innerspace>0:x11/innerspace \
+		jigsaw>0:games/jigsaw \
+		ja-jishyo>0:japanese/jishyo \
+		lapispuzzle>0:games/lapispuzzle \
+		laternamagica>0:graphics/laternamagica \
+		latex-service>0:textproc/latex-service \
+		localize>0:textproc/localize \
+		lusernet>0:news/lusernet \
+		mpdcon>0:audio/mpdcon \
+		nextgo>0:games/nextgo \
+		gnustep-notebook>0:deskutils/gnustep-notebook \
+		paje>0:science/paje \
+		pantomime>0:mail/pantomime \
+		pixen>0:graphics/pixen \
+		plopfolio>0:deskutils/plopfolio \
+		poe>0:multimedia/poe \
+		popup>0:textproc/popup \
+		gnustep-preview>0:graphics/preview \
+		price>0:graphics/price \
+		remotedesk>0:net/remotedesk \
+		simpleagenda>0:deskutils/simpleagenda \
+		systempreferences>0:deskutils/systempreferences \
+		terminal.app>0:x11/terminal.app \
+		timemon>0:sysutils/timemon \
+		toolboxkit>0:deskutils/toolboxkit \
+		waiho>0:ftp/waiho \
+		wizardkit>0:devel/wizardkit \
+		zillion>0:net/zillion \
+		zipper>0:archivers/zipper
 
 .include <bsd.port.mk>
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index a1fda7989812..a60525833872 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	gpct${PORTVERSION:S/.//g}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Evaluation tool for the Generic Polygon Clipper library
 
-LIB_DEPENDS=	libgpc.so:${PORTSDIR}/devel/libgpc	\
-		libformsGL.so:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libgpc.so:devel/libgpc	\
+		libformsGL.so:x11-toolkits/xforms
 
 USES=		zip:infozip uidfix
 USE_GL=		yes
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index f3845b2f730d..0506d6821060 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GNOME Synaptics Touchpad setting tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	xf86-input-synaptics>0:${PORTSDIR}/x11-drivers/xf86-input-synaptics
+RUN_DEPENDS=	xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
 
 USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gconf2 libglade2 gnomedocutils intltool
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index 1588bf56230f..6558c23d8bb5 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -10,16 +10,16 @@ COMMENT=	Dropdown terminal made for the GNOME desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gnome-common>=3.14.0:${PORTSDIR}/devel/gnome-common \
-		py${PYTHON_SUFFIX}-dbus>=0.84.0:${PORTSDIR}/devel/py-dbus \
-		py${PYTHON_SUFFIX}-notify>=0.1.1_9:${PORTSDIR}/devel/py-notify \
-		py${PYTHON_SUFFIX}-vte>=0.26.2_1:${PORTSDIR}/x11-toolkits/py-vte \
-		py${PYTHON_SUFFIX}-xdg>=0.19:${PORTSDIR}/devel/py-xdg
-RUN_DEPENDS=	keybinder>=0.3.0:${PORTSDIR}/x11/keybinder \
-		py${PYTHON_SUFFIX}-dbus>=0.84.0:${PORTSDIR}/devel/py-dbus \
-		py${PYTHON_SUFFIX}-notify>=0.1.1_9:${PORTSDIR}/devel/py-notify \
-		py${PYTHON_SUFFIX}-vte>=0.26.2_1:${PORTSDIR}/x11-toolkits/py-vte \
-		py${PYTHON_SUFFIX}-xdg>=0.19:${PORTSDIR}/devel/py-xdg
+BUILD_DEPENDS=	gnome-common>=3.14.0:devel/gnome-common \
+		py${PYTHON_SUFFIX}-dbus>=0.84.0:devel/py-dbus \
+		py${PYTHON_SUFFIX}-notify>=0.1.1_9:devel/py-notify \
+		py${PYTHON_SUFFIX}-vte>=0.26.2_1:x11-toolkits/py-vte \
+		py${PYTHON_SUFFIX}-xdg>=0.19:devel/py-xdg
+RUN_DEPENDS=	keybinder>=0.3.0:x11/keybinder \
+		py${PYTHON_SUFFIX}-dbus>=0.84.0:devel/py-dbus \
+		py${PYTHON_SUFFIX}-notify>=0.1.1_9:devel/py-notify \
+		py${PYTHON_SUFFIX}-vte>=0.26.2_1:x11-toolkits/py-vte \
+		py${PYTHON_SUFFIX}-xdg>=0.19:devel/py-xdg
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
@@ -59,11 +59,11 @@ pre-configure:
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/libexec/notification-daemon)
-RUN_DEPENDS+=	notification-daemon>=0.7.2_1:${PORTSDIR}/deskutils/notification-daemon
+RUN_DEPENDS+=	notification-daemon>=0.7.2_1:deskutils/notification-daemon
 .elif exists (${LOCALBASE}/bin/xfce4-notifyd-config)
-RUN_DEPENDS+=	xfce4-notifyd>=0.2.4:${PORTSDIR}/deskutils/xfce4-notifyd
+RUN_DEPENDS+=	xfce4-notifyd>=0.2.4:deskutils/xfce4-notifyd
 .else
-RUN_DEPENDS+=	notify-osd>=0.9.29_4:${PORTSDIR}/deskutils/notify-osd
+RUN_DEPENDS+=	notify-osd>=0.9.29_4:deskutils/notify-osd
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/hotwire-shell/Makefile b/x11/hotwire-shell/Makefile
index 32482037b579..c891aa3260d2 100644
--- a/x11/hotwire-shell/Makefile
+++ b/x11/hotwire-shell/Makefile
@@ -12,11 +12,11 @@ DISTNAME=	hotwire-${DISTVERSION}
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Object-oriented hypershell
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo \
-		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:${PORTSDIR}/devel/py-gobject \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo \
+		${LOCALBASE}/libdata/pkgconfig/pygobject-2.0.pc:devel/py-gobject \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:x11-toolkits/py-vte
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index 3af6100eb588..77a04e515f07 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Slightly improved screen locker based on slock
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
-		libev.so:${PORTSDIR}/devel/libev \
-		libxkbfile.so:${PORTSDIR}/x11/libxkbfile \
-		libxkbcommon.so:${PORTSDIR}/x11/libxkbcommon
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-image.so:x11/xcb-util-image \
+		libev.so:devel/libev \
+		libxkbfile.so:x11/libxkbfile \
+		libxkbcommon.so:x11/libxkbcommon
 
 MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
 		X11INC="${LOCALBASE}/include" CC="${CC}" \
diff --git a/x11/i3status/Makefile b/x11/i3status/Makefile
index 9366b9d4ae7b..b3d69b9d43b1 100644
--- a/x11/i3status/Makefile
+++ b/x11/i3status/Makefile
@@ -12,15 +12,15 @@ LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
-		libyajl.so:${PORTSDIR}/devel/yajl
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
+		libyajl.so:devel/yajl
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		gmake tar:bzip2
 
 PULSEAUDIO_EXTRA_PATCHES_OFF=	${FILESDIR}/no-pulseaudio.diff
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/i3status.c
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 561fb269f8e4..e4a8ae40e0fb 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
 
-LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libXft.so:x11-fonts/libXft \
+		libImlib2.so:graphics/imlib2
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README
 
 SHAPE_CONFIGURE_ENABLE=	shape
-SN_LIB_DEPENDS=	libstartup-notification.so:${PORTSDIR}/x11/startup-notification
+SN_LIB_DEPENDS=	libstartup-notification.so:x11/startup-notification
 SN_CONFIGURE_ON=	--enable-libsn
 
 do-install:
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index 88fceb750896..42dbfbbda5b6 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -12,7 +12,7 @@ COMMENT=	X11 pager program
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		scons
 
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index e8a6155eecb4..b644888af7a0 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for KDE
 
-LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
+LIB_DEPENDS=	libtidy.so:www/tidy-lib
 
 USE_GNOME=	glib20
 USE_KDE4=	kdelibs kdeprefix baloo baloo-widgets libkonq \
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	KONSOLE KWRITE
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 KONSOLE_DESC=	Install Konsole terminal emulator
-KONSOLE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/konsole:${PORTSDIR}/x11/konsole
+KONSOLE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/konsole:x11/konsole
 
 KWRITE_DESC=	Install KWrite text editor
 KWRITE_USE=	KDE4=kate_run
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index d29b881e0a48..cdd34b6cd40c 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -10,17 +10,17 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Runtime components for KDE Plasma Desktop
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libwebp.so:${PORTSDIR}/graphics/webp \
-		libslp.so:${PORTSDIR}/net/openslp \
-		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient \
-		libssh.so:${PORTSDIR}/security/libssh \
-		libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libexiv2.so:graphics/exiv2 \
+		libwebp.so:graphics/webp \
+		libslp.so:net/openslp \
+		libsmbclient.so:net/samba-libsmbclient \
+		libssh.so:security/libssh \
+		libqzeitgeist.so:sysutils/qzeitgeist
 # Explicitly depend on libssh to avoid interference with ssh.4 from
 # compat7x.
-BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
-RUN_DEPENDS=	cagibid:${PORTSDIR}/net/cagibi
+BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:security/libssh
+RUN_DEPENDS=	cagibid:net/cagibi
 
 USE_KDE4=	kactivities kdelibs kdeprefix oxygen \
 		attica automoc4 pimlibs strigi nepomuk-core
@@ -38,13 +38,13 @@ SHEBANG_FILES=	khelpcenter/searchhandlers/*.pl \
 OPTIONS_DEFINE=	PULSEAUDIO ZEITGEIST
 
 PULSEAUDIO_DESC=Audio configuration via PulseAudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio \
-			libcanberra.so:${PORTSDIR}/audio/libcanberra
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
+			libcanberra.so:audio/libcanberra
 PULSEAUDIO_USE=	GNOME=glib20
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PulseAudio:BOOL=OFF
 
 ZEITGEIST_DESC=	Event logging via Zeitgeist
-ZEITGEIST_RUN_DEPENDS=	zeitgeist-daemon:${PORTSDIR}/sysutils/zeitgeist
+ZEITGEIST_RUN_DEPENDS=	zeitgeist-daemon:sysutils/zeitgeist
 
 # Explicitly disable ALSA, see for details:
 # http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 125e7fdf30a6..41887eef0291 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -10,35 +10,35 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Plasma Desktop
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libck-connector.so:${PORTSDIR}/sysutils/consolekit \
-		libpci.so:${PORTSDIR}/devel/libpci \
-		libhal.so:${PORTSDIR}/sysutils/hal \
-		libqalculate.so:${PORTSDIR}/math/libqalculate \
-		libprison.so:${PORTSDIR}/graphics/prison \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libxcb-render-util.so:${PORTSDIR}/x11/xcb-util-renderutil \
-		libxcb-image.so:${PORTSDIR}/x11/xcb-util-image \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
-BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
-RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		xprop:${PORTSDIR}/x11/xprop \
-		xsetroot:${PORTSDIR}/x11/xsetroot \
-		xmessage:${PORTSDIR}/x11/xmessage \
-		xrdb:${PORTSDIR}/x11/xrdb \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		xset:${PORTSDIR}/x11/xset \
-		setxkbmap:${PORTSDIR}/x11/setxkbmap \
-		${KDE4_PREFIX}/bin/ksysguardd:${PORTSDIR}/sysutils/ksysguardd \
-		${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde \
-		${KDE4_PREFIX}/lib/kde4/libexec/polkitkde1helper:${PORTSDIR}/sysutils/kcm-polkit-kde \
-		${LOCALBASE}/etc/pam.d/kde:${PORTSDIR}/security/pam_kde \
-		${KDE4_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:${PORTSDIR}/x11-themes/kde4-base-artwork
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libck-connector.so:sysutils/consolekit \
+		libpci.so:devel/libpci \
+		libhal.so:sysutils/hal \
+		libqalculate.so:math/libqalculate \
+		libprison.so:graphics/prison \
+		libboost_thread.so:devel/boost-libs \
+		libdbusmenu-qt.so:devel/libdbusmenu-qt \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png \
+		libxcb-render-util.so:x11/xcb-util-renderutil \
+		libxcb-image.so:x11/xcb-util-image \
+		libxcb-keysyms.so:x11/xcb-util-keysyms
+BUILD_DEPENDS=	xrdb:x11/xrdb
+RUN_DEPENDS=	${KDE4_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \
+		${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		xprop:x11/xprop \
+		xsetroot:x11/xsetroot \
+		xmessage:x11/xmessage \
+		xrdb:x11/xrdb \
+		mkfontdir:x11-fonts/mkfontdir \
+		xset:x11/xset \
+		setxkbmap:x11/setxkbmap \
+		${KDE4_PREFIX}/bin/ksysguardd:sysutils/ksysguardd \
+		${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \
+		${KDE4_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \
+		${LOCALBASE}/etc/pam.d/kde:security/pam_kde \
+		${KDE4_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork
 
 USE_GL=		glu
 USE_GNOME=	glib20
@@ -78,7 +78,7 @@ GLES_USE=	GL=egl,glesv2
 GLES_CMAKE_OFF=	-DWITH_OpenGLES=off
 
 GPS_DESC=	GPS geolocation via gpsd
-GPS_LIB_DEPENDS=	libgps.so:${PORTSDIR}/astro/gpsd
+GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
 GPS_CMAKE_ON=	-DWITH_libgps:BOOL=ON
 GPS_CMAKE_OFF=	-DWITH_libgps:BOOL=OFF
 
@@ -86,26 +86,26 @@ GSTREAMER_DESC=	Multimedia via Phonon-GStreamer
 GSTREAMER_USE=	QT4=phonon-gst_run
 
 KACTIVITY_DESC=		Activity Manager daemon
-KACTIVITY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kactivitymanagerd:${PORTSDIR}/x11/kactivitymanagerd
+KACTIVITY_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd
 
 PYTHON_DESC=		Python plasmoids support
-PYTHON_RUN_DEPENDS=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
+PYTHON_RUN_DEPENDS=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:x11/plasma-scriptengine-python
 
 RUBY_DESC=		Ruby plasmoids support
-RUBY_RUN_DEPENDS=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:${PORTSDIR}/x11/plasma-scriptengine-ruby
+RUBY_RUN_DEPENDS=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby
 
 UPOWER_DESC=		Power management via UPower
-UPOWER_RUN_DEPENDS=	${LOCALBASE}/libexec/upowerd:${PORTSDIR}/sysutils/upower
+UPOWER_RUN_DEPENDS=	${LOCALBASE}/libexec/upowerd:sysutils/upower
 
 VLC_DESC=		Multimedia via Phonon-VLC
-VLC_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:${PORTSDIR}/multimedia/phonon-vlc
+VLC_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc
 
 WALLPAPERS_DESC=	Install official KDE wallpapers
-WALLPAPERS_RUN_DEPENDS=	${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers \
-			${KDE4_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:${PORTSDIR}/x11-themes/kde4-wallpapers-freebsd
+WALLPAPERS_RUN_DEPENDS=	${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde4-wallpapers \
+			${KDE4_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd
 
 .if !exists(/usr/lib/libutempter.so)
-LIB_DEPENDS+=	libutempter.so:${PORTSDIR}/sysutils/libutempter
+LIB_DEPENDS+=	libutempter.so:sysutils/libutempter
 .endif
 
 post-patch:
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 44def468c642..cea8b4cc901a 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -17,48 +17,48 @@ OPTIONS_DEFINE=	KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEBINDINGS KDEEDU \
 OPTIONS_DEFAULT=${OPTIONS_DEFINE:NKDEBINDINGS}
 
 KDEACCESSIBILITY_DESC=	Accessibility applications
-KDEACCESSIBILITY_RUN_DEPENDS=	kdeaccessibility>=${KDE4_VERSION}:${PORTSDIR}/accessibility/kdeaccessibility4
+KDEACCESSIBILITY_RUN_DEPENDS=	kdeaccessibility>=${KDE4_VERSION}:accessibility/kdeaccessibility4
 
 KDEADMIN_DESC=		Administration utilities
-KDEADMIN_RUN_DEPENDS=	kdeadmin>=${KDE4_VERSION}:${PORTSDIR}/sysutils/kdeadmin4
+KDEADMIN_RUN_DEPENDS=	kdeadmin>=${KDE4_VERSION}:sysutils/kdeadmin4
 
 KDEARTWORK_DESC=	Additional screensavers and wallpapers
-KDEARTWORK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kxsconfig:${PORTSDIR}/x11-themes/kdeartwork4
+KDEARTWORK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kxsconfig:x11-themes/kdeartwork4
 
 KDEBINDINGS_DESC=	Bindings for programming languages
-KDEBINDINGS_RUN_DEPENDS=	kdebindings>=${KDE4_VERSION}:${PORTSDIR}/devel/kdebindings4
+KDEBINDINGS_RUN_DEPENDS=	kdebindings>=${KDE4_VERSION}:devel/kdebindings4
 
 KDEEDU_DESC=		Entertaining, educational programs
-KDEEDU_RUN_DEPENDS=	kdeedu>=${KDE4_VERSION}:${PORTSDIR}/misc/kdeedu4
+KDEEDU_RUN_DEPENDS=	kdeedu>=${KDE4_VERSION}:misc/kdeedu4
 
 KDEGAMES_DESC=		Collection of games
-KDEGAMES_RUN_DEPENDS=	kdegames>=${KDE4_VERSION}:${PORTSDIR}/games/kdegames4
+KDEGAMES_RUN_DEPENDS=	kdegames>=${KDE4_VERSION}:games/kdegames4
 
 KDEGRAPHICS_DESC=	Graphics utilities
-KDEGRAPHICS_RUN_DEPENDS=	kdegraphics>=${KDE4_VERSION}:${PORTSDIR}/graphics/kdegraphics4
+KDEGRAPHICS_RUN_DEPENDS=	kdegraphics>=${KDE4_VERSION}:graphics/kdegraphics4
 
 KDEMULTIMEDIA_DESC=	Multimedia applications
-KDEMULTIMEDIA_RUN_DEPENDS=	kdemultimedia>=${KDE4_VERSION}:${PORTSDIR}/multimedia/kdemultimedia4
+KDEMULTIMEDIA_RUN_DEPENDS=	kdemultimedia>=${KDE4_VERSION}:multimedia/kdemultimedia4
 
 KDENETWORK_DESC=	Network-related programs
-KDENETWORK_RUN_DEPENDS=	kdenetwork>=${KDE4_VERSION}:${PORTSDIR}/net/kdenetwork4
+KDENETWORK_RUN_DEPENDS=	kdenetwork>=${KDE4_VERSION}:net/kdenetwork4
 
 KDEPIM_DESC=		Personal information management
-KDEPIM_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmail:${PORTSDIR}/deskutils/kdepim4
+KDEPIM_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmail:deskutils/kdepim4
 
 KDEPLASMA_DESC=		Extra plasmoids and plugins for Plasma
-KDEPLASMA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/lancelot:${PORTSDIR}/deskutils/kdeplasma-addons
+KDEPLASMA_RUN_DEPENDS=	${KDE4_PREFIX}/bin/lancelot:deskutils/kdeplasma-addons
 
 KDESDK_DESC=		Software development kit
-KDESDK_RUN_DEPENDS=	kdesdk>=${KDE4_VERSION}:${PORTSDIR}/devel/kdesdk4
+KDESDK_RUN_DEPENDS=	kdesdk>=${KDE4_VERSION}:devel/kdesdk4
 
 KDETOYS_DESC=		Miscellaneous small applications
-KDETOYS_RUN_DEPENDS=	kdetoys>=${KDE4_VERSION}:${PORTSDIR}/x11-clocks/kdetoys4
+KDETOYS_RUN_DEPENDS=	kdetoys>=${KDE4_VERSION}:x11-clocks/kdetoys4
 
 KDEUTILS_DESC=		Set of generic utilities
-KDEUTILS_RUN_DEPENDS=	kdeutils>=${KDE4_VERSION}:${PORTSDIR}/misc/kdeutils4
+KDEUTILS_RUN_DEPENDS=	kdeutils>=${KDE4_VERSION}:misc/kdeutils4
 
 KDEWEBDEV_DESC=		Web development environment
-KDEWEBDEV_RUN_DEPENDS=	${KDE4_PREFIX}/bin/klinkstatus:${PORTSDIR}/www/kdewebdev4
+KDEWEBDEV_RUN_DEPENDS=	${KDE4_PREFIX}/bin/klinkstatus:www/kdewebdev4
 
 .include <bsd.port.mk>
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 8e68b0033d7a..0efd08c3c25f 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -11,27 +11,27 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libjasper.so:${PORTSDIR}/graphics/jasper \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libavahi-core.so:${PORTSDIR}/net/avahi-app \
-		libenchant.so:${PORTSDIR}/textproc/enchant \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libhal.so:${PORTSDIR}/sysutils/hal \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libHUpnp.so:${PORTSDIR}/net/hupnp \
-		libpolkit-qt-core-1.so:${PORTSDIR}/sysutils/polkit-qt \
-		libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee
+LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
+		libjasper.so:graphics/jasper \
+		libpcre.so:devel/pcre \
+		libavahi-core.so:net/avahi-app \
+		libenchant.so:textproc/enchant \
+		libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libhal.so:sysutils/hal \
+		libqca.so:devel/qca \
+		libHUpnp.so:net/hupnp \
+		libpolkit-qt-core-1.so:sysutils/polkit-qt \
+		libdbusmenu-qt.so:devel/libdbusmenu-qt \
+		libgrantlee_gui.so:devel/grantlee
 
-BUILD_DEPENDS=	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS=	docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		xauth:${PORTSDIR}/x11/xauth \
-		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+		xauth:x11/xauth \
+		docbook-xml>0:textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdeprefix oxygen \
diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
index acd95cfa7fdf..88e0b8e41756 100644
--- a/x11/keybinder-gtk3/Makefile
+++ b/x11/keybinder-gtk3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for registering keyboard shortcuts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
+BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	engla
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 4f62540a9ff2..ef4c2cb79ff2 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for registering keyboard shortcuts
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
+BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	engla
diff --git a/x11/keynav/Makefile b/x11/keynav/Makefile
index 277ff19eb509..e9296ea689e9 100644
--- a/x11/keynav/Makefile
+++ b/x11/keynav/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://semicomplete.googlecode.com/files/
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Quickly select a portion of the screen using minimal keystrokes
 
-LIB_DEPENDS=	libxdo.so:${PORTSDIR}/x11/xdotool \
-		libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libxdo.so:x11/xdotool \
+		libcairo.so:graphics/cairo
 
 USES=		gmake pkgconfig
 USE_GNOME=	glib20
diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile
index 17787323f203..b0f2ebff953f 100644
--- a/x11/leechcraft/Makefile
+++ b/x11/leechcraft/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cross-platform modular live environment
 LICENSE=	BSL
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
 
-LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6 \
+		libpcre.so:devel/pcre \
+		libboost_program_options.so:devel/boost-libs
 
 #LC_REV=		1526-g7fdb92a
 INSTALLS_ICONS=	yes
@@ -65,24 +65,24 @@ AZOTH_CMAKE_ON=		-DENABLE_AZOTH:BOOL=true \
 			-DENABLE_AZOTH_VELVETBIRD:BOOL=true
 AZOTH_CMAKE_OFF=	-DENABLE_AZOTH:BOOL=false
 
-AZOTH_LIB_DEPENDS=	libQtMultimediaKit.so:${PORTSDIR}/multimedia/qt4-mobility \
-			libkqoauth.so:${PORTSDIR}/security/kqoauth \
-			libotr.so.5:${PORTSDIR}/security/libotr \
-			libpurple.so:${PORTSDIR}/net-im/libpurple \
-			libqca.so:${PORTSDIR}/devel/qca \
-			libqxmpp.so:${PORTSDIR}/net-im/qxmpp \
-			libspeex.so:${PORTSDIR}/audio/speex
+AZOTH_LIB_DEPENDS=	libQtMultimediaKit.so:multimedia/qt4-mobility \
+			libkqoauth.so:security/kqoauth \
+			libotr.so.5:security/libotr \
+			libpurple.so:net-im/libpurple \
+			libqca.so:devel/qca \
+			libqxmpp.so:net-im/qxmpp \
+			libspeex.so:audio/speex
 AZOTH_USES=		desktop-file-utils
 
 BITTORRENT_DESC=	Full-featured BitTorrent client plugin
 BITTORRENT_CMAKE_ON=	-DENABLE_TORRENT:BOOL=true
 BITTORRENT_CMAKE_OFF=	-DENABLE_TORRENT:BOOL=false
-BITTORRENT_LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
+BITTORRENT_LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar
 
 BLASQ_DESC=		Cloud image storage services client (like Flickr or Picasa)
 BLASQ_CMAKE_ON=		-DENABLE_BLASQ:BOOL=true
 BLASQ_CMAKE_OFF=	-DENABLE_BLASQ:BOOL=false
-BLASQ_LIB_DEPENDS=	libkqoauth.so:${PORTSDIR}/security/kqoauth
+BLASQ_LIB_DEPENDS=	libkqoauth.so:security/kqoauth
 
 BLOGIQUE_DESC=		Blogging client
 BLOGIQUE_CMAKE_ON=	-DENABLE_BLOGIQUE:BOOL=true
@@ -185,7 +185,7 @@ LACKMAN_CMAKE_OFF=	-DENABLE_LACKMAN:BOOL=false
 LASTFMSCROBBLE_DESC=		Last.FM scrobbler plugin
 LASTFMSCROBBLE_CMAKE_ON=	-DENABLE_LASTFMSCROBBLE:BOOL=true
 LASTFMSCROBBLE_CMAKE_OFF=	-DENABLE_LASTFMSCROBBLE:BOOL=false
-LASTFMSCROBBLE_LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm
+LASTFMSCROBBLE_LIB_DEPENDS=	liblastfm.so:audio/liblastfm
 
 LAUGHTY_DESC=		The LeechCraft notification daemon
 LAUGHTY_CMAKE_ON=	-DENABLE_LAUGHTY:BOOL=true
@@ -202,7 +202,7 @@ LEMON_CMAKE_OFF=	-DENABLE_LEMON:BOOL=false
 LHTR_DESC=		LeechCraft HTML Text editoR component
 LHTR_CMAKE_ON=		-DENABLE_LHTR:BOOL=true
 LHTR_CMAKE_OFF=		-DENABLE_LHTR:BOOL=false
-LHTR_BUILD_DEPENDS=	tidy:${PORTSDIR}/www/tidy-devel
+LHTR_BUILD_DEPENDS=	tidy:www/tidy-devel
 
 LIZNOO_DESC=		UPower-based power manager
 LIZNOO_CMAKE_ON=	-DENABLE_LIZNOO:BOOL=true
@@ -213,8 +213,8 @@ LMP_CMAKE_ON=		-DENABLE_LMP:BOOL=true \
 			-DUSE_GSTREAMER_10:BOOL=false
 LMP_CMAKE_OFF=		-DENABLE_LMP:BOOL=false
 LMP_USE=		GSTREAMER=yes
-LMP_LIB_DEPENDS=	libguess.so:${PORTSDIR}/textproc/libguess \
-			libtag.so:${PORTSDIR}/audio/taglib
+LMP_LIB_DEPENDS=	libguess.so:textproc/libguess \
+			libtag.so:audio/taglib
 
 MELLONETRAY_DESC=	System tray quark
 MELLONETRAY_CMAKE_ON=	-DENABLE_MELLONETRAY:BOOL=true
@@ -224,14 +224,14 @@ MELLONETRAY_USE=	xorg=xdamage
 MONOCLE_DESC=		Monocle, the modular document viewer
 MONOCLE_CMAKE_ON=	-DENABLE_MONOCLE:BOOL=true
 MONOCLE_CMAKE_OFF=	-DENABLE_MONOCLE:BOOL=false
-MONOCLE_LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \
-			libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
+MONOCLE_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre \
+			libpoppler-qt4.so:graphics/poppler-qt4
 
 MUSICZOMBIE_DESC=	MusicBrainz client plugin
 MUSICZOMBIE_CMAKE_ON=	-DENABLE_MUSICZOMBIE:BOOL=true
 MUSICZOMBIE_CMAKE_OFF=	-DENABLE_MUSICZOMBIE:BOOL=false
-MUSICZOMBIE_LIB_DEPENDS=libchromaprint.so:${PORTSDIR}/audio/chromaprint \
-			libavdevice.so:${PORTSDIR}/multimedia/ffmpeg
+MUSICZOMBIE_LIB_DEPENDS=libchromaprint.so:audio/chromaprint \
+			libavdevice.so:multimedia/ffmpeg
 
 NACHEKU_DESC=		Monitors selected directory and clipboard for downloadable entities
 NACHEKU_CMAKE_ON=	-DENABLE_NACHEKU:BOOL=true
@@ -273,7 +273,7 @@ POLEEMERY_CMAKE_OFF=	-DENABLE_POLEEMERY:BOOL=false
 POPISHU_DESC=		Text editor with IDE features
 POPISHU_CMAKE_ON=	-DENABLE_POPISHU:BOOL=true
 POPISHU_CMAKE_OFF=	-DENABLE_POPISHU:BOOL=false
-POPISHU_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+POPISHU_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 
 POSHUKU_DESC=		The full-featured web browser plugin
 POSHUKU_CMAKE_ON=	-DENABLE_POSHUKU:BOOL=true
@@ -282,12 +282,12 @@ POSHUKU_CMAKE_OFF=	-DENABLE_POSHUKU:BOOL=false
 QROSP_DESC=		Scrpting support for LeechCraft via Qross
 QROSP_CMAKE_ON=		-DENABLE_QROSP:BOOL=true
 QROSP_CMAKE_OFF=	-DENABLE_QROSP:BOOL=false
-QROSP_LIB_DEPENDS=	libqrosscore.so:${PORTSDIR}/devel/qross
+QROSP_LIB_DEPENDS=	libqrosscore.so:devel/qross
 
 ROSENTHAL_DESC=		Spellchecking support
 ROSENTHAL_CMAKE_ON=	-DENABLE_ROSENTHAL:BOOL=true
 ROSENTHAL_CMAKE_OFF=	-DENABLE_ROSENTHAL:BOOL=false
-ROSENTHAL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
+ROSENTHAL_LIB_DEPENDS=	libhunspell-1.3.so:textproc/hunspell
 
 SB2_DESC=		Sidebar for LeechCraft with combined launcher and tab switcher
 SB2_CMAKE_ON=		-DENABLE_SB2:BOOL=true
@@ -345,7 +345,7 @@ VROOBY_CMAKE_OFF=	-DENABLE_VROOBY:BOOL=false
 VTYULC_DESC=		Build VtyuLC, the videoplayer plugin
 VTYULC_CMAKE_ON=	-DENABLE_VTYULC:BOOL=true
 VTYULC_CMAKE_OFF=	-DENABLE_VTYULC:BOOL=false
-VTYULC_LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
+VTYULC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
 
 XPROXY_DESC=		Provides advanced proxy support features
 XPROXY_CMAKE_ON=	-DENABLE_XPROXY:BOOL=true
@@ -383,7 +383,7 @@ USE_QT4+=	xmlpatterns
     ${PORT_OPTIONS:MNETSTOREMANAGER} || ${PORT_OPTIONS:MPOSHUKU} || \
     ${PORT_OPTIONS:MQROSP} || ${PORT_OPTIONS:MSB2} || \
     ${PORT_OPTIONS:MTOUCHSTREAMS}
-LIB_DEPENDS+=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS+=	libqjson.so:devel/qjson
 .endif
 
 .if ${PORT_OPTIONS:MELEEMINATOR}
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 6a4585ee125b..9b5a7d0453f0 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -16,8 +16,8 @@ LICENSE_COMB=	multi
 LICENSE_DISTFILES=	${WRKSRC}/COPYING \
 	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	p5-URI>=1.60:${PORTSDIR}/net/p5-URI
-RUN_DEPENDS=	p5-URI>=1.60:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-URI>=1.60:net/p5-URI
+RUN_DEPENDS=	p5-URI>=1.60:net/p5-URI
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index f93b0dfa7896..b0277055cb0a 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -12,10 +12,10 @@ COMMENT?=	Core library of PCManFM file manager
 LICENSE=	LGPL21
 
 .if ! defined(EXTRA_ONLY)
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
-		libexif.so:${PORTSDIR}/graphics/libexif
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		valac:lang/vala
+LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
+		libexif.so:graphics/libexif
 .endif
 
 SLAVEDIRS=	${CATEGORIES}/${PORTNAME}-extra
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 6da4de96b583..56ff02ebb29d 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -16,9 +16,9 @@ USES=	tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra
+RUN_DEPENDS=	rarian-sk-config:textproc/rarian
 
 INSTALL_TARGET=	install-strip
 USE_GNOME=	gnomeprefix intlhack esound libbonobo \
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 9ed8e27e374a..806324d60927 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyboard shared library
 
-BUILD_DEPENDS=	libxklavier>=5.2:${PORTSDIR}/x11/libxklavier
-LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
+BUILD_DEPENDS=	libxklavier>=5.2:x11/libxklavier
+LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk30 intltool introspection:build \
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 11416cea309d..45aae2992db8 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libgnome library
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
+BUILD_DEPENDS=	gm4:devel/m4
 
 USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	xext
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index c6c63a84882e..1c06944f01d8 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE keyboard shared library
 
-LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index 4e62c9a13c99..6b2bf6acf38e 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple X11 library
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USES=		tar:Z
 USE_XORG=	x11 xaw xext xmu xt
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 186886d6b937..cf7227414412 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -12,10 +12,10 @@ COMMENT=	The X protocol C-language Binding (XCB) library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
-		xcb-proto>=1.9:${PORTSDIR}/x11/xcb-proto \
-		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:devel/libcheck \
+		xcb-proto>=1.9:x11/xcb-proto \
+		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 
 CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
 
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index de8bbfd9875f..d4934c918998 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -27,11 +27,11 @@ CONFIGURE_ARGS=	--with-vendor-info=${OPSYS} --without-html-dir
 OPTIONS_DEFINE=		GLADE GTK3 NLS STARTUP
 OPTIONS_DEFAULT=	GTK3 STARTUP
 STARTUP_DESC=	Startup notification
-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
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-GLADE_LIB_DEPENDS=	libgladeui-1.so:${PORTSDIR}/devel/glade3
+GLADE_LIB_DEPENDS=	libgladeui-1.so:devel/glade3
 GLADE_CONFIGURE_ENABLE=	gladeui
 GTK3_USE=	gnome=gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index d9e3908cf1fc..d28b8fae422b 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Utility library to make XKB stuff easier
 
-BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes
-RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
-		iso-codes>=0:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes
+RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
+		iso-codes>=0:misc/iso-codes
 
 USE_XORG=	x11 xkbfile
 USES=		gmake libtool pathfix pkgconfig tar:xz
diff --git a/x11/lumina-i18n/Makefile b/x11/lumina-i18n/Makefile
index 307ed4cadaff..8968db659821 100644
--- a/x11/lumina-i18n/Makefile
+++ b/x11/lumina-i18n/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lumina desktop environment localization files
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	lumina>=0:${PORTSDIR}/x11/lumina
+RUN_DEPENDS=	lumina>=0:x11/lumina
 
 USES=		tar:xz
 NO_BUILD=	yes
diff --git a/x11/lumina/Makefile b/x11/lumina/Makefile
index 22868ddf7f72..c1b0cf9a0d80 100644
--- a/x11/lumina/Makefile
+++ b/x11/lumina/Makefile
@@ -14,14 +14,14 @@ COMMENT=	Lumina Desktop Environment
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	xorg>=0:${PORTSDIR}/x11/xorg \
-		fluxbox>=0:${PORTSDIR}/x11-wm/fluxbox \
-		fluxbox-tenr-styles-pack>=0:${PORTSDIR}/x11-themes/fluxbox-tenr-styles-pack \
-		kde4-icons-oxygen>=0:${PORTSDIR}/x11-themes/kde4-icons-oxygen \
-		xscreensaver:${PORTSDIR}/x11/xscreensaver \
-		xscreensaver-demo:${PORTSDIR}/x11/xscreensaver \
-		xbrightness:${PORTSDIR}/x11/xbrightness \
-		numlockx:${PORTSDIR}/x11/numlockx
+RUN_DEPENDS=	xorg>=0:x11/xorg \
+		fluxbox>=0:x11-wm/fluxbox \
+		fluxbox-tenr-styles-pack>=0:x11-themes/fluxbox-tenr-styles-pack \
+		kde4-icons-oxygen>=0:x11-themes/kde4-icons-oxygen \
+		xscreensaver:x11/xscreensaver \
+		xscreensaver-demo:x11/xscreensaver \
+		xbrightness:x11/xbrightness \
+		numlockx:x11/numlockx
 
 CONFLICTS=      lumina-devel-0*
 
@@ -33,7 +33,7 @@ PCBSD_DESC=	Use the PC-BSD system interface settings.
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMULTIMEDIA}
-RUN_DEPENDS+=	gstreamer1-plugins-core>=0:${PORTSDIR}/multimedia/gstreamer1-plugins-core
+RUN_DEPENDS+=	gstreamer1-plugins-core>=0:multimedia/gstreamer1-plugins-core
 .endif
 
 MAKE_JOBS_UNSAFE=yes
diff --git a/x11/lxde-meta/Makefile b/x11/lxde-meta/Makefile
index 5669a5962380..b3000ab911c5 100644
--- a/x11/lxde-meta/Makefile
+++ b/x11/lxde-meta/Makefile
@@ -9,17 +9,17 @@ CATEGORIES=	x11
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	"meta-port" of the LXDE desktop slimmed down for FreeBSD releases
 
-RUN_DEPENDS=	openbox:${PORTSDIR}/x11-wm/openbox \
-		obconf:${PORTSDIR}/x11-wm/obconf \
-		lxsession:${PORTSDIR}/x11-wm/lxsession \
-		lxpanel:${PORTSDIR}/x11/lxpanel \
-		lxinput:${PORTSDIR}/sysutils/lxinput \
-		lxtask:${PORTSDIR}/sysutils/lxtask \
-		lxterminal:${PORTSDIR}/sysutils/lxterminal \
-		pcmanfm:${PORTSDIR}/x11-fm/pcmanfm \
-		gpicview:${PORTSDIR}/graphics/gpicview \
-		lxde-icon-theme>=0:${PORTSDIR}/x11-themes/lxde-icon-theme \
-		lxde-common>=0:${PORTSDIR}/misc/lxde-common
+RUN_DEPENDS=	openbox:x11-wm/openbox \
+		obconf:x11-wm/obconf \
+		lxsession:x11-wm/lxsession \
+		lxpanel:x11/lxpanel \
+		lxinput:sysutils/lxinput \
+		lxtask:sysutils/lxtask \
+		lxterminal:sysutils/lxterminal \
+		pcmanfm:x11-fm/pcmanfm \
+		gpicview:graphics/gpicview \
+		lxde-icon-theme>=0:x11-themes/lxde-icon-theme \
+		lxde-common>=0:misc/lxde-common
 
 USES=		metaport
 
diff --git a/x11/lxmenu-data/Makefile b/x11/lxmenu-data/Makefile
index 13e5ab92facb..71b1405bb3f7 100644
--- a/x11/lxmenu-data/Makefile
+++ b/x11/lxmenu-data/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Menu data used by lxpanel
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 USES=		gettext gmake tar:xz
 USE_GNOME=	intltool
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index d0c26679d760..ded97e8d4ba8 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Lightweight X11 desktop panel
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
-		libsysinfo.so:${PORTSDIR}/devel/libsysinfo
-RUN_DEPENDS=	${LOCALBASE}/share/desktop-directories/lxde-audio-video.directory:${PORTSDIR}/x11/lxmenu-data \
-		xmessage:${PORTSDIR}/x11/xmessage
+LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
+		libsysinfo.so:devel/libsysinfo
+RUN_DEPENDS=	${LOCALBASE}/share/desktop-directories/lxde-audio-video.directory:x11/lxmenu-data \
+		xmessage:x11/xmessage
 
 USE_AUTOTOOLS=	automake:env
 USE_CSTD=	gnu89
@@ -37,7 +37,7 @@ PORTDOCS=	AUTHORS README
 OPTIONS_DEFINE=	ALSA DOCS NLS
 OPTIONS_SUB=	yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index fc6cae2b6484..15a4ee1b83f6 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -11,15 +11,15 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applets components for the MATE Desktop Environment
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libxklavier.so:${PORTSDIR}/x11/libxklavier \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \
-		libhal.so:${PORTSDIR}/sysutils/hal \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
+		libxklavier.so:x11/libxklavier \
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libpolkit-gobject-1.so:sysutils/polkit \
+		libhal.so:sysutils/hal \
+		libupower-glib.so:sysutils/upower \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/mate-base/Makefile b/x11/mate-base/Makefile
index b9bfad643f97..8b7ecabfc68b 100644
--- a/x11/mate-base/Makefile
+++ b/x11/mate-base/Makefile
@@ -10,12 +10,12 @@ COMMENT=	"meta-port" for the MATE base integrated X11 desktop
 
 USES=		metaport
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \
-		${LOCALBASE}/share/mate-background-properties/mate-desktop.xml:${PORTSDIR}/x11-themes/mate-backgrounds \
-		${LOCALBASE}/bin/mate-session:${PORTSDIR}/x11/mate-session-manager \
-		mate-themes>=1.8.0:${PORTSDIR}/x11-themes/mate-themes \
-		mate-icon-theme-faenza>=1.8.0:${PORTSDIR}/x11-themes/mate-icon-theme-faenza
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSerif.ttf:x11-fonts/dejavu \
+		${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:sysutils/hal-info \
+		${LOCALBASE}/share/mate-background-properties/mate-desktop.xml:x11-themes/mate-backgrounds \
+		${LOCALBASE}/bin/mate-session:x11/mate-session-manager \
+		mate-themes>=1.8.0:x11-themes/mate-themes \
+		mate-icon-theme-faenza>=1.8.0:x11-themes/mate-icon-theme-faenza
 
 USE_MATE=	caja:run controlcenter:run icontheme:run \
 		marco:run notificationdaemon:run panel:run \
diff --git a/x11/mate-desktop/Makefile b/x11/mate-desktop/Makefile
index 389d99cd7a7a..6b94a4251f70 100644
--- a/x11/mate-desktop/Makefile
+++ b/x11/mate-desktop/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for MATE
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/mate-panel/Makefile b/x11/mate-panel/Makefile
index ff99475373dc..31066535ece1 100644
--- a/x11/mate-panel/Makefile
+++ b/x11/mate-panel/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Panel component for the MATE Desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libcanberra-gtk.so:audio/libcanberra
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index 4e754b7a121a..8f5d8ce72da1 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE screen saver and locker
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
@@ -43,11 +43,11 @@ OPTIONS_DEFINE=	PAM XSCREENSAVER
 OPTIONS_DEFAULT=PAM
 PAM_DESC=	Pluggable Authentication Module support
 
-XSCREENSAVER_RUN_DEPENDS=	xscreensaver-gnome-hacks>=0:${PORTSDIR}/x11/xscreensaver-gnome-hacks
+XSCREENSAVER_RUN_DEPENDS=	xscreensaver-gnome-hacks>=0:x11/xscreensaver-gnome-hacks
 
 OPTIONS_SUB=	yes
 
-PAM_RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper
+PAM_RUN_DEPENDS=	pam_helper:security/pam_helper
 PAM_CONFIGURE_ON=--enable-authentication-scheme=helper \
 		--with-passwd-helper=${LOCALBASE}/bin/pam_helper
 PAM_CONFIGURE_OFF=--disable-pam
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index 32a02261b838..321a10612cb5 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the MATE desktop
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libupower-glib.so:${PORTSDIR}/sysutils/upower
-RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
-		${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libupower-glib.so:sysutils/upower
+RUN_DEPENDS=	${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit \
+		${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/mate-terminal/Makefile b/x11/mate-terminal/Makefile
index 256ec3c56912..9a1a481815dc 100644
--- a/x11/mate-terminal/Makefile
+++ b/x11/mate-terminal/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the MATE Desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/mate/Makefile b/x11/mate/Makefile
index 5e43d7830633..8921e0e9f61f 100644
--- a/x11/mate/Makefile
+++ b/x11/mate/Makefile
@@ -10,22 +10,22 @@ COMMENT=	"meta-port" for the MATE integrated X11 desktop
 
 USES=		metaport
 
-RUN_DEPENDS=	mate-base>=1.8.0:${PORTSDIR}/x11/mate-base \
-		mate-themes>=1.8.0:${PORTSDIR}/x11-themes/mate-themes \
-		mate-icon-theme-faenza>=1.8.0:${PORTSDIR}/x11-themes/mate-icon-theme-faenza \
-		mate-terminal:${PORTSDIR}/x11/mate-terminal \
-		mate-screensaver:${PORTSDIR}/x11/mate-screensaver \
-		galculator:${PORTSDIR}/math/galculator \
-		mate-screenshot:${PORTSDIR}/deskutils/mate-utils \
-		mate-system-monitor:${PORTSDIR}/sysutils/mate-system-monitor \
-		eom:${PORTSDIR}/graphics/eom \
-		engrampa:${PORTSDIR}/archivers/engrampa \
-		atril:${PORTSDIR}/graphics/atril \
-		mate-volume-control:${PORTSDIR}/audio/mate-media \
-		mate-power-manager:${PORTSDIR}/sysutils/mate-power-manager \
-		caja-sendto:${PORTSDIR}/deskutils/caja-extensions \
-		mozo:${PORTSDIR}/deskutils/mozo \
-		mate-applets>=1.8.0:${PORTSDIR}/x11/mate-applets
+RUN_DEPENDS=	mate-base>=1.8.0:x11/mate-base \
+		mate-themes>=1.8.0:x11-themes/mate-themes \
+		mate-icon-theme-faenza>=1.8.0:x11-themes/mate-icon-theme-faenza \
+		mate-terminal:x11/mate-terminal \
+		mate-screensaver:x11/mate-screensaver \
+		galculator:math/galculator \
+		mate-screenshot:deskutils/mate-utils \
+		mate-system-monitor:sysutils/mate-system-monitor \
+		eom:graphics/eom \
+		engrampa:archivers/engrampa \
+		atril:graphics/atril \
+		mate-volume-control:audio/mate-media \
+		mate-power-manager:sysutils/mate-power-manager \
+		caja-sendto:deskutils/caja-extensions \
+		mozo:deskutils/mozo \
+		mate-applets>=1.8.0:x11/mate-applets
 
 USE_MATE=	pluma:run
 
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index 3a47c9d07d66..de53daa65eef 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library used to read freedesktop.org menus
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libfm-extra.so:${PORTSDIR}/x11/libfm-extra
+LIB_DEPENDS=	libfm-extra.so:x11/libfm-extra
 
 USES=		gmake pathfix pkgconfig libtool tar:xz
 GNU_CONFIGURE=	yes
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index d165372736a1..0d6a11b3e305 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -29,14 +29,14 @@ MAKE_JOBS_UNSAFE=	yes
 MAKE_ARGS=	PREFIX="${LOCALBASE}" DEST_PREFIX="${PREFIX}" CC="${CC}"
 
 .if ${PORT_OPTIONS:MULTRAGETOPT}
-LIB_DEPENDS+=	libultragetopt.so:${PORTSDIR}/devel/ultragetopt
+LIB_DEPENDS+=	libultragetopt.so:devel/ultragetopt
 MAKE_ARGS+=	USE_ULTRAGETOPT=yes
 .else
 MAKE_ARGS+=	USE_ULTRAGETOPT=no
 .endif
 
 .if ${PORT_OPTIONS:MIMLIB2}
-LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=	libImlib2.so:graphics/imlib2
 MAKE_ARGS+=	USE_IMLIB2=yes
 .else
 MAKE_ARGS+=	USE_IMLIB2=no
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index beacff3c3e63..c74a2a39025f 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -14,9 +14,9 @@ LICENSE=	GPLv3
 
 CONFLICTS=	fvwm-1.* fvwm-2.*
 
-LIB_DEPENDS=	libNucleo.so:${PORTSDIR}/x11-toolkits/nucleo \
-		libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	xorg-fonts>0:${PORTSDIR}/x11-fonts/xorg-fonts
+LIB_DEPENDS=	libNucleo.so:x11-toolkits/nucleo \
+		libpng.so:graphics/png
+RUN_DEPENDS=	xorg-fonts>0:x11-fonts/xorg-fonts
 
 USES=		gettext libtool pathfix pkgconfig python shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/fvwm-insitu/bin/fvwm-convert-2.4.in \
@@ -64,9 +64,9 @@ MMX_CONFIGURE_ENABLE=	mmx
 GLX_CONFIGURE_ENABLE=	glx
 GLX_X86_CONFIGURE_ENABLE=	glx-x86
 ATSPI_USE=	GNOME=atspi
-STROKE_LIB_DEPENDS=	libstroke.so:${PORTSDIR}/devel/libstroke
-MRPLAY_LIB_DEPENDS=	librplay.so:${PORTSDIR}/audio/rplay
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+STROKE_LIB_DEPENDS=	libstroke.so:devel/libstroke
+MRPLAY_LIB_DEPENDS=	librplay.so:audio/rplay
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 GLIB_USE=	GNOME=glib20
 GTK2_USE=	GNOME=gtk20
 
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index aa1cbd4b4a6e..ace201dffe5d 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -35,29 +35,29 @@ SIXEL_DESC=	Sixel graphics support
 UIM_DESC=	uim support (experimental)
 
 FRIBIDI_CONFIGURE_ENABLE=	fribidi
-FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
 
 UIM_CONFIGURE_ENABLE=	uim
-UIM_LIB_DEPENDS=	libuim.so:${PORTSDIR}/textproc/uim
+UIM_LIB_DEPENDS=	libuim.so:textproc/uim
 
 M17NLIB_CONFIGURE_ENABLE=	m17nlib
-M17NLIB_LIB_DEPENDS=	libm17n.so:${PORTSDIR}/devel/m17n-lib
+M17NLIB_LIB_DEPENDS=	libm17n.so:devel/m17n-lib
 
 SCIM_CONFIGURE_ENABLE=	scim
-SCIM_LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_LIB_DEPENDS=	libscim-1.0.so:textproc/scim
 
 IBUS_CONFIGURE_ENABLE=	ibus
-IBUS_LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
 
-CAIRO_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_CONFIGURE_ON=	--with-type-engines="xcore,xft,cairo"
 CAIRO_CONFIGURE_OFF=	--with-type-engines="xcore,xft"
 
 SIXEL_CONFIGURE_ENABLE=	sixel
 
-REGIS_LIB_DEPENDS=	libSDL.so:${PORTSDIR}/devel/sdl12 \
-			libSDL_ttf.so:${PORTSDIR}/graphics/sdl_ttf \
-			libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+REGIS_LIB_DEPENDS=	libSDL.so:devel/sdl12 \
+			libSDL_ttf.so:graphics/sdl_ttf \
+			libfontconfig.so:x11-fonts/fontconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index fe7418742b17..7aa877434578 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -75,7 +75,7 @@ USES+=		jpeg
 .if ! ${PORT_OPTIONS:MPNG} || ! ${PORT_OPTIONS:MBACKGROUND}
 CONFIGURE_ARGS+=	--disable-png
 .else
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 
 .if ! ${PORT_OPTIONS:MTRANSPARENCY}
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index dd6d987d5d6f..ed6d709f464a 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/materm/${PORTNAME}%20source/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tabbed version of rxvt
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 CONFLICTS=	mrxvt-0.5.*
 
@@ -24,7 +24,7 @@ USE_XORG=	x11
 OPTIONS_DEFINE=	DOCS JAPANESE XFT
 
 JAPANESE_CONFIGURE_ON=	--enable-xim --enable-cjk --with-encoding=eucj
-XFT_LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
+XFT_LIB_DEPENDS=	libXft.so:x11-fonts/libXft
 XFT_CONFIGURE_ENABLE=	xft
 
 PORTDOCS=	TIPS \
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 55342ab34459..16bad9d7e7e3 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -129,7 +129,7 @@ MAKE_ENV+=	WITHOUT_LINUX=yes
 
 .if ${NVVERSION} < 195.022
 # ABI version is hardcoded inside the binary, so specify it explicitly here
-LIB_DEPENDS=	libm.so.3:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libm.so.3:misc/compat5x
 .endif
 
 post-patch: .SILENT
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 7e838b6c4d33..6abc5919c5f3 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Display Control Panel for X NVidia driver
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
-		libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+LIB_DEPENDS=	libjansson.so:devel/jansson \
+		libvdpau.so:multimedia/libvdpau
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NVIDIA
diff --git a/x11/nxcomp/Makefile b/x11/nxcomp/Makefile
index 1c621670432f..90af87224cb5 100644
--- a/x11/nxcomp/Makefile
+++ b/x11/nxcomp/Makefile
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/nx-libs-${PORTVERSION}/${PORTNAME}
 USES=		autoreconf gmake jpeg
 USE_XORG=	xproto
 GNU_CONFIGURE=	yes
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,libdir}/nx,libdir},g" ${WRKSRC}/Makefile.in
diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index 15aa936178f5..964343d6cc40 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Access to X11 clipboard from Perl
 
-BUILD_DEPENDS=	p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy
+BUILD_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		xclip:${PORTSDIR}/x11/xclip
+		xclip:x11/xclip
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index 4c2ddc6630b1..5e8d228f475b 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module that reports number of seconds that X11 has been idle
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/x11/p5-X11-Resolution/Makefile b/x11/p5-X11-Resolution/Makefile
index 00297b98ad23..2a4f56d426ee 100644
--- a/x11/p5-X11-Resolution/Makefile
+++ b/x11/p5-X11-Resolution/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Provides a method to get the resolution for a X11 screen
 
-RUN_DEPENDS=	p5-X11-Protocol>=0:${PORTSDIR}/x11/p5-X11-Protocol
+RUN_DEPENDS=	p5-X11-Protocol>=0:x11/p5-X11-Protocol
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/x11/p5-X11-XCB/Makefile b/x11/p5-X11-XCB/Makefile
index f0245180727c..094a600c543c 100644
--- a/x11/p5-X11-XCB/Makefile
+++ b/x11/p5-X11-XCB/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Perl bindings for libxcb
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxcb.so:${PORTSDIR}/x11/libxcb \
-		libxcb-util.so:${PORTSDIR}/x11/xcb-util \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
+LIB_DEPENDS=	libxcb.so:x11/libxcb \
+		libxcb-util.so:x11/xcb-util \
+		libxcb-icccm.so:x11/xcb-util-wm
 BUILD_DEPENDS=	\
-		${LOCALBASE}/share/xcb/xcb.xsd:${PORTSDIR}/x11/xcb-proto \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
-		p5-MouseX-NativeTraits>=0:${PORTSDIR}/devel/p5-MouseX-NativeTraits \
-		p5-ExtUtils-Depends>=0:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-		p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
-		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
-		p5-XML-Descent>=0:${PORTSDIR}/textproc/p5-XML-Descent \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XS-Object-Magic>=0:${PORTSDIR}/devel/p5-XS-Object-Magic
+		${LOCALBASE}/share/xcb/xcb.xsd:x11/xcb-proto \
+		p5-Data-Dump>=0:devel/p5-Data-Dump \
+		p5-Mouse>=0:devel/p5-Mouse \
+		p5-MouseX-NativeTraits>=0:devel/p5-MouseX-NativeTraits \
+		p5-ExtUtils-Depends>=0:devel/p5-ExtUtils-Depends \
+		p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		p5-Test-Deep>=0:devel/p5-Test-Deep \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-XML-Descent>=0:textproc/p5-XML-Descent \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-XS-Object-Magic>=0:devel/p5-XS-Object-Magic
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11/p5-X11-Xlib/Makefile b/x11/p5-X11-Xlib/Makefile
index 71030c131b9e..154fb9b8be2e 100644
--- a/x11/p5-X11-Xlib/Makefile
+++ b/x11/p5-X11-Xlib/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Low-level access to the X11 library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckLib>=0:${PORTSDIR}/devel/p5-Devel-CheckLib
+BUILD_DEPENDS=	p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11/p5-XTerm-Conf/Makefile b/x11/p5-XTerm-Conf/Makefile
index 68eec0e4eccb..c8a7f9d44923 100644
--- a/x11/p5-XTerm-Conf/Makefile
+++ b/x11/p5-XTerm-Conf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl module that changes configuration of a running xterm
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=2.32:${PORTSDIR}/devel/p5-Term-ReadKey
+BUILD_DEPENDS=	p5-Term-ReadKey>=2.32:devel/p5-Term-ReadKey
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/x11/printscreen/Makefile b/x11/printscreen/Makefile
index a241d1ce7331..fc7f5cb0b40a 100644
--- a/x11/printscreen/Makefile
+++ b/x11/printscreen/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple screenshot program for X11
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	xwd:${PORTSDIR}/x11/xwd \
-		xwdtopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS=	xwd:x11/xwd \
+		xwdtopnm:graphics/netpbm
 
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 055861db1520..30d7f2512bbb 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -13,7 +13,7 @@ COMMENT=	The OpenLook props application
 
 CONFLICTS=	xview-clients-3.2.1.4.19*
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 MAKE_JOBS_UNSAFE=	yes
 WRKSRC=		${WRKDIR}/props
diff --git a/x11/py-qt4-opengl/Makefile b/x11/py-qt4-opengl/Makefile
index 7daddbb269b3..ba6dc97aab65 100644
--- a/x11/py-qt4-opengl/Makefile
+++ b/x11/py-qt4-opengl/Makefile
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtOpenGL API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2
+API_LIB_DEPENDS=	libqscintilla2.so:devel/qscintilla2
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index 893416cbc360..efc56db91e2f 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtOpenGL API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/x11/qxkb/Makefile b/x11/qxkb/Makefile
index 2e71ceeec0ce..8fd838441f9f 100644
--- a/x11/qxkb/Makefile
+++ b/x11/qxkb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Qt4-based advanced keyboard layout switcher
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libxkbfile.so:${PORTSDIR}/x11/libxkbfile
+LIB_DEPENDS=	libxkbfile.so:x11/libxkbfile
 
 USES=		cmake tar:bzip2
 USE_QT4=	linguisttools_build moc_build qmake_build rcc_build uic_build \
diff --git a/x11/rofi/Makefile b/x11/rofi/Makefile
index c99670cd6beb..8490d726a197 100644
--- a/x11/rofi/Makefile
+++ b/x11/rofi/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Window switcher, run dialog and dmenu replacement
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DaveDavenport
@@ -24,7 +24,7 @@ USE_GNOME=	pango
 OPTIONS_DEFINE=	I3
 
 I3_DESC=	I3 support
-I3_BUILD_DEPENDS=	i3:${PORTSDIR}/x11-wm/i3
+I3_BUILD_DEPENDS=	i3:x11-wm/i3
 I3_CFLAGS=	-I${LOCALBASE}/include
 
 PLIST_FILES=	bin/rofi bin/rofi-sensible-terminal man/man1/rofi.1.gz \
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index b7770d154769..02cad2eb12d0 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	Wallpaper-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Wallpaper management tool for the ROX desktop
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 USES=		python
 
diff --git a/x11/roxbg/Makefile b/x11/roxbg/Makefile
index 43d0a706d358..10d33fd524cc 100644
--- a/x11/roxbg/Makefile
+++ b/x11/roxbg/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Tool for setting the background in rox using a simple command
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 8351883c47cb..3d39771e3623 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -12,12 +12,12 @@ COMMENT=	GTK+ terminal emulator with tabs
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		itstool:${PORTSDIR}/textproc/itstool \
-		po4a:${PORTSDIR}/textproc/po4a
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:devel/py-lockfile \
+		docbook-xsl>0:textproc/docbook-xsl \
+		itstool:textproc/itstool \
+		po4a:textproc/po4a
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		gettext libtool:build pkgconfig python:build tar:bzip2
 USE_GNOME=	librsvg2:run libxslt:build
@@ -34,7 +34,7 @@ MAITCHFLAGS+=	PARALLEL=${MAKE_JOBS_NUMBER};PREFIX=${PREFIX};
 .if ${PORT_OPTIONS:MGTK3}
 #USE_GNOME+=	vte3
 # use older vte3-290 port until roxterm can support the 2.91 API from vte3
-LIB_DEPENDS+=	libvte2_90.so:${PORTSDIR}/x11-toolkits/vte290
+LIB_DEPENDS+=	libvte2_90.so:x11-toolkits/vte290
 .else
 USE_GNOME+=	vte
 DISABLE_GTK3=	True
diff --git a/x11/rubygem-gnome2/Makefile b/x11/rubygem-gnome2/Makefile
index 1d6143f9f878..af0e9654751a 100644
--- a/x11/rubygem-gnome2/Makefile
+++ b/x11/rubygem-gnome2/Makefile
@@ -11,29 +11,29 @@ COMMENT=	Meta port for all Ruby Gnome2 Gems
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:${PORTSDIR}/accessibility/rubygem-atk \
-		rubygem-cairo-gobject>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-cairo-gobject \
-		rubygem-clutter>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-clutter \
-		rubygem-clutter-gstreamer>=${PORTVERSION}:${PORTSDIR}/multimedia/rubygem-clutter-gstreamer \
-		rubygem-clutter-gtk>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-clutter-gtk \
-		rubygem-gdk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gdk3 \
-		rubygem-gdk_pixbuf2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-gdk_pixbuf2 \
-		rubygem-gio2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gio2 \
-		rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2 \
-		rubygem-gobject-introspection>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-gobject-introspection \
-		rubygem-goocanvas>=2.2.0:${PORTSDIR}/graphics/rubygem-goocanvas \
-		rubygem-gstreamer>=${PORTVERSION}:${PORTSDIR}/multimedia/rubygem-gstreamer \
-		rubygem-gtk2>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \
-		rubygem-gtk3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk3 \
-		rubygem-gtksourceview2>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtksourceview2 \
-		rubygem-gtksourceview3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtksourceview3 \
-		rubygem-pango>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-pango \
-		rubygem-poppler>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-poppler \
-		rubygem-rsvg2>=${PORTVERSION}:${PORTSDIR}/graphics/rubygem-rsvg2 \
-		rubygem-vte>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-vte \
-		rubygem-vte3>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-vte3 \
-		rubygem-webkit-gtk>=${PORTVERSION}:${PORTSDIR}/www/rubygem-webkit-gtk \
-		rubygem-webkit-gtk2>=${PORTVERSION}:${PORTSDIR}/www/rubygem-webkit-gtk2 \
+RUN_DEPENDS=	rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \
+		rubygem-cairo-gobject>=${PORTVERSION}:devel/rubygem-cairo-gobject \
+		rubygem-clutter>=${PORTVERSION}:graphics/rubygem-clutter \
+		rubygem-clutter-gstreamer>=${PORTVERSION}:multimedia/rubygem-clutter-gstreamer \
+		rubygem-clutter-gtk>=${PORTVERSION}:graphics/rubygem-clutter-gtk \
+		rubygem-gdk3>=${PORTVERSION}:x11-toolkits/rubygem-gdk3 \
+		rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2 \
+		rubygem-gio2>=${PORTVERSION}:devel/rubygem-gio2 \
+		rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
+		rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection \
+		rubygem-goocanvas>=2.2.0:graphics/rubygem-goocanvas \
+		rubygem-gstreamer>=${PORTVERSION}:multimedia/rubygem-gstreamer \
+		rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2 \
+		rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3 \
+		rubygem-gtksourceview2>=${PORTVERSION}:x11-toolkits/rubygem-gtksourceview2 \
+		rubygem-gtksourceview3>=${PORTVERSION}:x11-toolkits/rubygem-gtksourceview3 \
+		rubygem-pango>=${PORTVERSION}:x11-toolkits/rubygem-pango \
+		rubygem-poppler>=${PORTVERSION}:x11-toolkits/rubygem-poppler \
+		rubygem-rsvg2>=${PORTVERSION}:graphics/rubygem-rsvg2 \
+		rubygem-vte>=${PORTVERSION}:x11-toolkits/rubygem-vte \
+		rubygem-vte3>=${PORTVERSION}:x11-toolkits/rubygem-vte3 \
+		rubygem-webkit-gtk>=${PORTVERSION}:www/rubygem-webkit-gtk \
+		rubygem-webkit-gtk2>=${PORTVERSION}:www/rubygem-webkit-gtk2 \
 
 USES=		metaport
 USE_RUBY=	yes
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 058ec37d396d..379631abc4cb 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Clone of the terminal emulator rxvt modified to support Unicode
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig
+RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig
 
 USES=			cpe pkgconfig shebangfix tar:bzip2 terminfo
 USE_XORG=		xpm xft xrender
@@ -62,8 +62,8 @@ PORTDOCS=	README.xvt ${PORTDOCS1}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMLOCALE_FIX}
-PATCH_DEPENDS+=	p5-Encode-HanExtra>=0:${PORTSDIR}/chinese/p5-Encode-HanExtra \
-		p5-Encode-JIS2K>=0:${PORTSDIR}/converters/p5-Encode-JIS2K
+PATCH_DEPENDS+=	p5-Encode-HanExtra>=0:chinese/p5-Encode-HanExtra \
+		p5-Encode-JIS2K>=0:converters/p5-Encode-JIS2K
 .endif
 
 # disable the embedded perl interpreter
@@ -149,7 +149,7 @@ CONFIGURE_ARGS+=	--enable-pixbuf
 CONFIGURE_ARGS+=	--disable-startup-notification
 .else
 CONFIGURE_ARGS+=	--enable-startup-notification
-LIB_DEPENDS+=		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS+=		libstartup-notification-1.so:x11/startup-notification
 .endif
 
 # enable support for 256 colors
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
index 8a140fc3adf1..64df7a2faa28 100644
--- a/x11/scripts/Makefile
+++ b/x11/scripts/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	x11
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Various X related scripts
 
-RUN_DEPENDS=	ksh:${PORTSDIR}/shells/pdksh
+RUN_DEPENDS=	ksh:shells/pdksh
 
 XORG_CAT=	app
 USE_XORG=	x11
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index e9bd548501e1..eb3b0109e231 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Graphical login manager for X11, derived from Login.app
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		cmake jpeg pkgconfig
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrandr \
@@ -45,7 +45,7 @@ PAM_CMAKE_OFF=	-DUSE_PAM=no
 UTF8_EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-utf8
 
 CONSOLEKIT_CMAKE_ON=	-DUSE_CONSOLEKIT=yes
-CONSOLEKIT_LIB_DEPENDS=	libck-connector.so:${PORTSDIR}/sysutils/consolekit
+CONSOLEKIT_LIB_DEPENDS=	libck-connector.so:sysutils/consolekit
 CONSOLEKIT_CMAKE_OFF=	-DUSE_CONSOLEKIT=no
 
 post-patch:
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index b519cf1f9e45..209a51d8704a 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library that supports startup notification spec from freedesktop.org
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 USE_XORG=	x11
 USES=		gmake libtool pathfix pkgconfig
diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index 582a5394aae7..0159cd8b11a0 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -15,8 +15,8 @@ LICENSE_NAME=	MIT/X Consortium License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 USES=		pkgconfig ncurses:port
 USE_XORG=	x11 xext xft
diff --git a/x11/sxhkd/Makefile b/x11/sxhkd/Makefile
index e7110364a50e..0a4ed48c8d0b 100644
--- a/x11/sxhkd/Makefile
+++ b/x11/sxhkd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Simple X hotkey daemon
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
+LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	baskerville
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 606525f03d16..3e7ff6015530 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Dockable WindowMaker applet which displays the local temperature
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USE_XORG=	x11 xpm
 
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index ce2ca1aed827..1bc08438cb2a 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Multiple GNOME terminals in one window
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify \
-		${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:${PORTSDIR}/x11/keybinder \
-		${PYTHON_PKGNAMEPREFIX}vte>=0:${PORTSDIR}/x11-toolkits/py-vte
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify \
+		${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:x11/keybinder \
+		${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte
 
 USES=		python
 USE_GNOME=	pygtk2 intltool
diff --git a/x11/terminology/Makefile b/x11/terminology/Makefile
index e46a18efac40..761891a28b0b 100644
--- a/x11/terminology/Makefile
+++ b/x11/terminology/Makefile
@@ -11,8 +11,8 @@ COMMENT=	EFL Terminal Emulator
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
-		libelementary.so:${PORTSDIR}/x11-toolkits/elementary
+LIB_DEPENDS=	libefl.so:devel/efl \
+		libelementary.so:x11-toolkits/elementary
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/x11/thingylaunch/Makefile b/x11/thingylaunch/Makefile
index 2e8fdf461126..7e976af0394d 100644
--- a/x11/thingylaunch/Makefile
+++ b/x11/thingylaunch/Makefile
@@ -31,8 +31,8 @@ USE_XORG+=	x11
 
 .if ${PORT_OPTIONS:MLIBXCB}
 USE_XORG+=	xcb
-LIB_DEPENDS+=	libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
+LIB_DEPENDS+=	libxcb-icccm.so:x11/xcb-util-wm \
+		libxcb-keysyms.so:x11/xcb-util-keysyms
 CMAKE_ARGS+=	-DUSE_XCB:BOOL=ON
 .endif
 
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 0c2294d78710..2e1e07b2bc7a 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Drop down x11 terminal with transparency support
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	vte3>=0:${PORTSDIR}/x11-toolkits/vte3
-RUN_DEPENDS=	vte3>=0:${PORTSDIR}/x11-toolkits/vte3
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse
+BUILD_DEPENDS=	vte3>=0:x11-toolkits/vte3
+RUN_DEPENDS=	vte3>=0:x11-toolkits/vte3
+LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-rpath
diff --git a/x11/tint-devel/Makefile b/x11/tint-devel/Makefile
index 9664ebd759cf..fe36ea1e1180 100644
--- a/x11/tint-devel/Makefile
+++ b/x11/tint-devel/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Lightweight freedesktop-compliant panel (development version)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-		librsvg-2.so:${PORTSDIR}/graphics/librsvg2 \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libImlib2.so:graphics/imlib2 \
+		librsvg-2.so:graphics/librsvg2 \
+		libstartup-notification-1.so:x11/startup-notification
 
 CONFLICTS=	tint2-[0-9]*
 
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index b778e4f93195..32e791e2aa8e 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
+		libstartup-notification-1.so:x11/startup-notification
 
 USES=		alias cmake gettext pkgconfig tar:xz
 USE_GNOME=	glib20 gtk20 librsvg2 pango
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 146f391acee9..1c62f20299da 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/X11/desktop
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nifty set of desktop apps, including floating buttons
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms
 
 USES=		imake
 USE_XORG=	xaw
diff --git a/x11/urxvt-perls/Makefile b/x11/urxvt-perls/Makefile
index 0e47cd54ac29..faf57edb1bf1 100644
--- a/x11/urxvt-perls/Makefile
+++ b/x11/urxvt-perls/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Perl extension scripts for rxvt-unicode terminal emulator
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/bin/urxvt:${PORTSDIR}/x11/rxvt-unicode
+RUN_DEPENDS=	${LOCALBASE}/bin/urxvt:x11/rxvt-unicode
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
diff --git a/x11/virtualgl/Makefile b/x11/virtualgl/Makefile
index 57f5dc0b6cee..598ef1cdd800 100644
--- a/x11/virtualgl/Makefile
+++ b/x11/virtualgl/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	VirtualGL-${PORTVERSION}
 MAINTAINER=	davidjx8p@gmail.com
 COMMENT=	Redirects commands from an OpenGL app to another X server
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo \
-		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libturbojpeg.so:graphics/libjpeg-turbo \
+		libxcb-keysyms.so:x11/xcb-util-keysyms
 
 ONLY_FOR_ARCHS=	amd64 i386
 
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 9e3042693cbb..55016cb01693 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Simple and highly customizable quick launch bar
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	intltool-update:${PORTSDIR}/textproc/intltool
-LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+BUILD_DEPENDS=	intltool-update:textproc/intltool
+LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 
diff --git a/x11/wbarconf/Makefile b/x11/wbarconf/Makefile
index 3b56d96e0a8d..15fefee76cbf 100644
--- a/x11/wbarconf/Makefile
+++ b/x11/wbarconf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Configuration GUI for wbar
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	wbar:${PORTSDIR}/x11/wbar
+RUN_DEPENDS=	wbar:x11/wbar
 
 USE_GNOME=	pygobject pygtk2 gtk20
 USES=		gettext desktop-file-utils python shebangfix
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 639d43ddaf9f..15dfedfef13e 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	WINGs Display Manager; an xdm replacement
 
-LIB_DEPENDS=	libWINGs.so:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS=	libWINGs.so:x11-wm/windowmaker
 
 NOT_FOR_ARCHS=	sparc64
 
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 616bef6323ed..8934952839eb 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		DOCS IMLIB2
 
-IMLIB2_LIB_DEPENDS= 	libImlib2.so:${PORTSDIR}/graphics/imlib2
+IMLIB2_LIB_DEPENDS= 	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_ENABLE=Imlib2
 
 post-extract:
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 9d8f038042da..5cd248c88e95 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -12,8 +12,8 @@ COMMENT=	RSI prevention tool
 
 LICENSE=	GPLv3+
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:${PORTSDIR}/devel/py-cheetah
-LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah
+LIB_DEPENDS=	libgdome.so:textproc/gdome2
 
 USES=		gettext gmake pathfix pkgconfig python
 USE_XORG=	recordproto x11 xext xmu xscrnsaver xtst
@@ -31,11 +31,11 @@ OPTIONS_DEFAULT=	GSTREAMER
 OPTIONS_SUB=		yes
 
 GNOME_USE=		gnome=gnomepanel
-GNOME_LIB_DEPENDS=	libgnomeuimm-2.6.so:${PORTSDIR}/x11-toolkits/libgnomeuimm26
+GNOME_LIB_DEPENDS=	libgnomeuimm-2.6.so:x11-toolkits/libgnomeuimm26
 GNOME_CONFIGURE_ENABLE=	gnome2
 GSTREAMER_USE=		gstreamer=good
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 post-patch:
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 0c95b27e9781..70ddc8f77ba3 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -11,9 +11,9 @@ EXTRACT_SUFX=	ga7-src.tgz
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	3270 Terminal emulator
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
+		mkfontdir:x11-fonts/mkfontdir \
+		mkfontscale:x11-fonts/mkfontscale
 
 # Conflict due to x3270if
 CONFLICTS=	c3270-*
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 22c51285d273..302839278f9f 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	XLOCK
 OPTIONS_DEFAULT=XLOCK
 XLOCK_DESC=	Force dependency on x11/xlockmore
 
-XLOCK_RUN_DEPENDS=	xlock:${PORTSDIR}/x11/xlockmore
+XLOCK_RUN_DEPENDS=	xlock:x11/xlockmore
 
 PLIST_FILES=	bin/xautolock man/man1/xautolock.1.gz
 
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index ee69797bbb96..611cb74b5bef 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Control X from the command line for scripts
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_XORG=	xtst
 GNU_CONFIGURE=	yes
diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile
index 9b13f8c308d3..fd4adf691451 100644
--- a/x11/xbacklight/Makefile
+++ b/x11/xbacklight/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Program to adjust backlight brightness
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 XORG_CAT=	app
 USE_XORG=	x11 xrender xrandr xcb
diff --git a/x11/xbelld/Makefile b/x11/xbelld/Makefile
index 869ee3be0d48..39ec391a2a30 100644
--- a/x11/xbelld/Makefile
+++ b/x11/xbelld/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-0.2beta2
 MAINTAINER=	chip-set@mail.ru
 COMMENT=	XBellD is a small daemon for replacing the standard X terminal bell
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 
 USES=		imake tar:tgz
 USE_XORG=	ice sm xtrap xmu xt
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 4f361c350f2a..f65a9f8b5bcb 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	bin/xbindkeys %%EXAMPLESDIR%%/xbindkeysrc man/man1/xbindkeys.1.gz
 TCL_USES=		tk
 TCL_CONFIGURE_OFF=	--disable-tk
 TCL_PLIST_FILES=	bin/xbindkeys_show man/man1/xbindkeys_show.1.gz
-GUILE_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
+GUILE_LIB_DEPENDS=	libguile.so:lang/guile
 GUILE_CONFIGURE_OFF=	--disable-guile
 
 post-patch:
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index 99743d87a9ff..acb83203d938 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	x11
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Scientific calculator for X
 
-RUN_DEPENDS=	font-misc-misc>=1.1.2:${PORTSDIR}/x11-fonts/font-misc-misc \
-		font-adobe-100dpi>=1.0.3:${PORTSDIR}/x11-fonts/font-adobe-100dpi \
-		font-alias>=1.0.3:${PORTSDIR}/x11-fonts/font-alias \
-		xbitmaps>=1.1.0:${PORTSDIR}/x11/xbitmaps
+RUN_DEPENDS=	font-misc-misc>=1.1.2:x11-fonts/font-misc-misc \
+		font-adobe-100dpi>=1.0.3:x11-fonts/font-adobe-100dpi \
+		font-alias>=1.0.3:x11-fonts/font-alias \
+		xbitmaps>=1.1.0:x11/xbitmaps
 
 XORG_CAT=	app
 USE_XORG=	xt xaw
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 0bc34a482658..4586c3646036 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -8,13 +8,13 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XCB cursor library
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util \
-		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
-		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
+		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
+		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image
 
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:${PORTSDIR}/x11/xcb-util \
-		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil \
-		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:${PORTSDIR}/x11/xcb-util-image
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \
+		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \
+		${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image
 
 XORG_CAT=	lib
 USE_XORG=	xcb
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 4f0849d828d6..8f5b991bf856 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Port of Xlib's XImage and XShmImage functions
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 XORG_CAT=	lib
 USES=		gmake
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 4877fb3a56d5..582736749255 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Standard X key constants and conversion to/from keycodes
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 XORG_CAT=	lib
 USES=		gmake
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 15387734920f..f24ef0c0b913 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://xcb.freedesktop.org/dist/
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Convenience functions for the Render extension
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 XORG_CAT=	lib
 USES=		gmake
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index f558cca5d98d..5b4fc5a8938e 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Framework for window manager implementation
 
 LICNESE=	MIT
 
-LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS=	libxcb-util.so:x11/xcb-util
 
 XORG_CAT=	lib
 USES=		gmake
diff --git a/x11/xcbautolock/Makefile b/x11/xcbautolock/Makefile
index 977e79f44587..d22399932fa8 100644
--- a/x11/xcbautolock/Makefile
+++ b/x11/xcbautolock/Makefile
@@ -14,7 +14,7 @@ USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	bapt
 
-LIB_DEPENDS=	libxcb-screensaver.so:${PORTSDIR}/x11/libxcb
+LIB_DEPENDS=	libxcb-screensaver.so:x11/libxcb
 
 PLIST_FILES=	bin/xcbautolock \
 		man/man1/xcbautolock.1.gz
diff --git a/x11/xcm/Makefile b/x11/xcm/Makefile
index 413d1b0dca51..bd5c04f0790d 100644
--- a/x11/xcm/Makefile
+++ b/x11/xcm/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SF/oyranos/Xcm
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	X Color Management tools
 
-LIB_DEPENDS=	libXcm.so:${PORTSDIR}/x11/libXcm
+LIB_DEPENDS=	libXcm.so:x11/libXcm
 
 XORG_CAT=	app
 # xcm should be added to XORG_MODULES at /usr/ports/Mk/bsd.xorg.mk
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index e1c7ba864407..690b9caa7aa2 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display all (ok, most of) the colors in the universe
 
-RUN_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb
+RUN_DEPENDS=	showrgb:x11/rgb
 
 WRKSRC=		${WRKDIR}/xcolors
 USE_XORG=	xaw xmu xt sm ice xpm xp xext x11
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 8780cf977ca9..b1bd4c19401b 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -14,8 +14,8 @@ COMMENT=	X utility to translate rgb values into X color names
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/01-COPYING
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
-RUN_DEPENDS=	rgb>=1.0.3:${PORTSDIR}/x11/rgb
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
+RUN_DEPENDS=	rgb>=1.0.3:x11/rgb
 
 WRKSRC=		${WRKDIR}/xcolorsel
 USES=		imake
diff --git a/x11/xcurs/Makefile b/x11/xcurs/Makefile
index 9d46f5e9834e..511b55460120 100644
--- a/x11/xcurs/Makefile
+++ b/x11/xcurs/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://freebsd.nsu.ru/distfiles/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Editor for new X.Org style full-color cursors properties
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 USES=		python
 USE_GNOME=	pygtk2
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 0f35c888989d..1d4929cccdf0 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Create an X cursor file from a collection of PNG images
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 XORG_CAT=	app
 USE_XORG=	x11 xcursor xextproto
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 94f24e501631..3d8e278e6207 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -17,9 +17,9 @@ OPTIONS_DEFINE=	QRCODE UNIQUE
 OPTIONS_DEFAULT=	UNIQUE
 QRCODE_DESC=	QR Code support
 UNIQUE_DESC=	Unique (single instance) support
-QRCODE_LIB_DEPENDS=	libqrencode.so:${PORTSDIR}/graphics/libqrencode
+QRCODE_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 QRCODE_CONFIGURE_ENABLE=	libqrencode
-UNIQUE_LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+UNIQUE_LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
 UNIQUE_CONFIGURE_ENABLE=	unique
 
 GNU_CONFIGURE=	yes
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 89354214a102..b48579e6d62d 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -13,8 +13,8 @@ COMMENT=	D-Bus-based configuration storage system
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	p5-XML-Parser>=2.41:textproc/p5-XML-Parser
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
@@ -30,9 +30,9 @@ CONFIGURE_ARGS=--without-html-dir
 OPTIONS_DEFINE=		PERL NLS
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-PERL_BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:${PORTSDIR}/devel/p5-ExtUtils-Depends \
-	p5-ExtUtils-PkgConfig>=1.15:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-	p5-Glib2>=1.280:${PORTSDIR}/devel/p5-Glib2
+PERL_BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.304:devel/p5-ExtUtils-Depends \
+	p5-ExtUtils-PkgConfig>=1.15:devel/p5-ExtUtils-PkgConfig \
+	p5-Glib2>=1.280:devel/p5-Glib2
 PERL_USE=	perl5=run
 PERL_CONFIGURE_ENABLE=	perl-bindings
 OPTIONS_SUB=	yes
diff --git a/x11/xfce4-dashboard/Makefile b/x11/xfce4-dashboard/Makefile
index cfb597cb7d57..091c966f28f0 100644
--- a/x11/xfce4-dashboard/Makefile
+++ b/x11/xfce4-dashboard/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GNOME shell like dashboard for the Xfce desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+	libclutter-1.0.so:graphics/clutter
 
 GNU_CONFIGURE=	yes
 USES=	pkgconfig libtool gmake perl5 gettext xfce tar:bzip2
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index f07a97d6bb13..58668947de53 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Application and panel plugin to take screenshots
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11/xfce4-terminal/Makefile b/x11/xfce4-terminal/Makefile
index 1fbaf76bac3a..3b2d0735c403 100644
--- a/x11/xfce4-terminal/Makefile
+++ b/x11/xfce4-terminal/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Terminal emulator for the X windowing system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 glib20 intltool intlhack vte libxml2
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 89250e06f770..8e65b3ffe539 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Command line plugin for the Xfce Desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+	libdbus-glib-1.so:devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index 0d8bcf37fb1a..a2dbc827afc8 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Display all characters in an X font
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2
+BUILD_DEPENDS=	fc-cache:x11-fonts/fontconfig
+RUN_DEPENDS=	fc-cache:x11-fonts/fontconfig
 
 XORG_CAT=	app
 USE_XORG=	xft xt xaw
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 30282fc1cce1..d27125cedca6 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}sc.2_41
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 image grabber
 
-BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
+BUILD_DEPENDS=	xrdb:x11/xrdb
 
 USES=		display:build imake:notall tar:Z
 USE_XORG=	x11 xaw
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 078821a41ee2..4c220a5c1f2a 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -27,7 +27,7 @@ GUI_DESC=	Install Tk GUI
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGUI}
-RUN_DEPENDS+=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+RUN_DEPENDS+=	p5-Tk>=0:x11-toolkits/p5-Tk
 PLIST_SUB=	GUI=""
 MAKE_ARGS+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 .else
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index b801e83d7563..44bec00f3674 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -10,7 +10,7 @@ COMMENT=	X Keyboard Configuration Database
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
+BUILD_DEPENDS=	xkbcomp:x11/xkbcomp
 
 XORG_CAT=	data
 
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 6efd88728b3b..d6af1b4342b8 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -15,8 +15,8 @@ COMMENT=	X11 Image Loading Utility
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 CONFLICTS_INSTALL=	xli-*
 
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index e19974b9bb11..5b47dc570761 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--without-motif --without-ttf --without-editres \
 USE_GNOME=	#
 USE_XORG=	x11 xaw ice
 
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
 
 OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
 		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP
@@ -129,7 +129,7 @@ CONFIGURE_ARGS+=	--enable-customization
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickCore-6.so:graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--without-magick
 .endif
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
index c63c41cc1548..5a51948caac5 100644
--- a/x11/xmh/Makefile
+++ b/x11/xmh/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	x11 mail
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Send and read mail with an X interface to MH
 
-RUN_DEPENDS+=	repl:${PORTSDIR}/mail/nmh
+RUN_DEPENDS+=	repl:mail/nmh
 
 XORG_CAT=	app
 USE_XORG=	xaw xmu xt xbitmaps
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index f139ea04e14e..cf061ccedf78 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -43,7 +43,7 @@ check=${comp:C/.*://}
 .  if ${port:M*/*}==""
 port:=x11/${port}
 .  endif
-RUN_DEPENDS:=	${RUN_DEPENDS} ${check}:${PORTSDIR}/${port}
+RUN_DEPENDS:=	${RUN_DEPENDS} ${check}:${port}
 . endif
 .endfor
 
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index 62f54a9a895e..44fcabc4fb6e 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -16,46 +16,46 @@ NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
 
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
-		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
-		${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \
-		${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
-		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \
-		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman \
-		${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \
-		${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
-		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw \
-		${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \
-		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \
-		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \
-		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
-		${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \
-		${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \
-		${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
-		${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
-		${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
-		${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
-		${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \
-		${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \
-		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
-		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
-		${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
-		${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \
-		${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \
-		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \
-		${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
-		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
-		${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \
-		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
-		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
-		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
-		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \
-		${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \
-		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \
-		${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \
-		${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
-		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dmx.pc:x11/libdmx \
+		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc \
+		${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE \
+		${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS \
+		${LOCALBASE}/libdata/pkgconfig/oldx.pc:x11/liboldX \
+		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman \
+		${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM \
+		${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 \
+		${LOCALBASE}/libdata/pkgconfig/xau.pc:x11/libXau \
+		${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw \
+		${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite \
+		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor \
+		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage \
+		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp \
+		${LOCALBASE}/libdata/pkgconfig/xevie.pc:x11/libXevie \
+		${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext \
+		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes \
+		${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont \
+		${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont \
+		${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:x11-fonts/libXfontcache \
+		${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft \
+		${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi \
+		${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama \
+		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile \
+		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:x11/libxkbui \
+		${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu \
+		${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp \
+		${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm \
+		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr \
+		${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender \
+		${LOCALBASE}/libdata/pkgconfig/xres.pc:x11/libXres \
+		${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:x11/libXScrnSaver \
+		${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
+		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:x11/xtrans \
+		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:x11/libXTrap \
+		${LOCALBASE}/libdata/pkgconfig/xtst.pc:x11/libXtst \
+		${LOCALBASE}/libdata/pkgconfig/xv.pc:x11/libXv \
+		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:x11/libXvMC \
+		${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86dga \
+		${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc \
+		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm
 
 .include <bsd.port.mk>
diff --git a/x11/xorg-minimal/Makefile b/x11/xorg-minimal/Makefile
index b6d05ff78a88..3f6fc09d1d2e 100644
--- a/x11/xorg-minimal/Makefile
+++ b/x11/xorg-minimal/Makefile
@@ -14,21 +14,21 @@ USES=		metaport
 
 VIDEO_DRIVER?=	vesa
 
-RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server \
-		${LOCALBASE}/lib/xorg/modules/input/mouse_drv.so:${PORTSDIR}/x11-drivers/xf86-input-mouse \
-		${LOCALBASE}/lib/xorg/modules/input/kbd_drv.so:${PORTSDIR}/x11-drivers/xf86-input-keyboard \
-		${LOCALBASE}/bin/xinit:${PORTSDIR}/x11/xinit \
-		${LOCALBASE}/bin/xauth:${PORTSDIR}/x11/xauth
+RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:x11-servers/xorg-server \
+		${LOCALBASE}/lib/xorg/modules/input/mouse_drv.so:x11-drivers/xf86-input-mouse \
+		${LOCALBASE}/lib/xorg/modules/input/kbd_drv.so:x11-drivers/xf86-input-keyboard \
+		${LOCALBASE}/bin/xinit:x11/xinit \
+		${LOCALBASE}/bin/xauth:x11/xauth
 .if ${VIDEO_DRIVER} == "nvidia"
-RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/drivers/nvidia_drv.so:${PORTSDIR}/x11/nvidia-driver
+RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/drivers/nvidia_drv.so:x11/nvidia-driver
 .elif ${VIDEO_DRIVER} == "intel29"
-RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/drivers/intel_drv.so:${PORTSDIR}/x11-drivers/xf86-video-${VIDEO_DRIVER}
+RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/drivers/intel_drv.so:x11-drivers/xf86-video-${VIDEO_DRIVER}
 .else
-RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/drivers/${VIDEO_DRIVER}_drv.so:${PORTSDIR}/x11-drivers/xf86-video-${VIDEO_DRIVER}
+RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/drivers/${VIDEO_DRIVER}_drv.so:x11-drivers/xf86-video-${VIDEO_DRIVER}
 .endif
 
 .if ${VIDEO_DRIVER} == intel
-RUN_DEPENDS+=	${LOCALBASE}/lib/va/i965_drv_video.so:${PORTSDIR}/multimedia/libva-intel-driver
+RUN_DEPENDS+=	${LOCALBASE}/lib/va/i965_drv_video.so:multimedia/libva-intel-driver
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index cc57cc701e47..8481c80fd4a4 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -11,26 +11,26 @@ COMMENT=	X.Org complete distribution metaport
 
 USES=		metaport
 
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/dri
 
 # data
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
-		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps \
+		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:x11-themes/xcursor-themes
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:${PORTSDIR}/x11/xorg-docs
+DOCS_RUN_DEPENDS+=	${LOCALBASE}/share/doc/xorg-docs/README.xml:x11/xorg-docs
 
 # app, lib, font, driver
-RUN_DEPENDS+=	xorg-apps>0:${PORTSDIR}/x11/xorg-apps \
-		xorg-libraries>0:${PORTSDIR}/x11/xorg-libraries \
-		xorg-fonts>0:${PORTSDIR}/x11-fonts/xorg-fonts \
-		xorg-drivers>0:${PORTSDIR}/x11-drivers/xorg-drivers
+RUN_DEPENDS+=	xorg-apps>0:x11/xorg-apps \
+		xorg-libraries>0:x11/xorg-libraries \
+		xorg-fonts>0:x11-fonts/xorg-fonts \
+		xorg-drivers>0:x11-drivers/xorg-drivers
 
 .if defined(XORG_COMPLETE)
-RUN_DEPENDS+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
-		Xdmx:${PORTSDIR}/x11-servers/xorg-dmx \
-		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver
+RUN_DEPENDS+=	Xnest:x11-servers/xorg-nestserver \
+		Xdmx:x11-servers/xorg-dmx \
+		Xvfb:x11-servers/xorg-vfbserver
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 718682ee8caf..680be1e06804 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -12,23 +12,23 @@ COMMENT=	Xpra gives you persistent remote applications for X
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS=	py${PYTHON_SUFFIX}-lz4>=0.7.0_1:${PORTSDIR}/archivers/py-lz4 \
-		${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \
-		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:${PORTSDIR}/graphics/py-opengl-accelerate \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_SITELIBDIR}/netifaces.so:${PORTSDIR}/net/py-netifaces \
-		ssh-askpass:${PORTSDIR}/security/openssh-askpass \
-		setxkbmap:${PORTSDIR}/x11/setxkbmap \
-		xauth:${PORTSDIR}/x11/xauth \
-		xkbcomp:${PORTSDIR}/x11/xkbcomp \
-		${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
-		Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
+BUILD_DEPENDS=	cython:lang/cython \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
+RUN_DEPENDS=	py${PYTHON_SUFFIX}-lz4>=0.7.0_1:archivers/py-lz4 \
+		${PYTHON_SITELIBDIR}/rencode/__init__.py:converters/py-rencode \
+		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus \
+		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl \
+		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:graphics/py-opengl-accelerate \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_SITELIBDIR}/netifaces.so:net/py-netifaces \
+		ssh-askpass:security/openssh-askpass \
+		setxkbmap:x11/setxkbmap \
+		xauth:x11/xauth \
+		xkbcomp:x11/xkbcomp \
+		${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
+		Xvfb:x11-servers/xorg-vfbserver \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:x11-toolkits/py-gtkglext
 
 USES=		desktop-file-utils pkgconfig python shared-mime-info tar:xz
 USE_GSTREAMER=	good python
@@ -48,20 +48,20 @@ WEBP_DESC=	Enable WebP encoder
 X264_DESC=	Enable X264 encoder
 X265_DESC=	Enable X265 encoder
 
-AVAHI_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi
+AVAHI_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/avahi/__init__.py:net/py-avahi
 AVCODEC_VARS=		XPRA_OPTIONS+=dec_avcodec2
-CUPS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups
-OPENCL_LIB_DEPENDS=	libOpenCL.so:${PORTSDIR}/devel/ocl-icd
-OPENCL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyopencl/__init__.py:${PORTSDIR}/devel/py-pyopencl
+CUPS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:print/py-pycups
+OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
+OPENCL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyopencl/__init__.py:devel/py-pyopencl
 OPENCL_VARS=		XPRA_OPTIONS+=csc_opencl
 SWSCALE_VARS=		XPRA_OPTIONS+=csc_swscale
-VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_VARS=		XPRA_OPTIONS+=vpx
-WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_VARS=		XPRA_OPTIONS+=webp
-X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/libx264
+X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_VARS=		XPRA_OPTIONS+=enc_x264
-X265_LIB_DEPENDS=	libx265.so:${PORTSDIR}/multimedia/x265
+X265_LIB_DEPENDS=	libx265.so:multimedia/x265
 X265_VARS=		XPRA_OPTIONS+=enc_x265
 
 PYDISTUTILS_PKGNAME=	xpra_all
@@ -82,7 +82,7 @@ PYDISTUTILS_ARGS+=	--with-${opt}
 .endfor
 
 .if ${PORT_OPTIONS:MAVCODEC} || ${PORT_OPTIONS:MSWSCALE}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index dd901b475f5a..655391aeed46 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Python bindings to access X Window System protocol via libxcb
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto \
-		xcb-proto>=1.7.1:${PORTSDIR}/x11/xcb-proto
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:x11/xcb-proto \
+		xcb-proto>=1.7.1:x11/xcb-proto
 
 USES=		libtool pathfix pkgconfig python tar:bzip2
 USE_XORG=	xcb
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index fd795a081dd0..57f17f0676b9 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	xscreensaver-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat (for GNOME users)
 
-LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle
+LIB_DEPENDS=	libgle.so:graphics/gle
 
 #CONFLICTS?=	xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
@@ -57,7 +57,7 @@ PLIST_SUB+=		PAM="@comment "
 
 .if ${PORT_OPTIONS:MKEYRING}
 SUB_LIST+=		PAM_KEYRING=
-RUN_DEPENDS+=		${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
+RUN_DEPENDS+=		${LOCALBASE}/lib/pam_gnome_keyring.so:security/gnome-keyring
 .else
 SUB_LIST+=		PAM_KEYRING=\#
 .endif
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index 8d29d06b0166..b2798141fbd2 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/xscreensaverapp/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	hemi@puresimplicity.net
 COMMENT=	WindowMaker dockapp to control XScreenSaver
 
-LIB_DEPENDS=	libdockapp.so:${PORTSDIR}/x11-wm/libdockapp
+LIB_DEPENDS=	libdockapp.so:x11-wm/libdockapp
 
 PLIST_FILES=	bin/XScreenSaver.App
 GNU_CONFIGURE=	yes
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index ad6482ac02ca..5c8c3f240e57 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	http://www.jwz.org/xscreensaver/
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Save your screen while you entertain your cat
 
-RUN_DEPENDS=	p5-libwww>0:${PORTSDIR}/www/p5-libwww \
-		giftopnm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	libgle.so:${PORTSDIR}/graphics/gle
+RUN_DEPENDS=	p5-libwww>0:www/p5-libwww \
+		giftopnm:graphics/netpbm
+LIB_DEPENDS=	libgle.so:graphics/gle
 
 CONFLICTS=	xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
@@ -44,31 +44,31 @@ PAM_CONFIGURE_WITH=		pam
 SETUID_HACKS_DESC=		Install sonar hack suid so it can ping
 
 FIREF_DESC=			Add extra port x11/fireflies
-FIREF_RUN_DEPENDS=		${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
+FIREF_RUN_DEPENDS=		${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies
 
 NLS_USES=			gettext-runtime
 NLS_CONFIGURE_ENABLE=		nls
 
 XAOS1_DESC=			Add extra port graphics/xaos
-XAOS1_RUN_DEPENDS=		xaos:${PORTSDIR}/graphics/xaos
+XAOS1_RUN_DEPENDS=		xaos:graphics/xaos
 
 XDALI_DESC=			Add extra port x11-clocks/xdaliclock
-XDALI_RUN_DEPENDS=		xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock
+XDALI_RUN_DEPENDS=		xdaliclock:x11-clocks/xdaliclock
 
 XFT_CONFIGURE_WITH=		xft
 XFT_USE=			XORG=xft
 
 XEARTH_DESC=			Add extra port astro/xearth
-XEARTH_RUN_DEPENDS=		xearth:${PORTSDIR}/astro/xearth
+XEARTH_RUN_DEPENDS=		xearth:astro/xearth
 
 XMOUN_DESC=			Add extra port graphics/xmountains
-XMOUN_RUN_DEPENDS=		xmountains:${PORTSDIR}/graphics/xmountains
+XMOUN_RUN_DEPENDS=		xmountains:graphics/xmountains
 
 XPLANET_DESC=			Add extra port astro/xplanet
-XPLANET_RUN_DEPENDS=		xplanet:${PORTSDIR}/astro/xplanet
+XPLANET_RUN_DEPENDS=		xplanet:astro/xplanet
 
 XSNOW_DESC=			Add extra port x11/xsnow
-XSNOW_RUN_DEPENDS=		xsnow:${PORTSDIR}/x11/xsnow
+XSNOW_RUN_DEPENDS=		xsnow:x11/xsnow
 
 SUB_FILES=	xscreensaver-blank.desktop xscreensaver-lock.desktop \
 		xscreensaver-start.desktop xscreensaver-stop.desktop
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 57478211a82f..5daca6f85266 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -47,24 +47,24 @@ SCRNDUMP_DESC=	Enable XHTML and SVG screen dumps
 OPTIONS_DEFAULT=WCHAR LUIT 256COLOR
 
 256COLOR_CONFIGURE_ENABLE=	256-color
-LUIT_BUILD_DEPENDS=		luit:${PORTSDIR}/x11/luit
+LUIT_BUILD_DEPENDS=		luit:x11/luit
 LUIT_CONFIGURE_ENABLE=		luit
 WCHAR_CONFIGURE_ENABLE=		wide-chars
 WCHAR_VARS=			PKGMESSAGE="${PKGDIR}/pkg-message.wchar"
 DECTERM_CONFIGURE_ENABLE=	dec-locator
 PCRE_CONFIGURE_WITH=		pcre
-PCRE_LIB_DEPENDS=		libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=		libpcre.so:devel/pcre
 DABBREV_CONFIGURE_ENABLE=	dabbrev
 SIXEL_CONFIGURE_ENABLE=		sixel-graphics
 GNOME_USES=			desktop-file-utils
 LOGGING_CONFIGURE_ENABLE=	logging
 SCRNDUMP_CONFIGURE_ENABLE=	screen-dumps
 XAW3D_CONFIGURE_WITH=		Xaw3d
-XAW3D_LIB_DEPENDS=		libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=		libXaw3d.so:x11-toolkits/Xaw3d
 XAW3DXFT_CONFIGURE_WITH=	Xaw3dxft
-XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:${PORTSDIR}/x11-toolkits/libxaw3dxft
+XAW3DXFT_LIB_DEPENDS=		libXaw3dxft.so:x11-toolkits/libxaw3dxft
 NEXTAW_CONFIGURE_WITH=		neXtaw
-NEXTAW_LIB_DEPENDS=		libneXtaw.so:${PORTSDIR}/x11-toolkits/neXtaw
+NEXTAW_LIB_DEPENDS=		libneXtaw.so:x11-toolkits/neXtaw
 
 .include <bsd.port.options.mk>
 
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 98de0568334f..30b2aba44461 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFINE=		DOCS NLS XAW3D XTEST
 OPTIONS_DEFAULT=	XTEST
 
 XAW3D_DESC=		Xaw3d widget library support
-XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 XTEST_DESC=		XTEST extensions support
 XTEST_USE=		xorg=xtst
 
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index b983f8e46d9b..590a5de2fbe1 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	README CHANGES.ru README.ru
 
 OPTIONS_DEFINE=	LIBRSVG2 DOCS
 
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 LIBRSVG2_VARS=		XMKMF_ARGS=-DWITH_SVG_SUPPORT
 
 post-build:
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 2510a793834f..1a226a7e4e1c 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Help browser for the GNOME 3 desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3
-RUN_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl
+BUILD_DEPENDS=	yelp-xsl>=0:textproc/yelp-xsl \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+RUN_DEPENDS=	yelp-xsl>=0:textproc/yelp-xsl
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index d1266e1d5f23..080e7ebe5de3 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Display GNOME dialogs from the command line
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	gtkada-1.2.* zenity-2.*
 
@@ -25,7 +25,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=libnotify
 
 post-patch:
author	Mathieu Arnold <mat@FreeBSD.org>	2016-04-01 14:33:55 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2016-04-01 14:33:55 +0000
commit	72ea7e696b763bdbcef04fdbccc122c0364fa567 (patch)
tree	38b741bb92caf8470d126310c77168cb30040476 /x11
parent	- Update to 1.2.2 (diff)