26 files changed, 111 insertions, 111 deletions

diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index 40ca85aafb60..210de670773d 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ASFiles-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 file manager. Dockable in WindowMaker
 
-LIB_DEPENDS=	libDnd.so:${PORTSDIR}/x11/libdnd
+LIB_DEPENDS=	libDnd.so:x11/libdnd
 
 USES=		perl5
 GNU_CONFIGURE=	yes
diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index 07ef36a1e7c9..e044cb5505a8 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	File manager for the MATE desktop
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
-		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd:${PORTSDIR}/devel/gvfs
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libunique-1.0.so:x11-toolkits/unique \
+		libexempi.so:textproc/exempi
+RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd:devel/gvfs
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-fm/deforaos-browser/Makefile b/x11-fm/deforaos-browser/Makefile
index 6da2d24008c3..37d783465754 100644
--- a/x11-fm/deforaos-browser/Makefile
+++ b/x11-fm/deforaos-browser/Makefile
@@ -14,15 +14,15 @@ COMMENT=	DeforaOS desktop file browser
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
-		libXrandr.so:${PORTSDIR}/x11/libXrandr
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop \
+		libXrandr.so:x11/libXrandr
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 NLS_USES=		gettext
-DOCS_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-    ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+    ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 USE_GNOME=	gtk20
 USES=		desktop-file-utils pkgconfig
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 4745cbc8fc80..9fd9c9ba28ad 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Total Commander like file manager for the X Window System
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
-		fpcres:${PORTSDIR}/lang/fpc-utils
+BUILD_DEPENDS=	lazbuild:editors/lazarus \
+		fpcres:lang/fpc-utils
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -99,14 +99,14 @@ OPTIONS_DEFAULT=	GTK2 \
 			DSX_LOCATE
 
 GTK2_USE=		fpc=gtk2 gnome=gtk20
-GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 
-QT4_LIB_DEPENDS=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
-QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
+QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
 
-WCX_UNRAR_LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar
-WFX_SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-WLX_MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+WCX_UNRAR_LIB_DEPENDS=	libunrar.so:archivers/libunrar
+WFX_SAMBA_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
+WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index c29b67fe38b7..51d6783fd2ff 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -42,13 +42,13 @@ GTK2_MAKE_ENV=		WITH_GTK2=1 WITH_GTK3=0
 GTK2_USE=		GNOME=gtk20
 GTK3_MAKE_ENV=		WITH_GTK2=0 WITH_GTK3=1
 GTK3_USE=		GNOME=gtk30
-THUMB_LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp
+THUMB_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp
 THUMB_MAKE_ENV=		WITH_THUMB=1
 TRACKER_MAKE_ENV=	WITH_TRACKER=1
 NLS_USES=		gettext
 NLS_INSTALL_TARGET=	install_i18n
 HAL_MAKE_ENV=		WITH_HAL=1
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 
 post-patch:
 # fix cross-arch compiling, which sets ${TARGET}
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index c887a2ab7367..75b623ae8791 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	EZWGL-based file manager for X Window System
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libEZ.so:${PORTSDIR}/graphics/EZWGL
+LIB_DEPENDS=	libEZ.so:graphics/EZWGL
 
 USES=		gmake jpeg tar:tgz
 
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index b34a6e92d72c..07c6348814f5 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -14,9 +14,9 @@ COMMENT=	File manager for Gnome2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-RUN_DEPENDS=	meld:${PORTSDIR}/textproc/meld \
-		yelp:${PORTSDIR}/x11/yelp
+LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
+RUN_DEPENDS=	meld:textproc/meld \
+		yelp:x11/yelp
 
 USES=		gettext gmake libtool pathfix pkgconfig python tar:xz
 USE_GNOME=	gnomedocutils gnomeprefix gnomevfs2 intltool libgnomeui
@@ -33,17 +33,17 @@ OPTIONS_DEFINE=		CHM EXIV2 GSF POPPLER TAGLIB
 OPTIONS_DEFAULT=	CHM EXIV2 GSF POPPLER TAGLIB
 
 CHM_DESC=		CHM support via chmlib
-CHM_LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+CHM_LIB_DEPENDS=	libchm.so:misc/chmlib
 CHM_CONFIGURE_WITH=	libchm
-EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_WITH=	exiv2
 GSF_DESC=		OLE and ODF support via libgsf
