Remove ${PORTSDIR}/ from dependencies, categories d, e, f, and g.

With hat: portmgr Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2016-04-01 14:00:51 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2016-04-01 14:00:51 +0000
commit: 4e1b79a0a61f4973df8b4b0864d22086c769e219 (patch)
tree: 78ceaf1b099c56a40c240ab46278cdf4ae9e7c01 /deskutils
parent: Remove ${PORTSDIR}/ from dependencies, Mk and categories a, b, and c. (diff)
168 files changed, 746 insertions, 746 deletions
diff --git a/deskutils/anamnesis/Makefile b/deskutils/anamnesis/Makefile
index 5785f2d5431e..53180934712f 100644
--- a/deskutils/anamnesis/Makefile
+++ b/deskutils/anamnesis/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Clipboard manager that stores all clipboard history
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
 
 USES=		python
 PORTDOCS=	ChangeLog README
diff --git a/deskutils/baobab/Makefile b/deskutils/baobab/Makefile
index 6825ff173798..b30a8e34f67f 100644
--- a/deskutils/baobab/Makefile
+++ b/deskutils/baobab/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 graphical directory tree analyzer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		vapigen:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		vapigen:lang/vala
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index b026ab6d407f..439fe323c666 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Desktop organization tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
+LIB_DEPENDS=	libgpgme.so:security/gpgme
 
 USES=		cmake gettext-tools tar:bzip2
 USE_XORG=	xft xpm
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index 70db6143a47d..3fdfec411ad4 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Note editor designed to remain simple to use
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libtracker-control-1.0.so:sysutils/tracker \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index be046f704be6..fb7922ddeb2a 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	libgldi.so:${PORTSDIR}/deskutils/cairo-dock
+RUN_DEPENDS=	wget:ftp/wget
+LIB_DEPENDS=	libgldi.so:deskutils/cairo-dock
 
 DATADIR=	${PREFIX}/share/cairo-dock
 
@@ -68,16 +68,16 @@ PLUGINS_DESC=		Plug-ins
 ADDON_DESC=		Add On
 #TPI_DESC=		Third Party Interfaces
 
-ALSA_MIXER_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_MIXER_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_MIXER_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_MIXER_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_MIXER_CMAKE_ON=	-Denable-alsa-mixer:BOOL=TRUE
 ALSA_MIXER_CMAKE_OFF=	-Denable-alsa-mixer:BOOL=FALSE
 
-EXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 EXIF_CMAKE_ON=		-Denable-exif-support:BOOL=TRUE
 EXIF_CMAKE_OFF=		-Denable-exif-support:BOOL=FALSE
 
-GMENU_LIB_DEPENDS=	libgnome-menu-3.so:${PORTSDIR}/x11/gnome-menus
+GMENU_LIB_DEPENDS=	libgnome-menu-3.so:x11/gnome-menus
 GMENU_CMAKE_ON=		-Denable-gmenu:BOOL=TRUE
 GMENU_CMAKE_OFF=	-Denable-gmenu:BOOL=FALSE
 
@@ -85,11 +85,11 @@ GMENU_CMAKE_OFF=	-Denable-gmenu:BOOL=FALSE
 GNOME_INTEGRATION_CMAKE_ON=	-Denable-gnome-integration:BOOL=TRUE
 GNOME_INTEGRATION_CMAKE_OFF=	-Denable-gnome-integration:BOOL=FALSE
 
-ICAL_LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+ICAL_LIB_DEPENDS=	libical.so:devel/libical
 ICAL_CMAKE_ON=		-Denable-ical-support:BOOL=TRUE
 ICAL_CMAKE_OFF=		-Denable-ical-support:BOOL=FALSE
 
-IMPULSE_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+IMPULSE_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 IMPULSE_CMAKE_ON=	-Denable-impulse:BOOL=TRUE
 IMPULSE_CMAKE_OFF=	-Denable-impulse:BOOL=FALSE
 
@@ -99,17 +99,17 @@ KDE_INTEGRATION_USE_KDE4=	kdelibs
 KDE_INTEGRATION_CMAKE_ON=	-Denable-kde-integration:BOOL=TRUE
 KDE_INTEGRATION_CMAKE_OFF=	-Denable-kde-integration:BOOL=FALSE
 
-KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-				libxklavier.so:${PORTSDIR}/x11/libxklavier
+KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:graphics/libexif \
+				libxklavier.so:x11/libxklavier
 KEYBOARD_INDICATOR_CMAKE_ON=	-Denable-keyboard-indicator:BOOL=TRUE
 KEYBOARD_INDICATOR_CMAKE_OFF=	-Denable-keyboard-indicator:BOOL=FALSE
 
-MAIL_LIB_DEPENDS=	libetpan.so:${PORTSDIR}/mail/libetpan
+MAIL_LIB_DEPENDS=	libetpan.so:mail/libetpan
 MAIL_CMAKE_ON=		-Denable-mail:BOOL=TRUE
 MAIL_CMAKE_OFF=		-Denable-mail:BOOL=FALSE
 
-#MONO_BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
-#MONO_RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
+#MONO_BUILD_DEPENDS=	mono:lang/mono
+#MONO_RUN_DEPENDS=	mono:lang/mono
 #MONO_CMAKE_ON=		-Denable-mono-interface:BOOL=TRUE
 #MONO_CMAKE_OFF=		-Denable-mono-interface:BOOL=FALSE
 CMAKE_ARGS+=		-Denable-mono-interface:BOOL=FALSE
@@ -124,17 +124,17 @@ CMAKE_ARGS+=		-Denable-python-interface:BOOL=FALSE
 #RUBY_CMAKE_OFF=		-Denable-ruby-interface:BOOL=FALSE
 CMAKE_ARGS+=		-Denable-ruby-interface:BOOL=FALSE
 
-SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 SOUND_EFFECTS_CMAKE_ON=		-Denable-sound-effects:BOOL=TRUE
 SOUND_EFFECTS_CMAKE_OFF=	-Denable-sound-effects:BOOL=FALSE
 
 # Needs newer vte
-#TERMINAL_LIB_DEPENDS=	vte:${PORTSDIR}/x11-toolkits/vte
+#TERMINAL_LIB_DEPENDS=	vte:x11-toolkits/vte
 #TERMINAL_CMAKE_ON=	-Denable-terminal:BOOL=TRUE
 #TERMINAL_CMAKE_OFF=	-Denable-terminal:BOOL=FALSE
 
-UPOWER_LIB_DEPENDS=	libupower-glib.so:${PORTSDIR}/sysutils/upower
+UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 UPOWER_CMAKE_ON=	-Denable-upower-support:BOOL=TRUE
 UPOWER_CMAKE_OFF=	-Denable-upower-support:BOOL=FALSE
 
@@ -143,19 +143,19 @@ UPOWER_CMAKE_OFF=	-Denable-upower-support:BOOL=FALSE
 #VALA_CMAKE_OFF=		-Denable-vala-interface:BOOL=FALSE
 CMAKE_ARGS+=		-Denable-vala-interface:BOOL=FALSE
 
-WEBLETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+WEBLETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 WEBLETS_CMAKE_ON=	-Denable-weblets:BOOL=TRUE
 WEBLETS_CMAKE_OFF=	-Denable-weblets:BOOL=FALSE
 
-XGAMMA_RUN_DEPENDS=	xgamma:${PORTSDIR}/x11/xgamma
+XGAMMA_RUN_DEPENDS=	xgamma:x11/xgamma
 XGAMMA_CMAKE_ON=	-Denable-xgamma:BOOL=TRUE
 XGAMMA_CMAKE_OFF=	-Denable-xgamma:BOOL=FALSE
 
-XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:graphics/libexif
 XFCE_INTEGRATION_CMAKE_ON=	-Denable-xfce-integration:BOOL=TRUE
 XFCE_INTEGRATION_CMAKE_OFF=	-Denable-xfce-integration:BOOL=FALSE
 
-ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:${PORTSDIR}/sysutils/zeitgeist
+ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 ZEITGEIST_CMAKE_ON=	-Denable-recent-events:BOOL=TRUE
 ZEITGEIST_CMAKE_OFF=	-Denable-recent-events:BOOL=FALSE
 
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index a368faea8094..f18865d56c00 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -10,12 +10,12 @@ COMMENT=	Cairo-Dock is a light and eye-candy dock
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		sox:${PORTSDIR}/audio/sox
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libcurl.so:ftp/curl \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+RUN_DEPENDS=	bash:shells/bash \
+		sox:audio/sox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cairo-Dock
diff --git a/deskutils/caja-extensions/Makefile b/deskutils/caja-extensions/Makefile
index 08b7e425c6e2..6744e847582c 100644
--- a/deskutils/caja-extensions/Makefile
+++ b/deskutils/caja-extensions/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Set of extensions for Caja
 
-LIB_DEPENDS=	libgupnp-1.0.so:${PORTSDIR}/net/gupnp
+LIB_DEPENDS=	libgupnp-1.0.so:net/gupnp
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index d2fe90dea73b..db25674bec1d 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -10,50 +10,50 @@ MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 
-LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libpoppler-qt5.so:${PORTSDIR}/graphics/poppler-qt5 \
-		libwmflite.so:${PORTSDIR}/graphics/libwmf \
-		libchm.so:${PORTSDIR}/misc/chmlib \
-		libicudata.so:${PORTSDIR}/devel/icu \
-		libpodofo.so:${PORTSDIR}/graphics/podofo \
-		libmtp.so:${PORTSDIR}/multimedia/libmtp
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \
-		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \
-		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}apsw>=0:${PORTSDIR}/databases/py-apsw
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:${PORTSDIR}/devel/py-qt5-core \
-		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:${PORTSDIR}/x11-toolkits/py-qt5-gui \
-		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:${PORTSDIR}/net/py-qt5-network \
-		${PYTHON_PKGNAMEPREFIX}qt5-svg>=0:${PORTSDIR}/graphics/py-qt5-svg \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:${PORTSDIR}/www/py-qt5-webkit \
-		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:${PORTSDIR}/x11-toolkits/py-qt5-widgets \
-		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:${PORTSDIR}/www/py-qt5-webkitwidgets \
-		${PYTHON_PKGNAMEPREFIX}qt5-xmlpatterns>=0:${PORTSDIR}/textproc/py-qt5-xmlpatterns \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}netifaces>=0:${PORTSDIR}/net/py-netifaces \
-		${PYTHON_PKGNAMEPREFIX}cssselect>=0:${PORTSDIR}/www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}apsw>=0:${PORTSDIR}/databases/py-apsw \
-		pdftohtml:${PORTSDIR}/graphics/poppler-utils
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libpoppler-qt5.so:graphics/poppler-qt5 \
+		libwmflite.so:graphics/libwmf \
+		libchm.so:misc/chmlib \
+		libicudata.so:devel/icu \
+		libpodofo.so:graphics/podofo \
+		libmtp.so:multimedia/libmtp
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:devel/py-qt5-core \
+		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:x11-toolkits/py-qt5-gui \
+		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:net/py-qt5-network \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:www/py-qt5-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:x11-toolkits/py-qt5-widgets \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:www/py-qt5-webkitwidgets \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt5-core>=0:devel/py-qt5-core \
+		${PYTHON_PKGNAMEPREFIX}qt5-gui>=0:x11-toolkits/py-qt5-gui \
+		${PYTHON_PKGNAMEPREFIX}qt5-network>=0:net/py-qt5-network \
+		${PYTHON_PKGNAMEPREFIX}qt5-svg>=0:graphics/py-qt5-svg \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkit>=0:www/py-qt5-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt5-widgets>=0:x11-toolkits/py-qt5-widgets \
+		${PYTHON_PKGNAMEPREFIX}qt5-webkitwidgets>=0:www/py-qt5-webkitwidgets \
+		${PYTHON_PKGNAMEPREFIX}qt5-xmlpatterns>=0:textproc/py-qt5-xmlpatterns \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \
+		${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \
+		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \
+		pdftohtml:graphics/poppler-utils
 
 USE_RC_SUBR=	calibre
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
diff --git a/deskutils/california/Makefile b/deskutils/california/Makefile
index 803a5d7883a5..62c282c78043 100644
--- a/deskutils/california/Makefile
+++ b/deskutils/california/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Calendar client for GNOME 3
 
 IGNORE=		Not compatible with evolution-data-server 3.16.0
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
-LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libgdata.so:${PORTSDIR}/devel/libgdata \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		xdg-open:devel/xdg-utils
+LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3 \
+		libsoup-2.4.so:devel/libsoup \
+		libgee-0.8.so:devel/libgee \
+		libgdata.so:devel/libgdata \
+		libgoa-1.0.so:net/gnome-online-accounts
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index d65a6842ca18..6daf318cc353 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Qt based tool for offline CD/DVD/disk catalogs
 LICENSE=	GPLv2 MPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	cryptopp>0:${PORTSDIR}/security/cryptopp
-LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \
-		libzen.so:${PORTSDIR}/multimedia/libzen
+BUILD_DEPENDS=	cryptopp>0:security/cryptopp
+LIB_DEPENDS=	libtar.so:devel/libtar \
+		libexif.so:graphics/libexif \
+		libmediainfo.so:multimedia/libmediainfo \
+		libzen.so:multimedia/libzen
 
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
diff --git a/deskutils/clipit/Makefile b/deskutils/clipit/Makefile
index 75c98f732b95..3d5f37faff14 100644
--- a/deskutils/clipit/Makefile
+++ b/deskutils/clipit/Makefile
@@ -23,7 +23,7 @@ OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ON=	localedir=${LOCALBASE}/share/locale
 NLS_CONFIGURE_OFF=	--disable-nls
-XDOTOOL_RUN_DEPENDS+=	xdotool:${PORTSDIR}/x11/xdotool
+XDOTOOL_RUN_DEPENDS+=	xdotool:x11/xdotool
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^itlocaledir =.*|itlocaledir = $$(datarootdir)/locale|' \
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index 451bb6d1fd29..ef9584668a0f 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -11,16 +11,16 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Synchronization application for GNOME
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
+		xdg-open:devel/xdg-utils
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pathfix pkgconfig python:2
@@ -38,8 +38,8 @@ EOG_DESC=	Build Eye-Of-Gnome Plugin
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEOG}
-BUILD_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
-RUN_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
+BUILD_DEPENDS+=	eog:graphics/eog
+RUN_DEPENDS+=	eog:graphics/eog
 CONFIGURE_ARGS+=	--enable-eog-plugin
 .endif
 
