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)
170 files changed, 863 insertions, 863 deletions
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)