-GSF_LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
+GSF_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 GSF_CONFIGURE_WITH=	libgsf
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_CONFIGURE_WITH=	poppler
 TAGLIB_DESC=		Audio metadata support via taglib
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CONFIGURE_WITH=	taglib
 
 post-patch:
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 10b8614abb48..77f38255256d 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl script for renaming multiple files
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		p5-Locale-gettext>=0:devel/p5-Locale-gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/trunk
 
diff --git a/x11-fm/librfm/Makefile b/x11-fm/librfm/Makefile
index 2f962f8a6e79..21838afe9701 100644
--- a/x11-fm/librfm/Makefile
+++ b/x11-fm/librfm/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Basic library used by some rfm applications
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	libtubo.so:${PORTSDIR}/x11-fm/libtubo \
-		libdbh.so:${PORTSDIR}/databases/dbh \
-		libzip.so:${PORTSDIR}/archivers/libzip \
-		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
+BUILD_DEPENDS=	gawk:lang/gawk
+LIB_DEPENDS=	libtubo.so:x11-fm/libtubo \
+		libdbh.so:databases/dbh \
+		libzip.so:archivers/libzip \
+		librsvg-2.so:graphics/librsvg2
 
 OPTIONS_DEFINE=	NLS
 
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 77a95afffc63..ee75f8a5da41 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	MToolsFM-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical frontend to mtools
 
-RUN_DEPENDS=	mtools:${PORTSDIR}/emulators/mtools
+RUN_DEPENDS=	mtools:emulators/mtools
 
 USES=		gettext pathfix
 USE_GNOME=	gtk12
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 30798e02656c..64818ad58352 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the GNOME desktop
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libnotify.so:devel/libnotify \
+		libexempi.so:textproc/exempi
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
@@ -34,7 +34,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	TRACKER
 OPTIONS_DEFAULT=TRACKER
 TRACKER_DESC=	Tracker support
-TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker
+TRACKER_LIB_DEPENDS=	libtracker-control-1.0.so:sysutils/tracker
 TRACKER_CONFIGURE_ENABLE=	tracker
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index a01ea17eaacd..3990a73c3028 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -9,17 +9,17 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the Cinnamon desktop
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gtkdocize:${PORTSDIR}/textproc/gtk-doc \
-		py*-polib>=0:${PORTSDIR}/devel/py-polib \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libexempi.so:${PORTSDIR}/textproc/exempi
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gtkdocize:textproc/gtk-doc \
+		py*-polib>=0:devel/py-polib \
+		gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libnotify.so:devel/libnotify \
+		libexempi.so:textproc/exempi
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf:build desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig python:2 shared-mime-info
@@ -41,7 +41,7 @@ OPTIONS_SUB=			yes
 OPTIONS_DEFINE=			TRACKER
 OPTIONS_DEFAULT=		TRACKER
 TRACKER_CONFIGURE_ENABLE=	tracker
-TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker
+TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:sysutils/tracker
 TRACKER_DESC=			Integration with tracker
 
 post-patch:
diff --git a/x11-fm/p5-PerlFM/Makefile b/x11-fm/p5-PerlFM/Makefile
index 0000e91e8dc1..2eb0e4c3e8c1 100644
--- a/x11-fm/p5-PerlFM/Makefile
+++ b/x11-fm/p5-PerlFM/Makefile
@@ -12,14 +12,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Perl based file manager
 