diff --git a/deskutils/conkyemail/Makefile b/deskutils/conkyemail/Makefile
index c3b9ddb6f965..21278e8aa008 100644
--- a/deskutils/conkyemail/Makefile
+++ b/deskutils/conkyemail/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Email script for conky
 
-RUN_DEPENDS=	conky:${PORTSDIR}/sysutils/conky
+RUN_DEPENDS=	conky:sysutils/conky
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index dbb62100261f..4ac063ba2d35 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Weather forecast script for conky
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	conky:${PORTSDIR}/sysutils/conky \
-		pidof:${PORTSDIR}/sysutils/pidof
+RUN_DEPENDS=	conky:sysutils/conky \
+		pidof:sysutils/pidof
 
 USES=		gettext python fonts
 USE_PYTHON=	distutils
diff --git a/deskutils/dailystrips/Makefile b/deskutils/dailystrips/Makefile
index 8817e20bd92b..f8d522fcf077 100644
--- a/deskutils/dailystrips/Makefile
+++ b/deskutils/dailystrips/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utility to download or view your favorite online comic strips daily
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-TimeDate>=0:devel/p5-TimeDate
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/deskutils/deforaos-todo/Makefile b/deskutils/deforaos-todo/Makefile
index 9e99c3a8d8d5..5ada09f808ad 100644
--- a/deskutils/deforaos-todo/Makefile
+++ b/deskutils/deforaos-todo/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DeforaOS desktop todo list
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
-BUILD_DEPENDS=	${LOCALBASE}/include/Desktop/Mailer/plugin.h:${PORTSDIR}/mail/deforaos-mailer
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop
+BUILD_DEPENDS=	${LOCALBASE}/include/Desktop/Mailer/plugin.h:mail/deforaos-mailer
 
 USES=		desktop-file-utils pkgconfig
 USE_GNOME=	gtk20
@@ -27,8 +27,8 @@ MAKE_ENV=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 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
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} 's|= data doc|= data|' \
diff --git a/deskutils/devd-notifier/Makefile b/deskutils/devd-notifier/Makefile
index 2ea7451d0f68..6fc43e3119c1 100644
--- a/deskutils/devd-notifier/Makefile
+++ b/deskutils/devd-notifier/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Daemon notifying the user about devd(8) events \
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		pkgconfig
 PLIST_FILES=	bin/devd-notifier \
diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index 947db69e3658..ddc6a0f94def 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Application to keep a local mirror of web comics
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 74f042d39ed9..88718b47dbfc 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Blog editor for GNOME
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
 
 OPTIONS_DEFINE=	GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
@@ -30,7 +30,7 @@ GCONF_SCHEMAS=	drivel.schemas
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_OFF=	--without-gtkspell
 
 post-patch:
diff --git a/deskutils/easystroke/Makefile b/deskutils/easystroke/Makefile
index 6a6788706d84..2fc5db73d07b 100644
--- a/deskutils/easystroke/Makefile
+++ b/deskutils/easystroke/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Easystroke is a gesture-recognition application for X11
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man \
-		${LOCALBASE}/include/xorg/xserver-properties.h:${PORTSDIR}/x11-servers/xorg-server
-LIB_DEPENDS=	libgtkmm-3.0.so:${PORTSDIR}/x11-toolkits/gtkmm30 \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libboost_serialization.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	help2man:misc/help2man \
+		${LOCALBASE}/include/xorg/xserver-properties.h:x11-servers/xorg-server
+LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30 \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libboost_serialization.so:devel/boost-libs
 
 USE_XORG=	x11 xtst
 USES=		gettext gmake pkgconfig
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-BUILD_DEPENDS+=	intltool-merge:${PORTSDIR}/textproc/intltool
+BUILD_DEPENDS+=	intltool-merge:textproc/intltool
 PLIST_SUB+=		NLS=""
 ALL_TARGET=		easystroke.desktop all man
 .else
diff --git a/deskutils/etask/Makefile b/deskutils/etask/Makefile
index e75ea3172b47..8aa190e5f0c4 100644
--- a/deskutils/etask/Makefile
+++ b/deskutils/etask/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://members.chello.at/rene.weichselbaum/ \
 MAINTAINER=	dryice@dryice.name
 COMMENT=	Manage your projects or tasks within GNU Emacs
 
-RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS=	xpdf:graphics/xpdf
 
 USE_EMACS=	yes
 USES=		ghostscript:run
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 82cda442bbbd..9161e81dc4dc 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Powerful e-book reader
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfribidi.so:${PORTSDIR}/converters/fribidi \
-		libunibreak.so:${PORTSDIR}/textproc/libunibreak
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libfribidi.so:converters/fribidi \
+		libunibreak.so:textproc/libunibreak
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	geometer
diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile
index 1eca3cc130f6..43ef1d9fd472 100644
--- a/deskutils/freemind/Makefile
+++ b/deskutils/freemind/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Free mind-mapping software written in Java
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS=	unzip:archivers/unzip \
+		zip:archivers/zip
 
 USES=		cpe zip:infozip
 USE_JAVA=	yes
diff --git a/deskutils/fusenshi/Makefile b/deskutils/fusenshi/Makefile
index f761cca8d746..49c2ea993660 100644
--- a/deskutils/fusenshi/Makefile
+++ b/deskutils/fusenshi/Makefile
@@ -18,7 +18,7 @@ MAKE_JOBS_UNSAFE=	yes
 .ifdef WITHOUT_SSL
 MAKE_ARGS+=	WITHOUT_SSL=yes
 .else
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS+=	libgnutls.so:security/gnutls
 .endif
 
 post-install:
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index c1c7d13a9f6d..606c54fcfd5f 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GNOME frontend for anyRemote
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	anyremote:${PORTSDIR}/comms/anyremote
+RUN_DEPENDS=	anyremote:comms/anyremote
 
 USES=		gettext python
 USE_GNOME=	pygtk2
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index dd2b75855278..1d22e5fbc6d0 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -15,11 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 OPTIONS_DEFINE=		MYSQL NLS NOTIFY THUNDERBIRD
 OPTIONS_SUB=		yes
 THUNDERBIRD_DESC=	Thunderbird/Sunbird support
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb
 NLS_USES=		gettext
 NLS_USE=		GNOME=intltool
-NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>0:${PORTSDIR}/devel/py-notify
-THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify
+THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 NO_ARCH=	yes
 USES=		python:2,run tar:xz
diff --git a/deskutils/gcalcli/Makefile b/deskutils/gcalcli/Makefile
index 4c38668b6500..4c7901fcd371 100644
--- a/deskutils/gcalcli/Makefile
+++ b/deskutils/gcalcli/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Google Calendar Command Line Interface
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_SITELIBDIR}/gdata/__init__.py:${PORTSDIR}/devel/py-gdata \
-		${PYTHON_SITELIBDIR}/gflags.py:${PORTSDIR}/devel/py-gflags \
-		${PYTHON_SITELIBDIR}/apiclient/__init__.py:${PORTSDIR}/www/py-google-api-python-client \
-		${PYTHON_SITELIBDIR}/httplib2/__init__.py:${PORTSDIR}/www/py-httplib2
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
+		${PYTHON_SITELIBDIR}/gdata/__init__.py:devel/py-gdata \
+		${PYTHON_SITELIBDIR}/gflags.py:devel/py-gflags \
+		${PYTHON_SITELIBDIR}/apiclient/__init__.py:www/py-google-api-python-client \
+		${PYTHON_SITELIBDIR}/httplib2/__init__.py:www/py-httplib2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	insanum
@@ -36,9 +36,9 @@ ICS_VCAL_DESC=		enable importing of ics/vcal files
 SIMPLEJSON_DESC=	use simplejson for url shortening
 FUZZYDATES_DESC=	use parsedatetime for fuzzy date parsing
 
-ICS_VCAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject
-SIMPLEJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:${PORTSDIR}/devel/py-simplejson
-FUZZYDATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:${PORTSDIR}/devel/py-parsedatetime
+ICS_VCAL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject
+SIMPLEJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson
+FUZZYDATES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 8f99df78596d..d76fa55e4cee 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Arbitrary precision calculator for Gnome Desktop Environment
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libmpfr.so:${PORTSDIR}/math/mpfr
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libmpfr.so:math/mpfr
+RUN_DEPENDS=	rarian-sk-config:textproc/rarian
 
 USES=		desktop-file-utils gmake libtool pathfix pkgconfig \
 		readline shared-mime-info tar:xz
diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile
index cd22c5caee50..6750f8d40630 100644
--- a/deskutils/gkrellm-reminder2/Makefile
+++ b/deskutils/gkrellm-reminder2/Makefile
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM2 plugin that reminds you of important events
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index bc4d96d5c865..41f2eb9491e7 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple and beatiful calendar application for GNOME
 
 PORTSCOUT=	limitw:1,even
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libical.so:devel/libical
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/deskutils/gnome-characters/Makefile b/deskutils/gnome-characters/Makefile
index 84cba5cc77bd..be7a289c70f5 100644
--- a/deskutils/gnome-characters/Makefile
+++ b/deskutils/gnome-characters/Makefile
@@ -12,9 +12,9 @@ COMMENT=	find and insert unusual characters for GNOME 3
 
 PORTSCOUT=	limitw:1,even
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgjs.so:${PORTSDIR}/lang/gjs \
-		libunistring.so:${PORTSDIR}/devel/libunistring
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgjs.so:lang/gjs \
+		libunistring.so:devel/libunistring
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/deskutils/gnome-clocks/Makefile b/deskutils/gnome-clocks/Makefile
index 833b46712370..e5ad9b26d3f7 100644
--- a/deskutils/gnome-clocks/Makefile
+++ b/deskutils/gnome-clocks/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clocks for GNOME 3
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libgweather-3.so:${PORTSDIR}/net/libgweather
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libgeocode-glib.so:net/geocode-glib \
+		libgweather-3.so:net/libgweather
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-contacts/Makefile b/deskutils/gnome-contacts/Makefile
index 65c880335811..20f7d66168f9 100644
--- a/deskutils/gnome-contacts/Makefile
+++ b/deskutils/gnome-contacts/Makefile
@@ -9,13 +9,13 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Contacts manager for gnome
 
-BUILD_DEPENDS=	vala>=0.14.0:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS=	vala>=0.14.0:lang/vala
+LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
+		libchamplain-0.12.so:graphics/libchamplain \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libgee-0.8.so:devel/libgee \
+		libfolks.so:net-im/folks \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
@@ -42,11 +42,11 @@ OPTIONS_DEFINE_amd64=	CHEESE
 OPTIONS_DEFAULT_amd64=	CHEESE
 
 CHEESE_CONFIGURE_WITH=	cheese
-CHEESE_LIB_DEPENDS=	libcheese-gtk.so:${PORTSDIR}/multimedia/cheese
+CHEESE_LIB_DEPENDS=	libcheese-gtk.so:multimedia/cheese
 
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 MANPAGES_USE=		GNOME=libxslt:build
-MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:${PORTSDIR}/textproc/docbook-xml \
-			docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
+MANPAGES_BUILD_DEPENDS=	docbook-xml>=0:textproc/docbook-xml \
+			docbook-xsl>=0:textproc/docbook-xsl
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-dictionary/Makefile b/deskutils/gnome-dictionary/Makefile
index 125a105850c9..53e1bb238fcd 100644
--- a/deskutils/gnome-dictionary/Makefile
+++ b/deskutils/gnome-dictionary/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 dictionary lookup application
 
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc \
+		itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile
index 66748bf871b4..f0c794b7f0bb 100644
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@@ -12,21 +12,21 @@ COMMENT=	Document manager application designed to work with GNOME 3
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
-		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libevview3.so:${PORTSDIR}/graphics/evince \
-		libgdata.so:${PORTSDIR}/devel/libgdata \
-		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libzapojit-0.0.so:${PORTSDIR}/net/libzapojit
-RUN_DEPENDS=	py2?-dbus>0:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		unoconv:${PORTSDIR}/textproc/unoconv
+BUILD_DEPENDS=	itstool:textproc/itstool \
+		docbook-xsl>=0:textproc/docbook-xsl
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+		libclutter-1.0.so:graphics/clutter \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libevview3.so:graphics/evince \
+		libgdata.so:devel/libgdata \
+		libgoa-1.0.so:net/gnome-online-accounts \
+		libgjs.so:lang/gjs \
+		libtracker-sparql-1.0.so:sysutils/tracker \
+		libzapojit-0.0.so:net/libzapojit
+RUN_DEPENDS=	py2?-dbus>0:devel/py-dbus \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
+		unoconv:textproc/unoconv
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-epub-thumbnailer/Makefile b/deskutils/gnome-epub-thumbnailer/Makefile
index eac212a8cfc0..1d75e92d6cf8 100644
--- a/deskutils/gnome-epub-thumbnailer/Makefile
+++ b/deskutils/gnome-epub-thumbnailer/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Thumbnailer for EPub and MOBI books
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common
 
 USES=		autoreconf:build gettext gmake libarchive libtool pathfix pkgconfig
 USE_GNOME=	gdkpixbuf2 gnomedesktop3 gnomeprefix gtk30 \
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index 999e4010844d..40f5ad36f903 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -10,8 +10,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 font viewer utility
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/deskutils/gnome-initial-setup/Makefile b/deskutils/gnome-initial-setup/Makefile
index c6a75a0c55e3..a668f6cd7cab 100644
--- a/deskutils/gnome-initial-setup/Makefile
+++ b/deskutils/gnome-initial-setup/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	First boot setup tool for GNOME 3
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gdm>=3.0.0:${PORTSDIR}/x11/gdm
-LIB_DEPENDS=	libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
-		libpwquality.so:${PORTSDIR}/security/libpwquality \
-		libgweather-3.so:${PORTSDIR}/net/libgweather
-RUN_DEPENDS=	gdm>=3.0.0:${PORTSDIR}/x11/gdm
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		gdm>=3.0.0:x11/gdm
+LIB_DEPENDS=	libgoa-1.0.so:net/gnome-online-accounts \
+		libaccountsservice.so:sysutils/accountsservice \
+		libpwquality.so:security/libpwquality \
+		libgweather-3.so:net/libgweather
+RUN_DEPENDS=	gdm>=3.0.0:x11/gdm
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 7ec61f5d9e6e..e367ab7c3e97 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -10,15 +10,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Map application for GNOME 3
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \
-		libgeocode-glib.so:${PORTSDIR}/net/geocode-glib \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libchamplain-0.12.so:${PORTSDIR}/graphics/libchamplain \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libgjs.so:${PORTSDIR}/lang/gjs
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
+		libgeocode-glib.so:net/geocode-glib \
+		libgee-0.8.so:devel/libgee \
+		libchamplain-0.12.so:graphics/libchamplain \
+		libfolks.so:net-im/folks \
+		libgjs.so:lang/gjs
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index 54f055dc478b..cc2835201c2c 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -10,18 +10,18 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Photo application for GNOME 3
 
-BUILD_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libexempi.so:${PORTSDIR}/textproc/exempi \
-		libgfbgraph-0.2.so:${PORTSDIR}/net/gfbgraph \
-		libgegl-0.3.so:${PORTSDIR}/graphics/gegl3 \
-		libgrilo-0.2.so:${PORTSDIR}/net/grilo \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libtracker-control-1.0.so:${PORTSDIR}/sysutils/tracker \
-		libgjs.so:${PORTSDIR}/lang/gjs \
-		libbabl-0.1.so:${PORTSDIR}/x11/babl \
-		libgdata.so:${PORTSDIR}/devel/libgdata
-RUN_DEPENDS=	geoclue>=0:${PORTSDIR}/net/geoclue
+BUILD_DEPENDS=	geoclue>=0:net/geoclue \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libexempi.so:textproc/exempi \
+		libgfbgraph-0.2.so:net/gfbgraph \
+		libgegl-0.3.so:graphics/gegl3 \
+		libgrilo-0.2.so:net/grilo \
+		libexif.so:graphics/libexif \
+		libtracker-control-1.0.so:sysutils/tracker \
+		libgjs.so:lang/gjs \
+		libbabl-0.1.so:x11/babl \
+		libgdata.so:devel/libgdata
+RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-screenshot/Makefile b/deskutils/gnome-screenshot/Makefile
index eb298d848e43..4fe0ded0455a 100644
--- a/deskutils/gnome-screenshot/Makefile
+++ b/deskutils/gnome-screenshot/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 utility for making picutures of your screen
 
-LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/deskutils/gnome-search-tool/Makefile b/deskutils/gnome-search-tool/Makefile
index 0942caba9daf..e216aff2e521 100644
--- a/deskutils/gnome-search-tool/Makefile
+++ b/deskutils/gnome-search-tool/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 file search utilities
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 
diff --git a/deskutils/gnome-shell-extension-audio-output-switcher/Makefile b/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
index cd5b82698c31..4c73f33e57be 100644
--- a/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
+++ b/deskutils/gnome-shell-extension-audio-output-switcher/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell audio output switcher
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-backslide/Makefile b/deskutils/gnome-shell-extension-backslide/Makefile
index ebf2f494c9a1..acbf6edc2146 100644
--- a/deskutils/gnome-shell-extension-backslide/Makefile
+++ b/deskutils/gnome-shell-extension-backslide/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell extension for background slideshow
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 WRKSRC=		${WRKDIR}/LukasKnuth-backslide-7e36a49fc5e1
 
diff --git a/deskutils/gnome-shell-extension-coverflow/Makefile b/deskutils/gnome-shell-extension-coverflow/Makefile
index 503c5247fbb7..0f189855d806 100644
--- a/deskutils/gnome-shell-extension-coverflow/Makefile
+++ b/deskutils/gnome-shell-extension-coverflow/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lets you Alt-Tab windows in a cover-flow manner
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-dashtodock/Makefile b/deskutils/gnome-shell-extension-dashtodock/Makefile
index cf20e6c3b8ae..8fb1cd3090d0 100644
--- a/deskutils/gnome-shell-extension-dashtodock/Makefile
+++ b/deskutils/gnome-shell-extension-dashtodock/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Convert the dash into a dock
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-filesmenu/Makefile b/deskutils/gnome-shell-extension-filesmenu/Makefile
index 2b6b293abd36..fa20546cdb4f 100644
--- a/deskutils/gnome-shell-extension-filesmenu/Makefile
+++ b/deskutils/gnome-shell-extension-filesmenu/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Quickly navigate your file system
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-hidetopbar/Makefile b/deskutils/gnome-shell-extension-hidetopbar/Makefile
index 15ca8c209ae9..e3ee244c2032 100644
--- a/deskutils/gnome-shell-extension-hidetopbar/Makefile
+++ b/deskutils/gnome-shell-extension-hidetopbar/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Hide the topbar except in overview mode
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-lockkeys/Makefile b/deskutils/gnome-shell-extension-lockkeys/Makefile
index 9a4a0e69c16d..5d305d4d68cb 100644
--- a/deskutils/gnome-shell-extension-lockkeys/Makefile
+++ b/deskutils/gnome-shell-extension-lockkeys/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell Numlock and Capslock indicator
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-mediaplayer/Makefile b/deskutils/gnome-shell-extension-mediaplayer/Makefile
index 3f0d46300110..ae4318abc6f8 100644
--- a/deskutils/gnome-shell-extension-mediaplayer/Makefile
+++ b/deskutils/gnome-shell-extension-mediaplayer/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MPRIS2 extension for the GNOME3 shell
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
diff --git a/deskutils/gnome-shell-extension-openweather/Makefile b/deskutils/gnome-shell-extension-openweather/Makefile
index 9c83cea39f9d..e687ad472432 100644
--- a/deskutils/gnome-shell-extension-openweather/Makefile
+++ b/deskutils/gnome-shell-extension-openweather/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OpenWeather extension for the GNOME3 shell
 
-BUILD_DEPENDS=	gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-autogen.sh:devel/gnome-common \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
diff --git a/deskutils/gnome-shell-extension-overlay-icons/Makefile b/deskutils/gnome-shell-extension-overlay-icons/Makefile
index b059d2a3bd78..b21a04a9a53e 100644
--- a/deskutils/gnome-shell-extension-overlay-icons/Makefile
+++ b/deskutils/gnome-shell-extension-overlay-icons/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Show application icons on the windows overview
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-panel-osd/Makefile b/deskutils/gnome-shell-extension-panel-osd/Makefile
index 3bbe33e9fd05..8c3924df29ba 100644
--- a/deskutils/gnome-shell-extension-panel-osd/Makefile
+++ b/deskutils/gnome-shell-extension-panel-osd/Makefile
@@ -9,9 +9,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OSD extension for the GNOME3 shell
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
diff --git a/deskutils/gnome-shell-extension-trash/Makefile b/deskutils/gnome-shell-extension-trash/Makefile
index 400643b3ce35..b51710c934cf 100644
--- a/deskutils/gnome-shell-extension-trash/Makefile
+++ b/deskutils/gnome-shell-extension-trash/Makefile
@@ -9,10 +9,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-shell trash indicator
 
-BUILD_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
+		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
 
 USES=		gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20
diff --git a/deskutils/gnome-shell-extension-weather/Makefile b/deskutils/gnome-shell-extension-weather/Makefile
index 7453841f008f..9b1b8c73ffa9 100644
--- a/deskutils/gnome-shell-extension-weather/Makefile
+++ b/deskutils/gnome-shell-extension-weather/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Weather extension for the GNOME3 shell
 
-RUN_DEPENDS=	gnome-shell>=0:${PORTSDIR}/x11/gnome-shell
+RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell
 
 USES=		autoreconf gettext gmake gnome libtool pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack
diff --git a/deskutils/gnome-shell-extra-extensions/Makefile b/deskutils/gnome-shell-extra-extensions/Makefile
index 9bce7a9d681f..7adc9f334258 100644
--- a/deskutils/gnome-shell-extra-extensions/Makefile
+++ b/deskutils/gnome-shell-extra-extensions/Makefile
@@ -10,18 +10,18 @@ COMMENT=	Gnome shell extra extensions metaport
 
 USES=		metaport
 
-RUN_DEPENDS=	gnome-shell-extension-weather>=0:${PORTSDIR}/deskutils/gnome-shell-extension-weather \
-		gnome-shell-extension-openweather>=0:${PORTSDIR}/deskutils/gnome-shell-extension-openweather \
-		gnome-shell-extension-panel-osd>=0:${PORTSDIR}/deskutils/gnome-shell-extension-panel-osd \
-		gnome-shell-extension-mediaplayer>=0:${PORTSDIR}/deskutils/gnome-shell-extension-mediaplayer \
-		gnome-shell-extension-coverflow>=0:${PORTSDIR}/deskutils/gnome-shell-extension-coverflow \
-		gnome-shell-extension-overlay-icons>=0:${PORTSDIR}/deskutils/gnome-shell-extension-overlay-icons \
-		gnome-shell-extension-hidetopbar>=0:${PORTSDIR}/deskutils/gnome-shell-extension-hidetopbar \
-		gnome-shell-extension-lockkeys>=0:${PORTSDIR}/deskutils/gnome-shell-extension-lockkeys \
-		gnome-shell-extension-trash>=0:${PORTSDIR}/deskutils/gnome-shell-extension-trash \
-		gnome-shell-extension-dashtodock>=0:${PORTSDIR}/deskutils/gnome-shell-extension-dashtodock \
-		gnome-shell-extension-audio-output-switcher>=0:${PORTSDIR}/deskutils/gnome-shell-extension-audio-output-switcher \
-		gnome-shell-extension-recent-items>=0:${PORTSDIR}/deskutils/gnome-shell-extension-recent-items \
-		gnome-shell-extension-filesmenu>=0:${PORTSDIR}/deskutils/gnome-shell-extension-filesmenu
+RUN_DEPENDS=	gnome-shell-extension-weather>=0:deskutils/gnome-shell-extension-weather \
+		gnome-shell-extension-openweather>=0:deskutils/gnome-shell-extension-openweather \
+		gnome-shell-extension-panel-osd>=0:deskutils/gnome-shell-extension-panel-osd \
+		gnome-shell-extension-mediaplayer>=0:deskutils/gnome-shell-extension-mediaplayer \
+		gnome-shell-extension-coverflow>=0:deskutils/gnome-shell-extension-coverflow \
+		gnome-shell-extension-overlay-icons>=0:deskutils/gnome-shell-extension-overlay-icons \
+		gnome-shell-extension-hidetopbar>=0:deskutils/gnome-shell-extension-hidetopbar \
+		gnome-shell-extension-lockkeys>=0:deskutils/gnome-shell-extension-lockkeys \
+		gnome-shell-extension-trash>=0:deskutils/gnome-shell-extension-trash \
+		gnome-shell-extension-dashtodock>=0:deskutils/gnome-shell-extension-dashtodock \
+		gnome-shell-extension-audio-output-switcher>=0:deskutils/gnome-shell-extension-audio-output-switcher \
+		gnome-shell-extension-recent-items>=0:deskutils/gnome-shell-extension-recent-items \
+		gnome-shell-extension-filesmenu>=0:deskutils/gnome-shell-extension-filesmenu
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-sound-recorder/Makefile b/deskutils/gnome-sound-recorder/Makefile
index e59e78257052..fb5ff254c3bf 100644
--- a/deskutils/gnome-sound-recorder/Makefile
+++ b/deskutils/gnome-sound-recorder/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME sound recorder application
 
-LIB_DEPENDS=	libgjs.so:${PORTSDIR}/lang/gjs
+LIB_DEPENDS=	libgjs.so:lang/gjs
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-system-log/Makefile b/deskutils/gnome-system-log/Makefile
index 744119a89eec..5abbca4c7dbb 100644
--- a/deskutils/gnome-system-log/Makefile
+++ b/deskutils/gnome-system-log/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 3 system log viewer
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 CONFLICTS=	gnome-utils-2.[0-9]*
 
diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile
index df3cb53dc5ac..0b574689e6ab 100644
--- a/deskutils/gnome-tweak-tool/Makefile
+++ b/deskutils/gnome-tweak-tool/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Allows to tweak some hidden settings in GTK3 / GNOME3
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index e6ab770feb2f..826d573916c7 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -11,24 +11,24 @@ COMMENT=	GNOME 3 support utilities
 
 USES=		metaport
 
-RUN_DEPENDS=	baobab>=3.0:${PORTSDIR}/deskutils/baobab \
-		gnome-screenshot>=3.0:${PORTSDIR}/deskutils/gnome-screenshot \
-		gnote>=3.0:${PORTSDIR}/deskutils/gnote \
-		gnome-contacts>=3.0:${PORTSDIR}/deskutils/gnome-contacts \
-		gnome-search-tool>=3.0:${PORTSDIR}/deskutils/gnome-search-tool \
-		gnome-dictionary>=3.0:${PORTSDIR}/deskutils/gnome-dictionary \
-		gnome-system-log>=3.0:${PORTSDIR}/deskutils/gnome-system-log \
-		gnome-font-viewer>=3.0:${PORTSDIR}/deskutils/gnome-font-viewer \
-		gnome-system-monitor>=3.0:${PORTSDIR}/sysutils/gnome-system-monitor \
-		gnome-photos>=3.0:${PORTSDIR}/deskutils/gnome-photos \
-		gnome-clocks>=3.0:${PORTSDIR}/deskutils/gnome-clocks \
-		gnome-maps>=3.0:${PORTSDIR}/deskutils/gnome-maps \
-		gnome-weather>=3.0:${PORTSDIR}/deskutils/gnome-weather \
-		gnome-todo>=3.0:${PORTSDIR}/deskutils/gnome-todo
+RUN_DEPENDS=	baobab>=3.0:deskutils/baobab \
+		gnome-screenshot>=3.0:deskutils/gnome-screenshot \
+		gnote>=3.0:deskutils/gnote \
+		gnome-contacts>=3.0:deskutils/gnome-contacts \
+		gnome-search-tool>=3.0:deskutils/gnome-search-tool \
+		gnome-dictionary>=3.0:deskutils/gnome-dictionary \
+		gnome-system-log>=3.0:deskutils/gnome-system-log \
+		gnome-font-viewer>=3.0:deskutils/gnome-font-viewer \
+		gnome-system-monitor>=3.0:sysutils/gnome-system-monitor \
+		gnome-photos>=3.0:deskutils/gnome-photos \
+		gnome-clocks>=3.0:deskutils/gnome-clocks \
+		gnome-maps>=3.0:deskutils/gnome-maps \
+		gnome-weather>=3.0:deskutils/gnome-weather \
+		gnome-todo>=3.0:deskutils/gnome-todo
 
 OPTIONS_DEFINE=	DOCS
 DOCS_DESC=	Build Gnome Documents (pulls in tracker)
 