-BUILD_DEPENDS=	p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-Gtk2-Chmod>=0.0.0:${PORTSDIR}/x11-toolkits/p5-Gtk2-Chmod \
-		p5-Gtk2-PathButtonBar>=0.1.2:${PORTSDIR}/x11-toolkits/p5-Gtk2-PathButtonBar \
-		p5-String-ShellQuote>=1.03:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		p5-File-Stat-Bits>=1.01:${PORTSDIR}/sysutils/p5-File-Stat-Bits \
-		p5-ZConf-Bookmarks>=0.2.3:${PORTSDIR}/net/p5-ZConf-Bookmarks \
-		p5-ZConf-Runner>=2.1.1:${PORTSDIR}/deskutils/p5-ZConf-Runner \
-		p5-Dir-Watch>=0.0.0:${PORTSDIR}/devel/p5-Dir-Watch
+BUILD_DEPENDS=	p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-Gtk2-Chmod>=0.0.0:x11-toolkits/p5-Gtk2-Chmod \
+		p5-Gtk2-PathButtonBar>=0.1.2:x11-toolkits/p5-Gtk2-PathButtonBar \
+		p5-String-ShellQuote>=1.03:textproc/p5-String-ShellQuote \
+		p5-File-Stat-Bits>=1.01:sysutils/p5-File-Stat-Bits \
+		p5-ZConf-Bookmarks>=0.2.3:net/p5-ZConf-Bookmarks \
+		p5-ZConf-Runner>=2.1.1:deskutils/p5-ZConf-Runner \
+		p5-Dir-Watch>=0.0.0:devel/p5-Dir-Watch
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 7991d47d40e4..8c34af42f6c7 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -11,7 +11,7 @@ COMMENT=	PCMan File Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfm-gtk.so:${PORTSDIR}/x11/libfm
+LIB_DEPENDS=	libfm-gtk.so:x11/libfm
 
 USES=		autoreconf desktop-file-utils gettext gmake libtool pkgconfig \
 		tar:xz
diff --git a/x11-fm/rodent/Makefile b/x11-fm/rodent/Makefile
index 7ec8a9d14905..73fb8faea84b 100644
--- a/x11-fm/rodent/Makefile
+++ b/x11-fm/rodent/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Fast, small, and powerful file manager
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		bash:${PORTSDIR}/shells/bash \
-		intltoolize:${PORTSDIR}/textproc/intltool
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libmagic.so:${PORTSDIR}/sysutils/file \
-		librfm.so:${PORTSDIR}/x11-fm/librfm
+BUILD_DEPENDS=	gawk:lang/gawk \
+		bash:shells/bash \
+		intltoolize:textproc/intltool
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libmagic.so:sysutils/file \
+		librfm.so:x11-fm/librfm
 
 USES=		desktop-file-utils gmake libtool:keepla pkgconfig tar:bzip2 shebangfix
 USE_GNOME=	glib20 gtk20 librsvg2 libxml2
diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile
index 4814932e9040..6f807a5e18f7 100644
--- a/x11-fm/rox-mime-editor/Makefile
+++ b/x11-fm/rox-mime-editor/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	mime-editor-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	MIME type editor for the ROX desktop
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 USES=		python tar:bzip2
 
diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 2295a5338c9b..2168a71f8e2c 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Simple session manager for the ROX desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${PYTHON_PKGNAMEPREFIX}roxlib>=0:${PORTSDIR}/devel/py-roxlib \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus
 
 WRKSRC=		${WRKDIR}/ROX-Session
 DATADIR=	${PREFIX}/apps/ROX-Session
@@ -31,7 +31,7 @@ GDM_DESC=	Install GDM login manager
 
 SUB_FILES=	${PORTNAME} rox.desktop
 
-GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
+GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:x11/gdm
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile
index 89fe9aee1101..5432c505d16c 100644
--- a/x11-fm/sushi/Makefile
+++ b/x11-fm/sushi/Makefile
@@ -10,14 +10,14 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tool similar to Gloobus Preview that provides quick file previews
 
-LIB_DEPENDS=	libgcr-3.so:${PORTSDIR}/security/gcr \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \
-		libevdocument3.so:${PORTSDIR}/graphics/evince
-RUN_DEPENDS=	nautilus:${PORTSDIR}/x11-fm/nautilus
+LIB_DEPENDS=	libgcr-3.so:security/gcr \
+		libgjs.so:lang/gjs \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libmusicbrainz5.so:audio/libmusicbrainz5 \
+		libevdocument3.so:graphics/evince
+RUN_DEPENDS=	nautilus:x11-fm/nautilus
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index 5f3304e39c0e..d1f9c26c054c 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	3D filesystem browser
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 
 USE_GL=		glut
 USE_SDL=	image sdl
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 9449adb2b1de..6eec1c2c44e7 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -14,9 +14,9 @@ COMMENT=	The virtual filesystem for Thunar
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgamin-1.so:${PORTSDIR}/devel/gamin
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libgamin-1.so:devel/gamin
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 gdkpixbuf2 intltool intlhack
@@ -32,12 +32,12 @@ OPTIONS_DEFAULT=	NLS HAL DBUS STARTUP
 STARTUP_DESC=	Startup notification
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
 HAL_CONFIGURE_WITH=	volume-manager=hal
 HAL_CONFIGURE_OFF=	--with-volume-manager=freebsd
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CONFIGURE_ENABLE=	dbus
-STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
+STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 GCONF_USE=	gnome=gconf2
 GCONF_CONFIGURE_ENABLE=	gnome-thumbnailers
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 91174ba745f8..ec03490a5c60 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -15,9 +15,9 @@ LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libtumbler-1.so:${PORTSDIR}/deskutils/xfce4-tumbler \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libtumbler-1.so:deskutils/xfce4-tumbler \
+	libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	pkexec:sysutils/polkit
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -44,11 +44,11 @@ PLUG_WALL_DESC=	Wallpaper plugin
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	notifications
-PLUG_APR_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+PLUG_APR_LIB_DEPENDS=	libexif.so:graphics/libexif
 PLUG_APR_CONFIGURE_ENABLE=	apr-plugin exif