-DOCS_RUN_DEPENDS+=	gnome-documents>=0:${PORTSDIR}/deskutils/gnome-documents
+DOCS_RUN_DEPENDS+=	gnome-documents>=0:deskutils/gnome-documents
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-weather/Makefile b/deskutils/gnome-weather/Makefile
index aa20d5fe9ce4..dbcae031c6f3 100644
--- a/deskutils/gnome-weather/Makefile
+++ b/deskutils/gnome-weather/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Weather application for GNOME 3
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgweather-3.so:${PORTSDIR}/net/libgweather \
-		libgjs.so:${PORTSDIR}/lang/gjs
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgweather-3.so:net/libgweather \
+		libgjs.so:lang/gjs
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index cea3fa576b5e..40792410393f 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -12,12 +12,12 @@ COMMENT=	C++ version of Tomboy, note taking application
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3 \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libgtkspell3-3.so:textproc/gtkspell3 \
+		libboost_filesystem.so:devel/boost-libs \
+		libsecret-1.so:security/libsecret \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index e3fab304021d..b35e16d97d2c 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Time tracker for gnome2
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqof.so:${PORTSDIR}/databases/qof
+LIB_DEPENDS=	libqof.so:databases/qof
 
 USES=		gettext gmake libtool pathfix pkgconfig
 USE_XORG=	xscrnsaver
@@ -38,8 +38,8 @@ OPTIONS_DEFAULT=	GUILE1
 GUILE1_DESC=	Use lang/guile
 GUILE2_DESC=	Use lang/guile2
 
-GUILE1_LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile
-GUILE2_LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2
+GUILE1_LIB_DEPENDS=	libguile.so:lang/guile
+GUILE2_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 GUILE2_LDFLAGS=		-lm
 
 post-patch:
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index f641f2dd82e3..4c083ee1dd00 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -12,19 +12,19 @@ COMMENT=	GNOME recipe manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:${PORTSDIR}/devel/py-python-distutils-extra \
-		${PYTHON_PKGNAMEPREFIX}elib.intl>0:${PORTSDIR}/textproc/py-elib.intl
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:${PORTSDIR}/databases/py-sqlalchemy \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}poppler>=0:${PORTSDIR}/graphics/py-poppler \
-		${PYTHON_PKGNAMEPREFIX}rtf>=0:${PORTSDIR}/print/py-rtf \
-		${PYTHON_PKGNAMEPREFIX}reportlab>0:${PORTSDIR}/print/py-reportlab \
-		${PYTHON_PKGNAMEPREFIX}elib.intl>0:${PORTSDIR}/textproc/py-elib.intl
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0:databases/py-sqlalchemy \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler \
+		${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf \
+		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl
 
 OPTIONS_DEFINE=		IPYTHON
 IPYTHON_DESC=		Interactive shell support
-IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:${PORTSDIR}/devel/ipython
+IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython
 
 USES=		gettext python:2
 USE_GNOME=	intltool pygnome2 pygtk2
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index b9e396d37ed8..ceec5909d7c5 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Lightweight film collection manager
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:databases/py-sqlalchemy06 \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 USE_GNOME=	pygtk2
 USES=		gmake gettext python:2 tar:xz
@@ -25,19 +25,19 @@ OPTIONS_DEFINE=		CHARDET LXML REPORTLAB2
 OPTIONS_DEFAULT=	LXML
 
 CHARDET_DESC=		chardet support
-CHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:${PORTSDIR}/textproc/py-chardet
+CHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet
 
 LXML_DESC=		lxml support
-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
 
 REPORTLAB2_DESC=	ReportLab2 support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREPORTLAB2}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:${PORTSDIR}/print/py-reportlab2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab2>=2:print/py-reportlab2
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:${PORTSDIR}/print/py-reportlab1
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1
 .endif
 
 post-patch:
diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile
index c38d97f17728..578352e5bd2f 100644
--- a/deskutils/growl-for-linux/Makefile
+++ b/deskutils/growl-for-linux/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Notification system compatible with Growl
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	desktop-file-install:${PORTSDIR}/devel/desktop-file-utils
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libdbus-glib-1.so:devel/dbus-glib
 
 CONFIGURE_ARGS=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 LIBNOTIFY_DESC=		Use notify-osd for libnotify display plugin
-LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-LIBNOTIFY_RUN_DEPENDS=	notify-osd>=0.9.29_3:${PORTSDIR}/deskutils/notify-osd
+LIBNOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
+LIBNOTIFY_RUN_DEPENDS=	notify-osd>=0.9.29_3:deskutils/notify-osd
 
 OPTIONS_DEFAULT=LIBNOTIFY
 OPTIONS_DEFINE=	LIBNOTIFY
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index 12ea25928c31..5499d4d486f9 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -10,10 +10,10 @@ COMMENT=	GTD organizer for the GNOME desktop environment
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:${PORTSDIR}/devel/py-liblarch \
-		xset:${PORTSDIR}/x11/xset
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch \
+		xset:x11/xset
 
 USE_GNOME=	pygobject pygtk2
 USES=		gettext desktop-file-utils python:2 shebangfix
@@ -24,7 +24,7 @@ USE_PYTHON=	distutils autoplist
 OPTIONS_DEFINE=		CHEETAH
 CHEETAH_DESC=		Needed for export plugin to work
 OPTIONS_EXCLUDE=	NLS DOCS
-CHEETAH_RUN_DEPENDS=	${LOCALBASE}/bin/cheetah:${PORTSDIR}/devel/py-cheetah
+CHEETAH_RUN_DEPENDS=	${LOCALBASE}/bin/cheetah:devel/py-cheetah
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index 57dfbe0d17e5..e66efbc57de2 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Timer for your personal activities
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USE_XORG=	x11 xscrnsaver
 USE_GNOME=	gtk20
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index e78c6b07ac0f..89b4c8c5af76 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unicode/ISO10646 character map and font viewer
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS=	itstool:textproc/itstool
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 4fb0b3e89657..228592f259f7 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 USES=		gnustep
 USE_GNUSTEP=	back build
 GNU_CONFIGURE=	yes
-LIB_DEPENDS=	libDBKit.so:${PORTSDIR}/deskutils/gworkspace \
-		libPreferencePanes.so:${PORTSDIR}/deskutils/systempreferences
+LIB_DEPENDS=	libDBKit.so:deskutils/gworkspace \
+		libPreferencePanes.so:deskutils/systempreferences
 USE_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 USE_SQLITE=	yes
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
index c073fb1a1f0a..2d6171657df5 100644
--- a/deskutils/gxneur/Makefile
+++ b/deskutils/gxneur/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GTK frontend for XNeur keyboard layout switcher
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
-RUN_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
+BUILD_DEPENDS=	xneur:deskutils/xneur
+RUN_DEPENDS=	xneur:deskutils/xneur
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 3453ba814582..0756753767b3 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -54,9 +54,9 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
+RUN_DEPENDS+=	${PEARDIR}/Date.php:devel/pear-Date
 
-DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
+DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
 
 TIMEOBJECTS_USE=	HORDE_RUN=timeobjects
 XMLWRITER_USE=	PHP=xmlwriter
diff --git a/deskutils/jjclient/Makefile b/deskutils/jjclient/Makefile
index f3e8bfc25047..15366c94c69a 100644
--- a/deskutils/jjclient/Makefile
+++ b/deskutils/jjclient/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	SF/justjournal/JustJournal%20UNIX%20Client/${PORTVERSION} \
 MAINTAINER=	luke@justjournal.com
 COMMENT=	Command line client for posting JustJournal entries
 
-LIB_DEPENDS+=	libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c
+LIB_DEPENDS+=	libxmlrpc.so:net/xmlrpc-c
 
 PLIST_FILES=	bin/jjclient
 
diff --git a/deskutils/kchmviewer-kde4/Makefile b/deskutils/kchmviewer-kde4/Makefile
index ffdbb7e1e5b9..cfa7397c8d98 100644
--- a/deskutils/kchmviewer-kde4/Makefile
+++ b/deskutils/kchmviewer-kde4/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE viewer for CHM files
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib \
-		libzip.so:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS=	libchm.so:misc/chmlib \
+		libzip.so:archivers/libzip
 
 USES=		cmake:outsource gettext-tools
 USE_KDE4=	kdeprefix kdelibs automoc4
diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile
index 9aef582e36c1..26b15a975b0f 100644
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM tools and services
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libkgapi2.so:${PORTSDIR}/devel/libkgapi \
-		libkolab.so:${PORTSDIR}/devel/libkolab \
-		libkolabxml.so:${PORTSDIR}/textproc/libkolabxml \
-		libkfbapi.so:${PORTSDIR}/net/libkfbapi \
-		libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libkgapi2.so:devel/libkgapi \
+		libkolab.so:devel/libkolab \
+		libkolabxml.so:textproc/libkolabxml \
+		libkfbapi.so:net/libkfbapi \
+		libqjson.so:devel/qjson
 
 CONFLICTS_INSTALL=	kdepim-runtime44-4.*
 
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 14c65abb1b38..bfdc3da2787f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM applications
 
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libassuan.so:${PORTSDIR}/security/libassuan \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee \
-		libkgapi2.so:${PORTSDIR}/devel/libkgapi
-RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime \
-		${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libassuan.so:security/libassuan \
+		libsasl2.so:security/cyrus-sasl2 \
+		libboost_thread.so:devel/boost-libs \
+		libgrantlee_gui.so:devel/grantlee \
+		libkgapi2.so:devel/libkgapi
+RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \
+		${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
 
 CONFLICTS_INSTALL=	kdepim44-4.*
 
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 35616c7dd785..6b763627fe86 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -11,14 +11,14 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM Libraries
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
-		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libical.so:${PORTSDIR}/devel/libical \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libprison.so:${PORTSDIR}/graphics/prison \
-		libqjson.so:${PORTSDIR}/devel/qjson
+BUILD_DEPENDS=	xsltproc:textproc/libxslt
+LIB_DEPENDS=	libgpgme.so:security/gpgme \
+		libsasl2.so:security/cyrus-sasl2 \
+		libboost_thread.so:devel/boost-libs \
+		libical.so:devel/libical \
+		libuuid.so:misc/e2fsprogs-libuuid \
+		libprison.so:graphics/prison \
+		libqjson.so:devel/qjson
 
 USE_KDE4=	kdelibs akonadi kdeprefix \
 		automoc4 ontologies soprano
diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 0afd01fb3a59..15ed9e7ea45e 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE SC 4
 
-LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libqoauth.so:${PORTSDIR}/net/qoauth \
-		libqjson.so:${PORTSDIR}/devel/qjson
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2
+LIB_DEPENDS=	libqalculate.so:math/libqalculate \
+		libqwt.so:x11-toolkits/qwt5 \
+		libqca.so:devel/qca \
+		libqoauth.so:net/qoauth \
+		libqjson.so:devel/qjson
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:math/eigen2
 
 CONFLICTS_INSTALL=	plasma-applet-icontasks-0.[89].*
 
@@ -36,11 +36,11 @@ MARBLE_USE=	KDE4=marble
 MARBLE_CMAKE_OFF=	-DWITH_Marble=off
 
 IBUS_DESC=	Enable IBUS backend for input dialog
-IBUS_LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_LIB_DEPENDS=	libibus-1.0.so:textproc/ibus
 IBUS_CMAKE_OFF=	-DBUILD_ibus=off
 
 SCIM_DESC=	Enable SCIM backend for input dialog
-SCIM_LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_LIB_DEPENDS=	libscim-1.0.so:textproc/scim
 SCIM_CMAKE_OFF=	-DBUILD_scim=off
 
 post-patch:
diff --git a/deskutils/ladon/Makefile b/deskutils/ladon/Makefile
index 1e5181b4cb14..95f6c5394359 100644
--- a/deskutils/ladon/Makefile
+++ b/deskutils/ladon/Makefile
@@ -14,8 +14,8 @@ BROKEN=		does not build
 DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2016-04-15
 
-BUILD_DEPENDS=	npm>0:${PORTSDIR}/www/npm
-RUN_DEPENDS=	npm>0:${PORTSDIR}/www/npm
+BUILD_DEPENDS=	npm>0:www/npm
+RUN_DEPENDS=	npm>0:www/npm
 
 NO_BUILD=	yes
 USE_GITHUB=	yes
diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile
index 2e0071650657..264e7b18fae1 100644
--- a/deskutils/launchy/Makefile
+++ b/deskutils/launchy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Open source keystroke launcher
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
+RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils
 
 USES=		dos2unix qmake
 DOS2UNIX_FILES=	readme.lyx readme.txt
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index f5061616de1a..708c2b191cd8 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Library allowing communication with Google calendar and contacts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libxml2.so:textproc/libxml2
 
 USES=		cmake tar:bzip2
 CMAKE_ARGS=	-DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index d8f5aafbad6a..9863a47b7a30 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Vformat plugin for the OpenSync framework
 
-LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync
+LIB_DEPENDS=	libopensync.so:devel/libopensync
 
 USES=		cmake iconv pkgconfig tar:bzip2
 CMAKE_ARGS+=	-Wno-dev
diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile
index 95fe312af6d4..8b0f14ad91f1 100644
--- a/deskutils/libstreamanalyzer/Makefile
+++ b/deskutils/libstreamanalyzer/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: streamanalyzer library
 
-LIB_DEPENDS=	libavcodec${FFMPEG_SUFFIX}.so:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		libclucene-core.so:${PORTSDIR}/textproc/clucene \
-		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libstreams.so:${PORTSDIR}/deskutils/libstreams
+LIB_DEPENDS=	libavcodec${FFMPEG_SUFFIX}.so:multimedia/ffmpeg${FFMPEG_SUFFIX} \
+		libclucene-core.so:textproc/clucene \
+		libexiv2.so:graphics/exiv2 \
+		libstreams.so:deskutils/libstreams
 
 USES=		pkgconfig iconv
 USE_GNOME=	libxml2
diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile
index 780765b77af9..a32e7d7f51fb 100644
--- a/deskutils/ljit/Makefile
+++ b/deskutils/ljit/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GUI tool to help LiveJournal users post images
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	convert:graphics/ImageMagick
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 67693aaac937..570e14824a84 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://andy-shev.github.com/LogJam/download/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	GTK2 interface to livejournals, ie www.livejournal.com
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libdbus-glib-1.so:devel/dbus-glib
 
 OPTIONS_DEFINE=	GTKSPELL SQLITE XMMS GTKHTML RSVG
 OPTIONS_DEFAULT=	GTKSPELL
@@ -30,13 +30,13 @@ CONFIGURE_ARGS=	--program-transform-name="s/$$//"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
 GTKSPELL_CONFIGURE_WITH=	gtkspell
 
 SQLITE_CONFIGURE_WITH=	sqlite3
-SQLITE_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
-XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_WITH=	xmms
 
 GTKHTML_USE=	GNOME=gtkhtml3
diff --git a/deskutils/mate-notification-daemon/Makefile b/deskutils/mate-notification-daemon/Makefile
index 710f07400102..8fcdfb38d1e6 100644
--- a/deskutils/mate-notification-daemon/Makefile
+++ b/deskutils/mate-notification-daemon/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Send small notifications to your desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libcanberra-gtk.so:audio/libcanberra \
+		libnotify.so:devel/libnotify
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/mate-utils/Makefile b/deskutils/mate-utils/Makefile
index be595482043b..bdad8eec1a59 100644
--- a/deskutils/mate-utils/Makefile
+++ b/deskutils/mate-utils/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE support utilities
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
+		libcanberra-gtk.so:audio/libcanberra
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index c2abdafcedd4..e1820d1a4fb4 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -23,10 +23,10 @@ LIBS+=		-L${LOCALBASE}/lib -lX11
 OPTIONS_DEFINE=	CURL DOCS GTOP
 OPTIONS_DEFAULT=	CURL GTOP
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--disable-curl
 
-GTOP_LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
+GTOP_LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop
 GTOP_CONFIGURE_OFF=	--disable-gtop
 
 post-patch:
diff --git a/deskutils/multisync-backup/Makefile b/deskutils/multisync-backup/Makefile
index f051c4c9696b..ea608f581afe 100644
--- a/deskutils/multisync-backup/Makefile
+++ b/deskutils/multisync-backup/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	multisync-backup
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multisync backup plugin
 
-RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
+RUN_DEPENDS=	multisync:deskutils/multisync
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
diff --git a/deskutils/multisync-syncml/Makefile b/deskutils/multisync-syncml/Makefile
index 7f68b9103053..fcfc20c396e7 100644
--- a/deskutils/multisync-syncml/Makefile
+++ b/deskutils/multisync-syncml/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	multisync-syncml
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multisync plugin for SyncML targets
 
-RUN_DEPENDS=	multisync:${PORTSDIR}/deskutils/multisync
+RUN_DEPENDS=	multisync:deskutils/multisync
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index decc58ce1b2e..6cb751121b53 100644
--- a/deskutils/myitcrm/Makefile
+++ b/deskutils/myitcrm/Makefile
@@ -31,8 +31,8 @@ PHPMOD_DESC=	Use PHP module for Apache
 NGINX_DESC=	Use Nginx
 
 APACHE_USE=	APACHE_RUN=22+
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/www/lighttpd
-NGINX_RUN_DEPENDS=	nginx:${PORTSDIR}/www/nginx
+LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
+NGINX_RUN_DEPENDS=	nginx:www/nginx
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index f8e53ad1b8d0..6347262d96aa 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Notes-taking application based on Qt 4
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/deskutils/nautilus-actions/Makefile b/deskutils/nautilus-actions/Makefile
index 5575cc0852f5..4f1b4fe00008 100644
--- a/deskutils/nautilus-actions/Makefile
+++ b/deskutils/nautilus-actions/Makefile
@@ -9,10 +9,10 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Extension for Nautilus to configure programs to launch on files
 
-LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
-		libunique-3.0.so:${PORTSDIR}/x11-toolkits/libunique3
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgtop-2.0.so:devel/libgtop \
+		libunique-3.0.so:x11-toolkits/libunique3
 
 USES=		gettext gmake libtool pkgconfig tar:xz
 USE_GNOME=	gtk30 intltool nautilus3
diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile
index 15d49a327576..0e8299638769 100644
--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@@ -10,24 +10,24 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gustau.perez@gmail.com
 COMMENT=	File manager extensions for the Cinnamon desktop
 
-BUILD_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
-		gtkdocize:${PORTSDIR}/textproc/gtk-doc \
-		rst2html:${PORTSDIR}/textproc/py-docutils \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
-		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \
-		libnemo-extension.so:${PORTSDIR}/x11-fm/nemo \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libexempi.so:${PORTSDIR}/textproc/exempi \
-		libcjs.so:${PORTSDIR}/lang/cjs \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libevdocument3.so:${PORTSDIR}/graphics/evince \
-		libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3 \
-		libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
-		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5
-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 \
+		rst2html:textproc/py-docutils \
+		gnome-autogen.sh:devel/gnome-common \
+		${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libexif.so:graphics/libexif \
+		libcinnamon-desktop.so:x11/cinnamon-desktop \
+		libnemo-extension.so:x11-fm/nemo \
+		libnotify.so:devel/libnotify \
+		libexempi.so:textproc/exempi \
+		libcjs.so:lang/cjs \
+		libclutter-1.0.so:graphics/clutter \
+		libevdocument3.so:graphics/evince \
+		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
+		libclutter-gst-2.0.so:multimedia/clutter-gst \
+		libmusicbrainz5.so:audio/libmusicbrainz5
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
+		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
diff --git a/deskutils/note/Makefile b/deskutils/note/Makefile
index 4cc791208727..245e97fc7599 100644
--- a/deskutils/note/Makefile
+++ b/deskutils/note/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Console based tool to handle encrypted notes
 
 LICENSE=	GPLv1
 
-RUN_DEPENDS=	p5-YAML>=0.1:${PORTSDIR}/textproc/p5-YAML \
-		p5-Crypt-IDEA>=1.0:${PORTSDIR}/security/p5-Crypt-IDEA
+RUN_DEPENDS=	p5-YAML>=0.1:textproc/p5-YAML \
+		p5-Crypt-IDEA>=1.0:security/p5-Crypt-IDEA
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index d6e4e9320a84..1435bd05d55f 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Send small notifications to your desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile
index 00b49f3ab0a3..20683f3dc1ea 100644
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@@ -14,9 +14,9 @@ COMMENT=	On-screen-display notification agent using libnotify
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
+RUN_DEPENDS=	dbus-daemon:devel/dbus
 
 CONFLICTS=	xfce4-notification-daemon-[0-9]*
 
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 071bc0a88602..5e04ca222034 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Calendar application for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libpopt.so:devel/popt \
+	libdbus-glib-1.so:devel/dbus-glib \
+	libical.so:devel/libical
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -27,7 +27,7 @@ USE_XFCE=	panel
 
 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
 
 CFLAGS+=	-I${LOCALBASE}/include/libical
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index bdae6abe0809..c166e0b1c175 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Personal organizer
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libgringotts.so:${PORTSDIR}/security/libgringotts \
-		libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libical.so:devel/libical \
+		libnotify.so:devel/libnotify \
+		libgringotts.so:security/libgringotts \
+		libgtkspell.so:textproc/gtkspell \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
 
 USES=		gettext gmake libarchive pkgconfig
 USE_GNOME=	gtk20 libxml2
diff --git a/deskutils/osynctool/Makefile b/deskutils/osynctool/Makefile
index ce660585b6ea..a4521dbdaf14 100644
--- a/deskutils/osynctool/Makefile
+++ b/deskutils/osynctool/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/ \
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Command line client for the OpenSync framework
 
-LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync
+LIB_DEPENDS=	libopensync.so:devel/libopensync
 
 CONFLICTS=	msynctool-0.2*
 
diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
index b34e7c68fb6c..c841b1f020e8 100644
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@@ -11,8 +11,8 @@ COMMENT=	OwnCloud Desktop Syncing Client
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify \
-		libqt5keychain.so:${PORTSDIR}/security/qtkeychain-qt5
+LIB_DEPENDS=	libinotify.so:devel/libinotify \
+		libqt5keychain.so:security/qtkeychain-qt5
 
 USES=		cmake:outsource compiler:c++11-lib gmake iconv localbase \
 		pkgconfig sqlite
@@ -31,7 +31,7 @@ GH_PROJECT=	client
 
 OPTIONS_DEFINE=		DEBUG DOCS
 
-DOCS_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_USE=		tex=dvipsk:build,latex:build
 DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
 
diff --git a/deskutils/p5-Data-ICal/Makefile b/deskutils/p5-Data-ICal/Makefile
index ba895de04ce9..9e7da7611b4e 100644
--- a/deskutils/p5-Data-ICal/Makefile
+++ b/deskutils/p5-Data-ICal/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Data::ICal - Generates iCalendar (RFC 2445) calendar files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Class-ReturnValue>=0:${PORTSDIR}/devel/p5-Class-ReturnValue \
-		p5-Text-vFile-asData>=0:${PORTSDIR}/devel/p5-Text-vFile-asData
+BUILD_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
+		p5-Text-vFile-asData>=0:devel/p5-Text-vFile-asData
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-LongString>=0:devel/p5-Test-LongString \
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/deskutils/p5-Goo/Makefile b/deskutils/p5-Goo/Makefile
index 3d2ed8c2387a..4106b9bac65f 100644
--- a/deskutils/p5-Goo/Makefile
+++ b/deskutils/p5-Goo/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Stick Things together with The Goo
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-Auto>=0:${PORTSDIR}/devel/p5-Config-Auto \
-		p5-Config-Tiny>=0:${PORTSDIR}/devel/p5-Config-Tiny \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-Devel-Symdump>=0:${PORTSDIR}/devel/p5-Devel-Symdump \
-		p5-File-Grep>=0:${PORTSDIR}/devel/p5-File-Grep \
-		p5-File-NCopy>=0:${PORTSDIR}/devel/p5-File-NCopy \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		perltidy:${PORTSDIR}/devel/p5-Perl-Tidy \
-		p5-Term-ProgressBar>=0:${PORTSDIR}/devel/p5-Term-ProgressBar \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Text-FormatTable>=0:${PORTSDIR}/textproc/p5-Text-FormatTable
+BUILD_DEPENDS=	p5-Config-Auto>=0:devel/p5-Config-Auto \
+		p5-Config-Tiny>=0:devel/p5-Config-Tiny \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-Devel-Symdump>=0:devel/p5-Devel-Symdump \
+		p5-File-Grep>=0:devel/p5-File-Grep \
+		p5-File-NCopy>=0:devel/p5-File-NCopy \
+		p5-libwww>=0:www/p5-libwww \
+		perltidy:devel/p5-Perl-Tidy \
+		p5-Term-ProgressBar>=0:devel/p5-Term-ProgressBar \
+		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Text-FormatTable>=0:textproc/p5-Text-FormatTable
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/p5-ZConf-BGSet/Makefile b/deskutils/p5-ZConf-BGSet/Makefile
index d5389ca2c1a1..1e53a99bb289 100644
--- a/deskutils/p5-ZConf-BGSet/Makefile
+++ b/deskutils/p5-ZConf-BGSet/Makefile
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Background management utility and Perl module that uses ZConf
 
-BUILD_DEPENDS=	p5-Image-Size-FillFullSelect>=0.1.0:${PORTSDIR}/graphics/p5-Image-Size-FillFullSelect \
-		p5-ZConf>=:${PORTSDIR}/net/p5-ZConf \
-		${LOCALBASE}/bin/hsetroot:${PORTSDIR}/graphics/hsetroot \
-		p5-Imager-AverageGray>=0.0.0:${PORTSDIR}/graphics/p5-Imager-AverageGray \
-		p5-X11-Resolution>=0.0.0:${PORTSDIR}/x11/p5-X11-Resolution \
-		p5-String-ShellQuote>=1.04:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-Image-Size-FillFullSelect>=0.1.0:graphics/p5-Image-Size-FillFullSelect \
+		p5-ZConf>=:net/p5-ZConf \
+		${LOCALBASE}/bin/hsetroot:graphics/hsetroot \
+		p5-Imager-AverageGray>=0.0.0:graphics/p5-Imager-AverageGray \
+		p5-X11-Resolution>=0.0.0:x11/p5-X11-Resolution \
+		p5-String-ShellQuote>=1.04:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
index a6ef39a1e25c..be27e78335f2 100644
--- a/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
+++ b/deskutils/p5-ZConf-Runner-GUI-GTK/Makefile
@@ -12,10 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	The GTK GUI backend for ZConf::Runner
 
-BUILD_DEPENDS=	p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf \
-		p5-Gtk2>=1.060:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-ZConf-Runner>=0:${PORTSDIR}/deskutils/p5-ZConf-Runner \
-		p5-File-MimeInfo>=0:${PORTSDIR}/devel/p5-File-MimeInfo
+BUILD_DEPENDS=	p5-ZConf>=0:net/p5-ZConf \
+		p5-Gtk2>=1.060:x11-toolkits/p5-Gtk2 \
+		p5-ZConf-Runner>=0:deskutils/p5-ZConf-Runner \
+		p5-File-MimeInfo>=0:devel/p5-File-MimeInfo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/deskutils/p5-ZConf-Runner/Makefile b/deskutils/p5-ZConf-Runner/Makefile
index 120751386484..5ae026197cbd 100644
--- a/deskutils/p5-ZConf-Runner/Makefile
+++ b/deskutils/p5-ZConf-Runner/Makefile
@@ -12,11 +12,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Run a file using a chosen method, desktop entry, or mimetype
 
-BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
-		p5-File-MimeInfo>=0.16:${PORTSDIR}/devel/p5-File-MimeInfo \
-		p5-Curses-UI>=0.9609:${PORTSDIR}/devel/p5-Curses-UI \
-		p5-ZConf-GUI>=1.0.3:${PORTSDIR}/devel/p5-ZConf-GUI \
-		p5-String-ShellQuote>=1.04:${PORTSDIR}/textproc/p5-String-ShellQuote
+BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
+		p5-File-MimeInfo>=0.16:devel/p5-File-MimeInfo \
+		p5-Curses-UI>=0.9609:devel/p5-Curses-UI \
+		p5-ZConf-GUI>=1.0.3:devel/p5-ZConf-GUI \
+		p5-String-ShellQuote>=1.04:textproc/p5-String-ShellQuote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/phpcollab/Makefile b/deskutils/phpcollab/Makefile
index f455e4e93557..50208ffaaa15 100644
--- a/deskutils/phpcollab/Makefile
+++ b/deskutils/phpcollab/Makefile
@@ -27,7 +27,7 @@ MYSQL_USE=	PHP=mysql MYSQL=yes
 PGSQL_USE=	PHP=pgsql,pdo_pgsql
 PGSQL_USES=	pgsql
 APACHE_USE=	APACHE_RUN=22
-LIGHTTPD_RUN_DEPENDS=	lighttpd:${PORTSDIR}/ww/lighttpd
+LIGHTTPD_RUN_DEPENDS=	lighttpd:ww/lighttpd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile
index 000f9589d39a..5a4460468f2d 100644
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@@ -14,29 +14,29 @@ COMMENT=	Personal search and metasearch for the Free Desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	desktop-file-install:${PORTSDIR}/devel/desktop-file-utils \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info
-LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core		\
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24	\
-		libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat	\
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib		\
-		libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26	\
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs		\
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo		\
-		libexif.so:${PORTSDIR}/graphics/libexif			\
-		libexiv2.so:${PORTSDIR}/graphics/exiv2			\
-		libgmime-2.4.so:${PORTSDIR}/mail/gmime24		\
-		libtag.so:${PORTSDIR}/audio/taglib			\
-		libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info	\
-		antiword:${PORTSDIR}/textproc/antiword			\
-		xdg-open:${PORTSDIR}/devel/xdg-utils			\
-		${LOCALBASE}/libexec/xpdf/pdftotext:${PORTSDIR}/graphics/xpdf	\
-		catppt:${PORTSDIR}/textproc/catdoc			\
-		unzip:${PORTSDIR}/archivers/unzip			\
-		unrtf:${PORTSDIR}/textproc/unrtf			\
-		catdvi:${PORTSDIR}/print/catdvi				\
-		bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	desktop-file-install:devel/desktop-file-utils \
+		update-mime-database:misc/shared-mime-info
+LIB_DEPENDS=	libxapian.so:databases/xapian-core		\
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24	\
+		libexttextcat-2.0.so:textproc/libexttextcat	\
+		libdbus-glib-1.so:devel/dbus-glib		\
+		libxml++-2.6.so:textproc/libxml++26	\
+		libboost_thread.so:devel/boost-libs		\
+		libexecinfo.so:devel/libexecinfo		\
+		libexif.so:graphics/libexif			\
+		libexiv2.so:graphics/exiv2			\
+		libgmime-2.4.so:mail/gmime24		\
+		libtag.so:audio/taglib			\
+		libcurl.so:ftp/curl
+RUN_DEPENDS=	update-mime-database:misc/shared-mime-info	\
+		antiword:textproc/antiword			\
+		xdg-open:devel/xdg-utils			\
+		${LOCALBASE}/libexec/xpdf/pdftotext:graphics/xpdf	\
+		catppt:textproc/catdoc			\
+		unzip:archivers/unzip			\
+		unrtf:textproc/unrtf			\
+		catdvi:print/catdvi				\
+		bash:shells/bash
 
 PROJECTHOST=	${PORTNAME}-search
 
@@ -61,7 +61,7 @@ DEBUG_CONFIGURE_ON=	--enable-debug=yes
 
 CHMLIB_CONFIGURE_ON=	--enable-chmlib=yes
 CHMLIB_CONFIGURE_OFF=	--disable-chmlib
-CHMLIB_LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+CHMLIB_LIB_DEPENDS=	libchm.so:misc/chmlib
 
 INSTALLS_ICONS=	yes
 
diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index 7a88cf5b0dd8..f3f2d6348eea 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -27,7 +27,7 @@ COMMENT=	Good Web Calendar
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session
+BUILD_DEPENDS=	p5-CGI-Session>=0:www/p5-CGI-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix zip
diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile
index cbcdb8e424ae..5e7711a99f43 100644
--- a/deskutils/plasma-applet-qstardict/Makefile
+++ b/deskutils/plasma-applet-qstardict/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	plasma-applet-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionary plasma applet for KDE
 
-RUN_DEPENDS=	${QSTARDICT_PLUGIN_PATH}/libstardict.so:${PORTSDIR}/textproc/qstardict
+RUN_DEPENDS=	${QSTARDICT_PLUGIN_PATH}/libstardict.so:textproc/qstardict
 
 USES=		cmake tar:bzip2
 USE_QT4=	qmake_build uic_build moc_build rcc_build
diff --git a/deskutils/plasma-applet-simpleweatherforecast/Makefile b/deskutils/plasma-applet-simpleweatherforecast/Makefile
index 6c360edb4ddd..928fda8bfcca 100644
--- a/deskutils/plasma-applet-simpleweatherforecast/Makefile
+++ b/deskutils/plasma-applet-simpleweatherforecast/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	92149-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Weather plasma applet for KDE4
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS=	wget:ftp/wget
 
 USES=		cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs
diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index cd20e5fe763b..bdbc59cf606b 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -13,37 +13,37 @@ COMMENT=	Sync issue & bug tracking systems with taskwarrior
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:${PORTSDIR}/devel/py-twiggy \
-		${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:${PORTSDIR}/deskutils/py-taskw \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}keyring>0:${PORTSDIR}/security/py-keyring \
-		${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:${PORTSDIR}/ftp/py-pycurl \
-		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:${PORTSDIR}/devel/py-dogpile.cache \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:${PORTSDIR}/devel/py-lockfile \
-		${PYTHON_PKGNAMEPREFIX}click>0:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
-		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
+		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 OPTIONS_DEFINE=		BUGZILLA JIRA PHABRICATOR
 OPTIONS_DEFAULT=	BUGZILLA PHABRICATOR
 
 BUGZILLA_DESC=			Enable Bugzilla support
-BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:${PORTSDIR}/devel/py-python-bugzilla
+BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla
 
 JIRA_DESC=			Enabla Atlassian Jira support
-JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>0:${PORTSDIR}/devel/py-jira
+JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira
 
 PHABRICATOR_DESC=		Enable Phabricator support
-PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:${PORTSDIR}/devel/py-phabricator
+PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator
 
 TRAC_DESC=			Enable Trac support
-TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:${PORTSDIR}/devel/py-offtrac
+TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index f3ae0d8852f3..59b04512b4d6 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -13,17 +13,17 @@ COMMENT=	CalDAV-based calendar
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:${PORTSDIR}/devel/py-icalendar \
-		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:${PORTSDIR}/devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg \
-		${PYTHON_PKGNAMEPREFIX}pytz>=2014.10:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:${PORTSDIR}/devel/py-tzlocal \
-		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0.4.3:${PORTSDIR}/deskutils/py-vdirsyncer \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pkginfo>0:${PORTSDIR}/sysutils/py-pkginfo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar \
+		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2014.10:devel/py-pytz \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0.4.3:deskutils/py-vdirsyncer \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-pycarddav/Makefile b/deskutils/py-pycarddav/Makefile
index 8c31f6ebbe28..8d7d44696e77 100644
--- a/deskutils/py-pycarddav/Makefile
+++ b/deskutils/py-pycarddav/Makefile
@@ -13,12 +13,12 @@ COMMENT=	CardDAV based address book tool
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:${PORTSDIR}/devel/py-urwid \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:${PORTSDIR}/deskutils/py-vobject \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:${PORTSDIR}/devel/py-xdg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:deskutils/py-vobject \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-pystash/Makefile b/deskutils/py-pystash/Makefile
index a650ce631514..372449f9255a 100644
--- a/deskutils/py-pystash/Makefile
+++ b/deskutils/py-pystash/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Save your code snippets in the cloud from the command line
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:${PORTSDIR}/devel/py-args \
-		${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:${PORTSDIR}/devel/py-clint \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:${PORTSDIR}/devel/py-xerox
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args \
+		${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/py-taskw/Makefile b/deskutils/py-taskw/Makefile
index 04add2f1b18e..693499d165d7 100644
--- a/deskutils/py-taskw/Makefile
+++ b/deskutils/py-taskw/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python bindings for your taskwarrior database
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index d6381e700899..77a7c4a38b49 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Synchronize calendars and contacts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:${PORTSDIR}/devel/py-setuptools_scm
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.4:${PORTSDIR}/devel/py-atomicwrites \
-		${PYTHON_PKGNAMEPREFIX}click>=3.2:${PORTSDIR}/devel/py-click \
-		${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:${PORTSDIR}/devel/py-icalendar \
-		${PYTHON_PKGNAMEPREFIX}lxml>=3.0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.1.3:${PORTSDIR}/www/py-requests-toolbelt
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.4:devel/py-atomicwrites \
+		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:devel/py-icalendar \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.1.3:www/py-requests-toolbelt
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 285b91a5d467..3cf435077ba8 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jun-g@daemonfreaks.com
 COMMENT=	ICalendar library
 
-RUN_DEPENDS=	py*-dateutil>=1.1:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	py*-dateutil>=1.1:devel/py-dateutil
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index e69f70a717f5..5bda3497151c 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	PyBookReader-${PORTVERSION}
 MAINTAINER=	ufo@februality.com
 COMMENT=	Program for reading e-books
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index ddf36c1ded2b..32b6005c64d2 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Desktop panel written in Python
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libImlib2.so:${PORTSDIR}/graphics/imlib2
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libImlib2.so:graphics/imlib2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index fe51c50c2b4b..1fe2d71b5ffb 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Personal full text search package, based on Xapian
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxapian.so:${PORTSDIR}/databases/xapian-core
-RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
-		antiword:${PORTSDIR}/textproc/antiword \
-		catdoc:${PORTSDIR}/textproc/catdoc \
-		wpd2html:${PORTSDIR}/textproc/libwpd010 \
-		unrtf:${PORTSDIR}/textproc/unrtf
+LIB_DEPENDS=	libxapian.so:databases/xapian-core
+RUN_DEPENDS=	unrar:archivers/unrar \
+		antiword:textproc/antiword \
+		catdoc:textproc/catdoc \
+		wpd2html:textproc/libwpd010 \
+		unrtf:textproc/unrtf
 
 USES=		bison gmake iconv shebangfix
 SHEBANG_FILES=	filters/rclimg filters/rclpdf desktop/hotrecoll.py
@@ -35,18 +35,18 @@ OPTIONS_DEFINE=		ASPELL CHM DJVU KONQUEROR LATEX IMAGE PDF PS PYTHON \
 OPTIONS_DEFAULT=	ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON
 OPTIONS_SUB=		yes
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_WITH=	aspell
 CHM_DESC=		CHM via CHMLIB
-CHM_RUN_DEPENDS=	pychm>0:${PORTSDIR}/textproc/pychm
-DJVU_RUN_DEPENDS=	djvutxt:${PORTSDIR}/graphics/djvulibre
+CHM_RUN_DEPENDS=	pychm>0:textproc/pychm
+DJVU_RUN_DEPENDS=	djvutxt:graphics/djvulibre
 IMAGE_DESC=		Store personal tags or textual descriptions in images
-IMAGE_RUN_DEPENDS=	exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool
+IMAGE_RUN_DEPENDS=	exiftool:graphics/p5-Image-ExifTool
 KONQUEROR_DESC=		Konqueror webarchive format with Python
-KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:${PORTSDIR}/www/kwebkitpart
+KONQUEROR_RUN_DEPENDS=	kwebkitpart>0:www/kwebkitpart
 LATEX_USE=		tex=dvipsk:run,latex:run
-PDF_RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
-PS_RUN_DEPENDS=		pstotext:${PORTSDIR}/print/pstotext
+PDF_RUN_DEPENDS=	xpdf:graphics/xpdf
+PS_RUN_DEPENDS=		pstotext:print/pstotext
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENABLE=	python-module
 PYTHON_PLIST_SUB=	PYDISTUTILS_EGGINFO="${PYDISTUTILS_EGGINFO}"
@@ -59,8 +59,8 @@ QT4_CONFIGURE_ENABLE=	qtgui
 QT4_CONFIGURE_ENV=	QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" \
 			QTDIR="${QT_PREFIX}"
 QT4_VARS=		QT_NONSTANDARD=yes
-SOUND_RUN_DEPENDS=	mutagen-pony:${PORTSDIR}/audio/py-mutagen \
-			pykaraoke:${PORTSDIR}/audio/py-karaoke
+SOUND_RUN_DEPENDS=	mutagen-pony:audio/py-mutagen \
+			pykaraoke:audio/py-karaoke
 X11MON_DESC=		X11 session monitoring support
 X11MON_USES=		fam
 X11MON_USE=		xorg=ice,sm,x11
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 97cdeffe8c5f..e005fc37deb1 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Modern journal written in Python
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:${PORTSDIR}/www/py-webkitgtk \
-		${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}chardet>0:${PORTSDIR}/textproc/py-chardet
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk \
+		${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet
 
 USES=		desktop-file-utils gettext python:2
 
diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile
index 25c5fdf0220a..bd0a36ef3958 100644
--- a/deskutils/remind/Makefile
+++ b/deskutils/remind/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/rem \
 
 .if ${PORT_OPTIONS:MTCLTK}
 USES=		tk
-RUN_DEPENDS+=	dtplite:${PORTSDIR}/devel/tcllib
+RUN_DEPENDS+=	dtplite:devel/tcllib
 PLIST_FILES+=	bin/cm2rem.tcl bin/tkremind
 .endif
 
diff --git a/deskutils/rolo/Makefile b/deskutils/rolo/Makefile
index 4ae9a2f9d907..73ae67f4cfa3 100644
--- a/deskutils/rolo/Makefile
+++ b/deskutils/rolo/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text-based contact management software
 
-LIB_DEPENDS=	libvc.so:${PORTSDIR}/devel/libvc
+LIB_DEPENDS=	libvc.so:devel/libvc
 
 USES=		ncurses tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile
index 38b007daf7c5..96bdad6468ae 100644
--- a/deskutils/rox-memo/Makefile
+++ b/deskutils/rox-memo/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	memo-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Appointment/TODO management 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/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile
index a77cb019c2e3..a0f3555a71c5 100644
--- a/deskutils/rubrica/Makefile
+++ b/deskutils/rubrica/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Addressbook for the GNOME 2 desktop
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	libnotify.so:devel/libnotify
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
 USES=		desktop-file-utils gmake libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/rubygem-shellplay/Makefile b/deskutils/rubygem-shellplay/Makefile
index 9d80bb48b59b..c57b46d0b777 100644
--- a/deskutils/rubygem-shellplay/Makefile
+++ b/deskutils/rubygem-shellplay/Makefile
@@ -11,10 +11,10 @@ COMMENT=	CLI tool for shell-based presentations
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-paint>=1.0.0:${PORTSDIR}/devel/rubygem-paint \
-	rubygem-cliprompt>=0.1.2:${PORTSDIR}/devel/rubygem-cliprompt \
-	rubygem-configstruct>=0.1.0:${PORTSDIR}/devel/rubygem-configstruct \
-	rubygem-shell2html>=0.0.5:${PORTSDIR}/textproc/rubygem-shell2html
+RUN_DEPENDS=	rubygem-paint>=1.0.0:devel/rubygem-paint \
+	rubygem-cliprompt>=0.1.2:devel/rubygem-cliprompt \
+	rubygem-configstruct>=0.1.0:devel/rubygem-configstruct \
+	rubygem-shell2html>=0.0.5:textproc/rubygem-shell2html
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/deskutils/rubygem-taskjuggler/Makefile b/deskutils/rubygem-taskjuggler/Makefile
index b0b4e12f5ccb..cfc0c1c7a984 100644
--- a/deskutils/rubygem-taskjuggler/Makefile
+++ b/deskutils/rubygem-taskjuggler/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Project management tool for UNIX based operating systems
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	rubygem-mail>=2.4.3:${PORTSDIR}/mail/rubygem-mail \
-		rubygem-term-ansicolor>=1.0.7:${PORTSDIR}/devel/rubygem-term-ansicolor
+RUN_DEPENDS=	rubygem-mail>=2.4.3:mail/rubygem-mail \
+		rubygem-term-ansicolor>=1.0.7:devel/rubygem-term-ansicolor
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/deskutils/shutter/Makefile b/deskutils/shutter/Makefile
index cf06dc4ae245..56590ded9d06 100644
--- a/deskutils/shutter/Makefile
+++ b/deskutils/shutter/Makefile
@@ -13,38 +13,38 @@ COMMENT=	Screenshot tool
 LICENSE=	GPLv3 GPLv2 # the latter for some shipped cursors
 LICENSE_COMB=	multi
 
-RUN_DEPENDS=	ImageMagick>=6.9.3.1,1:${PORTSDIR}/graphics/ImageMagick \
-		librsvg2>=2.40.6:${PORTSDIR}/graphics/librsvg2 \
-		p5-File-BaseDir>=0.03:${PORTSDIR}/devel/p5-File-BaseDir \
-		p5-File-Copy-Recursive>=0.38_1:${PORTSDIR}/devel/p5-File-Copy-Recursive \
-		p5-File-Spec-Native>=1.003_1:${PORTSDIR}/devel/p5-File-Spec-Native \
-		p5-File-Which>=1.09:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-Gnome2-VFS>=1.082:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
-		p5-Gnome2-Wnck>=0.16:${PORTSDIR}/x11-toolkits/p5-Gnome2-Wnck \
-		p5-Gnome2>=1.045:${PORTSDIR}/x11-toolkits/p5-Gnome2 \
-		p5-Goo-Canvas>=0.06:${PORTSDIR}/devel/p5-Goo-Canvas \
-		p5-Gtk2-ImageView>=0.05:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView \
-		p5-Gtk2-Unique>=0.05:${PORTSDIR}/x11-toolkits/p5-Gtk2-Unique \
-		p5-Gtk2>=1.2491:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		p5-JSON-XS>=3.01:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-JSON>=2.90:${PORTSDIR}/converters/p5-JSON \
-		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
-		p5-Net-DBus>=1.0.0:${PORTSDIR}/devel/p5-Net-DBus \
-		p5-Net-Dropbox-API>=1.9:${PORTSDIR}/net/p5-Net-Dropbox-API \
-		p5-Net-OAuth>=0.28:${PORTSDIR}/net/p5-Net-OAuth \
-		p5-Path-Class>=0.35:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Proc-ProcessTable>=0.51:${PORTSDIR}/devel/p5-Proc-ProcessTable \
-		p5-Proc-Simple>=1.31:${PORTSDIR}/devel/p5-Proc-Simple \
-		p5-Sort-Naturally>=1.03:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-WWW-Mechanize>=1.74:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-X11-Protocol>=0.56:${PORTSDIR}/x11/p5-X11-Protocol \
-		p5-XML-Simple>=2.20:${PORTSDIR}/textproc/p5-XML-Simple \
-		xdg-utils>=1.0.2.20130919:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	ImageMagick>=6.9.3.1,1:graphics/ImageMagick \
+		librsvg2>=2.40.6:graphics/librsvg2 \
+		p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
+		p5-File-Copy-Recursive>=0.38_1:devel/p5-File-Copy-Recursive \
+		p5-File-Spec-Native>=1.003_1:devel/p5-File-Spec-Native \
+		p5-File-Which>=1.09:sysutils/p5-File-Which \
+		p5-Gnome2-VFS>=1.082:x11-toolkits/p5-Gnome2-VFS \
+		p5-Gnome2-Wnck>=0.16:x11-toolkits/p5-Gnome2-Wnck \
+		p5-Gnome2>=1.045:x11-toolkits/p5-Gnome2 \
+		p5-Goo-Canvas>=0.06:devel/p5-Goo-Canvas \
+		p5-Gtk2-ImageView>=0.05:x11-toolkits/p5-Gtk2-ImageView \
+		p5-Gtk2-Unique>=0.05:x11-toolkits/p5-Gtk2-Unique \
+		p5-Gtk2>=1.2491:x11-toolkits/p5-Gtk2 \
+		p5-JSON-XS>=3.01:converters/p5-JSON-XS \
+		p5-JSON>=2.90:converters/p5-JSON \
+		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
+		p5-Net-DBus>=1.0.0:devel/p5-Net-DBus \
+		p5-Net-Dropbox-API>=1.9:net/p5-Net-Dropbox-API \
+		p5-Net-OAuth>=0.28:net/p5-Net-OAuth \
+		p5-Path-Class>=0.35:devel/p5-Path-Class \
+		p5-Proc-ProcessTable>=0.51:devel/p5-Proc-ProcessTable \
+		p5-Proc-Simple>=1.31:devel/p5-Proc-Simple \
+		p5-Sort-Naturally>=1.03:textproc/p5-Sort-Naturally \
+		p5-WWW-Mechanize>=1.74:www/p5-WWW-Mechanize \
+		p5-X11-Protocol>=0.56:x11/p5-X11-Protocol \
+		p5-XML-Simple>=2.20:textproc/p5-XML-Simple \
+		xdg-utils>=1.0.2.20130919:devel/xdg-utils
 
 INSTALLS_ICONS=	yes
 
 METADATA_DESC=	Enable Shutter to write Metadata
-METADATA_RUN_DEPENDS=	p5-Image-ExifTool>=9.76:${PORTSDIR}/graphics/p5-Image-ExifTool
+METADATA_RUN_DEPENDS=	p5-Image-ExifTool>=9.76:graphics/p5-Image-ExifTool
 
 NO_BUILD=	yes
 
diff --git a/deskutils/silence/Makefile b/deskutils/silence/Makefile
index d26929682cf7..fb9b90a8c1fb 100644
--- a/deskutils/silence/Makefile
+++ b/deskutils/silence/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Information management tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:${PORTSDIR}/editors/kate
+RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/katepart.so:editors/kate
 
 USES=		cmake
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index 4861bc42ce72..7b99f7ac9d63 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	SimpleAgenda-${PORTVERSION}
 MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	simple calendar and agenda application
 
-LIB_DEPENDS+=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS+=	libical.so:devel/libical
 
 LICENSE=	GPLv2
 
diff --git a/deskutils/spice-gtk/Makefile b/deskutils/spice-gtk/Makefile
index 8ead98fccbb5..ade31dac7c32 100644
--- a/deskutils/spice-gtk/Makefile
+++ b/deskutils/spice-gtk/Makefile
@@ -17,16 +17,16 @@ USE_GNOME=	gnomeprefix gtk20 gtk30 intltool introspection:build
 USES=		cpe gmake jpeg libtool pkgconfig tar:bzip2 pathfix python
 CPE_VENDOR=	redhat
 
-BUILD_DEPENDS=	spice-protocol>=0.12.10:${PORTSDIR}/devel/spice-protocol \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:${PORTSDIR}/devel/py-pyparsing
-RUN_DEPENDS=	spice-protocol>=0.12.10:${PORTSDIR}/devel/spice-protocol
+BUILD_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing
+RUN_DEPENDS=	spice-protocol>=0.12.10:devel/spice-protocol
 
 .if defined(SPICE_SLAVE)
 PORTREVISION=	1
 CATEGORIES+=	python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:${PORTSDIR}/x11-toolkits/py-gtk2
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk2>=0:x11-toolkits/py-gtk2
 CONFIGURE_ARGS+=	--with-python
 PLIST_FILES+=	%%PYTHON_SITELIBDIR%%/SpiceClientGtk.so
 .endif
@@ -58,10 +58,10 @@ NOAUDIO_DESC=		Disable audio backend
 GSTREAMER_CONFIGURE_ON=	--with-audio=gstreamer
 GSTREAMER_USE=	GSTREAMER1=yes
 PULSEAUDIO_CONFIGURE_ON=	--with-audio=pulse
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 NOAUDIO_CONFIGURE_ON=		--with-audio=no
 SASL_CONFIGURE_WITH=		sasl=yes
-SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 
 .include <bsd.port.mk>
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index cbf73c3ce0f6..2b6f7382b709 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -19,15 +19,15 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 .include <${.CURDIR}/Makefile.common>
 
 .if ${PORT_OPTIONS:MCLIENT}
-RUN_DEPENDS+=	${LOCALBASE}/bin/strigiclient:${PORTSDIR}/deskutils/strigiclient
+RUN_DEPENDS+=	${LOCALBASE}/bin/strigiclient:deskutils/strigiclient
 .endif
 
 .if ${PORT_OPTIONS:MDAEMON}
-RUN_DEPENDS+=	${LOCALBASE}/bin/strigidaemon:${PORTSDIR}/deskutils/strigidaemon
+RUN_DEPENDS+=	${LOCALBASE}/bin/strigidaemon:deskutils/strigidaemon
 .endif
 
 .if ${PORT_OPTIONS:MUTILITIES}
-RUN_DEPENDS+=	${LOCALBASE}/bin/xmlindexer:${PORTSDIR}/deskutils/strigiutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/xmlindexer:deskutils/strigiutils
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/strigiclient/Makefile b/deskutils/strigiclient/Makefile
index cbf1be911f7c..374d222cffda 100644
--- a/deskutils/strigiclient/Makefile
+++ b/deskutils/strigiclient/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: Qt4 GUI
 
-LIB_DEPENDS=	libstreams.so:${PORTSDIR}/deskutils/libstreams \
-		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer \
-		libsearchclient.so:${PORTSDIR}/deskutils/strigidaemon
+LIB_DEPENDS=	libstreams.so:deskutils/libstreams \
+		libstreamanalyzer.so:deskutils/libstreamanalyzer \
+		libsearchclient.so:deskutils/strigidaemon
 
 USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/strigidaemon/Makefile b/deskutils/strigidaemon/Makefile
index d81c438ff017..992c70043f14 100644
--- a/deskutils/strigidaemon/Makefile
+++ b/deskutils/strigidaemon/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: daemon
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libstreams.so:${PORTSDIR}/deskutils/libstreams \
-		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libstreams.so:deskutils/libstreams \
+		libstreamanalyzer.so:deskutils/libstreamanalyzer
 
 USES=		fam pkgconfig
 USE_GNOME=	libxml2
diff --git a/deskutils/strigiutils/Makefile b/deskutils/strigiutils/Makefile
index e08e43adc9a6..2980fd9087c1 100644
--- a/deskutils/strigiutils/Makefile
+++ b/deskutils/strigiutils/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: utilities
 
-LIB_DEPENDS=	libstreams.so:${PORTSDIR}/deskutils/libstreams \
-		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer
+LIB_DEPENDS=	libstreams.so:deskutils/libstreams \
+		libstreamanalyzer.so:deskutils/libstreamanalyzer
 
 .include <${.CURDIR}/../strigi/Makefile.common>
 .include <bsd.port.mk>
diff --git a/deskutils/superswitcher/Makefile b/deskutils/superswitcher/Makefile
index 560e837eea35..3d17dcad0048 100644
--- a/deskutils/superswitcher/Makefile
+++ b/deskutils/superswitcher/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Alt-Tab replacement
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gmake pkgconfig
 USE_GNOME=	gconf2 intltool libwnck
diff --git a/deskutils/surrealtodo/Makefile b/deskutils/surrealtodo/Makefile
index 3ab488e8702a..6e5b8419d2fc 100644
--- a/deskutils/surrealtodo/Makefile
+++ b/deskutils/surrealtodo/Makefile
@@ -35,7 +35,7 @@ USE_PHP+=	pgsql
 USE_APACHE_RUN=	22
 .endif
 .if ${PORT_OPTIONS:MLIGHTTPD}
-RUN_DEPENDS+=	lighttpd:${PORTSDIR}/www/lighttpd
+RUN_DEPENDS+=	lighttpd:www/lighttpd
 .endif
 
 do-install:
diff --git a/deskutils/syncthing-gtk/Makefile b/deskutils/syncthing-gtk/Makefile
index b5096601b859..4019e60e13a6 100644
--- a/deskutils/syncthing-gtk/Makefile
+++ b/deskutils/syncthing-gtk/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Python based GUI for Syncthing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	syncthing
diff --git a/deskutils/tagutils/Makefile b/deskutils/tagutils/Makefile
index edcfe41558b2..69d50d9ec0cb 100644
--- a/deskutils/tagutils/Makefile
+++ b/deskutils/tagutils/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://releases.chipx86.com/leaftag/tagutils/
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Command line tool for tagging files
 
-LIB_DEPENDS=	libleaftag.so:${PORTSDIR}/devel/libleaftag
+LIB_DEPENDS=	libleaftag.so:devel/libleaftag
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
diff --git a/deskutils/taskd/Makefile b/deskutils/taskd/Makefile
index d7e9fcdef50f..318b7c0e5179 100644
--- a/deskutils/taskd/Makefile
+++ b/deskutils/taskd/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multi-user server for taskwarrior
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libgnutls.so:security/gnutls
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		cmake:outsource compiler:c++11-lib shebangfix
 SHEBANG_FILES=	demo/client/case* \
diff --git a/deskutils/taskwarrior/Makefile b/deskutils/taskwarrior/Makefile
index 862b04cb40ae..66a4806ff842 100644
--- a/deskutils/taskwarrior/Makefile
+++ b/deskutils/taskwarrior/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Feature-rich command-line todo list manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 USES=		compiler:c++11-lib cmake python:test shebangfix
 
diff --git a/deskutils/thinkingrock/Makefile b/deskutils/thinkingrock/Makefile
index 376b8a46f9c5..59cf6b8244f9 100644
--- a/deskutils/thinkingrock/Makefile
+++ b/deskutils/thinkingrock/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tr-${PORTVERSION}
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Application for collecting and processing your thoughts
 
-RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${LOCALBASE}/bin/xdg-email:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
+		${LOCALBASE}/bin/xdg-email:devel/xdg-utils
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile
index 24e09c7d9b6e..8a10ed33f565 100644
--- a/deskutils/todo/Makefile
+++ b/deskutils/todo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Todo.txt Manager
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS_INSTALL=	devtodo-[0-9]*
 
diff --git a/deskutils/tomboy-plugin-latex/Makefile b/deskutils/tomboy-plugin-latex/Makefile
index 1cea44cb189b..af144f57f11c 100644
--- a/deskutils/tomboy-plugin-latex/Makefile
+++ b/deskutils/tomboy-plugin-latex/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tomboy-latex-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	LaTeX math plugin for Tomboy
 
-BUILD_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
-RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
+BUILD_DEPENDS=	tomboy:deskutils/tomboy
+RUN_DEPENDS=	tomboy:deskutils/tomboy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/deskutils/tomboy-plugin-reminder/Makefile b/deskutils/tomboy-plugin-reminder/Makefile
index 4aab62cc11b8..c208d33bb3a9 100644
--- a/deskutils/tomboy-plugin-reminder/Makefile
+++ b/deskutils/tomboy-plugin-reminder/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tomboy-reminder-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Automatically open notes at a given date and time
 
-BUILD_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
-RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
+BUILD_DEPENDS=	tomboy:deskutils/tomboy
+RUN_DEPENDS=	tomboy:deskutils/tomboy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/deskutils/tomboy-plugin-todo/Makefile b/deskutils/tomboy-plugin-todo/Makefile
index 799b3472dc6f..1431fc4e0e71 100644
--- a/deskutils/tomboy-plugin-todo/Makefile
+++ b/deskutils/tomboy-plugin-todo/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	tomboy-todo-${PORTVERSION}
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Highlight FIXME, TODO, and XXX in your notes
 
-BUILD_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
-RUN_DEPENDS=	tomboy:${PORTSDIR}/deskutils/tomboy
+BUILD_DEPENDS=	tomboy:deskutils/tomboy
+RUN_DEPENDS=	tomboy:deskutils/tomboy
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_GMCS=${LOCALBASE}/bin/mcs
diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 6ad1f74e01c0..59745d4c698a 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Personal note taking system for the GNOME desktop
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
-		mautil:${PORTSDIR}/devel/mono-addins
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
-		mautil:${PORTSDIR}/devel/mono-addins
+LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus-sharp-glib \
+		mautil:devel/mono-addins
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:devel/dbus-sharp-glib \
+		mautil:devel/mono-addins
 
 USES=		cpe gettext gmake libtool mono pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack gnomeprefix gnomedocutils gnomesharp20
@@ -40,8 +40,8 @@ PORTSCOUT=	limitw:1,even
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 CONFIGURE_ARGS+=--enable-evolution
-BUILD_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:${PORTSDIR}/mail/gmime26-sharp
-RUN_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:${PORTSDIR}/mail/gmime26-sharp
+BUILD_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:mail/gmime26-sharp
+RUN_DEPENDS+=	${LOCALBASE}/lib/mono/gmime-sharp-2.6/gmime-sharp.dll:mail/gmime26-sharp
 PLIST_SUB+=	EVOLUTION=""
 .else
 CONFIGURE_ARGS+=--disable-evolution
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index cc1d68f0ce16..8ed522223932 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	On-Screen-Display for hotkeys of IBM ThinkPads
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS=	libxosd.so:misc/xosd
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 98e22f049397..3aaa7d109f23 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -16,10 +16,10 @@ COMMENT=	Structured information storage program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
-		aspell:${PORTSDIR}/textproc/aspell
+BUILD_DEPENDS=	aspell:textproc/aspell
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
+		aspell:textproc/aspell
 
 WRKSRC=		${WRKDIR}/TreeLine
 USE_QT4=	# empty
diff --git a/deskutils/vboxgtk/Makefile b/deskutils/vboxgtk/Makefile
index b87667eedfbe..95b0f7a759b1 100644
--- a/deskutils/vboxgtk/Makefile
+++ b/deskutils/vboxgtk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK frontend for VirtualBox
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xpcom/vboxxpcom.py:${PORTSDIR}/emulators/virtualbox-ose
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xpcom/vboxxpcom.py:emulators/virtualbox-ose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index db9205c9b262..8e24f7f43df3 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libvirt.so:${PORTSDIR}/devel/libvirt
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \
-		vte3>=0:${PORTSDIR}/x11-toolkits/vte3 \
-		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:${PORTSDIR}/www/py-urlgrabber \
-		${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt \
-		gtk-vnc>=0.4.4:${PORTSDIR}/net/gtk-vnc \
-		libvirt-glib>=0.1.9:${PORTSDIR}/devel/libvirt-glib \
-		libosinfo>=0:${PORTSDIR}/devel/libosinfo \
-		spice-gtk>=0.26:${PORTSDIR}/deskutils/spice-gtk
+LIB_DEPENDS=	libvirt.so:devel/libvirt
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2 \
+		vte3>=0:x11-toolkits/vte3 \
+		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber \
+		${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \
+		gtk-vnc>=0.4.4:net/gtk-vnc \
+		libvirt-glib>=0.1.9:devel/libvirt-glib \
+		libosinfo>=0:devel/libosinfo \
+		spice-gtk>=0.26:deskutils/spice-gtk
 
 PYDISTUTILS_INSTALLNOSINGLE=	yes
 PYDISTUTILS_CONFIGURE_TARGET=	configure
diff --git a/deskutils/vit/Makefile b/deskutils/vit/Makefile
index b8ef58b5a656..5f3e4abc7af3 100644
--- a/deskutils/vit/Makefile
+++ b/deskutils/vit/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Curses-based interface to taskwarrior
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes \
-		task:${PORTSDIR}/deskutils/taskwarrior
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes \
+		task:deskutils/taskwarrior
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/deskutils/vnc2flv/Makefile b/deskutils/vnc2flv/Makefile
index 788c18408fd9..c08e4fec563d 100644
--- a/deskutils/vnc2flv/Makefile
+++ b/deskutils/vnc2flv/Makefile
@@ -15,7 +15,7 @@ USES=		python
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	X11
-X11_RUN_DEPENDS=x11vnc:${PORTSDIR}/net/x11vnc
+X11_RUN_DEPENDS=x11vnc:net/x11vnc
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/flvscreen.so
diff --git a/deskutils/wammu/Makefile b/deskutils/wammu/Makefile
index 521b6d85d4e7..cccd124d4efb 100644
--- a/deskutils/wammu/Makefile
+++ b/deskutils/wammu/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GUI manager of contacts, todos, calendar, and messages in your phone
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libGammu.so:${PORTSDIR}/comms/gammu
+LIB_DEPENDS=	libGammu.so:comms/gammu
 
 USES=		gettext pkgconfig python tar:bz2
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/wyrd/Makefile b/deskutils/wyrd/Makefile
index 1222466d1057..4ee3933e0776 100644
--- a/deskutils/wyrd/Makefile
+++ b/deskutils/wyrd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Text-based front-end to Remind
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	remind:${PORTSDIR}/deskutils/remind
+RUN_DEPENDS=	remind:deskutils/remind
 
 USES=		gmake ncurses
 USE_OCAML=	yes
diff --git a/deskutils/xchm/Makefile b/deskutils/xchm/Makefile
index 4ef9a27dff46..c36c64e6424e 100644
--- a/deskutils/xchm/Makefile
+++ b/deskutils/xchm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Windows HTML Help (.chm) viewer for UNIX
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	libchm.so:misc/chmlib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 35f498e853e0..cfd01f79bcf8 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Notes plugin for the Xfce panel
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libunique-1.0.so:x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 0146f41c0e42..bd6d39c9d7a4 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Port of Gnome's notification-daemon for the Xfce desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+LIB_DEPENDS=	libsexy.so:x11-toolkits/libsexy \
+		libdbus-glib-1.so:devel/dbus-glib
+RUN_DEPENDS=	dbus-daemon:devel/dbus
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 978d283fbdb5..b9b3e8c2ef0f 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Visually-appealing notification daemon for Xfce
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libnotify.so:devel/libnotify
 
 USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 6995782f4728..b3d08fe0ad89 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Thumbnail service for Xfce desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
@@ -38,20 +38,20 @@ GSTREAMER_DESC=	GStreamer (1.0) thumbnailer plugin
 
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FONTS_LIB_DEPENDS=	libfreetype.so:print/freetype2
 FONTS_CONFIGURE_ENABLE=	font-thumbnailer
-JPEG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_LIB_DEPENDS=	libexif.so:graphics/libexif
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg-thumbnailer
-FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
+FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg-thumbnailer
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 POPPLER_CONFIGURE_ENABLE=	poppler-thumbnailer
 GSTREAMER_USE=	gstreamer1=yes
 GSTREAMER_CONFIGURE_ENABLE=	gstreamer-thumbnailer
 ODF_USE=	gnome=libgsf
 ODF_CONFIGURE_ENABLE=	odf-thumbnailer
-COVER_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+COVER_LIB_DEPENDS=	libcurl.so:ftp/curl
 COVER_CONFIGURE_ENABLE=	cover-thumbnailer
 OPTIONS_SUB=	yes
 
diff --git a/deskutils/xfce4-volumed-pulse/Makefile b/deskutils/xfce4-volumed-pulse/Makefile
index 54114101eadb..f4cedd72948c 100644
--- a/deskutils/xfce4-volumed-pulse/Makefile
+++ b/deskutils/xfce4-volumed-pulse/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Volume management daemon for Xfce using PulseAudio
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio \
-	libnotify.so:${PORTSDIR}/devel/libnotify \
-	libkeybinder.so:${PORTSDIR}/x11/keybinder
+LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
+	libnotify.so:devel/libnotify \
+	libkeybinder.so:x11/keybinder
 
 USES=	pkgconfig gmake xfce tar:bz2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 2d1cf7965776..0c794283c32d 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Volume management daemon for the Xfce desktop
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libkeybinder.so:${PORTSDIR}/x11/keybinder
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libkeybinder.so:x11/keybinder
 
 USES=		pkgconfig gmake xfce tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 126f86b3ba06..8bec75c59235 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Keyboard layout switching plugin for the Xfce panel
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	libxklavier.so:x11/libxklavier
 
 GNU_CONFIGURE=	yes
 USES=		gettext pkgconfig gmake xfce tar:bzip2
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index f279ca460957..d4399296ac63 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Auto keyboard switcher
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libpcre.so:devel/pcre
 
 USES=		compiler:nestedfct iconv libtool localbase pathfix pkgconfig
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -39,11 +39,11 @@ NLS_CONFIGURE_ENABLE=	nls
 X11_USE=		XORG=x11
 X11_CONFIGURE_WITH=	x
 
-ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ON=	--with-spell=aspell
 ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
 
-XOSD_LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 XOSD_CONFIGURE_WITH=	xosd
 
 .include <bsd.port.options.mk>
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 3e0458174180..1ffc3e69960e 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme
 
 OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_SUB=	yes
diff --git a/deskutils/xrolo/Makefile b/deskutils/xrolo/Makefile
index 32306efa1a40..1c0cb6058a09 100644
--- a/deskutils/xrolo/Makefile
+++ b/deskutils/xrolo/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}.v2p6
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Electronic Rolodex
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/xrolo
 
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 1d7fe00b7d5b..e73892d60164 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Desktop wiki editor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \
+		xdg-open:devel/xdg-utils \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 NO_ARCH=	yes
 
@@ -27,20 +27,20 @@ OPTIONS_DEFINE=		BZR DITAA GIT GNUPLOT GNUR GRAPHVIZ LATEX \
 			MERCURIAL SCROT
 
 DITAA_DESC=		Diagram editor support
-DITAA_RUN_DEPENDS=	ditaa:${PORTSDIR}/graphics/ditaa
+DITAA_RUN_DEPENDS=	ditaa:graphics/ditaa
 BZR_DESC=		Version control for notebooks using bzr
-BZR_RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
+BZR_RUN_DEPENDS=	bzr:devel/bzr
 GIT_DESC=		Version control for notebooks using git
-GIT_RUN_DEPENDS=	git:${PORTSDIR}/devel/git
-GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+GIT_RUN_DEPENDS=	git:devel/git
+GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 GNUR_DESC=		Support of plot editor based on GNU R
-GNUR_RUN_DEPENDS=	R:${PORTSDIR}/math/R
-GRAPHVIZ_RUN_DEPENDS=	fdp:${PORTSDIR}/graphics/graphviz
+GNUR_RUN_DEPENDS=	R:math/R
+GRAPHVIZ_RUN_DEPENDS=	fdp:graphics/graphviz
 LATEX_USE=		tex=latex:run
 MERCURIAL_DESC=		Version control for notebooks using hg
-MERCURIAL_RUN_DEPENDS=	hg:${PORTSDIR}/devel/mercurial
+MERCURIAL_RUN_DEPENDS=	hg:devel/mercurial
 SCROT_DESC=		Screenshot taking and inserting support
-SCROT_RUN_DEPENDS=	scrot:${PORTSDIR}/graphics/scrot
+SCROT_RUN_DEPENDS=	scrot:graphics/scrot
 
 post-patch:
 	@${REINPLACE_CMD} -e \
author	Mathieu Arnold <mat@FreeBSD.org>	2016-04-01 14:00:51 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2016-04-01 14:00:51 +0000
commit	4e1b79a0a61f4973df8b4b0864d22086c769e219 (patch)
tree	78ceaf1b099c56a40c240ab46278cdf4ae9e7c01 /deskutils
parent	Remove ${PORTSDIR}/ from dependencies, Mk and categories a, b, and c. (diff)