-PLUG_SBR_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PLUG_SBR_LIB_DEPENDS=	libpcre.so:devel/pcre
 PLUG_SBR_CONFIGURE_ENABLE=	sbr-plugin pcre
 PLUG_TPA_USE=	gnome=gvfs xfce=panel
 PLUG_TPA_CONFIGURE_ENABLE=	tpa-plugin
diff --git a/x11-fm/twander/Makefile b/x11-fm/twander/Makefile
index 5065c89fdbec..0f8754339a73 100644
--- a/x11-fm/twander/Makefile
+++ b/x11-fm/twander/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.tundraware.com/Software/twander/
 MAINTAINER=	twander@tundraware.com
 COMMENT=	Better Filesystem Browser
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
 
 USES=		python
 NO_ARCH=	yes
diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile
index 22904f1d9d88..9f4f6679be75 100644
--- a/x11-fm/wcmcommander/Makefile
+++ b/x11-fm/wcmcommander/Makefile
@@ -26,13 +26,13 @@ PORTDOCS=	CHANGELOG.txt README.md readme_eng.txt
 OPTIONS_DEFINE=	FREETYPE SMB SSH DOCS
 OPTIONS_DEFAULT=FREETYPE SMB SSH
 
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FREETYPE_CMAKE_ON=	-DWITH_FREETYPE=ON
 FREETYPE_CMAKE_OFF=	-DWITH_FREETYPE=OFF
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CMAKE_ON=		-DWITH_SMBCLIENT=ON
 SMB_CMAKE_OFF=		-DWITH_SMBCLIENT=OFF
-SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_CMAKE_ON=		-DWITH_LIBSSH2=ON
 SSH_CMAKE_OFF=		-DWITH_LIBSSH2=OFF
 
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 5fa90a8523a2..9229b73f8758 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -11,7 +11,7 @@ COMMENT=	X11 file manager based on Directory Opus of AmigaOS
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c++11-lib pkgconfig shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
@@ -28,11 +28,11 @@ OPTIONS_EXCLUDE_DragonFly=	AVFS
 INOTIFY_DESC=	Monitor directory changes via libinotify
 AVFS_DESC=	Use AVFS library to access an archives
 
-AVFS_LIB_DEPENDS=	libavfs.so:${PORTSDIR}/sysutils/avfs
+AVFS_LIB_DEPENDS=	libavfs.so:sysutils/avfs
 
-HAL_LIB_DEPENDS=	libhal-storage.so:${PORTSDIR}/sysutils/hal \
-			libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+HAL_LIB_DEPENDS=	libhal-storage.so:sysutils/hal \
+			libdbus-glib-1.so:devel/dbus-glib
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 INOTIFY_LDFLAGS=	-L${LOCALBASE}/lib
 
 LUA_CONFIGURE_OFF=	--disable-lua
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 728ba2582a70..15ad57b4fa17 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://xdiskusage.sourceforge.net/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show where disk space is taken up
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake tar:tgz
 
diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile
index 83c0494b75b3..8e1f33bed478 100644
--- a/x11-fm/xfe/Makefile
+++ b/x11-fm/xfe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast MS-Explorer like file manager for X
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
+LIB_DEPENDS=	libFOX-1.6.so:x11-toolkits/fox16
 
 USES=		desktop-file-utils gmake localbase pathfix
 USE_XORG=	xft