Remove ${PORTSDIR}/ from dependencies, Mk and categories a, b, and c.

With hat:	portmgr
Sponsored by:	Absolight

1009 files changed, 3492 insertions, 3492 deletions

diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 59a18ff67a50..8588436bc4e7 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -31,8 +31,8 @@ GECKO_CONFING?=	${LOCALBASE}/bin/${GECKO}-config
 XPIDL?=		${LOCALBASE}/lib/${GECKO}/xpidl
 XPIDL_INCL?=	`${GECKO_CONFIG} --idlflags`
 
-BUILD_DEPENDS+=	libxul>=38:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	libxul>=38:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+=	libxul>=38:www/libxul
+RUN_DEPENDS+=	libxul>=38:www/libxul
 
 .elif ${gecko_ARGS:Mfirefox}
 
@@ -41,8 +41,8 @@ _GECKO_VERSIONS=		38 45
 _GECKO_TYPE=	firefox
 
 # Dependence lines for different Firefox versions
-38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-45_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+38_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
+45_DEPENDS=		${LOCALBASE}/lib/firefox/firefox:www/firefox
 
 .if exists(${LOCALBASE}/bin/firefox)
 _GECKO_INSTALLED_VER!=	${LOCALBASE}/bin/firefox --version 2>/dev/null
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/
 .endif
 
 # Dependence lines for different Seamonkey versions
-39_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+39_DEPENDS=		${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
 
 .elif ${gecko_ARGS:Mthunderbird}
 
@@ -75,7 +75,7 @@ _GECKO_INSTALLED_VER:=	${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g
 .endif
 
 # Dependence lines for different Thunderbird versions
-38_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+38_DEPENDS=		${LOCALBASE}/lib/thunderbird/thunderbird:mail/thunderbird
 
 .else
 IGNORE=	Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index 73844c28166d..aeb6470a1c76 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -201,9 +201,9 @@ zlib_UNIT=	devel/fpc-zlib
 .if defined(_POSTMKINCLUDED) && defined(USE_FPC)
 .	for UNIT in ${USE_FPC}
 .		if ${_FPC_ALL_UNITS:M${UNIT}} != ""
-BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
+BUILD_DEPENDS+= ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
 .			if defined(USE_FPC_RUN)
-RUN_DEPENDS+=   ${MKINSTDIR}/${UNIT}.fpm:${PORTSDIR}/${${UNIT:S/-/_/}_UNIT}
+RUN_DEPENDS+=   ${MKINSTDIR}/${UNIT}.fpm:${${UNIT:S/-/_/}_UNIT}
 .			endif
 
 security-check: fpc-check-install
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 89bbc606e182..85ecd9dee20e 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -397,7 +397,7 @@ MOZ_OPTIONS+=	--disable-pulseaudio
 
 .if ${MOZILLA_VER:R:R} >= 40
 .if ${PORT_OPTIONS:MRUST}
-BUILD_DEPENDS+=	rustc:${PORTSDIR}/${RUST_PORT}
+BUILD_DEPENDS+=	rustc:${RUST_PORT}
 RUST_PORT?=		lang/rust
 MOZ_OPTIONS+=	--enable-rust
 .else
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 515dcc4e0366..c594c8686c02 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -4421,7 +4421,7 @@ fetch-recursive-list:
 
 # Used by fetch-required and fetch-required list, this script looks
 # at each of the dependencies. If 3 items are specified in the tuple,
-# such as foo:${PORTSDIR}/graphics/foo:extract, the first item (foo)
+# such as foo:graphics/foo:extract, the first item (foo)
 # is examined. Only if it begins with a / and does not exist on the
 # file-system will ``make targ'' proceed.
 # For more usual (dual-item) dependency tuples, the ``make targ''
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 3e220c059025..df37ce36e325 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -12,11 +12,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Interactive Python accessibility explorer for GNOME
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		itstool:${PORTSDIR}/textproc/itstool \
-		at-spi2-core>=2.1.5:${PORTSDIR}/accessibility/at-spi2-core
-RUN_DEPENDS=	gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
-		at-spi2-core>=2.1.5:${PORTSDIR}/accessibility/at-spi2-core
+BUILD_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
+		itstool:textproc/itstool \
+		at-spi2-core>=2.1.5:accessibility/at-spi2-core
+RUN_DEPENDS=	gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
+		at-spi2-core>=2.1.5:accessibility/at-spi2-core
 
 USES=		gettext gmake pkgconfig python:3 shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack py3gobject3
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index a0de68395934..e3ddab8ca101 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -16,7 +16,7 @@ USES+=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
-RUN_DEPENDS=	at-spi2-atk>2.6.0:${PORTSDIR}/accessibility/at-spi2-atk
+RUN_DEPENDS=	at-spi2-atk>2.6.0:accessibility/at-spi2-atk
 
 USES+=		gmake gettext libtool pathfix pkgconfig python:2
 USE_GNOME=	intlhack gtk20 gconf2 libbonobo
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index b9f5d5149e3c..d81fd5f5b0a8 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Assisted Technology Provider module for GTK+
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	at-spi2-core>=2.17.90:${PORTSDIR}/accessibility/at-spi2-core
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	at-spi2-core>=2.17.90:${PORTSDIR}/accessibility/at-spi2-core
+BUILD_DEPENDS=	at-spi2-core>=2.17.90:accessibility/at-spi2-core
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+RUN_DEPENDS=	at-spi2-core>=2.17.90:accessibility/at-spi2-core
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index 7aabc460a8dc..23c3b8c7249e 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Assistive Technology Service Provider Interface
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 3fbca3d34cc4..d76c67ee2ac6 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Gnome On-Screen keyboard
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee \
-		libxklavier.so:${PORTSDIR}/x11/libxklavier
-RUN_DEPENDS=	py2?-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
+LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter \
+		libgee-0.8.so:devel/libgee \
+		libxklavier.so:x11/libxklavier
+RUN_DEPENDS=	py2?-atspi>=2.1.91:accessibility/py-atspi
 
 USES=		gettext gmake gnome libtool pathfix pkgconfig python:2 \
 		shebangfix tar:xz
diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile
index 605bf4e59134..398b5ac8048d 100644
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@@ -13,9 +13,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Information efficient text-entry interface
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
-RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libogg.so:audio/libogg
+RUN_DEPENDS=	rarian-sk-config:textproc/rarian
 
 USES=		gettext gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack libgnomeui atspi \
diff --git a/accessibility/eflite/Makefile b/accessibility/eflite/Makefile
index 9175fc0f4e18..12ff6e1ab21a 100644
--- a/accessibility/eflite/Makefile
+++ b/accessibility/eflite/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	David.K.Gerry@GMail.com
 COMMENT=	Speech server for Festival Lite used by yasr and Emacspeak
 
-BUILD_DEPENDS=	flite:${PORTSDIR}/audio/flite
-RUN_DEPENDS=	flite:${PORTSDIR}/audio/flite
+BUILD_DEPENDS=	flite:audio/flite
+RUN_DEPENDS=	flite:audio/flite
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 2d6dce72b85a..8371e31898df 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -29,11 +29,11 @@ FESTIVAL_DESC=	Festival speech synthesis support
 
 OPTIONS_SUB=	yes
 
-ESPEAK_LIB_DEPENDS=	libespeak.so:${PORTSDIR}/audio/espeak
+ESPEAK_LIB_DEPENDS=	libespeak.so:audio/espeak
 ESPEAK_CONFIGURE_ON=--with-espeak-dir=${LOCALBASE}
 ESPEAK_CONFIGURE_OFF=--without-espeak
 
-FESTIVAL_RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+FESTIVAL_RUN_DEPENDS=	festival:audio/festival
 FESTIVAL_CONFIGURE_OFF=--without-festival
 
 post-patch:
diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile
index ada30dbc98c2..1c2be94f564b 100644
--- a/accessibility/gnopernicus/Makefile
+++ b/accessibility/gnopernicus/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Collection of accessibility apps for GNOME 2
 DEPRECATED=	Not developed upstream anymore. Obsoleted by accessibility/orca
 EXPIRATION_DATE=	2016-04-07
 
-LIB_DEPENDS=	libgnome-mag.so:${PORTSDIR}/accessibility/gnome-mag
+LIB_DEPENDS=	libgnome-mag.so:accessibility/gnome-mag
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile
index 753fd3ffec7f..5b8e8a069efc 100644
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)
 
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libdbus-glib-1.so:devel/dbus-glib
 
 USES=		gmake gettext libtool pathfix pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
diff --git a/accessibility/java-access-bridge/Makefile b/accessibility/java-access-bridge/Makefile
index c9d3e28d9cb0..6809b3299c8d 100644
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome Java Accessibility Bridge
 
-BUILD_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
-RUN_DEPENDS=	xprop:${PORTSDIR}/x11/xprop
+BUILD_DEPENDS=	xprop:x11/xprop
+RUN_DEPENDS=	xprop:x11/xprop
 
 USES=		gmake pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile
index 915bcbde3e1a..735bf421a4c8 100644
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE text-to-speech system
 
-LIB_DEPENDS=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
+LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	kdeprefix kdelibs automoc4
diff --git a/accessibility/kaccessible/Makefile b/accessibility/kaccessible/Makefile
index 87cf1dde119c..24b76ccea9a8 100644
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Accessibility services for KDE
 
-LIB_DEPENDS=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
+LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource tar:xz
diff --git a/accessibility/kdeaccessibility4/Makefile b/accessibility/kdeaccessibility4/Makefile
index d7a8a0317ef9..0eafa553a0ab 100644
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@@ -15,18 +15,18 @@ OPTIONS_DEFINE=	JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH
 OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
 
 JOVIE_DESC=		Install Jovie text-to-speech system
-JOVIE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
+JOVIE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/jovie:accessibility/jovie
 
 KACCESSIBLE_DESC=	Install Accessibility services for KDE
-KACCESSIBLE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:${PORTSDIR}/accessibility/kaccessible
+KACCESSIBLE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible
 
 KMAG_DESC=		Install Screen magnifier
-KMAG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmag:${PORTSDIR}/accessibility/kmag
+KMAG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmag:accessibility/kmag
 
 KMOUSETOOL_DESC=	Install Automatic mouse click tool
-KMOUSETOOL_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmousetool:${PORTSDIR}/accessibility/kmousetool
+KMOUSETOOL_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmousetool:accessibility/kmousetool
 
 KMOUTH_DESC=		Install Speech synthesizer frontend
-KMOUTH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmouth:${PORTSDIR}/accessibility/kmouth
+KMOUTH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmouth:accessibility/kmouth
 
 .include <bsd.port.mk>
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 84b66768c80e..f46f37585fcf 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -11,8 +11,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mouse accessibility enhancements for the GNOME desktop
 
-BUILD_DEPENDS=	gsettings-desktop-schemas>=0.1.0:${PORTSDIR}/devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gsettings-desktop-schemas>=0.1.0:${PORTSDIR}/devel/gsettings-desktop-schemas
+BUILD_DEPENDS=	gsettings-desktop-schemas>=0.1.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gsettings-desktop-schemas>=0.1.0:devel/gsettings-desktop-schemas
 
 USE_XORG=	x11 xfixes xcursor xtst
 USE_GNOME=	gnomeprefix gtk30 intlhack
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index c6b63673ef60..ca303e7fd721 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -10,16 +10,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Scriptable screen reader
 
-BUILD_DEPENDS=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus \
-		py3?-xdg>=0:${PORTSDIR}/devel/py3-xdg \
-		py3?-cairo>=0:${PORTSDIR}/graphics/py3-cairo \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libatspi.so:${PORTSDIR}/accessibility/at-spi2-core
-RUN_DEPENDS=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus \
-		py3?-speech-dispatcher>=0:${PORTSDIR}/accessibility/py3-speech-dispatcher \
-		py3?-atspi>=0:${PORTSDIR}/accessibility/py3-atspi \
-		py3?-xdg>=0:${PORTSDIR}/devel/py3-xdg \
-		py3?-cairo>=0:${PORTSDIR}/graphics/py3-cairo
+BUILD_DEPENDS=	py3?-dbus>=0:devel/py3-dbus \
+		py3?-xdg>=0:devel/py3-xdg \
+		py3?-cairo>=0:graphics/py3-cairo \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libatspi.so:accessibility/at-spi2-core
+RUN_DEPENDS=	py3?-dbus>=0:devel/py3-dbus \
+		py3?-speech-dispatcher>=0:accessibility/py3-speech-dispatcher \
+		py3?-atspi>=0:accessibility/py3-atspi \
+		py3?-xdg>=0:devel/py3-xdg \
+		py3?-cairo>=0:graphics/py3-cairo
 
 # conflict with py*-json-py because orca uses the json from python itself
 # and py*-json-py shadows this.
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index c7e56989287c..a6535253e642 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python API for the D-BUS based SPI framework
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
+RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:accessibility/at-spi2-core
 
 CONFLICTS=	at-spi-1.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index 8e8d4ab5b6e1..450b168e2b87 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python3 API for the D-BUS based SPI framework
 
-RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
+RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:accessibility/at-spi2-core
 
 CONFLICTS=	at-spi-1.[0-9]*
 PORTSCOUT=	limitw:1,even
diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index 2e693273e857..d179f41981bb 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -38,8 +38,8 @@ VIDMODE_CONFIGURE_ENABLE=	vidmode
 
 GUI_USES=		python
 GUI_CONFIGURE_ENABLE=	gui
-GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:${PORTSDIR}/x11-toolkits/py-gtk2 \
-			${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \
+			${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
 
 GNOME_CONFIGURE_ENABLE=	gnome-clock
 GNOME_USE=		GNOME=glib20,gconf2
diff --git a/accessibility/rubygem-atk/Makefile b/accessibility/rubygem-atk/Makefile
index 0fcdc5cf89ae..6228a33cd0ff 100644
--- a/accessibility/rubygem-atk/Makefile
+++ b/accessibility/rubygem-atk/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Ruby binding for ATK
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-glib2
+RUN_DEPENDS=	rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
 
 USE_GNOME=	atk
 USE_RUBY=	yes
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index ef904afd37aa..c9056fde6368 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Common interface to speech synthesis
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libdotconf.so:${PORTSDIR}/devel/dotconf \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libdotconf.so:devel/dotconf \
+		libltdl.so:devel/libltdl \
+		libsndfile.so:audio/libsndfile
 
 USE_GNOME=	glib20 intltool
 USES=		alias gettext gmake pathfix pkgconfig libtool
@@ -44,28 +44,28 @@ OPTIONS_DEFINE=	ALSA AO DOCS ESPEAK FESTIVAL FLITE NAS PULSEAUDIO
 OPTIONS_DEFAULT=ESPEAK
 OPTIONS_SUB=	yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=	alsa
 
-AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_CONFIGURE_WITH=	libao
 
 ESPEAK_DESC=		eSpeak speech synthesizer support
-ESPEAK_LIB_DEPENDS=	libespeak.so:${PORTSDIR}/audio/espeak
+ESPEAK_LIB_DEPENDS=	libespeak.so:audio/espeak
 ESPEAK_CONFIGURE_WITH=	espeak
 
 FESTIVAL_DESC=		Festival Speech Synthesis System support
-FESTIVAL_RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
-			${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:${PORTSDIR}/audio/festival-freebsoft-utils
+FESTIVAL_RUN_DEPENDS=	festival:audio/festival \
+			${LOCALBASE}/share/festival/lib/${PORTNAME}.scm:audio/festival-freebsoft-utils
 
 FLITE_DESC=		Flite speech synthesis engine support
-FLITE_LIB_DEPENDS=	libflite.so:${PORTSDIR}/audio/flite
+FLITE_LIB_DEPENDS=	libflite.so:audio/flite
 FLITE_CONFIGURE_WITH=	flite
 
-NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_CONFIGURE_WITH=	nas
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=pulse
 
 post-patch:
@@ -85,8 +85,8 @@ post-install:
 .else
 
 USES+=		python:3
-LIB_DEPENDS+=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg
+LIB_DEPENDS+=	libspeechd.so:accessibility/speech-dispatcher
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg
 
 USE_PYTHON=	py3kplist
 PLIST_SUB=	PYVER=${PYTHON_VER:S|.||}
diff --git a/arabic/khotot/Makefile b/arabic/khotot/Makefile
index 6d63aadd9aae..e2d07bbee52c 100644
--- a/arabic/khotot/Makefile
+++ b/arabic/khotot/Makefile
@@ -20,8 +20,8 @@ MONO_DESC=	Install Arabic PCF fonts
 AEFONTS_DESC=	Install Arabeyes project TrueType fonts
 KACST_DESC=	Install King AbdulAziz University fonts
 
-MONO_RUN_DEPENDS=	ar-ae_fonts_mono>0:${PORTSDIR}/arabic/ae_fonts_mono
-AEFONTS_RUN_DEPENDS=	ar-ae_fonts1_ttf>0:${PORTSDIR}/arabic/ae_fonts_ttf
-KACST_RUN_DEPENDS=	ar-kacst_fonts>0:${PORTSDIR}/arabic/kacst_fonts
+MONO_RUN_DEPENDS=	ar-ae_fonts_mono>0:arabic/ae_fonts_mono
+AEFONTS_RUN_DEPENDS=	ar-ae_fonts1_ttf>0:arabic/ae_fonts_ttf
+KACST_RUN_DEPENDS=	ar-kacst_fonts>0:arabic/kacst_fonts
 
 .include <bsd.port.mk>
diff --git a/archivers/advancecomp/Makefile b/archivers/advancecomp/Makefile
index ee3379ce31d0..1faaaf396410 100644
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Recompression utilities for .ZIP, .PNG, .MNG, and .GZ files
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libzopfli.so:${PORTSDIR}/archivers/zopfli
+LIB_DEPENDS=	libzopfli.so:archivers/zopfli
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 61d0b30fcbd3..ebc0e1538e41 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Archiving tool for KDE
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 USE_KDE4=	kdeprefix automoc4 kdelibs libkonq
 USES=		cmake:outsource libarchive cpe tar:xz
@@ -22,14 +22,14 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	7ZIP RAR ZIP
 
 7ZIP_DESC=	Support for 7-Zip archives
-7ZIP_RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
+7ZIP_RUN_DEPENDS=	7z:archivers/p7zip
 
 RAR_DESC=	Support for RAR archives
-RAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
-			rar:${PORTSDIR}/archivers/rar
+RAR_RUN_DEPENDS=	unrar:archivers/unrar \
+			rar:archivers/rar
 
 ZIP_DESC=	Support for ZIP archives
-ZIP_RUN_DEPENDS=	unzip>0:${PORTSDIR}/archivers/unzip \
-			zip:${PORTSDIR}/archivers/zip
+ZIP_RUN_DEPENDS=	unzip>0:archivers/unzip \
+			zip:archivers/zip
 
 .include <bsd.port.mk>
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 283469c9420b..c63a3f2623fb 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Dynamic Adaptive Compression Tool
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
-		liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	libmcrypt.so:security/libmcrypt \
+		liblzo2.so:archivers/lzo2
 
 USES=		desthack gmake localbase
 GNU_CONFIGURE=	yes
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index c364f8e3c953..9ffccc23ccd4 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -14,18 +14,18 @@ COMMENT=	Program to extract various archive file formats
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc \
-		arj:${PORTSDIR}/archivers/arj \
-		cabextract:${PORTSDIR}/archivers/cabextract \
-		dpkg:${PORTSDIR}/archivers/dpkg \
-		lzop:${PORTSDIR}/archivers/lzop \
-		7z:${PORTSDIR}/archivers/p7zip \
-		rpm:${PORTSDIR}/archivers/rpm4 \
-		rzip:${PORTSDIR}/archivers/rzip \
-		unace:${PORTSDIR}/archivers/unace \
-		unrar:${PORTSDIR}/archivers/unrar \
-		zoo:${PORTSDIR}/archivers/zoo \
-		flac:${PORTSDIR}/audio/flac
+RUN_DEPENDS=	arc:archivers/arc \
+		arj:archivers/arj \
+		cabextract:archivers/cabextract \
+		dpkg:archivers/dpkg \
+		lzop:archivers/lzop \
+		7z:archivers/p7zip \
+		rpm:archivers/rpm4 \
+		rzip:archivers/rzip \
+		unace:archivers/unace \
+		unrar:archivers/unrar \
+		zoo:archivers/zoo \
+		flac:audio/flac
 
 CONFLICTS=	deco-[0-9]*
 
diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index 25102688c269..d90be3f70566 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Debian package maintenance system
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	po4a:${PORTSDIR}/textproc/po4a
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar \
-		gpatch:${PORTSDIR}/devel/patch
+BUILD_DEPENDS=	po4a:textproc/po4a
+RUN_DEPENDS=	gtar:archivers/gtar \
+		gpatch:devel/patch
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake iconv libtool ncurses perl5 pkgconfig tar:xz
diff --git a/archivers/engrampa/Makefile b/archivers/engrampa/Makefile
index a4f9152927ac..e619c159925d 100644
--- a/archivers/engrampa/Makefile
+++ b/archivers/engrampa/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Archive manager for zip files, tar, etc
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	itstool:textproc/itstool
+RUN_DEPENDS=	${LOCALBASE}/bin/gtar:archivers/gtar \
+		${LOCALBASE}/bin/unzip:archivers/unzip
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/archivers/epkg/Makefile b/archivers/epkg/Makefile
index b9230f40d95c..6164a9091a66 100644
--- a/archivers/epkg/Makefile
+++ b/archivers/epkg/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Encap Package Manager
 
 BROKEN=		unfetchable
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libfget.a:${PORTSDIR}/ftp/fget
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libfget.a:ftp/fget
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2
 
 HAS_CONFIGURE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index d756ac4f50a4..532621ea41d4 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Archive manager for zip files, tar, etc
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar \
-		zipinfo:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	itstool:textproc/itstool
+RUN_DEPENDS=	gtar:archivers/gtar \
+		zipinfo:archivers/unzip
 
 # Port unzip is desired, but specify the uniquely named zipinfo to ensure
 # archivers/unzip is pulled in.  Using "unzip" is satisfied by base unzip  
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
index fb41d06dea28..17e2048f01f9 100644
--- a/archivers/fpc-unzip/Makefile
+++ b/archivers/fpc-unzip/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	UNZIP
 UNZIP_DESC=	Install unzip tools
 OPTIONS_DEFAULT=	UNZIP
 
-UNZIP_RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+UNZIP_RUN_DEPENDS=	unzip:archivers/unzip
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/gcab/Makefile b/archivers/gcab/Makefile
index 7a383f1ee679..9dfb2c5ff808 100644
--- a/archivers/gcab/Makefile
+++ b/archivers/gcab/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject library to create cabinet files
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala
+BUILD_DEPENDS=	vala:lang/vala
 
 USES=		cpe gettext gmake libtool pathfix pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/archivers/hlextract/Makefile b/archivers/hlextract/Makefile
index 32070e5b2995..7eb1a532fe3d 100644
--- a/archivers/hlextract/Makefile
+++ b/archivers/hlextract/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to extract data from various Half-Life file formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libhl.so:${PORTSDIR}/games/hllib
+LIB_DEPENDS=	libhl.so:games/hllib
 
 USES=		dos2unix zip
 WRKSRC=		${WRKDIR}/HLExtract
diff --git a/archivers/innoextract/Makefile b/archivers/innoextract/Makefile
index 1794a6d36709..beb8a3893bdc 100644
--- a/archivers/innoextract/Makefile
+++ b/archivers/innoextract/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Program to extract Inno Setup files
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_program_options.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
+		libboost_filesystem.so:devel/boost-libs \
+		libboost_system.so:devel/boost-libs \
+		libboost_program_options.so:devel/boost-libs
 
 USES=		cmake iconv
 CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=man
diff --git a/archivers/javatar/Makefile b/archivers/javatar/Makefile
index 3c097d308547..8fed069d838e 100644
--- a/archivers/javatar/Makefile
+++ b/archivers/javatar/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.gjt.org/download/time/java/tar/ \
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java tar archive I/O package
 
-RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf
+RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:java/jaf
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile
index faad06efd547..437a9e109f48 100644
--- a/archivers/libarchive/Makefile
+++ b/archivers/libarchive/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://libarchive.org/downloads/
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Library to create and read several streaming archive formats
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 OPTIONS_DEFINE=	LZO NETTLE
 OPTIONS_DEFAULT=LZO
@@ -79,10 +79,10 @@ CFLAGS+=	"-I${LOCALBASE}/include"
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 
-LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 LZO_CONFIGURE_WITH=	lzo2
 
-NETTLE_LIB_DEPENDS=	libnettle.so:${PORTSDIR}/security/nettle
+NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
 NETTLE_CONFIGURE_WITH=	nettle
 NETTLE_CONFIGURE_ON=	--without-openssl
 NETTLE_USE_OFF=		OPENSSL=yes
diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile
index fc24adabd86a..fc7e682efbe9 100644
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/synce/Orange/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to extract CAB files from self-extracting installers
 
-LIB_DEPENDS=	libgsf-1.so:${PORTSDIR}/devel/libgsf
-RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
-		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	libgsf-1.so:devel/libgsf
+RUN_DEPENDS=	cabextract:archivers/cabextract \
+		unzip:archivers/unzip
 
 OPTIONS_DEFINE=	LIBSYNCE LIBDYNAMITE LIBUNSHIELD INNO VISE MSI
 OPTIONS_DEFAULT=	LIBSYNCE LIBDYNAMITE LIBUNSHIELD
@@ -31,15 +31,15 @@ INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=		--with-libgsf
 
-LIBSYNCE_LIB_DEPENDS=		libsynce.so:${PORTSDIR}/palm/synce-libsynce
+LIBSYNCE_LIB_DEPENDS=		libsynce.so:palm/synce-libsynce
 LIBSYNCE_CONFIGURE_WITH=	libsynce
 LIBSYNCE_VARS=			REQUIRES+=libsynce
 
-LIBDYNAMITE_LIB_DEPENDS=	libdynamite.so:${PORTSDIR}/archivers/libdynamite
+LIBDYNAMITE_LIB_DEPENDS=	libdynamite.so:archivers/libdynamite
 LIBDYNAMITE_CONFIGURE_WITH=	libdynamite
 LIBDYNAMITE_VARS=		REQUIRES+=libdynamite
 
-LIBUNSHIELD_LIB_DEPENDS=	libunshield.so:${PORTSDIR}/archivers/unshield
+LIBUNSHIELD_LIB_DEPENDS=	libunshield.so:archivers/unshield
 LIBUNSHIELD_CONFIGURE_WITH=	libunshield
 LIBUNSHIELD_VARS=		REQUIRES+=libunshield
 
diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile
index 5ac80c258671..d8a82391cac2 100644
--- a/archivers/libpar2/Makefile
+++ b/archivers/libpar2/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv2
 MAINTAINER=	toxic@doobie.com
 COMMENT=	Library for manipulating PAR2 files, extracted from par2cmdline
 
-LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
 GNU_CONFIGURE=	yes
 
diff --git a/archivers/lrzip/Makefile b/archivers/lrzip/Makefile
index 85f64c1e4da8..87a40333ac34 100644
--- a/archivers/lrzip/Makefile
+++ b/archivers/lrzip/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Long Range ZIP or Lzma RZIP
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	nasm>=0:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+BUILD_DEPENDS=	nasm>=0:devel/nasm
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-asm
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index d583c1722849..9894311f42a0 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.lzop.org/download/ \
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Fast file compressor similar to gzip, using the LZO library
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index 16a48b805486..b316ef19617f 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Neat script to make self-extracting archives
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 EXTRACT_CMD=	${SH}
 EXTRACT_BEFORE_ARGS=
diff --git a/archivers/p5-Archive-Any-Lite/Makefile b/archivers/p5-Archive-Any-Lite/Makefile
index 4eecc382c299..f46bc6b438d0 100644
--- a/archivers/p5-Archive-Any-Lite/Makefile
+++ b/archivers/p5-Archive-Any-Lite/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Simple CPAN package extractor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-ExtUtils-MakeMaker-CPANfile>=0.06:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker-CPANfile
-RUN_DEPENDS=	p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip
-TEST_DEPENDS=	p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-Test-Pod>=1.18:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-Test-UseAllModules>=0.10:${PORTSDIR}/devel/p5-Test-UseAllModules
+BUILD_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-ExtUtils-MakeMaker-CPANfile>=0.06:devel/p5-ExtUtils-MakeMaker-CPANfile
+RUN_DEPENDS=	p5-Archive-Zip>=0:archivers/p5-Archive-Zip
+TEST_DEPENDS=	p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
+		p5-Test-Pod>=1.18:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-Test-UseAllModules>=0.10:devel/p5-Test-UseAllModules
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/archivers/p5-Archive-Any-Plugin-Rar/Makefile b/archivers/p5-Archive-Any-Plugin-Rar/Makefile
index 5db48912d8f3..032ced14dd40 100644
--- a/archivers/p5-Archive-Any-Plugin-Rar/Makefile
+++ b/archivers/p5-Archive-Any-Plugin-Rar/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	anes@anes.su
 COMMENT=	Wrapper around Archive::Rar
 
-BUILD_DEPENDS=	p5-Archive-Any>=0:${PORTSDIR}/archivers/p5-Archive-Any \
-		p5-Archive-Rar>=0:${PORTSDIR}/archivers/p5-Archive-Rar \
-		p5-lib-abs>=0.90:${PORTSDIR}/devel/p5-lib-abs
+BUILD_DEPENDS=	p5-Archive-Any>=0:archivers/p5-Archive-Any \
+		p5-Archive-Rar>=0:archivers/p5-Archive-Rar \
+		p5-lib-abs>=0.90:devel/p5-lib-abs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/archivers/p5-Archive-Any/Makefile b/archivers/p5-Archive-Any/Makefile
index f51e8839a507..e3478fc12065 100644
--- a/archivers/p5-Archive-Any/Makefile
+++ b/archivers/p5-Archive-Any/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Single interface to deal with file archives
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Archive-Zip>=1.07:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-File-MMagic>=1.27:${PORTSDIR}/devel/p5-File-MMagic \
-		p5-MIME-Types>=1.16:${PORTSDIR}/mail/p5-MIME-Types \
-		p5-Module-Find>=0.05:${PORTSDIR}/devel/p5-Module-Find
+BUILD_DEPENDS=	p5-Archive-Zip>=1.07:archivers/p5-Archive-Zip \
+		p5-File-MMagic>=1.27:devel/p5-File-MMagic \
+		p5-MIME-Types>=1.16:mail/p5-MIME-Types \
+		p5-Module-Find>=0.05:devel/p5-Module-Find
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \
-		p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Perl-Critic>=0:textproc/p5-Test-Perl-Critic \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/archivers/p5-Archive-Extract-Libarchive/Makefile b/archivers/p5-Archive-Extract-Libarchive/Makefile
index 7c95c7ac2742..13b4c57a5065 100644
--- a/archivers/p5-Archive-Extract-Libarchive/Makefile
+++ b/archivers/p5-Archive-Extract-Libarchive/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Generic archive extracting mechanism (using libarchive)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Object-Tiny>=0:${PORTSDIR}/devel/p5-Object-Tiny
+BUILD_DEPENDS=	p5-Object-Tiny>=0:devel/p5-Object-Tiny
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Test-Pod>=1.04:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Test-Pod>=1.04:devel/p5-Test-Pod
 
 USE_PERL5=	modbuild
 USES=		perl5 libarchive
diff --git a/archivers/p5-Archive-Peek/Makefile b/archivers/p5-Archive-Peek/Makefile
index 5f84510738c3..707df5c8c250 100644
--- a/archivers/p5-Archive-Peek/Makefile
+++ b/archivers/p5-Archive-Peek/Makefile
@@ -11,13 +11,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Peek into archives without extracting them
 
-BUILD_DEPENDS=	p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Types-Path-Class>=0:${PORTSDIR}/devel/p5-MooseX-Types-Path-Class
+BUILD_DEPENDS=	p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Pod>=1.14:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.14:devel/p5-Test-Pod
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/archivers/p5-Archive-Rar/Makefile b/archivers/p5-Archive-Rar/Makefile
index 9b23e01ef934..2d276861a8e9 100644
--- a/archivers/p5-Archive-Rar/Makefile
+++ b/archivers/p5-Archive-Rar/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface with the 'rar' command
 
-BUILD_DEPENDS=	rar:${PORTSDIR}/archivers/rar \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
+BUILD_DEPENDS=	rar:archivers/rar \
+		p5-IPC-Run>=0:devel/p5-IPC-Run
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/archivers/p5-Archive-SimpleExtractor/Makefile b/archivers/p5-Archive-SimpleExtractor/Makefile
index 81026d4b3049..1ed27982ea9b 100644
--- a/archivers/p5-Archive-SimpleExtractor/Makefile
+++ b/archivers/p5-Archive-SimpleExtractor/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple module for extract archives
 
-BUILD_DEPENDS=	p5-Archive-Rar>=2.02:${PORTSDIR}/archivers/p5-Archive-Rar \
-		p5-Archive-Zip>=1.30:${PORTSDIR}/archivers/p5-Archive-Zip
+BUILD_DEPENDS=	p5-Archive-Rar>=2.02:archivers/p5-Archive-Rar \
+		p5-Archive-Zip>=1.30:archivers/p5-Archive-Zip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/archivers/p5-Archive-Tar/Makefile b/archivers/p5-Archive-Tar/Makefile
index 606b706d62e4..f7aede8c99b4 100644
--- a/archivers/p5-Archive-Tar/Makefile
+++ b/archivers/p5-Archive-Tar/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl module for creation and manipulation of tar files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+RUN_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 
 USES=		perl5
 USE_PERL5=	configure
@@ -23,7 +23,7 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	TEXTDIFF
 TEXTDIFF_DESC=	Text::Diff support for ptardiff
 
-TEXTDIFF_RUN_DEPENDS=	p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff
+TEXTDIFF_RUN_DEPENDS=	p5-Text-Diff>=0:textproc/p5-Text-Diff
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/5.009/5.666/' ${WRKSRC}/Makefile.PL
diff --git a/archivers/p5-Archive-Zip/Makefile b/archivers/p5-Archive-Zip/Makefile
index 4e1eada11f2a..5686adf62de1 100644
--- a/archivers/p5-Archive-Zip/Makefile
+++ b/archivers/p5-Archive-Zip/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Create, manipulate, read, and write Zip archive files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-MockModule>=0:${PORTSDIR}/devel/p5-Test-MockModule
+TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/archivers/p5-Compress-LZO/Makefile b/archivers/p5-Compress-LZO/Makefile
index 6c7db30a5ca2..643d0650c473 100644
--- a/archivers/p5-Compress-LZO/Makefile
+++ b/archivers/p5-Compress-LZO/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to the LZO compression library
 
-LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
+LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 CFLAGS+=	-I${LOCALBASE}/include/lzo
 USES=		perl5
diff --git a/archivers/p5-Compress-LZW/Makefile b/archivers/p5-Compress-LZW/Makefile
index 311f5df74155..b562539a6e73 100644
--- a/archivers/p5-Compress-LZW/Makefile
+++ b/archivers/p5-Compress-LZW/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Pure perl implementation of LZW
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moo>=1.001000:${PORTSDIR}/devel/p5-Moo \
-		p5-Type-Tiny>0:${PORTSDIR}/devel/p5-Type-Tiny \
-		p5-namespace-clean>0:${PORTSDIR}/devel/p5-namespace-clean \
-		p5-strictures>0:${PORTSDIR}/devel/p5-strictures
+BUILD_DEPENDS=	p5-Moo>=1.001000:devel/p5-Moo \
+		p5-Type-Tiny>0:devel/p5-Type-Tiny \
+		p5-namespace-clean>0:devel/p5-namespace-clean \
+		p5-strictures>0:devel/p5-strictures
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/archivers/p5-Compress-Raw-Bzip2/Makefile b/archivers/p5-Compress-Raw-Bzip2/Makefile
index 6efad4a19843..4b0d186ec651 100644
--- a/archivers/p5-Compress-Raw-Bzip2/Makefile
+++ b/archivers/p5-Compress-Raw-Bzip2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Low-Level Interface to bzip2 compression library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/archivers/p5-Compress-Raw-Lzma/Makefile b/archivers/p5-Compress-Raw-Lzma/Makefile
index 56514ca39730..a509aaf9d863 100644
--- a/archivers/p5-Compress-Raw-Lzma/Makefile
+++ b/archivers/p5-Compress-Raw-Lzma/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Low-Level Interface to lzma compression library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 OPTIONS_DEFINE=	LZMALIB
 LZMALIB_DESC=	Use archivers/lzmalia instead of liblzma in base
@@ -21,7 +21,7 @@ LZMALIB_DESC=	Use archivers/lzmalia instead of liblzma in base
 USE_PERL5=	configure
 USES=		perl5
 
-LZMALIB_LIB_DEPENDS=	liblzma.so.1:${PORTSDIR}/archivers/lzmalib
+LZMALIB_LIB_DEPENDS=	liblzma.so.1:archivers/lzmalib
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compress/Raw/Lzma/Lzma.so
diff --git a/archivers/p5-Compress-Raw-Zlib/Makefile b/archivers/p5-Compress-Raw-Zlib/Makefile
index 898d5d402d0d..a5d72f6446e8 100644
--- a/archivers/p5-Compress-Raw-Zlib/Makefile
+++ b/archivers/p5-Compress-Raw-Zlib/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Low-Level Interface to zlib compression library
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/archivers/p5-Compress-Snappy/Makefile b/archivers/p5-Compress-Snappy/Makefile
index 0b3a74dcdd1e..c648952d85b4 100644
--- a/archivers/p5-Compress-Snappy/Makefile
+++ b/archivers/p5-Compress-Snappy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl interface to Google Snappy (de)compressor
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Devel-CheckLib>=0:${PORTSDIR}/devel/p5-Devel-CheckLib
+BUILD_DEPENDS=	p5-Devel-CheckLib>=0:devel/p5-Devel-CheckLib
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/archivers/p5-IO-Compress-Lzf/Makefile b/archivers/p5-IO-Compress-Lzf/Makefile
index 0177457960e2..7e3d13170aa9 100644
--- a/archivers/p5-IO-Compress-Lzf/Makefile
+++ b/archivers/p5-IO-Compress-Lzf/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Write lzf files / buffers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Compress-LZF>=0:${PORTSDIR}/archivers/p5-Compress-LZF \
-		p5-IO-Compress>=${PORTVERSION}:${PORTSDIR}/archivers/p5-IO-Compress
+BUILD_DEPENDS=	p5-Compress-LZF>=0:archivers/p5-Compress-LZF \
+		p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/archivers/p5-IO-Compress-Lzma/Makefile b/archivers/p5-IO-Compress-Lzma/Makefile
index 011dea776c1d..a984107510cc 100644
--- a/archivers/p5-IO-Compress-Lzma/Makefile
+++ b/archivers/p5-IO-Compress-Lzma/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Write lzma files / buffers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Compress-Raw-Lzma>=${PORTVERSION}:${PORTSDIR}/archivers/p5-Compress-Raw-Lzma \
-		p5-IO-Compress>=${PORTVERSION}:${PORTSDIR}/archivers/p5-IO-Compress
+BUILD_DEPENDS=	p5-Compress-Raw-Lzma>=${PORTVERSION}:archivers/p5-Compress-Raw-Lzma \
+		p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p7zip>=0:${PORTSDIR}/archivers/p7zip
+TEST_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p7zip>=0:archivers/p7zip
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/archivers/p5-IO-Compress-Lzop/Makefile b/archivers/p5-IO-Compress-Lzop/Makefile
index f0dd2e6eed4c..87761c368f07 100644
--- a/archivers/p5-IO-Compress-Lzop/Makefile
+++ b/archivers/p5-IO-Compress-Lzop/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Write lzop files / buffers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Compress-LZO>=0:${PORTSDIR}/archivers/p5-Compress-LZO \
-		p5-IO-Compress>=${PORTVERSION}:${PORTSDIR}/archivers/p5-IO-Compress
+BUILD_DEPENDS=	p5-Compress-LZO>=0:archivers/p5-Compress-LZO \
+		p5-IO-Compress>=${PORTVERSION}:archivers/p5-IO-Compress
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/archivers/p5-IO-Compress/Makefile b/archivers/p5-IO-Compress/Makefile
index 26c5ea3618cf..242dc284c8f2 100644
--- a/archivers/p5-IO-Compress/Makefile
+++ b/archivers/p5-IO-Compress/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Perl5 compression modules (bzip2, deflate, gzip, zlib, zip)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Compress-Raw-Bzip2>=${PORTVERSION}:${PORTSDIR}/archivers/p5-Compress-Raw-Bzip2 \
-		p5-Compress-Raw-Zlib>=${PORTVERSION}:${PORTSDIR}/archivers/p5-Compress-Raw-Zlib
+BUILD_DEPENDS=	p5-Compress-Raw-Bzip2>=${PORTVERSION}:archivers/p5-Compress-Raw-Bzip2 \
+		p5-Compress-Raw-Zlib>=${PORTVERSION}:archivers/p5-Compress-Raw-Zlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1:devel/p5-Test-Pod
 
 CONFLICTS_INSTALL=	p5-Compress-Zlib-2* p5-IO-Compress-Base-2* p5-IO-Compress-Zlib-2* p5-IO-Compress-Bzip2-2*
 
diff --git a/archivers/p5-POE-Filter-Bzip2/Makefile b/archivers/p5-POE-Filter-Bzip2/Makefile
index 2f583fc47d00..ab8ec74969f8 100644
--- a/archivers/p5-POE-Filter-Bzip2/Makefile
+++ b/archivers/p5-POE-Filter-Bzip2/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE filter wrapped around Compress::Bzip2
 
-BUILD_DEPENDS=	p5-Compress-Bzip2>=2.08:${PORTSDIR}/archivers/p5-Compress-Bzip2 \
-		p5-POE>=0.38:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Compress-Bzip2>=2.08:archivers/p5-Compress-Bzip2 \
+		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/archivers/p5-POE-Filter-LZF/Makefile b/archivers/p5-POE-Filter-LZF/Makefile
index 7df4b1edacec..d4ee27e1d66b 100644
--- a/archivers/p5-POE-Filter-LZF/Makefile
+++ b/archivers/p5-POE-Filter-LZF/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE filter wrapped around Compress::LZF
 
-BUILD_DEPENDS=	p5-Compress-LZF>=1.51:${PORTSDIR}/archivers/p5-Compress-LZF \
-		p5-POE>=0.38:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Compress-LZF>=1.51:archivers/p5-Compress-LZF \
+		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/archivers/p5-POE-Filter-LZO/Makefile b/archivers/p5-POE-Filter-LZO/Makefile
index b825f43f62e7..1d4148a4f5bd 100644
--- a/archivers/p5-POE-Filter-LZO/Makefile
+++ b/archivers/p5-POE-Filter-LZO/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE filter wrapped around Compress::LZO
 
-BUILD_DEPENDS=	p5-Compress-LZO>=1.08:${PORTSDIR}/archivers/p5-Compress-LZO \
-		p5-POE>=0.38:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Compress-LZO>=1.08:archivers/p5-Compress-LZO \
+		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/archivers/p5-POE-Filter-LZW/Makefile b/archivers/p5-POE-Filter-LZW/Makefile
index e123dcd0ecbe..540fd94b2dcc 100644
--- a/archivers/p5-POE-Filter-LZW/Makefile
+++ b/archivers/p5-POE-Filter-LZW/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE filter wrapped around Compress::LZW
 
-BUILD_DEPENDS=	p5-Compress-LZW>=0:${PORTSDIR}/archivers/p5-Compress-LZW \
-		p5-POE>=0.38:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-Compress-LZW>=0:archivers/p5-Compress-LZW \
+		p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/archivers/p5-POE-Filter-Zlib/Makefile b/archivers/p5-POE-Filter-Zlib/Makefile
index 4b6e44c359fa..09064db6d30e 100644
--- a/archivers/p5-POE-Filter-Zlib/Makefile
+++ b/archivers/p5-POE-Filter-Zlib/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE filter wrapped around Compress::Zlib
 
-BUILD_DEPENDS=	p5-POE>=0.38:${PORTSDIR}/devel/p5-POE
+BUILD_DEPENDS=	p5-POE>=0.38:devel/p5-POE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/archivers/p5-PerlIO-via-Bzip2/Makefile b/archivers/p5-PerlIO-via-Bzip2/Makefile
index 6cf17f37400c..0e400d5544a6 100644
--- a/archivers/p5-PerlIO-via-Bzip2/Makefile
+++ b/archivers/p5-PerlIO-via-Bzip2/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to provide a PerlIO layer to bzip2/bunzip2
 
-BUILD_DEPENDS=	p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
+BUILD_DEPENDS=	p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile
index 8715987e0d61..6037645cea97 100644
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tools for using Parity v2 Archive files (tbb version)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtbb.so:${PORTSDIR}/devel/tbb
+LIB_DEPENDS=	libtbb.so:devel/tbb
 
 ONLY_FOR_ARCHS=	i386 amd64 ia64
 GNU_CONFIGURE=	yes
diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index e7c460692107..509294f3a138 100644
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files
 
-BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type
-RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type
+BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type
+RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type
 
 USES=		pear
 NO_ARCH=	yes
@@ -22,8 +22,8 @@ PEAR_MAIL_DESC=		PEAR::Mail support
 PEAR_MAIL_MIME_DESC=	PEAR::Mail_Mime support
 PEAR_CACHE_LITE_DESC=	PEAR::Cache_Lite support
 
-PEAR_MAIL_RUN_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
-PEAR_MAIL_MIME_RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
-PEAR_CACHE_LITE_RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
+PEAR_MAIL_RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail
+PEAR_MAIL_MIME_RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
+PEAR_CACHE_LITE_RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite
 
 .include <bsd.port.mk>
diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
index 59213d70e4ea..27e0f05db405 100644
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free archiver and file compressor
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
-		fpcres:${PORTSDIR}/lang/fpc-utils
+BUILD_DEPENDS=	lazbuild:editors/lazarus \
+		fpcres:lang/fpc-utils
 
 USES=		dos2unix zip
 USE_FPC=	cairo fcl-base fcl-image pasjpeg rtl-objpas x11
@@ -46,17 +46,17 @@ OPTIONS_DEFAULT=	GTK2 7Z
 USE_FPC+=	gtk2
 USE_GNOME=	gtk20
 LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 .endif
 
 .if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
 LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
 .endif
 
 .if ${PORT_OPTIONS:M7Z}
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
+RUN_DEPENDS+=	7z:archivers/p7zip
 ARCHIVER_FILES+=7z
 PLIST_SUB+=	7Z=""
 .else
@@ -64,7 +64,7 @@ PLIST_SUB+=	7Z="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MARC}
-RUN_DEPENDS+=	arc:${PORTSDIR}/archivers/arc
+RUN_DEPENDS+=	arc:archivers/arc
 ARCHIVER_FILES+=arc
 PLIST_SUB+=	ARC=""
 .else
@@ -72,7 +72,7 @@ PLIST_SUB+=	ARC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MZPAQ}
-RUN_DEPENDS+=	zpaq:${PORTSDIR}/archivers/paq
+RUN_DEPENDS+=	zpaq:archivers/paq
 ARCHIVER_FILES+=zpaq
 PLIST_SUB+=	ZPAQ=""
 .else
@@ -80,7 +80,7 @@ PLIST_SUB+=	ZPAQ="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUNACE}
-RUN_DEPENDS+=	unace:${PORTSDIR}/archivers/unace
+RUN_DEPENDS+=	unace:archivers/unace
 ARCHIVER_FILES+=unace
 PLIST_SUB+=	UNACE=""
 .else
diff --git a/archivers/php5-snappy/Makefile b/archivers/php5-snappy/Makefile
index 76c7113b4155..ae67beade7cf 100644
--- a/archivers/php5-snappy/Makefile
+++ b/archivers/php5-snappy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PHP extension for the snappy compression algorithm
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS+=	libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS+=	libsnappy.so:archivers/snappy
 CONFIGURE_ARGS+=	--with-snappy-includedir=${LOCALBASE}/include
 
 USE_PHP=	yes
diff --git a/archivers/pigz/Makefile b/archivers/pigz/Makefile
index 15e2e3c7dc7a..d34411e94141 100644
--- a/archivers/pigz/Makefile
+++ b/archivers/pigz/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Parallel GZIP
 
 LICENSE=	ZLIB
 
-LIB_DEPENDS=	libzopfli.so:${PORTSDIR}/archivers/zopfli
+LIB_DEPENDS=	libzopfli.so:archivers/zopfli
 
 USES=		cpe gmake localbase
 CPE_VENDOR=	zlib
diff --git a/archivers/plzip/Makefile b/archivers/plzip/Makefile
index 90d2c5fd5c1d..685de28d263f 100644
--- a/archivers/plzip/Makefile
+++ b/archivers/plzip/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SAVANNAH/lzip/${PORTNAME}
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Parallel, lossless data compressor based on the LZMA algorithm
 
-BUILD_DEPENDS=	lzlib>=1.1:${PORTSDIR}/archivers/lzlib
+BUILD_DEPENDS=	lzlib>=1.1:archivers/lzlib
 
 PLIST_FILES=	bin/plzip \
 		man/man1/plzip.1.gz
diff --git a/archivers/py-attic/Makefile b/archivers/py-attic/Makefile
index 0b4ea7b8418f..16dcde050c07 100644
--- a/archivers/py-attic/Makefile
+++ b/archivers/py-attic/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Deduplicating backup program
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:${PORTSDIR}/devel/py-msgpack-python
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:${PORTSDIR}/devel/py-msgpack-python
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python
 
 USES=		python:3.3+
 USE_PYTHON=	autoplist distutils
@@ -27,8 +27,8 @@ PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000015
-BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
-RUN_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
+BUILD_DEPENDS+=	openssl>=1.0:security/openssl
+RUN_DEPENDS+=	openssl>=1.0:security/openssl
 .endif
 
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
diff --git a/archivers/py-libarchive-c/Makefile b/archivers/py-libarchive-c/Makefile
index 2d7bab19de6c..c4138a0ecd09 100644
--- a/archivers/py-libarchive-c/Makefile
+++ b/archivers/py-libarchive-c/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python interface to libarchive
 
 LICENSE=	LGPL20+
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:${PORTSDIR}/devel/py-pytest
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest
 
 USES?=		python
 USE_GITHUB=	yes
diff --git a/archivers/py-librtfcomp/Makefile b/archivers/py-librtfcomp/Makefile
index ece12507b574..a92c95a4e03f 100644
--- a/archivers/py-librtfcomp/Makefile
+++ b/archivers/py-librtfcomp/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python bindings for library for handling compressed RTF documents
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	librtfcomp.so:${PORTSDIR}/archivers/librtfcomp
+BUILD_DEPENDS=	pyrexc:devel/pyrex
+LIB_DEPENDS=	librtfcomp.so:archivers/librtfcomp
 
 CONFIGURE_ARGS=	--enable-python-bindings
 GNU_CONFIGURE=	yes
diff --git a/archivers/py-python-snappy/Makefile b/archivers/py-python-snappy/Makefile
index 73c62d46744d..b667e41c0457 100644
--- a/archivers/py-python-snappy/Makefile
+++ b/archivers/py-python-snappy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python library for the snappy compression library from Google
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	libsnappy.so:archivers/snappy
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/archivers/py-rarfile/Makefile b/archivers/py-rarfile/Makefile
index 665ff18497e8..4b59b81a3eed 100644
--- a/archivers/py-rarfile/Makefile
+++ b/archivers/py-rarfile/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python module for RAR archive reading
 
 LICENSE=	ISCL
 
-RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+RUN_DEPENDS=	unrar:archivers/unrar
 
 NO_ARCH=	yes
 USES=		python:2.7+
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index ba0b7a523fc2..0371a0243170 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -38,7 +38,7 @@ IGNORE=	requires a kernel with compiled-in IA32 compatibility
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000054
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 .endif
 
 do-install:
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index 6ef919eaa763..684b2274ef64 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -9,8 +9,8 @@ DISTNAME=	archive-${PORTVERSION}
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Archive management tool for the ROX desktop
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
 
 USES=		python tar:bzip2
 NO_ARCH=	yes
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 6f99b907b00b..a5d199882fa2 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -11,10 +11,10 @@ PKGNAMESUFFIX=	4
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The RPM Package Manager
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
-		libnss3.so:${PORTSDIR}/security/nss \
-		libdbus-1.so:${PORTSDIR}/devel/dbus
-BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
+LIB_DEPENDS=	libpopt.so:devel/popt \
+		libnss3.so:security/nss \
+		libdbus-1.so:devel/dbus
+BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:textproc/gsed
 
 OPTIONS_DEFINE=	PYTHON NLS DOCS
 OPTIONS_DEFAULT=PYTHON NLS
diff --git a/archivers/rubygem-archive-zip/Makefile b/archivers/rubygem-archive-zip/Makefile
index 17b53efa6a8e..b80675bb09f5 100644
--- a/archivers/rubygem-archive-zip/Makefile
+++ b/archivers/rubygem-archive-zip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Provides interface to working with ZIP archives
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-io-like>=0.3.0:${PORTSDIR}/devel/rubygem-io-like
+RUN_DEPENDS=	rubygem-io-like>=0.3.0:devel/rubygem-io-like
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/archivers/rvm/Makefile b/archivers/rvm/Makefile
index a08ccce40074..d7714bf58091 100644
--- a/archivers/rvm/Makefile
+++ b/archivers/rvm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Archive manager that uses rsync to manage backups
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	rsync:${PORTSDIR}/net/rsync
+BUILD_DEPENDS=	rsync:net/rsync
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile
index 692d12d099cb..bde5698320f3 100644
--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Fast compressor/decompressor library
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3
+BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xerial
diff --git a/archivers/snzip/Makefile b/archivers/snzip/Makefile
index 2f35cf04771c..f48a2413fabc 100644
--- a/archivers/snzip/Makefile
+++ b/archivers/snzip/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Compression/decompression tool based on snappy library
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	libsnappy.so:archivers/snappy
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index d4c0874698d4..c1cf8971842e 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Squeeze is a modern and advanced archive manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libthunar-vfs-1.so:${PORTSDIR}/x11-fm/thunar-vfs
+LIB_DEPENDS=	libthunar-vfs-1.so:x11-fm/thunar-vfs
 
 SSP_UNSAFE=	yes
 GNU_CONFIGURE=	yes
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index ecb606838c64..5046b4f5f869 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -13,7 +13,7 @@ LICENSE=	CDDL GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILES=	${WRKSRC}/CDDL.Schily.txt
 
-BUILD_DEPENDS=	smake:${PORTSDIR}/devel/smake
+BUILD_DEPENDS=	smake:devel/smake
 
 USES=		gettext iconv tar:bzip2
 USE_GCC=	any
diff --git a/archivers/tardy/Makefile b/archivers/tardy/Makefile
index bcd165ed6408..2af26a367317 100644
--- a/archivers/tardy/Makefile
+++ b/archivers/tardy/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Manipulate the file headers in tar archive files in various ways
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs \
-		${LOCALBASE}/include/libiberty/libiberty.h:${PORTSDIR}/devel/gnulibiberty
-LIB_DEPENDS=	libexplain.so:${PORTSDIR}/devel/libexplain
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \
+		${LOCALBASE}/include/libiberty/libiberty.h:devel/gnulibiberty
+LIB_DEPENDS=	libexplain.so:devel/libexplain
 
 GNU_CONFIGURE=	yes
 
diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index 1c59ba58692e..d7fe0a1eaee2 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -14,8 +14,8 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 # XXX: USES=gnustep overrides MAKEFILE we set below, so depend explicitly
-LIB_DEPENDS=	libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \
-		libwavpack.so:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS=	libgnustep-base.so:lang/gnustep-base \
+		libwavpack.so:audio/wavpack
 
 USES=		gmake zip
 
diff --git a/archivers/unfoo/Makefile b/archivers/unfoo/Makefile
index d8a4468aa1dd..8b1a4adf849a 100644
--- a/archivers/unfoo/Makefile
+++ b/archivers/unfoo/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	archivers
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tiny sh(1) wrapper to simplify decompression of files
 
-RUN_DEPENDS=	unace:${PORTSDIR}/archivers/unace \
-		unrar:${PORTSDIR}/archivers/unrar \
-		unzip:${PORTSDIR}/archivers/unzip \
-		7z:${PORTSDIR}/archivers/p7zip
+RUN_DEPENDS=	unace:archivers/unace \
+		unrar:archivers/unrar \
+		unzip:archivers/unzip \
+		7z:archivers/p7zip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vitaminmoo
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 2e737e488f7b..ec4489b03e5e 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The Ultimate Packer for eXecutables
 
-LIB_DEPENDS=	libucl.so:${PORTSDIR}/archivers/ucl
+LIB_DEPENDS=	libucl.so:archivers/ucl
 
 LZMA_VER=	4.65
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile
index 0ae5d73cad8f..28e5bf62ab87 100644
--- a/archivers/xarchive/Makefile
+++ b/archivers/xarchive/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 MAINTAINER=	mark@mkproductions.org
 COMMENT=	GTK+ front end for various archiving tools
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
@@ -26,15 +26,15 @@ RAR_DESC=	RAR archive support
 RPM_DESC=	RPM archive support
 ZIP_DESC=	ZIP archive support
 
-7ZIP_RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
-ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
-ACE_RUN_DEPENDS=	unace:${PORTSDIR}/archivers/unace
-DEB_RUN_DEPENDS=	dpkg-deb:${PORTSDIR}/archivers/dpkg
-RAR_RUN_DEPENDS=	rar:${PORTSDIR}/archivers/rar \
-		unrar:${PORTSDIR}/archivers/unrar
-RPM_RUN_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
-		rpm:${PORTSDIR}/archivers/rpm4
-ZIP_RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		unzip:${PORTSDIR}/archivers/unzip
+7ZIP_RUN_DEPENDS=	7z:archivers/p7zip
+ARJ_RUN_DEPENDS=	arj:archivers/arj
+ACE_RUN_DEPENDS=	unace:archivers/unace
+DEB_RUN_DEPENDS=	dpkg-deb:archivers/dpkg
+RAR_RUN_DEPENDS=	rar:archivers/rar \
+		unrar:archivers/unrar
+RPM_RUN_DEPENDS=	rpm2cpio:archivers/rpm2cpio \
+		rpm:archivers/rpm4
+ZIP_RUN_DEPENDS=	zip:archivers/zip \
+		unzip:archivers/unzip
 
 .include <bsd.port.mk>
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 401dec39183b..d9be81537810 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Desktop-agnostic GTK+2 frontend to various archiving tools
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
-		7zr:${PORTSDIR}/archivers/p7zip \
-		zip:${PORTSDIR}/archivers/zip \
-		zipinfo:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		7zr:archivers/p7zip \
+		zip:archivers/zip \
+		zipinfo:archivers/unzip
 
 USES=		desktop-file-utils gmake pkgconfig tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool
@@ -32,10 +32,10 @@ ARJ_DESC=	ARJ compression support
 LZO_DESC=	LZO compression support
 RAR_DESC=	RAR compression support
 
-ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
-LZO_RUN_DEPENDS=	lzop:${PORTSDIR}/archivers/lzop
-RAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
-			rar:${PORTSDIR}/archivers/rar
+ARJ_RUN_DEPENDS=	arj:archivers/arj
+LZO_RUN_DEPENDS=	lzop:archivers/lzop
+RAR_RUN_DEPENDS=	unrar:archivers/unrar \
+			rar:archivers/rar
 
 NLS_USES=	gettext
 NLS_CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile
index 5161405ab53c..8f80931f6b59 100644
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utilities for searching in bzip2, gzip, lzip, and xz archives
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=	lzip:${PORTSDIR}/archivers/lzip
+EXTRACT_DEPENDS=	lzip:archivers/lzip
 
 INFO=		zutils
 
diff --git a/astro/R-cran-maptools/Makefile b/astro/R-cran-maptools/Makefile
index 5f05dffba37c..ba2e1b4d8f1c 100644
--- a/astro/R-cran-maptools/Makefile
+++ b/astro/R-cran-maptools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tools for reading and handling spatial objects
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-sp>=1.0.11:${PORTSDIR}/math/R-cran-sp
+RUN_DEPENDS=	R-cran-sp>=1.0.11:math/R-cran-sp
 
 USES=	cran:auto-plist
 
diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 0aa259da9a57..3e54af84ef52 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Software for describing astronomical images
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libcfitsio.so:astro/cfitsio \
+		libpng.so:graphics/png \
+		libnetpbm.so:graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake jpeg pkgconfig python tar:bzip2
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index 769ea86204e6..330a6bdeb48e 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Astropulse for BOINC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \
-		${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-v7:patch
-RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
+		${NONEXISTENT}:astro/boinc-setiathome-v7:patch
+RUN_DEPENDS=	boinc_client:net/boinc-client
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pkgconfig tar:xz
@@ -36,13 +36,13 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 
 OPTIONS_SUB=	yes
 
-X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client
 X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client
 
 SETI_WORK!=	cd ${.CURDIR}/../boinc-setiathome-v7 && ${MAKE} -V WRKSRC
 CONFIGURE_ENV+=	BOINCDIR="${NONEXISTENT}" \
diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v7/Makefile
index 5b5648618987..3d79a5788482 100644
--- a/astro/boinc-setiathome-v7/Makefile
+++ b/astro/boinc-setiathome-v7/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Setiathome Enhanced for BOINC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+RUN_DEPENDS=	boinc_client:net/boinc-client
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 USES=		tar:xz gmake pkgconfig
 USE_AUTOTOOLS=	autoconf:env automake:env
@@ -39,13 +39,13 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 
 OPTIONS_SUB=	yes
 
-X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client
 X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client
 
 CFLAGS_i386=	-mtune=native
 CFLAGS_amd64=	-mtune=native
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 16153975ad5c..12880799bcf0 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Scriptable space flight simulator for X11
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gettext gmake jpeg libtool lua pkgconfig
 USE_GL=		gl
@@ -62,8 +62,8 @@ IGNORE=		requires one of the <${UI_LIST}> values for CELESTIA_UI
 
 .if ${CELESTIA_UI} == "gtk" || ${CELESTIA_UI} == "gnome"
 USES+=		pathfix
-LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libtheora.so:multimedia/libtheora
 STARTUP_NOTIFY=	true
 PLIST_FILES+=	share/celestia/celestia-logo.png share/celestia/celestiaui.xml
 .else
diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile
index d40374b913b3..9518d66dd77c 100644
--- a/astro/cfitsio/Makefile
+++ b/astro/cfitsio/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for reading and writing files in FITS data format
 
-LIB_DEPENDS=	libf2c.so:${PORTSDIR}/lang/f2c
+LIB_DEPENDS=	libf2c.so:lang/f2c
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index 289c494e2e0f..8a418826d9b9 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Lightweight opensource gps moving map application
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgps.so:${PORTSDIR}/astro/gpsd
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexif.so:graphics/libexif \
+		libsoup-2.4.so:devel/libsoup \
+		libgps.so:astro/gpsd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DATADIRNAME=share
diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile
index 37ba888a6186..5784dba86578 100644
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library for geographic projections
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:${PORTSDIR}/devel/autoconf-archive
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive
 
 USES=		autoreconf compiler:c++11-lang gmake libtool python
 PORTDOCS=	*
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT=	DOXYGEN PERL\
 PERL_DESC=	Build documentation with pod2man and pod2html
 OPTIONS_GROUP=	DATASETS
 OPTIONS_SUB=	yes
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
 PERL_USE=	PERL5=build
 PERL_USES=	perl5
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index fce2e2d9ac50..452bd4788665 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	gkrellmoon-${PORTVERSION}
 MAINTAINER=	w@wrzask.pl
 COMMENT=	Moon clock plugin for Gkrellm2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/astro/gmapcatcher/Makefile b/astro/gmapcatcher/Makefile
index b127c47da4b3..6047fe841e90 100644
--- a/astro/gmapcatcher/Makefile
+++ b/astro/gmapcatcher/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	mapcatcher_${PORTVERSION}
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Offline map viewer
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/g}
 USES=		python
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index f113516e1ec6..9b7a6335cd78 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Explore, Search, and Discover
 
-EXTRACT_DEPENDS=	unmakeself:${PORTSDIR}/archivers/unmakeself
+EXTRACT_DEPENDS=	unmakeself:archivers/unmakeself
 
 RESTRICTED=	Not really sure about the redistribution terms
 
@@ -31,7 +31,7 @@ USE_PERL5=	patch build
 
 UNMAKESELF=	${LOCALBASE}/bin/unmakeself
 
-NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_USE_OFF=	LINUX_APPS=dri,libpciaccess
 
 # Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
diff --git a/astro/gpsbabel14/Makefile b/astro/gpsbabel14/Makefile
index 781ff8defe38..92559cbb27da 100644
--- a/astro/gpsbabel14/Makefile
+++ b/astro/gpsbabel14/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GPS file translating tool (pre-qt version)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
index e66467010832..01c39aaf578c 100644
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Correlate digital camera photos with GPS data in GPX format
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		gmake pkgconfig
 USE_GNOME=	libxml2
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index d6ffe6dea7aa..05b758fd9f02 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
+		xsltproc:textproc/libxslt
 
 USES=		cpe pathfix pkgconfig python scons
 CPE_VENDOR=	gpsd_project
@@ -112,7 +112,7 @@ PPS_IMPLIES=	NTPSHM
 
 # Export methods
 SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_MAKE_ARGS=	dbus_export=yes
 SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
 
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index b778a0f3b880..3933a70e19d7 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GPS navigation system
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libpcre.so:devel/pcre
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake libtool perl5 pkgconfig shebangfix
 SHEBANG_FILES=	src/gpsfetchmap.pl src/geocache2way src/gpssmswatch \
diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile
index 4251825ad2d4..fc4d27793c7a 100644
--- a/astro/gpsprune/Makefile
+++ b/astro/gpsprune/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES=	bin/gpsprune ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
 OPTIONS_DEFINE=	JAVA3D
 JAVA3D_DESC=	Support for 3D view of track
 
-JAVA3D_RUN_DEPENDS=	java3d>=1.5.2:${PORTSDIR}/java/java3d
+JAVA3D_RUN_DEPENDS=	java3d>=1.5.2:java/java3d
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
diff --git a/astro/gpxloggerd/Makefile b/astro/gpxloggerd/Makefile
index 97a6fc53bba4..28607ae3d444 100644
--- a/astro/gpxloggerd/Makefile
+++ b/astro/gpxloggerd/Makefile
@@ -10,7 +10,7 @@ GH_ACCOUNT=	glebius
 MAINTAINER=	glebius@FreeBSD.org
 COMMENT=	Daemon that connects to the GPSD daemon and logs GPS traces
 
-LIB_DEPENDS=	libgps.so:${PORTSDIR}/astro/gpsd
+LIB_DEPENDS=	libgps.so:astro/gpsd
 
 USE_RC_SUBR=	${PORTNAME}
 PLIST_FILES=	sbin/${PORTNAME} \
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 10fcdb58f589..2f63af4800f9 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 desktop planetarium
 
-LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libwcs.so:${PORTSDIR}/astro/wcslib
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 \
-		xplanet:${PORTSDIR}/astro/xplanet
-RUN_DEPENDS=	xplanet:${PORTSDIR}/astro/xplanet
+LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
+		libwcs.so:astro/wcslib
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
+		xplanet:astro/xplanet
+RUN_DEPENDS=	xplanet:astro/xplanet
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource compiler:c++11-lib tar:xz
diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile
index 4695bc3d1cfc..ea6298915372 100644
--- a/astro/libkgeomap/Makefile
+++ b/astro/libkgeomap/Makefile
@@ -10,7 +10,7 @@ COMMENT=	KDE4 library for browsing photos on a map
 
 .include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common"
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
 
 # libkexiv2 is used only for demo application
 USE_KDE4+=	marble
diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
index bf0956f4b821..f2d921d8b1d7 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for handling binary OpenStreetMap data
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.osmpbf
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scrosby
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 04c7c5614053..bbe85c11d84a 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE
 
-LIB_DEPENDS=	libquazip.so:${PORTSDIR}/archivers/quazip
+LIB_DEPENDS=	libquazip.so:archivers/quazip
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource gmake shared-mime-info tar:xz
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	GPS
 OPTIONS_SUB=	yes
 
 GPS_DESC=	Support for GPS position provider
-GPS_LIB_DEPENDS=	libgps.so:${PORTSDIR}/astro/gpsd
+GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
 GPS_CMAKE_OFF=	-DWITH_libgps:BOOL=FALSE
 
 # pre-configure:
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 73e34d74e0a3..5bd922536d7b 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Openstreetmap mapping program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libquazip5.so:${PORTSDIR}/archivers/quazip-qt5 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libproj.so:graphics/proj \
+		libquazip5.so:archivers/quazip-qt5 \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
@@ -32,11 +32,11 @@ OPTIONS_DEFAULT=	GEOIMAGE
 
 GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
 GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
-GEOIMAGE_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+GEOIMAGE_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
-ZBAR_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
 # graphics/zbar needs to be built with Qt support (and needs a Qt5 version)
 ZBAR_BROKEN=	Does not build with option ZBAR selected
 
diff --git a/astro/mymoon/Makefile b/astro/mymoon/Makefile
index 3b939e0558da..23be7f4770b1 100644
--- a/astro/mymoon/Makefile
+++ b/astro/mymoon/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://makemebad.net/geek/codes/${PORTNAME}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show latitude and longitude of the moon
 
-LIB_DEPENDS=	libnova.so:${PORTSDIR}/astro/libnova
+LIB_DEPENDS=	libnova.so:astro/libnova
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index f837b45cde4a..55686ab9a0b9 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -27,15 +27,15 @@ GNOME_VARS=		INSTALLS_OMF=yes
 
 OPENGL_CONFIGURE_ON=	--with-lib-GL
 OPENGL_CONFIGURE_OFF=	--disable-opengl
-OPENGL_LIB_DEPENDS=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2
+OPENGL_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2
 OPENGL_USE=		GL=glut
 
 PGPLOT_DESC=		PGPLOT support
 PGPLOT_CONFIGURE_ON=	--with-pgplot-include=${LOCALBASE}/include \
 			--with-pgplot-lib=${LOCALBASE}/lib
 PGPLOT_CONFIGURE_OFF=	--with-gnuplot
-PGPLOT_LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
-PGPLOT_RUN_DEPENDS_OFF=	gnuplot:${PORTSDIR}/math/gnuplot
+PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot
+PGPLOT_RUN_DEPENDS_OFF=	gnuplot:math/gnuplot
 PGPLOT_USES=		fortran
 
 .include <bsd.port.pre.mk>
diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile
index 49dcc925bac1..99abf051f473 100644
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@@ -12,14 +12,14 @@ COMMENT=	C++/Javascript framework for working with OSM files
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf
-BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
-RUN_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libboost_regex.so:devel/boost-libs \
+		libsqlite3.so:databases/sqlite3 \
+		libexpat.so:textproc/expat2 \
+		libgeos.so:graphics/geos \
+		libprotobuf.so:devel/protobuf
+BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
+RUN_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	joto
@@ -35,12 +35,12 @@ OPTIONS_DEFINE=	JAVASCRIPT DOXYGEN DOCS
 OPTIONS_DEFAULT=JAVASCRIPT
 JAVASCRIPT_DESC=Enable javascript support
 
-JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8 \
-			libshp.so:${PORTSDIR}/devel/shapelib \
-			libicuuc.so:${PORTSDIR}/devel/icu
+JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8 \
+			libshp.so:devel/shapelib \
+			libicuuc.so:devel/icu
 
 DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 do-build-DOXYGEN-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/astro/p5-Astro-ADS/Makefile b/astro/p5-Astro-ADS/Makefile
index f769daf94d7c..37a980356e18 100644
--- a/astro/p5-Astro-ADS/Makefile
+++ b/astro/p5-Astro-ADS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO Perl interface to the ADS abstract service
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index 50dd09c4f84c..55d966817177 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Generic stellar catalogue object
 LICENSE=	GPLv3
 
 # p5-Astro-FITS-CFITSIO is a recommended dependency
-BUILD_DEPENDS=	p5-Astro-Coords>=0.12:${PORTSDIR}/astro/p5-Astro-Coords \
-		p5-Astro-FITS-CFITSIO>=1.03:${PORTSDIR}/astro/p5-Astro-FITS-CFITSIO \
-		p5-Astro-Flux>=0.01:${PORTSDIR}/astro/p5-Astro-Flux \
-		p5-Astro-Telescope>=0.50:${PORTSDIR}/astro/p5-Astro-Telescope \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Misc-Quality>=0.1:${PORTSDIR}/astro/p5-Misc-Quality \
-		p5-Number-Uncertainty>=0.1:${PORTSDIR}/math/p5-Number-Uncertainty \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-libwww>=5.53:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Astro-Coords>=0.12:astro/p5-Astro-Coords \
+		p5-Astro-FITS-CFITSIO>=1.03:astro/p5-Astro-FITS-CFITSIO \
+		p5-Astro-Flux>=0.01:astro/p5-Astro-Flux \
+		p5-Astro-Telescope>=0.50:astro/p5-Astro-Telescope \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-Misc-Quality>=0.1:astro/p5-Misc-Quality \
+		p5-Number-Uncertainty>=0.1:math/p5-Number-Uncertainty \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-libwww>=5.53:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/astro/p5-Astro-Coords/Makefile b/astro/p5-Astro-Coords/Makefile
index 6900e64ef7f6..f0d500b08a28 100644
--- a/astro/p5-Astro-Coords/Makefile
+++ b/astro/p5-Astro-Coords/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Class for handling astronomical coordinates
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-PAL>=0:${PORTSDIR}/astro/p5-Astro-PAL \
-		p5-Astro-Telescope>=0.71:${PORTSDIR}/astro/p5-Astro-Telescope \
-		p5-DateTime>=0.76:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-Astro-PAL>=0:astro/p5-Astro-PAL \
+		p5-Astro-Telescope>=0.71:astro/p5-Astro-Telescope \
+		p5-DateTime>=0.76:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/astro/p5-Astro-DSS/Makefile b/astro/p5-Astro-DSS/Makefile
index 649b8c272447..e975e2618a29 100644
--- a/astro/p5-Astro-DSS/Makefile
+++ b/astro/p5-Astro-DSS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO interface to the 1st and 2nd Digital Sky Surveys
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-Astro-FITS-CFITSIO/Makefile b/astro/p5-Astro-FITS-CFITSIO/Makefile
index 0d273fa8de12..6d10c6a127dc 100644
--- a/astro/p5-Astro-FITS-CFITSIO/Makefile
+++ b/astro/p5-Astro-FITS-CFITSIO/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for using the cfitsio library
 
-LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 
 CONFIGURE_ENV=	CFITSIO=${LOCALBASE}
 USES=		perl5
diff --git a/astro/p5-Astro-Flux/Makefile b/astro/p5-Astro-Flux/Makefile
index 1c2859827057..d7abdb8cc136 100644
--- a/astro/p5-Astro-Flux/Makefile
+++ b/astro/p5-Astro-Flux/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Class for handling astronomical flux quantities
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-WaveBand>=0:${PORTSDIR}/astro/p5-Astro-WaveBand \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Misc-Quality>=0:${PORTSDIR}/astro/p5-Misc-Quality \
-		p5-Number-Uncertainty>=0:${PORTSDIR}/math/p5-Number-Uncertainty
+BUILD_DEPENDS=	p5-Astro-WaveBand>=0:astro/p5-Astro-WaveBand \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Misc-Quality>=0:astro/p5-Misc-Quality \
+		p5-Number-Uncertainty>=0:math/p5-Number-Uncertainty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/astro/p5-Astro-Hipparcos/Makefile b/astro/p5-Astro-Hipparcos/Makefile
index 6be52ee43330..09c528aa8cb8 100644
--- a/astro/p5-Astro-Hipparcos/Makefile
+++ b/astro/p5-Astro-Hipparcos/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for reading the Hipparcos star catalog
 
-BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.06:${PORTSDIR}/devel/p5-ExtUtils-XSpp
+BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.06:devel/p5-ExtUtils-XSpp
 
 MAKE_ARGS+=	CC="${CXX}"
 USES=		perl5
diff --git a/astro/p5-Astro-PAL/Makefile b/astro/p5-Astro-PAL/Makefile
index 4b17ca3022f3..228a80cf0c4b 100644
--- a/astro/p5-Astro-PAL/Makefile
+++ b/astro/p5-Astro-PAL/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl interface to Starlink PAL positional astronomy library
 
 LICENSE=	GPLv3
 
-TEST_DEPENDS=	p5-Test-Number-Delta>=1:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-Number-Delta>=1:devel/p5-Test-Number-Delta
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/astro/p5-Astro-SIMBAD-Client/Makefile b/astro/p5-Astro-SIMBAD-Client/Makefile
index 5ebc49bef609..f44fd727cdc6 100644
--- a/astro/p5-Astro-SIMBAD-Client/Makefile
+++ b/astro/p5-Astro-SIMBAD-Client/Makefile
@@ -13,11 +13,11 @@ COMMENT=	OO interface to SIMBAD4
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-DoubleEncodedEntities>=1:${PORTSDIR}/textproc/p5-XML-DoubleEncodedEntities \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-DoubleEncodedEntities>=1:textproc/p5-XML-DoubleEncodedEntities \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index 53e1c425f15a..89cec671974d 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO Perl interface to the SIMBAD astronomical database
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-Astro-SpaceTrack/Makefile b/astro/p5-Astro-SpaceTrack/Makefile
index 637ff2c709ef..04350e4b6115 100644
--- a/astro/p5-Astro-SpaceTrack/Makefile
+++ b/astro/p5-Astro-SpaceTrack/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Retrieve orbital data from www.space-track.org
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=6.03:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-HTTP-Message>=6.03:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	limit:^[0-9\.]*$$
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index f6aac1359d58..32cfb37d8fa8 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to calculate sunrise/sunset times
 
-BUILD_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+BUILD_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/astro/p5-Astro-Sunrise/Makefile b/astro/p5-Astro-Sunrise/Makefile
index 6d9dfc5efb13..e20b5f51ca3a 100644
--- a/astro/p5-Astro-Sunrise/Makefile
+++ b/astro/p5-Astro-Sunrise/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension for computing the sunrise/sunset on a given day
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	configure patch
diff --git a/astro/p5-Astro-Telescope/Makefile b/astro/p5-Astro-Telescope/Makefile
index dc2dab1d8373..22a85e36403d 100644
--- a/astro/p5-Astro-Telescope/Makefile
+++ b/astro/p5-Astro-Telescope/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Class for obtaining telescope information
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-PAL>=0.99:${PORTSDIR}/astro/p5-Astro-PAL
+BUILD_DEPENDS=	p5-Astro-PAL>=0.99:astro/p5-Astro-PAL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index f5857d937418..9177e5ecf00c 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Classes and app to compute satellite visibility
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Manip>=1.14:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS=	p5-Date-Manip>=1.14:devel/p5-Date-Manip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 OPTIONS_DEFINE=	GEOCODER_US SIMBAD SOAPLITE SPACETRACK USGS
 OPTIONS_DEFAULT=GEOCODER_US SIMBAD SPACETRACK USGS
@@ -32,10 +32,10 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-GEOCODER_US_RUN_DEPENDS=p5-Geo-Coder-Geocoder-US>=0:${PORTSDIR}/misc/p5-Geo-Coder-Geocoder-US
-SIMBAD_RUN_DEPENDS=	p5-Astro-SIMBAD-Client>=0:${PORTSDIR}/astro/p5-Astro-SIMBAD-Client
-SOAPLITE_RUN_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
-SPACETRACK_RUN_DEPENDS=	p5-Astro-SpaceTrack>=0:${PORTSDIR}/astro/p5-Astro-SpaceTrack
-USGS_RUN_DEPENDS=	p5-Geo-WebService-Elevation-USGS>=0:${PORTSDIR}/science/p5-Geo-WebService-Elevation-USGS
+GEOCODER_US_RUN_DEPENDS=p5-Geo-Coder-Geocoder-US>=0:misc/p5-Geo-Coder-Geocoder-US
+SIMBAD_RUN_DEPENDS=	p5-Astro-SIMBAD-Client>=0:astro/p5-Astro-SIMBAD-Client
+SOAPLITE_RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
+SPACETRACK_RUN_DEPENDS=	p5-Astro-SpaceTrack>=0:astro/p5-Astro-SpaceTrack
+USGS_RUN_DEPENDS=	p5-Geo-WebService-Elevation-USGS>=0:science/p5-Geo-WebService-Elevation-USGS
 
 .include <bsd.port.mk>
diff --git a/astro/p5-GPS-Babel/Makefile b/astro/p5-GPS-Babel/Makefile
index 18862c0f3414..de5fb91ad289 100644
--- a/astro/p5-GPS-Babel/Makefile
+++ b/astro/p5-GPS-Babel/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to gpsbabel
 
-BUILD_DEPENDS=	p5-Geo-Gpx>=0.25:${PORTSDIR}/graphics/p5-Geo-Gpx \
-		p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
-RUN_DEPENDS=	p5-Geo-Gpx>=0.25:${PORTSDIR}/graphics/p5-Geo-Gpx \
-		p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-Geo-Gpx>=0.25:graphics/p5-Geo-Gpx \
+		p5-File-Which>=0.05:sysutils/p5-File-Which
+RUN_DEPENDS=	p5-Geo-Gpx>=0.25:graphics/p5-Geo-Gpx \
+		p5-File-Which>=0.05:sysutils/p5-File-Which
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index 35ec72bb6d42..78ed4b9ee477 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	perl-GPS-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl interface to GPS receivers
 
-BUILD_DEPENDS=	p5-Device-SerialPort>=0.07:${PORTSDIR}/comms/p5-Device-SerialPort
+BUILD_DEPENDS=	p5-Device-SerialPort>=0.07:comms/p5-Device-SerialPort
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/astro/p5-Starlink-AST/Makefile b/astro/p5-Starlink-AST/Makefile
index 0ffde6f6ba65..0ba8ed2fef30 100644
--- a/astro/p5-Starlink-AST/Makefile
+++ b/astro/p5-Starlink-AST/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Interface to the Starlink AST library
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-FITS-CFITSIO>=0:${PORTSDIR}/astro/p5-Astro-FITS-CFITSIO \
-		p5-Astro-FITS-Header>=0:${PORTSDIR}/astro/p5-Astro-FITS-Header
+BUILD_DEPENDS=	p5-Astro-FITS-CFITSIO>=0:astro/p5-Astro-FITS-CFITSIO \
+		p5-Astro-FITS-Header>=0:astro/p5-Astro-FITS-Header
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/astro/p5-Weather-Underground/Makefile b/astro/p5-Weather-Underground/Makefile
index 80aab1e39248..35fe5721aadf 100644
--- a/astro/p5-Weather-Underground/Makefile
+++ b/astro/p5-Weather-Underground/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Retrieve weather information from wunderground.com
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/astro/p5-ZConf-Weather/Makefile b/astro/p5-ZConf-Weather/Makefile
index 059a8a5d8efb..3d410b59bef5 100644
--- a/astro/p5-ZConf-Weather/Makefile
+++ b/astro/p5-ZConf-Weather/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	ZConf module to assist with fetching/printing weather information
 
-BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
-		p5-Text-NeatTemplate>=0.10.01:${PORTSDIR}/textproc/p5-Text-NeatTemplate \
-		p5-Weather-Underground>=3.03:${PORTSDIR}/astro/p5-Weather-Underground
+BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
+		p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate \
+		p5-Weather-Underground>=3.03:astro/p5-Weather-Underground
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index e7a91d1ccef1..4e8112b93f78 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Displays U.S. Census Bureau populated places on a map
 
-LIB_DEPENDS=	libtkgeomap.so:${PORTSDIR}/astro/tkgeomap
+LIB_DEPENDS=	libtkgeomap.so:astro/tkgeomap
 
 USES+=		tk:run
 NO_BUILD=	yes
diff --git a/astro/py-RO/Makefile b/astro/py-RO/Makefile
index 71f5452f0973..4c82c8cbc41f 100644
--- a/astro/py-RO/Makefile
+++ b/astro/py-RO/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Package of Python astronomical utilities
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=		MATPLOTLIB PYFITS PYGAME
@@ -25,8 +25,8 @@ PYGAME_DESC=		Add Support for PyGame
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-MATPLOTLIB_RUN_DEPENDS=	${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
-PYFITS_RUN_DEPENDS=	${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits
-PYGAME_RUN_DEPENDS=	${PKGNAMEPREFIX}game>=1.8.1:${PORTSDIR}/devel/py-game
+MATPLOTLIB_RUN_DEPENDS=	${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib
+PYFITS_RUN_DEPENDS=	${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits
+PYGAME_RUN_DEPENDS=	${PKGNAMEPREFIX}game>=1.8.1:devel/py-game
 
 .include <bsd.port.mk>
diff --git a/astro/py-aipy/Makefile b/astro/py-aipy/Makefile
index d63e2d0b02f6..0fe0d4fed7e0 100644
--- a/astro/py-aipy/Makefile
+++ b/astro/py-aipy/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Astronomical Interferometry in PYthon
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem \
-		${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits \
-		${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
+		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem \
+		${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \
+		${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/astro/py-astLib/Makefile b/astro/py-astLib/Makefile
index fcdbb24faa71..ca98c90be09c 100644
--- a/astro/py-astLib/Makefile
+++ b/astro/py-astLib/Makefile
@@ -15,10 +15,10 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PKGNAMEPREFIX}scipy>=0.7.0:${PORTSDIR}/science/py-scipy \
-		${PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits \
-		${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
+		${PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy \
+		${PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \
+		${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.15,0.17,0.17.1 # incorrect versioning upstream
diff --git a/astro/py-pyfits/Makefile b/astro/py-pyfits/Makefile
index 0564f17e4cf4..c8c966b5d7ce 100644
--- a/astro/py-pyfits/Makefile
+++ b/astro/py-pyfits/Makefile
@@ -14,10 +14,10 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}d2to1>=0:${PORTSDIR}/devel/py-d2to1 \
-		${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:${PORTSDIR}/devel/py-stsci.distutils
+		${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1 \
+		${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:devel/py-stsci.distutils
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}d2to1>=0:${PORTSDIR}/devel/py-d2to1
+		${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index d0483bef509d..ad02d2caf18d 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -11,9 +11,9 @@ COMMENT=	The ultimate outdoor aficionado's tool
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libgps.so:${PORTSDIR}/astro/gpsd
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libproj.so:graphics/proj \
+		libgps.so:astro/gpsd
 
 USES=		cmake desktop-file-utils
 USE_QT4=	dbus gui opengl network sql xml linguist_build \
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 8c04aac1cd04..225bbcd84eaa 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -13,8 +13,8 @@ LICENSE=	GPLv3
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libroutino.so:${PORTSDIR}/astro/routino
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libroutino.so:astro/routino
 
 USES=		cmake desktop-file-utils
 USE_QT5=	buildtools linguisttools qmake script sql webkit widgets xml
diff --git a/astro/readosm/Makefile b/astro/readosm/Makefile
index 328b44c36084..e4b8baf21c0d 100644
--- a/astro/readosm/Makefile
+++ b/astro/readosm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extract valid data from within an Open Street Map input file
 LICENSE=	MPL LGPL21 GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}e
 GNU_CONFIGURE=	yes
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index 08146e4fe1a4..c5ca8a05d63f 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generates images of the Earth centered at a particular location
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 146f19ed787e..8150baad9e35 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Vector-based GPS moving map
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 248fd83ea5c7..f3b1817cd66c 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Shows which portion of the Earth's surface is illuminated by the Sun
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index 40658948ab1e..24f9fd25ea8e 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Read, manipulate, and display geo data
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtclgeomap.so:${PORTSDIR}/astro/tclgeomap
+LIB_DEPENDS=	libtclgeomap.so:astro/tclgeomap
 
 USES+=		tk
 GNU_CONFIGURE=	yes
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 4d2a0364e55e..fa237db1c47e 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgexiv2.so:graphics/gexiv2 \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libpthread-stubs.so:devel/libpthread-stubs
+RUN_DEPENDS=	gpsbabel:astro/gpsbabel
 
 USES=		compiler:c++11-lib gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
@@ -57,20 +57,20 @@ GEOCACHES_SUB_FILES=	pkg-message
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
-GEOTAG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+GEOTAG_LIB_DEPENDS=	libexif.so:graphics/libexif
 GEOTAG_CONFIGURE_ENABLE=geotag
 
-GPSD_LIB_DEPENDS=	libgpsd.so:${PORTSDIR}/astro/gpsd
+GPSD_LIB_DEPENDS=	libgpsd.so:astro/gpsd
 GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
-MAPNIK_LIB_DEPENDS=	libmapnik.so:${PORTSDIR}/graphics/mapnik
+MAPNIK_LIB_DEPENDS=	libmapnik.so:graphics/mapnik
 MAPNIK_CONFIGURE_ENABLE=	mapnik
 
 MBTILES_USES=		sqlite
 MBTILES_CONFIGURE_ENABLE=	mbtiles
 
-JOSM_RUN_DEPENDS=	josm:${PORTSDIR}/astro/josm
-MERKAATOR_RUN_DEPENDS=	merkaartor:${PORTSDIR}/astro/merkaartor
+JOSM_RUN_DEPENDS=	josm:astro/josm
+MERKAATOR_RUN_DEPENDS=	merkaartor:astro/merkaartor
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index 0145cb703d88..cf98f2f3c316 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -26,9 +26,9 @@ CFITSIO_DESC=	Add cfitsio support (for tests only)
 PGPLOT_DESC=	Add pgplot support (for tests only)
 
 CFITSIO_CONFIGURE_WITH=	cfitsio
-CFITSIO_LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 PGPLOT_CONFIGURE_WITH=	pgplot
-PGPLOT_LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
+PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#%%PKGDIR%%#${STAGEDIR}${PREFIX}/libdata#g' \
diff --git a/astro/weatherspect/Makefile b/astro/weatherspect/Makefile
index b62729013ba5..b0a76ce285fb 100644
--- a/astro/weatherspect/Makefile
+++ b/astro/weatherspect/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Weather simulation in ASCII art
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Term-Animation>=0:${PORTSDIR}/devel/p5-Term-Animation \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Term-Animation>=0:devel/p5-Term-Animation \
+		p5-libwww>=0:www/p5-libwww
 
 PORTSCOUT=	skipv:1.31
 
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index 7cf4802782cd..73c8032fe30c 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -14,7 +14,7 @@ COMMENT=	DockApp that shows the weather at geosynchronous orbit
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSpaceWeather
 
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index 7a7b6d90012f..da00e8ac7f50 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small demo for tkgeomap
 
-LIB_DEPENDS=	libtkgeomap.so:${PORTSDIR}/astro/tkgeomap
+LIB_DEPENDS=	libtkgeomap.so:astro/tkgeomap
 
 USES=		tk:run
 NO_BUILD=	yes
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 7719228cde4d..f4569378fd91 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Interactive astronomical ephemeris program
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake jpeg motif
 LDFLAGS+=	-lfontconfig
diff --git a/astro/xmoontool/Makefile b/astro/xmoontool/Makefile
index 51af1216d2ef..f429e53cb6e9 100644
--- a/astro/xmoontool/Makefile
+++ b/astro/xmoontool/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	NOTES
 PLIST_FILES=	bin/xmoontool man/man1/xmoontool.1.gz
 
 LIBNOVA_MAKE_ENV_OFF=	WITHOUT_LIBNOVA=yes
-LIBNOVA_LIB_DEPENDS=	libnova.so:${PORTSDIR}/astro/libnova
+LIBNOVA_LIB_DEPENDS=	libnova.so:astro/libnova
 MONOCHROME_MAKE_ENV=	DEFINES=""
 
 do-install:
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 2caf32b24367..431700d7cc76 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -21,19 +21,19 @@ OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 OPTIONS_DEFAULT=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 
 FREETYPE_CONFIGURE_WITH=	--with-freetype
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 PANGO_CONFIGURE_WITH=	pango
 PANGO_USE=	GNOME=pango
 GIF_CONFIGURE_WITH=	gif
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS+=	libpng.so:graphics/png
 PNM_CONFIGURE_WITH=	pnm
-PNM_LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+PNM_LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 TIFF_CONFIGURE_WITH=	tiff
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 post-extract:
 	@${REINPLACE_CMD} -e "s/default/default.sample/g" ${WRKSRC}/Makefile.in
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 19298e016da3..11a7215dde5b 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Harmonic tide clock and tide predictor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		compiler:c++0x gmake libtool localbase tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/HVSC-Update/Makefile b/audio/HVSC-Update/Makefile
index 40e1f60805ac..d8363353f82f 100644
--- a/audio/HVSC-Update/Makefile
+++ b/audio/HVSC-Update/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME:S/-/_/}_Tool_source_${PORTVERSION:S/.//g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Update program for the HVSC C= 64 SID tune collection
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/audio/aacplusenc/Makefile b/audio/aacplusenc/Makefile
index 7728a2aed59b..864148cd99c8 100644
--- a/audio/aacplusenc/Makefile
+++ b/audio/aacplusenc/Makefile
@@ -25,8 +25,8 @@ PLIST_FILES=	bin/aacplusenc
 MAKE_ARGS+=	INSTDIR=${STAGEDIR}${PREFIX}
 
 FFTW3_MAKE_ARGS_OFF=	NOFFTW3=1
-FFTW3_LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-			libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW3_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+			libfftw3.so:math/fftw3
 FFTW3_CFLAGS=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index bfeafe33930a..a212438818a5 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
-		cdparanoia:${PORTSDIR}/audio/cdparanoia \
-		lame:${PORTSDIR}/audio/lame \
-		${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:${PORTSDIR}/audio/py-eyed3 \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	cd-discid:audio/cd-discid \
+		cdparanoia:audio/cdparanoia \
+		lame:audio/lame \
+		${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:audio/py-eyed3 \
+		oggenc:audio/vorbis-tools \
+		bash:shells/bash
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -35,18 +35,18 @@ OPTIONS_GROUP_CODEC=	AAC FLAC MPP OPUS SPEEX
 OPTIONS_GROUP_RIPPER=	CDDA2WAV DAGRAB
 OPTIONS_DEFINE=		NORMALIZE REPLAYGAIN
 
-AAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-CDDA2WAV_RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
-DAGRAB_RUN_DEPENDS=	dagrab:${PORTSDIR}/audio/dagrab
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-MPP_RUN_DEPENDS=	mpcenc:${PORTSDIR}/audio/musepack
+AAC_RUN_DEPENDS=	faac:audio/faac
+CDDA2WAV_RUN_DEPENDS=	cdda2wav:sysutils/cdrtools
+DAGRAB_RUN_DEPENDS=	dagrab:audio/dagrab
+FLAC_RUN_DEPENDS=	flac:audio/flac
+MPP_RUN_DEPENDS=	mpcenc:audio/musepack
 NORMALIZE_DESC=		Enable normalize support
-NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
-OPUS_RUN_DEPENDS=	opusenc:${PORTSDIR}/audio/opus-tools
+NORMALIZE_RUN_DEPENDS=	normalize:audio/normalize
+OPUS_RUN_DEPENDS=	opusenc:audio/opus-tools
 REPLAYGAIN_DESC=	Enable (vorbis|mp3)gain support
-REPLAYGAIN_RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain \
-			vorbisgain:${PORTSDIR}/audio/vorbisgain
-SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/audio/speex
+REPLAYGAIN_RUN_DEPENDS=	mp3gain:audio/mp3gain \
+			vorbisgain:audio/vorbisgain
+SPEEX_RUN_DEPENDS=	speexenc:audio/speex
 
 post-extract:
 	@${LN} -sf abcde.conf ${WRKSRC}/abcde.conf.sample
diff --git a/audio/abraca/Makefile b/audio/abraca/Makefile
index 2bc9099c8914..d9627d5dcd2f 100644
--- a/audio/abraca/Makefile
+++ b/audio/abraca/Makefile
@@ -9,11 +9,11 @@ MASTER_SITES=	SF/${PORTNAME}
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	GTK2 client for the XMMS2 music player
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
-		libgee-0.8.so:${PORTSDIR}/devel/libgee
-RUN_DEPENDS=	gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \
-		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	${LOCALBASE}/bin/valac:lang/vala
+LIB_DEPENDS=	libxmmsclient.so:audio/xmms2 \
+		libgee-0.8.so:devel/libgee
+RUN_DEPENDS=	gnome-themes-standard>=3.0.0:x11-themes/gnome-themes-standard \
+		gnome-icon-theme>=0:misc/gnome-icon-theme
 
 USES=		pkgconfig waf tar:bzip2
 USE_GNOME=	gtk30 intltool
diff --git a/audio/acoustid-fingerprinter/Makefile b/audio/acoustid-fingerprinter/Makefile
index e2e8781dbfcd..cf3b8ebb014c 100644
--- a/audio/acoustid-fingerprinter/Makefile
+++ b/audio/acoustid-fingerprinter/Makefile
@@ -12,9 +12,9 @@ COMMENT=	AcoustID audio fingerprint submission tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
+		libtag.so:audio/taglib \
+		libavcodec.so:multimedia/ffmpeg
 
 USES=		cmake
 USE_QT4=	gui network \
diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index e89bd57aa73c..07fd222c9d40 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -15,8 +15,8 @@ COMMENT=	AdLib player using adplug library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libadplug.so:${PORTSDIR}/audio/libadplug \
-		libbinio.so:${PORTSDIR}/devel/libbinio
+LIB_DEPENDS=	libadplug.so:audio/libadplug \
+		libbinio.so:devel/libbinio
 
 GNU_CONFIGURE=	yes
 USES=		libtool
diff --git a/audio/alienwah/Makefile b/audio/alienwah/Makefile
index a66f234a4810..efa5049472ff 100644
--- a/audio/alienwah/Makefile
+++ b/audio/alienwah/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Paul Nasca's AlienWah LADSPA plugin
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 USES=		gmake
 MAKE_ARGS=	CPP="${CXX}" CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -fPIC"
diff --git a/audio/alure/Makefile b/audio/alure/Makefile
index 9a79598f62df..e264145e4bed 100644
--- a/audio/alure/Makefile
+++ b/audio/alure/Makefile
@@ -24,26 +24,26 @@ OPTIONS_DEFAULT=	DUMB FLAC VORBIS SNDFILE
 
 DUMB_DESC=		DUMB audio library decoding support
 
-DOCS_BUILD_DEPENDS=	NaturalDocs:${PORTSDIR}/devel/naturaldocs
-DUMB_BUILD_DEPENDS=	${LOCALBASE}/include/dumb.h:${PORTSDIR}/audio/dumb
+DOCS_BUILD_DEPENDS=	NaturalDocs:devel/naturaldocs
+DUMB_BUILD_DEPENDS=	${LOCALBASE}/include/dumb.h:audio/dumb
 DUMB_CMAKE_ON=		-DDUMB:BOOL=TRUE
 DUMB_CMAKE_OFF=		-DDUMB:BOOL=FALSE
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_ON=		-DFLAC:BOOL=TRUE
 FLAC_CMAKE_OFF=		-DFLAC:BOOL=FALSE
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_ON=	-DFLUIDSYNTH:BOOL=TRUE
 FLUIDSYNTH_CMAKE_OFF=	-DFLUIDSYNTH:BOOL=FALSE
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CMAKE_ON=	-DMPG123:BOOL=TRUE
 MPG123_CMAKE_OFF=	-DMPG123:BOOL=FALSE
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CMAKE_ON=	-DMODPLUG:BOOL=TRUE
 MODPLUG_CMAKE_OFF=	-DMODPLUG:BOOL=FALSE
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DVORBIS:BOOL=TRUE
 VORBIS_CMAKE_OFF=	-DVORBIS:BOOL=FALSE
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_ON=	-DSNDFILE:BOOL=TRUE
 SNDFILE_CMAKE_OFF=	-DSNDFILE:BOOL=FALSE
 
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 870643b15c97..6938d10b20f3 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -10,17 +10,17 @@ MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE music player
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libtag-extras.so:${PORTSDIR}/audio/taglib-extras \
-		liblastfm.so:${PORTSDIR}/audio/liblastfm \
-		libofa.so:${PORTSDIR}/audio/libofa \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libqjson.so:${PORTSDIR}/devel/qjson \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libdbus-1.so:${PORTSDIR}/devel/dbus
-BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator
-RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \
-		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libtag-extras.so:audio/taglib-extras \
+		liblastfm.so:audio/liblastfm \
+		libofa.so:audio/libofa \
+		libavcodec.so:multimedia/ffmpeg \
+		libqjson.so:devel/qjson \
+		libqca.so:devel/qca \
+		libdbus-1.so:devel/dbus
+BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator
+RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \
+		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms
 
 USE_KDE4=	kdelibs kdeprefix libkcddb libkcompactdisc \
 		nepomuk-core runtime automoc4 strigi
@@ -40,20 +40,20 @@ OPTIONS_DEFAULT=IPOD MP3TUNES MTP
 OPTIONS_SUB=	yes
 
 AMAZON_DESC=		Amazon MP3 store support via clamz
-AMAZON_RUN_DEPENDS=	clamz:${PORTSDIR}/net/clamz
+AMAZON_RUN_DEPENDS=	clamz:net/clamz
 
 IPOD_DESC=		Apple iPod support
-IPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod
 IPOD_USE=		GNOME=gdkpixbuf2,glib20
 IPOD_CMAKE_OFF=		-DWITH_IPOD:BOOL=Off
 
 MP3TUNES_DESC=		MP3tunes support
-MP3TUNES_LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth \
-			libcurl.so:${PORTSDIR}/ftp/curl
+MP3TUNES_LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth \
+			libcurl.so:ftp/curl
 MP3TUNES_USE=		GNOME=glib20,libxml2
 MP3TUNES_CMAKE_OFF=	-DWITH_MP3tunes:BOOL=Off
 
-MTP_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_OFF=		-DWITH_Mtp:BOOL=Off
 
 NLS_USES=		gettext
diff --git a/audio/amb-plugins/Makefile b/audio/amb-plugins/Makefile
index b27732a3a519..f4a1bb7282f7 100644
--- a/audio/amb-plugins/Makefile
+++ b/audio/amb-plugins/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ambisonics plugins, mainly to be used within Ardour
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2 GPLv3
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index d780ded212dd..6c21d6f769cb 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -12,22 +12,22 @@ COMMENT=	Music player with rich features
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libcddb.so:${PORTSDIR}/audio/libcddb \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		liboggz.so:${PORTSDIR}/audio/liboggz \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libmac.so:${PORTSDIR}/audio/mac \
-		libmpcdec.so:${PORTSDIR}/audio/musepack \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libwavpack.so:${PORTSDIR}/audio/wavpack \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
-		liblrdf.so:${PORTSDIR}/textproc/liblrdf
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libmp3lame.so:audio/lame \
+		libcddb.so:audio/libcddb \
+		libmad.so:audio/libmad \
+		libmodplug.so:audio/libmodplug \
+		liboggz.so:audio/liboggz \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libvorbis.so:audio/libvorbis \
+		libmac.so:audio/mac \
+		libmpcdec.so:audio/musepack \
+		libspeex.so:audio/speex \
+		libwavpack.so:audio/wavpack \
+		libavcodec.so:multimedia/ffmpeg \
+		libcdio_paranoia.so:sysutils/libcdio-paranoia \
+		liblrdf.so:textproc/liblrdf
 
 USES=		gettext localbase lua pkgconfig
 USE_GNOME=	gtk20 libxml2 libxslt
@@ -39,13 +39,13 @@ DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \
 
 OPTIONS_DEFINE=		ALSA DOCS JACK PULSEAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ON=	--with-alsa=yes
 ALSA_CONFIGURE_OFF=	--with-alsa=no
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ON=	--with-jack=yes
 JACK_CONFIGURE_OFF=	--with-jack=no
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ON=	--with-pulse=yes
 PULSEAUDIO_CONFIGURE_OFF=	--with-pulse=no
 
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index bb1ca96bf91a..c940506cb5fc 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Multichannel digital audio workstation
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo \
-		liblrdf.so:${PORTSDIR}/textproc/liblrdf \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libaubio.so:${PORTSDIR}/audio/aubio \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26
+LIB_DEPENDS=	liblo.so:audio/liblo \
+		liblrdf.so:textproc/liblrdf \
+		libjack.so:audio/jack \
+		libaubio.so:audio/aubio \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libboost_date_time.so:devel/boost-libs \
+		libgnomecanvasmm-2.6.so:graphics/libgnomecanvasmm26
 
 USES=		cpe gettext scons pkgconfig tar:bzip2
 MAKE_ARGS+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
@@ -39,7 +39,7 @@ BROKEN_powerpc64=	Does not build
 
 .if ${PORT_OPTIONS:MVST}
 MAKE_ARGS+=	VST=yes
-LIB_DEPENDS+=	libwine.so:${PORTSDIR}/emulators/wine
+LIB_DEPENDS+=	libwine.so:emulators/wine
 PLIST_SUB+=	NO_VST="@comment "
 PLIST_SUB+=	VST=""
 .else
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index e115b7a17099..668f930da00a 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Ario is a GTK2 client for MPD
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libnotify.so:${PORTSDIR}/devel/libnotify \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libtag_c.so:${PORTSDIR}/audio/taglib \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \
-		libmpdclient.so:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libgnutls.so:security/gnutls \
+		libgcrypt.so:security/libgcrypt \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libcurl.so:ftp/curl \
+		libnotify.so:devel/libnotify \
+		libsoup-2.4.so:devel/libsoup \
+		libtag_c.so:audio/taglib \
+		libunique-1.0.so:x11-toolkits/unique \
+		libmpdclient.so:audio/libmpdclient
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -35,7 +35,7 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	AVAHI NLS
 AVAHI_DESC=	Zeroconf support (Avahi)
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 
 NLS_USES=		gettext
diff --git a/audio/arss/Makefile b/audio/arss/Makefile
index b136dc45edd0..1cff001d41bc 100644
--- a/audio/arss/Makefile
+++ b/audio/arss/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	Additive Image Synthesizer (convert audio to images, images to audio)
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index f93170ed1ea2..1b8ca2cec9bb 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Dockable CD player for AfterStep or WindowMaker
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libworkman.so:${PORTSDIR}/audio/libworkman
+LIB_DEPENDS=	libworkman.so:audio/libworkman
 
 USES=		imake
 
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index f44fbb8c9f5e..c98544e40255 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight GTK+ CD ripper
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
-RUN_DEPENDS=	${LOCALBASE}/bin/cdparanoia:${PORTSDIR}/audio/cdparanoia
+LIB_DEPENDS=	libcddb.so:audio/libcddb
+RUN_DEPENDS=	${LOCALBASE}/bin/cdparanoia:audio/cdparanoia
 
 OPTIONS_DEFINE=	LAME OGG FLAC OPUS WAVPACK APE WINDOWS_CHARS NLS DOCS
 OPTIONS_DEFAULT=	OGG FLAC
@@ -27,12 +27,12 @@ USE_GNOME=	gtk20 glib20 intltool intlhack
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-OGG_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-OPUS_RUN_DEPENDS=	opusenc:${PORTSDIR}/audio/opus-tools
-WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}/audio/wavpack
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+LAME_RUN_DEPENDS=	lame:audio/lame
+OGG_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+FLAC_RUN_DEPENDS=	flac:audio/flac
+OPUS_RUN_DEPENDS=	opusenc:audio/opus-tools
+WAVPACK_RUN_DEPENDS=	wavpack:audio/wavpack
+APE_RUN_DEPENDS=	mac:audio/mac
 NLS_CONFIGURE_ENABLE=	yes
 
 post-patch:
diff --git a/audio/atunes/Makefile b/audio/atunes/Makefile
index fef769810bdf..fe7cf0136911 100644
--- a/audio/atunes/Makefile
+++ b/audio/atunes/Makefile
@@ -35,12 +35,12 @@ LAME_DESC=		Encoder: Enable lame MP3 encoder
 VORBIS_DESC=		Encoder: Enable vorbis OGG encoder
 FLAC_DESC=		Encoder: Enable FLAC encoder
 
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-XINE_LIB_DEPENDS=	libxine.so:${PORTSDIR}/multimedia/libxine
-CDDA2WAV_RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
+CDDA2WAV_RUN_DEPENDS=	cdda2wav:sysutils/cdrtools
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
+FLAC_RUN_DEPENDS=	flac:audio/flac
 
 DESKTOP_ENTRIES="aTunes" \
 		"Audio player and manager" \
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index b44f51860fe0..048894dd0618 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for audio labelling
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	txt2man:${PORTSDIR}/textproc/txt2man
+BUILD_DEPENDS=	txt2man:textproc/txt2man
 
 USES=		pkgconfig tar:bzip2 waf
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
@@ -24,19 +24,19 @@ OPTIONS_SUB=		yes
 
 COMPLEX_DESC=		Compile with C99 complex.h
 COMPLEX_CONFIGURE_ENABLE=	complex
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=	avcodec
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=	samplerate
 FFTW_DESC=		Use single precision FFTW3 instead of built-in OOURA
 FFTW_CONFIGURE_ENABLE=	fftw3f
-FFTW_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-FFTW_LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+FFTW_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+FFTW_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_ENABLE=	sndfile
 
 post-patch:
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index f4335b78b524..3e3e6c52697a 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -14,11 +14,11 @@ COMMENT=	GUI editor for digital audio waveforms
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
-		bash:${PORTSDIR}/shells/bash \
-		cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+BUILD_DEPENDS=	autogen:devel/autogen \
+		bash:shells/bash \
+		cmake:devel/cmake
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libsndfile.so:audio/libsndfile
 
 BROKEN_powerpc64=	Does not build
 
@@ -77,62 +77,62 @@ CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
 
 DEBUG_CONFIGURE_WITH=	debug
 
-DOCS_BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man \
-			docbook2man:${PORTSDIR}/textproc/docbook-utils
+DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
+			docbook2man:textproc/docbook-utils
 
 ALSA_CONFIGURE_OFF=	--disable-alsa
 ALSA_CONFIGURE_WITH=	alsa
 ALSA_CFLAGS=		-I${LOCALBASE}/include
 ALSA_CXXFLAGS=		-I${LOCALBASE}/include
 ALSA_LDFLAGS=		-L${LOCALBASE}/lib
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
-DYNLOAD_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:${PORTSDIR}/multimedia/ffmpeg
-DYNLOAD_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:${PORTSDIR}/audio/lame
+DYNLOAD_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
+DYNLOAD_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:audio/lame
 DYNLOAD_CONFIGURE_ENABLE=	dynamic-loading
 DYNLOAD_CPPFLAGS=		-I${LOCALBASE}/include	# for audio/lame using
 DYNLOAD_LDFLAGS=		-L${LOCALBASE}/lib	# for audio/lame using
 
 FFMPEG_CONFIGURE_WITH=	ffmpeg=system
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 FLAC_CONFIGURE_WITH=	libflac=system
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 
 ID3TAG_CONFIGURE_WITH=	libid3tag=system
-ID3TAG_LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
+ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 LADSPA_CONFIGURE_ENABLE=	ladspa
-LADSPA_RUN_DEPENDS=	listplugins:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa
 
 MAD_CONFIGURE_WITH=	libmad=system
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 
 LAME_CONFIGURE_ON=	--with-lame=system
 LAME_CONFIGURE_OFF=	--with-lame	# --without-lame is broken
 LAME_CPPFLAGS=		-I${LOCALBASE}/include
 LAME_LDFLAGS=		-L${LOCALBASE}/lib
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 
 LV2_CONFIGURE_WITH=	lv2
 
 SBSMS_CONFIGURE_WITH=	sbsms
 
 SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
-SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
+SOUNDTOUCH_LIB_DEPENDS=	libSoundTouch.so:audio/soundtouch
 
 SSE_CONFIGURE_ENABLE=	sse
 
 TWOLAME_CONFIGURE_WITH=	libtwolame=system
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 
 VAMP_CONFIGURE_WITH=	libvamp=system
-VAMP_LIB_DEPENDS=	libvamp-hostsdk.so:${PORTSDIR}/audio/vamp-plugin-sdk
+VAMP_LIB_DEPENDS=	libvamp-hostsdk.so:audio/vamp-plugin-sdk
 
 VORBIS_CONFIGURE_WITH=	libvorbis=system
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 VST_CONFIGURE_ENABLE=	vst
 
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index 5121753a57da..58edfacd541b 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -10,7 +10,7 @@ COMMENT=	KDE4 audio CD ripping utility
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
+LIB_DEPENDS=	libcdda_paranoia.so:audio/cdparanoia
 
 USES=		tar:xz cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb libkcompactdisc
@@ -26,14 +26,14 @@ NLS_USES=		gettext
 NLS_CMAKE_OFF=		-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
 
 EYED3_DESC=		Unicode MP3 tag support via audio/py-eyed3
-EYED3_RUN_DEPENDS=	eyeD3:${PORTSDIR}/audio/py-eyed3
+EYED3_RUN_DEPENDS=	eyeD3:audio/py-eyed3
 
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
+FAAC_RUN_DEPENDS=	faac:audio/faac
 
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+FLAC_RUN_DEPENDS=	flac:audio/flac
 
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
+LAME_RUN_DEPENDS=	lame:audio/lame
 
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
 
 .include <bsd.port.mk>
diff --git a/audio/audiere/Makefile b/audio/audiere/Makefile
index 2d7102fc67e8..c510f1b342ce 100644
--- a/audio/audiere/Makefile
+++ b/audio/audiere/Makefile
@@ -36,11 +36,11 @@ CDAUDIO_DESC=	libcdaudio support
 # link audiere with ogg as well
 DUMB_IMPLIES=	VORBIS
 
-DUMB_BUILD_DEPENDS=	${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
-CDAUDIO_LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-			libogg.so:${PORTSDIR}/audio/libogg
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+DUMB_BUILD_DEPENDS=	${LOCALBASE}/lib/libdumb.a:audio/dumb
+CDAUDIO_LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+			libogg.so:audio/libogg
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 post-patch:
 # could be an option, but build is broken with recent FLAC
diff --git a/audio/audiotag/Makefile b/audio/audiotag/Makefile
index 10143fca0eb3..a1e00cd49dee 100644
--- a/audio/audiotag/Makefile
+++ b/audio/audiotag/Makefile
@@ -30,10 +30,10 @@ PLIST_FILES=	bin/audiotag
 OPTIONS_DEFINE=	VORBIS ID3 MP4 FLAC DOCS
 OPTIONS_DEFAULT=	VORBIS ID3 MP4 FLAC
 
-VORBIS_RUN_DEPENDS=	vorbiscomment:${PORTSDIR}/audio/vorbis-tools
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-ID3_RUN_DEPENDS=	id3tag:${PORTSDIR}/audio/id3lib
-MP4_RUN_DEPENDS=	AtomicParsley:${PORTSDIR}/multimedia/atomicparsley
+VORBIS_RUN_DEPENDS=	vorbiscomment:audio/vorbis-tools
+FLAC_RUN_DEPENDS=	flac:audio/flac
+ID3_RUN_DEPENDS=	id3tag:audio/id3lib
+MP4_RUN_DEPENDS=	AtomicParsley:multimedia/atomicparsley
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/audiotag ${STAGEDIR}${PREFIX}/bin
diff --git a/audio/autotalent/Makefile b/audio/autotalent/Makefile
index f0e1276325ab..179e06930197 100644
--- a/audio/autotalent/Makefile
+++ b/audio/autotalent/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Real-time pitch correction plugin for LADSPA
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake
diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 4321baf26ee5..1c2a11953a3b 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Small SIP client
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-BUILD_DEPENDS=	re>=0.4.6:${PORTSDIR}/audio/re \
-		rem>=0.4.4:${PORTSDIR}/audio/rem
+BUILD_DEPENDS=	re>=0.4.6:audio/re \
+		rem>=0.4.4:audio/rem
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake pkgconfig
diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
index d1a44f3dee64..39b20a99c45a 100644
--- a/audio/baresip/Makefile.depends
+++ b/audio/baresip/Makefile.depends
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
-ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:${PORTSDIR}/audio/alsa-lib
+ALSA_DEPEND=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
 BV32_DEPEND=	# nonexistent
-CELT_DEPEND=	${LOCALBASE}/include/celt/celt.h:${PORTSDIR}/audio/celt
+CELT_DEPEND=	${LOCALBASE}/include/celt/celt.h:audio/celt
 CONS_DEPEND=	# unnecessary
 DTLS_SRTP_DEPEND=	# unnecessary
 EVDEV_DEPEND=
-FFMPEG_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:${PORTSDIR}/multimedia/ffmpeg
-G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:${PORTSDIR}/comms/spandsp
-G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:${PORTSDIR}/comms/spandsp
+FFMPEG_DEPEND=	${LOCALBASE}/include/libavcodec/avcodec.h:multimedia/ffmpeg
+G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
+G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
 G722_1_DEPEND=	# nonexistent
-GSM_DEPEND=	${LOCALBASE}/include/gsm.h:${PORTSDIR}/audio/gsm
-GST_DEPEND=	gst-launch:${PORTSDIR}/multimedia/gstreamer
-ILBC_DEPEND=	${LOCALBASE}/include/ilbc/iLBC_define.h:${PORTSDIR}/net/ilbc
+GSM_DEPEND=	${LOCALBASE}/include/gsm.h:audio/gsm
+GST_DEPEND=	gst-launch:multimedia/gstreamer
+ILBC_DEPEND=	${LOCALBASE}/include/ilbc/iLBC_define.h:net/ilbc
 L16_DEPEND=	
-OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:${PORTSDIR}/audio/opus
+OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
 OSS_DEPEND=	# In base
-PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:${PORTSDIR}/comms/spandsp
-PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:${PORTSDIR}/audio/portaudio
+PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:comms/spandsp
+PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:audio/portaudio
 SDL_DEPEND=	# Handled with USE_SDL in Makefile
-SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:${PORTSDIR}/audio/libsndfile
-SPEEX_DEPEND=	${LOCALBASE}/include/speex/speex.h:${PORTSDIR}/audio/speex
-SRTP_DEPEND=	${LOCALBASE}/include/srtp/srtp.h:${PORTSDIR}/net/libsrtp
+SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:audio/libsndfile
+SPEEX_DEPEND=	${LOCALBASE}/include/speex/speex.h:audio/speex
+SRTP_DEPEND=	${LOCALBASE}/include/srtp/srtp.h:net/libsrtp
 STDIO_DEPEND=	# In base
-UUID_DEPEND=	${LOCALBASE}/include/uuid/uuid.h:${PORTSDIR}/misc/e2fsprogs-libuuid
-V4L_DEPEND=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:${PORTSDIR}/multimedia/libv4l
+UUID_DEPEND=	${LOCALBASE}/include/uuid/uuid.h:misc/e2fsprogs-libuuid
+V4L_DEPEND=	${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat
+V4L2_DEPEND=	${LOCALBASE}/include/libv4l2.h:multimedia/libv4l
 X11_DEPEND=	# Handled with USE_XORG in Makefile
diff --git a/audio/baudline/Makefile b/audio/baudline/Makefile
index 756486d16046..c88618c8e3e2 100644
--- a/audio/baudline/Makefile
+++ b/audio/baudline/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	bin/baudline
 OPTIONS_DEFINE=		MPG123 DOCS
 OPTIONS_DEFAULT=	MPG123
 
-MMPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MMPG123_RUN_DEPENDS=	mpg123:audio/mpg123
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 IGNORE=		may not be automatically fetched due to licensing\
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 6c5e606fd4c4..c1d3a29fe83f 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Powerful music composition and modular synthesis application
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libguile.so:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libmad.so:audio/libmad \
+		libvorbisfile.so:audio/libvorbis \
+		libguile.so:lang/guile
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		shared-mime-info shebangfix tar:bzip2
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 7db1a7e4ea0d..8ed80cbdecd2 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Media library management system for obsessive-compulsive music geeks
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.27:${PORTSDIR}/audio/py-mutagen \
-		${PYTHON_PKGNAMEPREFIX}unidecode>=0:${PORTSDIR}/converters/py-unidecode \
-		${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:${PORTSDIR}/audio/py-musicbrainzngs \
-		${PYTHON_PKGNAMEPREFIX}munkres>=0:${PORTSDIR}/math/py-munkres \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}enum34>=1.0.4:${PORTSDIR}/devel/py-enum34 \
-		${PYTHON_PKGNAMEPREFIX}jellyfish>=0:${PORTSDIR}/devel/py-jellyfish \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.27:audio/py-mutagen \
+		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode \
+		${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs \
+		${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}enum34>=1.0.4:devel/py-enum34 \
+		${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
 
 USES=		python
 USE_PYTHON=	autoplist distutils
@@ -55,32 +55,32 @@ THUMBNAILS_DESC=	Thumbnails for freedesktop.org-compliant file managers
 WEB_DESC=		Web plugin for querying, browsing and playing music
 WEB_CORS_DESC=		Cross-origin resource sharing for the Web plugin
 
-ACOUSTICBRAINZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-BADFILES_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac \
-			mp3val:${PORTSDIR}/audio/mp3val
-BPD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:${PORTSDIR}/multimedia/py-gstreamer
-CHROMA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:${PORTSDIR}/audio/py-pyacoustid
-DISCOGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:${PORTSDIR}/audio/py-discogs-client
-ECHONEST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyechonest>=8.0.1:${PORTSDIR}/devel/py-pyechonest
-EMBYUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-FETCHART_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-FFMPEG_RUN_DEPENDS=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
-IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
-IPFS_RUN_DEPENDS=	ipfs-go:${PORTSDIR}/sysutils/ipfs-go
-LASTFM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylast>=0:${PORTSDIR}/audio/py-pylast
-LASTIMPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-LYRICS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-LYRICS_GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:${PORTSDIR}/www/py-beautifulsoup
-METASYNC_DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
-MPDSTATS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd2>=0:${PORTSDIR}/audio/py-mpd2
-PLEXUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-REPLAYGAIN_RUN_DEPENDS=	mp3gain>=0:${PORTSDIR}/audio/mp3gain
-REPLAYGAIN_RUN_DEPENDS+=	aacgain>=0:${PORTSDIR}/audio/aacgain
-SPOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:${PORTSDIR}/www/py-requests
-THUMBNAILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg
-THUMBNAILS_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pathlib>=0:${PORTSDIR}/devel/py-pathlib
-WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask
-WEB_CORS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:${PORTSDIR}/www/py-flask-cors
+ACOUSTICBRAINZ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+BADFILES_RUN_DEPENDS=	flac:audio/flac \
+			mp3val:audio/mp3val
+BPD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer
+CHROMA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid
+DISCOGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:audio/py-discogs-client
+ECHONEST_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyechonest>=8.0.1:devel/py-pyechonest
+EMBYUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+FETCHART_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+FFMPEG_RUN_DEPENDS=	ffmpeg>=2:multimedia/ffmpeg
+IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick
+IPFS_RUN_DEPENDS=	ipfs-go:sysutils/ipfs-go
+LASTFM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast
+LASTIMPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+LYRICS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+LYRICS_GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup
+METASYNC_DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus
+MPDSTATS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd2>=0:audio/py-mpd2
+PLEXUPDATE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+REPLAYGAIN_RUN_DEPENDS=	mp3gain>=0:audio/mp3gain
+REPLAYGAIN_RUN_DEPENDS+=	aacgain>=0:audio/aacgain
+SPOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
+THUMBNAILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg
+THUMBNAILS_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib
+WEB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask
+WEB_CORS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors
 
 post-install:
 	${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/man/man1/
diff --git a/audio/blop/Makefile b/audio/blop/Makefile
index 610cac30d439..cc7fbda36d8f 100644
--- a/audio/blop/Makefile
+++ b/audio/blop/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bandlimited oscillator plugins for LADSPA-aware audio applications
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile
index bcf6f0f2f197..ff97d3b4704a 100644
--- a/audio/boodler/Makefile
+++ b/audio/boodler/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFAULT=	OSS
 
 AUDIO_DESC=		Audio backend
 
-ESOUND_LIB_DEPENDS=	libesd.so:${PORTSDIR}/audio/esound
+ESOUND_LIB_DEPENDS=	libesd.so:audio/esound
 ESOUND_CONFIGURE_ON=	--driver esd
 
 FILE_DESC=		Write raw PCM data to a file
diff --git a/audio/bristol/Makefile b/audio/bristol/Makefile
index b385be03656c..063126b36dbd 100644
--- a/audio/bristol/Makefile
+++ b/audio/bristol/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Vintage synthesiers emulation for electric pianos and organs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS=	libjack.so:audio/jack \
+		libfluidsynth.so:audio/fluidsynth
 
 USES=		libtool
 USE_LDCONFIG=	yes
diff --git a/audio/calf/Makefile b/audio/calf/Makefile
index e3d89e5eeda4..81c7927d6b8a 100644
--- a/audio/calf/Makefile
+++ b/audio/calf/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Audio plug-in pack for LV2 and JACK environments
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth \
+		libjack.so:audio/jack \
+		libexpat.so:textproc/expat2
 
 USES=		autoreconf compiler:c++11-lang gmake libtool pkgconfig
 USE_GNOME=	gtk20
@@ -30,11 +30,11 @@ OPTIONS_DEFINE=		DOCS LASH LV2
 OPTIONS_DEFAULT=	LASH LV2
 OPTIONS_SUB=		yes
 
-LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=	liblash.so:audio/lash
 LASH_CONFIGURE_WITH=	lash
 LV2_DESC=		LV2 audio plugin
-LV2_BUILD_DEPENDS=	lv2core>0:${PORTSDIR}/audio/lv2core
-LV2_RUN_DEPENDS=	lv2core>0:${PORTSDIR}/audio/lv2core
+LV2_BUILD_DEPENDS=	lv2core>0:audio/lv2core
+LV2_RUN_DEPENDS=	lv2core>0:audio/lv2core
 LV2_CONFIGURE_WITH=	lv2
 
 .include <bsd.port.pre.mk>
diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index 904e5110f25c..dfb87ced5129 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -34,33 +34,33 @@ OPTIONS_DEFINE=		CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB
 OPTIONS_DEFAULT=	TAGLIB
 OPTIONS_SUB=		yes
 
-CDDB_LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
+CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
 CDDB_CMAKE_ON=		-DENABLE_CDDB:BOOL=TRUE
 CDDB_CMAKE_OFF=		-DENABLE_CDDB:BOOL=FALSE
 
-CDPARANOIA_LIB_DEPENDS=	libcdda_interface.so:${PORTSDIR}/audio/cdparanoia
+CDPARANOIA_LIB_DEPENDS=	libcdda_interface.so:audio/cdparanoia
 CDPARANOIA_CMAKE_ON=	-DENABLE_CDPARANOIA:BOOL=TRUE
 CDPARANOIA_CMAKE_OFF=	-DENABLE_CDPARANOIA:BOOL=FALSE
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_ON=	-DENABLE_FFMPEG:BOOL=TRUE
 FFMPEG_CMAKE_OFF=	-DENABLE_FFMPEG:BOOL=FALSE
 
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CMAKE_ON=	-DENABLE_MPG123:BOOL=TRUE
 MPG123_CMAKE_OFF=	-DENABLE_MPG123:BOOL=FALSE
 
-MTP_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_ON=		-DENABLE_MTP:BOOL=TRUE
 MTP_CMAKE_OFF=		-DENABLE_MTP:BOOL=FALSE
 
-MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5
+MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5
 MUSICBRAINZ_CMAKE_ON=	-DENABLE_MUSICBRAINZ:BOOL=TRUE
 MUSICBRAINZ_CMAKE_OFF=	-DENABLE_MUSICBRAINZ:BOOL=FALSE
 MUSICBRAINZ_DESC=	Access MusicBrainz database for metadata lookup
 
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib\
-			libtag-extras.so:${PORTSDIR}/audio/taglib-extras
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib\
+			libtag-extras.so:audio/taglib-extras
 TAGLIB_CMAKE_ON=	-DENABLE_TAGLIB_EXTRAS:BOOL=TRUE \
 			-DENABLE_TAGLIB:BOOL=TRUE
 TAGLIB_CMAKE_OFF=	-DENABLE_TAGLIB_EXTRAS:BOOL=FALSE \
diff --git a/audio/caps-plugins/Makefile b/audio/caps-plugins/Makefile
index 62991e2b1af8..6fc5a5f5329e 100644
--- a/audio/caps-plugins/Makefile
+++ b/audio/caps-plugins/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	caps_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The C* Audio Plugin Suite
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index fd419527755c..f66a6e7a3f08 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -12,10 +12,10 @@ COMMENT=	C++ class framework for manipulating audio files
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-LIB_DEPENDS=	libccgnu2.so:${PORTSDIR}/devel/commoncpp \
-		libucommon.so:${PORTSDIR}/devel/ucommon \
-		libgsm.so:${PORTSDIR}/audio/gsm \
-		libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libccgnu2.so:devel/commoncpp \
+		libucommon.so:devel/ucommon \
+		libgsm.so:audio/gsm \
+		libspeex.so:audio/speex
 
 USES=		cmake:outsource pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/audio/cd2mp3/Makefile b/audio/cd2mp3/Makefile
index 30c9cd52eea1..40af89d7156d 100644
--- a/audio/cd2mp3/Makefile
+++ b/audio/cd2mp3/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	http://mark.foster.cc/pub/freebsd/ports/distfiles/ \
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Easy to use CD Ripping and MP3 Encoding tool
 
-RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		dagrab:${PORTSDIR}/audio/dagrab
+RUN_DEPENDS=	lame:audio/lame \
+		dagrab:audio/dagrab
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
diff --git a/audio/celt/Makefile b/audio/celt/Makefile
index 0a20f0646ab7..bb73e7a886b9 100644
--- a/audio/celt/Makefile
+++ b/audio/celt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	The CELT ultra-low delay audio codec
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index 6fa72d7f3297..53a2069f3dbd 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -10,7 +10,7 @@ COMMENT=	AcoustID audio fingerprinting library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USES=		cmake:outsource pathfix
 USE_LDCONFIG=	yes
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 4348f5adb757..a91f3ed9edde 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -13,15 +13,15 @@ COMMENT=	Cross-platform music player based on Amarok 1.4
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libchromaprint.so:${PORTSDIR}/audio/chromaprint \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libqjson.so:${PORTSDIR}/devel/qjson \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libechonest.so:${PORTSDIR}/audio/libechonest
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libchromaprint.so:audio/chromaprint \
+		libprotobuf.so:devel/protobuf \
+		libqca.so:devel/qca \
+		libqjson.so:devel/qjson \
+		libfftw3.so:math/fftw3 \
+		libechonest.so:audio/libechonest
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}${PKGNAMESUFFIX}
@@ -73,7 +73,7 @@ DROPBOX_CMAKE_OFF=	-DENABLE_DROPBOX=OFF
 MOODBAR_CMAKE_ON=	-DENABLE_MOODBAR=ON
 MOODBAR_CMAKE_OFF=	-DENABLE_MOODBAR=OFF
 
-AUDIOCD_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+AUDIOCD_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 AUDIOCD_CMAKE_ON=	-DENABLE_AUDIOCD=ON
 AUDIOCD_CMAKE_OFF=	-DENABLE_AUDIOCD=OFF
 
@@ -90,19 +90,19 @@ GIO_USE=	GNOME=glib20
 GIO_CMAKE_ON=	-DENABLE_GIO=ON
 GIO_CMAKE_OFF=	-DENABLE_GIO=OFF
 
-GOOGLE_DRIVE_BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
+GOOGLE_DRIVE_BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
 GOOGLE_DRIVE_CMAKE_ON=	-DENABLE_GOOGLE_DRIVE=ON
 GOOGLE_DRIVE_CMAKE_OFF=	-DENABLE_GOOGLE_DRIVE=OFF
 
-GPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+GPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod
 GPOD_CMAKE_ON=	-DENABLE_LIBGPOD=ON
 GPOD_CMAKE_OFF=	-DENABLE_LIBGPOD=OFF
 
-LASTFM_LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm
+LASTFM_LIB_DEPENDS=	liblastfm.so:audio/liblastfm
 LASTFM_CMAKE_ON=	-DENABLE_LIBLASTFM=ON
 LASTFM_CMAKE_OFF=	-DENABLE_LIBLASTFM=OFF
 
-MPT_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
+MPT_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_ON=	-DENABLE_LIBMTP=ON
 MTP_CMAKE_OFF=	-DENABLE_LIBMTP=OFF
 
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 80bd01d30e1d..14f267bcd6d1 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Ncurses based frontend to mpg123
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+RUN_DEPENDS=	mpg123:audio/mpg123
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-kenrevs
 
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/cmp3 bin/rnmp3
 OPTIONS_DEFINE=	DOCS VORBIS
 OPTIONS_DEFAULT=	VORBIS
 
-VORBIS_RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
+VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/cmt/Makefile b/audio/cmt/Makefile
index 9d9339dac14e..876faf64d8ad 100644
--- a/audio/cmt/Makefile
+++ b/audio/cmt/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	${PORTNAME}_src_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Computer Music Toolkit - a collection of LADSPA plugins
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BUILD_WRKSRC=	${WRKDIR}/${PORTNAME}/src
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 630ccf753ae6..828ff7b85301 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -32,7 +32,7 @@ DISCID_DESC=	DISCID support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:audio/flac
 CONFIGURE_ARGS+=CONFIG_FLAC=y
 PLIST_SUB+=	FLAC=""
 .else
@@ -41,7 +41,7 @@ PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:audio/libmad
 CONFIGURE_ARGS+=CONFIG_MAD=y
 PLIST_SUB+=	MAD=""
 .else
@@ -50,7 +50,7 @@ PLIST_SUB+=	MAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	libmodplug.so:audio/libmodplug
 CONFIGURE_ARGS+=CONFIG_MODPLUG=y
 PLIST_SUB+=	MODPLUG=""
 .else
@@ -59,7 +59,7 @@ PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+=	libmikmod.so:audio/libmikmod
 CONFIGURE_ARGS+=CONFIG_MIKMOD=y
 PLIST_SUB+=	MIKMOD=""
 .else
@@ -67,7 +67,7 @@ PLIST_SUB+=	MIKMOD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	libmpcdec.so:audio/musepack
 CONFIGURE_ARGS+=CONFIG_MPC=y
 PLIST_SUB+=	MPC=""
 .else
@@ -76,7 +76,7 @@ PLIST_SUB+=	MPC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPUS}
-LIB_DEPENDS+=	libopusfile.so:${PORTSDIR}/audio/opusfile
+LIB_DEPENDS+=	libopusfile.so:audio/opusfile
 CONFIGURE_ARGS+=CONFIG_OPUS=y
 PLIST_SUB+=	OPUS=""
 .else
@@ -85,7 +85,7 @@ PLIST_SUB+=	OPUS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MTREMOR}
-LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:audio/libvorbis
 CONFIGURE_ARGS+=CONFIG_VORBIS=y
 PLIST_SUB+=	VORBIS=""
 .else
@@ -94,13 +94,13 @@ PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTREMOR}
-LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+LIB_DEPENDS+=	libvorbisidec.so:audio/libtremor
 CONFIGURE_ARGS+=CONFIG_TREMOR=y
 .endif
 
 .if ${PORT_OPTIONS:MMP4}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
-LIB_DEPENDS+=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS+=	libfaad.so:audio/faad
+LIB_DEPENDS+=	libmp4v2.so:multimedia/mp4v2
 CONFIGURE_ARGS+=CONFIG_MP4=y
 PLIST_SUB+=	MP4=""
 .else
@@ -109,7 +109,7 @@ PLIST_SUB+=	MP4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:audio/faad
 CONFIGURE_ARGS+=CONFIG_AAC=y
 PLIST_SUB+=	AAC=""
 .else
@@ -118,7 +118,7 @@ PLIST_SUB+=	AAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=	libwavpack.so:audio/wavpack
 CONFIGURE_ARGS+=CONFIG_WAVPACK=y
 PLIST_SUB+=	WAVPACK=""
 .else
@@ -127,8 +127,8 @@ PLIST_SUB+=	WAVPACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-BUILD_DEPENDS+=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
-RUN_DEPENDS+=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
+BUILD_DEPENDS+=	ffmpeg>=2:multimedia/ffmpeg
+RUN_DEPENDS+=	ffmpeg>=2:multimedia/ffmpeg
 CONFIGURE_ARGS+=CONFIG_FFMPEG=y
 PLIST_SUB+=	FFMPEG=""
 .else
@@ -137,7 +137,7 @@ PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAO}
-LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libao.so:audio/libao
 CONFIGURE_ARGS+=CONFIG_AO=y
 PLIST_SUB+=	AO=""
 .else
@@ -146,7 +146,7 @@ PLIST_SUB+=	AO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 CONFIGURE_ARGS+=CONFIG_PULSE=y
 PLIST_SUB+=	PULSEAUDIO=""
 .else
@@ -155,14 +155,14 @@ PLIST_SUB+=	PULSEAUDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	libcddb.so:${PORTSDIR}/audio/libcddb
+LIB_DEPENDS+=	libcddb.so:audio/libcddb
 CONFIGURE_ARGS+=CONFIG_CDDB=y
 .else
 CONFIGURE_ARGS+=CONFIG_CDDB=n
 .endif
 
 .if ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
+LIB_DEPENDS+=	libcdio_cdda.so:sysutils/libcdio-paranoia
 CONFIGURE_ARGS+=CONFIG_CDIO=y
 PLIST_SUB+=	CDIO=""
 .else
@@ -171,7 +171,7 @@ PLIST_SUB+=	CDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCUE}
-LIB_DEPENDS+=	libcue.so:${PORTSDIR}/textproc/libcue
+LIB_DEPENDS+=	libcue.so:textproc/libcue
 CONFIGURE_ARGS+=CONFIG_CUE=y
 PLIST_SUB+=	CUE=""
 .else
@@ -180,14 +180,14 @@ PLIST_SUB+=	CUE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDISCID}
-LIB_DEPENDS+=	libdiscid.so:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS+=	libdiscid.so:audio/libdiscid
 CONFIGURE_ARGS+=CONFIG_DISCID=y
 .else
 CONFIGURE_ARGS+=CONFIG_DISCID=n
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:audio/jack
 CONFIGURE_ARGS+=CONFIG_JACK=y
 PLIST_SUB+=	JACK=""
 .else
@@ -196,7 +196,7 @@ PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSAMPLERATE} && ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 CONFIGURE_ARGS+=CONFIG_SAMPLERATE=y
 .else
 CONFIGURE_ARGS+=CONFIG_SAMPLERATE=n
diff --git a/audio/codec2/Makefile b/audio/codec2/Makefile
index a726365dc9c6..bf8ed4c7f2c0 100644
--- a/audio/codec2/Makefile
+++ b/audio/codec2/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://files.freedv.org/codec2/ \
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Low bit rate codec
 
-LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libspeex.so:audio/speex
 
 USES=		cmake:outsource compiler:c11 tar:xz
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
diff --git a/audio/cpp-xmms2/Makefile b/audio/cpp-xmms2/Makefile
index a39201a36060..a442e673735e 100644
--- a/audio/cpp-xmms2/Makefile
+++ b/audio/cpp-xmms2/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	cpp-
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	C++ Bindings for XMMS2
 
-LIB_DEPENDS+=	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
-		libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+=	libboost_signals.so:devel/boost-libs \
+		libxmmsclient.so:audio/xmms2
 
 MASTERDIR=	${.CURDIR}/../xmms2
 USE_LDCONFIG=	yes
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 1a3bcab9bd9f..3bc922d3b5e2 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Realtime sound processor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:audio/jack
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	laudrup
diff --git a/audio/crip/Makefile b/audio/crip/Makefile
index dc73ec30aee4..3cd835770fba 100644
--- a/audio/crip/Makefile
+++ b/audio/crip/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Terminal-based ripper/encoder/tagger
 OPTIONS_DEFINE=	SOX DOCS
 SOX_DESC=	SoX audio support
 
-RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
-		cdparanoia:${PORTSDIR}/audio/cdparanoia \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		vorbisgain:${PORTSDIR}/audio/vorbisgain
+RUN_DEPENDS=	p5-CDDB_get>=0:audio/p5-CDDB_get \
+		cdparanoia:audio/cdparanoia \
+		oggenc:audio/vorbis-tools \
+		vorbisgain:audio/vorbisgain
 
-SOX_RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
+SOX_RUN_DEPENDS+=	sox:audio/sox
 PORTDOCS=	Changelog README criprc_example
 
 USES=		shebangfix perl5
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index cd1d56c45b93..1e7a1fed2b07 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -17,10 +17,10 @@ COMMENT=	Sound synthesizer
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	swig13>0:${PORTSDIR}/devel/swig13 \
-		eigen>0:${PORTSDIR}/math/eigen3 \
-		gmm++>0:${PORTSDIR}/math/gmm++
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+BUILD_DEPENDS=	swig13>0:devel/swig13 \
+		eigen>0:math/eigen3 \
+		gmm++>0:math/gmm++
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 PORTSCOUT=	limit:^5\.
 
@@ -61,7 +61,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 MAKE_ARGS+=	useALSA=1
 ALSA_H=		alsa/asoundlib.h
 .else
@@ -70,58 +70,58 @@ ALSA_H=		##alsa/asoundlib.h##
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:graphics/png
 MAKE_ARGS+=	buildImageOpcodes=1
 .else
 MAKE_ARGS+=	buildImageOpcodes=0
 .endif
 
 .if ${PORT_OPTIONS:MDSSI}
-BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
+BUILD_DEPENDS+=	dssi>=0:audio/dssi
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
+RUN_DEPENDS+=	dssi>=0:audio/dssi
 MAKE_ARGS+=	buildDSSI=1
 .else
 MAKE_ARGS+=	buildDSSI=0
 .endif
 
 .if ${PORT_OPTIONS:MFLUIDSYNTH}
-LIB_DEPENDS+=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS+=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_H=	fluidsynth.h
 .else
 FLUIDSYNTH_H=	##fluidsynth.h##
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:audio/jack
 MAKE_ARGS+=	useJack=1
 .else
 MAKE_ARGS+=	useJack=0
 .endif
 
 .if ${PORT_OPTIONS:MOSC}
-LIB_DEPENDS+=	liblo.so:${PORTSDIR}/audio/liblo
+LIB_DEPENDS+=	liblo.so:audio/liblo
 MAKE_ARGS+=	useOSC=1
 .else
 MAKE_ARGS+=	useOSC=0
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS+=	libportaudio.so:audio/portaudio
 MAKE_ARGS+=	usePortAudio=1
 .else
 MAKE_ARGS+=	usePortAudio=0
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_H=	pulse/simple.h
 .else
 PULSEAUDIO_H=	##pulse/simple.h##
 .endif
 
 .if ${PORT_OPTIONS:MFLTK}
-LIB_DEPENDS+=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS+=	libfltk.so:x11-toolkits/fltk
 MAKE_ARGS+=	buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
 .else
 MAKE_ARGS+=	buildCsound5GUI=0 buildCSEditor=0 buildWinsound=0 useFLTK=0
@@ -136,7 +136,7 @@ MAKE_ARGS+=	Word64=1
 .endif
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH
 .endif
 
diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index ddd4836bfdc7..a8caab97e48f 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -15,12 +15,12 @@ COMMENT=	Sound synthesizer
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	boost-libs>0:${PORTSDIR}/devel/boost-libs \
-		swig>2:${PORTSDIR}/devel/swig20 \
-		eigen>0:${PORTSDIR}/math/eigen3 \
-		gmm++>0:${PORTSDIR}/math/gmm++
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
+		swig>2:devel/swig20 \
+		eigen>0:math/eigen3 \
+		gmm++>0:math/gmm++
+LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile
 
 USES=		bison cmake localbase python:2
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
@@ -45,36 +45,36 @@ OPTIONS_DEFAULT=	FLTK OPENMP
 OPTIONS_SUB=		yes
 
 ALSA_DESC=		Build ALSA I/O module
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=		-DUSE_ALSA:BOOL=OFF
 ALSA_PREVENTS=		DSSI
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_OFF=		-DUSE_CURL:BOOL=OFF
 DSSI_DESC=		Build DSSI/LADSPA host opcodes
-DSSI_BUILD_DEPENDS=	dssi>0:${PORTSDIR}/audio/dssi
-DSSI_LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat
-DSSI_RUN_DEPENDS=	dssi>0:${PORTSDIR}/audio/dssi
+DSSI_BUILD_DEPENDS=	dssi>0:audio/dssi
+DSSI_LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat
+DSSI_RUN_DEPENDS=	dssi>0:audio/dssi
 DSSI_CMAKE_OFF=		-DBUILD_DSSI_OPCODES:BOOL=OFF
 DSSI_CFLAGS=		-isystem ${LOCALBASE}/include/dssi
 DSSI_PREVENTS=		ALSA
 FLTK_DESC=		Build FLTK plugin and GUI
-FLTK_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+FLTK_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 FLTK_CMAKE_ON=		-DBUILD_WINSOUND:BOOL=ON
 FLTK_CMAKE_OFF=		-DBUILD_CSOUND_AC:BOOL=OFF \
 			-DBUILD_VIRTUAL_KEYBOARD:BOOL=OFF \
 			-DUSE_FLTK:BOOL=OFF
 FLUIDSYNTH_DESC=	Building FluidSynth opcodes
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CMAKE_OFF=	-DBUILD_FLUID_OPCODES:BOOL=OFF
 HDF5_DESC=		Build HDF5 read/write opcodes
-HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_OFF=		-DBUILD_HDF5_OPCODES:BOOL=OFF
 JACK_DESC=		Build Jack I/O module and opcodes
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_OFF=		-DBUILD_JACK_OPCODES:BOOL=OFF \
 			-DUSE_JACK:BOOL=OFF
 LUA_DESC=		Build Lua Interface and opcodes
-LUA_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LUA_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 LUA_CMAKE_OFF=		-DBUILD_CSOUND_AC_LUA_INTERFACE:BOOL=OFF \
 			-DBUILD_LUA_INTERFACE:BOOL=OFF \
 			-DBUILD_LUA_OPCODES:BOOL=OFF
@@ -87,22 +87,22 @@ OPENMP_USES=		compiler:gcc-c++11-lib
 OPENMP_USES_OFF=	compiler:c++11-lib
 OPENMP_CMAKE_OFF=	-DUSE_OPEN_MP:BOOL=OFF
 OSC_DESC=		Build OSC opcodes
-OSC_LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
+OSC_LIB_DEPENDS=	liblo.so:audio/liblo
 OSC_CMAKE_OFF=		-DBUILD_OSC_OPCODES:BOOL=OFF
 PNG_DESC=		Build Image opcodes
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_OFF=		-DBUILD_IMAGE_OPCODES:BOOL=OFF
 PORTAUDIO_DESC=		Build PortAudio I/O module
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_OFF=	-DUSE_PORTAUDIO:BOOL=OFF
 PULSEAUDIO_DESC=	Build PulseAudio I/O module
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSEAUDIO:BOOL=OFF
 
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/audio/cue2toc/Makefile b/audio/cue2toc/Makefile
index 46cff2e05dfc..3613da5b05f9 100644
--- a/audio/cue2toc/Makefile
+++ b/audio/cue2toc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.tuxcoder.com/cue2toc/download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl script that converts CUE files into TOC files for cdrdao
 
-RUN_DEPENDS=	p5-Audio-Wav>=0:${PORTSDIR}/audio/p5-Audio-Wav
+RUN_DEPENDS=	p5-Audio-Wav>=0:audio/p5-Audio-Wav
 
 USES=		perl5 shebangfix
 NO_WRKSUBDIR=	yes
diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile
index de96eacb28ba..c7ae2ca3ca06 100644
--- a/audio/cueplayer/Makefile
+++ b/audio/cueplayer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	CUE player
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:devel/libnotify
 
 USES=		pkgconfig qmake
 USE_QT4=	gui xml uic_build moc_build rcc_build network
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index d19358d68399..5729eb117f21 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -27,30 +27,30 @@ OPTIONS_MULTI_CODEC=	AACPLUS FAAC LAME OPUS TWOLAME VORBIS
 OPTIONS_DEFAULT=	VORBIS
 
 AACPLUS_DESC=		AAC HEv2 and libsamplerate support
-AACPLUS_LIB_DEPENDS=	libaacplus.so:${PORTSDIR}/audio/libaacplus \
-			libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+AACPLUS_LIB_DEPENDS=	libaacplus.so:audio/libaacplus \
+			libsamplerate.so:audio/libsamplerate
 AACPLUS_CONFIGURE_ON=	--with-aacplus-prefix=${LOCALBASE} \
 			--with-samplerate-prefix=${LOCALBASE}
 AACPLUS_CONFIGURE_OFF=	--without-aacplus --without-samplerate
-FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CONFIGURE_ON=	--with-faac-prefix=${LOCALBASE}
 FAAC_CONFIGURE_OFF=	--without-faac
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ON=	--with-jack-prefix=${LOCALBASE}
 JACK_CONFIGURE_OFF=	--without-jack
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ON=	--with-lame-prefix=${LOCALBASE}
 LAME_CONFIGURE_OFF=	--without-lame
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_ON=	--with-opus-prefix=${LOCALBASE}
 OPUS_CONFIGURE_OFF=	--without-opus
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ON=	--with-pulseaudio-prefix=${LOCALBASE}
 PULSEAUDIO_CONFIGURE_OFF=	--without-pulseaudio
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 TWOLAME_CONFIGURE_ON=	--with-twolame-prefix=${LOCALBASE}
 TWOLAME_CONFIGURE_OFF=	--without-twolame
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-vorbis-prefix=${LOCALBASE}
 VORBIS_CONFIGURE_OFF=	--without-vorbis
 
diff --git a/audio/dcd/Makefile b/audio/dcd/Makefile
index 8abb958b33c5..82fc65ce93b3 100644
--- a/audio/dcd/Makefile
+++ b/audio/dcd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple, programmable, intelligent CD player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
+LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
 
 USES=		gmake
 
diff --git a/audio/deadbeef-jack-plugin/Makefile b/audio/deadbeef-jack-plugin/Makefile
index af3e54993258..5b3600ebd690 100644
--- a/audio/deadbeef-jack-plugin/Makefile
+++ b/audio/deadbeef-jack-plugin/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	audio
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	JACK output plugin for DeaDBeeF music player
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
+LIB_DEPENDS=	libjack.so:audio/jack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef-mpris-plugin/Makefile b/audio/deadbeef-mpris-plugin/Makefile
index 307d26d6870c..991a40854db0 100644
--- a/audio/deadbeef-mpris-plugin/Makefile
+++ b/audio/deadbeef-mpris-plugin/Makefile
@@ -16,7 +16,7 @@ BROKEN=		does not work with recent versions of glib and/or DeaDBeeF
 DEPRECATED=	Abandonware; use `audio/deadbeef-mpris2-plugin' instead
 EXPIRATION_DATE=	2016-05-16
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/audio/deadbeef-mpris2-plugin/Makefile b/audio/deadbeef-mpris2-plugin/Makefile
index 01a44c04c438..57bec9683752 100644
--- a/audio/deadbeef-mpris2-plugin/Makefile
+++ b/audio/deadbeef-mpris2-plugin/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MPRIS protocol version 2 plugin for DeaDBeeF music player
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef-musical-spectrum-plugin/Makefile b/audio/deadbeef-musical-spectrum-plugin/Makefile
index 577b28c04d17..a5b4e6a73af8 100644
--- a/audio/deadbeef-musical-spectrum-plugin/Makefile
+++ b/audio/deadbeef-musical-spectrum-plugin/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	audio
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Musical spectrum plugin for DeaDBeeF audio player
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
+LIB_DEPENDS=	libfftw3.so:math/fftw3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef-playback-status-plugin/Makefile b/audio/deadbeef-playback-status-plugin/Makefile
index da9887b04551..1af32ed5f2b5 100644
--- a/audio/deadbeef-playback-status-plugin/Makefile
+++ b/audio/deadbeef-playback-status-plugin/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Playback status widget for DeaDBeeF audio player
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef-quick-search-plugin/Makefile b/audio/deadbeef-quick-search-plugin/Makefile
index 400342b5dc9e..4b6ec623b2f8 100644
--- a/audio/deadbeef-quick-search-plugin/Makefile
+++ b/audio/deadbeef-quick-search-plugin/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quick playlist search bar plugin for DeaDBeeF audio player
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef-vu-meter-plugin/Makefile b/audio/deadbeef-vu-meter-plugin/Makefile
index 327f436fd6a8..22bacabcd9f8 100644
--- a/audio/deadbeef-vu-meter-plugin/Makefile
+++ b/audio/deadbeef-vu-meter-plugin/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	VU meter plugin for DeaDBeeF audio player
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef-waveform-seekbar-plugin/Makefile b/audio/deadbeef-waveform-seekbar-plugin/Makefile
index c19ebdfc61ed..ea7f75eb4727 100644
--- a/audio/deadbeef-waveform-seekbar-plugin/Makefile
+++ b/audio/deadbeef-waveform-seekbar-plugin/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Waveform seekbar plugin for DeaDBeeF audio player
 
-BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:${PORTSDIR}/audio/deadbeef
+BUILD_DEPENDS=	${LOCALBASE}/include/deadbeef/deadbeef.h:audio/deadbeef
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_GITHUB=	yes
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 6c2345c06cb1..c493de48660b 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -71,13 +71,13 @@ GUI_IMPLIES=		CONVERTER
 OPTIONS_GROUP+=		MP3
 OPTIONS_GROUP_MP3=	MAD MPG123
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_OFF=	--disable-libmad
 
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CONFIGURE_OFF=	--disable-libmpg123
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 GTK2_USE=		gnome=gtk20,glib20
@@ -95,16 +95,16 @@ GTK3_IMPLIES=		GUI
 PLIST_SUB+=		GTK_VER=${GTK_VER}
 
 GUI_CONFIGURE_OFF=	--disable-gtk2 --disable-gtk3
-GUI_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson
+GUI_LIB_DEPENDS=	libjansson.so:devel/jansson
 
-VFS_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+VFS_LIB_DEPENDS=	libcurl.so:ftp/curl
 VFS_CONFIGURE_OFF=	--disable-vfs-curl
 
-LASTFM_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LASTFM_LIB_DEPENDS=	libcurl.so:ftp/curl
 LASTFM_CONFIGURE_OFF=	--disable-lfm
 
-ART_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-			libImlib2.so:${PORTSDIR}/graphics/imlib2
+ART_LIB_DEPENDS=	libcurl.so:ftp/curl \
+			libImlib2.so:graphics/imlib2
 ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
 ART_IMPLIES=		VFS
@@ -113,7 +113,7 @@ SUPEREQ_CONFIGURE_OFF=	--disable-supereq
 
 SID_CONFIGURE_OFF=	--disable-sid
 
-FFAP_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+FFAP_BUILD_DEPENDS=	yasm:devel/yasm
 FFAP_CONFIGURE_OFF=	--disable-ffap
 
 VTX_CONFIGURE_OFF=	--disable-vtx
@@ -122,44 +122,44 @@ ADPLUG_CONFIGURE_OFF=	--disable-adplug
 
 HOTKEYS_CONFIGURE_OFF=	--disable-hotkeys
 
-OGG_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+OGG_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 OGG_CONFIGURE_OFF=	--disable-vorbis
 
-FFMPEG_LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \
-		libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0 \
-		libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0
+FFMPEG_LIB_DEPENDS=	libavcodec0.so:multimedia/ffmpeg0 \
+		libavformat0.so:multimedia/ffmpeg0 \
+		libavutil0.so:multimedia/ffmpeg0
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_OFF=	--disable-flac
 
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_OFF=	--disable-sndfile
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--disable-wavpack
 
-CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-			libcddb.so:${PORTSDIR}/audio/libcddb
+CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+			libcddb.so:audio/libcddb
 CDDA_CONFIGURE_OFF=	--disable-cdda
 
 GME_CONFIGURE_OFF=	--disable-gme
 
 DUMB_CONFIGURE_OFF=	--disable-dumb
 
-NOTIFY_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+NOTIFY_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 NOTIFY_CONFIGURE_OFF=	--disable-notify
 
 MUSEPACK_CONFIGURE_OFF=	--disable-musepack
 
-WILDMIDI_RUN_DEPENDS=	${LOCALBASE}/share/freepats/crude.cfg:${PORTSDIR}/audio/freepats
+WILDMIDI_RUN_DEPENDS=	${LOCALBASE}/share/freepats/crude.cfg:audio/freepats
 WILDMIDI_CONFIGURE_OFF=	--disable-wildmidi
 
 TTA_CONFIGURE_OFF=	--disable-tta
 
 DCA_CONFIGURE_OFF=	--disable-dca
 
-AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_CONFIGURE_OFF=	--disable-aac
 
 MMS_CONFIGURE_OFF=	--disable-mms
@@ -177,14 +177,14 @@ M3U_CONFIGURE_OFF=	--disable-m3u
 
 SPF_CONFIGURE_OFF=	--disable-psf
 
-DSP_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+DSP_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 DSP_CONFIGURE_OFF=	--disable-src
 
 MONO2STEREO_CONFIGURE_OFF=	--disable-mono2stereo
 
 CONVERTER_CONFIGURE_OFF=	--disable-converter
 
-VFS_ZIP_LIB_DEPENDS=	libzip.so:${PORTSDIR}/archivers/libzip
+VFS_ZIP_LIB_DEPENDS=	libzip.so:archivers/libzip
 VFS_ZIP_CONFIGURE_OFF=	--disable-vfs-zip
 
 ALAC_CONFIGURE_OFF=		--disable-alac
diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile
index bc5d92e438ae..1f2396252367 100644
--- a/audio/decibel-audio-player/Makefile
+++ b/audio/decibel-audio-player/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://decibel.silent-blade.org/uploads/Main/
 MAINTAINER=	somicide@gmail.com
 COMMENT=	Fast GTK+ audio player with an clean and user friendly interface
 
-RUN_DEPENDS=	py*-dbus>=0.80:${PORTSDIR}/devel/py-dbus \
-		py*-mutagen>=1.11:${PORTSDIR}/audio/py-mutagen
+RUN_DEPENDS=	py*-dbus>=0.80:devel/py-dbus \
+		py*-mutagen>=1.11:audio/py-mutagen
 
 LICENSE=	GPLv2
 
@@ -30,19 +30,19 @@ MPEG4IP_DESC=	AAC/MP4P support
 ##A few extra requirements if we want to use some nifty plugins in decibel
 EXTRAS_DESC=	Extra dependencies for plugins
 
-AUDIOCD_RUN_DEPENDS=	cd-discid>=0.9:${PORTSDIR}/audio/cd-discid \
-		py*-cddb>=1.4:${PORTSDIR}/audio/py-cddb \
-		gstreamer-plugins-cdio>=0.10.16:${PORTSDIR}/sysutils/gstreamer-plugins-cdio
-EXTRAS_RUN_DEPENDS=	py*-pillow>0:${PORTSDIR}/graphics/py-pillow \
-		py*-notify>=0.1.1:${PORTSDIR}/devel/py-notify
+AUDIOCD_RUN_DEPENDS=	cd-discid>=0.9:audio/cd-discid \
+		py*-cddb>=1.4:audio/py-cddb \
+		gstreamer-plugins-cdio>=0.10.16:sysutils/gstreamer-plugins-cdio
+EXTRAS_RUN_DEPENDS=	py*-pillow>0:graphics/py-pillow \
+		py*-notify>=0.1.1:devel/py-notify
 FLAC_USE=	GSTREAMER=flac
 MP3_USE=	GSTREAMER=mp3
-MPEG4IP_LIB_DEPENDS=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+MPEG4IP_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 MPEG4IP_USE=	GSTREAMER=faad
 OGG_USE=	GSTREAMER=ogg
 SPEEX_USE=	GSTREAMER=speex
 VORBIS_USE=	GSTREAMER=vorbis
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_USE=	GSTREAMER=wavpack
 
 post-patch:
diff --git a/audio/deforaos-mixer/Makefile b/audio/deforaos-mixer/Makefile
index 265d862c89e4..e32d790fe6d5 100644
--- a/audio/deforaos-mixer/Makefile
+++ b/audio/deforaos-mixer/Makefile
@@ -14,7 +14,7 @@ COMMENT=	DeforaOS desktop audio mixer
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop
+LIB_DEPENDS=	libDesktop.so:x11/deforaos-libdesktop
 
 MAKE_ARGS=	PREFIX=${PREFIX}
 USES=		desktop-file-utils gettext pkgconfig
diff --git a/audio/dekagen/Makefile b/audio/dekagen/Makefile
index 69c5c5a955ba..d92e969fd695 100644
--- a/audio/dekagen/Makefile
+++ b/audio/dekagen/Makefile
@@ -17,14 +17,14 @@ COMMENT=	Frontend to rip, convert, and name MP3/Ogg
 # both of them are supported by dekagen.
 
 .if !defined(WITHOUT_XMCD)
-RUN_DEPENDS+=	cda:${PORTSDIR}/audio/xmcd
+RUN_DEPENDS+=	cda:audio/xmcd
 .endif
 
 # If you want to use another ripper, eg. tosha or dagrab,
 # you can safely 'make -DWITHOUT_CDPARANOIA'.
 
 .if !defined(WITHOUT_CDPARANOIA)
-RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
+RUN_DEPENDS+=	cdparanoia:audio/cdparanoia
 .endif
 
 NO_BUILD=	Shell Script
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 69826e655b4a..77d47c13d82c 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -11,16 +11,16 @@ COMMENT=	Graphical score editor
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libaubio.so:${PORTSDIR}/audio/aubio \
-		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libsmf.so:${PORTSDIR}/audio/libsmf \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		librubberband.so:${PORTSDIR}/audio/rubberband \
-		libguile.so:${PORTSDIR}/lang/guile \
-		libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libaubio.so:audio/aubio \
+		libfluidsynth.so:audio/fluidsynth \
+		libjack.so:audio/jack \
+		libsmf.so:audio/libsmf \
+		libsndfile.so:audio/libsndfile \
+		libportaudio.so:audio/portaudio \
+		librubberband.so:audio/rubberband \
+		libguile.so:lang/guile \
+		libfftw3.so:math/fftw3
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		bison gettext gmake pkgconfig
 USE_GNOME=	intltool librsvg2 libxml2
@@ -45,18 +45,18 @@ GTK2_USE=		gnome=gtk20,gtksourceview2
 GTK2_CONFIGURE_ON=	--enable-gtk2
 GTK3_USE=		gnome=gtk30,gtksourceview3
 LILYPOND_DESC=		Install LilyPond (Printing)
-LILYPOND_RUN_DEPENDS=	lilypond:${PORTSDIR}/print/lilypond
+LILYPOND_RUN_DEPENDS=	lilypond:print/lilypond
 PDF_CONFIGURE_OFF=	--disable-evince
 TOOLKIT_DESC=		GTK+ toolkit
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK3} && ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+=	libevview3.so:${PORTSDIR}/graphics/evince
+LIB_DEPENDS+=	libevview3.so:graphics/evince
 .endif
 
 .if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+=	libatrilview.so:${PORTSDIR}/graphics/atril
+LIB_DEPENDS+=	libatrilview.so:graphics/atril
 .endif
 
 post-patch:
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 2f13095ba41c..2a892fe22593 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Command-line {wav,mp3,m4a} to ogg converter
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad \
-		mutagen-inspect:${PORTSDIR}/audio/py-mutagen \
-		mplayer:${PORTSDIR}/multimedia/mplayer \
-		oggenc:${PORTSDIR}/audio/vorbis-tools
+RUN_DEPENDS=	faad:audio/faad \
+		mutagen-inspect:audio/py-mutagen \
+		mplayer:multimedia/mplayer \
+		oggenc:audio/vorbis-tools
 
 USES=		python:2,run shebangfix
 
diff --git a/audio/dream/Makefile b/audio/dream/Makefile
index 41f2027215e6..97e07c88b4db 100644
--- a/audio/dream/Makefile
+++ b/audio/dream/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Software radio for AM and Digital Radio Mondiale (DRM)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib\
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5\
-		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libhamlib.so:comms/hamlib\
+		libqwt.so:x11-toolkits/qwt5\
+		libfftw3.so:math/fftw3
 
 USE_QT4=	qmake_build moc_build uic_build corelib gui network rcc webkit
 QT4_MAKE_ARGS=	INSTALL_ROOT=${STAGEDIR}
@@ -26,17 +26,17 @@ OPTIONS_RADIO_DEVICE=	PORTAUDIO PULSEAUDIO
 OPTIONS_DEFAULT=	PORTAUDIO SNDFILE
 OPTIONS_SUB=		yes
 
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
-SPEEX_LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speexdsp
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
-FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
+
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
+SPEEX_LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
+FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 
 MANDIRS=	${PREFIX}/share/man/man1
 PLIST_FILES=	%%QT_BINDIR%%/dream share/man/man1/dream.1.gz
diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile
index 55cc0292ea8b..b62de401497b 100644
--- a/audio/dsbmixer/Makefile
+++ b/audio/dsbmixer/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Tabbed GTK+ mixer for FreeBSD
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	dsbwrtsysctl:${PORTSDIR}/sysutils/dsbwrtsysctl
+RUN_DEPENDS=	dsbwrtsysctl:sysutils/dsbwrtsysctl
 
 USES=		tar:tgz pkgconfig
 USE_GNOME=	gtk20
diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 0fc6a8160bb1..47e523eab9cd 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -12,13 +12,13 @@ COMMENT=	API for audio processing plugins
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libjack.so:${PORTSDIR}/audio/jack
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libjack.so:audio/jack
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 USES=		gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index 959da04e5cad..0066fe3981dc 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=	ALLEGRO
 OPTIONS_SUB=	yes
 ALLEGRO_DESC=	Enable allegro support
 
-ALLEGRO_LIB_DEPENDS=	liballeg.so:${PORTSDIR}/devel/allegro
+ALLEGRO_LIB_DEPENDS=	liballeg.so:devel/allegro
 ALLEGRO_MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`" \
 			LINK_ALLEGRO="`allegro-config --libs` -lm"
 ALLEGRO_CONFLICTS=	dumb-[0-9]*
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 99f266061148..78097d9ab679 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -11,15 +11,15 @@ COMMENT=	GTK Tag editor for audio files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
-	        ${LOCALBASE}/share/xsl/docbook/html/refentry.xsl:${PORTSDIR}/textproc/docbook-xsl \
-	        itstool:${PORTSDIR}/textproc/itstool \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libtag.so:${PORTSDIR}/audio/taglib
+BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:textproc/docbook-xml \
+	        ${LOCALBASE}/share/xsl/docbook/html/refentry.xsl:textproc/docbook-xsl \
+	        itstool:textproc/itstool \
+		xsltproc:textproc/libxslt
+LIB_DEPENDS=	libid3.so:audio/id3lib \
+		libid3tag.so:audio/libid3tag \
+		libvorbis.so:audio/libvorbis \
+		libFLAC.so:audio/flac \
+		libtag.so:audio/taglib
 
 USES=		desktop-file-utils gettext-tools gmake pkgconfig tar:xz
 USE_GNOME=	gtk30 intlhack libxslt
@@ -39,12 +39,12 @@ OPTIONS_DEFINE=	WAVPACK NLS OPUS SPEEX DOCS
 OPTIONS_DEFAULT=	NLS
 OPTIONS_SUB=	yes
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_ENABLE=	wavpack
 NLS_CONFIGURE_ENABLE=	nls
-OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
 OPUS_CONFIGURE_ENABLE=	opus
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=	speex
 
 NLS_USES=		gettext-runtime
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index 149285072e76..b9ac04f7ca44 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	E.A.W.+Izumo+Tamuki collection of Gravis Ultrasound MIDI patches
 
 # Not useful without timidity.
-RUN_DEPENDS=	${LOCALBASE}/share/eawpats/acbass.pat:${PORTSDIR}/audio/eawpats \
-		${LOCALBASE}/share/guspat/inst/GUS/acbass.pat:${PORTSDIR}/audio/guspat
+RUN_DEPENDS=	${LOCALBASE}/share/eawpats/acbass.pat:audio/eawpats \
+		${LOCALBASE}/share/guspat/inst/GUS/acbass.pat:audio/guspat
 
 NO_CDROM=	Some of the patches are marked no-commercial-use
 
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 04061302610c..9247100dfe0e 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Multitrack audio processing software
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 OPTIONS_DEFINE=	ALSA AUDIOFILE JACK LIBLO LIBOIL PYTHON SAMPLERATE SNDFILE
 OPTIONS_DEFAULT=PYTHON
@@ -33,22 +33,22 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 ALSA_CONFIGURE_ENABLE=	alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 AUDIOFILE_CONFIGURE_ENABLE=	audiofile
-AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 JACK_CONFIGURE_ENABLE=	jack
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 LIBLO_CONFIGURE_ENABLE=	liblo
-LIBLO_LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
+LIBLO_LIB_DEPENDS=	liblo.so:audio/liblo
 LIBOIL_CONFIGURE_ENABLE=liboil
-LIBOIL_LIB_DEPENDS=	liboil-0.3.so:${PORTSDIR}/devel/liboil
+LIBOIL_LIB_DEPENDS=	liboil-0.3.so:devel/liboil
 PYTHON_CONFIGURE_ENABLE=pyecasound
 PYTHON_CONFIGURE_ENV=	PYTHONPATH="${PYTHON_CMD}"
 PYTHON_USES=		python
 SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SNDFILE_CONFIGURE_ENABLE=	sndfile
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 post-patch:
 	@${REINPLACE_CMD} -e '/test/ s|==|=|g ; \
diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile
index f21da606df74..8b2db5d5f797 100644
--- a/audio/enscribe/Makefile
+++ b/audio/enscribe/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Create digital audio watermark images from photographic images
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libgd.so:graphics/gd \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2
 
 USES=		jpeg pkgconfig tar:tgz
 
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index e69cbe0ede9f..f7f03b6c4ebe 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound library for enlightenment package
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 
 USES=		alias libtool:keepla pathfix pkgconfig:both tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 2388c8721ee4..12a9912dabe9 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -19,8 +19,8 @@ OPTIONS_RADIO=	AUDIO_SYSTEM
 OPTIONS_RADIO_AUDIO_SYSTEM=	PORTAUDIO PULSEAUDIO RUNTIME
 RUNTIME_DESC=	Sound interface selected at runtime
 
-PORTAUDIOLIB=	libportaudio.so:${PORTSDIR}/audio/portaudio
-PULSEAUDIOLIB=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PORTAUDIOLIB=	libportaudio.so:audio/portaudio
+PULSEAUDIOLIB=	libpulse.so:audio/pulseaudio
 
 PORTAUDIO_LIB_DEPENDS=	${PORTAUDIOLIB}
 PULSEAUDIO_LIB_DEPENDS=	${PULSEAUDIOLIB}
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index e297c3ce81a3..29bedaf6c62d 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Advanced Qt4 XMMS2 client
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxmmsclient++.so:${PORTSDIR}/audio/cpp-xmms2
+LIB_DEPENDS=	libxmmsclient++.so:audio/cpp-xmms2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E}
 
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index d7d5bed57d79..bb9a025673f1 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Full featured python-based music player for GTK+
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:${PORTSDIR}/audio/py-mutagen
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen
 
 MAKE_ENV+=	PYTHON2_CMD=${PYTHON_CMD} XDGCONFDIR=${PREFIX}/etc/xdg
 USES=		desktop-file-utils gmake python:2
@@ -25,14 +25,14 @@ OPTIONS_DEFAULT=	BAD CDDB DBUS HAL NOTIFY NLS SEXY
 OPTIONS_SUB=		yes
 BAD_DESC=		Install bad GStreamer plugins
 BAD_USE=		GSTREAMER=bad
-CDDB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cddb>=1.4:${PORTSDIR}/audio/py-cddb
-DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:${PORTSDIR}/devel/py-dbus
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
-NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify
+CDDB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:devel/py-dbus
+HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
+NOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify
 NLS_USES=		gettext
 NLS_INSTALL_TARGET_OFF=	install_no_locale
 SEXY_DESC=		UI enchancements
-SEXY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sexy>=0.1.9:${PORTSDIR}/x11-toolkits/py-sexy
+SEXY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sexy>=0.1.9:x11-toolkits/py-sexy
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/Makefile
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 5891784d53dc..a024ba62acab 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/eXtace/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio visualization plugin for the X Window System
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USES=		libtool pathfix pkgconfig
 USE_GNOME=	esound gtk20
diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile
index 313acc5af08c..9063527329ee 100644
--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ezstream/ \
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Command line utility for streaming to icecast servers
 
-LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libshout.so:audio/libshout \
+		libvorbis.so:audio/libvorbis
 
 OPTIONS_DEFINE=	TAGLIB DOCS EXAMPLES
 OPTIONS_DEFAULT=	TAGLIB
@@ -36,7 +36,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 TAGLIB_CONFIGURE_OFF=	--without-taglib
-TAGLIB_LIB_DEPENDS=		libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=		libtag.so:audio/taglib
 TAGLIB_CONFIGURE_ON=	--with-taglib=${LOCALBASE}
 
 .include <bsd.port.options.mk>
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index db359c356c63..f09dd51350d9 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG-2 and MPEG-4 AAC audio encoder
 
-LIB_DEPENDS=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 
 RESTRICTED=	Distribution in binary form is prohibited
 
diff --git a/audio/fapg/Makefile b/audio/fapg/Makefile
index f5986d444ba7..40d27ad0361e 100644
--- a/audio/fapg/Makefile
+++ b/audio/fapg/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Fast Audio Playlist Generator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
+LIB_DEPENDS=	liburiparser.so:net/uriparser
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-uriparser="${LOCALBASE}"
diff --git a/audio/fcplay/Makefile b/audio/fcplay/Makefile
index a0521b262043..1655825d0b92 100644
--- a/audio/fcplay/Makefile
+++ b/audio/fcplay/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Future Composer Reference Player
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS=	libsidplay.so:audio/libsidplay
 
 USES=		gmake tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/audio/fdmf/Makefile b/audio/fdmf/Makefile
index 45473be9fa58..7f704a439e13 100644
--- a/audio/fdmf/Makefile
+++ b/audio/fdmf/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Find similar music by perceptual hashing
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
-		mpg123:${PORTSDIR}/audio/mpg123 \
-		ogg123:${PORTSDIR}/audio/vorbis-tools \
-		p5-GDBM>=0:${PORTSDIR}/databases/p5-GDBM \
-		spline:${PORTSDIR}/graphics/plotutils
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libfftw3.so:math/fftw3
+RUN_DEPENDS=	mplayer:multimedia/mplayer \
+		mpg123:audio/mpg123 \
+		ogg123:audio/vorbis-tools \
+		p5-GDBM>=0:databases/p5-GDBM \
+		spline:graphics/plotutils
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${SCRS}
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 7d83ced8f855..691ff8f4439c 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -14,7 +14,7 @@ COMMENT?=	Command line player for .nsf and .hes audio files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 
 USES=		libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/festival-freebsoft-utils/Makefile b/audio/festival-freebsoft-utils/Makefile
index 6faf7f51c630..90cd43afb67b 100644
--- a/audio/festival-freebsoft-utils/Makefile
+++ b/audio/festival-freebsoft-utils/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Festival utilities focused on interaction with Speech Dispatcher
 
 OPTIONS_DEFINE=	DOCS
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
-		sox:${PORTSDIR}/audio/sox
+RUN_DEPENDS=	festival:audio/festival \
+		sox:audio/sox
 
 NO_BUILD=	yes
 USES=		iconv
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 70e4eaf96ab8..27faf2aacb9f 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -66,7 +66,7 @@ post-patch::
 		${WRKSRC}/*/config/systems/default.mak
 
 .for m in nas esd
-${m:tu}_LIB_DEPENDS=	lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound}
+${m:tu}_LIB_DEPENDS=	lib${m:nas=audio}.so:audio/${m:esd=esound}
 post-patch-${m:tu}-on:
 	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:tu}_AUDIO,INCLUDE_MODULES += ${m:tu}_AUDIO,' \
 		${WRKDIR}/*/config/config.in
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index e8c165f78a26..d86528a19124 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	festival
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Oxford Advanced Learner's pronunciation dictionary for Festival
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+RUN_DEPENDS=	festival:audio/festival
 
 RESTRICTED=	No commercial use
 
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 21a7099f10cf..ae1a080e465c 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	OGIlexicon-2.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Composite pronunciation dictionary from ogi.edu for Festival
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
-		${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex
+RUN_DEPENDS=	festival:audio/festival \
+		${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex
 
 RESTRICTED=	No commercial use
 
diff --git a/audio/festvox-cmu_us_slt_arctic/Makefile b/audio/festvox-cmu_us_slt_arctic/Makefile
index 778827dbf101..28e406bb2a8b 100644
--- a/audio/festvox-cmu_us_slt_arctic/Makefile
+++ b/audio/festvox-cmu_us_slt_arctic/Makefile
@@ -15,9 +15,9 @@ LICENSE_NAME=	MIT License (CMU variant)
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept dist-sell pkg-sell
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival \
-	${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu \
-	${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex
+RUN_DEPENDS=	festival:audio/festival \
+	${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu \
+	${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex
 
 USES=	tar:bzip2
 
diff --git a/audio/festvox-czech/Makefile b/audio/festvox-czech/Makefile
index 357caf9f1442..11dbf2e4ed86 100644
--- a/audio/festvox-czech/Makefile
+++ b/audio/festvox-czech/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	festival
 MAINTAINER=	valtri@civ.zcu.cz
 COMMENT=	Czech male voice for Festival
 
-RUN_DEPENDS=	${LOCALBASE}/share/festival/lib/dicts/czech-lexicon.out:${PORTSDIR}/audio/festlex-czech
+RUN_DEPENDS=	${LOCALBASE}/share/festival/lib/dicts/czech-lexicon.out:audio/festlex-czech
 
 NO_BUILD=	yes
 USES=		gmake
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index 9561491d6435..3daa4e5577b0 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	British English male voice for Festival speech synthesis system
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/oald/oaldlex.scm:${PORTSDIR}/audio/festlex-oald
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/oald/oaldlex.scm:audio/festlex-oald
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index f65d5217afb2..2ba5af39ed72 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	festival
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Castilian Spanish male voice for Festival
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+RUN_DEPENDS=	festival:audio/festival
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index cef597111442..975327747792 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 16 kHz, for Festival
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 CONFLICTS=	festvox-kal8-*
 
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 21307d7f9510..03d159b35cc1 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 8 kHz, for Festival
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index a8ac324ceb8b..e91c0f597f5e 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 16 kHz, for Festival
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 0cd4d5c9ed62..bdd70aa591a2 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	American English male voice, sampled at 8 kHz, for Festival
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:${PORTSDIR}/audio/festlex-cmu
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/cmu/cmulex.scm:audio/festlex-cmu
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 0801dd8a6b16..64aa59b8f6b8 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	16 kHz British English male voice for Festival
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/oald/oaldlex.scm:${PORTSDIR}/audio/festlex-oald
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/oald/oaldlex.scm:audio/festlex-oald
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 16ebfc65235c..5031f61a0ea2 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	British English male voice, sampled at 8 kHz, for Festival
 
 RUN_DEPENDS=	\
-${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:${PORTSDIR}/audio/festlex-poslex \
-${LOCALBASE}/share/festival/lib/dicts/oald/oaldlex.scm:${PORTSDIR}/audio/festlex-oald
+${LOCALBASE}/share/festival/lib/dicts/wsj.wp39.poslexR:audio/festlex-poslex \
+${LOCALBASE}/share/festival/lib/dicts/oald/oaldlex.scm:audio/festlex-oald
 
 WRKSRC=		${WRKDIR}/festival
 
diff --git a/audio/festvox-russian/Makefile b/audio/festvox-russian/Makefile
index 606eab51e19e..fa5a6fa1c4de 100644
--- a/audio/festvox-russian/Makefile
+++ b/audio/festvox-russian/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	festival
 MAINTAINER=	yerenkow@gmail.com
 COMMENT=	Russian male voice for Festival speech synthesis system
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+RUN_DEPENDS=	festival:audio/festival
 
 USES=		tar:bzip2
 
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
index 524664b69ec7..0dbefaed3b62 100644
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Open-source media server for the Roku SoundBridge and iTunes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vorbis/codec.h:${PORTSDIR}/audio/libvorbis \
-		${LOCALBASE}/include/FLAC/metadata.h:${PORTSDIR}/audio/flac
-RUN_DEPENDS=	oggdec:${PORTSDIR}/audio/vorbis-tools \
-		flac:${PORTSDIR}/audio/flac
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag
+BUILD_DEPENDS=	${LOCALBASE}/include/vorbis/codec.h:audio/libvorbis \
+		${LOCALBASE}/include/FLAC/metadata.h:audio/flac
+RUN_DEPENDS=	oggdec:audio/vorbis-tools \
+		flac:audio/flac
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libsqlite3.so:databases/sqlite3 \
+		libid3tag.so:audio/libid3tag
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 17d58edfaa39..4f5de8546f3e 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/flac/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Free lossless audio codec
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 USES=		iconv libtool pathfix pkgconfig tar:xz
 
@@ -28,7 +28,7 @@ TEST_TARGET=	check
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 post-install:
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index 1a273b346b08..06a30eb75464 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	SF/flac-tools/${PORTNAME}/
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Command-line player for flac audio files
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libao.so:${PORTSDIR}/audio/libao \
-		libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libao.so:audio/libao \
+		libpopt.so:devel/popt
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/audio/flacon/Makefile b/audio/flacon/Makefile
index 24173e375f7b..abb70e1ca470 100644
--- a/audio/flacon/Makefile
+++ b/audio/flacon/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Graphical audio file extractor and encoder
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libuchardet.so:${PORTSDIR}/textproc/uchardet
+LIB_DEPENDS=	libuchardet.so:textproc/uchardet
 
 USE_GITHUB=	yes
 
diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile
index f2c20d548019..57b25aa33978 100644
--- a/audio/fluidsynth-dssi/Makefile
+++ b/audio/fluidsynth-dssi/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/dssi/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wrapper for FluidSynth allowing it to function as a DSSI plugin
 
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
-		libjack.so:${PORTSDIR}/audio/jack
-BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libfluidsynth.so:audio/fluidsynth \
+		libjack.so:audio/jack
+BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:audio/dssi
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 575a70ac9f7a..7b398ed1e7eb 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -24,29 +24,29 @@ USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lpthread
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_OFF=		-Denable-jack:BOOL=FALSE
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=		-Denable-alsa:BOOL=FALSE
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_OFF=		-Denable-dbus:BOOL=FALSE
 
-LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LADSPA_CMAKE_ON=	-Denable-ladspa:BOOL=TRUE
 
-LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=	liblash.so:audio/lash
 LASH_CMAKE_OFF=		-Denable-lash:BOOL=FALSE
 
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_ON=	-Denable-portaudio:BOOL=TRUE
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-Denable-pulseaudio:BOOL=FALSE
 
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CMAKE_OFF=	-Denable-libsndfile:BOOL=FALSE
 
 post-patch:
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index c2944a78108b..f7a9633b03ca 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Free Music Instrument Tuner
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 USE_XORG=	xmu
 USE_QT4=	corelib gui opengl \
@@ -27,18 +27,18 @@ OPTIONS_DEFAULT=	JACK OSS
 
 OPTIONS_SUB=	yes
 
-ALSA_LIB_DEPENDS=	libasound.so.2:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so.2:audio/alsa-lib
 ALSA_CMAKE_ON=		-DSOUNDSYSTEM_USE_ALSA:BOOL=true
 ALSA_CMAKE_OFF=		-DSOUNDSYSTEM_USE_ALSA:BOOL=false
 
 OSS_CMAKE_ON=		-DSOUNDSYSTEM_USE_OSS:BOOL=true
 OSS_CMAKE_OFF=		-DSOUNDSYSTEM_USE_OSS:BOOL=false
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_ON=		-DSOUNDSYSTEM_USE_JACK:BOOL=true
 JACK_CMAKE_OFF=		-DSOUNDSYSTEM_USE_JACK:BOOL=false
 
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_ON=	-DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true
 PORTAUDIO_CMAKE_OFF=	-DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false
 
diff --git a/audio/fpc-a52/Makefile b/audio/fpc-a52/Makefile
index 321ac532f719..19100b61cb4b 100644
--- a/audio/fpc-a52/Makefile
+++ b/audio/fpc-a52/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBA52
 LIBA52_DESC=	Install a52 library
 OPTIONS_DEFAULT=	LIBA52
 
-LIBA52_LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52
+LIBA52_LIB_DEPENDS=	liba52.so:audio/liba52
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-mad/Makefile b/audio/fpc-mad/Makefile
index e1063450b5cc..26b7db458460 100644
--- a/audio/fpc-mad/Makefile
+++ b/audio/fpc-mad/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBMAD
 LIBMAD_DESC=	Install mad library
 OPTIONS_DEFAULT=	LIBMAD
 
-LIBMAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+LIBMAD_LIB_DEPENDS=	libmad.so:audio/libmad
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-modplug/Makefile b/audio/fpc-modplug/Makefile
index 155e04d2f6be..62b1e70feeb9 100644
--- a/audio/fpc-modplug/Makefile
+++ b/audio/fpc-modplug/Makefile
@@ -17,6 +17,6 @@ OPTIONS_DEFINE=	LIBMODPLUG
 LIBMODPLUG_DESC=	Install modplug library
 OPTIONS_DEFAULT=	LIBMODPLUG
 
-LIBMODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+LIBMODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/fpc-oggvorbis/Makefile b/audio/fpc-oggvorbis/Makefile
index a0cc2969df30..5cbd575a3faa 100644
--- a/audio/fpc-oggvorbis/Makefile
+++ b/audio/fpc-oggvorbis/Makefile
@@ -18,7 +18,7 @@ LIBOGG_DESC=	Install ogg library
 LIBVORBIS_DESC=	Install vorbis library
 OPTIONS_DEFAULT=	LIBOGG LIBVORBIS
 
-LIBOGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
-LIBVORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIBOGG_LIB_DEPENDS=	libogg.so:audio/libogg
+LIBVORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/fplib/Makefile b/audio/fplib/Makefile
index 48e35d672727..b07348f06bfa 100644
--- a/audio/fplib/Makefile
+++ b/audio/fplib/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Last.fm fingerprint library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/debian/copyright
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libmad.so:audio/libmad \
+		libsamplerate.so:audio/libsamplerate \
+		libtag.so:audio/taglib
 
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index 288e1bff91f5..913c7cc0d298 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	tmh.public@gmail.com
 COMMENT=	Graphical frontend for the Music Player Daemon
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libcurl.so:ftp/curl \
+		libxml2.so:textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 07861577ce7c..2b7b03b13d16 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	NAS DOCS
 
 .if ${PKGNAMEPREFIX} == ""
 
-NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_CONFIGURE_ENABLE=	nas
 
 .endif
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index 48975354f10b..57d55055bc22 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Graphical DSSI host with JACK MIDI support
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \
-		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		jackit>=0.109.2:${PORTSDIR}/audio/jack
+BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:audio/dssi \
+		${LOCALBASE}/include/ladspa.h:audio/ladspa \
+		jackit>=0.109.2:audio/jack
 # Between 0.109.0 and earlier versions there was an api change in JACK.
 # However, the library version number was not changed.  The line above
 # is supposed to work around that.
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libjack.so:audio/jack
 
 USE_GNOME=	gtk20
 USES=		tar:bzip2 gmake pkgconfig
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index 15c7c9ac6611..8d373e495403 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Instrument editor for gig files
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	libgig.so:${PORTSDIR}/audio/libgig \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
-RUN_DEPENDS=	${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so.3:${PORTSDIR}/audio/linuxsampler
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
+LIB_DEPENDS=	libgig.so:audio/libgig \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
+RUN_DEPENDS=	${LOCALBASE}/lib/linuxsampler/liblinuxsampler.so.3:audio/linuxsampler
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 GNU_CONFIGURE=	yes
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index d8860989585d..dfcbfe36ef73 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Gimmix is a graphical MPD client written in C using GTK+2
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libnxml.so:${PORTSDIR}/textproc/libnxml
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libtag.so:audio/taglib \
+		libnxml.so:textproc/libnxml
 
 USES=		tar:bzip2 desktop-file-utils gmake pkgconfig
 USE_GNOME=	gtk20 intltool libglade2
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 297b9471f80b..35ce4b5ab5f4 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -11,9 +11,9 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	GKrellM XMMS Plugin
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 WRKSRC=		${WRKDIR}/gkrellmms
 
diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile
index 35a998f111c1..e294c33ebb44 100644
--- a/audio/gkrellmss2/Makefile
+++ b/audio/gkrellmss2/Makefile
@@ -12,9 +12,9 @@ COMMENT=	GKrellM plugin with a VU meter showing left/right channel audio
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+LIB_DEPENDS=	libfftw3.so:math/fftw3
+RUN_DEPENDS=	gkrellm:sysutils/gkrellm2
 
 USES=		gettext gmake
 USE_XORG=	x11
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile
index dec555eb04cd..8b167228d4ed 100644
--- a/audio/gkrellmvolume2/Makefile
+++ b/audio/gkrellmvolume2/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	gkrellm-volume-${PORTVERSION}
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	GKrellM volume plugin
 
-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
 
 WRKSRC=		${WRKDIR}/gkrellm-volume
 
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 31feac2c6843..cf509ee016e1 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful, fast, stable, and easily extensible sound editor for GNOME
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libguile.so:${PORTSDIR}/lang/guile
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libmad.so:audio/libmad \
+		libvorbis.so:audio/libvorbis \
+		libltdl.so:devel/libltdl \
+		libguile.so:lang/guile
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 6f25bfa1a34f..841eb3f16c52 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@mark.reidel.info
 COMMENT=	Nice and clean GTK+-2.x based graphical client for musicpd
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:audio/libmpd
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/gmidimonitor/Makefile b/audio/gmidimonitor/Makefile
index 139782d9c0ff..e12a99587a6a 100644
--- a/audio/gmidimonitor/Makefile
+++ b/audio/gmidimonitor/Makefile
@@ -13,8 +13,8 @@ COMMENT=	GTK+ application that shows MIDI events
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		liblash.so:${PORTSDIR}/audio/lash
+LIB_DEPENDS=	libjack.so:audio/jack \
+		liblash.so:audio/lash
 
 USES=		pkgconfig tar:bzip2 waf
 USE_GNOME=	gtk20 libglade2
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index 75a315f8d036..22fc4a778aba 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Alarm plugin for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index fac188a5a8a1..5f32c7f1e4ea 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Draws all album covers
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 intltool
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 040d86276f6f..9a19fc472a51 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Album Image fetcher for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index fdce6f031165..ec723e8d2cfa 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Favorites plugin for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USES=		libtool pkgconfig
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index e587d6dbf50a..56a72cd840ae 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Last.FM metadata fetcher plugin for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 496059c4d029..6106ccec349f 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Libnotify for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libnotify.so:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libnotify.so:devel/libnotify
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 intltool
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index 1d6889036110..a5cc18f5df70 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Lyrics Provider plugin for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool glib20 gtk20 libxml2
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index b35cd978b813..7e5c754ed8b6 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Fetch lyrics gmpc plugin
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool glib20 gtk20 libxml2
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index 03911c417f80..95a515bfe196 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Lyricswiki Provider plugin for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index 61896e767dc0..7c21274bf84b 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Magnatune plugin lets you preview music from Magnatune
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libsqlite3.so:databases/sqlite3
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool glib20 gtk20 libglade2
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index 73fe0a4af6da..0da61e372fcb 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Collects metadata for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 2141fee45b5e..b31eb8cf4c89 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Lets you stream music files to your mpd that are not in your database
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libtag.so:audio/taglib \
+		libmicrohttpd.so:www/libmicrohttpd
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 0c69d26b053c..6fcafc79c80d 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Shoutcast stream for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libcairo.so:${PORTSDIR}/graphics/cairo
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc \
-		ogg123:${PORTSDIR}/audio/vorbis-tools
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libcairo.so:graphics/cairo
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc \
+		ogg123:audio/vorbis-tools
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 043de2d81fdb..de4246320fd7 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Wikipedia info for gmpc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
-RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libsoup-2.4.so:devel/libsoup \
+		libwebkitgtk-1.0.so:www/webkit-gtk2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:audio/gmpc
+RUN_DEPENDS=	gmpc:audio/gmpc
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	intltool glib20 gtk20
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index ba97e2cfe58d..4a3c4a8cc94d 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -12,13 +12,13 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full featured GTK2 client for musicpd
 
-BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2 \
-		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
-		libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+BUILD_DEPENDS=	gob2:devel/gob2 \
+		valac:lang/vala
+LIB_DEPENDS=	libmpd.so:audio/libmpd \
+		libsexy.so:x11-toolkits/libsexy \
+		libsqlite3.so:databases/sqlite3 \
+		libsoup-2.4.so:devel/libsoup \
+		libunique-1.0.so:x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake libtool pathfix pkgconfig
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT=	MMKEYS
 
 MMKEYS_CONFIGURE_ON=--disable-mmkeys
 
-XSPF_LIB_DEPENDS=	libxspf.so:${PORTSDIR}/multimedia/libxspf
+XSPF_LIB_DEPENDS=	libxspf.so:multimedia/libxspf
 XSPF_CONFIGURE_ENABLE=	libxspf
 
 .include <bsd.port.mk>
diff --git a/audio/gmtp/Makefile b/audio/gmtp/Makefile
index 0c6bdad012ef..ab4ecf42ad7e 100644
--- a/audio/gmtp/Makefile
+++ b/audio/gmtp/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Media Transfer Protocol (MTP) GUI client
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libmtp.so:multimedia/libmtp \
+		libid3tag.so:audio/libid3tag \
+		libFLAC.so:audio/flac \
+		libvorbis.so:audio/libvorbis
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/gmusicbrowser/Makefile b/audio/gmusicbrowser/Makefile
index c00b80fd1644..938776a5f196 100644
--- a/audio/gmusicbrowser/Makefile
+++ b/audio/gmusicbrowser/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Jukebox for large collections of mp3/ogg/flac/mpc files
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	p5-Gtk2>=1.0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS=	p5-Gtk2>=1.0:x11-toolkits/p5-Gtk2
 
 NO_BUILD=	yes
 
@@ -27,11 +27,11 @@ OPTIONS_DEFAULT=LIBNOTIFY
 LIBNOTIFY_DESC=	Desktop notification
 WEBKIT_DESC=	Enable embedded web browser
 
-GSTREAMER_RUN_DEPENDS=	p5-GStreamer>=0:${PORTSDIR}/multimedia/p5-GStreamer
-DBUS_RUN_DEPENDS=	p5-Net-DBus>=1.0:${PORTSDIR}/devel/p5-Net-DBus
-WEBKIT_RUN_DEPENDS=	p5-Gtk2-WebKit>=0:${PORTSDIR}/www/p5-Gtk2-WebKit
-LIBNOTIFY_RUN_DEPENDS=	p5-Gtk2-Notify>=0.05:${PORTSDIR}/devel/p5-Gtk2-Notify
-NLS_RUN_DEPENDS=	p5-Locale-gettext>=1.0:${PORTSDIR}/devel/p5-Locale-gettext
+GSTREAMER_RUN_DEPENDS=	p5-GStreamer>=0:multimedia/p5-GStreamer
+DBUS_RUN_DEPENDS=	p5-Net-DBus>=1.0:devel/p5-Net-DBus
+WEBKIT_RUN_DEPENDS=	p5-Gtk2-WebKit>=0:www/p5-Gtk2-WebKit
+LIBNOTIFY_RUN_DEPENDS=	p5-Gtk2-Notify>=0.05:devel/p5-Gtk2-Notify
+NLS_RUN_DEPENDS=	p5-Locale-gettext>=1.0:devel/p5-Locale-gettext
 OPTIONS_SUB=	yes
 
 do-install:
diff --git a/audio/gnaural/Makefile b/audio/gnaural/Makefile
index 126c023c9659..5bcd9db0c6f6 100644
--- a/audio/gnaural/Makefile
+++ b/audio/gnaural/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Binaural beat generator
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libportaudio.so:audio/portaudio \
+		libsndfile.so:audio/libsndfile
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig desktop-file-utils
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 619cc51b0243..9a70e0dd8599 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -12,9 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 
-BUILD_DEPENDS=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+BUILD_DEPENDS=	xml2po:textproc/gnome-doc-utils
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libunique-1.0.so:x11-toolkits/unique
 
 CONFLICTS=	gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]*
 
@@ -36,7 +36,7 @@ OPTIONS_DEFINE=	PULSEAUDIO
 OPTIONS_DEFAULT=PULSEAUDIO
 OPTIONS_SUB=	yes
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=pulseaudio
 
 post-patch:
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index cda44ba9907a..3286df8c5c4a 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -10,9 +10,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME music playing application
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libgrilo-0.2.so:${PORTSDIR}/net/grilo \
-		libmediaart-2.0.so:${PORTSDIR}/multimedia/libmediaart
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libgrilo-0.2.so:net/grilo \
+		libmediaart-2.0.so:multimedia/libmediaart
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 26f35d000513..9cd7eceb9bee 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program for finding and playing free music from the Internet
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+		libao.so:audio/libao
 
 USES=		pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index 59d8607103df..c60f3fb94339 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	Alternative for replaygain
 
-RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		wavegain:${PORTSDIR}/audio/wavegain
+RUN_DEPENDS+=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+		wavegain:audio/wavegain
 
 USES=		perl5 shebangfix
 USE_PERL5=	run
@@ -27,23 +27,23 @@ OPTIONS_DEFAULT=	MP3 OGG MP4
 MAC_DESC=	Monkey's Audio Encoding and Playback
 CDPLAY_DESC=	CD Playback
 
-MP3_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-			p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
-OGG_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-MP4_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac \
-			faad:${PORTSDIR}/audio/faad
-CDDB_RUN_DEPENDS=	cddb.pl:${PORTSDIR}/audio/p5-CDDB_get
-CDPLAY_RUN_DEPENDS=	p5-Audio-CD>=0:${PORTSDIR}/audio/p5-Audio-CD
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-MAC_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
-MUSEPACK_RUN_DEPENDS=	mppenc:${PORTSDIR}/audio/musepack
+MP3_RUN_DEPENDS=	lame:audio/lame \
+			p5-MP3-Info>=0:audio/p5-MP3-Info
+OGG_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+MP4_RUN_DEPENDS=	faac:audio/faac \
+			faad:audio/faad
+CDDB_RUN_DEPENDS=	cddb.pl:audio/p5-CDDB_get
+CDPLAY_RUN_DEPENDS=	p5-Audio-CD>=0:audio/p5-Audio-CD
+FLAC_RUN_DEPENDS=	flac:audio/flac
+MAC_RUN_DEPENDS=	mac:audio/mac
+MUSEPACK_RUN_DEPENDS=	mppenc:audio/musepack
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCDPARANOIA} || ${PORT_OPTIONS:MCDDA2WAV}
-RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS+=	cdda2wav:sysutils/cdrtools
 .else
-RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
+RUN_DEPENDS+=	cdparanoia:audio/cdparanoia
 .endif
 
 post-patch:
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index cb4f7619304c..269e6aa456f7 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Set of Perl scripts for using an Apple iPod
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
-		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
+BUILD_DEPENDS=	p5-MP3-Info>=0:audio/p5-MP3-Info \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-TimeDate>=0:devel/p5-TimeDate \
+		p5-Unicode-String>=0:converters/p5-Unicode-String \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 INFO=		gnupod
@@ -34,12 +34,12 @@ CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 
 OPTIONS_DEFINE=	FLAC VORBIS DOCS
 
-FLAC_BUILD_DEPENDS=	p5-Audio-FLAC-Header>=0:${PORTSDIR}/audio/p5-Audio-FLAC-Header
-FLAC_RUN_DEPENDS=	p5-Audio-FLAC-Header>=0:${PORTSDIR}/audio/p5-Audio-FLAC-Header
-VORBIS_BUILD_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
-			oggdec:${PORTSDIR}/audio/vorbis-tools
-VORBIS_RUN_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
-			oggdec:${PORTSDIR}/audio/vorbis-tools
+FLAC_BUILD_DEPENDS=	p5-Audio-FLAC-Header>=0:audio/p5-Audio-FLAC-Header
+FLAC_RUN_DEPENDS=	p5-Audio-FLAC-Header>=0:audio/p5-Audio-FLAC-Header
+VORBIS_BUILD_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:audio/p5-Ogg-Vorbis-Header-PurePerl \
+			oggdec:audio/vorbis-tools
+VORBIS_RUN_DEPENDS=	p5-Ogg-Vorbis-Header-PurePerl>=0:audio/p5-Ogg-Vorbis-Header-PurePerl \
+			oggdec:audio/vorbis-tools
 
 post-install:
 	# It tries to guess where it should install it's Perl modules, gets it
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 40fe066da925..ac9434fa2aa5 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -13,11 +13,11 @@ COMMENT=	GNUstep CD player with CDDB support
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio \
-		libPrefsModule.so:${PORTSDIR}/deskutils/preferences
+LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio \
+		libPrefsModule.so:deskutils/preferences
 
-BUILD_DEPENDS=	cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle
-RUN_DEPENDS=	cddb-bundle>0:${PORTSDIR}/audio/cddb-bundle
+BUILD_DEPENDS=	cddb-bundle>0:audio/cddb-bundle
+RUN_DEPENDS=	cddb-bundle>0:audio/cddb-bundle
 
 USES=		tar:bzip2 gnustep
 USE_GNUSTEP=	back build
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 7aa63b768b6f..ea46ca2a7af3 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Music collection manager and player
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libFOX-1.7.so:${PORTSDIR}/x11-toolkits/fox17
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libexpat.so:textproc/expat2 \
+		libFOX-1.7.so:x11-toolkits/fox17
 
 USE_GITHUB=	yes
 
@@ -41,52 +41,52 @@ OPTIONS_DEFAULT=	CDIO DBUS FAAD FLAC MAD OGG OPUS SAMPLERATE SMB \
 			VORBIS WAVPACK
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--without-alsa
-CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 CDIO_CONFIGURE_OFF=	--without-cdda
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_OFF=	--without-dbus
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CONFIGURE_ON=	--faad-prefix=${LOCALBASE}
 FAAD_CONFIGURE_OFF=	--without-faad
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-avcodec
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_OFF=	--without-flac
 GCRYPT_DESC=		Use libgcrypt for md5 calculation
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 GCRYPT_CONFIGURE_ON=	--with-md5=gcrypt
 GCRYPT_CONFIGURE_OFF=	--with-md5=internal
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--without-jack
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_ON=	--mad-prefix=${LOCALBASE}
 MAD_CONFIGURE_OFF=	--without-mad
-MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=	libmms.so:net/libmms
 MMS_CONFIGURE_OFF=	--without-mms
 NLS_USES=		gettext
 NLS_LIBS=		-lintl
 NLS_CONFIGURE_OFF=	--without-nls
-OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_LIB_DEPENDS=	libogg.so:audio/libogg
 OGG_CONFIGURE_OFF=	--without-ogg
-OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_CONFIGURE_OFF=	--without-opus
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--without-pulse
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_OFF=	--without-samplerate
-SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_ON=	--smb-prefix=${LOCALBASE}
 SMB_CONFIGURE_OFF=	--without-smb
-TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_CONFIGURE_ON=	--with-tremor
 TREMOR_IMPLIES=		OGG
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_OFF=	--without-vorbis
 VORBIS_IMPLIES=		OGG
 VORBISDEC_DESC=		Vorbis decoder library
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--without-wavpack
 
 post-patch:
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 559d2b7086f6..27d828e37d59 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -10,12 +10,12 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD player and ripper for GNOME Desktop environment
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid \
-		libcoverart.so.0:${PORTSDIR}/audio/libcoverart \
-		libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \
-		libbrasero-media3.so:${PORTSDIR}/sysutils/brasero \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libdiscid.so:audio/libdiscid \
+		libcoverart.so.0:audio/libcoverart \
+		libmusicbrainz5.so:audio/libmusicbrainz5 \
+		libbrasero-media3.so:sysutils/brasero \
+		libunique-1.0.so:x11-toolkits/unique
 
 USES=		desktop-file-utils gettext gmake gnome pkgconfig tar:xz
 USE_GNOME=	glib20 gtk30 intlhack
@@ -32,7 +32,7 @@ GLIB_SCHEMAS=	org.gnome.Goobox.gschema.xml
 OPTIONS_DEFINE=	NOTIFY
 OPTIONS_DEFAULT=NOTIFY
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=notification
 
 .include <bsd.port.mk>
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 3ff4bbda440b..505ceb27b49a 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -14,12 +14,12 @@ COMMENT?=	Another gtk-based MP3 frontend
 OPTIONS_DEFINE=	MPG321
 MPG321_DESC=	use mpg321 instead of mpg123
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools \
-		xmp:${PORTSDIR}/audio/xmp
+LIB_DEPENDS=	libpng.so:graphics/png
+RUN_DEPENDS=	ogg123:audio/vorbis-tools \
+		xmp:audio/xmp
 
-MPG321_RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
-MPG321_RUN_DEPENDS_OFF=	mpg123:${PORTSDIR}/audio/mpg123
+MPG321_RUN_DEPENDS=	mpg321:audio/mpg321
+MPG321_RUN_DEPENDS_OFF=	mpg123:audio/mpg123
 
 USE_GNOME=	gdkpixbuf
 USES=		gettext libtool
diff --git a/audio/gqradio/Makefile b/audio/gqradio/Makefile
index d4e8f4d7c733..aef83ed66968 100644
--- a/audio/gqradio/Makefile
+++ b/audio/gqradio/Makefile
@@ -22,7 +22,7 @@ LIBS+=		-L${LOCALBASE}/lib -lm -lX11
 
 OPTIONS_DEFINE=		DOCS V4L
 
-V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_BUILD_DEPENDS=	v4l_compat>0:multimedia/v4l_compat
 V4L_CONFIGURE_ENV_OFF=	ac_cv_header_linux_videodev_h=no
 
 post-patch:
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 665a26347002..3763df2b6c64 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -14,7 +14,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Audio recording and tick/scratch reduction for e.g. vinyl records
 
-LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
+LIB_DEPENDS=	libfftw.so:math/fftw
 
 ALL_TARGET=	gramofile
 USES=		gmake perl5
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 24bdba034846..1a51e15ebaf5 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	SF
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GTK front-end to external cd rippers and audio encoders
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libid3.so:audio/id3lib \
+		libcurl.so:ftp/curl
 
 USE_XORG=	x11
 USES=		gmake libtool pathfix pkgconfig
@@ -30,13 +30,13 @@ OPTIONS_DEFAULT+=	LAME
 
 OPTIONS_SUB=	yes
 
-CDPARANOIA_LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
+CDPARANOIA_LIB_DEPENDS=	libcdda_paranoia.so:audio/cdparanoia
 CDPARANOIA_CONFIGURE_ENABLE=	cdpar
-CDDA2WAV_RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-VORBIS_RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
+CDDA2WAV_RUN_DEPENDS=	cdda2wav:sysutils/cdrtools
+FAAC_RUN_DEPENDS=	faac:audio/faac
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
diff --git a/audio/gsound/Makefile b/audio/gsound/Makefile
index a19267592f21..33d2dcbfdf44 100644
--- a/audio/gsound/Makefile
+++ b/audio/gsound/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject library for playing system sounds
 
-BUILD_DEPENDS=	vala:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra
+BUILD_DEPENDS=	vala:lang/vala
+LIB_DEPENDS=	libcanberra.so:audio/libcanberra
 
 USES=		gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 introspection:build
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index ea0a496547db..79a12642c3ff 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnome-based loudspeaker design program
 
-LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		autoreconf gmake pkgconfig
 USE_GNOME=	gnomeprefix libxml2
@@ -24,8 +24,8 @@ CFLAGS+=	-O0
 OPTIONS_DEFINE=	SPICE
 SPICE_DESC=	Use spice instead of gnucap
 
-SPICE_RUN_DEPENDS=	spice3:${PORTSDIR}/cad/spice
-SPICE_RUN_DEPENDS_OFF=	gnucap:${PORTSDIR}/cad/gnucap
+SPICE_RUN_DEPENDS=	spice3:cad/spice
+SPICE_RUN_DEPENDS_OFF=	gnucap:cad/gnucap
 
 post-extract:
 	@${FIND} ${WRKSRC} -type l -delete
diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile
index d7ce7f716b4d..95fffaf37488 100644
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	moodbar-0.1.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shows the "moods" of audio tracks in Amarok
 
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+		libfftw3.so:math/fftw3
 
 CFLAGS:=	${CFLAGS} -O2
 USE_GSTREAMER=	yes good
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index c1a105d54c7f..fbe1a07e75a9 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Metronome application
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libpulse-simple.so:audio/pulseaudio
 
 USES=		pkgconfig desktop-file-utils
 GNU_CONFIGURE=	yes
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 2c4fb1465908..97792b6b68cf 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GUI for Apple iPod using GTK2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libgpod.so:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS=	libid3tag.so:audio/libid3tag \
+		libgpod.so:audio/libgpod
 
 USES=		gettext gmake pkgconfig shebangfix
 SHEBANG_FILES=	scripts/mab2vcard scripts/sync-evolution.sh \
@@ -33,13 +33,13 @@ OPTIONS_DEFAULT=	VORBIS FLAC CURL
 
 CURL_DESC=	Cover art download support via libcurl
 
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_OFF=	--without-ogg
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_OFF=	--without-flac
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--without-curl
 
 post-patch:
diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index 6993b2ddaa64..646a77bb5dd4 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK2 based XMMS2 client, written in C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS=	libxmmsclient.so:audio/xmms2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index 15afcbadda73..997f870fff30 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -26,34 +26,34 @@ OPTIONS_SUB=	yes
 
 PORTDOCS=	README
 
-AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_CMAKE_ON=		-DWITH_AAC:BOOL=ON
 AAC_CMAKE_OFF=		-DWITH_AAC:BOOL=OFF
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_ON=		-DWITH_FLAC:BOOL=ON
 FLAC_CMAKE_OFF=		-DWITH_FLAC:BOOL=OFF
 
-MP3_LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MP3_LIB_DEPENDS+=	libmpg123.so:audio/mpg123
 MP3_CMAKE_ON=		-DWITH_MP3:BOOL=ON
 MP3_CMAKE_OFF=		-DWITH_MP3:BOOL=OFF
 
 SHOUTCAST_CMAKE_ON=	-DWITH_STREAM:BOOL=ON
 SHOUTCAST_CMAKE_OFF=	-DWITH_STREAM:BOOL=OFF
 
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DWITH_VORBIS:BOOL=ON
 VORBIS_CMAKE_OFF=	-DWITH_VORBIS:BOOL=OFF
 
 OSS_CMAKE_ON=		-DWITH_OSS:BOOL=ON
 OSS_CMAKE_OFF=		-DWITH_OSS:BOOL=OFF
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-JACK_LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 JACK_CMAKE_ON=		-DWITH_JACK:BOOL=ON
 JACK_CMAKE_OFF=		-DWITH_JACK:BOOL=OFF
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE:BOOL=OFF
 
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 45e04e1888ca..607078ab6f1a 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -26,23 +26,23 @@ HTTP_DESC=	HTTP streams and AudioScrobbler support
 LIBAO_DESC=	LibAO support (breaks chroot)
 XCURSES_DESC=	Build XCurses version
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-			libid3tag.so:${PORTSDIR}/audio/libid3tag
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
+			libid3tag.so:audio/libid3tag
 MAD_CONFIGURE_OFF=no_mp3
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_OFF=no_vorbis
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_OFF=no_sndfile
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CFLAGS=		-I${LOCALBASE}/include/libmodplug
 MODPLUG_CONFIGURE_OFF=no_modplug
-HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+HTTP_LIB_DEPENDS=	libcurl.so:ftp/curl
 HTTP_CONFIGURE_OFF=no_http no_scrobbler
-LIBAO_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIBAO_LIB_DEPENDS=	libao.so:audio/libao
 LIBAO_CONFIGURE_ON=ao
-XCURSES_LIB_DEPENDS=	libXCurses.so:${PORTSDIR}/devel/pdcurses
+XCURSES_LIB_DEPENDS=	libXCurses.so:devel/pdcurses
 XCURSES_CONFIGURE_ON=xcurses
-XSPF_LIB_DEPENDS=	libxspf.so:${PORTSDIR}/multimedia/libxspf
+XSPF_LIB_DEPENDS=	libxspf.so:multimedia/libxspf
 XSPF_CONFIGURE_OFF=no_xspf
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=no_nls
diff --git a/audio/hexter/Makefile b/audio/hexter/Makefile
index e30660285c12..275d6d421232 100644
--- a/audio/hexter/Makefile
+++ b/audio/hexter/Makefile
@@ -12,10 +12,10 @@ COMMENT=	DSSI softsynth that models the sound generation of a Yamaha DX7
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libjack.so:${PORTSDIR}/audio/jack
-BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libjack.so:audio/jack
+BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:audio/dssi
 
 USES=		gmake libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/hydrogen-devel/Makefile b/audio/hydrogen-devel/Makefile
index 53a64bfa77c5..10b4f265d348 100644
--- a/audio/hydrogen-devel/Makefile
+++ b/audio/hydrogen-devel/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Advanced drum machine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 CONFLICTS=	hydrogen-0.*
 
@@ -33,25 +33,25 @@ EXPORT_DESC=		Export support for drumkit
 
 ALSA_CMAKE_ON=		-DWANT_ALSA:BOOL=ON
 ALSA_CMAKE_OFF=		-DWANT_ALSA:BOOL=OFF
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	alsa-plugins>=0:audio/alsa-plugins
 
 DEBUG_CMAKE_ON=		-DWANT_DEBUG:BOOL=ON
 DEBUG_CMAKE_OFF=	-DWANT_DEBUG:BOOL=OFF
 
 JACK_CMAKE_ON=		-DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
 JACK_CMAKE_OFF=		-DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 LADSPA_CMAKE_ON=	-DWANT_LADSPA:BOOL=ON \
 			-DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
 LADSPA_CMAKE_OFF=	-DWANT_LADSPA:BOOL=OFF
-LADSPA_BUILD_DEPENDS=	ladspa>=0:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS=	ladspa>=0:audio/ladspa
+LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 
 LASH_CMAKE_ON=		-DWANT_LASH:BOOL=ON
 LASH_CMAKE_OFF=		-DWANT_LASH:BOOL=OFF
-LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=	liblash.so:audio/lash
 
 LIBARCHIVE_DESC=	LibArchive support
 LIBARCHIVE_CMAKE_ON=	-DWANT_LIBARCHIVE:BOOL=ON
@@ -62,24 +62,24 @@ LIBTAR_DESC=		Libtar support
 LIBTAR_CMAKE_ON=	-DWANT_LIBTAR:BOOL=ON \
 			-DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/
 LIBTAR_CMAKE_OFF=	-DWANT_LIBTAR:BOOL=OFF
-LIBTAR_LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar
+LIBTAR_LIB_DEPENDS=	libtar.so:devel/libtar
 
 OSS_CMAKE_ON=		-DWANT_OSS:BOOL=ON
 OSS_CMAKE_OFF=		-DWANT_OSS:BOOL=OFF
 
 PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 RDF_DESC=		RDF File support
 RDF_CMAKE_ON=		-DWANT_LRDF:BOOL=ON \
 			-DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2
 RDF_CMAKE_OFF=		-DWANT_LRDF:BOOL=OFF
-RDF_LIB_DEPENDS=	liblrdf.so:${PORTSDIR}/textproc/liblrdf
+RDF_LIB_DEPENDS=	liblrdf.so:textproc/liblrdf
 
 # using librubberband is experimental and current versions have bad timing
 # installing the rubberband cli tool still works as before
@@ -87,11 +87,11 @@ RUBBERBAND_DESC=	librubberband for time stretching
 RUBBERBAND_CMAKE_ON=	-DWANT_RUBBERBAND:BOOL=ON \
 			-DRUBBERBAND_INCLUDE_DIR:STRING=${LOCALBASE}/include/rubberband
 RUBBERBAND_CMAKE_OFF=	-DWANT_RUBBERBAND:BOOL=OFF
-RUBBERBAND_LIB_DEPENDS=	librubberband.so:${PORTSDIR}/audio/rubberband
+RUBBERBAND_LIB_DEPENDS=	librubberband.so:audio/rubberband
 
 TEST_CMAKE_ON=		-DWANT_CPPUNIT:BOOL=ON
 TEST_CMAKE_OFF=		-DWANT_CPPUNIT:BOOL=OFF
-TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit
+TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit
 
 post-patch:
 	@${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index eb43ef4b196a..859830a33f1a 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Advanced drum machine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 CONFLICTS=	hydrogen-devel-0.*
 
@@ -32,25 +32,25 @@ EXPORT_DESC=		Export support for drumkit
 
 ALSA_CMAKE_ON=		-DWANT_ALSA:BOOL=ON
 ALSA_CMAKE_OFF=		-DWANT_ALSA:BOOL=OFF
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	alsa-plugins>=0:audio/alsa-plugins
 
 DEBUG_CMAKE_ON=		-DWANT_DEBUG:BOOL=ON
 DEBUG_CMAKE_OFF=	-DWANT_DEBUG:BOOL=OFF
 
 JACK_CMAKE_ON=		-DWANT_JACK:BOOL=ON -DWANT_JACKSESSION:BOOL=ON
 JACK_CMAKE_OFF=		-DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 LADSPA_CMAKE_ON=	-DWANT_LADSPA:BOOL=ON \
 			-DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
 LADSPA_CMAKE_OFF=	-DWANT_LADSPA:BOOL=OFF
-LADSPA_BUILD_DEPENDS=	ladspa>=0:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS=	ladspa>=0:audio/ladspa
+LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
 
 LASH_CMAKE_ON=		-DWANT_LASH:BOOL=ON
 LASH_CMAKE_OFF=		-DWANT_LASH:BOOL=OFF
-LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=	liblash.so:audio/lash
 
 LIBARCHIVE_DESC=	LibArchive support
 LIBARCHIVE_CMAKE_ON=	-DWANT_LIBARCHIVE:BOOL=ON
@@ -61,28 +61,28 @@ LIBTAR_DESC=		Libtar support
 LIBTAR_CMAKE_ON=	-DWANT_LIBTAR:BOOL=ON \
 			-DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/
 LIBTAR_CMAKE_OFF=	-DWANT_LIBTAR:BOOL=OFF
-LIBTAR_LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar
+LIBTAR_LIB_DEPENDS=	libtar.so:devel/libtar
 
 OSS_CMAKE_ON=		-DWANT_OSS:BOOL=ON
 OSS_CMAKE_OFF=		-DWANT_OSS:BOOL=OFF
 
 PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 PULSEAUDIO_CMAKE_ON=	-DWANT_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 RDF_DESC=		RDF File support
 RDF_CMAKE_ON=		-DWANT_LRDF:BOOL=ON \
 			-DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2
 RDF_CMAKE_OFF=		-DWANT_LRDF:BOOL=OFF
-RDF_LIB_DEPENDS=	liblrdf.so:${PORTSDIR}/textproc/liblrdf
+RDF_LIB_DEPENDS=	liblrdf.so:textproc/liblrdf
 
 TEST_CMAKE_ON=		-DWANT_CPPUNIT:BOOL=ON
 TEST_CMAKE_OFF=		-DWANT_CPPUNIT:BOOL=OFF
-TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:${PORTSDIR}/devel/cppunit
+TEST_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit
 
 post-patch:
 	@${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \
diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile
index 02f7e5bb1a2d..9597bf2d522f 100644
--- a/audio/icecast-kh/Makefile
+++ b/audio/icecast-kh/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Streaming mp3/ogg-vorbis audio server, KH branch
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libtheora.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis \
+		libxml2.so:textproc/libxml2 \
+		libxslt.so:textproc/libxslt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	karlheyes
@@ -46,20 +46,20 @@ CONFLICTS_INSTALL=	icecast-[0-9]* icecast2-[0-9]*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCURL}
-BUILD_DEPENDS+=	curl>=7.10:${PORTSDIR}/ftp/curl
+BUILD_DEPENDS+=	curl>=7.10:ftp/curl
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
 .if ${PORT_OPTIONS:MKATE}
-LIB_DEPENDS+=	libkate.so:${PORTSDIR}/multimedia/libkate
+LIB_DEPENDS+=	libkate.so:multimedia/libkate
 .else
 CONFIGURE_ARGS+=	--without-kate
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-BUILD_DEPENDS+=	speex>=1:${PORTSDIR}/audio/speex
+BUILD_DEPENDS+=	speex>=1:audio/speex
 CONFIGURE_ARGS+=	--with-speex=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-speex
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index cb3f48b90058..16a1fad2a96a 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -20,12 +20,12 @@ COMMENT=	Streaming mp3/ogg-vorbis audio server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libshout.so:${PORTSDIR}/audio/libshout \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libxslt.so:${PORTSDIR}/textproc/libxslt
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libshout.so:audio/libshout \
+		libspeex.so:audio/speex \
+		libtheora.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis \
+		libxslt.so:textproc/libxslt
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile
index 686a7c9bfed7..95a07d7aab1e 100644
--- a/audio/icegenerator/Makefile
+++ b/audio/icegenerator/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/0.5.5-pre2
 MAINTAINER=		funkblaster@mail.ru
 COMMENT=		Direct streaming generator for Icecast/Shoutcast
 
-LIB_DEPENDS=		libshout.so:${PORTSDIR}/audio/libshout
+LIB_DEPENDS=		libshout.so:audio/libshout
 
 GNU_CONFIGURE=		yes
 USES=			gmake pkgconfig
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index c78e518328f6..2ec436ee3dcf 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Vorbis streaming source client for icecast 2
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libshout.so:${PORTSDIR}/audio/libshout \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libshout.so:audio/libshout \
+		libspeex.so:audio/speex \
+		libtheora.so:multimedia/libtheora \
+		libvorbis.so:audio/libvorbis
 
 OPTIONS_DEFINE=	ALSA
 
@@ -31,7 +31,7 @@ USES=		gmake iconv pkgconfig tar:bzip2
 PLIST_FILES=	bin/ices
 PORTDATA=	*
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 .include <bsd.port.mk>
diff --git a/audio/id3el/Makefile b/audio/id3el/Makefile
index e11c7a793ae5..fa3a78b38d29 100644
--- a/audio/id3el/Makefile
+++ b/audio/id3el/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	id3el-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Add-on to edit ID3 tags for mpg123-mode (mpg123.el) on Emacsen
 
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/site-lisp/mpg123.el:${PORTSDIR}/audio/mpg123.el
+RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/site-lisp/mpg123.el:audio/mpg123.el
 
 ALL_TARGET=	id3put
 
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index dd470517de41..70551d0086bd 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command line id3v2 tag editor
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS=	libid3.so:audio/id3lib
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/audio/idjc/Makefile b/audio/idjc/Makefile
index 053e4f3a1cec..19b7e9bca9c6 100644
--- a/audio/idjc/Makefile
+++ b/audio/idjc/Makefile
@@ -11,20 +11,20 @@ COMMENT=	Shoutcast/Icecast DJ Console
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libtwolame.so:${PORTSDIR}/audio/twolame \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libmpg123.so:${PORTSDIR}/audio/mpg123 \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libmp3lame.so:${PORTSDIR}/audio/lame \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libshout-idjc.so:${PORTSDIR}/audio/shout-idjc
-RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools \
-		${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libavutil.so:multimedia/ffmpeg \
+		libjack.so:audio/jack \
+		libtwolame.so:audio/twolame \
+		libspeex.so:audio/speex \
+		libsndfile.so:audio/libsndfile \
+		libmpg123.so:audio/mpg123 \
+		libFLAC.so:audio/flac \
+		libmp3lame.so:audio/lame \
+		libvorbis.so:audio/libvorbis \
+		libshout-idjc.so:audio/shout-idjc
+RUN_DEPENDS=	oggenc:audio/vorbis-tools \
+		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus
 
 OPTIONS_SUB=	YES
 OPTIONS_DEFINE=	DOCS NLS
diff --git a/audio/jack-keyboard/Makefile b/audio/jack-keyboard/Makefile
index 5db474ad5279..0734277af9ad 100644
--- a/audio/jack-keyboard/Makefile
+++ b/audio/jack-keyboard/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Virtual keyboard for JACK MIDI
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:audio/jack
 
 USE_GNOME=	gtk20
 USES=		cmake
@@ -22,7 +22,7 @@ INSTALLS_ICONS=	yes
 OPTIONS_DEFINE=        LASH
 OPTIONS_DEFAULT=       LASH
 
-LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=	liblash.so:audio/lash
 LASH_CMAKE_ON=	-DLashEnable:BOOL=On
 LASH_CMAKE_OFF=	-DLashEnable:BOOL=Off
 
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 1bd019625f47..a5209b7e5876 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	LADSPA effects rack for the JACK audio server
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		liblrdf.so:${PORTSDIR}/textproc/liblrdf
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libjack.so:audio/jack \
+		liblrdf.so:textproc/liblrdf
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 USE_GNOME=	libgnomeui libxml2
 USES=		gettext shebangfix pkgconfig python tar:bzip2
diff --git a/audio/jack-smf-utils/Makefile b/audio/jack-smf-utils/Makefile
index 0cabe9822caf..787b5ab00dd1 100644
--- a/audio/jack-smf-utils/Makefile
+++ b/audio/jack-smf-utils/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Standard MIDI File file player and recorder for JACK MIDI
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		liblash.so:${PORTSDIR}/audio/lash
+LIB_DEPENDS=	libjack.so:audio/jack \
+		liblash.so:audio/lash
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 04bbc5947d4e..7b30b2770dee 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Low latency audio server
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libcelt0.so:${PORTSDIR}/audio/celt \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libsamplerate.so:audio/libsamplerate \
+		libcelt0.so:audio/celt \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -36,12 +36,12 @@ OPTIONS_DEFINE=	ALSA DOXYGEN READLINE
 OPTIONS_DEFAULT=READLINE
 OPTIONS_SUB=	yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
 READLINE_USES=		readline
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN="false"
 
 READLINE_CONFIGURE_ENV_OFF=	ac_cv_lib_readline_readline=no \
diff --git a/audio/jack_ghero/Makefile b/audio/jack_ghero/Makefile
index 95b7a2d78a3b..56d477821482 100644
--- a/audio/jack_ghero/Makefile
+++ b/audio/jack_ghero/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Daemon that converts a GuitarHero device into a JACK MIDI device
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:audio/jack
 
 USES=		tar:bzip2 uidfix
 
diff --git a/audio/jack_mixer/Makefile b/audio/jack_mixer/Makefile
index cba75cd0d42a..5dca4328e6d3 100644
--- a/audio/jack_mixer/Makefile
+++ b/audio/jack_mixer/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Mixer for the jack audio connection kit
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst \
-		${LOCALBASE}/include/pygtk-2.0/pygtk/pygtk.h:${PORTSDIR}/x11-toolkits/py-gtk2
+LIB_DEPENDS=	libjack.so:audio/jack
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/fpconst.py:math/py-fpconst \
+		${LOCALBASE}/include/pygtk-2.0/pygtk/pygtk.h:x11-toolkits/py-gtk2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		libtool pkgconfig python
diff --git a/audio/jack_umidi/Makefile b/audio/jack_umidi/Makefile
index 8634c066f3d7..4473ebba1c23 100644
--- a/audio/jack_umidi/Makefile
+++ b/audio/jack_umidi/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Daemon that converts a raw MIDI device into a JACK MIDI device
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:audio/jack
 
 USES=		tar:bzip2 uidfix
 PLIST_FILES=	sbin/jack_umidi \
diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile
index bd81d273d18c..0c5ef788a3dc 100644
--- a/audio/jamin/Makefile
+++ b/audio/jamin/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JACK Audio Mastering interface
 
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libjack.so:${PORTSDIR}/audio/jack \
-		liblo.so:${PORTSDIR}/audio/liblo
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		${LOCALBASE}/lib/ladspa/fast_lookahead_limiter_1913.so:${PORTSDIR}/audio/swhplugins
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+		libjack.so:audio/jack \
+		liblo.so:audio/liblo
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
+		${LOCALBASE}/lib/ladspa/fast_lookahead_limiter_1913.so:audio/swhplugins
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gmake libtool pkgconfig shared-mime-info
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index f9243a44f320..b276c79006aa 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Multi-track non-linear audio editing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg
 
 USES=	desktop-file-utils python:2 shared-mime-info
 USE_PYTHON=	distutils
@@ -29,7 +29,7 @@ PULSE_DESC=	${PULSEAUDIO_DESC}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBUS}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus
 .endif
 
 .if ${PORT_OPTIONS:MGNOME} || ${PORT_OPTIONS:MPROFILES} \
@@ -41,11 +41,11 @@ USE_GNOME+=	pygnome2
 .if empty(PORT_OPTIONS:MDBUS)
 IGNORE=		requires DBUS support
 . endif
-RUN_DEPENDS+=	pidgin:${PORTSDIR}/net-im/pidgin
+RUN_DEPENDS+=	pidgin:net-im/pidgin
 .endif
 
 .if ${PORT_OPTIONS:MOMF} || exists(${LOCALBASE}/bin/scrollkeeper-update)
-RUN_DEPENDS+=	scrollkeeper-update:${PORTSDIR}/textproc/scrollkeeper
+RUN_DEPENDS+=	scrollkeeper-update:textproc/scrollkeeper
 INSTALLS_OMF=	yes
 PLIST_SUB+=	OMF=""
 .else
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index a24379d09d55..86e4418a6b8c 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Jukebox, tagger and music collection manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/audio/julius/Makefile b/audio/julius/Makefile
index 5ace26ac95db..1b849d7e715a 100644
--- a/audio/julius/Makefile
+++ b/audio/julius/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SFJP/julius/37582
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	Large Vocabulary Continuous Speech Recognition Engine
 
-BUILD_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
-RUN_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
+BUILD_DEPENDS=	ja-p5-Jcode>=0:japanese/p5-Jcode
+RUN_DEPENDS=	ja-p5-Jcode>=0:japanese/p5-Jcode
 
 GNU_CONFIGURE=	yes
 USES=		iconv perl5 shebangfix
diff --git a/audio/jxm/Makefile b/audio/jxm/Makefile
index 3caf4b0cddd4..31798817acdf 100644
--- a/audio/jxm/Makefile
+++ b/audio/jxm/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMPCR (USB XM radio) control software
 
-RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/CommDriver.jar:${PORTSDIR}/comms/java-commapi-freebsd
+RUN_DEPENDS=	${JAVA_HOME}/jre/lib/ext/CommDriver.jar:comms/java-commapi-freebsd
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 0d5e624c1b30..99ad1c67d45d 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Audio-cd ripper and encoder for KDE4
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid \
-		libtag.so:${PORTSDIR}/audio/taglib
-RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac \
-		oggenc:${PORTSDIR}/audio/vorbis-tools
+LIB_DEPENDS=	libdiscid.so:audio/libdiscid \
+		libtag.so:audio/taglib
+RUN_DEPENDS=	flac:audio/flac \
+		oggenc:audio/vorbis-tools
 .if !defined(PACKAGE_BUILDING)
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+RUN_DEPENDS+=	lame:audio/lame
 .endif
 
 USES=		cmake tar:bzip2
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index c3975f5d9a9d..079760cde390 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -51,7 +51,7 @@ PHONON_USE=	QT4=phonon
 # Qt 4 and Qt 5
 CONFLICTS_INSTALL+=	kid3-3.*
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 
 USES+=		desktop-file-utils
 USE_GNOME=	libxslt:build
@@ -71,33 +71,33 @@ CLI_DESC=	Build and install command line utility
 CLI_USES=	readline
 
 FLAC_DESC=	Support for FLAC files
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_ON=		-DWITH_FLAC=ON
 FLAC_CMAKE_OFF=		-DWITH_FLAC=OFF
 
 ID3LIB_DESC=	Support for mp3 files
-ID3LIB_LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
+ID3LIB_LIB_DEPENDS=	libid3.so:audio/id3lib
 ID3LIB_CMAKE_ON=	-DWITH_ID3LIB=ON
 ID3LIB_CMAKE_OFF=	-DWITH_ID3LIB=OFF
 
 MP4V2_DESC=	Support for mp4 files
-MP4V2_LIB_DEPENDS=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+MP4V2_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 MP4V2_CMAKE_ON=		-DWITH_MP4V2=ON
 MP4V2_CMAKE_OFF=	-DWITH_MP4V2=OFF
 
 VORBIS_DESC=	Support for Ogg/Vorbis files
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-			libogg.so:${PORTSDIR}/audio/libogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+			libogg.so:audio/libogg
 VORBIS_CMAKE_ON=	-DWITH_VORBIS=ON
 VORBIS_CMAKE_OFF=	-DWITH_VORBIS=OFF
 
 TAGLIB_DESC=	Support for various audio formats
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_ON=	-DWITH_TAGLIB=ON
 TAGLIB_CMAKE_OFF=	-DWITH_TAGLIB=OFF
 
 CHROMAPRINT_DESC=	Support for Chromaprint audio fingerprints
-CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint
+CHROMAPRINT_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 CHROMAPRINT_CMAKE_ON=	-DWITH_CHROMAPRINT=ON
 CHROMAPRINT_CMAKE_OFF=	-DWITH_CHROMAPRINT=OFF
 
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index e74c8e7ca8ea..30621b07d176 100644
--- a/audio/kio-audiocd/Makefile
+++ b/audio/kio-audiocd/Makefile
@@ -13,10 +13,10 @@ COMMENT=	KDE IOSlave for accessing audio CDs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libcdda_paranoia.so:audio/cdparanoia \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix libkcddb libkcompactdisc \
@@ -26,6 +26,6 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	LAME
 LAME_DESC=	Install LAME MP3 audio encoder
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
+LAME_RUN_DEPENDS=	lame:audio/lame
 
 .include <bsd.port.mk>
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 38db6456b535..43a931174d9e 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -19,11 +19,11 @@ USE_QT4=	gui phonon xml \
 
 OPTIONS_DEFINE=	ALSA PULSEAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-no_alsa
 
-PULSEAUDIO_LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra \
-			libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
+			libpulse.so:audio/pulseaudio
 PULSEAUDIO_USE=		GNOME=glib20
 PULSEAUDIO_CMAKE_ON=	-DWITH_Canberra:BOOL=ON \
 			-DWITH_PulseAudio:BOOL=ON
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
index 9167830c05dc..8aedb0b10628 100644
--- a/audio/kscd/Makefile
+++ b/audio/kscd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	CD Player for KDE
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3
+LIB_DEPENDS=	libmusicbrainz3.so:audio/libmusicbrainz3
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
@@ -20,7 +20,7 @@ USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 
 OPTIONS_DEFINE=	ALSA
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-no_alsa
 
 .include <bsd.port.mk>
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 7cd2d2abfcbd..cf50ab2b88f4 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Curses-based MP3 player
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 
 GNU_CONFIGURE=	yes
 USES=		ncurses pathfix
diff --git a/audio/kstreamripper/Makefile b/audio/kstreamripper/Makefile
index 1f12e3ccc908..b4475f01759e 100644
--- a/audio/kstreamripper/Makefile
+++ b/audio/kstreamripper/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	syncer@gmail.com
 COMMENT=	Program for recording streams for KDE4
 
-RUN_DEPENDS=	${LOCALBASE}/bin/streamripper:${PORTSDIR}/audio/streamripper
+RUN_DEPENDS=	${LOCALBASE}/bin/streamripper:audio/streamripper
 
 USES=		cmake gettext-tools tar:bzip2
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index b03f4a60b961..7d714cd1a6c6 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 post-patch:
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index 5a1720f3bc46..005f7a2501dd 100644
--- a/audio/lash/Makefile
+++ b/audio/lash/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Session management system for JACK audio applications
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libjack.so:audio/jack \
+		libdssialsacompat.so:audio/libdssialsacompat \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		gmake pathfix pkgconfig libtool
 USE_GNOME=	gtk20 libxml2
@@ -34,13 +34,13 @@ OPTIONS_SUB=	yes
 
 PYTHON_DESC=	Build pylash
 PYTHON_USES=	python
-PYTHON_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+PYTHON_BUILD_DEPENDS=	swig:devel/swig13
 PYTHON_CONFIGURE_OFF=	--disable-pylash
 
 READLINE_USES=		readline
 READLINE_CONFIGURE_ENV_OFF=	vl_cv_lib_readline=no
 
-DOCS_BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html
 DOCS_CONFIGURE_ENV_OFF=	ac_cv_prog_lash_texi2html=no
 
 post-patch:
diff --git a/audio/last.fm/Makefile b/audio/last.fm/Makefile
index a8aabc57aa2d..0be15fcbd664 100644
--- a/audio/last.fm/Makefile
+++ b/audio/last.fm/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Official last.fm radio player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libgpod.so:${PORTSDIR}/audio/libgpod \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libgpod.so:audio/libgpod \
+		libmad.so:audio/libmad \
+		libsamplerate.so:audio/libsamplerate \
+		libfftw3f.so:math/fftw3-float
 
 WRKSRC=		${WRKDIR}/last.fm-${PORTVERSION}
 
diff --git a/audio/lastfm-desktop/Makefile b/audio/lastfm-desktop/Makefile
index 8377d2b7e99a..8dd1599e5cc3 100644
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Official Last.fm desktop application suite
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libgpod.so:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS=	liblastfm.so:audio/liblastfm \
+		libavcodec.so:multimedia/ffmpeg \
+		libgpod.so:audio/libgpod
 
 USES=		pkgconfig qmake tar:bzip2 gmake
 USE_QT4=	gui linguist_build moc_build network phonon \
diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile
index 6782b3cfbfcf..155b6d18e3d3 100644
--- a/audio/liba52/Makefile
+++ b/audio/liba52/Makefile
@@ -22,8 +22,8 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DJBFFT OPTIMIZED_CFLAGS DOCS
 DJBFFT_DESC=	djb fft support
 
-DJBFFT_BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
-DJBFFT_RUN_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
+DJBFFT_BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:math/djbfft
+DJBFFT_RUN_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:math/djbfft
 DJBFFT_CFLAGS=		-I${LOCALBASE}/include
 DJBFFT_LDFLAGS=		-L${LOCALBASE}/lib
 DJBFFT_CONFIGURE_ON=	--enable-djbfft
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 9c1a01d83b5f..2141d44dbf2b 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -42,8 +42,8 @@ SRC26410=	26410-800.zip
 
 FFTW3_DESC=	Use FFTW3 library for performance
 
-FFTW3_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-			libfftw3f.so:${PORTSDIR}/math/fftw3-float
+FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+			libfftw3f.so:math/fftw3-float
 FFTW3_CONFIGURE_ON=	--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE}
 FFTW3_CONFIGURE_OFF=	--with-fftw3=no
 
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index 29258580415a..2f4ed41a8023 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -13,7 +13,7 @@ COMMENT=	AdLib emulator library supporting many formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libbinio.so:${PORTSDIR}/devel/libbinio
+LIB_DEPENDS=	libbinio.so:devel/libbinio
 
 USES=		pkgconfig libtool makeinfo
 GNU_CONFIGURE=	yes
diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile
index 322fa46c62fd..6f9379d1963e 100644
--- a/audio/libamrnb/Makefile
+++ b/audio/libamrnb/Makefile
@@ -24,7 +24,7 @@ LICENSE_PERMS_3GPP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-a
 LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26104}
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:archivers/unzip
 
 RESTRICTED=	unclear legal status, probably need licenses from 3GPP and more
 
diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile
index 9072fedd1390..6d2dc4c62563 100644
--- a/audio/libamrwb/Makefile
+++ b/audio/libamrwb/Makefile
@@ -23,7 +23,7 @@ LICENSE_PERMS_3GPP=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-a
 LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26204}
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	unzip:archivers/unzip
 
 RESTRICTED=	unclear legal status, probably need licenses from 3GPP and more
 
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 40e9cccd05a1..030075abaef5 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -23,10 +23,10 @@ MAKE_ARGS=	ckport_DATA=""
 OPTIONS_DEFINE=	DOCS ESOUND NAS PULSEAUDIO
 OPTIONS_SUB=	yes
 
-NAS_LIB_DEPENDS=libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=libaudio.so:audio/nas
 NAS_CONFIGURE_ENABLE=	nas
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
 ESOUND_CONFIGURE_ENABLE=esd
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index 95bb19865383..36c6afeb4baf 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/bs2b/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Bauer Stereophonic-to-Binaural DSP
 
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libsndfile.so:audio/libsndfile \
+		libogg.so:audio/libogg \
+		libFLAC.so:audio/flac \
+		libvorbis.so:audio/libvorbis
 
 USES=		tar:bzip2 gmake pkgconfig libtool
 USE_LDCONFIG=	yes
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 855385623e18..42621420cb8e 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Implementation of the Freedesktop sound theme spec
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL
 
-LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
+		libltdl.so:devel/libltdl
 
 USES=		gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix gtk20
@@ -37,13 +37,13 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 
 .if defined(SLAVEPORT)
 USE_GNOME+=	gtk30
-LIB_DEPENDS+=	libcanberra.so:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS+=	libcanberra.so:audio/libcanberra
 CONFIGURE_ARGS+=--enable-gtk3
 .else
 CONFIGURE_ARGS+=--disable-gtk3
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CONFIGURE_ARGS+=--disable-pulse
diff --git a/audio/libconvolve/Makefile b/audio/libconvolve/Makefile
index f51a51adb19e..e4529296f800 100644
--- a/audio/libconvolve/Makefile
+++ b/audio/libconvolve/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Simple C library for partitioned convolution
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile
 
 USES=		gmake pkgconfig tar:tgz
 USE_LDCONFIG=	yes
diff --git a/audio/libcoverart/Makefile b/audio/libcoverart/Makefile
index 997424c677bb..538371c4014e 100644
--- a/audio/libcoverart/Makefile
+++ b/audio/libcoverart/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Library for accessing the MusicBrainz cover art archive
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
-		libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libjansson.so:devel/jansson \
+		libneon.so:www/neon
 
 USES=		cmake pathfix
 USE_LDCONFIG=	yes
diff --git a/audio/libebur128/Makefile b/audio/libebur128/Makefile
index 51e6664ce57e..1aaa1c2f240e 100644
--- a/audio/libebur128/Makefile
+++ b/audio/libebur128/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Implementation of the EBU R128 loudness standard
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jiixyj
diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index f33ae63a0742..3e616b6d79a8 100644
--- a/audio/libechonest/Makefile
+++ b/audio/libechonest/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Collection of C++/Qt classes designed to use the APIs of The Echo Nest
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:devel/qjson
 
 GH_ACCOUNT=	lfranchi
 
diff --git a/audio/libfishsound/Makefile b/audio/libfishsound/Makefile
index 090c500175fe..2145ea7ca5fc 100644
--- a/audio/libfishsound/Makefile
+++ b/audio/libfishsound/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Programing interface to decode/encode audio data
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libspeex.so:audio/speex \
+		libvorbis.so:audio/libvorbis
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 
@@ -27,7 +27,7 @@ USES=		libtool pathfix pkgconfig
 
 PORTDOCS=	*
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_IMPLIES=	DOCS
 
 post-patch-DOCS-off:
diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index f6b61397f6ac..8e4d01b3221d 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Gigasampler file loader library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libsndfile.so:audio/libsndfile \
+		libuuid.so:misc/e2fsprogs-libuuid
 
 USES=		tar:bzip2 gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index f10e25979241..835553c2723f 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Library for direct access to iPod contents
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libsgutils2.so:${PORTSDIR}/sysutils/sg3_utils
+LIB_DEPENDS=	libplist.so:devel/libplist \
+		libtag.so:audio/taglib \
+		libsgutils2.so:sysutils/sg3_utils
 
 USES=		gettext gmake libtool localbase pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
@@ -32,7 +32,7 @@ OPTIONS_SUB=	yes
 
 IMOBILE_DESC=	Apple iPhone/iPod Touch support
 
-IMOBILE_LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
+IMOBILE_LIB_DEPENDS=	libimobiledevice.so:comms/libimobiledevice
 IMOBILE_CONFIGURE_ENV=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
 IMOBILE_CONFIGURE_WITH=	libimobiledevice
 
@@ -42,9 +42,9 @@ MONO_CONFIGURE_WITH=	mono
 CONFIGURE_ARGS+=	--without-mono
 PLIST_SUB+=		MONO="@comment "
 
-PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20 \
-			${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
-PYTHON_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+PYTHON_BUILD_DEPENDS=	swig2.0:devel/swig20 \
+			${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen
+PYTHON_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen
 PYTHON_USE=		GNOME=pygobject
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig2.0"
diff --git a/audio/libgroove/Makefile b/audio/libgroove/Makefile
index 78c7517ac21c..4fce675ab65e 100644
--- a/audio/libgroove/Makefile
+++ b/audio/libgroove/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Audio dispatching library
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libchromaprint.so:${PORTSDIR}/audio/chromaprint \
-		libebur128.so:${PORTSDIR}/audio/libebur128 \
-		libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libchromaprint.so:audio/chromaprint \
+		libebur128.so:audio/libebur128 \
+		libspeexdsp.so:audio/speexdsp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	andrewrk
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index a2f1f6cb024c..7c586ea07696 100644
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE CDDB library
 
-LIB_DEPENDS=	libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5
+LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	automoc4 kdelibs kdeprefix
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 98035e053bec..e4488265c549 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -18,7 +18,7 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	ALSA
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 post-patch-ALSA-off:
 	${REINPLACE_CMD} -e '/find_package(Alsa)/d' \
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index dcdf4f416a70..64b95179337e 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Qt C++ library for the Last.fm webservices
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libsamplerate.so:audio/libsamplerate
 
 GH_ACCOUNT=	lastfm
 
diff --git a/audio/liblo/Makefile b/audio/liblo/Makefile
index 60286c9e2278..ff464558bc4c 100644
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@@ -24,7 +24,7 @@ PORTEXAMPLES=	example_client example_server \
 OPTIONS_DEFINE=	DOXYGEN DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 .include <bsd.port.options.mk>
 
diff --git a/audio/libmatemixer/Makefile b/audio/libmatemixer/Makefile
index 34aaca6dbcc9..8d1a5e7e101d 100644
--- a/audio/libmatemixer/Makefile
+++ b/audio/libmatemixer/Makefile
@@ -27,8 +27,8 @@ OPTIONS_DEFINE=		PULSEAUDIO ALSA
 OPTIONS_SUB=		yes
 
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 ALSA_CONFIGURE_ENABLE=		alsa
-ALSA_LIB_DEPENDS=		libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 
 .include <bsd.port.mk>
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 0611f2bd0ab0..92add26b3ad8 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for splitting of various audio files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-cutter --disable-doxygen_doc
@@ -31,19 +31,19 @@ PCRE_DESC=	PCRE support to set tags from input filename
 OPTIONS_DEFAULT=	MAD FLAC VORBIS ID3 PCRE NLS
 
 MAD_CONFIGURE_ENABLE=	mp3
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 
 FLAC_CONFIGURE_ENABLE=	flac
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 
 VORBIS_CONFIGURE_ENABLE=ogg
-VORBIS_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-			libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
+			libvorbis.so:audio/libvorbis
 
 PCRE_CONFIGURE_ENABLE=	pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
-MID3_LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
+MID3_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
 MID3_CONFIGURE_ENABLE=	id3tag
 
 NLS_USES=		gettext
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile
index 681d89abad46..c87d5b4e09b2 100644
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS DOXYGEN
 OPTIONS_SUB=	yes
 DOXYGEN_IMPLIES=	DOCS
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=	--disable-documentation
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index b4716c250ce8..0d9459ad832a 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MusicBrainz client library for audio metadata lookup
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid \
-		libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libdiscid.so:audio/libdiscid \
+		libneon.so:www/neon
 
 USES=		cmake pathfix
 USE_LDCONFIG=	yes
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 305ce350dde9..bac4d179e36d 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MusicBrainz client library for audio metadata lookup
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+LIB_DEPENDS=	libneon.so:www/neon
 
 USES=		cmake iconv:build pathfix
 USE_GNOME=	libxml2
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
index 9e59ad4bd367..db5713a27060 100644
--- a/audio/libnjb/Makefile
+++ b/audio/libnjb/Makefile
@@ -25,7 +25,7 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN=no
 
 post-patch:
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index 2a1944a7c123..cacff4bd1010 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -17,9 +17,9 @@ LICENSE_NAME_APL1=	Adaptive Public License version 1.0
 LICENSE_FILE_APL1=	${WRKSRC}/COPYING
 LICENSE_PERMS_APL1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libexpat.so:textproc/expat2 \
+		libcurl.so:ftp/curl
 
 PROJECTHOST=	musicip-libofa
 USES=		dos2unix libtool pathfix
diff --git a/audio/liboggz/Makefile b/audio/liboggz/Makefile
index f98cc2478142..d77ca4de586e 100644
--- a/audio/liboggz/Makefile
+++ b/audio/liboggz/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple Ogg API
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/audio/libopenspc/Makefile b/audio/libopenspc/Makefile
index 09a7f13304c9..6060952aa6a9 100644
--- a/audio/libopenspc/Makefile
+++ b/audio/libopenspc/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://rainbow-runner.nl/freebsd/ \
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Library for playing SPC (SNES audio) files
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 8a7510d22d53..75dd1f790373 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -31,15 +31,15 @@ CONFIGURE_ARGS+=	--disable-cpu-clip
 .endif
 
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libfftw3.so:${PORTSDIR}/math/fftw3
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libfftw3.so:math/fftw3
 .else
 CONFIGURE_ARGS+=	--disable-fftw
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:audio/libsndfile
 .elif defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BUILD_DEPENDS +=	libsndfile>=0:${PORTSDIR}/audio/libsndfile
+BUILD_DEPENDS +=	libsndfile>=0:audio/libsndfile
 .else
 CONFIGURE_ARGS+=	--disable-sndfile
 .endif
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index bd8e3821938c..34fd4c05f1d5 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Connect and transmit data to an Icecast media streaming server
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 CONFLICTS=	libshout2-[0-9]*
 
@@ -30,9 +30,9 @@ USES=		gmake libtool pathfix pkgconfig
 PORTDOCS=	*
 
 SPEEX_CONFIGURE_ENABLE=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 THEORA_CONFIGURE_ENABLE=theora
-THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^DATA = / s| $$(ckport_DATA)||; /^install-data-am:/ s| install-ckportDATA||' ${WRKSRC}/Makefile.in
diff --git a/audio/libsidplayfp/Makefile b/audio/libsidplayfp/Makefile
index ad99b5ad0c48..af679ba09013 100644
--- a/audio/libsidplayfp/Makefile
+++ b/audio/libsidplayfp/Makefile
@@ -19,7 +19,7 @@ PORTDOCS=	NEWS README TODO
 
 OPTIONS_DEFINE=	DEBUG DOCS DOXYGEN
 DEBUG_CONFIGURE_ON=	--enable-debug=full
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPTIONS_GROUP=	OPTIMIZATION
 OPTIONS_GROUP_OPTIMIZATION=	BHINTS INLINE MMX
@@ -33,7 +33,7 @@ INLINE_CONFIGURE_ENABLE=	inline
 MMX_DESC=	Enable MMX code in reSIDfp for old x86 non-SSE2 CPU
 MMX_CONFIGURE_ENABLE=	mmx
 
-BUILD_DEPENDS+=	xa65:${PORTSDIR}/devel/xa65
+BUILD_DEPENDS+=	xa65:devel/xa65
 
 SIDPLAYFP_SHLIB_VERSION=	4.2.5
 STILVIEW_SHLIB_VERSION=	0.0.3
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 6870526bc060..92f5763214de 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -30,8 +30,8 @@ EXTERNAL_DESC=	Enable FLAC and Ogg Vorbis support
 CPU_CLIP_VARS=	MANUAL_PACKAGE_BUILD="WITH_CPU_CLIP may customize the package for the build machine"
 CPU_CLIP_CONFIGURE_OFF=	--disable-cpu-clip
 
-EXTERNAL_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-			libvorbis.so:${PORTSDIR}/audio/libvorbis
+EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
+			libvorbis.so:audio/libvorbis
 EXTERNAL_CONFIGURE_OFF=	--disable-external-libs
 
 post-patch:
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index 57c2bcab879e..8fc094b99049 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 GIT_COMMIT=	b56ffc
 USES=		autoreconf libtool pathfix pkgconfig
diff --git a/audio/libumidi/Makefile b/audio/libumidi/Makefile
index a38f77c89912..dbbf37f3653f 100644
--- a/audio/libumidi/Makefile
+++ b/audio/libumidi/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFAULT=JACK
 USES=		tar:bzip2 uidfix
 
 JACK_MAKE_ARGS=	" HAVE_JACK=YES"
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 DEBUG_MAKE_ARGS=	" HAVE_DEBUG=YES"
 MAKE_ARGS+=" HAVE_MAN=YES"
 
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 537e4726b3c8..33cac574c8c3 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Audio compression codec library
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 USES=		libtool pathfix tar:xz
 USE_LDCONFIG=	yes
diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index 4b263b53f88a..43f8b495d970 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -24,12 +24,12 @@ OPTIONS_GROUP=		SOUND
 OPTIONS_GROUP_SOUND=	ALSA JACK
 OPTIONS_DEFAULT=	JACK
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CONFIGURE_ENABLE=	alsa
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-			libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+JACK_LIB_DEPENDS=	libjack.so:audio/jack \
+			libsamplerate.so:audio/libsamplerate
 JACK_CONFIGURE_ENABLE=	jack
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-alsa-lib/Makefile b/audio/linux-c6-alsa-lib/Makefile
index 5768d71676f7..405fd4c45dea 100644
--- a/audio/linux-c6-alsa-lib/Makefile
+++ b/audio/linux-c6-alsa-lib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	alsa-lib>0:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
 
diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index 573c8d7b4ca6..2be5e618766c 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Advanced Linux Sound Architecture libraries (Linux Fedora 10)
 
-RUN_DEPENDS=	alsa-lib>0:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS=	alsa-lib>0:audio/alsa-lib
 
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
diff --git a/audio/linux-mbrola/Makefile b/audio/linux-mbrola/Makefile
index e28e3ee6f6cb..305fa67c3c0e 100644
--- a/audio/linux-mbrola/Makefile
+++ b/audio/linux-mbrola/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MBROLA speech synthesizer for Linux
 
-RUN_DEPENDS=	mbrolavox>0:${PORTSDIR}/audio/mbrolavox
+RUN_DEPENDS=	mbrolavox>0:audio/mbrolavox
 
 CONFLICTS=	mbrola-*
 NO_BUILD=	yes
diff --git a/audio/linux-skype_oss_wrapper/Makefile b/audio/linux-skype_oss_wrapper/Makefile
index 358da79b2294..2ea133f51b61 100644
--- a/audio/linux-skype_oss_wrapper/Makefile
+++ b/audio/linux-skype_oss_wrapper/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Partial PulseAudio API implementation using OSS backend
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:${PORTSDIR}/devel/linux-c6-devtools
+BUILD_DEPENDS=	${LINUXBASE}/usr/bin/gcc:devel/linux-c6-devtools
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	s3erios
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 3f1b59f89c8b..b434d1d71ace 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.linuxsampler.org/packages/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular MIDI sampler
 
-LIB_DEPENDS=	libgig.so:${PORTSDIR}/audio/libgig
+LIB_DEPENDS=	libgig.so:audio/libgig
 
 RESTRICTED=	no commercial use
 
@@ -37,20 +37,20 @@ CONFIGURE_ARGS+=--disable-arts-driver
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:audio/jack
 .else
 CONFIGURE_ARGS+=--disable-jack-driver
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 .else
 CONFIGURE_ARGS+=--disable-alsa-driver
 .endif
 
 .if ${PORT_OPTIONS:MDSSI}
-BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
-RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
+BUILD_DEPENDS+=	dssi>=0:audio/dssi
+RUN_DEPENDS+=	dssi>=0:audio/dssi
 PLIST_SUB+=	DSSI=""
 CPPFLAGS:=	-I${LOCALBASE}/include/dssi ${CPPFLAGS}
 .else
@@ -59,8 +59,8 @@ PLIST_SUB+=	DSSI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLV2CORE}
-BUILD_DEPENDS+=	lv2core>=0:${PORTSDIR}/audio/lv2core
-RUN_DEPENDS+=	lv2core>=0:${PORTSDIR}/audio/lv2core
+BUILD_DEPENDS+=	lv2core>=0:audio/lv2core
+RUN_DEPENDS+=	lv2core>=0:audio/lv2core
 PLIST_SUB+=	LV2CORE=""
 .else
 CONFIGURE_ENV+=	ac_cv_header_lv2_h=no
diff --git a/audio/listener/Makefile b/audio/listener/Makefile
index 34837ea03ad0..9bc70521c005 100644
--- a/audio/listener/Makefile
+++ b/audio/listener/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Program to listen for and record sound activity
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libportaudio.so:audio/portaudio \
+		libsndfile.so:audio/libsndfile
 
 USES=		localbase ncurses tar:tgz
 
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index 01c789e4a4fa..296143f9f6ba 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -13,18 +13,18 @@ COMMENT=	All-in-one sequencer, drum machine, sampler, and more
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float
-RUN_DEPENDS=	${LOCALBASE}/share/ladspa/rdf/caps.rdf:${PORTSDIR}/audio/caps-plugins \
-		${LOCALBASE}/lib/ladspa/cmt.so:${PORTSDIR}/audio/cmt \
-		${LOCALBASE}/share/ladspa/rdf/swh-plugins.rdf:${PORTSDIR}/audio/swhplugins \
-		${LOCALBASE}/share/ladspa/rdf/tap-plugins.rdf:${PORTSDIR}/audio/tap-plugins
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libfluidsynth.so:audio/fluidsynth \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libvorbis.so:audio/libvorbis \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float
+RUN_DEPENDS=	${LOCALBASE}/share/ladspa/rdf/caps.rdf:audio/caps-plugins \
+		${LOCALBASE}/lib/ladspa/cmt.so:audio/cmt \
+		${LOCALBASE}/share/ladspa/rdf/swh-plugins.rdf:audio/swhplugins \
+		${LOCALBASE}/share/ladspa/rdf/tap-plugins.rdf:audio/tap-plugins
 
 OPTIONS_DEFINE=	JACK PULSEAUDIO SDL
 
@@ -47,10 +47,10 @@ CMAKE_ARGS=	-DWANT_ALSA:BOOL=OFF \
 
 DOS2UNIX_FILES=	plugins/midi_import/portsmf/allegrowr.cpp plugins/midi_import/portsmf/mfmidi.cpp CMakeLists.txt
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_OFF=		-DWANT_JACK:BOOL=OFF
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_OFF=	-DWANT_PULSEAUDIO:BOOL=OFF
 
 SDL_USE=		SDL=sdl
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index fa54e1a3e919..d81a21637106 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Play and organize your music collection
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:${PORTSDIR}/databases/py-sqlite3 \
-	${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:${PORTSDIR}/devel/py3-dbus \
-	${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:${PORTSDIR}/multimedia/py3-gstreamer1
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-	libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3 \
+	${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py3-dbus \
+	${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py3-gstreamer1
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+	libtotem-plparser.so:multimedia/totem-pl-parser
 
 USES=	shebangfix python:3 pkgconfig gettext gmake tar:xz
 GNU_CONFIGURE=	yes
diff --git a/audio/lua51-mpd/Makefile b/audio/lua51-mpd/Makefile
index e21bf6de973c..230392a8cac2 100644
--- a/audio/lua51-mpd/Makefile
+++ b/audio/lua51-mpd/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 MAINTAINER=	demelier.david@gmail.com
 COMMENT=	Lua library for musicpd
 
-RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket
+RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket
 
 OPTIONS_DEFINE=	DOCS
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile
index d29c3668cd48..b9b731e4b690 100644
--- a/audio/lxmusic/Makefile
+++ b/audio/lxmusic/Makefile
@@ -13,8 +13,8 @@ COMMENT=	LXDE music player based on xmms2
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
-		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libxmmsclient.so:audio/xmms2 \
+		libnotify.so:devel/libnotify
 
 USES=		gmake desktop-file-utils pkgconfig
 USE_GNOME=	gtk20 intltool
diff --git a/audio/mac/Makefile b/audio/mac/Makefile
index 20d052faa596..944e23c3ae81 100644
--- a/audio/mac/Makefile
+++ b/audio/mac/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
-BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+BUILD_DEPENDS=	yasm:devel/yasm
 .endif
 
 post-install:
diff --git a/audio/madfufw/Makefile b/audio/madfufw/Makefile
index 8bdd52cfc10f..f09665a76c5b 100644
--- a/audio/madfufw/Makefile
+++ b/audio/madfufw/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	madfuload-1.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	M-Audio DFU Firmware for Transit, Ozone, Sonica, MobilePre
 
-RUN_DEPENDS=	${LOCALBASE}/bin/dfu-util:${PORTSDIR}/comms/dfu-util
+RUN_DEPENDS=	${LOCALBASE}/bin/dfu-util:comms/dfu-util
 
 WRKSRC=		${WRKDIR}/madfuload-1.2
 PLIST_FILES=	share/maudio/ma003101.bin \
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index f99b5bde72a3..073533a0bb9f 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Madplay MP3 player (part of MAD project)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS=	libmad.so:audio/libmad \
+		libid3tag.so:audio/libid3tag
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile
index 28b1e5270b96..7fa680362737 100644
--- a/audio/mangler/Makefile
+++ b/audio/mangler/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Ventrilo VOIP compatible client
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libcelt0.so:${PORTSDIR}/audio/celt \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libgsm.so:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libcelt0.so:audio/celt \
+		libspeex.so:audio/speex \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgsm.so:audio/gsm
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-alsa
@@ -28,6 +28,6 @@ USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	PULSEAUDIO
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 
 .include <bsd.port.mk>
diff --git a/audio/mate-media/Makefile b/audio/mate-media/Makefile
index 4ff707fc154e..a653bbc42643 100644
--- a/audio/mate-media/Makefile
+++ b/audio/mate-media/Makefile
@@ -10,10 +10,10 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the MATE desktop
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
-		libmatemixer.so:${PORTSDIR}/audio/libmatemixer \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libmatemixer.so:audio/libmatemixer \
+		libunique-1.0.so:x11-toolkits/unique
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index a3ca57f52c98..b7049a35380a 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Program intended to help with organizing your music files
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ogg>0:${PORTSDIR}/audio/py-ogg \
-		${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis \
-		lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mplayer:${PORTSDIR}/multimedia/mplayer
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg \
+		${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \
+		lame:audio/lame \
+		oggenc:audio/vorbis-tools \
+		mplayer:multimedia/mplayer
 
 WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
 USES=		python:2 tar:bzip2
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index becafef93091..8df2e7a52a23 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -45,21 +45,21 @@ DOUBLE_SAMPLES_DESC=	Increase quality for 24/32-bit samplerates
 DOUBLE_SAMPLES_CONFIGURE_WITH=	double-samples
 ESOUND_USE=		gnome=esound
 ESOUND_CONFIGURE_WITH=	esound
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_WITH=	jack
-LADSPA_BUILD_DEPENDS=	ladspa>0:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS=	ladspa>0:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS=	ladspa>0:audio/ladspa
+LADSPA_RUN_DEPENDS=	ladspa>0:audio/ladspa
 LADSPA_CONFIGURE_ENV_OFF=	ac_cv_header_ladspa_h=no
 OSS_CONFIGURE_WITH=	oss
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CONFIGURE_WITH=	portaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulse
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_WITH=	libsamplerate
 SDL_USE=		sdl=sdl
 SDL_CONFIGURE_WITH=	sdl
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_WITH=	libsndfile
 
 post-patch:
diff --git a/audio/midipp/Makefile b/audio/midipp/Makefile
index 74177102f064..a3642271fcf8 100644
--- a/audio/midipp/Makefile
+++ b/audio/midipp/Makefile
@@ -12,8 +12,8 @@ COMMENT=	MIDI playback, recording, and live performance tool
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	libumidi>=2.0.13:${PORTSDIR}/audio/libumidi
-LIB_DEPENDS=	libumidi20.so:${PORTSDIR}/audio/libumidi
+BUILD_DEPENDS=	libumidi>=2.0.13:audio/libumidi
+LIB_DEPENDS=	libumidi20.so:audio/libumidi
 
 USES=		qmake tar:bzip2
 USE_QT4=	gui moc_build rcc_build network
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index ab50b6b22891..edc7c4b727ce 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mod player which plays MTM, STM, XM, MOD, S3M, ULT, UNI, and IT mods
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index a80e63ddd76c..7a1a5325ef0f 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv3
 
 NOT_FOR_ARCH=	powerpc
 
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
-		libzzip.so:${PORTSDIR}/devel/zziplib
+LIB_DEPENDS+=	libjack.so:audio/jack \
+		libzzip.so:devel/zziplib
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/minitunes/Makefile b/audio/minitunes/Makefile
index 789a47b4003d..210cd4a709d0 100644
--- a/audio/minitunes/Makefile
+++ b/audio/minitunes/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://flavio.tordini.org/files/${PORTNAME}/
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Just another music player
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		qmake
 USE_QT4=	dbus gui moc_build network phonon rcc_build \
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index cde1dc864507..926e89966bc8 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -14,14 +14,14 @@ COMMENT=	DJ mixing application
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libid3tag.so:audio/libid3tag \
+		libmad.so:audio/libmad \
+		libportaudio.so:audio/portaudio \
+		libsndfile.so:audio/libsndfile \
+		libvorbisfile.so:audio/libvorbis \
+		libtag.so:audio/taglib \
+		libprotobuf.so:devel/protobuf
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -39,18 +39,18 @@ OPTIONS_DEFINE=		DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK
 OPTIONS_DEFAULT=	FAAD SHOUTCAST WAVPACK
 OPTIONS_SUB=		yes
 
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
-			libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
+			libmp4v2.so:multimedia/mp4v2
 FAAD_MAKE_ARGS=		faad=1
 FAAD_MAKE_ARGS_OFF=	faad=0
-GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 GPERFTOOLS_MAKE_ARGS=	perftools=1
 GPERFTOOLS_MAKE_ARGS_OFF=	perftools=0
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-SHOUTCAST_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+LAME_RUN_DEPENDS=	lame:audio/lame
+SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_MAKE_ARGS=	shoutcast=1
 SHOUTCAST_MAKE_ARGS_OFF=	shoutcast=0
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_MAKE_ARGS=	wv=1
 WAVPACK_MAKE_ARGS_OFF=	wv=0
 
diff --git a/audio/mma/Makefile b/audio/mma/Makefile
index ce8b91f693d9..0107d85601cd 100644
--- a/audio/mma/Makefile
+++ b/audio/mma/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 
 BROKEN=		unfetchable
 
-RUN_DEPENDS=	aplaymidi:${PORTSDIR}/audio/alsa-utils \
-		timidity:${PORTSDIR}/audio/timidity++
+RUN_DEPENDS=	aplaymidi:audio/alsa-utils \
+		timidity:audio/timidity++
 
 MMABIN=	${PREFIX}/bin/mma
 
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 147c65328409..9238e4d9c7cc 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Console audio player designed to be powerful and easy to use
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		gmake libtool ncurses pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
@@ -30,64 +30,64 @@ CURL_DESC=	curl support (Internet streams)
 RCC_DESC=	RCC support
 SIDPLAY2_DESC=	libsidplay2 support
 
-AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_PLIST_FILES=	lib/moc/decoder_plugins/libaac_decoder.so
 AAC_CONFIGURE_OFF=	--without-aac
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--without-curl
 
 DEBUG_CONFIGURE_OFF=	--enable-debug=no
 
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_PLIST_FILES=	lib/moc/decoder_plugins/libffmpeg_decoder.so
 FFMPEG_CONFIGURE_OFF=	--without-ffmpeg
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_PLIST_FILES=	lib/moc/decoder_plugins/libflac_decoder.so
 FLAC_CONFIGURE_OFF=	--without-flac
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--without-jack
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_PLIST_FILES=	lib/moc/decoder_plugins/libmodplug_decoder.so
 MODPLUG_CONFIGURE_OFF=	--without-modplug
 
-MP3_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-			libid3tag.so:${PORTSDIR}/audio/libid3tag
+MP3_LIB_DEPENDS=	libmad.so:audio/libmad \
+			libid3tag.so:audio/libid3tag
 MP3_PLIST_FILES=	lib/moc/decoder_plugins/libmp3_decoder.so
 MP3_CONFIGURE_OFF=	--without-mp3
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack \
-			libtag_c.so:${PORTSDIR}/audio/taglib
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
+			libtag_c.so:audio/taglib
 MUSEPACK_PLIST_FILES=	lib/moc/decoder_plugins/libmusepack_decoder.so
 MUSEPACK_CONFIGURE_OFF=	--without-musepack
 
-RCC_LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel/librcc \
-			librcd.so:${PORTSDIR}/devel/librcd
+RCC_LIB_DEPENDS=	librcc.so:devel/librcc \
+			librcd.so:devel/librcd
 RCC_CONFIGURE_OFF=	--without-rcc
 
-SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_OFF=	--without-samplerate
 
-SIDPLAY2_LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+SIDPLAY2_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 SIDPLAY2_PLIST_FILES=	lib/moc/decoder_plugins/libsidplay2_decoder.so
 SIDPLAY2_CONFIGURE_OFF=	--without-sidplay2
 
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_PLIST_FILES=	lib/moc/decoder_plugins/libsndfile_decoder.so
 SNDFILE_CONFIGURE_OFF=	--without-sndfile
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_PLIST_FILES=	lib/moc/decoder_plugins/libspeex_decoder.so
 SPEEX_CONFIGURE_OFF=	--without-speex
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_PLIST_FILES=	lib/moc/decoder_plugins/libvorbis_decoder.so
 VORBIS_CONFIGURE_OFF=	--without-ogg
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_PLIST_FILES=	lib/moc/decoder_plugins/libwavpack_decoder.so
 WAVPACK_CONFIGURE_OFF=	--without-wavpack
 
diff --git a/audio/modplugplay/Makefile b/audio/modplugplay/Makefile
index d03af42848a5..259896023cb1 100644
--- a/audio/modplugplay/Makefile
+++ b/audio/modplugplay/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Command-line music mod player using libmodplug
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 
 PLIST_FILES=	bin/modplugplay man/man1/modplugplay.1.gz
 
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 41a07423031a..aa50cc109e79 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -29,40 +29,40 @@ OPTIONS_DEFAULT_i386=	ASSEMBLY WMA
 
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=		-DWithPluginAlsaRenderer=1
 ALSA_CMAKE_OFF=		-DWithPluginAlsaRenderer=0
 
-AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_CMAKE_ON=		-DWithPluginAoRenderer=1
 AO_CMAKE_OFF=		-DWithPluginAoRenderer=0
 
 ASSEMBLY_DESC=		Enable assembly optimizations
-ASSEMBLY_BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+ASSEMBLY_BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:devel/yasm
 ASSEMBLY_CMAKE_ON=	-DWithAssembly=1
 ASSEMBLY_CMAKE_OFF=	-DWithAssembly=0
 
-CUE_LIB_DEPENDS=	libcue.so:${PORTSDIR}/textproc/libcue
+CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
 CUE_CMAKE_ON=		-DWithPluginCuePack=1
 CUE_CMAKE_OFF=		-DWithPluginCuePack=0
 
-FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+FAAC_LIB_DEPENDS=	libfaac.so:audio/faac
 FAAC_CMAKE_ON=		-DWithPluginFaacEncoder=1
 FAAC_CMAKE_OFF=		-DWithPluginFaacEncoder=0
 
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CMAKE_ON=		-DWithPluginFaadDecoder=1
 FAAD_CMAKE_OFF=		-DWithPluginFaadEncoder=0
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CMAKE_ON=		-DWithPluginFlacDecoder=1
 FLAC_CMAKE_OFF=		-DWithPluginFlacDecoder=0
 
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CMAKE_ON=		-DWithPluginLameEncoder=1
 LAME_CMAKE_OFF=		-DWithPluginLameEncoder=0
 
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CMAKE_ON=	-DWithPluginMpg123Decoder=1
 MPG123_CMAKE_OFF=	-DWithPluginMpg123Decoder=0
 
@@ -71,7 +71,7 @@ MAC4DECODER_CMAKE_ON=	-DWithPluginMac4Decoder=1
 MAC4DECODER_CMAKE_OFF=	-DWithPluginMac4Decoder=0
 
 MACDECODER_DESC=	Old mac3.99 ape decoder (*.ape)
-MACDECODER_LIB_DEPENDS=	libmac.so:${PORTSDIR}/audio/mac
+MACDECODER_LIB_DEPENDS=	libmac.so:audio/mac
 MACDECODER_CMAKE_ON=	-DWithPluginMacDecoder=1
 MACDECODER_CMAKE_OFF=	-DWithPluginMacDecoder=0
 
@@ -94,11 +94,11 @@ SDK_CMAKE_ON=		-DWithHeadFiles=1
 SDK_CMAKE_OFF=		-DWithHeadFiles=0
 
 TAGLIB_DESC=		TagLib plugin (recommended)
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CMAKE_ON=	-DWithPluginTagLibParser=1
 TAGLIB_CMAKE_OFF=	-DWithPluginTagLibParser=0
 
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CMAKE_ON=	-DWithPluginOggDecoder=1
 VORBIS_CMAKE_OFF=	-DWithPluginOggDecoder=0
 
diff --git a/audio/mp-player/Makefile b/audio/mp-player/Makefile
index 8d328013fe5a..03c54b8c39f1 100644
--- a/audio/mp-player/Makefile
+++ b/audio/mp-player/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Curses based module tracker using libmikmod
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 
 USES=		ncurses
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/mp3-archive-tools/Makefile b/audio/mp3-archive-tools/Makefile
index 6028f980179c..fbcb96badcf1 100644
--- a/audio/mp3-archive-tools/Makefile
+++ b/audio/mp3-archive-tools/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Set of tools to ease organising a collection of audio files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libmp3-archive-perl>=0:${PORTSDIR}/audio/libmp3-archive-perl \
-		p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag
+BUILD_DEPENDS=	libmp3-archive-perl>=0:audio/libmp3-archive-perl \
+		p5-MP3-Tag>=0:audio/p5-MP3-Tag
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index a986ed41ced1..3afce0a53273 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -12,10 +12,10 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	uqs@FreeBSD.org
 COMMENT=	Convert MP3 files to Ogg Vorbis files
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
+RUN_DEPENDS=	mpg123:audio/mpg123 \
+		oggenc:audio/vorbis-tools \
+		p5-MP3-Info>=0:audio/p5-MP3-Info \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	mp32ogg
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 75742f6b4753..0e482c464d0e 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -24,20 +24,20 @@ SIDPLAY_DESC=	Sidplayer support
 
 PORTDOCS=	AUTHORS CREDITS ChangeLog FAQ README TODO
 
-LIRC_LIB_DEPENDS=		liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=		liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_WITH=		lirc
 
-SIDPLAY_LIB_DEPENDS=		libsidplay.so:${PORTSDIR}/audio/libsidplay
+SIDPLAY_LIB_DEPENDS=		libsidplay.so:audio/libsidplay
 SIDPLAY_CONFIGURE_WITH=		sidplay
 
-VORBIS_LIB_DEPENDS=		libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_WITH=		oggvorbis
 
 SDL_CONFIGURE_WITH=	sdl
 SDL_USE=		SDL=yes
 
 NAS_CONFIGURE_WITH=	nas
-NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
+NAS_LIB_DEPENDS=	libaudio.so:audio/nas
 NAS_LDFLAGS=		-laudio
 
 ESOUND_CONFIGURE_WITH=	esd
diff --git a/audio/mp3burn/Makefile b/audio/mp3burn/Makefile
index 691d6a11ea25..92876353c13b 100644
--- a/audio/mp3burn/Makefile
+++ b/audio/mp3burn/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line tool to burn audio CDs from MP3, Ogg, Vorbis, FLAC files
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
-		ogg123:${PORTSDIR}/audio/vorbis-tools \
-		p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-Ogg-Vorbis-Header>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		cdda2wav:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	mpg123:audio/mpg123 \
+		ogg123:audio/vorbis-tools \
+		p5-MP3-Info>=0:audio/p5-MP3-Info \
+		p5-Ogg-Vorbis-Header>=0:audio/p5-Ogg-Vorbis-Header \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		cdda2wav:sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
index 8b21c4dd854b..56507c1a3ac4 100644
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@@ -13,8 +13,8 @@ COMMENT=	CD to mp3c converter with a console frontend
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	mp3info:${PORTSDIR}/audio/mp3info \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+RUN_DEPENDS=	mp3info:audio/mp3info \
+		cdrecord:sysutils/cdrtools
 
 USES=		ncurses
 HAS_CONFIGURE=	yes
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index 2ac03a5c59a9..9742d8904781 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -10,8 +10,8 @@ EXTRACT_SUFX=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for checking and fixing MP3 archive inconsistencies
 
-RUN_DEPENDS=	${LOCALBASE}/bin/id3tool:${PORTSDIR}/audio/id3tool \
-		${LOCALBASE}/bin/mp3_check:${PORTSDIR}/audio/mp3_check
+RUN_DEPENDS=	${LOCALBASE}/bin/id3tool:audio/id3tool \
+		${LOCALBASE}/bin/mp3_check:audio/mp3_check
 
 USES=		shebangfix perl5
 USE_PERL5=	run
diff --git a/audio/mp3lint/Makefile b/audio/mp3lint/Makefile
index ebd540fdf969..eef296c50850 100644
--- a/audio/mp3lint/Makefile
+++ b/audio/mp3lint/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Configurable tool to check collections of audio files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	libmp3-archive-perl>=0:${PORTSDIR}/audio/libmp3-archive-perl
+BUILD_DEPENDS=	libmp3-archive-perl>=0:audio/libmp3-archive-perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/audio/mp3mover/Makefile b/audio/mp3mover/Makefile
index 026cf48df089..083c0da0d6c8 100644
--- a/audio/mp3mover/Makefile
+++ b/audio/mp3mover/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/mediamover/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rename mp3s and manipulate them
 
-RUN_DEPENDS=	p5-tagged>=0:${PORTSDIR}/audio/p5-tagged
+RUN_DEPENDS=	p5-tagged>=0:audio/p5-tagged
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	mp3mover.pl
diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index e196812511e6..91ef2aeaa23d 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mp3 bitrate plot tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 OPTIONS_DEFINE=	GD IMAGEMAGICK
 OPTIONS_DEFAULT=GD
@@ -26,9 +26,9 @@ LIBS+=		-L${LOCALBASE}/lib -lboost_system
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 GD_CONFIGURE_ENABLE=	gd
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
 IMAGEMAGICK_CONFIGURE_ENABLE=	magick
-IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick
 
 BROKEN_powerpc64=	Does not build on powerpc64
 
diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
index 3c5f6d37afa5..6371597c46ce 100644
--- a/audio/mp3riot/Makefile
+++ b/audio/mp3riot/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Mp3riot creates mp3 playlists, HTML files, etc
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
+RUN_DEPENDS=	p5-MP3-Info>=0:audio/p5-MP3-Info
 
 USES=		perl5 shebangfix zip
 SHEBANG_FILES=	mp3riot
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index 76c4a3272d99..8e3659e6788d 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Utility to split mp3 and ogg files (via GTK Interface)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmp3splt.so:${PORTSDIR}/audio/libmp3splt \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libmp3splt.so:audio/libmp3splt \
+		libmad.so:audio/libmad \
+		libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libid3tag.so:audio/libid3tag \
+		libltdl.so:devel/libltdl
 
 INSTALLS_OMF=	yes
 USE_GSTREAMER1=	yes
@@ -39,8 +39,8 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
-#DOCS_LIB_DEPENDS=	libgvc.so:${PORTSDIR}/graphics/graphviz
-#DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+#DOCS_LIB_DEPENDS=	libgvc.so:graphics/graphviz
+#DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
 #DOCS_CONFIGURE_OFF=	--disable-doxygen-doc
 
 .include <bsd.port.mk>
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 99df50d42926..8e7bffd5a98f 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Utility to split MP3 and Ogg files (via CUE sheets)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmp3splt.so:${PORTSDIR}/audio/libmp3splt \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libmp3splt.so:audio/libmp3splt \
+		libltdl.so:devel/libltdl
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index 09435f305259..6f9fc9fe8c00 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/mp3stat \
 OPTIONS_DEFINE=		VORBIS DOCS
 OPTIONS_DEFAULT=	VORBIS
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_PLIST_FILES=	lib/mp3stat/input_vorb.so
 VORBIS_MAKE_ARGS_OFF=	VORBIS=""
 
diff --git a/audio/mp3unicode/Makefile b/audio/mp3unicode/Makefile
index 436c3da4fd3c..d51fc66e2bca 100644
--- a/audio/mp3unicode/Makefile
+++ b/audio/mp3unicode/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://github.com/downloads/alonbl/mp3unicode/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	ID3 tags charset converter
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		iconv pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index 920e682d2266..8dafce7bded0 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -12,8 +12,8 @@ COMMENT=	MPD AudioScrobbler written in C++ supporting the latest protocol
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libmpdclient.so:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libmpdclient.so:audio/libmpdclient
 
 USES=		pkgconfig
 
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 237ecfe64850..6d4b6b3570d5 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK+ client for the Music Player Daemon (MPD)
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd
 
 USES=		gettext iconv python:2 tar:tgz
 USE_GNOME=	intltool pygtk2
@@ -25,6 +25,6 @@ OPTIONS_DEFINE=		MPD
 OPTIONS_DEFAULT=	MPD
 
 MPD_DESC=		Install Music Player Daemon
-MPD_RUN_DEPENDS=	musicpd:${PORTSDIR}/audio/musicpd
+MPD_RUN_DEPENDS=	musicpd:audio/musicpd
 
 .include <bsd.port.mk>
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index 710cb288fb45..0976ff376eb1 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv2
 USES=		gnustep
 USE_GNUSTEP=	base gui back build
 
-LIB_DEPENDS=	libmpdclient.so.2:${PORTSDIR}/audio/libmpdclient \
-		libSQLClient.so:${PORTSDIR}/databases/sqlclient
+LIB_DEPENDS=	libmpdclient.so.2:audio/libmpdclient \
+		libSQLClient.so:databases/sqlclient
 
 post-patch:
 	${REINPLACE_CMD} -e \
diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index c4d13cdfaaeb..c0402ba01df0 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	mpg123el.cgi?${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Front-end to mpg123/ogg123 audio player for Emacsen
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+RUN_DEPENDS=	mpg123:audio/mpg123
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${PORTNAME}-${PORTVERSION}
 NO_WRKSUBDIR=	yes
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index ff25cdb5d51e..6c2f5762d186 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Command-line player for MPEG Layer 1, 2, and 3 audio files
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		tar:bzip2 gmake libtool pathfix
 USE_LDCONFIG=	yes
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 2a50f1250cab..2e8f4950a8fe 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Command-line MP3 player, compatible with mpg123
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	libao.so:audio/libao \
+		libid3tag.so:audio/libid3tag \
+		libmad.so:audio/libmad
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mpg123-symlink
@@ -24,7 +24,7 @@ PLIST_FILES=	bin/mpg321 man/man1/mpg321.1.gz
 OPTIONS_DEFINE=	SCROBBLER
 SCROBBLER_DESC=	Last.fm Audioscrobbler support
 
-SCROBBLER_RUN_DEPENDS=	scrobbler-helper:${PORTSDIR}/audio/p5-Audio-Scrobbler
+SCROBBLER_RUN_DEPENDS=	scrobbler-helper:audio/p5-Audio-Scrobbler
 SCROBBLER_PATCHFILES=	mpg321-0.2.10-scrobbler-01.patch:scrobbler
 SCROBBLER_PATCH_SITES=	http://people.FreeBSD.org/~roam/ports/audio/:scrobbler \
 		http://devel.ringlet.net/audio/mpg321-scrobbler/:scrobbler
diff --git a/audio/mps/Makefile b/audio/mps/Makefile
index 916d3da8231f..de788df2b4ce 100644
--- a/audio/mps/Makefile
+++ b/audio/mps/Makefile
@@ -24,7 +24,7 @@ MPV_DESC=	Mpv media player support
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-MPV_RUN_DEPENDS=	mpv:${PORTSDIR}/multimedia/mpv
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 
 .include <bsd.port.mk>
diff --git a/audio/msbcg729/Makefile b/audio/msbcg729/Makefile
index 5337dc0c4d0d..2b8652386f79 100644
--- a/audio/msbcg729/Makefile
+++ b/audio/msbcg729/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Software G729A codec plugin for Mediastreamer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
-		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer
+LIB_DEPENDS=	libortp.so:net/ortp \
+		libmediastreamer_base.so:net/mediastreamer
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static --disable-strict
diff --git a/audio/msilbc/Makefile b/audio/msilbc/Makefile
index 458fde2dc091..27c78b0926fc 100644
--- a/audio/msilbc/Makefile
+++ b/audio/msilbc/Makefile
@@ -8,9 +8,9 @@ MASTER_SITES=	SAVANNAH/linphone/plugins/sources/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Mediastreamer plugin for the iLBC audio codec
 
-LIB_DEPENDS=	libortp.so:${PORTSDIR}/net/ortp \
-		libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \
-		libilbc.so:${PORTSDIR}/net/ilbc
+LIB_DEPENDS=	libortp.so:net/ortp \
+		libmediastreamer_base.so:net/mediastreamer \
+		libilbc.so:net/ilbc
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile
index b8a7ea0dbf16..d98495909464 100644
--- a/audio/mumble/Makefile
+++ b/audio/mumble/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Voice chat software primarily intended for use while gaming
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libprotoc.so:${PORTSDIR}/devel/protobuf \
-		libopus.so:${PORTSDIR}/audio/opus
+LIB_DEPENDS+=	libspeex.so:audio/speex \
+		libsndfile.so:audio/libsndfile \
+		libboost_iostreams.so:devel/boost-libs \
+		libboost_python.so:devel/boost-python-libs \
+		libprotoc.so:devel/protobuf \
+		libopus.so:audio/opus
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
@@ -52,7 +52,7 @@ USE_QT4+=	dbus
 .if ! ${PORT_OPTIONS:MBONJOUR}
 CONFIG+=	no-bonjour
 .else
-LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	libdns_sd.so:net/mDNSResponder
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile
index fd367cd6ac86..1de8cbc2b628 100644
--- a/audio/murmur/Makefile
+++ b/audio/murmur/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Murmur is the server component of Mumble
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USERS=		murmur
 GROUPS=		murmur
@@ -39,7 +39,7 @@ BONJOUR_DESC=	Bonjour Support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICE}
-LIB_DEPENDS+=	libIce.so:${PORTSDIR}/devel/ice
+LIB_DEPENDS+=	libIce.so:devel/ice
 .else
 CONFIG+=	no-ice
 .endif
@@ -51,7 +51,7 @@ CONFIG+=	no-dbus
 .endif
 
 .if ${PORT_OPTIONS:MBONJOUR}
-LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	libdns_sd.so:net/mDNSResponder
 .else
 CONFIG+=	no-bonjour
 .endif
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 88ff8179547a..e51f792cf6d9 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multiple Streaming Engine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 OPTIONS_DEFINE=	X11 LAME SNDFILE DOCS
 OPTIONS_DEFAULT=X11
@@ -31,9 +31,9 @@ PLIST_FILES=	bin/muse man/man1/muse.1.gz
 PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/muse.mo
 .endfor
 
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENV=	ac_cv_header_lame_lame_h=no
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 X11_USE=		GNOME=gtk20
 X11_CONFIGURE_OFF=	--without-x --with-rubik
 
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index f420152efb71..081359af413d 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Free music composition & notation software
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.GPL
 
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libsndfile.so:audio/libsndfile \
+		libvorbis.so:audio/libvorbis
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils \
 		pkgconfig shared-mime-info zip
@@ -29,16 +29,16 @@ DATADIR=	${PREFIX}/share/mscore-${PORTVERSION:R}
 OPTIONS_DEFINE=		ALSA JACK PORTAUDIO PULSEAUDIO
 OPTIONS_DEFAULT=	PORTAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_ON=		-DBUILD_ALSA:BOOL=ON
 ALSA_CMAKE_OFF=		-DBUILD_ALSA:BOOL=OFF
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CMAKE_ON=		-DBUILD_JACK:BOOL=ON
 JACK_CMAKE_OFF=		-DBUILD_JACK:BOOL=OFF
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_ON=	-DBUILD_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DBUILD_PORTAUDIO:BOOL=OFF
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DBUILD_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DBUILD_PULSEAUDIO:BOOL=OFF
 
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index 67e9a48a4d34..c9b4af6a2c31 100644
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	musicbox-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK+ audio tag editor
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		pathfix pkgconfig shebangfix
 USE_GNOME=	gnomeprefix libglade2
diff --git a/audio/musiccontrol/Makefile b/audio/musiccontrol/Makefile
index 4c5475608526..1322301ddddf 100644
--- a/audio/musiccontrol/Makefile
+++ b/audio/musiccontrol/Makefile
@@ -13,9 +13,9 @@ EXTRACT_ONLY=
 MAINTAINER=	xi@borderworlds.dk
 COMMENT=	Advanced music player
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \
-		${LOCALBASE}/bin/ogg123:${PORTSDIR}/audio/vorbis-tools \
-		${LOCALBASE}/bin/simplemod:${PORTSDIR}/audio/simplemod
+RUN_DEPENDS=	${LOCALBASE}/bin/mpg123:audio/mpg123 \
+		${LOCALBASE}/bin/ogg123:audio/vorbis-tools \
+		${LOCALBASE}/bin/simplemod:audio/simplemod
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile
index 849bb695abf6..daa42d4e8ad6 100644
--- a/audio/musicpc/Makefile
+++ b/audio/musicpc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Command line client for the musicpd
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
 USES=		pkgconfig tar:xz
 GNU_CONFIGURE=	yes
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 12c5f6aa062a..ce9f7f1b0c4c 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -15,8 +15,8 @@ USES=		gmake pkgconfig compiler:c++11-lib tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 
-LIB_DEPENDS=	libboost_iostreams.so:${PORTSDIR}/devel/boost-libs \
-		libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
+		libicudata.so:devel/icu
 
 USE_RC_SUBR=	${PORTNAME}
 CONFIGURE_ARGS+=--disable-alsa --disable-systemd-daemon --disable-roar
@@ -58,75 +58,75 @@ WILDMIDI_DESC=	WildMIDI support (MIDI files)
 OPTIONS_DEFAULT=ID3TAG IPV6 MAD OSS FLAC VORBIS WAV FFMPEG SNDFILE CURL
 
 AAC_CONFIGURE_ENABLE=aac
-AAC_LIB_DEPENDS=libfaad.so:${PORTSDIR}/audio/faad
+AAC_LIB_DEPENDS=libfaad.so:audio/faad
 ADPLUG_CONFIGURE_ENABLE=adplug
-ADPLUG_LIB_DEPENDS=libadplug.so:${PORTSDIR}/audio/libadplug
+ADPLUG_LIB_DEPENDS=libadplug.so:audio/libadplug
 AO_CONFIGURE_ENABLE=ao
-AO_LIB_DEPENDS=libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=libao.so:audio/libao
 CDPARANOIA_CONFIGURE_ENABLE=cdio-paranoia
-CDPARANOIA_LIB_DEPENDS=libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
+CDPARANOIA_LIB_DEPENDS=libcdda_paranoia.so:audio/cdparanoia
 CURL_CONFIGURE_ENABLE=curl
-CURL_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=libcurl.so:ftp/curl
 FFMPEG_CONFIGURE_ENABLE=ffmpeg
-FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
-			libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+			libavformat.so:multimedia/ffmpeg \
+			libavutil.so:multimedia/ffmpeg
 FLAC_CONFIGURE_ENABLE=flac
-FLAC_LIB_DEPENDS=libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=libFLAC.so:audio/flac
 FLUIDSYNTH_CONFIGURE_ENABLE=fluidsynth
-FLUIDSYNTH_LIB_DEPENDS=libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=libfluidsynth.so:audio/fluidsynth
 GME_CONFIGURE_ENABLE=gme
-GME_LIB_DEPENDS=libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS=libgme.so:audio/libgme
 HTTPD_CONFIGURE_ENABLE=httpd-output
 ID3TAG_CONFIGURE_ENABLE=id3
-ID3TAG_LIB_DEPENDS=libid3tag.so:${PORTSDIR}/audio/libid3tag
+ID3TAG_LIB_DEPENDS=libid3tag.so:audio/libid3tag
 IPV6_CONFIGURE_ENABLE=ipv6
 JACK_CONFIGURE_ENABLE=jack
-JACK_LIB_DEPENDS=libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=libjack.so:audio/jack
 LAME_CONFIGURE_ENABLE=lame-encoder
-LAME_LIB_DEPENDS=libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=libmp3lame.so:audio/lame
 MAD_CONFIGURE_ENABLE=mad
-MAD_LIB_DEPENDS=libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=libmad.so:audio/libmad
 MIKMOD_CONFIGURE_ENABLE=mikmod
-MIKMOD_LIB_DEPENDS=libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=libmikmod.so:audio/libmikmod
 MMS_CONFIGURE_ENABLE=mms
-MMS_LIB_DEPENDS=libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=libmms.so:net/libmms
 MODPLUG_CONFIGURE_ENABLE=modplug
-MODPLUG_LIB_DEPENDS=libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=libmodplug.so:audio/libmodplug
 MPG123_CONFIGURE_ENABLE=mpg123
-MPG123_LIB_DEPENDS=libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=libmpg123.so:audio/mpg123
 MUSEPACK_CONFIGURE_ENABLE=mpc
-MUSEPACK_LIB_DEPENDS=libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_LIB_DEPENDS=libmpcdec.so:audio/musepack
 OPENAL_CONFIGURE_ENABLE=openal
-OPENAL_LIB_DEPENDS=libopenal.so:${PORTSDIR}/audio/openal
+OPENAL_LIB_DEPENDS=libopenal.so:audio/openal
 OPUS_CONFIGURE_ENABLE=opus
-OPUS_LIB_DEPENDS=libopus.so:${PORTSDIR}/audio/opus
+OPUS_LIB_DEPENDS=libopus.so:audio/opus
 OSS_CONFIGURE_ENABLE=oss
 PIPE_CONFIGURE_ENABLE=pipe-output
 PULSEAUDIO_CONFIGURE_ENABLE=pulse
-PULSEAUDIO_LIB_DEPENDS=libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=libpulse.so:audio/pulseaudio
 SAMPLERATE_CONFIGURE_ENABLE=lsr
-SAMPLERATE_LIB_DEPENDS=libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_LIB_DEPENDS=libsamplerate.so:audio/libsamplerate
 SIDPLAY2_CONFIGURE_ENABLE=sidplay
-SIDPLAY2_LIB_DEPENDS=libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+SIDPLAY2_LIB_DEPENDS=libsidplay2.so:audio/libsidplay2
 SNDFILE_CONFIGURE_ENABLE=sndfile
-SNDFILE_LIB_DEPENDS=libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=libsndfile.so:audio/libsndfile
 SQLITE3_CONFIGURE_ENABLE=sqlite
-SQLITE3_LIB_DEPENDS=libsqlite3.so:${PORTSDIR}/databases/sqlite3
+SQLITE3_LIB_DEPENDS=libsqlite3.so:databases/sqlite3
 TREMOR_CONFIGURE_WITH=tremor
-TREMOR_LIB_DEPENDS=libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_LIB_DEPENDS=libvorbisidec.so:audio/libtremor
 TWOLAME_CONFIGURE_ENABLE=twolame-encoder
-TWOLAME_LIB_DEPENDS=libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=libtwolame.so:audio/twolame
 VORBISENC_CONFIGURE_ENABLE=vorbis-encoder
-VORBISENC_LIB_DEPENDS=libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+VORBISENC_LIB_DEPENDS=libvorbisenc.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
-VORBIS_LIB_DEPENDS=libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=libvorbis.so:audio/libvorbis
 WAV_CONFIGURE_ENABLE=audiofile
-WAV_LIB_DEPENDS=libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+WAV_LIB_DEPENDS=libaudiofile.so:audio/libaudiofile
 WAVPACK_CONFIGURE_ENABLE=wavpack
-WAVPACK_LIB_DEPENDS=libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=libwavpack.so:audio/wavpack
 WILDMIDI_CONFIGURE_ENABLE=wildmidi
-WILDMIDI_LIB_DEPENDS=libWildMidi.so:${PORTSDIR}/audio/wildmidi
+WILDMIDI_LIB_DEPENDS=libWildMidi.so:audio/wildmidi
 
 MPDUSER?=	mpd
 MPDGROUP?=	mpd
@@ -153,8 +153,8 @@ IGNORE=${MSG}  You also have musicpd.conf-- check carefully to see which one you
 CONFIGURE_ARGS+=--enable-bzip2 \
 		--enable-zzip \
 		--enable-iso9660
-LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib \
-		libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+LIB_DEPENDS+=	libzzip.so:devel/zziplib \
+		libcdio_paranoia.so:sysutils/libcdio-paranoia
 .else
 CONFIGURE_ARGS+=--disable-bzip2 \
 		--disable-zzip \
@@ -163,14 +163,14 @@ CONFIGURE_ARGS+=--disable-bzip2 \
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=--with-zeroconf=avahi
-LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 .else
 CONFIGURE_ARGS+=--with-zeroconf=no
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 CONFIGURE_ARGS+=--with-zeroconf=bonjour
-LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	libdns_sd.so:net/mDNSResponder
 .else
 CONFIGURE_ARGS+=--with-zeroconf=no
 .endif
@@ -181,7 +181,7 @@ CONFIGURE_ARGS+=--with-zeroconf=no
 .  if ${PORT_OPTIONS:MTREMOR}
 IGNORE=		shoutcast and tremor do not coexist; use vorbis instead
 .  endif
-LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout
+LIB_DEPENDS+=	libshout.so:audio/libshout
 CONFIGURE_ARGS+=--enable-vorbis-encoder \
 		--enable-shout
 .else
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 36c170bbf343..71b554d10777 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	mythplugin-
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Music playing plugin for MythTV
 
-LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float
-BUILD_DEPENDS=	mythfrontend:${PORTSDIR}/multimedia/mythtv
+LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+		libFLAC.so:audio/flac \
+		libvorbis.so:audio/libvorbis \
+		libtag.so:audio/taglib \
+		libfftw3f.so:math/fftw3-float
+BUILD_DEPENDS=	mythfrontend:multimedia/mythtv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index b71e6cdc8c6c..4c464a27c47f 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ncurses client for the musicpd
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 47b0b90c0d21..130149fc695f 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -11,9 +11,9 @@ COMMENT=	ncurses mpd client, clone of ncmpc with some new features
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libboost_filesystem.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
+		libfftw3.so:math/fftw3 \
+		libboost_filesystem.so:devel/boost-libs
 
 USES=		compiler:c++11-lib iconv libtool ncurses:port pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
@@ -34,19 +34,19 @@ PLIST_FILES=	bin/ncmpcpp \
 		man/man1/ncmpcpp.1.gz
 PORTDOCS=	AUTHORS COPYING NEWS bindings config
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	curl
 
 CLOCK_CONFIGURE_ENABLE=	clock
 
 UTF8_CONFIGURE_ENABLE=	unicode
 
-TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
 TAGLIB_CONFIGURE_WITH=	taglib
 
 OUTPUTS_CONFIGURE_ENABLE=	outputs
 
-VISUALIZER_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
+VISUALIZER_BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
 VISUALIZER_CONFIGURE_ENABLE=	visualizer
 
 .include <bsd.port.pre.mk>
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index dfdb9fd5f107..0e377ddd74aa 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -11,10 +11,10 @@ COMMENT=	DSSI plugin that emulates the sound of the TB-303 Bassline
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libjack.so:${PORTSDIR}/audio/jack
+BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:audio/dssi
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libjack.so:audio/jack
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gordonjcp
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 215774f3724c..f8a984943cb4 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	alex@fafula.com
 COMMENT=	Tool for adjusting the volume of wave/MP3 files to a standard level
 
-LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	libmad.so:audio/libmad
 
 USES=		shebangfix perl5 tar:bzip2 libtool
 USE_PERL5=	run
@@ -25,12 +25,12 @@ OPTIONS_DEFAULT=	MP3
 OPTIONS_SUB=	yes
 XMMS_DESC=	XMMS plugin
 
-XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_ENABLE=	xmms
-MP3_RUN_DEPENDS+=	madplay:${PORTSDIR}/audio/madplay \
-			lame:${PORTSDIR}/audio/lame
-OGG_RUN_DEPENDS=	oggdec:${PORTSDIR}/audio/vorbis-tools
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+MP3_RUN_DEPENDS+=	madplay:audio/madplay \
+			lame:audio/lame
+OGG_RUN_DEPENDS=	oggdec:audio/vorbis-tools
+FLAC_RUN_DEPENDS=	flac:audio/flac
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 54520d7e114a..aa69faf8af0a 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Legendary Open Cubic Player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libsidplay.so:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS=	libid3tag.so:audio/libid3tag \
+		libmad.so:audio/libmad \
+		libvorbis.so:audio/libvorbis \
+		libsidplay.so:audio/libsidplay
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -51,7 +51,7 @@ OPTIONS_DEFAULT=ADPLUG FLAC MIDI X11 SDL
 .include <bsd.port.options.mk>
 
 .if exists(${TIMIDITY_CFG}) || ${PORT_OPTIONS:MMIDI}
-RUN_DEPENDS+=	eawpats>0:${PORTSDIR}/audio/eawpats
+RUN_DEPENDS+=	eawpats>0:audio/eawpats
 .endif
 
 .if ${PORT_OPTIONS:MX11}
@@ -64,7 +64,7 @@ PLIST_SUB+=		XORG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MADPLUG}
-LIB_DEPENDS+=		libadplug.so:${PORTSDIR}/audio/libadplug
+LIB_DEPENDS+=		libadplug.so:audio/libadplug
 CONFIGURE_ARGS+=	--with-adplug
 PLIST_SUB+=		ADPLUG=""
 .else
@@ -88,7 +88,7 @@ PLIST_SUB+=		DESKTOP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=		libFLAC.so:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=		libFLAC.so:audio/flac
 CONFIGURE_ARGS+=	--with-flac
 PLIST_SUB+=		FLAC=""
 .else
diff --git a/audio/ogg2mp3/Makefile b/audio/ogg2mp3/Makefile
index c5b46facaa44..1836f2f4a66a 100644
--- a/audio/ogg2mp3/Makefile
+++ b/audio/ogg2mp3/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Perl script that converts Ogg Vorbis files to MP3 format
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
-		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
-		ogginfo:${PORTSDIR}/audio/vorbis-tools
+RUN_DEPENDS=	lame:audio/lame \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
+		ogginfo:audio/vorbis-tools
 
 NO_BUILD=	yes
 USES=		perl5 tar:bzip2
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index d26ea916c9b0..791e75db0176 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -30,19 +30,19 @@ CONFIG_DESC=		Install configuration utility (needs Qt 4.x)
 
 #ALSA_CMAKE_ON=		-DALSOFT_REQUIRE_ALSA:BOOL=ON
 #ALSA_CMAKE_OFF=		-DALSOFT_BACKEND_ALSA:BOOL=OFF
-#ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+#ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 CONFIG_CMAKE_ON=	-DALSOFT_NO_CONFIG_UTIL:BOOL=OFF
 CONFIG_CMAKE_OFF=	-DALSOFT_NO_CONFIG_UTIL:BOOL=ON
 CONFIG_USE=		QT4=gui
 FLUIDSYNTH_CMAKE_ON=	-DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
-FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 PORTAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PULSEAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 
 post-patch:
 	@${REINPLACE_CMD} 's|/etc/openal|${ETCDIR}|' \
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 2e004065b1d3..3b404e6372cd 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -33,13 +33,13 @@ ESOUND_USE=		GNOME=esound
 ESOUND_CONFIGURE_ENABLE=esd
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_ENABLE=	sdl
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
-SMPEG_LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg
 SMPEG_CONFIGURE_ENABLE=	mp3
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
-ASM_BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+ASM_BUILD_DEPENDS=	nasm:devel/nasm
 
 NOT_FOR_ARCHS=	ia64
 NOT_FOR_ARCHS_REASON_ia64=	does not compile
diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile
index f311d3c77ade..657b0e961b83 100644
--- a/audio/opus-tools/Makefile
+++ b/audio/opus-tools/Makefile
@@ -14,9 +14,9 @@ LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libopus.so:${PORTSDIR}/audio/opus
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libogg.so:audio/libogg \
+		libopus.so:audio/opus
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index c309c116f629..c12751a1925b 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Opus playback library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libopus.so:${PORTSDIR}/audio/opus
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libopus.so:audio/opus
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	DOXYGEN DOCS
 OPTIONS_DEFAULT=	# empty
 
 DOXYGEN_CONFIGURE_ENABLE=	doc
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 CONFIGURE_ARGS+=	--disable-examples
 INSTALL_TARGET=	install-strip
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index b83cd7bdfa09..1e84db659177 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-beta
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Audio Library Project
 
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS=	mpg123:audio/mpg123
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libvorbis.so:audio/libvorbis
 
 USES=		libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 300f15e7f7ec..f70ad67792f1 100644
--- a/audio/osd-lyrics/Makefile
+++ b/audio/osd-lyrics/Makefile
@@ -13,9 +13,9 @@ COMMENT=	On-screen lyrics display program for various media players
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libnotify.so:devel/libnotify \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libcurl.so:ftp/curl
 
 USES=		desktop-file-utils gettext gmake iconv localbase pkgconfig
 USE_GNOME=	gtk20 intltool
@@ -34,10 +34,10 @@ MPD_DESC=	MPD support
 XMMS2_DESC=	XMMS2 support
 AMAROK_DESC=	Amarok 1.4 support
 
-MPD_LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
+MPD_LIB_DEPENDS=	libmpd.so:audio/libmpd
 MPD_CONFIGURE_OFF=	--disable-mpd
 
-XMMS2_LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
+XMMS2_LIB_DEPENDS=	libxmmsclient.so:audio/xmms2
 XMMS2_CONFIGURE_OFF=	--disable-xmms2
 
 AMAROK_CONFIGURE_ON=	--enable-amarok1
diff --git a/audio/osdmixer/Makefile b/audio/osdmixer/Makefile
index 6aea07ed4ce6..08c8d635c81b 100644
--- a/audio/osdmixer/Makefile
+++ b/audio/osdmixer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Displays audio volume with an OSD
 
-LIB_DEPENDS=	libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS=	libxosd.so:misc/xosd
 
 PLIST_FILES=	bin/osdmixer
 
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 57a09dc3c3dc..d119091f390c 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open Sound System
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+BUILD_DEPENDS=	gawk:lang/gawk
 
 USES=		tar:bzip2 kmod pkgconfig
 ALL_TARGET=	all install
@@ -43,7 +43,7 @@ CONFIGURE_ENV=	CC="${CC}" HOSTCC="${CC}"
 OPTIONS_DEFINE=	VORBIS
 OPTIONS_DEFAULT=VORBIS
 
-VORBIS_LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis
 VORBIS_CONFIGURE_ENV=	OGG_SUPPORT=YES
 
 pre-patch:
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 8c372353c1ef..17c8c22a40a8 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to libcdaudio (cd + cddb)
 
-LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
+LIB_DEPENDS=	libcdaudio.so:audio/libcdaudio
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Audio-Ecasound/Makefile b/audio/p5-Audio-Ecasound/Makefile
index 83e42ff2e229..d0c5c9c90889 100644
--- a/audio/p5-Audio-Ecasound/Makefile
+++ b/audio/p5-Audio-Ecasound/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for ecasound sampler, recorder, fx-processor
 
-BUILD_DEPENDS=	libecasoundc-config:${PORTSDIR}/audio/ecasound
+BUILD_DEPENDS=	libecasoundc-config:audio/ecasound
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Audio-FLAC-Header/Makefile b/audio/p5-Audio-FLAC-Header/Makefile
index 6356aa037810..e8cb13534362 100644
--- a/audio/p5-Audio-FLAC-Header/Makefile
+++ b/audio/p5-Audio-FLAC-Header/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to FLAC header metadata
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+LIB_DEPENDS=	libFLAC.so:audio/flac
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Audio-MPD-Common/Makefile b/audio/p5-Audio-MPD-Common/Makefile
index 983ab137a63b..b44c4766e381 100644
--- a/audio/p5-Audio-MPD-Common/Makefile
+++ b/audio/p5-Audio-MPD-Common/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Bunch of common helper classes for mpd
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Moose>=0.92:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly \
-		p5-String-Formatter>=0:${PORTSDIR}/devel/p5-String-Formatter
+BUILD_DEPENDS=	p5-Moose>=0.92:devel/p5-Moose \
+		p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Readonly>=0:devel/p5-Readonly \
+		p5-String-Formatter>=0:devel/p5-String-Formatter
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-Audio-MPD/Makefile b/audio/p5-Audio-MPD/Makefile
index 71ab9812bfa5..b4fda49f8cb6 100644
--- a/audio/p5-Audio-MPD/Makefile
+++ b/audio/p5-Audio-MPD/Makefile
@@ -13,16 +13,16 @@ COMMENT=	Class to talk to MPD (Music Player Daemon) servers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Audio-MPD-Common>=0:${PORTSDIR}/audio/p5-Audio-MPD-Common \
-		p5-Getopt-Euclid>=0:${PORTSDIR}/devel/p5-Getopt-Euclid \
-		p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP \
-		p5-Moose>=0:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-Has-Sugar>=0:${PORTSDIR}/devel/p5-MooseX-Has-Sugar \
-		p5-MooseX-SemiAffordanceAccessor>=0:${PORTSDIR}/devel/p5-MooseX-SemiAffordanceAccessor \
-		p5-MooseX-Types>=0:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon
+BUILD_DEPENDS=	p5-Audio-MPD-Common>=0:audio/p5-Audio-MPD-Common \
+		p5-Getopt-Euclid>=0:devel/p5-Getopt-Euclid \
+		p5-IO-Socket-IP>=0:net/p5-IO-Socket-IP \
+		p5-Moose>=0:devel/p5-Moose \
+		p5-MooseX-Has-Sugar>=0:devel/p5-MooseX-Has-Sugar \
+		p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \
+		p5-MooseX-Types>=0:devel/p5-MooseX-Types \
+		p5-Proc-Daemon>=0:devel/p5-Proc-Daemon
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Corpus-Audio-MPD>=1.113282:${PORTSDIR}/audio/p5-Test-Corpus-Audio-MPD
+TEST_DEPENDS=	p5-Test-Corpus-Audio-MPD>=1.113282:audio/p5-Test-Corpus-Audio-MPD
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/audio/p5-Audio-Musepack/Makefile b/audio/p5-Audio-Musepack/Makefile
index d9f47e50c8f5..d4ce9f6ae8de 100644
--- a/audio/p5-Audio-Musepack/Makefile
+++ b/audio/p5-Audio-Musepack/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface to Musepack file information and APE tag fields
 
-BUILD_DEPENDS=	p5-MP3-Info>=1.20:${PORTSDIR}/audio/p5-MP3-Info \
-		p5-Audio-Scan>=0.85:${PORTSDIR}/audio/p5-Audio-Scan
+BUILD_DEPENDS=	p5-MP3-Info>=1.20:audio/p5-MP3-Info \
+		p5-Audio-Scan>=0.85:audio/p5-Audio-Scan
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-Audio-Scan/Makefile b/audio/p5-Audio-Scan/Makefile
index 5f55c0ba60f6..82295e35aed1 100644
--- a/audio/p5-Audio-Scan/Makefile
+++ b/audio/p5-Audio-Scan/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Scanner for audio file metadata and tag information
 
 LICENSE=	GPLv2
 
-TEST_DEPENDS=	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+TEST_DEPENDS=	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Audio-Scrobbler/Makefile b/audio/p5-Audio-Scrobbler/Makefile
index b633587c0fcb..fa3c8884fee4 100644
--- a/audio/p5-Audio-Scrobbler/Makefile
+++ b/audio/p5-Audio-Scrobbler/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl interface to Last.fm and AudioScrobbler
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
-		p5-libwww>=5:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Config-IniFiles>=0:devel/p5-Config-IniFiles \
+		p5-libwww>=5:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-Audio-Wav/Makefile b/audio/p5-Audio-Wav/Makefile
index 3408d5d67c53..a66551306a60 100644
--- a/audio/p5-Audio-Wav/Makefile
+++ b/audio/p5-Audio-Wav/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl modules for reading and writing Microsoft WAV files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-Audio/Makefile b/audio/p5-Audio/Makefile
index 16bb68521403..203e90390ff3 100644
--- a/audio/p5-Audio/Makefile
+++ b/audio/p5-Audio/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Audio manipulation routines for perl
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Math-GSL>=0:${PORTSDIR}/math/p5-Math-GSL
+BUILD_DEPENDS=	p5-Math-GSL>=0:math/p5-Math-GSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-Filesys-Virtual-DAAP/Makefile b/audio/p5-Filesys-Virtual-DAAP/Makefile
index b74c3681c893..0de950ebea38 100644
--- a/audio/p5-Filesys-Virtual-DAAP/Makefile
+++ b/audio/p5-Filesys-Virtual-DAAP/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Present a DAAP share as a VFS
 
-RUN_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
-		p5-Filesys-Virtual>=0:${PORTSDIR}/devel/p5-Filesys-Virtual \
-		p5-Filesys-Virtual-Plain>=0:${PORTSDIR}/devel/p5-Filesys-Virtual-Plain \
-		p5-Net-DAAP-Client>=0:${PORTSDIR}/audio/p5-Net-DAAP-Client
+RUN_DEPENDS=	p5-Class-Accessor>=0:devel/p5-Class-Accessor \
+		p5-Filesys-Virtual>=0:devel/p5-Filesys-Virtual \
+		p5-Filesys-Virtual-Plain>=0:devel/p5-Filesys-Virtual-Plain \
+		p5-Net-DAAP-Client>=0:audio/p5-Net-DAAP-Client
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-MIDI/Makefile b/audio/p5-MIDI/Makefile
index 7a3d04d63693..243dfa3a88f3 100644
--- a/audio/p5-MIDI/Makefile
+++ b/audio/p5-MIDI/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	GD
 USES=		perl5
 USE_PERL5=	configure
 
-GD_BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
-GD_RUN_DEPENDS=		p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+GD_BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD
+GD_RUN_DEPENDS=		p5-GD>=0:graphics/p5-GD
 
 .include <bsd.port.mk>
diff --git a/audio/p5-MP3-Find/Makefile b/audio/p5-MP3-Find/Makefile
index 809aa7c7368f..dc8a73fda447 100644
--- a/audio/p5-MP3-Find/Makefile
+++ b/audio/p5-MP3-Find/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Search and sort MP3 files based on their ID3 tags
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
+BUILD_DEPENDS=	p5-MP3-Info>=0:audio/p5-MP3-Info
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
@@ -23,9 +23,9 @@ USE_PERL5=	configure
 OPTIONS_DEFINE=	DB
 DB_DESC=	Use database backend
 
-DB_BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-			p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-			p5-SQL-Abstract>=0:${PORTSDIR}/databases/p5-SQL-Abstract
+DB_BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+			p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+			p5-SQL-Abstract>=0:databases/p5-SQL-Abstract
 DB_RUN_DEPENDS=		${DB_BUILD_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/audio/p5-MP3-Tag-Utils/Makefile b/audio/p5-MP3-Tag-Utils/Makefile
index 4f67eb976dd1..6eaeeef7c74c 100644
--- a/audio/p5-MP3-Tag-Utils/Makefile
+++ b/audio/p5-MP3-Tag-Utils/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Assorted utilities for manipulating MP3 files via MP3::Tag
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-MP3-Tag>=1.13:${PORTSDIR}/audio/p5-MP3-Tag \
-		p5-Text-NeatTemplate>=0.10.01:${PORTSDIR}/textproc/p5-Text-NeatTemplate
+BUILD_DEPENDS=	p5-MP3-Tag>=1.13:audio/p5-MP3-Tag \
+		p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/audio/p5-Music-Audioscrobbler-MPD/Makefile b/audio/p5-Music-Audioscrobbler-MPD/Makefile
index 29ee9e947b8c..df6af0a23f9e 100644
--- a/audio/p5-Music-Audioscrobbler-MPD/Makefile
+++ b/audio/p5-Music-Audioscrobbler-MPD/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module to submit songs to last.fm from MPD
 
-BUILD_DEPENDS=	p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-Music-Audioscrobbler-Submit>=0.05:${PORTSDIR}/audio/p5-Music-Audioscrobbler-Submit
-RUN_DEPENDS:=	p5-Proc-Daemon>=0:${PORTSDIR}/devel/p5-Proc-Daemon \
-		p5-Music-Audioscrobbler-Submit>=0.05:${PORTSDIR}/audio/p5-Music-Audioscrobbler-Submit
+BUILD_DEPENDS=	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+		p5-Music-Audioscrobbler-Submit>=0.05:audio/p5-Music-Audioscrobbler-Submit
+RUN_DEPENDS:=	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
+		p5-Music-Audioscrobbler-Submit>=0.05:audio/p5-Music-Audioscrobbler-Submit
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Music-Audioscrobbler-Submit/Makefile b/audio/p5-Music-Audioscrobbler-Submit/Makefile
index e6a7b47dc494..e023cdd51d1c 100644
--- a/audio/p5-Music-Audioscrobbler-Submit/Makefile
+++ b/audio/p5-Music-Audioscrobbler-Submit/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module to submit songs to last.fm from MPD
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Config-Options>=0.8:${PORTSDIR}/devel/p5-Config-Options
-RUN_DEPENDS:=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Config-Options>=0.8:${PORTSDIR}/devel/p5-Config-Options
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww \
+		p5-Config-Options>=0.8:devel/p5-Config-Options
+RUN_DEPENDS:=	p5-libwww>=0:www/p5-libwww \
+		p5-Config-Options>=0.8:devel/p5-Config-Options
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-MusicBrainz-DiscID/Makefile b/audio/p5-MusicBrainz-DiscID/Makefile
index 93719113b135..1330b372f9ac 100644
--- a/audio/p5-MusicBrainz-DiscID/Makefile
+++ b/audio/p5-MusicBrainz-DiscID/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobias.rehbein@web.de
 COMMENT=	Perl interface for the MusicBrainz libdiscid library
 
-BUILD_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
-LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
+BUILD_DEPENDS=	p5-Test-Pod>=0:devel/p5-Test-Pod
+LIB_DEPENDS=	libdiscid.so:audio/libdiscid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pkgconfig perl5
diff --git a/audio/p5-Net-DAAP-Client/Makefile b/audio/p5-Net-DAAP-Client/Makefile
index f1b94f7740a6..ee562d804a44 100644
--- a/audio/p5-Net-DAAP-Client/Makefile
+++ b/audio/p5-Net-DAAP-Client/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Client for Apple iTunes DAAP service
 
-RUN_DEPENDS=	p5-Digest-MD5-M4p>=0:${PORTSDIR}/security/p5-Digest-MD5-M4p \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Net-DAAP-DMAP>=0:${PORTSDIR}/audio/p5-Net-DAAP-DMAP
+RUN_DEPENDS=	p5-Digest-MD5-M4p>=0:security/p5-Digest-MD5-M4p \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Net-DAAP-DMAP>=0:audio/p5-Net-DAAP-DMAP
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-Net-DAAP-DMAP/Makefile b/audio/p5-Net-DAAP-DMAP/Makefile
index 622c610f4c5b..0a1aa4bac29a 100644
--- a/audio/p5-Net-DAAP-DMAP/Makefile
+++ b/audio/p5-Net-DAAP-DMAP/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Perl module for reading and writing DAAP structures
 
-BUILD_DEPENDS=	p5-Math-BigInt>0:${PORTSDIR}/math/p5-Math-BigInt
+BUILD_DEPENDS=	p5-Math-BigInt>0:math/p5-Math-BigInt
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Data-HexDump>0:${PORTSDIR}/devel/p5-Data-HexDump \
-		p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences
+TEST_DEPENDS=	p5-Data-HexDump>0:devel/p5-Data-HexDump \
+		p5-Test-Differences>0:devel/p5-Test-Differences
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile
index e00cddbbe600..05eac8a95eb7 100644
--- a/audio/p5-Net-FreeDB/Makefile
+++ b/audio/p5-Net-FreeDB/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Get the CDID of an audio CD and query the FreeDB servers
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-CDDB-File>=0:${PORTSDIR}/audio/p5-CDDB-File  \
-		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo
+BUILD_DEPENDS=	p5-CDDB-File>=0:audio/p5-CDDB-File  \
+		p5-Moo>=0:devel/p5-Moo
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		alias perl5
diff --git a/audio/p5-Net-LibLO/Makefile b/audio/p5-Net-LibLO/Makefile
index 2405fcc47fdc..d797ac91d1bc 100644
--- a/audio/p5-Net-LibLO/Makefile
+++ b/audio/p5-Net-LibLO/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension for liblo Lightweight OSC library
 
-LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
+LIB_DEPENDS=	liblo.so:audio/liblo
 
 USES=		pkgconfig perl5
 USE_PERL5=	modbuild
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
index 91af603d38c3..13050de7f593 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dominique.goncalves@gmail.com
 COMMENT=	Manipulate / fetch info from Ogg-Vorbis audio files
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	ogginfo.pl
diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile
index d9e4315dda73..4bfa42659572 100644
--- a/audio/p5-Ogg-Vorbis-Header/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Manipulate / fetch info from Ogg-Vorbis audio files
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline \
-		p5-Inline-C>=0:${PORTSDIR}/devel/p5-Inline-C
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+BUILD_DEPENDS=	p5-Inline>=0:devel/p5-Inline \
+		p5-Inline-C>=0:devel/p5-Inline-C
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile
index ae56a30ca599..82a3ea440108 100644
--- a/audio/p5-Shout/Makefile
+++ b/audio/p5-Shout/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl glue for libshout MP3 streaming source library
 
-LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+LIB_DEPENDS=	libshout.so:audio/libshout
 
 USES=		perl5 pkgconfig shebangfix
 USE_PERL5=	configure
diff --git a/audio/p5-Test-Corpus-Audio-MPD/Makefile b/audio/p5-Test-Corpus-Audio-MPD/Makefile
index ccda9d1882b3..ccfa57ef9a65 100644
--- a/audio/p5-Test-Corpus-Audio-MPD/Makefile
+++ b/audio/p5-Test-Corpus-Audio-MPD/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automate launching of fake mdp for testing purposes
 
-BUILD_DEPENDS=	p5-File-ShareDir-PathClass>0:${PORTSDIR}/devel/p5-File-ShareDir-PathClass \
-		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
-		p5-Readonly>=0:${PORTSDIR}/devel/p5-Readonly
+BUILD_DEPENDS=	p5-File-ShareDir-PathClass>0:devel/p5-File-ShareDir-PathClass \
+		p5-Path-Class>=0:devel/p5-Path-Class \
+		p5-Readonly>=0:devel/p5-Readonly
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index b0b794e691e6..4166b7a06880 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-perl-${PORTVERSION}
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Ogg Vorbis streams
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-xmms2/Makefile b/audio/p5-xmms2/Makefile
index d159513fdd29..d135ff834cad 100644
--- a/audio/p5-xmms2/Makefile
+++ b/audio/p5-xmms2/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Perl Bindings for XMMS2
 
-LIB_DEPENDS+=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+=	libxmmsclient.so:audio/xmms2
 
 MASTERDIR=	${.CURDIR}/../xmms2
 
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index c8d1d4401a25..6878dfd9f970 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Perl Audio Converter
 
 LICENSE=	GPLv3+
 
-RUN_DEPENDS=	p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header \
-		p5-Audio-Scan>0:${PORTSDIR}/audio/p5-Audio-Scan \
-		p5-CDDB_get>0:${PORTSDIR}/audio/p5-CDDB_get \
-		p5-MP3-Tag>0:${PORTSDIR}/audio/p5-MP3-Tag \
-		p5-Parallel-ForkManager>0:${PORTSDIR}/devel/p5-Parallel-ForkManager \
-		p5-Switch>0:${PORTSDIR}/lang/p5-Switch
+RUN_DEPENDS=	p5-Audio-FLAC-Header>0:audio/p5-Audio-FLAC-Header \
+		p5-Audio-Scan>0:audio/p5-Audio-Scan \
+		p5-CDDB_get>0:audio/p5-CDDB_get \
+		p5-MP3-Tag>0:audio/p5-MP3-Tag \
+		p5-Parallel-ForkManager>0:devel/p5-Parallel-ForkManager \
+		p5-Switch>0:lang/p5-Switch
 
 NO_ARCH=	yes
 
@@ -31,32 +31,32 @@ OPTIONS_DEFINE=		APE CDPARANOIA DOCS FAAC FAAD FFMPEG KDE4 \
 OPTIONS_DEFAULT=	CDPARANOIA FAAC FAAD FFMPEG LAME VORBIS
 OPTIONS_SUB=		yes
 
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
-CDPARANOIA_RUN_DEPENDS=	cdparanoia:${PORTSDIR}/audio/cdparanoia
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
-FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
-FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+APE_RUN_DEPENDS=	mac:audio/mac
+CDPARANOIA_RUN_DEPENDS=	cdparanoia:audio/cdparanoia
+FAAC_RUN_DEPENDS=	faac:audio/faac
+FAAD_RUN_DEPENDS=	faad:audio/faad
+FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 KDE4_DESC=		Konqueror/Dolphin integration
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
+LAME_RUN_DEPENDS=	lame:audio/lame
 LAUDIO_DESC=		Laudio support
-LAUDIO_RUN_DEPENDS=	laudio:${PORTSDIR}/audio/linux-laudio
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-MUSEPACK_RUN_DEPENDS=	mpcenc:${PORTSDIR}/audio/musepack
+LAUDIO_RUN_DEPENDS=	laudio:audio/linux-laudio
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MUSEPACK_RUN_DEPENDS=	mpcenc:audio/musepack
 OPTIMFROG_DESC=		OptimFROG lossless audio support
-OPTIMFROG_RUN_DEPENDS=	ofr:${PORTSDIR}/audio/optimfrog
+OPTIMFROG_RUN_DEPENDS=	ofr:audio/optimfrog
 OPUS_DESC=		Ogg Opus audio codec support
-OPUS_RUN_DEPENDS=	opusenc:${PORTSDIR}/audio/opus-tools
-SNDFILE_RUN_DEPENDS=	sndfile-convert:${PORTSDIR}/audio/libsndfile
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
+OPUS_RUN_DEPENDS=	opusenc:audio/opus-tools
+SNDFILE_RUN_DEPENDS=	sndfile-convert:audio/libsndfile
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
 SHORTEN_DESC=		Shorten audio support
-SHORTEN_RUN_DEPENDS=	shorten:${PORTSDIR}/audio/shorten
+SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
 SOX_DESC=		Audio conversion support via SoX
-SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
-SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/audio/speex
-TOOLAME_RUN_DEPENDS+=	toolame:${PORTSDIR}/audio/toolame
-TTA_RUN_DEPENDS=	ttaenc:${PORTSDIR}/audio/tta
-VORBIS_RUN_DEPENDS=	vorbiscomment:${PORTSDIR}/audio/vorbis-tools
-WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}/audio/wavpack
+SOX_RUN_DEPENDS=	sox:audio/sox
+SPEEX_RUN_DEPENDS=	speexenc:audio/speex
+TOOLAME_RUN_DEPENDS+=	toolame:audio/toolame
+TTA_RUN_DEPENDS=	ttaenc:audio/tta
+VORBIS_RUN_DEPENDS=	vorbiscomment:audio/vorbis-tools
+WAVPACK_RUN_DEPENDS=	wavpack:audio/wavpack
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index 253a352da232..761b02781c8a 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Gtk frontend for PulseAudio
 
-LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24 \
+		libpulse.so:audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 7cd388b853f6..1442cc99540a 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK configuration dialog for PulseAudio
 
-LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24 \
+		libpulse.so:audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	PK NLS
 OPTIONS_SUB=	yes
 PK_DESC=	Force dependency on PackageKit
 
-PK_LIB_DEPENDS=	libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit
+PK_LIB_DEPENDS=	libpackagekit-glib2.so:ports-mgmt/packagekit
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index 17e384c24b53..832a29380f34 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Modular patch bay for Jack
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		libraul.so:${PORTSDIR}/audio/raul \
-		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \
-		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libflowcanvas.so:${PORTSDIR}/x11-toolkits/flowcanvas
+LIB_DEPENDS=	libjack.so:audio/jack \
+		libraul.so:audio/raul \
+		libboost_date_time.so:devel/boost-libs \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libglibmm-2.4.so:devel/glibmm \
+		libglademm-2.4.so:devel/libglademm24 \
+		libflowcanvas.so:x11-toolkits/flowcanvas
 
 USES=		pkgconfig tar:bzip2 waf
 INSTALLS_ICONS=	yes
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index c0791f213478..ffbccf2cd1a2 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GTK mixer for PulseAudio
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig gettext tar:xz
@@ -26,11 +26,11 @@ OPTIONS_DEFAULT=	GTK2
 CONFIGURE_ARGS=	--disable-lynx
 
 GTK2_USE=	GNOME=gtkmm24
-GTK2_LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra
+GTK2_LIB_DEPENDS=	libcanberra.so:audio/libcanberra
 GTK2_CONFIGURE_ON=	--disable-gtk3
 
 GTK3_USE=	GNOME=gtkmm30
-GTK3_LIB_DEPENDS=	libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+GTK3_LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3
 
 post-patch:
 # Install locales files in right place
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index edee62a80de6..0a6ab06db9fe 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK volume meter for PulseAudio
 
-BUILD_DEPENDS=	pulseaudio>=0.9.7:${PORTSDIR}/audio/pulseaudio
-RUN_DEPENDS=	pulseaudio>=0.9.7:${PORTSDIR}/audio/pulseaudio
-LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio
+BUILD_DEPENDS=	pulseaudio>=0.9.7:audio/pulseaudio
+RUN_DEPENDS=	pulseaudio>=0.9.7:audio/pulseaudio
+LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24 \
+		libpulse.so:audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/pd-cyclone/Makefile b/audio/pd-cyclone/Makefile
index ef2accce1cd8..d04b9775ef68 100644
--- a/audio/pd-cyclone/Makefile
+++ b/audio/pd-cyclone/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Pd library of clones of Max/MSP 4.5 objects
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pd:${PORTSDIR}/audio/pd
-RUN_DEPENDS=	pd:${PORTSDIR}/audio/pd
+BUILD_DEPENDS=	pd:audio/pd
+RUN_DEPENDS=	pd:audio/pd
 
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-0.2beta1
 
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 84a5d13fafab..7322cb85e18a 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -15,8 +15,8 @@ LICENSE=	BSD3CLAUSE LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
-		dejavu>0:${PORTSDIR}/x11-fonts/dejavu
+RUN_DEPENDS=	xdg-open:devel/xdg-utils \
+		dejavu>0:x11-fonts/dejavu
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
 
@@ -37,9 +37,9 @@ DESKTOP_ENTRIES="Pd" "" "${PREFIX}/lib/pd/tcl/pd.ico" "pd" "" false
 OPTIONS_DEFINE=		ALSA DOCS JACK
 
 ALSA_CONFIGURE_ENABLE=	alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 JACK_CONFIGURE_ENABLE=	jack
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 
 post-patch:
 	${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index 2d397ac854dd..5d4f3c5a994e 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Command line Pandora player
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
-		libfaad.so:${PORTSDIR}/audio/faad \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libao.so:audio/libao \
+		libfaad.so:audio/faad \
+		libmad.so:audio/libmad \
+		libgnutls.so:security/gnutls \
+		libjson-c.so:devel/json-c \
+		libgcrypt.so:security/libgcrypt \
+		libavcodec.so:multimedia/ffmpeg \
+		libcurl.so:ftp/curl
 
 PLIST_FILES=	bin/pianobar \
 		man/man1/pianobar.1.gz
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 172adb5f56a0..60d90c679ca4 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Next generation MusicBrainz Tagger
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=0:${PORTSDIR}/audio/py-discid \
-		${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen \
-		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
-		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=0:audio/py-discid \
+		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:textproc/py-qt4-xml
 
 USES=		gettext python:2 desktop-file-utils
 USE_PYTHON=	distutils
@@ -30,13 +30,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-release-${PORTVERSION}
 OPTIONS_DEFINE=	ACOUSTID REPLAYGAIN
 
 ACOUSTID_DESC=		AcoustID audio fingerprinting support
-ACOUSTID_RUN_DEPENDS=	fpcalc:${PORTSDIR}/audio/chromaprint
+ACOUSTID_RUN_DEPENDS=	fpcalc:audio/chromaprint
 
 REPLAYGAIN_DESC=	ReplayGain audio normalization support
-REPLAYGAIN_RUN_DEPENDS=	metaflac:${PORTSDIR}/audio/flac \
-			mp3gain:${PORTSDIR}/audio/mp3gain \
-			vorbisgain:${PORTSDIR}/audio/vorbisgain \
-			wvgain:${PORTSDIR}/audio/wavpack
+REPLAYGAIN_RUN_DEPENDS=	metaflac:audio/flac \
+			mp3gain:audio/mp3gain \
+			vorbisgain:audio/vorbisgain \
+			wvgain:audio/wavpack
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|distutils\.command\.install |setuptools\.command\.install |' \
diff --git a/audio/pidgin-musictracker/Makefile b/audio/pidgin-musictracker/Makefile
index 483d081718ce..6faf4f1e87cb 100644
--- a/audio/pidgin-musictracker/Makefile
+++ b/audio/pidgin-musictracker/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Plugin for Pidgin to displays the music track currently playing
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
-RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:net-im/pidgin
+RUN_DEPENDS=	pidgin:net-im/pidgin
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		gmake libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index 8c3c42b35f76..246566680417 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -13,11 +13,11 @@ LICENSE=	GPLv3
 
 USE_GITHUB=	yes
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py3-xdg \
-		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py3-dbus \
-		${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:${PORTSDIR}/multimedia/py3-gstreamer1 \
-		${PYTHON_PKGNAMEPREFIX}pylast>0:${PORTSDIR}/audio/py3-pylast \
-		git:${PORTSDIR}/devel/git
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg \
+		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py3-dbus \
+		${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py3-gstreamer1 \
+		${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py3-pylast \
+		git:devel/git
 
 USE_GNOME=	gtk30 py3gobject3
 USES=		python:3
diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index aacbbf21f830..016671441b2a 100644
--- a/audio/playgsf/Makefile
+++ b/audio/playgsf/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://projects.raphnet.net/playgsf/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command-line player for gsf audio files
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:audio/libao
 
 USES=		gmake dos2unix
 GNU_CONFIGURE=	yes
diff --git a/audio/pm3umpdl/Makefile b/audio/pm3umpdl/Makefile
index 2c518d7ade00..06161404170e 100644
--- a/audio/pm3umpdl/Makefile
+++ b/audio/pm3umpdl/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Loading a M3U file into musicpd
 
-RUN_DEPENDS=	${LOCALBASE}/bin/mpc:${PORTSDIR}/audio/musicpc
+RUN_DEPENDS=	${LOCALBASE}/bin/mpc:audio/musicpc
 
 USES=		perl5
 
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index f478322f52b2..0ad73890ac80 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	REGEX
 
 REGEX_DESC=	Support boost regex pattern matching
 
-REGEX_LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
+REGEX_LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 REGEX_CONFIGURE_ENABLE=	regex
 
 INSTALL_TARGET=	install-strip
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 9df5051af18b..2fdb9a041334 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech recognition system
 
-LIB_DEPENDS=	libsphinxad.so:${PORTSDIR}/audio/sphinxbase
+LIB_DEPENDS=	libsphinxad.so:audio/sphinxbase
 
 USES=		gmake pathfix pkgconfig libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index f671d47190d3..983287e6ab8d 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -39,7 +39,7 @@ DOXYGEN_DESC=	Install API documentation (requires DOCS)
 
 OPTIONS_SUB=	yes
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ON=	--with-jack
 JACK_CONFIGURE_OFF=	--without-jack
 
@@ -47,7 +47,7 @@ EXAMPLES_BIN=	pa_d* pa_f* paex_*
 PATEST_BIN=	pa_m* paqa_* patest*
 
 DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \
diff --git a/audio/praat/Makefile b/audio/praat/Makefile
index bbd8a9056d25..dae36e6a3b5a 100644
--- a/audio/praat/Makefile
+++ b/audio/praat/Makefile
@@ -19,7 +19,7 @@ USE_GNOME=	gtk20
 MAKEFILE=	makefile
 PLIST_FILES=	bin/praat man/man1/praat.1.gz
 
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/pragha/Makefile b/audio/pragha/Makefile
index 6621c61729f6..70aa43c231e3 100644
--- a/audio/pragha/Makefile
+++ b/audio/pragha/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Lightweight music player
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-	libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-	libnotify.so:${PORTSDIR}/devel/libnotify \
-	libkeybinder-3.0.so:${PORTSDIR}/x11/keybinder-gtk3 \
-	libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-	libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser
+LIB_DEPENDS=	libtag.so:audio/taglib \
+	libpeas-1.0.so:devel/libpeas \
+	libnotify.so:devel/libnotify \
+	libkeybinder-3.0.so:x11/keybinder-gtk3 \
+	libsoup-2.4.so:devel/libsoup \
+	libtotem-plparser.so:multimedia/totem-pl-parser
 
 USES=	compiler:c11 desktop-file-utils gettext-tools gmake libtool \
 	pkgconfig tar:bz2
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 646d64c773b7..464e0910c19a 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -11,13 +11,13 @@ COMMENT=	Audio tag editor
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	chromaprint>=0.4:${PORTSDIR}/audio/chromaprint \
-		${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:${PORTSDIR}/audio/py-musicbrainz2 \
-		${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:${PORTSDIR}/audio/py-mutagen \
-		${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:${PORTSDIR}/devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:${PORTSDIR}/devel/py-pyparsing \
-		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.0:${PORTSDIR}/graphics/py-qt4-svg \
-		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+RUN_DEPENDS=	chromaprint>=0.4:audio/chromaprint \
+		${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2 \
+		${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen \
+		${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj \
+		${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.5.0:graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.0:x11-toolkits/py-qt4-gui
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 8f9482a3efec..94a1f49f8f36 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -15,15 +15,15 @@ COMMENT=	Sound server for UNIX
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libspeexdsp.so:${PORTSDIR}/audio/speexdsp \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		liborc-0.4.so:${PORTSDIR}/devel/orc \
-		libjson-c.so:${PORTSDIR}/devel/json-c \
-		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libck-connector.so:${PORTSDIR}/sysutils/consolekit
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libspeexdsp.so:audio/speexdsp \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		liborc-0.4.so:devel/orc \
+		libjson-c.so:devel/json-c \
+		libdbus-1.so:devel/dbus \
+		libltdl.so:devel/libltdl \
+		libck-connector.so:sysutils/consolekit
 
 USE_GNOME=	glib20 intltool
 USE_XORG=	x11 sm xtst ice
@@ -63,15 +63,15 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	JACK AVAHI GCONF ALSA SIMD BASH ZSH
 OPTIONS_DEFAULT=AVAHI SIMD
 JACK_CONFIGURE_ENABLE=	jack
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 AVAHI_CONFIGURE_ENABLE=	avahi
-AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 GCONF_CONFIGURE_ENABLE=	gconf
 GCONF_USE=	GNOME=gconf2
 ALSA_CONFIGURE_ENABLE=	alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 SIMD_CONFIGURE_ENABLE=	orc
-SIMD_LIB_DEPENDS=	liborc-0.4.so:${PORTSDIR}/devel/orc
+SIMD_LIB_DEPENDS=	liborc-0.4.so:devel/orc
 ZSH_CONFIGURE_OFF=	--without-zsh-completion-dir
 
 PULSE_VERSION=	${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index cdb2a0392e2b..ec0f44a1be45 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Python wrapper for audio device abstraction library (libao)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:audio/libao
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-discid/Makefile b/audio/py-discid/Makefile
index 4a4a3aabfb60..6921be372074 100644
--- a/audio/py-discid/Makefile
+++ b/audio/py-discid/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python libdiscid bindings
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	libdiscid.so:audio/libdiscid
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/audio/py-discogs-client/Makefile b/audio/py-discogs-client/Makefile
index cbb587937f1f..70acc2fa88db 100644
--- a/audio/py-discogs-client/Makefile
+++ b/audio/py-discogs-client/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python interface to Discogs website
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}oauthlib>=0:${PORTSDIR}/security/py-oauthlib \
-		${PYTHON_PKGNAMEPREFIX}six>=0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib \
+		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-eyed3/Makefile b/audio/py-eyed3/Makefile
index f0a630ad790e..65e32df34c33 100644
--- a/audio/py-eyed3/Makefile
+++ b/audio/py-eyed3/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python module for processing ID3 tags
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:${PORTSDIR}/devel/py-magic
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic
 
 NO_ARCH=	yes
 USES=		python
diff --git a/audio/py-fmoo-audiotools/Makefile b/audio/py-fmoo-audiotools/Makefile
index 31a2fa10250c..a17378592351 100644
--- a/audio/py-fmoo-audiotools/Makefile
+++ b/audio/py-fmoo-audiotools/Makefile
@@ -19,12 +19,12 @@ USE_PYTHON=	autoplist concurrent distutils
 OPTIONS_DEFINE=	CDIO LAME MPG123 OPUS TWOLAME VORBIS
 OPTIONS_DEFAULT=CDIO MPG123 OPUS TWOLAME VORBIS
 
-CDIO_LIB_DEPENDS=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
-OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
-VORBIS_LIB_DEPENDS=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+CDIO_LIB_DEPENDS=	libcdio_cdda.so:sysutils/libcdio-paranoia
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
+VORBIS_LIB_DEPENDS=	libvorbisenc.so:audio/libvorbis
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index dd01da297056..3916698d4b3f 100644
--- a/audio/py-gmusicapi/Makefile
+++ b/audio/py-gmusicapi/Makefile
@@ -12,20 +12,20 @@ COMMENT=	Unofficial Python API for Google Play Music
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:${PORTSDIR}/devel/py-appdirs \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:${PORTSDIR}/audio/py-mutagen \
-		${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:${PORTSDIR}/security/py-oauth2client \
-		${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:${PORTSDIR}/security/py-gpsoauth \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:${PORTSDIR}/devel/py-protobuf \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:${PORTSDIR}/www/py-requests \
-		${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:${PORTSDIR}/devel/py-validictory \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:${PORTSDIR}/net/py-ndg_httpsclient \
-		${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:${PORTSDIR}/www/py-MechanicalSoup \
-		${PYTHON_PKGNAMEPREFIX}openssl>0:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:${PORTSDIR}/devel/py-pyasn1
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:audio/py-mutagen \
+		${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:security/py-oauth2client \
+		${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:security/py-gpsoauth \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory \
+		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
+		${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:www/py-MechanicalSoup \
+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simon-weber
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 5d7c5a8916a1..52b25d4dffc1 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 LICENSE=	LGPL21+
 
 BUILD_DEPENDS=	${PYGAME}
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libaa.so:${PORTSDIR}/graphics/aalib
-RUN_DEPENDS=	dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libaa.so:graphics/aalib
+RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu \
 		${PYGAME} \
 		${PYNUMPY}
 
@@ -37,7 +37,7 @@ PLIST_FILES=	${BIN_SCRIPTS:S,^,bin/,} \
 OPTIONS_DEFINE=		MUTAGEN
 
 MUTAGEN_DESC=		Mutagen support
-MUTAGEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
+MUTAGEN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
 
 BIN_SCRIPTS=	cdg2mpg pycdg pykar pykaraoke pykaraoke_mini pympg
 DATA_FONTS=	DejaVuSans.ttf DejaVuSansCondensed.ttf \
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 764c4f6cab65..5ac6f4477909 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python module that provides the MPEG Audio Decoder interface
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	libmad.so:audio/libmad
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jaqx0r
diff --git a/audio/py-musicbrainz2/Makefile b/audio/py-musicbrainz2/Makefile
index 9aa24b0c54b2..b64a252b8007 100644
--- a/audio/py-musicbrainz2/Makefile
+++ b/audio/py-musicbrainz2/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Next Generation Python bindings for MusicBrainz
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	libdiscid.so:audio/libdiscid
 
 USES=		python:2
 USE_PYTHON=	autoplist distutils
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index 3d7e45412efd..b4131101e9ac 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Object-oriented Python bindings for the ogg library
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:audio/libogg
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-pyacoustid/Makefile b/audio/py-pyacoustid/Makefile
index fb09149b23a3..9ba96a5d4914 100644
--- a/audio/py-pyacoustid/Makefile
+++ b/audio/py-pyacoustid/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Bindings for Chromaprint acoustic fingerprinting and the Acoustid API
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint
+LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile
index f0ffbb0af9e7..bcc8ed851f9f 100644
--- a/audio/py-pyaudio/Makefile
+++ b/audio/py-pyaudio/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Portaudio toolkit bindings for Python
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-pylast/Makefile b/audio/py-pylast/Makefile
index 1e2f2319da7a..45e29669904b 100644
--- a/audio/py-pylast/Makefile
+++ b/audio/py-pylast/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python interface to Last.fm and Libre.fm
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile
index eede3a7e4310..6d51a258241a 100644
--- a/audio/py-pyliblo/Makefile
+++ b/audio/py-pyliblo/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python wrapper for the Liblo OSC Library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	pyrex>=0.9.4:${PORTSDIR}/devel/pyrex \
-		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython
-LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
+BUILD_DEPENDS=	pyrex>=0.9.4:devel/pyrex \
+		${LOCALBASE}/bin/cython:lang/cython
+LIB_DEPENDS=	liblo.so:audio/liblo
 
 USES=		python
 USE_PYTHON=	distutils
diff --git a/audio/py-shout/Makefile b/audio/py-shout/Makefile
index 56f85e48bd08..d358a3ad442b 100644
--- a/audio/py-shout/Makefile
+++ b/audio/py-shout/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for libshout2
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+LIB_DEPENDS=	libshout.so:audio/libshout
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
diff --git a/audio/py-speex/Makefile b/audio/py-speex/Makefile
index 1c7891b7d1df..2fa617c33ce1 100644
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	python
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python bindings for the Speex compressor/decompressor audio codec
 
-BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+BUILD_DEPENDS=	pyrex>=0.9.6.2:devel/pyrex
+LIB_DEPENDS=	libspeex.so:audio/speex
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile
index 0d466ef3ae2a..a87d4d7b3a7c 100644
--- a/audio/py-tagpy/Makefile
+++ b/audio/py-tagpy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python bindings for Scott Wheeler's TagLib
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+		libtag.so:audio/taglib
 
 USES=		compiler:c++11-lang python shebangfix
 HAS_CONFIGURE=	yes
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 70e99dace6d9..a20335a3d4c9 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Object-oriented Python bindings for the vorbis library
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:${PORTSDIR}/audio/py-ogg
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index 6de20aa410bd..1c68249902c2 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -9,8 +9,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Python Bindings for XMMS2
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pyrex/__init__.py:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS+=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pyrex/__init__.py:devel/pyrex
+LIB_DEPENDS+=	libxmmsclient.so:audio/xmms2
 
 MASTERDIR=	${.CURDIR}/../xmms2
 
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index 4ca3145325e8..b30fe4d6a3b3 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Music jukebox written in Python with a curses GUI
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}mutagen>0:${PORTSDIR}/audio/py-mutagen
+LIB_DEPENDS=	libao.so:audio/libao
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen
 
 
 USES=		ncurses python:2
@@ -31,11 +31,11 @@ PLIST_FILES=	etc/pytonerc.sample
 OPTIONS_DEFINE=		MAD MPG123 MPG321 VORBIS
 OPTIONS_DEFAULT=	MAD VORBIS
 
-MAD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mad>0:${PORTSDIR}/audio/py-mad
-MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MAD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mad>0:audio/py-mad
+MPG123_RUN_DEPENDS=	mpg123:audio/mpg123
 MPG321_DESC=		MP3 decoding support via mpg321
-MPG321_RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
-VORBIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:${PORTSDIR}/audio/py-vorbis
+MPG321_RUN_DEPENDS=	mpg321:audio/mpg321
+VORBIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis
 
 post-patch:
 .for i in pytone pytonectl
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index bbb01d7a90b6..33ac5303f609 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Qt interface for JACK Audio Connection Kit
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:audio/jack
 
 USES=		gmake
 QT_NONSTANDARD=	yes
@@ -31,10 +31,10 @@ OPTIONS_DEFAULT=	QT4
 
 TOOLKIT_DESC=		Preferred Qt toolkit
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa_seq
 
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CONFIGURE_ENABLE=	portaudio
 
 QT4_USE=		qt4=corelib,dbus,gui,xml \
diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index 9bdf697c27ba..bcdc00f6a14b 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Qt-based front end to LinuxSampler
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libgig.so:${PORTSDIR}/audio/libgig \
-		liblscp.so:${PORTSDIR}/audio/liblscp
-RUN_DEPENDS=	linuxsampler:${PORTSDIR}/audio/linuxsampler
+LIB_DEPENDS=	libgig.so:audio/libgig \
+		liblscp.so:audio/liblscp
+RUN_DEPENDS=	linuxsampler:audio/linuxsampler
 
 USES=		gmake pkgconfig shared-mime-info
 QT_NONSTANDARD=	yes
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 27d2c249784d..b4deef509f4e 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Qt fluidsynth front-end application
 LICENSE=	GPLv2+
 #LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 
 USES=		gmake
 QT_NONSTANDARD=	yes
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index ae96114f89c5..3c21e5222715 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Qt4 client for MPD (the Music Player Daemon)
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
-		libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient \
+		libtag.so:audio/taglib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}\ ${PORTVERSION}
 
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index c212a858ae0d..b8057963706a 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Music file player for Apple Airport Express
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag
-RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321 \
-		ogg123:${PORTSDIR}/audio/vorbis-tools \
-		faad:${PORTSDIR}/audio/faad \
-		flac:${PORTSDIR}/audio/flac
+LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
+		libfltk.so:x11-toolkits/fltk \
+		libid3tag.so:audio/libid3tag
+RUN_DEPENDS=	mpg321:audio/mpg321 \
+		ogg123:audio/vorbis-tools \
+		faad:audio/faad \
+		flac:audio/flac
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	`fltk-config --ldflags`
diff --git a/audio/raul/Makefile b/audio/raul/Makefile
index 52dec5176248..610035f383fd 100644
--- a/audio/raul/Makefile
+++ b/audio/raul/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C++ utility library primarily aimed at audio/musical applications
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES=		pkgconfig tar:bzip2 waf
 USE_GNOME=	glib20
diff --git a/audio/rebot3/Makefile b/audio/rebot3/Makefile
index c9cd9f69f2fc..a9e89b1f844b 100644
--- a/audio/rebot3/Makefile
+++ b/audio/rebot3/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Renames mp3 files using freedb or local CDDB
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-CDDB>=0:${PORTSDIR}/audio/p5-CDDB \
-		p5-MP3-ID3v1Tag>=0:${PORTSDIR}/audio/p5-MP3-ID3v1Tag
+RUN_DEPENDS=	p5-CDDB>=0:audio/p5-CDDB \
+		p5-MP3-ID3v1Tag>=0:audio/p5-MP3-ID3v1Tag
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/audio/rem/Makefile b/audio/rem/Makefile
index 7d0c03dd9fc7..1a5a1cff0479 100644
--- a/audio/rem/Makefile
+++ b/audio/rem/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for real-time audio and video processing
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:${PORTSDIR}/audio/re
+BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 358f9295ce52..0e9fcf87cb18 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -11,19 +11,19 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Audio player for GNOME
 
-BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
-		valac:${PORTSDIR}/lang/vala \
-		gtkdoc-check:${PORTSDIR}/textproc/gtk-doc \
-		itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \
-		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libcheck.so:${PORTSDIR}/devel/libcheck \
-		libpeas-1.0.so:${PORTSDIR}/devel/libpeas \
-		libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
-		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
-		libsecret-1.so:${PORTSDIR}/security/libsecret \
-		libtdb.so:${PORTSDIR}/databases/tdb
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
+		valac:lang/vala \
+		gtkdoc-check:textproc/gtk-doc \
+		itstool:textproc/itstool
+LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
+		libtotem-plparser.so:multimedia/totem-pl-parser \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libcheck.so:devel/libcheck \
+		libpeas-1.0.so:devel/libpeas \
+		libjson-glib-1.0.so:devel/json-glib \
+		libsoup-gnome-2.4.so:devel/libsoup-gnome \
+		libsecret-1.so:security/libsecret \
+		libtdb.so:databases/tdb
 
 USES=		desktop-file-utils gettext gmake gnome libtool pathfix \
 		pkgconfig tar:xz
@@ -53,34 +53,34 @@ OPTIONS_DEFINE=	BRASERO DAAP GRILO IPOD NOTIFY PYTHON LIRC MTP
 OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON
 BRASERO_DESC=	Brasero disc burning support
 BRASERO_CONFIGURE_ENABLE=brasero
-BRASERO_LIB_DEPENDS=	libbrasero-media3.so:${PORTSDIR}/sysutils/brasero
+BRASERO_LIB_DEPENDS=	libbrasero-media3.so:sysutils/brasero
 DAAP_DESC=	DAAP support
 DAAP_CONFIGURE_ENABLE=	daap
-DAAP_LIB_DEPENDS=	libdmapsharing-3.0.so:${PORTSDIR}/net/libdmapsharing
+DAAP_LIB_DEPENDS=	libdmapsharing-3.0.so:net/libdmapsharing
 IPOD_DESC=	iPod support
 IPOD_CONFIGURE_WITH=	ipod
-IPOD_LIB_DEPENDS=	libgpod.so:${PORTSDIR}/audio/libgpod
+IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod
 GRILO_DESC=		Media discovery with Grilo
 GRILO_CONFIGURE_ENABLE=	grilo
-GRILO_BUILD_DEPENDS=	grilo-plugins>=0:${PORTSDIR}/net/grilo-plugins
-GRILO_RUN_DEPENDS=	grilo-plugins>=0:${PORTSDIR}/net/grilo-plugins
+GRILO_BUILD_DEPENDS=	grilo-plugins>=0:net/grilo-plugins
+GRILO_RUN_DEPENDS=	grilo-plugins>=0:net/grilo-plugins
 LIRC_CONFIGURE_ENABLE=	lirc
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 NOTIFY_CONFIGURE_ENABLE=	notify
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 MTP_CONFIGURE_WITH=	mtp
-MTP_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp \
-			libhal.so:${PORTSDIR}/sysutils/hal
+MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp \
+			libhal.so:sysutils/hal
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_USES=		python:3
 PYTHON_USE=		PYTVER=${PYTHON_VER:S/.//}
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PORTSDIR}/devel/py3-libpeas
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas
 # context plugin
 # webkit is for the context plugin, which is broken because
 # it needs textproc/py3-mako
 #WEBKIT_DESC=	HTML view support
 #WEBKIT_CONFIGURE_WITH=	webkit
-#WEBKIT_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+#WEBKIT_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index 923d16ea5eea..8ec2e614f6a0 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Command line audio CD ripper
 LICENSE=	GPLv2
 
 # See pkg-message about other dependencies.
-RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
-	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-	p5-WebService-MusicBrainz>=0:${PORTSDIR}/www/p5-WebService-MusicBrainz \
-	p5-MusicBrainz-DiscID>=0:${PORTSDIR}/audio/p5-MusicBrainz-DiscID \
-	lame:${PORTSDIR}/audio/lame \
-	cdparanoia:${PORTSDIR}/audio/cdparanoia
+RUN_DEPENDS=	p5-CDDB_get>=0:audio/p5-CDDB_get \
+	p5-libwww>=0:www/p5-libwww \
+	p5-WebService-MusicBrainz>=0:www/p5-WebService-MusicBrainz \
+	p5-MusicBrainz-DiscID>=0:audio/p5-MusicBrainz-DiscID \
+	lame:audio/lame \
+	cdparanoia:audio/cdparanoia
 
 USES=		perl5 shebangfix tar:bzip2
 NO_BUILD=	yes
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index c0bf4d304fe9..c89fca312f5a 100644
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	ripperX-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK program to rip CD audio tracks and encode them
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
-RUN_DEPENDS=	cdparanoia:${PORTSDIR}/audio/cdparanoia
+LIB_DEPENDS=	libid3.so:audio/id3lib
+RUN_DEPENDS=	cdparanoia:audio/cdparanoia
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_lib_id3_ID3Tag_Link=yes
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 2dbc7523ffde..a83aca1cef41 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -12,16 +12,16 @@ COMMENT=	General purpose music editor and sequencer suite
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
-		${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		liblrdf.so:${PORTSDIR}/textproc/liblrdf
-RUN_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
-		flac:${PORTSDIR}/audio/flac \
-		wavpack:${PORTSDIR}/audio/wavpack \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		lilypond:${PORTSDIR}/print/lilypond
+BUILD_DEPENDS=	dssi_osc_update:audio/dssi \
+		${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libfftw3f.so:math/fftw3-float \
+		liblrdf.so:textproc/liblrdf
+RUN_DEPENDS=	dssi_osc_update:audio/dssi \
+		flac:audio/flac \
+		wavpack:audio/wavpack \
+		xdg-open:devel/xdg-utils \
+		lilypond:print/lilypond
 
 USES=		cmake:outsource desktop-file-utils pkgconfig shared-mime-info \
 		tar:bzip2
@@ -34,7 +34,7 @@ OPTIONS_SINGLE=		TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
 OPTIONS_DEFAULT=	QT4
 
-LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_ON=		-DENABLE_LIRC:BOOL=ON
 QT4_USE=		qt4=gui,network,testlib,xml \
 			qt4=linguisttools_build,moc_build,qmake_build \
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 20b9a82ed705..8b30543ef58e 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Network audio player
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libgsm.so:audio/gsm
 
 USES=		makeinfo
 USE_LDCONFIG=	yes
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index b12d8f3e9ccf..fdf82b18215b 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech synthesizer
 
-LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libaudio.so:${PORTSDIR}/audio/nas
+LIB_DEPENDS=	libgdbm.so:databases/gdbm \
+		libaudio.so:audio/nas
 
 USES=		autoreconf
 GNU_CONFIGURE=	yes
diff --git a/audio/rubberband/Makefile b/audio/rubberband/Makefile
index b5621748c856..9363733052ef 100644
--- a/audio/rubberband/Makefile
+++ b/audio/rubberband/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Vamp audio analysis plugin SDK
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libvamp-sdk.so:${PORTSDIR}/audio/vamp-plugin-sdk \
-		libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libsamplerate.so:audio/libsamplerate \
+		libvamp-sdk.so:audio/vamp-plugin-sdk \
+		libfftw3.so:math/fftw3
+RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
 USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/ruby-audiofile/Makefile b/audio/ruby-audiofile/Makefile
index e01699b25136..f3107d2586d4 100644
--- a/audio/ruby-audiofile/Makefile
+++ b/audio/ruby-audiofile/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding to the audiofile library
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 
 BROKEN_RUBY22=	yes
 BROKEN_RUBY23=	yes
diff --git a/audio/ruby-taglib/Makefile b/audio/ruby-taglib/Makefile
index 7d5c3e508c93..b906e0d9134f 100644
--- a/audio/ruby-taglib/Makefile
+++ b/audio/ruby-taglib/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Ruby library wrapping the Taglib library
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/audio/ruby-xmms2/Makefile b/audio/ruby-xmms2/Makefile
index 1790a97cd7ad..5e3b10820f1b 100644
--- a/audio/ruby-xmms2/Makefile
+++ b/audio/ruby-xmms2/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby Bindings for XMMS2
 
-LIB_DEPENDS+=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+=	libxmmsclient.so:audio/xmms2
 
 MASTERDIR=	${.CURDIR}/../xmms2
 
diff --git a/audio/rubygem-ruby-shout/Makefile b/audio/rubygem-ruby-shout/Makefile
index 08c2a5d706cf..db4d11c8eda5 100644
--- a/audio/rubygem-ruby-shout/Makefile
+++ b/audio/rubygem-ruby-shout/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby binding to the libshout library
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+LIB_DEPENDS=	libshout.so:audio/libshout
 
 CONFIGURE_ARGS=	--with-opt-include="${LOCALBASE}/include"
 USE_RUBY=	yes
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index 823cf6ee6170..9a24e666bd16 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	xmms-scrobbler-${PORTVERSION}
 MAINTAINER?=	novel@FreeBSD.org
 COMMENT?=	XMMS/BMP plugin for Audioscrobbler.com
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 CONFLICTS=	xmms-scrobbler-[0-9]*
 
@@ -29,7 +29,7 @@ OPTIONS_DEFAULT=XMMS
 XMMS_DESC=	Enable XMMS support
 ENCODINGS_PATCH_DESC=	Enable ID3 tags recoding support
 
-XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_PLIST_FILES=	lib/xmms/General/libxmms_scrobbler.so
 XMMS_CONFIGURE_ENABLE=	xmms-plugin
 
diff --git a/audio/sdl2_mixer/Makefile b/audio/sdl2_mixer/Makefile
index 2f85526a0fb9..4f1a92b85359 100644
--- a/audio/sdl2_mixer/Makefile
+++ b/audio/sdl2_mixer/Makefile
@@ -34,27 +34,27 @@ OPTIONS_DEFAULT+=	VORBIS
 MOD_DESC=	Tracker music support
 SMPEG_DESC=	MP3 audio support via SMPEG2
 
-MIKMOD_LIB_DEPENDS=		libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=		libmikmod.so:audio/libmikmod
 MIKMOD_CONFIGURE_ENABLE=	music-mod-mikmod
 
-MODPLUG_LIB_DEPENDS=		libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=		libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	music-mod-modplug
 
-FLAC_LIB_DEPENDS=		libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=		libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENABLE=		music-flac
 
-FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ON=	--enable-music-midi --enable-music-midi-fluidsynth
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-music-midi --disable-music-midi-fluidsynth
 
-SMPEG_LIB_DEPENDS=		libsmpeg2.so:${PORTSDIR}/multimedia/smpeg2
+SMPEG_LIB_DEPENDS=		libsmpeg2.so:multimedia/smpeg2
 SMPEG_CONFIGURE_ON=		--enable-music-mp3 --enable-music-mp3-smpeg
 SMPEG_CONFIGURE_OFF=		--disable-music-mp3 --disable-music-mp3-smpeg
 
-VORBIS_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	music-ogg
 
-TREMOR_LIB_DEPENDS=		libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_LIB_DEPENDS=		libvorbisidec.so:audio/libtremor
 TREMOR_CONFIGURE_ON=		--enable-music-ogg
 # TREMOR_CONFIGURE_OFF is handled by VORBIS=off
 TREMOR_CONFIGURE_ENABLE=	music-ogg-tremor
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 0a4fafa7b0bc..d4ac25d04e93 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -36,28 +36,28 @@ MOD_DESC=	Tracker music support
 SMPEG_DESC=	MP3 audio support via SMPEG
 TIMIDITYPLUS_DESC=	Use Timidity++ instead of Timidity (soundfont)
 
-MIKMOD_LIB_DEPENDS=		libmikmod.so:${PORTSDIR}/audio/libmikmod
+MIKMOD_LIB_DEPENDS=		libmikmod.so:audio/libmikmod
 MIKMOD_CONFIGURE_ENABLE=	music-mod
 
-MODPLUG_LIB_DEPENDS=		libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=		libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	music-mod-modplug
 
-FLAC_LIB_DEPENDS=		libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=		libFLAC.so:audio/flac
 FLAC_CONFIGURE_ENABLE=		music-flac
 
-SMPEG_LIB_DEPENDS=		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+SMPEG_LIB_DEPENDS=		libsmpeg.so:multimedia/smpeg
 SMPEG_CONFIGURE_ENABLE=		music-mp3
 
-VORBIS_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	music-ogg
 
-TIMIDITYPLUS_RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg-eawpats:${PORTSDIR}/audio/eawpats
+TIMIDITYPLUS_RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg-eawpats:audio/eawpats
 TIMIDITYPLUS_VARS=		CONFIG_FILE=${LOCALBASE}/share/timidity/timidity.cfg-eawpats
 
-TIMIDITYPLUS_RUN_DEPENDS_OFF=	${LOCALBASE}/lib/timidity/timidity.cfg:${PORTSDIR}/audio/timidity
+TIMIDITYPLUS_RUN_DEPENDS_OFF=	${LOCALBASE}/lib/timidity/timidity.cfg:audio/timidity
 TIMIDITYPLUS_VARS_OFF=		CONFIG_FILE=${LOCALBASE}/lib/timidity/timidity.cfg
 
-TREMOR_LIB_DEPENDS=		libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_LIB_DEPENDS=		libvorbisidec.so:audio/libtremor
 TREMOR_CONFIGURE_ON=		--enable-music-ogg
 # TREMOR_CONFIGURE_OFF is handled by VORBIS=off
 TREMOR_CONFIGURE_ENABLE=	music-ogg-tremor
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index a656dd6e996a..5c87a0138f6b 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -29,51 +29,51 @@ SMPEG_DESC=	MP3 audio format
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:audio/flac
 .else
 CONFIGURE_ARGS+=--disable-flac
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+=	libmikmod.so:audio/libmikmod
 .else
 CONFIGURE_ARGS+=--disable-mikmod
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	libmodplug.so:audio/libmodplug
 .else
 CONFIGURE_ARGS+=--disable-modplug
 .endif
 
 .if ${PORT_OPTIONS:MPHYSFS}
-LIB_DEPENDS+=	libphysfs.so:${PORTSDIR}/devel/physfs
+LIB_DEPENDS+=	libphysfs.so:devel/physfs
 .else
 CONFIGURE_ARGS+=--disable-physfs
 .endif
 
 .if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	libsmpeg.so:multimedia/smpeg
 CONFIGURE_ARGS+=--disable-mpglib
 .else
 CONFIGURE_ARGS+=--disable-smpeg
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:audio/speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if ${PORT_OPTIONS:MMIDI}
-RUN_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
-BUILD_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:${PORTSDIR}/audio/timidity
+RUN_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:audio/timidity
+BUILD_DEPENDS+=	${LOCALBASE}/lib/timidity/goemon.cfg:audio/timidity
 .else
 CONFIGURE_ARGS+=--disable-midi
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
 .else
 CONFIGURE_ARGS+=--disable-ogg
 .endif
diff --git a/audio/shairplay/Makefile b/audio/shairplay/Makefile
index 779a9c20e827..6083ce0b447c 100644
--- a/audio/shairplay/Makefile
+++ b/audio/shairplay/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Portable AirPlay server implementation
 LICENSE=	BSD3CLAUSE LGPL21 MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:audio/libao
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	juhovh
@@ -24,7 +24,7 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFAULT=	MDNSRESPONDER
 OPTIONS_SINGLE=		ZEROCONF
 OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
-AVAHI_LIB_DEPENDS=		libdns_sd.so:${PORTSDIR}/net/avahi-libdns
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+AVAHI_LIB_DEPENDS=		libdns_sd.so:net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 
 .include <bsd.port.mk>
diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
index a3ddb9cb7fa1..84dc7b92a815 100644
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@@ -9,14 +9,14 @@ CATEGORIES=	audio
 MAINTAINER=	miks.mikelsons@gmail.com
 COMMENT=	Airtunes emulator
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-Crypt-OpenSSL-RSA>=0:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
-		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
-		p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		avahi-publish-service:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS=	libao.so:audio/libao
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64 \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long \
+		p5-URI>=0:net/p5-URI \
+		p5-Crypt-OpenSSL-RSA>=0:security/p5-Crypt-OpenSSL-RSA \
+		p5-Digest-MD5>=0:security/p5-Digest-MD5 \
+		p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		avahi-publish-service:net/avahi-app
 
 USES=		gmake perl5 pkgconfig
 USE_PERL5=	run
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index 04c62ef842e6..11721d3ee218 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -37,7 +37,7 @@ m=	${RDEP_MAPPING:M${o}*}
 .if ${m}
 b=	${m:C/^[A-Z]*://:C/:.*//:tl}
 p=	${m:C/^[A-Z]*://:C/.*://:tl}
-RUN_DEPENDS+=	${b}:${PORTSDIR}/audio/${p}
+RUN_DEPENDS+=	${b}:audio/${p}
 RUN_DEPENDS:=	${RUN_DEPENDS}
 .endif
 .endfor
diff --git a/audio/shout-idjc/Makefile b/audio/shout-idjc/Makefile
index c7fbafb354db..3d3bf259364d 100644
--- a/audio/shout-idjc/Makefile
+++ b/audio/shout-idjc/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Shoutcast/Icecast Library for audio/idjc
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg \
-		libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg \
+		libspeex.so:audio/speex
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig
diff --git a/audio/shoutcast/Makefile b/audio/shoutcast/Makefile
index 2d0d1ba239c9..66e122d12c50 100644
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@@ -55,9 +55,9 @@ GROUPS=		${SHOUTCASTGROUP}
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010
 .if ${ARCH} == "i386"
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libstdc++.so.6:misc/compat9x
 .else
-RUN_DEPENDS+=	${LOCALBASE}/lib32/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS+=	${LOCALBASE}/lib32/compat/libstdc++.so.6:misc/compat9x
 .endif
 .endif
 
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 1bddf73b347a..0e448e77886e 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Commodore SID-chip emulator that plays SID music files
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS=	libsidplay.so:audio/libsidplay
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sidplay-includes=${LOCALBASE}/include \
diff --git a/audio/sidplay2/Makefile b/audio/sidplay2/Makefile
index 7c67452f3a45..67fc0ad22601 100644
--- a/audio/sidplay2/Makefile
+++ b/audio/sidplay2/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	sidplay-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commodore SID music player using libsidplay2
 
-LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/audio/simplemod/Makefile b/audio/simplemod/Makefile
index 653603b7cdd0..1e6bc995db4e 100644
--- a/audio/simplemod/Makefile
+++ b/audio/simplemod/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://borderworlds.dk/projects/sm/
 MAINTAINER=	xi@borderworlds.dk
 COMMENT=	Minimalistic module player
 
-LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libmikmod.so:audio/libmikmod
 
 WRKSRC=		${WRKDIR}/simplemod
 
diff --git a/audio/siren/Makefile b/audio/siren/Makefile
index 2a4568b50b1e..c1860ac2d473 100644
--- a/audio/siren/Makefile
+++ b/audio/siren/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Text-based audio player
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libwavpack.so:${PORTSDIR}/audio/wavpack \
-		libopusfile.so:${PORTSDIR}/audio/opusfile
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libid3tag.so:audio/libid3tag \
+		libmad.so:audio/libmad \
+		libvorbis.so:audio/libvorbis \
+		libwavpack.so:audio/wavpack \
+		libopusfile.so:audio/opusfile
 
 USES=		ncurses pkgconfig
 HAS_CONFIGURE=	yes
@@ -26,7 +26,7 @@ OPTIONS_MULTI=	SOUND
 OPTIONS_MULTI_SOUND=	OSS PULSEAUDIO
 OPTIONS_DEFAULT=	OSS
 OSS_CONFIGURE_ON=	oss=yes pulse=no
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ON=	oss=no pulse=yes
 OPTIONS_SUB=	yes
 
diff --git a/audio/skype-call-recorder/Makefile b/audio/skype-call-recorder/Makefile
index 8a15f48ffa63..18a21f40c9c0 100644
--- a/audio/skype-call-recorder/Makefile
+++ b/audio/skype-call-recorder/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Skype call recorder
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libid3.so:${PORTSDIR}/audio/id3lib \
-		libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libid3.so:audio/id3lib \
+		libvorbisenc.so:audio/libvorbis
 
 USES=		cmake
 USE_QT4=	corelib dbus gui network \
diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index 066d6526ced3..8d7da442e9e8 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -13,9 +13,9 @@ COMMENT=	LV2 Application Support Library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		librdf.so:${PORTSDIR}/textproc/redland
+BUILD_DEPENDS=	${LOCALBASE}/include/lv2.h:audio/lv2core
+LIB_DEPENDS=	libjack.so:audio/jack \
+		librdf.so:textproc/redland
 
 USES=		pkgconfig tar:bzip2 waf
 USE_LDCONFIG=	yes
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index 3b77f809a19b..87458d71ff4d 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Cross platform audio loop slicer
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libcsound64.so:${PORTSDIR}/audio/csound
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libmad.so:audio/libmad \
+		libcsound64.so:audio/csound
 
 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gmake pkgconfig
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index fe54b679d8aa..3fbcef9fb586 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -26,7 +26,7 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	VORBIS DOCS
 OPTIONS_SUB=	yes
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-ogg-include=${LOCALBASE}/include \
 			--with-ogg-lib=${LOCALBASE}/lib
 VORBIS_ALL_TARGET=	all libsnackogg.so
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ca994514e0bb..902216e15916 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -31,16 +31,16 @@ CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-FFTW3_LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
+FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3
 FFTW3_CONFIGURE_WITH=	fftw
 
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 GSL_CONFIGURE_WITH=	gsl
 
 S7_CONFIGURE_WITH=	s7
 
-LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+LADSPA_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LADSPA_CONFIGURE_WITH=	ladspa
 
 GTK2_USE=	GNOME=gtk20
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 3979dfd20c00..a8580673d043 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Free ear training software
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
-		txt2man:${PORTSDIR}/textproc/txt2man
+BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
+		txt2man:textproc/txt2man
 
 USES=		gettext gmake makeinfo pathfix pkgconfig python shebangfix
 SHEBANG_FILES=	exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 444af2226a1c..3798a41058e0 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Elegant music player for MPD
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd
 
 USES=		gettext pkgconfig python
 USE_GNOME=	pygtk2
@@ -29,11 +29,11 @@ OPTIONS_SUB=	yes
 
 MANPAGES_MAKE_ENV_OFF=	NO_INSTALL_MANPAGES=yes
 DOCS_MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
-MPD_RUN_DEPENDS+=	musicpd:${PORTSDIR}/audio/musicpd
-MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:${PORTSDIR}/devel/py-dbus
-PYGNOMEEXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:${PORTSDIR}/x11-toolkits/py-gnome-extras
-TAGLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:${PORTSDIR}/audio/py-tagpy
-ZSI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:${PORTSDIR}/net/py-zsi
+MPD_RUN_DEPENDS+=	musicpd:audio/musicpd
+MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus
+PYGNOMEEXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras
+TAGLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy
+ZSI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:net/py-zsi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile
index d17e24e58071..e802d603ccca 100644
--- a/audio/sooperlooper/Makefile
+++ b/audio/sooperlooper/Makefile
@@ -12,16 +12,16 @@ COMMENT=	Live audio looping sampler
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	ladspa>0:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		librubberband.so:${PORTSDIR}/audio/rubberband \
-		libvamp-sdk.so:${PORTSDIR}/audio/vamp-plugin-sdk \
-		libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	ladspa>0:${PORTSDIR}/audio/ladspa
+BUILD_DEPENDS=	ladspa>0:audio/ladspa
+LIB_DEPENDS=	libjack.so:audio/jack \
+		liblo.so:audio/liblo \
+		libsamplerate.so:audio/libsamplerate \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libsndfile.so:audio/libsndfile \
+		librubberband.so:audio/rubberband \
+		libvamp-sdk.so:audio/vamp-plugin-sdk \
+		libfftw3.so:math/fftw3
+RUN_DEPENDS=	ladspa>0:audio/ladspa
 
 USES=		gmake ncurses pkgconfig
 USE_GNOME=	libxml2
@@ -36,7 +36,7 @@ OPTIONS_DEFINE=		ALSA WXGTK
 OPTIONS_DEFAULT=	WXGTK
 OPTIONS_SUB=		yes
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENV_OFF=	ac_cv_header_alsa_asoundlib_h=no
 WXGTK_USE=		WX=2.8
 WXGTK_CONFIGURE_ON=	--with-wxconfig-path=${WX_CONFIG}
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 1a8283c906c9..11aa722a5ec9 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -10,13 +10,13 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clean, mean, and lean CD ripper for GNOME
 
-BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
-LIB_DEPENDS=	libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5 \
-		libdiscid.so:${PORTSDIR}/audio/libdiscid \
-		libtag.so:${PORTSDIR}/audio/taglib \
-		libcanberra.so:${PORTSDIR}/audio/libcanberra \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libbrasero-media3.so:${PORTSDIR}/sysutils/brasero
+BUILD_DEPENDS=	itstool:textproc/itstool
+LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
+		libdiscid.so:audio/libdiscid \
+		libtag.so:audio/taglib \
+		libcanberra.so:audio/libcanberra \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libbrasero-media3.so:sysutils/brasero
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index c0181282dd07..4ab9cf227b54 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sound conversion application for the GNOME environment
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:${PORTSDIR}/multimedia/py-gstreamer
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer
 
 NO_ARCH=	yes
 USES=		desktop-file-utils gmake python:2 shebangfix tar:xz
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index 55df71365921..f84eb3e6f2eb 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactively select and save sections of an audio file
 
-RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox \
-		rawplay:${PORTSDIR}/audio/rawrec \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		flac:${PORTSDIR}/audio/flac \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
+RUN_DEPENDS=	sox:audio/sox \
+		rawplay:audio/rawrec \
+		oggenc:audio/vorbis-tools \
+		flac:audio/flac \
+		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 LICENSE=	GPLv2
 
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 3895d2d3cfce..a42a2ec1efe3 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Frontend to various audio converters (transcoder)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
-		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
+LIB_DEPENDS=	libtag.so:audio/taglib \
+		libcdda_paranoia.so:audio/cdparanoia
 
 GH_ACCOUNT=	HessiJames
 USES=		cmake compiler:c++11-lang
@@ -41,74 +41,74 @@ REPLAYGAIN_DESC=	Replaygain tools for codecs
 RIPPER_DESC=		CD ripping tools
 
 AFTEN_DESC=		ATSC A/52 audio encoder
-AFTEN_RUN_DEPENDS=	aften:${PORTSDIR}/audio/aften
+AFTEN_RUN_DEPENDS=	aften:audio/aften
 
 AACGAIN_DESC=		AAC audio replaygain
-AACGAIN_RUN_DEPENDS=	aacgain:${PORTSDIR}/audio/aacgain
+AACGAIN_RUN_DEPENDS=	aacgain:audio/aacgain
 
 CDPARANOIA_DESC=	CD ripping support (cdparanoia - implicit)
 
 CDRKIT_DESC=		CD ripping support (cdrkit)
-CDRKIT_RUN_DEPENDS=	icedax:${PORTSDIR}/sysutils/cdrkit
+CDRKIT_RUN_DEPENDS=	icedax:sysutils/cdrkit
 
-FAAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac \
-			faad:${PORTSDIR}/audio/faad
+FAAC_RUN_DEPENDS=	faac:audio/faac \
+			faad:audio/faad
 
-FFMPEG_RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg
 
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
+FLAC_RUN_DEPENDS=	flac:audio/flac
 
 FLAKE_DESC=		FLAC audio codec
-FLAKE_RUN_DEPENDS=	flake:${PORTSDIR}/audio/flake
+FLAKE_RUN_DEPENDS=	flake:audio/flake
 
 FLUIDSYNTH_DESC=	SoundFont 2 audio codec
-FLUIDSYNTH_RUN_DEPENDS=	fluidsynth:${PORTSDIR}/audio/fluidsynth
+FLUIDSYNTH_RUN_DEPENDS=	fluidsynth:audio/fluidsynth
 
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
+LAME_RUN_DEPENDS=	lame:audio/lame
 
 LIBAV_DESCR=		LibAV support (WMA, AIFF, AC3, APE...)
-LIBAV_RUN_DEPENDS=	avconv:${PORTSDIR}/multimedia/libav
+LIBAV_RUN_DEPENDS=	avconv:multimedia/libav
 
 MAC_DESC=		Monkey's Audio lossless codec
-MAC_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
+MAC_RUN_DEPENDS=	mac:audio/mac
 
 MP3GAIN_DESC=		MP3 audio replaygain
-MP3GAIN_RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain
+MP3GAIN_RUN_DEPENDS=	mp3gain:audio/mp3gain
 
-MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
-MUSEPACK_RUN_DEPENDS=	mpcenc:${PORTSDIR}/audio/musepack
+MUSEPACK_RUN_DEPENDS=	mpcenc:audio/musepack
 
 NEROAAC_DESC=		Nero AAC MPEG-3 and 3GPP audio codec
-NEROAAC_RUN_DEPENDS=	neroAacEnc:${PORTSDIR}/audio/linux-neroaaccodec
+NEROAAC_RUN_DEPENDS=	neroAacEnc:audio/linux-neroaaccodec
 
 NORMALIZE_DESC=		MP3/Ogg Vorbis audio filter and replaygain
-NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
+NORMALIZE_RUN_DEPENDS=	normalize:audio/normalize
 
 OPUSTOOLS_DESC=		Opus audio codec
-OPUSTOOLS_RUN_DEPENDS=	opusenc:${PORTSDIR}/audio/opus-tools
+OPUSTOOLS_RUN_DEPENDS=	opusenc:audio/opus-tools
 
 SHORTEN_DESC=		Shorten (lossless) audio codec
-SHORTEN_RUN_DEPENDS=	shorten:${PORTSDIR}/audio/shorten
+SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
 
 SOX_DESC=		Universal sound sample translator
-SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+SOX_RUN_DEPENDS=	sox:audio/sox
 
-SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/audio/speex
+SPEEX_RUN_DEPENDS=	speexenc:audio/speex
 
 TIMIDITY_DESC=		MIDI audio decoder
-TIMIDITY_RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+TIMIDITY_RUN_DEPENDS=	timidity:audio/timidity
 
-TTA_RUN_DEPENDS=	ttaenc:${PORTSDIR}/audio/tta
+TTA_RUN_DEPENDS=	ttaenc:audio/tta
 
-TWOLAME_RUN_DEPENDS=	twolame:${PORTSDIR}/audio/twolame
+TWOLAME_RUN_DEPENDS=	twolame:audio/twolame
 
 VORBISGAIN_DESC=	Ogg Vorbis audio replaygain
-VORBISGAIN_RUN_DEPENDS=	vorbisgain:${PORTSDIR}/audio/vorbisgain
+VORBISGAIN_RUN_DEPENDS=	vorbisgain:audio/vorbisgain
 
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
 
-WAVPACK_RUN_DEPENDS=	wavpack:${PORTSDIR}/audio/wavpack
+WAVPACK_RUN_DEPENDS=	wavpack:audio/wavpack
 
 NLS_USES=	gettext
 NLS_CMAKE_OFF=	-DBUILD_po=FALSE
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 4ff1771fa4d1..b56c1fe6f3e8 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mod player/tracking tool which supports XM and MOD formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 GNU_CONFIGURE=	yes
 USES=		compiler pathfix pkgconfig
@@ -34,7 +34,7 @@ DESKTOP_ENTRIES="SoundTracker" "Pattern-oriented music editor" \
 
 ASM_CONFIGURE_ON=	--enable-asm
 
-JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
 
 SDL_USE=		SDL=sdl
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index d97c283e6731..68d3e427c74d 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -16,7 +16,7 @@ COMMENT=	SOund eXchange - universal sound sample translator
 LICENSE=	LGPL21 GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 CONFLICTS=	play-[0-9]*
 
@@ -45,56 +45,56 @@ CONFIGURE_ARGS+=	--with-gsm
 CONFIGURE_ARGS+=	--disable-stack-protector
 
 ALSA_CONFIGURE_WITH=	alsa
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 
 AO_CONFIGURE_WITH=	ao
-AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=		libao.so:audio/libao
 
 AMRNB_CONFIGURE_WITH=	amrnb
-AMRNB_LIB_DEPENDS=	libamrnb.so:${PORTSDIR}/audio/libamrnb
+AMRNB_LIB_DEPENDS=	libamrnb.so:audio/libamrnb
 
 AMRWB_CONFIGURE_WITH=	amrwb
-AMRWB_LIB_DEPENDS=	libamrwb.so:${PORTSDIR}/audio/libamrwb
+AMRWB_LIB_DEPENDS=	libamrwb.so:audio/libamrwb
 
 VORBIS_CONFIGURE_WITH=	oggvorbis
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 SNDFILE_CONFIGURE_WITH=	sndfile
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 LADSPA_CONFIGURE_WITH=	ladspa
-LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa
-LADSPA_BUILD_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:${PORTSDIR}/audio/ladspa
+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:audio/ladspa
+LADSPA_BUILD_DEPENDS=	${LOCALBASE}/lib/ladspa/filter.so:audio/ladspa
 
 LAME_CONFIGURE_WITH=	lame
-LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 
 FLAC_CONFIGURE_WITH=	flac
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 
 MAD_CONFIGURE_WITH=	mad
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
 
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
 ID3TAG_CONFIGURE_WITH=	id3tag
-ID3TAG_LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
+ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
 
 WAVPACK_CONFIGURE_WITH=	wavpack
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 
 TWOLAME_CONFIGURE_WITH=	twolame
-TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
 
 OPUS_CONFIGURE_WITH=	opus
-OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile
+OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
 
 # We cannot ask for gsm to be enabled without it trying to use external gsm,
 # so force the autoconf checks to fail
diff --git a/audio/specimen/Makefile b/audio/specimen/Makefile
index 65a1c2a63825..dcd4c53cf4ac 100644
--- a/audio/specimen/Makefile
+++ b/audio/specimen/Makefile
@@ -14,12 +14,12 @@ COMMENT=	MIDI controllable audio sampler
 # However, the library version number was not changed.  The line above
 # is supposed to work around that.
 
-BUILD_DEPENDS=	jackit>=0.109.2:${PORTSDIR}/audio/jack
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		liblash.so:${PORTSDIR}/audio/lash \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libphat.so:${PORTSDIR}/x11-toolkits/phat
+BUILD_DEPENDS=	jackit>=0.109.2:audio/jack
+LIB_DEPENDS=	libjack.so:audio/jack \
+		liblash.so:audio/lash \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libphat.so:x11-toolkits/phat
 
 USES=		gmake pkgconfig
 USE_GNOME=	libgnomecanvas libxml2
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index a09664222d25..7977b0a55451 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Audio compression format designed for speech
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libspeexdsp.so:audio/speexdsp
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index cfdf1bd94999..63ada21fa1a8 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Acoustic spectrum analyser
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USES=		tar:xz gmake pkgconfig desktop-file-utils compiler:c++11-lib desktop-file-utils
 USE_GNOME=	intltool
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index b84a75e27e8b..de694f38de11 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech recognition system
 
-LIB_DEPENDS=	libsphinxbase.so:${PORTSDIR}/audio/sphinxbase
+LIB_DEPENDS=	libsphinxbase.so:audio/sphinxbase
 
 USES=		gmake pathfix libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 3f83b74391bf..349ac93c936a 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -29,7 +29,7 @@ SNDFILE_DESC=	libsndfile support
 THREADS_DESC=	Build with thread safety support
 
 SNDFILE_USES=		pkgconfig
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_ENV_OFF=	HAVE_PKGCONFIG=no
 
 THREADS_LDFLAGS=		-lpthread
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 99e352d16aa8..df9d8585da57 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Loop-based sampler
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	PTHREAD_LIBS="-lpthread"
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index db5c776e6472..b00547e4ccec 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	SpiralSynth-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI-capable synthesizer for X
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
 MAKE_ENV=	PTHREAD_LIBS="-lpthread"
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 8e2fadd0f686..397ac54e509b 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	spiralmodular-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented modular softsynth/sequencer/sampler
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		jackd:${PORTSDIR}/audio/jack
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
+		jackd:audio/jack
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libsndfile.so:audio/libsndfile
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/audio/splaytk/Makefile b/audio/splaytk/Makefile
index 0650775c77d8..d9890b05fa2f 100644
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tk based interface for splay
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	splay:${PORTSDIR}/audio/splay
+RUN_DEPENDS=	splay:audio/splay
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/splay-tk-${PORTVERSION}
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index 2b072eff1433..a9ad0c9e524f 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -10,13 +10,13 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Learning console-based MP3/OGG player
 
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac \
-		libfftw.so:${PORTSDIR}/math/fftw \
-		libid3.so:${PORTSDIR}/audio/id3lib \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libao.so:${PORTSDIR}/audio/libao
-RUN_DEPENDS=	id3v2:${PORTSDIR}/audio/id3v2
+LIB_DEPENDS+=	libFLAC.so:audio/flac \
+		libfftw.so:math/fftw \
+		libid3.so:audio/id3lib \
+		libmad.so:audio/libmad \
+		libvorbis.so:audio/libvorbis \
+		libao.so:audio/libao
+RUN_DEPENDS=	id3v2:audio/id3v2
 
 USES=		tar:bzip2 gmake
 USE_RUBY=	yes
diff --git a/audio/squeezeboxserver-dynamicplaylist/Makefile b/audio/squeezeboxserver-dynamicplaylist/Makefile
index b62b3d8fe31a..2cd21cca76e4 100644
--- a/audio/squeezeboxserver-dynamicplaylist/Makefile
+++ b/audio/squeezeboxserver-dynamicplaylist/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	squeezeboxserver
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Squeezebox Server plugin to create dynamic playlists
 
-RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
+RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip
diff --git a/audio/squeezeboxserver-lazysearch/Makefile b/audio/squeezeboxserver-lazysearch/Makefile
index 3edb393349d9..16cd0594c001 100644
--- a/audio/squeezeboxserver-lazysearch/Makefile
+++ b/audio/squeezeboxserver-lazysearch/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	squeezeboxserver
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Squeezebox Server plugin for performing lazy searches
 
-RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
+RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/audio/squeezeboxserver-sqlplaylist/Makefile b/audio/squeezeboxserver-sqlplaylist/Makefile
index 49af4b2b009f..6b165edf5b4b 100644
--- a/audio/squeezeboxserver-sqlplaylist/Makefile
+++ b/audio/squeezeboxserver-sqlplaylist/Makefile
@@ -13,8 +13,8 @@ DIST_SUBDIR=	squeezeboxserver
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Squeezebox Server plugin to create playlists based on SQL queries
 
-RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver \
-		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:${PORTSDIR}/audio/squeezeboxserver-dynamicplaylist
+RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver \
+		${LOCALBASE}/${SLIMDIR}/Plugins/DynamicPlayList/install.xml:audio/squeezeboxserver-dynamicplaylist
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip
diff --git a/audio/squeezeboxserver-superdatetime/Makefile b/audio/squeezeboxserver-superdatetime/Makefile
index 560c5655abba..78636e5faef4 100644
--- a/audio/squeezeboxserver-superdatetime/Makefile
+++ b/audio/squeezeboxserver-superdatetime/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	squeezeboxserver
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Squeezebox Server plugin to display weather conditions and forecasts
 
-RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
+RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
 
 PROJECTHOST=	grebrown-projects
 
diff --git a/audio/squeezeboxserver-trackstat/Makefile b/audio/squeezeboxserver-trackstat/Makefile
index c3d04ef01e37..26644d202b46 100644
--- a/audio/squeezeboxserver-trackstat/Makefile
+++ b/audio/squeezeboxserver-trackstat/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	squeezeboxserver
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Squeezebox Server plugin to store ratings and statistics about songs
 
-RUN_DEPENDS=	softsqueeze:${PORTSDIR}/audio/squeezeboxserver
+RUN_DEPENDS=	softsqueeze:audio/squeezeboxserver
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 USES=		zip
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 489301b38c28..ca891949062f 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -21,24 +21,24 @@ RESTRICTED=	Contains non-redistributable firmware, documentation, and images
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-32171-noCPAN
 
-RUN_DEPENDS+=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
-		p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck \
-		p5-EV>=0:${PORTSDIR}/devel/p5-EV \
-		p5-Audio-Scan>=0.87:${PORTSDIR}/audio/p5-Audio-Scan \
-		p5-Class-XSAccessor>=0:${PORTSDIR}/devel/p5-Class-XSAccessor
+RUN_DEPENDS+=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-URI-Find>=0:textproc/p5-URI-Find \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \
+		p5-Encode-Detect>=0:converters/p5-Encode-Detect \
+		p5-GD>=0:graphics/p5-GD \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-YAML-Syck>=0:textproc/p5-YAML-Syck \
+		p5-EV>=0:devel/p5-EV \
+		p5-Audio-Scan>=0.87:audio/p5-Audio-Scan \
+		p5-Class-XSAccessor>=0:devel/p5-Class-XSAccessor
 
 # Work around a bug in p5-Package-Stash port
-RUN_DEPENDS+=	p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager
+RUN_DEPENDS+=	p5-Package-DeprecationManager>=0.10:devel/p5-Package-DeprecationManager
 
 USERS=		${SLIMUSER}
 GROUPS=		${SLIMGROUP}
@@ -46,12 +46,12 @@ USES=		perl5 tar:tgz
 
 USE_MYSQL=	server
 
-APE_RUN_DEPENDS=	mac:${PORTSDIR}/audio/mac
-FAAD_RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad
-FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
-LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
-SHORTEN_RUN_DEPENDS=	shorten:${PORTSDIR}/audio/shorten
-SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+APE_RUN_DEPENDS=	mac:audio/mac
+FAAD_RUN_DEPENDS=	faad:audio/faad
+FLAC_RUN_DEPENDS=	flac:audio/flac
+LAME_RUN_DEPENDS=	lame:audio/lame
+SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
+SOX_RUN_DEPENDS=	sox:audio/sox
 
 USE_RC_SUBR=	squeezeboxserver
 TMP_SLIMDIR=	${WRKDIR}/_squeezeboxserver
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 7a0295408dd4..72add71783ad 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Splits SHOUTcast stream into tracks
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-		libtre.so:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libmad.so:audio/libmad \
+		libtre.so:textproc/libtre
 
 OPTIONS_DEFINE=	FAAD VORBIS
 OPTIONS_DEFAULT=FAAD VORBIS
@@ -39,10 +39,10 @@ LDFLAGS+=	-Lcdk-${CDK_VERSION} -L${LOCALBASE}/lib
 CDK_VERSION=	5.0-20060507
 
 FAAD_CONFIGURE_OFF=	ac_cv_lib_faad_NeAACDecDecode2=no
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 
 VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 post-extract:
 	${MV} ${WRKDIR}/cdk-${CDK_VERSION} ${WRKSRC}
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index 543aae7d2ce3..6bafb73115eb 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Transcode and stream audio to a SHOUTcast/Icecast/Peercast server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libmad.so:${PORTSDIR}/audio/libmad \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libmp3lame.so:${PORTSDIR}/audio/lame
+LIB_DEPENDS=	libogg.so:audio/libogg \
+		libvorbis.so:audio/libvorbis \
+		libmad.so:audio/libmad \
+		libcurl.so:ftp/curl \
+		libmp3lame.so:audio/lame
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 74bff2b6675a..eba838ef5d96 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -12,9 +12,9 @@ COMMENT=	GTK+ stream directory browser
 
 BROKEN=		Is no longer able to fetch stream information
 
-BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+BUILD_DEPENDS=	rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libcurl.so:ftp/curl
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme
 
 USES=		gettext gmake libtool pathfix pkgconfig
 USE_GNOME=	gtk20 gnomeprefix
@@ -45,7 +45,7 @@ PYTHON_CONFIGURE_ENABLE=	python
 .if ${PORT_OPTIONS:MLOCAL}
 PLIST_SUB+=	LOCAL=""
 .if ${PORT_OPTIONS:MLOCAL_METADATA}
-LIB_DEPENDS+=	libtag_c.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS+=	libtag_c.so:audio/taglib
 .else
 CONFIGURE_ARGS+=	--disable-local-metadata
 .endif
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 3911a378fa0e..5b86c889aeba 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Sound editor for the GNOME/GTK+2 desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libmad.so:audio/libmad \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libvorbis.so:audio/libvorbis \
+		libspeex.so:audio/speex
 
 USES=		pathfix gettext pkgconfig gmake tar:bzip2 libtool \
 		desktop-file-utils
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 7ca8cc11f4d4..5b31ccdac815 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	swh-plugins-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Steve Harris' huge Collection of LADSPA Plugins
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
+		${LOCALBASE}/include/fftw3.h:math/fftw3
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 # includes assembler code
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/taglib-extras/Makefile b/audio/taglib-extras/Makefile
index 704bd040b33b..1ed7d4c7ce1e 100644
--- a/audio/taglib-extras/Makefile
+++ b/audio/taglib-extras/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra taglib features for Amarok 2.2
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		cmake
 
diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile
index 6401398ba276..af79923635dd 100644
--- a/audio/taglib/Makefile
+++ b/audio/taglib/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	RCC
 OPTIONS_SUB=	yes
 
 RCC_DESC=		Build with RusXMMS librcc patches (experimental)
-RCC_LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel/librcc
+RCC_LIB_DEPENDS=	librcc.so:devel/librcc
 RCC_EXTRA_PATCHES=	${FILESDIR}/extrapatch-rcc
 RCC_CFLAGS=		-I${LOCALBASE}/include
 RCC_LDFLAGS=		-L${LOCALBASE}/lib
diff --git a/audio/taglookup/Makefile b/audio/taglookup/Makefile
index a156739d50e2..7b80c34ab69e 100644
--- a/audio/taglookup/Makefile
+++ b/audio/taglookup/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.kamaz.org.uk/taglookup/
 MAINTAINER=	alex@kamaz.org.uk
 COMMENT=	Utility for tagging groups of audio files using CDDB
 
-LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb \
-		libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libcddb.so:audio/libcddb \
+		libtag.so:audio/taglib
 
 USES=		pkgconfig tar:tgz
 
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index bfc9552df9b3..8c3a8d470942 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GNOME MP3/Ogg file tagger
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libid3.so:audio/id3lib \
+		libvorbis.so:audio/libvorbis
 
 USES=		tar:bzip2 gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack libglade2
diff --git a/audio/tagutil/Makefile b/audio/tagutil/Makefile
index 603b9a62600f..a82ca47ebc32 100644
--- a/audio/tagutil/Makefile
+++ b/audio/tagutil/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command line interface tool to manage tags in music files
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libyaml.so:${PORTSDIR}/textproc/libyaml
+LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kAworu
@@ -29,13 +29,13 @@ OPTIONS_DEFAULT=	FLAC OGG TAGLIB
 TAGLIB_DESC=	Multiple file format but limited tags support
 JSON_DESC=	JSON output format support
 
-JSON_LIB_DEPENDS+=	libjansson.so:${PORTSDIR}/devel/jansson
+JSON_LIB_DEPENDS+=	libjansson.so:devel/jansson
 JSON_CMAKE_OFF+=	-DWITHOUT_JSON=yes
-FLAC_LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS+=	libFLAC.so:audio/flac
 FLAC_CMAKE_OFF+=	-DWITHOUT_FLAC=yes
-OGG_LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+OGG_LIB_DEPENDS+=	libvorbisfile.so:audio/libvorbis
 OGG_CMAKE_OFF+=	-DWITHOUT_OGGVORBIS=yes
-TAGLIB_LIB_DEPENDS+=	libtag_c.so:${PORTSDIR}/audio/taglib
+TAGLIB_LIB_DEPENDS+=	libtag_c.so:audio/taglib
 TAGLIB_CMAKE_OFF+=	-DWITHOUT_TAGLIB=yes
 
 .include <bsd.port.mk>
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index adbe1f1c1971..2f0379ca945a 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Realtime audio synthesizer that allows you to "scratch" on audio data
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
-		rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
-		liblrdf.so:${PORTSDIR}/textproc/liblrdf
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa \
+		rarian-sk-config:textproc/rarian
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile \
+		liblrdf.so:textproc/liblrdf
 
 OPTIONS_DEFINE=	ALSA JACK MPG123 SOX VORBIS MAD
 OPTIONS_DEFAULT=	JACK MPG123 SOX VORBIS MAD
@@ -36,21 +36,21 @@ INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-alsa
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--disable-jack
-MPG123_BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+MPG123_BUILD_DEPENDS=	mpg123:audio/mpg123
+MPG123_RUN_DEPENDS=	mpg123:audio/mpg123
 MPG123_CONFIGURE_OFF=	--disable-mpg123
-SOX_BUILD_DEPENDS=	sox:${PORTSDIR}/audio/sox
-SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+SOX_BUILD_DEPENDS=	sox:audio/sox
+SOX_RUN_DEPENDS=	sox:audio/sox
 SOX_CONFIGURE_OFF=	--disable-sox
-VORBIS_BUILD_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-VORBIS_RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_BUILD_DEPENDS=	oggenc:audio/vorbis-tools
+VORBIS_RUN_DEPENDS=	oggenc:audio/vorbis-tools
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_OFF=	--disable-mad
 
 post-patch:
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index 6367a696e4a9..24cd1a764fed 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Media tags plugin
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		gmake pkgconfig gettext libtool xfce tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index b12ff1a3e9fe..91e4718884f9 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	JACK audio capture tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libjack.so:audio/jack \
+		liblo.so:audio/liblo \
+		libsndfile.so:audio/libsndfile
 
 OPTIONS_DEFINE=	LASH
 
@@ -23,7 +23,7 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lm
 
-LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=	liblash.so:audio/lash
 LASH_CONFIGURE_OFF=	--disable-lash
 
 post-patch:
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 3492f7dc822b..7c5aab909d09 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -14,9 +14,9 @@ COMMENT?=	Software MIDI player
 LICENSE=	GPLv2+
 
 .if !defined(PKGNAMESUFFIX)
-LIB_DEPENDS=	libarc.so:${PORTSDIR}/archivers/libarc \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
-RUN_DEPENDS=	eawpats>0:${PORTSDIR}/audio/eawpats
+LIB_DEPENDS=	libarc.so:archivers/libarc \
+		libvorbis.so:audio/libvorbis
+RUN_DEPENDS=	eawpats>0:audio/eawpats
 .endif
 
 USES=		gmake tar:bzip2
@@ -33,11 +33,11 @@ OPTIONS_DEFINE=		DOCS EAWPLUS ESOUND X11
 OPTIONS_DEFAULT=	X11
 
 EAWPLUS_DESC=		Collection of Gravis Ultrasound MIDI patches
-EAWPLUS_RUN_DEPENDS=	eawplus>0:${PORTSDIR}/audio/eawplus
+EAWPLUS_RUN_DEPENDS=	eawplus>0:audio/eawplus
 ESOUND_USE=		gnome=esound
 ESOUND_CONFIGURE_ON=	--enable-audio=oss,esd,vorbis
 ESOUND_CONFIGURE_OFF=	--enable-audio=oss,vorbis
-X11_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+X11_LIB_DEPENDS=	libpng.so:graphics/png
 X11_USE=		xorg=x11,xext
 X11_CONFIGURE_ON=	--with-x --enable-spectrogram --enable-wrd \
 			--enable-dynamic
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
index 0197e2c09942..d441058ae03a 100644
--- a/audio/timidity++/Makefile.interface
+++ b/audio/timidity++/Makefile.interface
@@ -2,8 +2,8 @@
 
 # Shared by timidity++ interface ports
 
-BUILD_DEPENDS+=	libarc>0:${PORTSDIR}/archivers/libarc
-RUN_DEPENDS+=	timidity++>0:${PORTSDIR}/audio/timidity++
+BUILD_DEPENDS+=	libarc>0:archivers/libarc
+RUN_DEPENDS+=	timidity++>0:audio/timidity++
 
 SLAVEDIRS=	audio/timidity++-emacs audio/timidity++-gtk \
 		audio/timidity++-motif audio/timidity++-slang \
@@ -57,9 +57,9 @@ DESKTOP_ENTRIES="XmMidi" "" "" "${LINK}" "Motif;AudioVideo;Audio;Midi;" ""
 
 .if ${INTERFACE} == "slang"
 .if defined(JAPANESE)
-LIB_DEPENDS+=	libslang.so:${PORTSDIR}/japanese/libslang
+LIB_DEPENDS+=	libslang.so:japanese/libslang
 .else
-LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS+=	libslang.so:devel/libslang2
 .endif
 
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=\
 LINK=		tkmidi
 
 .if defined(JAPANESE)
-LIB_DEPENDS+=	libtk80jp.so:${PORTSDIR}/japanese/tk80
+LIB_DEPENDS+=	libtk80jp.so:japanese/tk80
 CONFIGURE_ARGS+=\
 		--with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \
 		--with-tk-includes=${LOCALBASE}/include/tk8.0jp \
@@ -105,7 +105,7 @@ DESKTOP_ENTRIES="TkMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" ""
 .if ${INTERFACE} == "xaw"
 LINK=		xawmidi
 
-LIB_DEPENDS+=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS+=	libXaw3d.so:x11-toolkits/Xaw3d
 
 USE_XORG=	x11 xext xmu xt sm ice xpm
 
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index cfe7d394a903..62cc1ee86ef7 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -27,7 +27,7 @@ GUSPAT_DESC=	Use audio/guspat instead of included sound fonts (goemon)
 
 # Set up sound fonts from audio/guspat.
 .if ${PORT_OPTIONS:MGUSPAT}
-RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:${PORTSDIR}/audio/guspat
+RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:audio/guspat
 TDIR=		${LOCALBASE}/share/timidity
 TCONFIG=	timidity.cfg-guspat
 PLIST_SUB+=	GOEMON="@comment "
diff --git a/audio/tkeca/Makefile b/audio/tkeca/Makefile
index 15b1a5e7d557..4e85f9a530b6 100644
--- a/audio/tkeca/Makefile
+++ b/audio/tkeca/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Tk interface to ecasound
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize \
-		ecasound:${PORTSDIR}/audio/ecasound
+RUN_DEPENDS=	normalize:audio/normalize \
+		ecasound:audio/ecasound
 
 USES=		desktop-file-utils tk
 
diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index e486d65f795d..0e547252f3ca 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -11,28 +11,28 @@ COMMENT=	Multi-source, social, and smart music player
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash \
-		websocketpp>=0.4.0:${PORTSDIR}/devel/websocketpp
-RUN_DEPENDS=	phonon-vlc>=0.6.1:${PORTSDIR}/multimedia/phonon-vlc
-LIB_DEPENDS=	libattica.so:${PORTSDIR}/x11-toolkits/attica \
-		liblucene++.so:${PORTSDIR}/textproc/luceneplusplus \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libechonest.so:${PORTSDIR}/audio/libechonest \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libjreen.so:${PORTSDIR}/net-im/libjreen \
-		liblastfm.so:${PORTSDIR}/audio/liblastfm \
-		libqca.so:${PORTSDIR}/devel/qca \
-		libqjson.so:${PORTSDIR}/devel/qjson \
-		libqtkeychain.so:${PORTSDIR}/security/qtkeychain-qt4 \
-		libquazip.so:${PORTSDIR}/archivers/quazip \
-		libtag.so:${PORTSDIR}/audio/taglib
+BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash \
+		websocketpp>=0.4.0:devel/websocketpp
+RUN_DEPENDS=	phonon-vlc>=0.6.1:multimedia/phonon-vlc
+LIB_DEPENDS=	libattica.so:x11-toolkits/attica \
+		liblucene++.so:textproc/luceneplusplus \
+		libboost_thread.so:devel/boost-libs \
+		libechonest.so:audio/libechonest \
+		libgnutls.so:security/gnutls \
+		libjreen.so:net-im/libjreen \
+		liblastfm.so:audio/liblastfm \
+		libqca.so:devel/qca \
+		libqjson.so:devel/qjson \
+		libqtkeychain.so:security/qtkeychain-qt4 \
+		libquazip.so:archivers/quazip \
+		libtag.so:audio/taglib
 
 CMAKE_ARGS=	-DBUILD_RELEASE="ON"
 CXXFLAGS+=	-Wno-cast-align -I${LOCALBASE}/include
 
 GH_ACCOUNT=	tomahawk-player
 
-TELEPATHY_LIB_DEPENDS=	libtelepathy-qt4.so:${PORTSDIR}/net-im/telepathy-qt4
+TELEPATHY_LIB_DEPENDS=	libtelepathy-qt4.so:net-im/telepathy-qt4
 TELEPATHY_DESC=	Configure Telepathy Settings
 TELEPATHY_USE_KDE4=	kdelibs automoc4
 
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 57cea5d3a007..f10e67260697 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -20,12 +20,12 @@ COMMENT=	Multitrack tablature editor and player
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel \
-		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \
-		${JAVALIBDIR}/gervill.jar:${PORTSDIR}/audio/gervill
+BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel \
+		${JAVALIBDIR}/itext.jar:devel/itext \
+		${JAVALIBDIR}/gervill.jar:audio/gervill
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
-		libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth \
+		libjack.so:audio/jack
 
 MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
diff --git a/audio/twolame/Makefile b/audio/twolame/Makefile
index 708f92b768e8..e877264bd8b9 100644
--- a/audio/twolame/Makefile
+++ b/audio/twolame/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	SF \
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG Audio Layer 2 encoder
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
+		libFLAC.so:audio/flac \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg
 
 USES=		gmake pathfix pkgconfig libtool
 USE_LDCONFIG=	yes
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index cbb29f565925..252d5721015f 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unix Amiga Delitracker Emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:audio/libao
 
 USES=		gmake pkgconfig tar:bzip2
 HAS_CONFIGURE=	yes
@@ -45,7 +45,7 @@ TEXTSCOPE_CONFIGURE_WITH=	text-scope
 FUSE_USES=		fuse
 FUSE_CONFIGURE_WITH=	uadefs
 
-XMMS_LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_WITH=	xmms
 
 post-extract:
diff --git a/audio/ufmcontrol-i18n/Makefile b/audio/ufmcontrol-i18n/Makefile
index 864bcc2c3ba9..c3bbb41d2e00 100644
--- a/audio/ufmcontrol-i18n/Makefile
+++ b/audio/ufmcontrol-i18n/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/ufmcontrol-i18n/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	USB radio control utility
 
-RUN_DEPENDS=	snack>=2.2.10_4:${PORTSDIR}/audio/snack
+RUN_DEPENDS=	snack>=2.2.10_4:audio/snack
 
 USES=		libedit tk:wrapper,run
 USE_LDCONFIG=	yes
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index f70f077e7104..e0ae27e133b5 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console module player
 
-LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
-		libao.so:${PORTSDIR}/audio/libao
-BUILD_DEPENDS=	${LOCALBASE}/lib/libaiff.a:${PORTSDIR}/audio/libaiff
+LIB_DEPENDS=	libmodplug.so:audio/libmodplug \
+		libao.so:audio/libao
+BUILD_DEPENDS=	${LOCALBASE}/lib/libaiff.a:audio/libaiff
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index 1cd797c5a767..a145a596f919 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Minimalistic Murmur (Mumble server)
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
-		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+LIB_DEPENDS=	libconfig.so:devel/libconfig \
+		libprotobuf-c.so:devel/protobuf-c
 
 USE_GITHUB=	yes
 
diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile
index ffa136a8c924..a779ad9c1951 100644
--- a/audio/vagalume/Makefile
+++ b/audio/vagalume/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GTK+-based client for the Last.fm online radio
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
+		libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig desktop-file-utils
@@ -28,12 +28,12 @@ OPTIONS_DEFAULT=	DBUS TRAY
 OPTIONS_SUB=	NLS DBUS
 TRAY_DESC=	Tray icon and libnotify support
 
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 DBUS_CONFIGURE_ON=	--enable-dbus --enable-im-status
 DBUS_CONFIGURE_OFF=	--disable-dbus --disable-im-status
 
-TRAY_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify
-TRAY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+TRAY_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libnotify.pc:devel/libnotify
+TRAY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 TRAY_CONFIGURE_ENABLE=	tray-icon
 
 NLS_USES=		gettext
diff --git a/audio/vamp-plugin-sdk/Makefile b/audio/vamp-plugin-sdk/Makefile
index dd836560acb6..98f292c88f76 100644
--- a/audio/vamp-plugin-sdk/Makefile
+++ b/audio/vamp-plugin-sdk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Vamp audio analysis plugin SDK
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/ventrilo-server/Makefile b/audio/ventrilo-server/Makefile
index 5bd990919df1..3a167ba47b61 100644
--- a/audio/ventrilo-server/Makefile
+++ b/audio/ventrilo-server/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ventrilo_srv-${PORTVERSION}-FreeBSD-i386
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Server side of the Ventrilo group voice chat system
 
-RUN_DEPENDS=	compat4x-i386>0:${PORTSDIR}/misc/compat4x
+RUN_DEPENDS=	compat4x-i386>0:misc/compat4x
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index 1eb87a2318ef..6996f5bb756d 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Curses-based media player with vim-like keybinds
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+RUN_DEPENDS=	mplayer:multimedia/mplayer
+LIB_DEPENDS=	libtag.so:audio/taglib
 
 USES=		ncurses
 ALL_TARGET=	vitunes
diff --git a/audio/volumeicon/Makefile b/audio/volumeicon/Makefile
index 071da47099c0..d504f4f827db 100644
--- a/audio/volumeicon/Makefile
+++ b/audio/volumeicon/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=		NLS NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
 OPTIONS_SUB=		yes
 
-NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=notify
 
 .include <bsd.port.mk>
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index bb1963fb2e87..5473f712f0ff 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Play, encode, and manage Ogg Vorbis files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libkate.so:${PORTSDIR}/multimedia/libkate \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libao.so:audio/libao \
+		libcurl.so:ftp/curl \
+		libFLAC.so:audio/flac \
+		libkate.so:multimedia/libkate \
+		libspeex.so:audio/speex \
+		libvorbis.so:audio/libvorbis
 
 USES=		cpe iconv pkgconfig
 CPE_VENDOR=	xiph
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
index de3d588dc325..22a3981946bb 100644
--- a/audio/vorbisgain/Makefile
+++ b/audio/vorbisgain/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Calculates the perceived sound level of an Ogg Vorbis file
 OPTIONS_DEFINE=	RECURSIVE
 RECURSIVE_DESC=	recursive processing and pattern matching
 
-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile
index 0135709cdec8..aa24fe81a5cc 100644
--- a/audio/vsound/Makefile
+++ b/audio/vsound/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Utility for capturing audio streams from programs with OSS output
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	sox:${PORTSDIR}/audio/sox
-RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+BUILD_DEPENDS=	sox:audio/sox
+RUN_DEPENDS=	sox:audio/sox
 
 USES=		alias libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/waon/Makefile b/audio/waon/Makefile
index 9a6477ee5ab3..7d368ec81e30 100644
--- a/audio/waon/Makefile
+++ b/audio/waon/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Wave-to-Notes transcriber and some utility tools
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libao.so:${PORTSDIR}/audio/libao \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libao.so:audio/libao \
+		libsndfile.so:audio/libsndfile \
+		libsamplerate.so:audio/libsamplerate
 
 USES=		pkgconfig
 USE_GNOME=	gtk20
diff --git a/audio/wavegain/Makefile b/audio/wavegain/Makefile
index 35e6291c93dd..0b1880d59ad7 100644
--- a/audio/wavegain/Makefile
+++ b/audio/wavegain/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}srcs${EXTRACT_SUFFIX}
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	Program that applies ReplayGain to wave files
 
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	uses x86 assembly
diff --git a/audio/whysynth/Makefile b/audio/whysynth/Makefile
index 02e1f68b6531..b0bb45296e55 100644
--- a/audio/whysynth/Makefile
+++ b/audio/whysynth/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Versatile softsynth implemented as a DSSI plugin
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \
-		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float
+BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:audio/dssi \
+		${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libjack.so:audio/jack \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float
 
 USES=		gmake pkgconfig tar:bzip2 libtool
 GNU_CONFIGURE=	yes
diff --git a/audio/wildmidi/Makefile b/audio/wildmidi/Makefile
index 5e3870aa0b35..4080660c3295 100644
--- a/audio/wildmidi/Makefile
+++ b/audio/wildmidi/Makefile
@@ -45,12 +45,12 @@ LICENSE+=	GPLv3
 LICENSE_COMB=	multi
 CMAKE_ARGS+=	-DWANT_OPENAL:BOOL=OFF
 .  if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 .  elif ${PORT_OPTIONS:MOPENALSOFT}
-LIB_DEPENDS+=	libopenal.so:${PORTSDIR}/audio/openal-soft
+LIB_DEPENDS+=	libopenal.so:audio/openal-soft
 CMAKE_ARGS+=	-DWANT_OPENAL:BOOL=ON
 .  elif ${PORT_OPTIONS:MOPENAL}
-LIB_DEPENDS+=	libopenal.so:${PORTSDIR}/audio/openal
+LIB_DEPENDS+=	libopenal.so:audio/openal
 CMAKE_ARGS+=	-DWANT_OPENAL:BOOL=ON
 .  endif
 .endif
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index 037cbf8f006f..66a7702d90eb 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp to display album covers for XMMS
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
-		libgdk_pixbuf_xlib.so:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	libxmms.so:multimedia/xmms \
+		libgdk_pixbuf_xlib.so:graphics/gdk-pixbuf
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index 67cf96caff41..d445be7ea380 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	WorkMan-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Look-based CD player tool
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/workman
 USES=		imake
diff --git a/audio/wxguitar/Makefile b/audio/wxguitar/Makefile
index f74bfa36abd4..e13e8358173b 100644
--- a/audio/wxguitar/Makefile
+++ b/audio/wxguitar/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple guitar tuning assistant
 
-RUN_DEPENDS=	wavplay:${PORTSDIR}/audio/wavplay
+RUN_DEPENDS=	wavplay:audio/wavplay
 
 USES=		compiler:c++11-lib
 USE_CXXSTD=	c++11
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 421f143b0c17..6944b324c517 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Volume control for the Xfce desktop
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+		libunique-1.0.so:x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
@@ -27,7 +27,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	KEYBIND NLS
 KEYBIND_DESC=	Multimedia keyboard shortcuts
-KEYBIND_LIB_DEPENDS=	libkeybinder.so:${PORTSDIR}/x11/keybinder
+KEYBIND_LIB_DEPENDS=	libkeybinder.so:x11/keybinder
 KEYBIND_CONFIGURE_ENABLE=	keybinder
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index e5d08649ea55..a50e7515e934 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Musicpd client plugin for the Xfce panel
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
-RUN_DEPENDS=	musicpd:${PORTSDIR}/audio/musicpd
+LIB_DEPENDS=	libmpd.so:audio/libmpd
+RUN_DEPENDS=	musicpd:audio/musicpd
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/audio/xfce4-pulseaudio-plugin/Makefile b/audio/xfce4-pulseaudio-plugin/Makefile
index e2440997530c..80af1646b6cb 100644
--- a/audio/xfce4-pulseaudio-plugin/Makefile
+++ b/audio/xfce4-pulseaudio-plugin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Panel plugin for controlling PulseAudio mixer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpulse-mainloop-glib.so:${PORTSDIR}/audio/pulseaudio
-RUN_DEPENDS=	pavucontrol>=2.0:${PORTSDIR}/audio/pavucontrol
+LIB_DEPENDS=	libpulse-mainloop-glib.so:audio/pulseaudio
+RUN_DEPENDS=	pavucontrol>=2.0:audio/pavucontrol
 
 USES=	gettext gmake libtool pkgconfig tar:bzip2 xfce:gtk3
 GNU_CONFIGURE=	yes
@@ -30,7 +30,7 @@ CFLAGS+=	-Wno-return-type
 OPTIONS_DEFINE=	KEYBINDER
 OPTIONS_DEFAULT=	KEYBINDER
 KEYBINDER_DESC=	Keyboard shortcuts
-KEYBINDER_LIB_DEPENDS=	libkeybinder-3.0.so:${PORTSDIR}/x11/keybinder-gtk3
+KEYBINDER_LIB_DEPENDS=	libkeybinder-3.0.so:x11/keybinder-gtk3
 KEYBINDER_CONFIGURE_ENABLE=	keybinder
 
 .include <bsd.port.mk>
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index ed7e1265d0c2..b23c71412062 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Graphical MPD client focusing on low footprint
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
+BUILD_DEPENDS=	valac:lang/vala
+LIB_DEPENDS=	libmpd.so:audio/libmpd
 
 INSTALLS_ICONS=	yes
 USES=		tar:bzip2 gettext gmake xfce pkgconfig
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 3eb6f79d59b8..6f5360d3352f 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Generic music player for Unix-like systems
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+LIB_DEPENDS=	libid3tag.so:audio/libid3tag
+RUN_DEPENDS=	mpg123:audio/mpg123
 
 USE_GNOME=	gtk20
 USES=		gettext pkgconfig
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index c4cc19a7a7dd..719933728fc1 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
 MAINTAINER=	eischen@vigrid.com
 COMMENT=	Motif CD player
 
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
-		libFLAC.so:${PORTSDIR}/audio/flac
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
+		libFLAC.so:audio/flac
+RUN_DEPENDS+=	lame:audio/lame
 
 USES=		imake motif ncurses
 USE_XORG=	x11 xext xaw xmu xp xpm xt sm ice
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index 9b2973fa8ec6..d59dd39bc105 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -12,8 +12,8 @@ COMMENT=	XMMS plugin for playing AHX tunes
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 PLIST_FILES=	lib/xmms/Input/libahx.so
 
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index c46072c02200..fd7b4a105885 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Ncurses program for (remote) controlling multimedia/xmms
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs
 
 USES=		gettext iconv
 USE_GNOME=	gtk12
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index a2ce02cdfdfc..bd8ac540245d 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	xmms-
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS plugin for MP4/M4A/AAC files
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
-		libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS=	libxmms.so:multimedia/xmms \
+		libfaad.so:audio/faad
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/plugins/xmms/src
 
diff --git a/audio/xmms-festalon/Makefile b/audio/xmms-festalon/Makefile
index 76bbe39f45f4..c2681096923f 100644
--- a/audio/xmms-festalon/Makefile
+++ b/audio/xmms-festalon/Makefile
@@ -7,8 +7,8 @@ COMMENT=	XMMS plugin for playing .nsf and .hes audio files
 
 MASTERDIR=	${.CURDIR}/../festalon
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 USE_GNOME=	glib12
 CONFIGURE_ARGS+=	--enable-interface=interface
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 0533bcb98558..805c1089cde8 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -9,9 +9,9 @@ DISTNAME=	flac-${PORTVERSION}
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS input plugin for playing FLAC files
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
-		libFLAC.so:${PORTSDIR}/audio/flac \
-		libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libxmms.so:multimedia/xmms \
+		libFLAC.so:audio/flac \
+		libogg.so:audio/libogg
 
 USES=		iconv libtool tar:xz
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-gbsplay/Makefile b/audio/xmms-gbsplay/Makefile
index b54bf4130e05..733c43e033a0 100644
--- a/audio/xmms-gbsplay/Makefile
+++ b/audio/xmms-gbsplay/Makefile
@@ -7,9 +7,9 @@ COMMENT=	XMMS plugin for playing Nintendo Game Boy(TM) audio
 
 MASTERDIR=	${.CURDIR}/../gbsplay
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
-		gbsplay:${PORTSDIR}/audio/gbsplay
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms \
+		gbsplay:audio/gbsplay
 
 USE_GNOME=	glib12
 USE_GCC=	any
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index 780c3863bac3..565b00786395 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -15,8 +15,8 @@ COMMENT=	XMMS Plugin that provides LADSPA Plugins to XMMS
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
 
 PLIST_FILES=	lib/xmms/Effect/ladspa.so
 
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index 1b72cb973abf..2933e6a374e2 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/arved
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	XMMS plugin, that plays a sound on incoming mail and opens the MUA
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/audio/xmms-nas/Makefile b/audio/xmms-nas/Makefile
index 1665359580c9..d709e1c1abcb 100644
--- a/audio/xmms-nas/Makefile
+++ b/audio/xmms-nas/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.stack.nl/pub/users/willem/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network Audio System (NAS) output plugin for XMMS
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
-		libaudio.so:${PORTSDIR}/audio/nas
+LIB_DEPENDS=	libxmms.so:multimedia/xmms \
+		libaudio.so:audio/nas
 
 USES=		libtool
 USE_GNOME=	gtk12
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index a1b7f7888297..bf08263fd00b 100644
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XMMS input-plugin for playing Nintendo(TM) NSF audio files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 GNU_CONFIGURE=	yes
 USES=		libtool
diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile
index 62ed5faba5ef..983de18a0546 100644
--- a/audio/xmms-openspc/Makefile
+++ b/audio/xmms-openspc/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	xmms-OpenSPC-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	SPC player for XMMS using OpenSPC
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
-		xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	nasm:devel/nasm \
+		xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 GNU_CONFIGURE=	yes
 USES=		libtool
diff --git a/audio/xmms-sapplug/Makefile b/audio/xmms-sapplug/Makefile
index 927b5bb6034c..1f05cfd201f8 100644
--- a/audio/xmms-sapplug/Makefile
+++ b/audio/xmms-sapplug/Makefile
@@ -13,8 +13,8 @@ COMMENT=	XMMS input plugin for playing 8bit Atari(TM) .sap audio files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 USES=		gmake compiler
 USE_GNOME=	glib12
diff --git a/audio/xmms-sexypsf/Makefile b/audio/xmms-sexypsf/Makefile
index c8cff6c77e94..eaff4dceb4cb 100644
--- a/audio/xmms-sexypsf/Makefile
+++ b/audio/xmms-sexypsf/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	sexypsf-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	XMMS plugin for playing .psf files
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms:multimedia/xmms
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		tar:bzip2
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 1386f6c73945..4d861b0f90a1 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.etree.org/shnutils/xmms-shn/dist/src/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS plugin to allow playing shorten-compressed audio
 
-BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms-config:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 USES=		libtool
 USE_GNOME=	gtk12
diff --git a/audio/xmms-timidity/Makefile b/audio/xmms-timidity/Makefile
index 8e8ff8c0d111..0f9e7c52ba5d 100644
--- a/audio/xmms-timidity/Makefile
+++ b/audio/xmms-timidity/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.shikadi.net/utils/files/
 MAINTAINER=	beyert@cs.ucr.edu
 COMMENT=	XMMS input plugin to play midi files (via timidity)
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
+RUN_DEPENDS=	timidity:audio/timidity
 
 USE_LDCONFIG=	${PREFIX}/lib/xmms/Input
 
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index e2c517c5f09b..08f3d6e28873 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Volume Normalizer plugin for XMMS
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
 
 USES=		libtool
 USE_GNOME=	gtk12
diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
index 20e3acc8e2df..dbe72f987659 100644
--- a/audio/xmms-wavpack/Makefile
+++ b/audio/xmms-wavpack/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://www.wavpack.com/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XMMS input plugin to play WavPack files
 
-LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack \
-		libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libwavpack.so:audio/wavpack \
+		libxmms.so:multimedia/xmms
 
 USES=		iconv libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-xf86audio/Makefile b/audio/xmms-xf86audio/Makefile
index 8628146b993a..2bff1c768254 100644
--- a/audio/xmms-xf86audio/Makefile
+++ b/audio/xmms-xf86audio/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.devin.com/xmms-xf86audio/download/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	XF86Audio multimedia-key support for XMMS
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
 
 MAKE_ARGS=	CC="${CC}" OPT="${CFLAGS}" DEBUG=""
 
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index 24aee9e577d4..f08fbec7fc4d 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	xmms-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Sega Genesis GYM plugin for XMMS
 
-LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:multimedia/xmms
 
 GNU_CONFIGURE=	yes
 USES=		libtool
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index aac7f458bb82..9193bc146453 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Last.fm submission client for XMMS2
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libxmmsclient.so:audio/xmms2 \
+		libcurl.so:ftp/curl
 
 USES=		gmake pkgconfig
 LDFLAGS+=	-lpthread
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index f4fced171715..a98ff6303572 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -57,100 +57,100 @@ OPTIONS_SUB=	yes
 AIRPLAY_USE=		OPENSSL=yes
 AIRPLAY_CONFIGURE_OFF=	--without-plugins="airplay"
 
-AO_LIB_DEPENDS=		libao.so:${PORTSDIR}/audio/libao
+AO_LIB_DEPENDS=		libao.so:audio/libao
 AO_CONFIGURE_OFF=	--without-plugins="ao"
 
-APE_LIB_DEPENDS=	libmac.so:${PORTSDIR}/audio/mac
+APE_LIB_DEPENDS=	libmac.so:audio/mac
 APE_CONFIGURE_OFF=	--without-plugins="mac"
 
-AVCODEC_LIB_DEPENDS=	libavutil.so:${PORTSDIR}/multimedia/ffmpeg
+AVCODEC_LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 AVCODEC_CONFIGURE_OFF=	--without-plugins="avcodec"
 
-CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
-			libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
-			libdiscid.so:${PORTSDIR}/audio/libdiscid
+CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
+			libcdio_cdda.so:sysutils/libcdio-paranoia \
+			libdiscid.so:audio/libdiscid
 CDDA_CONFIGURE_OFF=	--without-plugins="cdda"
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=	--without-plugins="curl" --without-plugins="icymetaint"
 
-FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAD_LIB_DEPENDS=	libfaad.so:audio/faad
 FAAD_CONFIGURE_OFF=	--without-plugins="faad" --without-plugins="mp4"
 
 FAM_USES=		fam:gamin
 FAM_CONFIGURE_OFF=	--without-optionals="medialib-updater"
 
-FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 
-GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_OFF=	--without-plugins="gme"
 
 GVFS_USE=		GNOME=gvfs
 GVFS_CONFIGURE_OFF=	--without-plugins="gvfs"
 
-ICES_LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout
+ICES_LIB_DEPENDS=	libshout.so:audio/libshout
 ICES_CONFIGURE_OFF=	--without-plugins="ices"
 
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_OFF=	--without-plugins="jack"
 
-MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_OFF=	--without-plugins="mad"
 
 MDNS_CONFIGURE_OFF=	--without-optionals="mdns"
 
 MDNS_APPLE_CONFIGURE_ON=	--with-mdns-backend="dns_sd"
-MDNS_APPLE_LIB_DEPENDS=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
+MDNS_APPLE_LIB_DEPENDS=		libdns_sd.so:net/mDNSResponder
 
 MDNS_AVAHI_CONFIGURE_ON=	--with-mdns-backend="avahi"
-MDNS_AVAHI_LIB_DEPENDS=		libavahi-core.so:${PORTSDIR}/net/avahi-app
+MDNS_AVAHI_LIB_DEPENDS=		libavahi-core.so:net/avahi-app
 
-MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_LIB_DEPENDS=	libmms.so:net/libmms
 MMS_CONFIGURE_OFF=	--without-plugins="mms"
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_OFF=	--without-plugins="modplug"
 
-MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
 MPG123_CONFIGURE_OFF=	--without-plugins="mpg123"
 
-MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
 MUSEPACK_CONFIGURE_OFF=	--without-plugins="musepack"
 
-OFA_LIB_DEPENDS=	libofa.so:${PORTSDIR}/audio/libofa
+OFA_LIB_DEPENDS=	libofa.so:audio/libofa
 OFA_CONFIGURE_OFF=	--without-plugins="ofa"
 
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--without-plugins="pulse"
 
-SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SAMBA_LIB_DEPENDS=	libsmbclient.so:net/samba-libsmbclient
 SAMBA_CONFIGURE_OFF=	--without-plugins="samba"
 
-SID_LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
+SID_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 SID_CONFIGURE_OFF=	--without-plugins="sid"
 
-SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_OFF=	--without-plugins="sndfile"
 
-SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 SPEEX_CONFIGURE_OFF=	--without-plugins="speex"
 
-TREMOR_LIB_DEPENDS=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
+TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor
 TREMOR_CONFIGURE_OFF=	--without-plugins="tremor"
 
 VISUAL_USE=		SDL=yes
-VISUAL_LIB_DEPENDS=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
+VISUAL_LIB_DEPENDS=	libvisual-0.4.so:graphics/libvisual04
 VISUAL_CONFIGURE_OFF=	--without-optionals="vistest"
 VISUAL_CONFIGURE_ON=	--with-vis-reference-clients
 
-VOCODER_LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-			libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+VOCODER_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
+			libsamplerate.so:audio/libsamplerate
 VOCODER_CONFIGURE_OFF=	--without-plugins="vocoder"
 
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_OFF=	--without-plugins="vorbis"
 
-WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--without-plugins="wavpack"
 
 XML_USE=		GNOME=libxml2
@@ -192,7 +192,7 @@ CONFIGURE_ARGS+=	--without-optionals="python" \
 
 # xmms2-ripper
 .if ${PORT_OPTIONS:MVISUAL} && ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisenc.so:audio/libvorbis
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-clients-vistest-wscript
 .endif
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index f3e7a297527f..4944bb869a15 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Small utility to control XMMS from the command line
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+BUILD_DEPENDS=	xmms:multimedia/xmms
+RUN_DEPENDS=	xmms:multimedia/xmms
 
 USES=		gmake
 USE_CSTD=	gnu89
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 4a7a337f7294..20c877e8271b 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Player for many different Amiga and PC module formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libxmp.so:${PORTSDIR}/audio/libxmp
+LIB_DEPENDS=	libxmp.so:audio/libxmp
 
 USES=		pkgconfig gmake
 WANT_GNOME=	yes
@@ -27,11 +27,11 @@ CONFIG_FILES=	xmp.conf modules.conf
 
 OPTIONS_DEFINE=	ALSA PULSEAUDIO
 
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
-ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CONFIGURE_ENABLE=	alsa
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
 post-patch:
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index 3fad83575b2b..3a8b35e25d5e 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	SF/dssi/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Classic analog style software synthesizer
 
-BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \
-		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
-		liblo.so:${PORTSDIR}/audio/liblo \
-		libjack.so:${PORTSDIR}/audio/jack
+BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:audio/dssi \
+		${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
+		liblo.so:audio/liblo \
+		libjack.so:audio/jack
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
diff --git a/audio/xvmixer/Makefile b/audio/xvmixer/Makefile
index b6dd01c767cc..c3760593e70c 100644
--- a/audio/xvmixer/Makefile
+++ b/audio/xvmixer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://ftp.auxio.org/pub/mirrors/step.polymtl.ca/pub/Xview/apps/xv
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Look-based audio mixer
 
-LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:x11-toolkits/xview
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DUSE_XBM_ICON" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBRARIES="-lxview -lolgx -lX11"
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index ebe7040116d1..b8d103c05ed9 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based MP3 player
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
-		libgdbm.so:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libid3.so:audio/id3lib \
+		libgdbm.so:databases/gdbm
 
 USES=		pathfix libtool pkgconfig gettext gmake perl5
 USE_GNOME=	gtk20
@@ -31,12 +31,12 @@ ESOUND_USE=		GNOME=esound
 INSTALL_TARGET=	install-strip
 
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:devel/nasm
 CPPFLAGS+=	"-D_M_IX86"
 .else
 CONFIGURE_ARGS+=	--disable-x86opts
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 6d68ddf6a642..f799ac6376b5 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Realtime software synthesizer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libmxml.so:${PORTSDIR}/textproc/mxml
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libmxml.so:textproc/mxml
 
 USES=		tar:bzip2 cmake pkgconfig
 
@@ -28,29 +28,29 @@ ALSAMIDI_DESC=	MIDI input through ALSA
 DSSI_DESC=	DSSI Plugin
 LO_DESC=	Open Sound Control support via LibLO
 
-ALSAMIDI_LIB_DEPENDS=		libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSAMIDI_LIB_DEPENDS=		libasound.so:audio/alsa-lib
 ALSAMIDI_CMAKE_OFF=		-DAlsaEnable:BOOL=OFF
 
-DSSI_LIB_DEPENDS=		libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat
-DSSI_BUILD_DEPENDS=		dssi>0:${PORTSDIR}/audio/dssi
-DSSI_RUN_DEPENDS=		dssi>0:${PORTSDIR}/audio/dssi
+DSSI_LIB_DEPENDS=		libdssialsacompat.so:audio/libdssialsacompat
+DSSI_BUILD_DEPENDS=		dssi>0:audio/dssi
+DSSI_RUN_DEPENDS=		dssi>0:audio/dssi
 DSSI_CFLAGS=			-I${LOCALBASE}/include/dssi
 DSSI_CMAKE_OFF=			-DDssiEnable:BOOL=OFF
 
-GUI_LIB_DEPENDS=		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+GUI_LIB_DEPENDS=		libfltk.so:x11-toolkits/fltk
 GUI_ON=				-DGuiModule:STRING=fltk
 GUI_CMAKE_OFF=			-DGuiModule:STRING=OFF
 
-LO_LIB_DEPENDS=			liblo.so:${PORTSDIR}/audio/liblo
+LO_LIB_DEPENDS=			liblo.so:audio/liblo
 LO_CMAKE_OFF=			-DLibloEnable:BOOL=OFF
 
-LASH_LIB_DEPENDS=		liblash.so:${PORTSDIR}/audio/lash
+LASH_LIB_DEPENDS=		liblash.so:audio/lash
 LASH_CMAKE_OFF=			-DLashEnabe:BOOL=OFF
 
-JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
+JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
 
-PORTAUDIO_LIB_DEPENDS=		libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=		libportaudio.so:audio/portaudio
 PORTAUDIO_CMAKE_OFF=		-DPaEnabe:BOOL=OFF
 PORTAUDIO_LDFLAGS=		-lportaudio
 
diff --git a/benchmarks/autobench/Makefile b/benchmarks/autobench/Makefile
index 93973aaf77ca..7d640fe1691b 100644
--- a/benchmarks/autobench/Makefile
+++ b/benchmarks/autobench/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Automating the process of benchmarking a web server
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	httperf:${PORTSDIR}/benchmarks/httperf \
-		gawk:${PORTSDIR}/lang/gawk \
-		gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	httperf:benchmarks/httperf \
+		gawk:lang/gawk \
+		gnuplot:math/gnuplot
 
 USES=		gmake perl5 shebangfix
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" DEBUG_FLAGS= \
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 0d892cc24b66..13a2c17ba165 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simulation of the Ziff-Davis netbench benchmark
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	libpopt.so:devel/popt
 
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index d5f1478f585f..ff981789a4c4 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Distributed network benchmarking system
 
-RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS=	gnuplot:math/gnuplot
 
 BUILD_WRKSRC=	${WRKSRC}/obj/${OPSYS}
 INSTALL_WRKSRC=	${WRKSRC}/obj/${OPSYS}
diff --git a/benchmarks/expedite/Makefile b/benchmarks/expedite/Makefile
index eb605abfd991..dc938fafd874 100644
--- a/benchmarks/expedite/Makefile
+++ b/benchmarks/expedite/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Expedite is a benchmark suite for Evas
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+LIB_DEPENDS=	libefl.so:devel/efl
 
 DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
diff --git a/benchmarks/fio/Makefile b/benchmarks/fio/Makefile
index 4a984ce6f9d7..f471d9f66ec5 100644
--- a/benchmarks/fio/Makefile
+++ b/benchmarks/fio/Makefile
@@ -16,7 +16,7 @@ USES=		gmake tar:bzip2
 OPTIONS_DEFINE=	GNUPLOT EXAMPLES
 GNUPLOT_DESC=	Support for plotting graphs
 
-GNUPLOT_BUILD_DEPENDS=	${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot
+GNUPLOT_BUILD_DEPENDS=	${LOCALBASE}/bin/gnuplot:math/gnuplot
 
 .include <bsd.port.options.mk>
 
@@ -26,7 +26,7 @@ MAKE_ARGS+=	YACC=${LOCALBASE}/bin/bison
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>0:textproc/flex
 MAKE_ARGS+=	LEX=${LOCALBASE}/bin/flex
 .endif
 
diff --git a/benchmarks/flowgrind/Makefile b/benchmarks/flowgrind/Makefile
index f869f22b8343..79135b0e8909 100644
--- a/benchmarks/flowgrind/Makefile
+++ b/benchmarks/flowgrind/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Measure throughput and other metrics for TCP
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	pcap-config:${PORTSDIR}/net/libpcap
-LIB_DEPENDS=	libpcap.so:${PORTSDIR}/net/libpcap \
-		libgsl.so:${PORTSDIR}/math/gsl \
-		libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c
+BUILD_DEPENDS=	pcap-config:net/libpcap
+LIB_DEPENDS=	libpcap.so:net/libpcap \
+		libgsl.so:math/gsl \
+		libxmlrpc.so:net/xmlrpc-c
 
 USE_GITHUB=	yes
 
diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile
index 6dd7053cd794..f3bb6f2c161d 100644
--- a/benchmarks/himenobench/Makefile
+++ b/benchmarks/himenobench/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Tool for measureing performance of floating point operation
 
 LICENSE=	LGPL20 # (or later)
 
-EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
+EXTRACT_DEPENDS=	lha:archivers/lha
 
 USES=		zip
 NO_WRKSUBDIR=	yes
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=		ICC IFC OPTIMIZED_CFLAGS
 OPTIONS_SUB=		yes
 
 ICC_DESC=		Intel C compiler support
-ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc
+ICC_BUILD_DEPENDS=	${LOCALBASE}/intel_cc_80/bin/icc:lang/icc
 IFC_DESC=		Intel Fortran compiler support
 IFC_USES=		fortran:ifort
 IFC_USES_OFF=		fortran
diff --git a/benchmarks/hpl/Makefile b/benchmarks/hpl/Makefile
index fd4f7db677aa..f14afcee0fd2 100644
--- a/benchmarks/hpl/Makefile
+++ b/benchmarks/hpl/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	NETLIB/benchmark/hpl
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	High Performance Computing Linpack Benchmark
 
-LIB_DEPENDS=	libblas.so:${PORTSDIR}/math/blas \
-		libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS=	libblas.so:math/blas \
+		libmpich.so:net/mpich2
 
 USES=		fortran
 USE_LDCONFIG=	yes
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index 8b9d406a31a5..d60b5aaf67db 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -32,11 +32,11 @@ OPTIONS_DEFINE=	CHECK_RESULTS DOCS OPENMPI
 CHECK_RESULTS_DESC=	Check results (not valid as real benchmark data)
 CHECK_RESULTS_CFLAGS=	-DCHECK
 
-OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
-OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_MAKE_ENV=	MPI_HOME=${LOCALBASE}/mpi/openmpi
-OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich2
+OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich2
 OPENMPI_MAKE_ENV_OFF=	MPI_HOME=${LOCALBASE}
 
 do-install:
diff --git a/benchmarks/mdtest/Makefile b/benchmarks/mdtest/Makefile
index a3b72e30c4d0..5a8aa99aebe2 100644
--- a/benchmarks/mdtest/Makefile
+++ b/benchmarks/mdtest/Makefile
@@ -23,12 +23,12 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=	OPENMPI EXAMPLES
 OPENMPI_DESC=	Use Open MPI instead of MPICH2
 
-OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
-OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
+OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 OPENMPI_VARS=			MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc
 
-OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+OPENMPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/mpicc:net/mpich2
+OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich2
 OPENMPI_VARS_OFF=		MPICC=${LOCALBASE}/bin/mpicc
 
 do-build:
diff --git a/benchmarks/nosqlbench/Makefile b/benchmarks/nosqlbench/Makefile
index ed7da24bf29e..accb6b7007b7 100644
--- a/benchmarks/nosqlbench/Makefile
+++ b/benchmarks/nosqlbench/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Micro-benchmarking NoSQL storage
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libleveldb.so:${PORTSDIR}/databases/leveldb
+LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
 DATE=		20151214
 USES=		cmake tar:bzip2
diff --git a/benchmarks/nqueens/Makefile b/benchmarks/nqueens/Makefile
index b6ce2bdd2444..6c59879d19a2 100644
--- a/benchmarks/nqueens/Makefile
+++ b/benchmarks/nqueens/Makefile
@@ -30,7 +30,7 @@ PROGS=		qn24b_base
 
 .if ${PORT_OPTIONS:MMPI}
 MPICC?=		${LOCALBASE}/mpich/bin/mpicc
-BUILD_DEPENDS=	${MPICC}:${PORTSDIR}/net/mpich
+BUILD_DEPENDS=	${MPICC}:net/mpich
 PROGS+=		qn24b_mpi
 .endif
 
diff --git a/benchmarks/p5-Benchmark-Stopwatch/Makefile b/benchmarks/p5-Benchmark-Stopwatch/Makefile
index c6ea168307aa..ccca754598b3 100644
--- a/benchmarks/p5-Benchmark-Stopwatch/Makefile
+++ b/benchmarks/p5-Benchmark-Stopwatch/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple timing of stages of your code
 
-RUN_DEPENDS=	p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
+RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
-BUILD_DEPENDS+=	p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString
+BUILD_DEPENDS+=	p5-Test-LongString>=0:devel/p5-Test-LongString
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index b43cb0b3c14d..904a4293aae5 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -20,8 +20,8 @@ WANT_PHP_CLI=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/phoronix-test-suite
 
-RUN_DEPENDS+=	fpdf>0:${PORTSDIR}/print/fpdf
-RUN_DEPENDS+=	cmake:${PORTSDIR}/devel/cmake
+RUN_DEPENDS+=	fpdf>0:print/fpdf
+RUN_DEPENDS+=	cmake:devel/cmake
 
 PORTDATA=	*
 PORTDOCS=	*
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index aef4f59b66ee..cae6e8c779dc 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -26,12 +26,12 @@ OPTIONS_DEFINE=		DOCS GNUPLOT GSSAPI LDNS PERL SSL ZLIB
 OPTIONS_DEFAULT=	SSL ZLIB
 
 GNUPLOT_DESC=		GNUPlot for full reporting functionality
-GNUPLOT_RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
+GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 GSSAPI_USES=		gssapi:mit
 GSSAPI_CONFIGURE_ON=	--with-kerberos=${KRB5CONFIG} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_CONFIGURE_OFF=	--without-kerberos
 LDNS_DESC=		DNS zone file support via libldns
-LDNS_LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
+LDNS_LIB_DEPENDS=	libldns.so:dns/ldns
 LDNS_CONFIGURE_ON=	--with-ldns=${LOCALBASE}/bin/ldns-config
 LDNS_CONFIGURE_OFF=	--without-ldns
 SSL_DESC=		SSL/HTTPS support
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index d47ab08aee0d..4453eee3f4c6 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -28,7 +28,7 @@ OPTIONS_RADIO=		TLS
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	OPENSSL
 
-GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_USES=		pkgconfig
 GNUTLS_CONFIGURE_OFF=	--disable-gnutls
 GNUTLS_CPPFLAGS=	$$(pkg-config --cflags gnutls)
diff --git a/benchmarks/rubygem-railsbench/Makefile b/benchmarks/rubygem-railsbench/Makefile
index d8a3310a6cca..6ce1ea3c5aaa 100644
--- a/benchmarks/rubygem-railsbench/Makefile
+++ b/benchmarks/rubygem-railsbench/Makefile
@@ -23,6 +23,6 @@ PLIST_FILES=	bin/railsbench
 OPTIONS_DEFINE=	GRUFF
 GRUFF_DESC=	Plotting of perf data support using gruff
 
-GRUFF_RUN_DEPENDS=	rubygem-gruff>=0.2.8:${PORTSDIR}/graphics/rubygem-gruff
+GRUFF_RUN_DEPENDS=	rubygem-gruff>=0.2.8:graphics/rubygem-gruff
 
 .include <bsd.port.mk>
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index 8a32aa308a91..28440ce544ea 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -33,7 +33,7 @@ RTPSTREAM_CONFIGURE_WITH=	rtpstream
 OPENSSL_CONFIGURE_WITH=	openssl
 
 OPENSSL_USE=	openssl=yes
-GSL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 PCAP_FILES=	dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \
 		dtmf_2833_3.pcap dtmf_2833_4.pcap dtmf_2833_5.pcap \
diff --git a/benchmarks/slowloris/Makefile b/benchmarks/slowloris/Makefile
index 0dfb7c07ac5f..1c5670eebeb6 100644
--- a/benchmarks/slowloris/Makefile
+++ b/benchmarks/slowloris/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	The low bandwidth, yet greedy and poisonous HTTP client
 
-RUN_DEPENDS=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long
+RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Getopt-Long>=0:devel/p5-Getopt-Long
 
 NO_BUILD=	yes
 
@@ -26,7 +26,7 @@ PERL_THREADS?=	yes
 .if ${PERL_THREADS} != "yes"
 EXTRA_PATCHES+=	${FILESDIR}/extra-nothreads
 .else
-RUN_DEPENDS+=	p5-threads-shared>=0:${PORTSDIR}/devel/p5-threads-shared
+RUN_DEPENDS+=	p5-threads-shared>=0:devel/p5-threads-shared
 .endif
 
 do-install:
diff --git a/benchmarks/tsung/Makefile b/benchmarks/tsung/Makefile
index ea5715a99b75..49e5c89df001 100644
--- a/benchmarks/tsung/Makefile
+++ b/benchmarks/tsung/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Multi-protocol distributed load testing tool
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
-RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS=	erlc:lang/erlang
+RUN_DEPENDS=	erl:lang/erlang
 
 USE_PERL5=	run
 
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile
index 848379226368..7331039a3249 100644
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Modern HTTP benchmarking tool
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wg
diff --git a/biology/bcftools/Makefile b/biology/bcftools/Makefile
index ff969014a35e..e0b804b87190 100644
--- a/biology/bcftools/Makefile
+++ b/biology/bcftools/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Tools for manipulating next-generation sequencing data
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	htslib>=1.3:${PORTSDIR}/biology/htslib
-LIB_DEPENDS=	libhts.so:${PORTSDIR}/biology/htslib
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	htslib>=1.3:biology/htslib
+LIB_DEPENDS=	libhts.so:biology/htslib
+TEST_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	samtools
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	GPL
 GPL_DESC=	Enable modules that rely on GPL code
 OPTIONS_DEFAULT=	GPL
 
-GPL_LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
+GPL_LIB_DEPENDS=	libgsl.so:math/gsl
 
 .include <bsd.port.options.mk>
 
diff --git a/biology/blat/Makefile b/biology/blat/Makefile
index db878287c9e9..7d8cb309bdb9 100644
--- a/biology/blat/Makefile
+++ b/biology/blat/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}Src${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast tool for local sequence similarity searches
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/biology/consed/Makefile b/biology/consed/Makefile
index c45aee4933d2..19d4b93e0c86 100644
--- a/biology/consed/Makefile
+++ b/biology/consed/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}_linux
 MAINTAINER=	mzaki@m.u-tokyo.ac.jp
 COMMENT=	Graphical tool for editing Phrap assemblies
 
-RUN_DEPENDS=	phred:${PORTSDIR}/biology/phred \
-		phrap:${PORTSDIR}/biology/phrap
+RUN_DEPENDS=	phred:biology/phred \
+		phrap:biology/phrap
 
 CONFLICTS_INSTALL=	phd2fasta-[0-9]*
 
diff --git a/biology/crux/Makefile b/biology/crux/Makefile
index c8eaac6ecedb..6f6ee97b8db1 100644
--- a/biology/crux/Makefile
+++ b/biology/crux/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=		SYS_LINALG
 
 SYS_LINALG_DESC=	Enable system ATLAS/LAPACK
-SYS_LINALG_LIB_DEPENDS=	libatlas.so:${PORTSDIR}/math/atlas
+SYS_LINALG_LIB_DEPENDS=	libatlas.so:math/atlas
 SYS_LINALG_CONFIGURE_ENABLE=	sys-linalg
 
 post-patch:
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 5eae33585420..447981d0fb28 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Collection of open source tools for genetic sequence analysis
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	clustalw:${PORTSDIR}/biology/clustalw \
-		primer3:${PORTSDIR}/biology/primer3
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	clustalw:biology/clustalw \
+		primer3:biology/primer3
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libpng.so:graphics/png
 
 CONFLICTS=	qmail-ldap-[0-9]* digest-[0-9]*
 
@@ -41,8 +41,8 @@ OPTIONS_DEFAULT=	X11
 DOCS_CONFIGURE_ON=	--with-docroot=${DOCSDIR}
 X11_USE=	XORG=x11
 X11_USES=	motif
-X11_LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libpng.so:${PORTSDIR}/graphics/png
+X11_LIB_DEPENDS=	libgd.so:graphics/gd \
+		libpng.so:graphics/png
 X11_CONFIGURE_OFF=	--without-x
 
 CONFIG_FILE=	${WRKSRC}/emboss/emboss.default.template
diff --git a/biology/fastx-toolkit/Makefile b/biology/fastx-toolkit/Makefile
index ed8f59c689c1..e8f9f97e8aa5 100644
--- a/biology/fastx-toolkit/Makefile
+++ b/biology/fastx-toolkit/Makefile
@@ -11,7 +11,7 @@ COMMENT=	CLI tools for Short-Reads FASTA/FASTQ files preprocessing
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgtextutils.so:${PORTSDIR}/biology/libgtextutils
+LIB_DEPENDS=	libgtextutils.so:biology/libgtextutils
 
 USES=		autoreconf libtool perl5 pkgconfig shebangfix
 USE_PERL5=	run
diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile
index 411d9f05f31e..24bd35c10b9f 100644
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Converts gff-formated genomic data-sets to PostScript
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
-		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	gawk:lang/gawk \
+		bash:shells/bash
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/biology/htslib/Makefile b/biology/htslib/Makefile
index b6532c2d21b8..c7a9feec1c20 100644
--- a/biology/htslib/Makefile
+++ b/biology/htslib/Makefile
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash
+TEST_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	samtools
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=		CURL
 OPTIONS_DEFAULT=	CURL
 
 CURL_DESC=		Use libcurl for network file access (HTTPS and S3 support).
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ENABLE=	libcurl
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/biology/iolib/Makefile b/biology/iolib/Makefile
index 26c3ccc9caf8..0bbd5eacc991 100644
--- a/biology/iolib/Makefile
+++ b/biology/iolib/Makefile
@@ -11,7 +11,7 @@ COMMENT=	General purpose trace file (and Experiment File) reading interface
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
diff --git a/biology/jellyfish/Makefile b/biology/jellyfish/Makefile
index f427a40f6a73..92c3e8e8fb0f 100644
--- a/biology/jellyfish/Makefile
+++ b/biology/jellyfish/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fast, memory-efficient counting of k-mers in DNA
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	yaggo:${PORTSDIR}/devel/yaggo
+BUILD_DEPENDS=	yaggo:devel/yaggo
 
 GNU_CONFIGURE=	yes
 
diff --git a/biology/libsbml/Makefile b/biology/libsbml/Makefile
index 5162e2cc682d..e922fcbe1790 100644
--- a/biology/libsbml/Makefile
+++ b/biology/libsbml/Makefile
@@ -25,14 +25,14 @@ LDFLAGS+=	-L${ICONV_PREFIX}/lib
 OPTIONS_DEFINE=	EXAMPLES PYTHON RUBY
 OPTIONS_SUB=	yes
 
-PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+PYTHON_BUILD_DEPENDS=	swig2.0:devel/swig20
 PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-DWITH_PYTHON:BOOL=ON \
 			-DPYTHON_INCLUDE_DIR:STRING="${PYTHON_INCLUDEDIR}" \
 			-DPYTHON_LIBRARY:STRING="${PYTHONBASE}/lib/lib${PYTHON_VERSION}.so" \
 			-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"
 
-RUBY_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+RUBY_BUILD_DEPENDS=	swig2.0:devel/swig20
 RUBY_USE=		ruby=yes
 RUBY_CMAKE_ON=		-DWITH_RUBY:BOOL=ON
 
diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index 338b29313c50..644194dae2bf 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -16,9 +16,9 @@ COMMENT=	NCBI implementation of Basic Local Alignment Search Tool
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/scripts/projects/blast/LICENSE
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libbz2.so:${PORTSDIR}/archivers/bzip2
-RUN_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libbz2.so:archivers/bzip2
+RUN_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/c++
 
diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index dd3038541de1..8013d766b0fe 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl5 interface to the ACEDB genome database system
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache
+BUILD_DEPENDS=	p5-Cache-Cache>=0:devel/p5-Cache-Cache
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/biology/p5-Bio-ASN1-EntrezGene/Makefile b/biology/p5-Bio-ASN1-EntrezGene/Makefile
index f5f7fc25e8dd..8785d558e0fe 100644
--- a/biology/p5-Bio-ASN1-EntrezGene/Makefile
+++ b/biology/p5-Bio-ASN1-EntrezGene/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Regular expression-based Perl Parser for NCBI Entrez Gene
 
-BUILD_DEPENDS=	p5-bioperl>=0:${PORTSDIR}/biology/p5-bioperl
+BUILD_DEPENDS=	p5-bioperl>=0:biology/p5-bioperl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/biology/p5-Bio-Das-Lite/Makefile b/biology/p5-Bio-Das-Lite/Makefile
index 445e15b6a66d..26a213a1f4c8 100644
--- a/biology/p5-Bio-Das-Lite/Makefile
+++ b/biology/p5-Bio-Das-Lite/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Perl extension for the DAS (HTTP+XML) Protocol
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Readonly>=1.03:${PORTSDIR}/devel/p5-Readonly \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-WWW-Curl>=4.07:${PORTSDIR}/www/p5-WWW-Curl
+BUILD_DEPENDS=	p5-Readonly>=1.03:devel/p5-Readonly \
+		p5-libwww>=0:www/p5-libwww \
+		p5-WWW-Curl>=4.07:www/p5-WWW-Curl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/biology/p5-Bio-Das/Makefile b/biology/p5-Bio-Das/Makefile
index 75777ff55cae..347e0b3a14b7 100644
--- a/biology/p5-Bio-Das/Makefile
+++ b/biology/p5-Bio-Das/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Client-side library for Distributed Genome Annotation System
 
-RUN_DEPENDS=	p5-HTML-Parser>=3:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-bioperl>=0:${PORTSDIR}/biology/p5-bioperl \
-		p5-libwww>=5:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-HTML-Parser>=3:www/p5-HTML-Parser \
+		p5-bioperl>=0:biology/p5-bioperl \
+		p5-libwww>=5:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/biology/p5-Bio-GFF3/Makefile b/biology/p5-Bio-GFF3/Makefile
index 42e857150553..48d684685367 100644
--- a/biology/p5-Bio-GFF3/Makefile
+++ b/biology/p5-Bio-GFF3/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Fast low-level functions for parsing and formatting GFF3
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-File-ReadBackwards>=0:${PORTSDIR}/devel/p5-File-ReadBackwards \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-File-ReadBackwards>=0:devel/p5-File-ReadBackwards \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-URI>=0:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String
+TEST_DEPENDS=	p5-IO-String>=0:devel/p5-IO-String
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/biology/p5-Bio-Glite/Makefile b/biology/p5-Bio-Glite/Makefile
index d8c4e60be310..ed0668d44584 100644
--- a/biology/p5-Bio-Glite/Makefile
+++ b/biology/p5-Bio-Glite/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Interface to G-language
 
-BUILD_DEPENDS=	p5-libwww>=5:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=5:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/biology/p5-Bio-Graphics/Makefile b/biology/p5-Bio-Graphics/Makefile
index e219ae594564..a6123ebb9237 100644
--- a/biology/p5-Bio-Graphics/Makefile
+++ b/biology/p5-Bio-Graphics/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Generate GD Images of Bio::Seq Objects
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Bio-SCF>=1.01:${PORTSDIR}/biology/p5-Bio-SCF \
-		p5-GD>=2.30:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-SVG>=0.32:${PORTSDIR}/graphics/p5-GD-SVG \
-		p5-Statistics-Descriptive>=2.6:${PORTSDIR}/math/p5-Statistics-Descriptive \
-		p5-bioperl>=1.6.0:${PORTSDIR}/biology/p5-bioperl
+BUILD_DEPENDS=	p5-Bio-SCF>=1.01:biology/p5-Bio-SCF \
+		p5-GD>=2.30:graphics/p5-GD \
+		p5-GD-SVG>=0.32:graphics/p5-GD-SVG \
+		p5-Statistics-Descriptive>=2.6:math/p5-Statistics-Descriptive \
+		p5-bioperl>=1.6.0:biology/p5-bioperl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/biology/p5-Bio-MAGETAB/Makefile b/biology/p5-Bio-MAGETAB/Makefile
index 6fc139d50a68..ce4faf061c89 100644
--- a/biology/p5-Bio-MAGETAB/Makefile
+++ b/biology/p5-Bio-MAGETAB/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Data model and utility API for the MAGE-TAB format
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	p5-Date-Manip>=5.44:${PORTSDIR}/devel/p5-Date-Manip \
-		p5-DateTime>=0.43.02:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-DateManip>=0.04:${PORTSDIR}/devel/p5-DateTime-Format-DateManip \
-		p5-Email-Valid>=0.179:${PORTSDIR}/mail/p5-Email-Valid \
-		p5-Moose>=0.43:${PORTSDIR}/devel/p5-Moose \
-		p5-MooseX-FollowPBP>=0.04:${PORTSDIR}/devel/p5-MooseX-FollowPBP \
-		p5-MooseX-Types>=0.10:${PORTSDIR}/devel/p5-MooseX-Types \
-		p5-Params-Coerce>=0.14:${PORTSDIR}/devel/p5-Params-Coerce \
-		p5-Parse-RecDescent>=1.965.001:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Text-CSV_XS>=0.32:${PORTSDIR}/textproc/p5-Text-CSV_XS \
-		p5-URI>=1.35:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	p5-Date-Manip>=5.44:devel/p5-Date-Manip \
+		p5-DateTime>=0.43.02:devel/p5-DateTime \
+		p5-DateTime-Format-DateManip>=0.04:devel/p5-DateTime-Format-DateManip \
+		p5-Email-Valid>=0.179:mail/p5-Email-Valid \
+		p5-Moose>=0.43:devel/p5-Moose \
+		p5-MooseX-FollowPBP>=0.04:devel/p5-MooseX-FollowPBP \
+		p5-MooseX-Types>=0.10:devel/p5-MooseX-Types \
+		p5-Params-Coerce>=0.14:devel/p5-Params-Coerce \
+		p5-Parse-RecDescent>=1.965.001:devel/p5-Parse-RecDescent \
+		p5-Text-CSV_XS>=0.32:textproc/p5-Text-CSV_XS \
+		p5-URI>=1.35:net/p5-URI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Exception>=0.26:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS=	p5-Test-Exception>=0.26:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/biology/p5-Bio-NEXUS/Makefile b/biology/p5-Bio-NEXUS/Makefile
index b4d20deaf394..bba1732dbd31 100644
--- a/biology/p5-Bio-NEXUS/Makefile
+++ b/biology/p5-Bio-NEXUS/Makefile
@@ -11,12 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object-oriented Perl API for the NEXUS file format
 
-BUILD_DEPENDS=	p5-Clone-PP>=1.02:${PORTSDIR}/devel/p5-Clone-PP
+BUILD_DEPENDS=	p5-Clone-PP>=1.02:devel/p5-Clone-PP
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Deep>=0.106:${PORTSDIR}/devel/p5-Test-Deep \
-		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Deep>=0.106:devel/p5-Test-Deep \
+		p5-Test-Pod>=0:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/biology/p5-Bio-Phylo/Makefile b/biology/p5-Bio-Phylo/Makefile
index 5ce60754c885..b697fa1d97bc 100644
--- a/biology/p5-Bio-Phylo/Makefile
+++ b/biology/p5-Bio-Phylo/Makefile
@@ -13,19 +13,19 @@ COMMENT=	Phylogenetic analysis using Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-Math-CDF>=0:${PORTSDIR}/math/p5-Math-CDF \
-		p5-Math-Random>=0:${PORTSDIR}/math/p5-Math-Random \
-		p5-PDF-API2>=0:${PORTSDIR}/textproc/p5-PDF-API2 \
-		p5-SVG>=0:${PORTSDIR}/textproc/p5-SVG \
-		p5-SWF-Builder>=0:${PORTSDIR}/graphics/p5-SWF-Builder \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-XML-XML2JSON>=0:${PORTSDIR}/textproc/p5-XML-XML2JSON \
-		p5-bioperl>=0:${PORTSDIR}/biology/p5-bioperl \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS=	p5-GD>=0:graphics/p5-GD \
+		p5-Math-CDF>=0:math/p5-Math-CDF \
+		p5-Math-Random>=0:math/p5-Math-Random \
+		p5-PDF-API2>=0:textproc/p5-PDF-API2 \
+		p5-SVG>=0:textproc/p5-SVG \
+		p5-SWF-Builder>=0:graphics/p5-SWF-Builder \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-XML-XML2JSON>=0:textproc/p5-XML-XML2JSON \
+		p5-bioperl>=0:biology/p5-bioperl \
+		p5-libxml>=0:textproc/p5-libxml
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/biology/p5-Bio-SCF/Makefile b/biology/p5-Bio-SCF/Makefile
index 7a6d05896f77..c84f76752ca6 100644
--- a/biology/p5-Bio-SCF/Makefile
+++ b/biology/p5-Bio-SCF/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Read and Update SCF Chromatographic Sequence Files
 
-BUILD_DEPENDS=	${LOCALBASE}/include/io_lib/scf.h:${PORTSDIR}/biology/iolib
+BUILD_DEPENDS=	${LOCALBASE}/include/io_lib/scf.h:biology/iolib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/biology/p5-bioperl-run/Makefile b/biology/p5-bioperl-run/Makefile
index 711829bbd618..134d8e50d0d1 100644
--- a/biology/p5-bioperl-run/Makefile
+++ b/biology/p5-bioperl-run/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Wrapper modules for common bioinformatics tools
 LICENSE=	ART10 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-bioperl>=1.6.0:${PORTSDIR}/biology/p5-bioperl \
-		p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
-		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-File-Sort>=0:${PORTSDIR}/misc/p5-File-Sort \
-		p5-Config-Any>=0:${PORTSDIR}/devel/p5-Config-Any
+BUILD_DEPENDS=	p5-bioperl>=1.6.0:biology/p5-bioperl \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-File-Sort>=0:misc/p5-File-Sort \
+		p5-Config-Any>=0:devel/p5-Config-Any
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	p5-bioperl-run-1.[13579]*
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index da1b1d5ed9d2..fd7f623d2668 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -16,46 +16,46 @@ COMMENT=	Collection of Perl modules for bioinformatics
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Algorithm-Munkres>=0:${PORTSDIR}/math/p5-Algorithm-Munkres \
-		p5-Array-Compare>=0:${PORTSDIR}/misc/p5-Array-Compare \
-		p5-Class-AutoClass>=0:${PORTSDIR}/devel/p5-Class-AutoClass \
-		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
-		p5-Convert-Binary-C>=0:${PORTSDIR}/converters/p5-Convert-Binary-C \
-		p5-Data-Stag>=0:${PORTSDIR}/devel/p5-Data-Stag \
-		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
-		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-		p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
-		p5-GD-SVG>=0:${PORTSDIR}/graphics/p5-GD-SVG \
-		p5-Graph>=0:${PORTSDIR}/math/p5-Graph \
-		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz \
-		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-HTML-TableExtract>=2:${PORTSDIR}/www/p5-HTML-TableExtract \
-		p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Math-Random>=0:${PORTSDIR}/math/p5-Math-Random \
-		p5-PostScript>=0:${PORTSDIR}/print/p5-PostScript \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-Set-Scalar>=0:${PORTSDIR}/devel/p5-Set-Scalar \
-		p5-Sort-Naturally>=1:${PORTSDIR}/textproc/p5-Sort-Naturally \
-		p5-Spreadsheet-ParseExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-ParseExcel \
-		p5-SVG>=0:${PORTSDIR}/textproc/p5-SVG \
-		p5-SVG-Graph>=0:${PORTSDIR}/graphics/p5-SVG-Graph \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most \
-		p5-Text-Shellwords>=0:${PORTSDIR}/textproc/p5-Text-Shellwords \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-XML-DOM-XPath>=0:${PORTSDIR}/textproc/p5-XML-DOM-XPath \
-		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
-		p5-XML-SAX>=0:${PORTSDIR}/textproc/p5-XML-SAX \
-		p5-XML-SAX-Writer>=0:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
-		p5-XML-Simple>=2:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-XML-Twig>=0:${PORTSDIR}/textproc/p5-XML-Twig \
-		p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
-		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
+BUILD_DEPENDS=	p5-Algorithm-Munkres>=0:math/p5-Algorithm-Munkres \
+		p5-Array-Compare>=0:misc/p5-Array-Compare \
+		p5-Class-AutoClass>=0:devel/p5-Class-AutoClass \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Convert-Binary-C>=0:converters/p5-Convert-Binary-C \
+		p5-Data-Stag>=0:devel/p5-Data-Stag \
+		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		p5-Error>=0:lang/p5-Error \
+		p5-GD>=0:graphics/p5-GD \
+		p5-GD-SVG>=0:graphics/p5-GD-SVG \
+		p5-Graph>=0:math/p5-Graph \
+		p5-GraphViz>=0:graphics/p5-GraphViz \
+		p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-HTML-TableExtract>=2:www/p5-HTML-TableExtract \
+		p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Math-Random>=0:math/p5-Math-Random \
+		p5-PostScript>=0:print/p5-PostScript \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-Set-Scalar>=0:devel/p5-Set-Scalar \
+		p5-Sort-Naturally>=1:textproc/p5-Sort-Naturally \
+		p5-Spreadsheet-ParseExcel>=0:textproc/p5-Spreadsheet-ParseExcel \
+		p5-SVG>=0:textproc/p5-SVG \
+		p5-SVG-Graph>=0:graphics/p5-SVG-Graph \
+		p5-Test-Most>=0:devel/p5-Test-Most \
+		p5-Text-Shellwords>=0:textproc/p5-Text-Shellwords \
+		p5-Text-Tabs+Wrap>=0:textproc/p5-Text-Tabs+Wrap \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-DOM>=0:textproc/p5-XML-DOM \
+		p5-XML-DOM-XPath>=0:textproc/p5-XML-DOM-XPath \
+		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
+		p5-XML-SAX>=0:textproc/p5-XML-SAX \
+		p5-XML-SAX-Writer>=0:textproc/p5-XML-SAX-Writer \
+		p5-XML-Simple>=2:textproc/p5-XML-Simple \
+		p5-XML-Twig>=0:textproc/p5-XML-Twig \
+		p5-XML-Writer>=0:textproc/p5-XML-Writer \
+		p5-YAML>=0:textproc/p5-YAML \
+		p5-libwww>=0:www/p5-libwww \
+		p5-libxml>=0:textproc/p5-libxml
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -66,10 +66,10 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	DOCS EXAMPLES PGTEST SQLITETEST
 PGTEST_DESC=	Test PostGreSQL
 SQLITETEST_DESC=	Test SQLite
-PGTEST_RUN_DEPENDS=	p5-DBD-Pg>=3:${PORTSDIR}/databases/p5-DBD-Pg
-PGTEST_BUILD_DEPENDS=	p5-DBD-Pg>=3:${PORTSDIR}/databases/p5-DBD-Pg
-SQLITETEST_RUN_DEPENDS=	p5-DBD-SQLite>=1:${PORTSDIR}/databases/p5-DBD-SQLite
-SQLITETEST_BUILD_DEPENDS=	p5-DBD-SQLite>=1:${PORTSDIR}/databases/p5-DBD-SQLite
+PGTEST_RUN_DEPENDS=	p5-DBD-Pg>=3:databases/p5-DBD-Pg
+PGTEST_BUILD_DEPENDS=	p5-DBD-Pg>=3:databases/p5-DBD-Pg
+SQLITETEST_RUN_DEPENDS=	p5-DBD-SQLite>=1:databases/p5-DBD-SQLite
+SQLITETEST_BUILD_DEPENDS=	p5-DBD-SQLite>=1:databases/p5-DBD-SQLite
 
 post-patch:
 	@${FIND} ${WRKSRC}/examples ${WRKSRC}/doc -name "*.pl" -o -name "*.cgi" \
diff --git a/biology/p5-transdecoder/Makefile b/biology/p5-transdecoder/Makefile
index fc0f578bf8a1..003ec621d474 100644
--- a/biology/p5-transdecoder/Makefile
+++ b/biology/p5-transdecoder/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Identify candidate coding regions within transcript sequences
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	cd-hit>=4.6.1:${PORTSDIR}/biology/cd-hit \
-		p5-URI>0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	cd-hit>=4.6.1:biology/cd-hit \
+		p5-URI>0:net/p5-URI
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/biology/phylip/Makefile b/biology/phylip/Makefile
index 7bf26844c122..cb33948fb206 100644
--- a/biology/phylip/Makefile
+++ b/biology/phylip/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Phylogeny Inference Package
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/src/COPYRIGHT
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile
index 4d512f5145dc..3870444c51ac 100644
--- a/biology/phyml/Makefile
+++ b/biology/phyml/Makefile
@@ -28,9 +28,9 @@ OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH2 OPENMPI
 
-MPICH2_LIB_DEPENDS=	libmpich.so:${PORTSDIR}/net/mpich2
+MPICH2_LIB_DEPENDS=	libmpich.so:net/mpich2
 MPICH2_MAKE_ARGS=	CC="${LOCALBASE}/bin/mpicc"
-OPENMPI_LIB_DEPENDS=	libmpi.so:${PORTSDIR}/net/openmpi
+OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 OPENMPI_MAKE_ARGS=	CC="${LOCALBASE}/mpi/openmpi/bin/mpicc"
 
 .include <bsd.port.options.mk>
diff --git a/biology/plink/Makefile b/biology/plink/Makefile
index 6d4f58deff27..3e6be38a458c 100644
--- a/biology/plink/Makefile
+++ b/biology/plink/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Whole genome association analysis toolset
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS=	liblapack.so:math/lapack
 
 # We need Fortran LDFLAGS to link with Lapack.
 USES=		fortran gmake zip
diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
index 5710363231cf..c7483b1cf158 100644
--- a/biology/protomol/Makefile
+++ b/biology/protomol/Makefile
@@ -14,8 +14,8 @@ COMMENT=	OO, component based, framework for molecular dynamics (MD) simulations
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		shebangfix
 SHEBANG_FILES=	examples/butane_4/procDihedralFile.awk \
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index 197bb328ed97..27f2abdb61e4 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -21,6 +21,6 @@ OPTIONS_DEFINE=	REPORTLAB
 OPTIONS_DEFAULT=	REPORTLAB
 
 REPORTLAB_DESC=	PDF support in Bio.Graphics module
-REPORTLAB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}reportlab1>0:${PORTSDIR}/print/py-reportlab1
+REPORTLAB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}reportlab1>0:print/py-reportlab1
 
 .include <bsd.port.mk>
diff --git a/biology/pycogent/Makefile b/biology/pycogent/Makefile
index 4d4b6e57f877..1dd650abc285 100644
--- a/biology/pycogent/Makefile
+++ b/biology/pycogent/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Toolkit for statistical analysis of biological sequences
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${LOCALBASE}/bin/cython:${PORTSDIR}/lang/cython \
-		${LOCALBASE}/bin/sphinx-build:${PORTSDIR}/textproc/py-sphinx \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06
+		${LOCALBASE}/bin/cython:lang/cython \
+		${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:databases/py-sqlalchemy06
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/biology/ruby-bio/Makefile b/biology/ruby-bio/Makefile
index 1f06ce5f639d..cff4fc5927b8 100644
--- a/biology/ruby-bio/Makefile
+++ b/biology/ruby-bio/Makefile
@@ -29,10 +29,10 @@ USE_RUBY_SETUP=	yes
 SHEBANG_FILES=	sample/biofetch.rb
 ruby_OLD_CMD=	/usr/proj/bioruby/bin/ruby
 
-XMLPARSER_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmlparser.so:${PORTSDIR}/textproc/ruby-xmlparser
-BDB4_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
-MYSQL_RUN_DEPENDS=	rubygem-dbd-mysql>=0:${PORTSDIR}/databases/rubygem-dbd-mysql
-PGSQL_RUN_DEPENDS=	rubygem-dbd-pg>=0:${PORTSDIR}/databases/rubygem-dbd-pg
+XMLPARSER_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmlparser.so:textproc/ruby-xmlparser
+BDB4_RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/bdb.so:databases/ruby-bdb
+MYSQL_RUN_DEPENDS=	rubygem-dbd-mysql>=0:databases/rubygem-dbd-mysql
+PGSQL_RUN_DEPENDS=	rubygem-dbd-pg>=0:databases/rubygem-dbd-pg
 
 post-patch:
 	${RUBY} -i -pe 'gsub(%r"(/etc/bioinformatics/)") { "${PREFIX}" + $$1 }' \
diff --git a/biology/samtools/Makefile b/biology/samtools/Makefile
index 1be0a2087e47..620026bdf6c7 100644
--- a/biology/samtools/Makefile
+++ b/biology/samtools/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Tools for manipulating next-generation sequencing data
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	htslib>=1.3:${PORTSDIR}/biology/htslib
-LIB_DEPENDS=	libhts.so:${PORTSDIR}/biology/htslib
-TEST_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	htslib>=1.3:biology/htslib
+LIB_DEPENDS=	libhts.so:biology/htslib
+TEST_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index 62c137d5a918..c5d4e6dae278 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -15,8 +15,8 @@ BROKEN=		checksum mismatch
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/biology/seqtools/Makefile b/biology/seqtools/Makefile
index 6a26778e82ad..57969ce0bc80 100644
--- a/biology/seqtools/Makefile
+++ b/biology/seqtools/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Tools for visualising sequence alignments
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libsqlite3.so:databases/sqlite3
 
 USES=		execinfo libtool pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile
index ba3cffaee2c0..c79244ebfe64 100644
--- a/biology/t_coffee/Makefile
+++ b/biology/t_coffee/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Multiple DNA or protein sequence alignment package
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	clustalw:${PORTSDIR}/biology/clustalw
+RUN_DEPENDS=	clustalw:biology/clustalw
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/biology/ugene/Makefile b/biology/ugene/Makefile
index 55aab14861c3..88a5dfa468ea 100644
--- a/biology/ugene/Makefile
+++ b/biology/ugene/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Free, open-source, cross-platform bioinformatics toolkit
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		desktop-file-utils execinfo qmake
 USE_GL=		glu
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index b925a14f2604..fa8705a03a51 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -28,7 +28,7 @@ LICENSE=	GPLv2
 # There exists a "logical" RUN_DEPENDS towards french/aster and french/eficas
 # for the server part, but it is not set to avoid circular dependences.
 
-RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
+RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}
 
 .if !defined(CLIENT_SEUL)
 USES+=		gettext python tk:build
@@ -73,18 +73,18 @@ WITH_PBS=	yes
 WITH_MPI=	yes
 . endif
 . if defined(WITH_MPI)
-RUN_DEPENDS+=	${HOME_MPI}/bin/mpirun:${PORTSDIR}/net/mpich2
+RUN_DEPENDS+=	${HOME_MPI}/bin/mpirun:net/mpich2
 HOME_MPI=	${LOCALBASE}
 PLIST_SUB+=	MPI=""
 . else
 PLIST_SUB+=	MPI="@comment "
 . endif
 . if defined(WITH_PBS)
-RUN_DEPENDS+=	qsub:${PORTSDIR}/sysutils/torque
+RUN_DEPENDS+=	qsub:sysutils/torque
 . endif
 .else
-RUN_DEPENDS+=	xterm:${PORTSDIR}/x11/xterm						\
-		${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:${PORTSDIR}/graphics/tkpng
+RUN_DEPENDS+=	xterm:x11/xterm						\
+		${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:graphics/tkpng
 TKPNG_VER=	0.9
 TKPNG=		tkpng${TKPNG_VER}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_CLIENT
@@ -125,25 +125,25 @@ BASH2RC=	asrun/calcul.py share/codeaster/asrun/data/mpirun_template
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
 WITH_ED=	nedit
-RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:${PORTSDIR}/editors/nedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/nedit:editors/nedit
 . elif exists(${LOCALBASE}/bin/gvim)
 WITH_ED=	gvim
-RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
+RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
-RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
 . elif exists(${LOCALBASE}/bin/xemacs)
 WITH_ED=	xemacs
-RUN_DEPENDS+=	${LOCALBASE}/bin/xemacs:${PORTSDIR}/editors/xemacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/xemacs:editors/xemacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
-RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
 . elif exists(${LOCALBASE}/bin/kwrite)
 WITH_ED=	kwrite
-RUN_DEPENDS+=	${LOCALBASE}/bin/kwrite:${PORTSDIR}/editors/kate
+RUN_DEPENDS+=	${LOCALBASE}/bin/kwrite:editors/kate
 . elif exists(${LOCALBASE}/bin/xedit)
 WITH_ED=	xedit
-RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit
+RUN_DEPENDS+=	${LOCALBASE}/bin/xedit:x11/xedit
 . else
 WITH_ED=	vi
 . endif
diff --git a/cad/brickutils/Makefile b/cad/brickutils/Makefile
index 93519bc25301..356caecb9834 100644
--- a/cad/brickutils/Makefile
+++ b/cad/brickutils/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Utility for building models with LEGO
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/BrickUtils-${PORTVERSION}
 
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile
index 8db83dcbcd72..8f09e827633e 100644
--- a/cad/brlcad/Makefile
+++ b/cad/brlcad/Makefile
@@ -10,15 +10,15 @@ MASTER_SITES=	SF/${PORTNAME}/BRL-CAD%20Source/${PORTVERSION}
 MAINTAINER=	erik@brlcad.org
 COMMENT=	CSG modelling system from the US Ballistic Research Laboratory
 
-BUILD_DEPENDS=	${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama	\
-		xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libpng.so:${PORTSDIR}/graphics/png \
-		librle.so:${PORTSDIR}/graphics/urt \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+BUILD_DEPENDS=	${LOCALBASE}/include/tnt/jama_lu.h:math/jama	\
+		xsltproc:textproc/libxslt
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libdrm.so:graphics/libdrm \
+		libpng.so:graphics/png \
+		librle.so:graphics/urt \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GL=		gl glu
 USE_XORG=	ice inputproto sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 311040bf3fd3..29d5b8c9a1f8 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Three-Dimensional Structural Finite Element Program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack	\
-		libspooles.so:${PORTSDIR}/math/spooles	\
-		libtaucs.so:${PORTSDIR}/math/taucs
+LIB_DEPENDS=	libarpack.so:math/arpack	\
+		libspooles.so:math/spooles	\
+		libtaucs.so:math/taucs
 
 DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}	\
 		cgx_${PORTVERSION}.all${EXTRACT_SUFX}
@@ -65,10 +65,10 @@ EXTRACT_ONLY+=	${DIST_HTM} ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
 .endif
 
 .if ${PORT_OPTIONS:MMETIS}
-LIB_DEPENDS+=	libmetis.so:${PORTSDIR}/math/metis4
+LIB_DEPENDS+=	libmetis.so:math/metis4
 .endif
 .if ${PORT_OPTIONS:MMETIS_EDF}
-LIB_DEPENDS+=	libmetis.so:${PORTSDIR}/math/metis-edf
+LIB_DEPENDS+=	libmetis.so:math/metis-edf
 .endif
 
 .if ${ARCH} == "sparc64"
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 9e249116a1eb..654d8c066212 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -25,7 +25,7 @@ PLIST_FILES=	bin/dinotrace
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEMACS}
-RUN_DEPENDS+=	verilog-mode.el>0:${PORTSDIR}/cad/verilog-mode.el
+RUN_DEPENDS+=	verilog-mode.el>0:cad/verilog-mode.el
 USE_EMACS=	yes
 EMACS_NO_BUILD_DEPENDS=	yes
 .for F in dinotrace.el sim-log.el
diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 67d1ee6a8e0b..1f00318a069a 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Sophisticated VLSI design system
 
 LICENSE=	GPLv3
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -45,16 +45,16 @@ DESKTOP_ENTRIES="Electric-NG" "${COMMENT}" "${PORTNAME}${PKGNAMESUFFIX}" \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBSH} || exists(${JAVALIBDIR}/bsh.jar)
-RUN_DEPENDS+=	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh
+RUN_DEPENDS+=	${JAVALIBDIR}/bsh.jar:lang/bsh
 LIBFILES+=	${JAVALIBDIR}/bsh.jar
 .endif
 
 .if ${PORT_OPTIONS:M3D} || exists(${J3DLIB})
-RUN_DEPENDS+=	${J3DLIB}:${PORTSDIR}/java/java3d
+RUN_DEPENDS+=	${J3DLIB}:java/java3d
 .endif
 
 .if ${PORT_OPTIONS:MIRSIM}
-RUN_DEPENDS+=	${JAVALIBDIR}/jmf.jar:${PORTSDIR}/java/jmf
+RUN_DEPENDS+=	${JAVALIBDIR}/jmf.jar:java/jmf
 PLUGINS+=	electricSFS-${PORTVERSION}
 LIBFILES+=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}/electricSFS-${PORTVERSION}.jar
 .endif
diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index b3652e399726..6753001dfb88 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	T1LIB NLS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=T1LIB
 T1LIB_DESC=	Use T1lib Type1 font library
 
-T1LIB_LIB_DEPENDS+=	libt1.so:${PORTSDIR}/devel/t1lib
+T1LIB_LIB_DEPENDS+=	libt1.so:devel/t1lib
 T1LIB_VARS=	FEATURES+=T1LIB
 NLS_USES=	gettext
 NLS_VARS=	FEATURES+=INT
diff --git a/cad/elmerfem/Makefile b/cad/elmerfem/Makefile
index f07300147f16..87bae6b45c04 100644
--- a/cad/elmerfem/Makefile
+++ b/cad/elmerfem/Makefile
@@ -10,8 +10,8 @@ COMMENT=	ELMER FEM package
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libparpack.so:${PORTSDIR}/math/arpack-ng-mpich	\
-		libmpich.so.8:${PORTSDIR}/net/mpich2
+LIB_DEPENDS=	libparpack.so:math/arpack-ng-mpich	\
+		libmpich.so.8:net/mpich2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile
index 5b07d6f5dbdc..dae46847c8f0 100644
--- a/cad/fritzing/Makefile
+++ b/cad/fritzing/Makefile
@@ -27,9 +27,9 @@ INSTALLS_ICONS=	yes
 PORTDATA=	*
 MAKE_ENV=	INSTALL_ROOT="${STAGEDIR}"
 
-BUILD_DEPENDS+=	boost-libs>1.52:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS+=	boost-libs>1.52:devel/boost-libs
 
-RUN_DEPENDS+=	py${PYTHON_SUFFIX}-sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	py${PYTHON_SUFFIX}-sqlite3>0:databases/py-sqlite3
 
 .include <bsd.port.pre.mk>
 
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 1acae6907c1e..30c530e04bbb 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -14,10 +14,10 @@ COMMENT=	GPL Electronic Design Automation tools
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libstroke.so:${PORTSDIR}/devel/libstroke \
-		libguile.so:${PORTSDIR}/lang/guile
-RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk\
-		m4>=1.4.11:${PORTSDIR}/devel/m4
+LIB_DEPENDS=	libstroke.so:devel/libstroke \
+		libguile.so:lang/guile
+RUN_DEPENDS=	gawk:lang/gawk\
+		m4>=1.4.11:devel/m4
 
 USES=		desktop-file-utils gettext gmake libtool pathfix perl5 \
 		pkgconfig python:run shared-mime-info shebangfix
diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index 8c34f389eb17..9c923b80e781 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GNU VHDL simulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libmpc.so:${PORTSDIR}/math/mpc
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
 
 USES=		ada gmake
 USE_GITHUB=	yes
@@ -78,7 +78,7 @@ PLIST_SUB+=	X86_64="@comment "
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
-RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 AS_COMMAND=	${LOCALBASE}/bin/as
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 .else
@@ -101,9 +101,9 @@ IGNORE=		not supported by GCC backend
 .endif
 
 .if ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+=	llvm-config${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} \
-		clang++${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER}
-RUN_DEPENDS+=	llc${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER}
+BUILD_DEPENDS+=	llvm-config${LLVMVER}:devel/llvm${LLVMVER} \
+		clang++${LLVMVER}:lang/clang${LLVMVER}
+RUN_DEPENDS+=	llc${LLVMVER}:devel/llvm${LLVMVER}
 PLIST=		${.CURDIR}/llvm-plist
 PLIST_SUB+=	GLIB=ghdl/lib/ghdl/
 .endif
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 138b86b7150a..9e69ad7e4fb3 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -14,10 +14,10 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Automatic 3D finite element mesh generator
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libpng.so:${PORTSDIR}/graphics/png \
-		liblapack.so:${PORTSDIR}/math/lapack
-RUN_DEPENDS=	getdp:${PORTSDIR}/science/getdp
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+		libpng.so:graphics/png \
+		liblapack.so:math/lapack
+RUN_DEPENDS=	getdp:science/getdp
 
 BROKEN_powerpc64=	Does not build on powerpc64
 
@@ -62,17 +62,17 @@ METIS_CMAKE_ON=	-DENABLE_METIS=ON
 METIS_CMAKE_OFF=	-DENABLE_METIS=OFF
 METIS_VARS=		"no_cdrom=Contact appropriate authors for commercial purposes if including Tetgen or Metis"
 METIS_VARS=		distfiles+=manual.pdf
-TAUCS_LIB_DEPENDS=	libtaucs.so:${PORTSDIR}/math/taucs
+TAUCS_LIB_DEPENDS=	libtaucs.so:math/taucs
 TAUCS_CMAKE_ON=		-DENABLE_TAUCS=ON
 TAUCS_CMAKE_OFF=	-DENABLE_TAUCS=OFF
-MED_LIB_DEPENDS=	libmed.so:${PORTSDIR}/french/med
+MED_LIB_DEPENDS=	libmed.so:french/med
 MED_CMAKE_ON=		-DENABLE_MED=ON
 MED_CMAKE_OFF=		-DENABLE_MED=OFF
-CGNS_LIB_DEPENDS=	libcgns.so:${PORTSDIR}/science/cgnslib
+CGNS_LIB_DEPENDS=	libcgns.so:science/cgnslib
 CGNS_CMAKE_ON=		-DENABLE_CGNS=ON
 CGNS_CMAKE_OFF=		-DENABLE_CGNS=OFF
 GMM_CMAKE_OFF=		-DENABLE_GMM=OFF
-OCC_LIB_DEPENDS=	libTKernel.so:${PORTSDIR}/cad/opencascade
+OCC_LIB_DEPENDS=	libTKernel.so:cad/opencascade
 OCC_CMAKE_ON=		-DENABLE_OCC=ON -DOCC_INC=${LOCALBASE}/include/OpenCASCADE
 OCC_CFLAGS=		-DHAVE_CONFIG_H -DHAVE_WOK_CONFIG_H -DFREEBSD
 OCC_CONFLICTS=		gmsh-2.*
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index 01321e7ad0cb..876d6f6ff023 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Dynamic Finite Element Program Suite
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	java3d>0:${PORTSDIR}/java/java3d
+RUN_DEPENDS=	java3d>0:java/java3d
 
 WRKSRC=		${WRKDIR}/Impact
 
@@ -45,7 +45,7 @@ DESKTOP_ENTRIES="Impact" "${COMMENT}" "${PORTNAME}" \
 OPTIONS_DEFINE=	GMSH
 
 GMSH_DESC=		Automatic 3D finite element mesh generator
-GMSH_RUN_DEPENDS=	gmsh:${PORTSDIR}/cad/gmsh
+GMSH_RUN_DEPENDS=	gmsh:cad/gmsh
 
 post-extract:
 	@${FIND} ${WRKSRC} -name CVS -type d -print0 -or -name .cvsignore -type f -print0 | \
diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile
index 22514fc803ab..c3a652664ab0 100644
--- a/cad/iverilog/Makefile
+++ b/cad/iverilog/Makefile
@@ -20,7 +20,7 @@ MAKE_JOBS_UNSAFE=	yes
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=0:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS+=	flex>=0:textproc/flex
 CONFIGURE_ENV+=	ac_cv_prog_LEX="${LOCALBASE}/bin/flex"
 .endif
 
diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 73bca0721dad..89a31b772a16 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR=		${PORTNAME}
 MAINTAINER=		mr@FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
-BUILD_DEPENDS=	bzr:${PORTSDIR}/devel/bzr \
-		${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:${PORTSDIR}/devel/bzrtools
+BUILD_DEPENDS=	bzr:devel/bzr \
+		${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/bzrlib/plugins/bzrtools/bzrtools.py:devel/bzrtools
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 CONFLICTS=	kicad-2014*
 
@@ -49,9 +49,9 @@ CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DKICAD_SKIP_BOOST=YES
 
 .if exists(${LOCALBASE}/bin/konqueror)
-RUN_DEPENDS+=	konqueror:${PORTSDIR}/x11/kde4-baseapps
+RUN_DEPENDS+=	konqueror:x11/kde4-baseapps
 .else
-RUN_DEPENDS+=	xpdf:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS+=	xpdf:graphics/xpdf
 .endif
 
 .if defined(BOOTSTRAP)
@@ -70,8 +70,8 @@ BZR_SRC_REV!=	bzr revno lp:kicad
 # make && make makeplist && make generate-plist && make check-plist
 # < Check PLIST_FILE_LIST below >
 
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-FETCH_DEPENDS+=	bzr:${PORTSDIR}/devel/bzr
+FETCH_DEPENDS+=	svn:devel/subversion
+FETCH_DEPENDS+=	bzr:devel/bzr
 
 showversions:
 	@${ECHO} "BOOST_RELEASE: ${BOOST_RELEASE}"
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index fb38fd8e7a62..3e9efbe7877e 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Schematic and PCB editing software
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+RUN_DEPENDS=	xpdf:graphics/xpdf
 
 CONFLICTS=	kicad-devel*
 
@@ -26,8 +26,8 @@ USE_GCC=	4.7
 #USES+=		compiler:gcc-c++11-lib
 LDFLAGS+=	-L${LOCALBASE}/lib/c++
 CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 DOS2UNIX_GLOB=	*.cmake sch_bus_entry.h sch_line.h sch_no_connect.h
 USE_XORG=	ice x11 xext
diff --git a/cad/layouteditor/Makefile b/cad/layouteditor/Makefile
index d7b4e14122dc..1d3a4c94dc9e 100644
--- a/cad/layouteditor/Makefile
+++ b/cad/layouteditor/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	LayoutEditor-${PORTVERSION:S,^0.0.,,}-gpl-src
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IC/MEMS layout editor
 
-LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	libttf.so:print/freetype
 
 USES=		qmake zip
 USE_QT4=	corelib gui network moc_build sql uic_build \
diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile
index ec04b083fb8f..40061f0f25c2 100644
--- a/cad/leocad/Makefile
+++ b/cad/leocad/Makefile
@@ -15,7 +15,7 @@ COMMENT=	CAD program that uses bricks similar to those found in many toys
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -43,13 +43,13 @@ ICON_SIZES=	16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDRAW}
-RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw
+RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw
 .endif
 
 .if ${PORT_OPTIONS:MLEOCAD}
 LEOCAD_PIECES=	Library-Linux-7931.zip
 DISTFILES+=	${LEOCAD_PIECES}
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
 post-extract:
 	@${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
 .endif
diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 929d5fbf0406..0dd6de01ccc3 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -7,8 +7,8 @@ CATEGORIES=	cad
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	2D CAD system
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libmuparser.so:${PORTSDIR}/math/muparser
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:devel/boost-libs
+LIB_DEPENDS=	libmuparser.so:math/muparser
 
 USE_QT4=	gui help network sql svg help-tools_build \
 		linguisttools_build moc_build rcc_build uic_build
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 8b91fcf7a58d..76e7c3002500 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Interactive editor for VLSI layouts
 LICENSE=	MIT
 LICENSE_FILE=	${FILESDIR}/license.txt
 
-LIB_DEPENDS=	libBLT25.so:${PORTSDIR}/x11-toolkits/blt
+LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt
 
 USES=		gmake tk:build tar:tgz
 USE_XORG=	ice xext xi xmu
diff --git a/cad/meshlab/Makefile b/cad/meshlab/Makefile
index 132b9b6f6b47..36918666e9e6 100644
--- a/cad/meshlab/Makefile
+++ b/cad/meshlab/Makefile
@@ -13,9 +13,9 @@ COMMENT=	3D triangular meshes processing and editing tool
 
 LICENSE=	GPLv2
 
-EXTRACT_DEPENDS=gtar:${PORTSDIR}/archivers/gtar
-LIB_DEPENDS=	libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap	\
-		libmpir.so:${PORTSDIR}/math/mpir
+EXTRACT_DEPENDS=gtar:archivers/gtar
+LIB_DEPENDS=	libQtSolutions_SOAP-head.so:devel/qt4-qtsolutions-soap	\
+		libmpir.so:math/mpir
 
 USES=		dos2unix qmake compiler:c++11-lib tar:tgz
 USE_CXXSTD=	c++11
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 24080ba43a3d..563b724fd132 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	SF/netgen-mesher/netgen-mesher/${PORTVERSION:C|\.[[:digit:]]+$||}/
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Automatic 3D tetrahedral mesh generator
 
-LIB_DEPENDS=	libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix \
-		libtogl.so:${PORTSDIR}/graphics/togl
+LIB_DEPENDS=	libTix8.4.3.so:x11-toolkits/tix \
+		libtogl.so:graphics/togl
 
 OCC_BROKEN=	Does not compile because of issues with cad/opencascade
 
@@ -33,11 +33,11 @@ OPTIONS_DEFAULT=	# OCC
 
 BROKEN_sparc64=		internal gcc error (Bug 23159)
 
-OCC_LIB_DEPENDS=	libTKernel.so:${PORTSDIR}/cad/opencascade
+OCC_LIB_DEPENDS=	libTKernel.so:cad/opencascade
 OCC_CXXFLAGS=		-DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE
 OCC_CONFIGURE_ON=	--enable-occ
 
-FFMPEG_LIB_DEPENDS=	libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
+FFMPEG_LIB_DEPENDS=	libavcodec0.so:multimedia/ffmpeg0
 FFMPEG_CONFIGURE_ON=	--enable-ffmpeg
 
 MACHINE=	${OPSYS:tu}
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index 4005013e6da1..11cbaa56c979 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -16,9 +16,9 @@ LICENSE_NAME=	LGPL21 with exception
 LICENSE_FILE=	${WRKSRC}/OCCT_LGPL_EXCEPTION.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libtbb.so:${PORTSDIR}/devel/tbb		\
-		libvtksys-${VTKVER}.so:${PORTSDIR}/math/vtk6
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libtbb.so:devel/tbb		\
+		libvtksys-${VTKVER}.so:math/vtk6
+RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/Overview.md
 # and ${WRKSRC}/dox/dev_guides/building
@@ -63,21 +63,21 @@ VIS_CMAKE_ON=		-DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON	\
 VIS_CMAKE_OFF=		-DUSE_FREEIMAGE:BOOL=OFF -DUSE_GL2PS:BOOL=OFF	\
 			-DUSE_FREETYPE:BOOL=OFF
 VIS_USE=		GL=glu
-VIS_LIB_DEPENDS=	libftgl.so:${PORTSDIR}/graphics/ftgl		\
-			libfreetype.so:${PORTSDIR}/print/freetype2	\
-			libgl2ps.so:${PORTSDIR}/print/gl2ps		\
-			libfreeimageplus.so:${PORTSDIR}/graphics/freeimage
+VIS_LIB_DEPENDS=	libftgl.so:graphics/ftgl		\
+			libfreetype.so:print/freetype2	\
+			libgl2ps.so:print/gl2ps		\
+			libfreeimageplus.so:graphics/freeimage
 
 VIS_CMAKE_ON=	-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}	\
 		-D3RDPARTY_FREEIMAGE_DIR=${LOCALBASE}	\
 		-D3RDPARTY_GL2PS_DIR=${LOCALBASE}
 
 DOCS_USE=	TEX=latex:build
-DOCS_BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash		\
-			doxygen:${PORTSDIR}/devel/doxygen	\
-			dot:${PORTSDIR}/graphics/graphviz	\
-			inkscape:${PORTSDIR}/graphics/inkscape
-DOCS_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:${PORTSDIR}/www/mathjax
+DOCS_BUILD_DEPENDS=	bash:shells/bash		\
+			doxygen:devel/doxygen	\
+			dot:graphics/graphviz	\
+			inkscape:graphics/inkscape
+DOCS_RUN_DEPENDS=	${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
 
 .include <bsd.port.options.mk>
 
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index f9bc0c0e4a58..aceecd616dbd 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -14,15 +14,15 @@ COMMENT=	Programmer's solid 3D CAD modeller
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 \
-		${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libmpfr.so:${PORTSDIR}/math/mpfr \
-		libCGAL.so:${PORTSDIR}/math/cgal \
-		libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
-		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libopencsg.so:${PORTSDIR}/graphics/opencsg
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
+		${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
+		${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libCGAL.so:math/cgal \
+		libqscintilla2.so:devel/qscintilla2 \
+		libharfbuzz.so:print/harfbuzz \
+		libopencsg.so:graphics/opencsg
 
 USES=		bison compiler:c++11-lang desktop-file-utils gettext-tools pkgconfig qmake shebangfix
 SHEBANG_FILES=	libraries/MCAD/get_submodules.py
diff --git a/cad/openvsp/Makefile b/cad/openvsp/Makefile
index 88dc0ef7281c..39bb86db8b56 100644
--- a/cad/openvsp/Makefile
+++ b/cad/openvsp/Makefile
@@ -15,14 +15,14 @@ LICENSE_NAME=	NASA Open Source Agreement version 1.3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
-LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libdrm.so:${PORTSDIR}/graphics/libdrm \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
+LIB_DEPENDS=	libpthread-stubs.so:devel/libpthread-stubs \
+		libdrm.so:graphics/libdrm \
+		libpng.so:graphics/png \
+		libfreetype.so:print/freetype2 \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfltk.so:x11-toolkits/fltk
 
 USE_GITHUB=	yes
 GH_PROJECT=	OpenVSP
diff --git a/cad/p5-GDS2/Makefile b/cad/p5-GDS2/Makefile
index 3f580a1bb011..e0bf2048621f 100644
--- a/cad/p5-GDS2/Makefile
+++ b/cad/p5-GDS2/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GDS2 stream module
 
 LICENSE=	ART10
 
-RUN_DEPENDS=	p5-Tk>=804.027:${PORTSDIR}/x11-toolkits/p5-Tk \
-		p5-Tk-WaitBox>0:${PORTSDIR}/x11-toolkits/p5-Tk-WaitBox
+RUN_DEPENDS=	p5-Tk>=804.027:x11-toolkits/p5-Tk \
+		p5-Tk-WaitBox>0:x11-toolkits/p5-Tk-WaitBox
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure
diff --git a/cad/p5-Verilog-Perl/Makefile b/cad/p5-Verilog-Perl/Makefile
index 247981d4d8be..166782690a27 100644
--- a/cad/p5-Verilog-Perl/Makefile
+++ b/cad/p5-Verilog-Perl/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	otacilio.neto@ee.ufcg.edu.br
 COMMENT=	Building point for Verilog support in the Perl language
 
-BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
+BUILD_DEPENDS=	flex>=2.5.35:textproc/flex
 
 USES=		bison gmake perl5
 USE_PERL5=	configure
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 0201af32f65e..a64033eff66c 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -12,10 +12,10 @@ COMMENT=	X11 interactive printed circuit board layout system
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
-		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	m4>=1.4.11:${PORTSDIR}/devel/m4 \
-		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libgd.so:graphics/gd \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
+RUN_DEPENDS=	m4>=1.4.11:devel/m4 \
+		${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 CONFLICTS=	gts-[0-9]*
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index e79622468717..08f9f0d04f08 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mesh generator and solver for Finite Element problems
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
 ATLAS_DESC=	Enable ATLAS support
diff --git a/cad/py-pycam/Makefile b/cad/py-pycam/Makefile
index 3724d8c04d39..c19a6cc5b8e8 100644
--- a/cad/py-pycam/Makefile
+++ b/cad/py-pycam/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Toolpath generator for 3-axis CNC machining
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
-		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
-		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 \
+		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl \
+		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext
 
 USES=		python:-2.7
 USE_PYTHON=	distutils autoplist
diff --git a/cad/pythoncad/Makefile b/cad/pythoncad/Makefile
index 0828d4e1b077..60b693ba98b6 100644
--- a/cad/pythoncad/Makefile
+++ b/cad/pythoncad/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Open-source CAD package built designed around Python
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
 
 USES=			python
 USE_PYTHON=		distutils
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 6dff90d7f1f1..96ae81db46d2 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Professional CAD system
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash	\
-		${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
-LIB_DEPENDS=	libquazip.so:${PORTSDIR}/archivers/quazip
+BUILD_DEPENDS=	bash:shells/bash	\
+		${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs
+LIB_DEPENDS=	libquazip.so:archivers/quazip
 
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index ea535b1cb599..3e92ad4351b3 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -20,8 +20,8 @@ USE_QT4=	corelib gui qt3support svg xml \
 USES=		tar:bzip2 cmake desktop-file-utils
 INSTALLS_ICONS=	yes
 
-GRAPHVIZ_BUILD_DEPENDS=	graphviz>=2.22:${PORTSDIR}/graphics/graphviz
-GRAPHVIZ_RUN_DEPENDS=	graphviz>=2.22:${PORTSDIR}/graphics/graphviz
+GRAPHVIZ_BUILD_DEPENDS=	graphviz>=2.22:graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	graphviz>=2.22:graphics/graphviz
 GRAPHVIZ_CMAKE_OFF=	-DQFSM_AVOID_GRAPHVIZ:BOOL=ON
 
 pre-configure:
diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile
index e3ebef024715..5af3a39be227 100644
--- a/cad/repsnapper/Makefile
+++ b/cad/repsnapper/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Controller and GCode generator for RepRap 3D printers
 LICENSE=	GPLv2 BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm \
-		libzip.so:${PORTSDIR}/archivers/libzip \
+LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:x11-toolkits/gtkglextmm \
+		libzip.so:archivers/libzip \
 
 USES=		autoreconf gmake libtool perl5 pkgconfig
 USE_GNOME=	gtkmm24 intltool libxml++26
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 380a0ddbad84..5b4ea1df69a4 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -46,7 +46,7 @@ PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf
 EXAMPLES=	scotch_example_1.f scotch_example_2.f90
 
 .if !defined(WITHOUT_MPI)
-LIB_DEPENDS+=	libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	libmpich.so:net/mpich2
 
 ALL_TARGET+=	ptscotch
 MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 7d8aa9928b98..7188ee8a110b 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -24,7 +24,7 @@ COMMENT=	General-purpose circuit simulation program
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:archivers/unzip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}3f5
 MAKEFILE=	${FILESDIR}/Makefile
diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index f58a3777a660..3002bd89e29e 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free interior design application
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.TXT
 
-BUILD_DEPENDS=	java3d>=0:${PORTSDIR}/java/java3d
-RUN_DEPENDS=	java3d>=0:${PORTSDIR}/java/java3d
+BUILD_DEPENDS=	java3d>=0:java/java3d
+RUN_DEPENDS=	java3d>=0:java/java3d
 
 USES=		zip
 NO_ARCH=	yes
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index 23990bf4be5d..9d9ce50dfaba 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Free explicit/implicit Finite Element Program
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libf2c.a:${PORTSDIR}/lang/f2c
+BUILD_DEPENDS=	${LOCALBASE}/lib/libf2c.a:lang/f2c
 
 OPTIONS_DEFINE=	ATLAS EXAMPLES THREADS
 ATLAS_DESC=	Use ATLAS instead of BLAS/LAPACK
@@ -36,25 +36,25 @@ GID_PTYPES=	${PREFIX}/${GIDDIR}/problemtypes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:math/atlas
 .if ${PORT_OPTIONS:MTHREADS}
 BLAS_LIBS=	-lptf77blas
 .else
 BLAS_LIBS=	-lf77blas
 .endif
 .else
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas	\
-		liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	libblas.so:math/blas	\
+		liblapack.so:math/lapack
 BLAS_LIBS=	-llapack -lblas
 .endif
 
 .if ${PORT_OPTIONS:MTHREADS}
 ALL_TARGET=	freebsd_parallel
-LIB_DEPENDS+=	libsuperlu_mt.so:${PORTSDIR}/math/superlu_mt
+LIB_DEPENDS+=	libsuperlu_mt.so:math/superlu_mt
 SUPERLU=	superlu_mt
 .else
 ALL_TARGET=	freebsd_old
-LIB_DEPENDS+=	libsuperlu.so:${PORTSDIR}/math/superlu
+LIB_DEPENDS+=	libsuperlu.so:math/superlu
 SUPERLU=	superlu
 .endif
 
diff --git a/cad/varkon/Makefile b/cad/varkon/Makefile
index 1a1c6c3bb183..a47e4b9b0a0d 100644
--- a/cad/varkon/Makefile
+++ b/cad/varkon/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Free CAD system and applications development tool
 LICENSE=	GPLv2 LGPL20
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+LIB_DEPENDS=	libtiff.so:graphics/tiff
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 WRKSRC=		${WRKDIR}/Varkon_${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/sources
diff --git a/cad/z88/Makefile b/cad/z88/Makefile
index 7e0da32e243b..6e828ab0b35e 100644
--- a/cad/z88/Makefile
+++ b/cad/z88/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	${PORTNAME}130${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compact Finite Element Analysis System
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 NO_WRKSUBDIR=	yes
 USES=		pkgconfig
diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index ad95d8046236..5791d9cbb017 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -25,13 +25,13 @@ SCIM_DESC=		Smart Common Input Method platform
 MINICHINPUT_DESC=	A tiny version of Chinput
 RELAXCONF_DESC=		A set of utilities for FreeBSD LiveCD
 
-WQY_RUN_DEPENDS=	${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:${PORTSDIR}/x11-fonts/wqy
-FIREFLYTTF_RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chinese/fireflyttf
-FCITX_RUN_DEPENDS=	fcitx:${PORTSDIR}/chinese/fcitx
-SCIM_RUN_DEPENDS=	${LOCALBASE}/share/scim/tables/Wubi.bin:${PORTSDIR}/chinese/scim-tables \
-			${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:${PORTSDIR}/chinese/scim-pinyin
-MINICHINPUT_RUN_DEPENDS=	chinput:${PORTSDIR}/chinese/miniChinput
-RELAXCONF_RUN_DEPENDS=	relaxconf:${PORTSDIR}/sysutils/relaxconf
+WQY_RUN_DEPENDS=	${LOCALBASE}/share/fonts/wqy/wenquanyi_10pt.pcf:x11-fonts/wqy
+FIREFLYTTF_RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:chinese/fireflyttf
+FCITX_RUN_DEPENDS=	fcitx:chinese/fcitx
+SCIM_RUN_DEPENDS=	${LOCALBASE}/share/scim/tables/Wubi.bin:chinese/scim-tables \
+			${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/pinyin.so:chinese/scim-pinyin
+MINICHINPUT_RUN_DEPENDS=	chinput:chinese/miniChinput
+RELAXCONF_RUN_DEPENDS=	relaxconf:sysutils/relaxconf
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
diff --git a/chinese/bg5pdf/Makefile b/chinese/bg5pdf/Makefile
index 1cd4953d1721..f13aaebf767f 100644
--- a/chinese/bg5pdf/Makefile
+++ b/chinese/bg5pdf/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Convert Chinese-Big5 encoded files to PDF, using PDFlib
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
+LIB_DEPENDS=	libpdf.so:print/pdflib
 
 USES=		python:2
 
diff --git a/chinese/brise/Makefile b/chinese/brise/Makefile
index 1bce06f5591f..cfa146c4e28a 100644
--- a/chinese/brise/Makefile
+++ b/chinese/brise/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Rime Schema Repository
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	rime_deployer:${PORTSDIR}/chinese/librime
+BUILD_DEPENDS=	rime_deployer:chinese/librime
 
 USES=		gmake
 USE_GITHUB=	yes
diff --git a/chinese/bsdconv-opencc/Makefile b/chinese/bsdconv-opencc/Makefile
index 48909b315373..50c10f824d21 100644
--- a/chinese/bsdconv-opencc/Makefile
+++ b/chinese/bsdconv-opencc/Makefile
@@ -11,9 +11,9 @@ COMMENT=	OpenCC conversion module for bsdconv
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bsdconv-mktable:${PORTSDIR}/converters/bsdconv
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv \
-		libopencc.so:${PORTSDIR}/chinese/opencc
+BUILD_DEPENDS=	${LOCALBASE}/bin/bsdconv-mktable:converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv \
+		libopencc.so:chinese/opencc
 
 PLIST_FILES=	share/bsdconv/inter/OPENCC \
 		share/bsdconv/inter/OPENCC.man \
diff --git a/chinese/bug5/Makefile b/chinese/bug5/Makefile
index 0cb03a034a38..902cb884fd65 100644
--- a/chinese/bug5/Makefile
+++ b/chinese/bug5/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Big5/GBK <-> UTF-8 translating layer in terminal
 LICENSE=	BSD2CLAUSE BSD3CLAUSE
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/chinese/chiconv/Makefile b/chinese/chiconv/Makefile
index b07b69964df2..099133661645 100644
--- a/chinese/chiconv/Makefile
+++ b/chinese/chiconv/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Auto chinese encoding converter
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile
index b23675f1ceae..244800719c11 100644
--- a/chinese/dictd-database/Makefile
+++ b/chinese/dictd-database/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Chinese <-> English dictd words database
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/dictd:${PORTSDIR}/net/dictd
+RUN_DEPENDS=	${LOCALBASE}/sbin/dictd:net/dictd
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile
index 7f004fdbebde..c3ade7ee272c 100644
--- a/chinese/enscript/Makefile
+++ b/chinese/enscript/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	chinese
 
 MAINTAINER=	ports@FreeBSD.org
 
-RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
+RUN_DEPENDS=	ttfm.sh:chinese/ttfm
 
 PAPERSIZE=	a4
 MASTERDIR=	${.CURDIR}/../../print/enscript-letter
diff --git a/chinese/eterm/Makefile b/chinese/eterm/Makefile
index 8d7a4ad95d0d..847803d462c6 100644
--- a/chinese/eterm/Makefile
+++ b/chinese/eterm/Makefile
@@ -18,6 +18,6 @@ CONFIGURE_ARGS=	--enable-trans --enable-utmp \
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/kcfonts/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/kcfonts/kc15f.pcf.gz:chinese/kcfonts
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/fcitx-chewing/Makefile b/chinese/fcitx-chewing/Makefile
index b61d1ab03f89..9206a22be001 100644
--- a/chinese/fcitx-chewing/Makefile
+++ b/chinese/fcitx-chewing/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Chewing support for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libchewing.so:${PORTSDIR}/chinese/libchewing
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libchewing.so:chinese/libchewing
 
 USES=		tar:xz cmake gettext pkgconfig
 INSTALLS_ICONS=	yes
diff --git a/chinese/fcitx-cloudpinyin/Makefile b/chinese/fcitx-cloudpinyin/Makefile
index 5a5fe10a9c49..ebd1fac22b17 100644
--- a/chinese/fcitx-cloudpinyin/Makefile
+++ b/chinese/fcitx-cloudpinyin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Cloud-based Pinyin module for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libcurl.so:ftp/curl
 
 USES=		tar:xz cmake gettext pkgconfig
 
diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index 21830a663965..ed1dba4e7b47 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Fcitx IM framework configuration tool
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
-		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx
 
 USE_GNOME=	intltool
 USES=		cmake gettext pkgconfig tar:xz
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 00e62cb89c81..badf45c34cde 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Libgooglepinyin support for Fcitx
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libgooglepinyin.so:${PORTSDIR}/chinese/libgooglepinyin
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libgooglepinyin.so:chinese/libgooglepinyin
 
 USES=		tar:xz cmake gettext pkgconfig iconv
 USE_GNOME=	intltool
diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
index 71299a95c30d..3aa332325f41 100644
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@@ -16,8 +16,8 @@ COMMENT=	Libpinyin support for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libpinyin.so:${PORTSDIR}/chinese/libpinyin
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libpinyin.so:chinese/libpinyin
 
 USES=		tar:xz cmake gettext pkgconfig
 INSTALLS_ICONS=	yes
diff --git a/chinese/fcitx-rime/Makefile b/chinese/fcitx-rime/Makefile
index a882c1a0debc..9e6e41851704 100644
--- a/chinese/fcitx-rime/Makefile
+++ b/chinese/fcitx-rime/Makefile
@@ -12,9 +12,9 @@ COMMENT=	RIME support for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		librime.so:${PORTSDIR}/chinese/librime
-RUN_DEPENDS=	${LOCALBASE}/share/brise/default.yaml:${PORTSDIR}/chinese/brise
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		librime.so:chinese/librime
+RUN_DEPENDS=	${LOCALBASE}/share/brise/default.yaml:chinese/brise
 
 USES=		tar:xz cmake gettext pkgconfig
 INSTALLS_ICONS=	yes
diff --git a/chinese/fcitx-sunpinyin/Makefile b/chinese/fcitx-sunpinyin/Makefile
index 93cf6c6b9050..d657def8b268 100644
--- a/chinese/fcitx-sunpinyin/Makefile
+++ b/chinese/fcitx-sunpinyin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SunPinyin support for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libsunpinyin.so:${PORTSDIR}/chinese/sunpinyin
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libsunpinyin.so:chinese/sunpinyin
 
 USES=		cmake gettext pkgconfig tar:xz
 INSTALLS_ICONS=	yes
diff --git a/chinese/fcitx-table-extra/Makefile b/chinese/fcitx-table-extra/Makefile
index 3b365410c26b..280649e6198f 100644
--- a/chinese/fcitx-table-extra/Makefile
+++ b/chinese/fcitx-table-extra/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Table-based input methods for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx
 
 USES=		tar:xz cmake gettext
 INSTALLS_ICONS=	yes
diff --git a/chinese/fcitx-ui-light/Makefile b/chinese/fcitx-ui-light/Makefile
index d2ef93f663d5..b6e3961cfa42 100644
--- a/chinese/fcitx-ui-light/Makefile
+++ b/chinese/fcitx-ui-light/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Alternative light weight UI for Fcitx
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfcitx-config.so:chinese/fcitx \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USE_XORG=	x11 xft xpm
 USES=		tar:bzip2 cmake gettext pkgconfig
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index c45648232442..2eaf1b247c30 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -21,10 +21,10 @@ COMMENT=	Flexible Input Method Framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libicuuc.so:${PORTSDIR}/devel/icu
-RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
+LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libicuuc.so:devel/icu
+RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR=${PORTSDIR}
@@ -89,7 +89,7 @@ PLIST_SUB+=	QT4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOPENCC}
-LIB_DEPENDS+=	libopencc.so:${PORTSDIR}/chinese/opencc
+LIB_DEPENDS+=	libopencc.so:chinese/opencc
 .else
 CMAKE_ARGS+=	-DENABLE_OPENCC=OFF
 .endif
diff --git a/chinese/font-std/Makefile b/chinese/font-std/Makefile
index 4938e250bd8e..b86659edadae 100644
--- a/chinese/font-std/Makefile
+++ b/chinese/font-std/Makefile
@@ -11,10 +11,10 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Chinese Standard Fonts
 
-RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
-		${LOCALBASE}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf \
-		${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf \
-		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
+RUN_DEPENDS=	${LOCALBASE}/share/fonts/TrueType/bkai00mp.ttf:chinese/arphicttf \
+		${LOCALBASE}/share/fonts/TrueType/gbsn00lp.ttf:chinese/arphicttf \
+		${LOCALBASE}/share/fonts/TrueType/bsmi00lp.ttf:chinese/arphicttf \
+		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf
 
 NO_BUILD=	yes
 PLIST_FILES=	${FONTSDIR}/std.zh_CN/STHeiti-Regular \
diff --git a/chinese/fortune/Makefile b/chinese/fortune/Makefile
index da735034a38b..fb77742e5a4a 100644
--- a/chinese/fortune/Makefile
+++ b/chinese/fortune/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	fortune-mod-zh-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Classic fortune file in Chinese
 
-RUN_DEPENDS=	autob5:${PORTSDIR}/chinese/autoconvert
+RUN_DEPENDS=	autob5:chinese/autoconvert
 
 PROJECTHOST=	chinese-fortune
 NO_BUILD=	yes
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index acae4286760e..3dd5a49df478 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -27,11 +27,11 @@ ANTHY_DESC=	Japanese anthy IM module
 QT_IM_MODULE_DESC=	QT IM module
 
 QT_IM_MODULE_USE=	QT4=inputmethods,qmake_build,moc_build,corelib,gui
-QT_IM_MODULE_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
+QT_IM_MODULE_LIB_DEPENDS=	libmng.so:graphics/libmng
 QT_IM_MODULE_CONFIGURE_OFF=	--use_qt4=N
 
-ANTHY_BUILD_DEPENDS=	${LOCALBASE}/include/anthy/anthy.h:${PORTSDIR}/japanese/anthy
-ANTHY_LIB_DEPENDS=	libanthy.so:${PORTSDIR}/japanese/anthy
+ANTHY_BUILD_DEPENDS=	${LOCALBASE}/include/anthy/anthy.h:japanese/anthy
+ANTHY_LIB_DEPENDS=	libanthy.so:japanese/anthy
 ANTHY_CONFIGURE_OFF=	--use_anthy=N
 
 post-patch:
diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile
index c911c66c8cb9..4d2aac770fdb 100644
--- a/chinese/ibus-chewing/Makefile
+++ b/chinese/ibus-chewing/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Chewing engine for IBus
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2 \
-		${LOCALBASE}/share/cmake/Modules/ManageEnvironmentCommon.cmake:${PORTSDIR}/devel/cmake-fedora \
-		ibus-daemon:${PORTSDIR}/textproc/ibus
-LIB_DEPENDS=	libchewing.so:${PORTSDIR}/chinese/libchewing
-RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus
+BUILD_DEPENDS=	gob2:devel/gob2 \
+		${LOCALBASE}/share/cmake/Modules/ManageEnvironmentCommon.cmake:devel/cmake-fedora \
+		ibus-daemon:textproc/ibus
+LIB_DEPENDS=	libchewing.so:chinese/libchewing
+RUN_DEPENDS=	ibus-daemon:textproc/ibus
 
 CMAKE_ARGS=	-DSYSCONF_INSTALL_DIR=${PREFIX}/etc \
 		-DLIB_DIR=${PREFIX}/lib
diff --git a/chinese/ibus-libpinyin/Makefile b/chinese/ibus-libpinyin/Makefile
index c84e0d415e4f..8456081f00e0 100644
--- a/chinese/ibus-libpinyin/Makefile
+++ b/chinese/ibus-libpinyin/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Intelligent Pinyin engine based on libpinyin for IBus
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libpinyin.so:${PORTSDIR}/chinese/libpinyin
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
+		libibus-1.0.so:textproc/ibus \
+		libpinyin.so:chinese/libpinyin
 
 USES=		compiler:c++11-lib gmake python pkgconfig gettext
 USE_GNOME=	glib20
@@ -36,7 +36,7 @@ STROKE_CONFIGURE_ENABLE=	stroke-input-mode
 
 OPENCC_BROKEN=			Requires newer OpenCC
 OPENCC_CONFIGURE_ENABLE=	opencc
-OPENCC_LIB_DEPENDS=		libopencc.so:${PORTSDIR}/chinese/opencc
+OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc
 
 NLS_USES=		gettext
 NLS_USE=		GNOME=intltool
diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile
index 8dea415e135a..13ff04a7b7d9 100644
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@@ -12,11 +12,11 @@ COMMENT=	PinYin engine for IBus
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \
-		${LOCALBASE}/share/gir-1.0/IBus-1.0.gir:${PORTSDIR}/textproc/ibus
-LIB_DEPENDS=	libpyzy-1.0.so:${PORTSDIR}/chinese/pyzy \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \
+		${LOCALBASE}/share/gir-1.0/IBus-1.0.gir:textproc/ibus
+LIB_DEPENDS=	libpyzy-1.0.so:chinese/pyzy \
+		libibus-1.0.so:textproc/ibus \
+		libsqlite3.so:databases/sqlite3
 
 USES=		compiler:c++11-lib gmake pkgconfig python
 GNU_CONFIGURE=	yes
diff --git a/chinese/ibus-table-chinese/Makefile b/chinese/ibus-table-chinese/Makefile
index ce1364164510..6e4e82a4e753 100644
--- a/chinese/ibus-table-chinese/Makefile
+++ b/chinese/ibus-table-chinese/Makefile
@@ -11,11 +11,11 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 MAINTAINER=	dennylin93@hs.ntnu.edu.tw
 COMMENT=	Chinese input tables for IBus
 
-BUILD_DEPENDS=	${LOCALBASE}/share/cmake/Modules/ManageEnvironment.cmake:${PORTSDIR}/devel/cmake-fedora \
-		ibus-daemon:${PORTSDIR}/textproc/ibus \
-		${LOCALBASE}/libexec/ibus-engine-table:${PORTSDIR}/textproc/ibus-table
-RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus \
-		${LOCALBASE}/libexec/ibus-engine-table:${PORTSDIR}/textproc/ibus-table
+BUILD_DEPENDS=	${LOCALBASE}/share/cmake/Modules/ManageEnvironment.cmake:devel/cmake-fedora \
+		ibus-daemon:textproc/ibus \
+		${LOCALBASE}/libexec/ibus-engine-table:textproc/ibus-table
+RUN_DEPENDS=	ibus-daemon:textproc/ibus \
+		${LOCALBASE}/libexec/ibus-engine-table:textproc/ibus-table
 
 USES=		cmake pkgconfig
 INSTALL_TARGET=	install
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 27dcdb4ddcba..90f52f2afb05 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kuo Chauo Chinese Fonts collection
 
 USES=		fonts
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
 MAKE_ARGS=	CFONTDIR=${FONTSDIR} EFONTDIR=${FONTSDIR}
 MAKE_JOBS_UNSAFE=yes
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index ed054c6c0471..728da486e5fb 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Chewing intelligent phonetic input method library
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
 
 USES=		cmake libtool pathfix pkgconfig tar:bzip2
 USE_SQLITE=	yes
diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 596a79a0e5c8..5c53b27e52db 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Rime Input Method Engine, the core library
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libglog.so:${PORTSDIR}/devel/glog \
-		libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet \
-		libopencc.so:${PORTSDIR}/chinese/opencc \
-		libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libglog.so:devel/glog \
+		libkyotocabinet.so:databases/kyotocabinet \
+		libopencc.so:chinese/opencc \
+		libyaml-cpp.so:devel/yaml-cpp
 
 USES=		cmake compiler:c++11-lib pkgconfig gettext perl5
 USE_PERL5=	build patch
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index 34b23aaa86e2..a4b9e80c472b 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	zh-moettf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Three Chinese BIG5 TrueType fonts: Kai LiShu Sung SungExt
 
-EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
+EXTRACT_DEPENDS=	unrar:archivers/unrar
 
 NO_CDROM=	Contact Ministry of Education of Taiwan for commercial use
 NO_BUILD=	yes
diff --git a/chinese/mutt/Makefile b/chinese/mutt/Makefile
index f2881a738d93..4baee7a319d4 100644
--- a/chinese/mutt/Makefile
+++ b/chinese/mutt/Makefile
@@ -16,7 +16,7 @@ COMMENT=	The Mongrel of Mail User Agents with Chinese support
 
 CONFLICTS=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-[0-9]* mutt-lite-[0-9]*
 
-LIB_DEPENDS+=	libhz.so:${PORTSDIR}/chinese/autoconvert
+LIB_DEPENDS+=	libhz.so:chinese/autoconvert
 
 LDFLAGS_ADD+=	-lhz
 
diff --git a/chinese/oicq/Makefile b/chinese/oicq/Makefile
index df6facb7b795..49f9ecf6f504 100644
--- a/chinese/oicq/Makefile
+++ b/chinese/oicq/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	Net-OICQ-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Implements OICQ messaging protocol
 
-BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-Crypt-OICQ>=0:${PORTSDIR}/security/p5-Crypt-OICQ
+BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
+		p5-Crypt-OICQ>=0:security/p5-Crypt-OICQ
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/chinese/p5-Lingua-Han-PinYin/Makefile b/chinese/p5-Lingua-Han-PinYin/Makefile
index 1c4dfef664b8..4201be8022d3 100644
--- a/chinese/p5-Lingua-Han-PinYin/Makefile
+++ b/chinese/p5-Lingua-Han-PinYin/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Retrieve the Mandarin (PinYin) of Chinese character (HanZi)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Lingua-Han-Utils>=0.10:${PORTSDIR}/chinese/p5-Lingua-Han-Utils
+BUILD_DEPENDS=	p5-Lingua-Han-Utils>=0.10:chinese/p5-Lingua-Han-Utils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/chinese/p5-Lingua-Han-Utils/Makefile b/chinese/p5-Lingua-Han-Utils/Makefile
index e3a1e8c29e71..5358a1027a45 100644
--- a/chinese/p5-Lingua-Han-Utils/Makefile
+++ b/chinese/p5-Lingua-Han-Utils/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utility tools of Chinese character(HanZi)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Encode-Detect-CJK>=0:${PORTSDIR}/converters/p5-Encode-Detect-CJK
+BUILD_DEPENDS=	p5-Encode-Detect-CJK>=0:converters/p5-Encode-Detect-CJK
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index 1c83c65bbc31..66ec892ad819 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Chinese Keywords Extraction via Lingua::ZH::TaBE
 
-BUILD_DEPENDS=	p5-Lingua-ZH-TaBE>=0:${PORTSDIR}/chinese/p5-Lingua-ZH-TaBE
+BUILD_DEPENDS=	p5-Lingua-ZH-TaBE>=0:chinese/p5-Lingua-ZH-TaBE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index 731592ee8b69..6b30f5e42d84 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Chinese Text Summarization
 
-BUILD_DEPENDS=	p5-Lingua-ZH-Toke>=0:${PORTSDIR}/chinese/p5-Lingua-ZH-Toke \
-		p5-Lingua-ZH-Wrap>=0:${PORTSDIR}/chinese/p5-Lingua-ZH-Wrap
+BUILD_DEPENDS=	p5-Lingua-ZH-Toke>=0:chinese/p5-Lingua-ZH-Toke \
+		p5-Lingua-ZH-Wrap>=0:chinese/p5-Lingua-ZH-Wrap
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index b7aa156d49fe..c37d03c7e001 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Chinese processing via libtabe
 
-LIB_DEPENDS=	libtabe.so:${PORTSDIR}/chinese/libtabe
+LIB_DEPENDS=	libtabe.so:chinese/libtabe
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 5562e977b82a..4bc297a6247f 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Chinese Tokenizer on steroids
 
-BUILD_DEPENDS=	p5-Lingua-ZH-TaBE>=0:${PORTSDIR}/chinese/p5-Lingua-ZH-TaBE
+BUILD_DEPENDS=	p5-Lingua-ZH-TaBE>=0:chinese/p5-Lingua-ZH-TaBE
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/chinese/p5-Text-Greeking-zh_TW/Makefile b/chinese/p5-Text-Greeking-zh_TW/Makefile
index 0bc7c53e74cf..80a2d4da5b2f 100644
--- a/chinese/p5-Text-Greeking-zh_TW/Makefile
+++ b/chinese/p5-Text-Greeking-zh_TW/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate meaningless Chinese text that creates the illusion of the document
 
-RUN_DEPENDS=	p5-common-sense>=2.02:${PORTSDIR}/devel/p5-common-sense
+RUN_DEPENDS=	p5-common-sense>=2.02:devel/p5-common-sense
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/chinese/p5-cconv/Makefile b/chinese/p5-cconv/Makefile
index 23bbae5a0332..ce27031810ee 100644
--- a/chinese/p5-cconv/Makefile
+++ b/chinese/p5-cconv/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl wrapper for chinese/cconv
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcconv.so:${PORTSDIR}/chinese/cconv
+LIB_DEPENDS=	libcconv.so:chinese/cconv
 
 USE_PERL5=	configure
 USES=		localbase perl5
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index df9e0bf065d4..9ce23b533fa8 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -40,7 +40,7 @@ DEBUG_CONFIGURE_ENABLE=		debug
 DOCKLET_CONFIGURE_ENABLE=	docklet
 NOTIFIER_CONFIGURE_ENABLE=	notifier
 LIBNOTIFY_CONFIGURE_ENABLE=	libnotify
-LIBNOTIFY_LIB_DEPENDS=		libnotify.so:${PORTSDIR}/devel/libnotify
+LIBNOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
 NANCY_CONFIGURE_ENABLE=		nancy
 MOUSE_CONFIGURE_ENABLE=		mouse
 EXTERNAL_CONFIGURE_ENABLE=	external
diff --git a/chinese/php-cconv/Makefile b/chinese/php-cconv/Makefile
index 941d4d425278..5f9b1d696fce 100644
--- a/chinese/php-cconv/Makefile
+++ b/chinese/php-cconv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PHP wrapper for chinese/cconv
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcconv.so:${PORTSDIR}/chinese/cconv
+LIB_DEPENDS=	libcconv.so:chinese/cconv
 
 CONFIGURE_ARGS=	--with-cconv-dir=${LOCALBASE}
 USE_PHP=	yes
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index 23772b422505..efa85c1dad42 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	phpBB-tw-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Traditional Chinese version of phpBB
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
 
 CONFLICTS=	phpbb-[0-9]*
 USES=		dos2unix
diff --git a/chinese/py-cconv/Makefile b/chinese/py-cconv/Makefile
index 61425c7ae77e..aaf3f66a3c5d 100644
--- a/chinese/py-cconv/Makefile
+++ b/chinese/py-cconv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python wrapper for chinese/cconv
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcconv.so:${PORTSDIR}/chinese/cconv
+LIB_DEPENDS=	libcconv.so:chinese/cconv
 
 USE_PYTHON=	autoplist concurrent distutils
 USES=		localbase python
diff --git a/chinese/pyzy/Makefile b/chinese/pyzy/Makefile
index bfb5a728613b..54362ad6e806 100644
--- a/chinese/pyzy/Makefile
+++ b/chinese/pyzy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	The Chinese PinYin and Bopomofo conversion library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 USES=		compiler:c++11-lib gmake libtool pkgconfig python:build shebangfix
 SHEBANG_FILES=	data/db/android/create_db.py
@@ -40,7 +40,7 @@ OPENPHRASE_DB_CONFIGURE_ENABLE=	db-open-phrase
 OPENPHRASE_DB_DISTFILES=	${OPENPHRASE_DBFILE}
 
 OPENCC_CONFIGURE_ENABLE=	opencc
-OPENCC_LIB_DEPENDS=		libopencc.so:${PORTSDIR}/chinese/opencc
+OPENCC_LIB_DEPENDS=		libopencc.so:chinese/opencc
 
 post-extract-OPENPHRASE_DB-on:
 	@${CP} ${DISTDIR}/${OPENPHRASE_DBFILE} ${WRKSRC}/data/db/open-phrase
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index 189c62dc32cf..1ec506e3ba2b 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -40,7 +40,7 @@ PHONON_CMAKE_ON=	-DQTERM_ENABLE_PHONON:BOOL=TRUE
 PHONON_CMAKE_OFF=	-DQTERM_ENABLE_PHONON:BOOL=FALSE
 
 QTSCRIPT_USE=	QT4=script
-QTSCRIPT_RUN_DEPENDS=	${QT_PLUGINDIR}/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
+QTSCRIPT_RUN_DEPENDS=	${QT_PLUGINDIR}/script/libqtscript_core.so:devel/qtscriptgenerator
 QTSCRIPT_CMAKE_ON=	-DQTERM_ENABLE_SCRIPT:BOOL=TRUE
 QTSCRIPT_CMAKE_OFF=	-DQTERM_ENABLE_SCRIPT:BOOL=FALSE
 
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index 46774314d880..a43b7d92b8de 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Education software to help people to study English
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libespeak.so:${PORTSDIR}/audio/espeak
+LIB_DEPENDS=	libespeak.so:audio/espeak
 
 GNU_CONFIGURE=	yes
 USES=		tar:bzip2 gettext gmake pkgconfig
diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile
index ffe88cf416ff..ed1ca554c89f 100644
--- a/chinese/scim-array/Makefile
+++ b/chinese/scim-array/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Array 30 SCIM IMEngine module
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
-RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS=	scim:textproc/scim
+RUN_DEPENDS=	scim:textproc/scim
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake iconv libtool:keepla pkgconfig
diff --git a/chinese/scim-fcitx/Makefile b/chinese/scim-fcitx/Makefile
index 90419c675ae8..e0cb857422fd 100644
--- a/chinese/scim-fcitx/Makefile
+++ b/chinese/scim-fcitx/Makefile
@@ -15,7 +15,7 @@ COMMENT=	SCIM IMEngine module for fcitx
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
+RUN_DEPENDS=	scim:textproc/scim
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		tar:bzip2 gmake libtool:keepla pkgconfig
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index fc23746938a9..67d8367c165e 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM Chinese Smart Pinyin input method
 
-BUILD_DEPENDS=	scim>=1.2.0:${PORTSDIR}/textproc/scim
+BUILD_DEPENDS=	scim>=1.2.0:textproc/scim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile
index e4c4d8ce5607..7e6812c92c72 100644
--- a/chinese/scim-tables/Makefile
+++ b/chinese/scim-tables/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SCIM table based Chinese input methods
 
-BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim \
-		scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
-RUN_DEPENDS=	scim-make-table:${PORTSDIR}/textproc/scim-table-imengine
+BUILD_DEPENDS=	scim:textproc/scim \
+		scim-make-table:textproc/scim-table-imengine
+RUN_DEPENDS=	scim-make-table:textproc/scim-table-imengine
 
 USES=		pkgconfig gmake
 GNU_CONFIGURE=	yes
diff --git a/chinese/sunpinyin/Makefile b/chinese/sunpinyin/Makefile
index 30a631a26761..d9a993efb78c 100644
--- a/chinese/sunpinyin/Makefile
+++ b/chinese/sunpinyin/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Statistical language model based input method engine
 LICENSE=	LGPL21 CDDL
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_TAGNAME=	a8bd811
diff --git a/chinese/ttf2pt1/Makefile b/chinese/ttf2pt1/Makefile
index c66355047dca..54530a63ad26 100644
--- a/chinese/ttf2pt1/Makefile
+++ b/chinese/ttf2pt1/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-chinese-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	True Type Font to Postscript Type 1 converter with Chinese maps
 
-RUN_DEPENDS=	ttf2pt1:${PORTSDIR}/print/ttf2pt1
+RUN_DEPENDS=	ttf2pt1:print/ttf2pt1
 
 USES=		tar:tgz
 MAKE_ARGS=	INSTDIR="${PREFIX}"
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index 21b53770aa82..9a1d33e89bd1 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Big5/GB enhanced TrueType Font Manager
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 MAKE_ARGS=	FREETYPE_BASE=${LOCALBASE:Q} CC="${CC}"
 
diff --git a/chinese/ttfm/Makefile.ttf b/chinese/ttfm/Makefile.ttf
index ef50e54fb48e..e4e21bff54cf 100644
--- a/chinese/ttfm/Makefile.ttf
+++ b/chinese/ttfm/Makefile.ttf
@@ -22,17 +22,17 @@ XFONTSDIR_REL=	${XFONTSDIR:S,${LOCALBASE}/,,}
 PLIST_SUB+=	XFONTSDIR=${XFONTSDIR_REL}
 
 .if ${PORT_OPTIONS:MX11}
-RUN_DEPENDS+=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS+=	${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig
 _TTF_MODULES=	xttfm
 .endif
 
 .if ${PORT_OPTIONS:MGHOSTSCRIPT}
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
+RUN_DEPENDS+=	${LOCALBASE}/share/fonts/adobe-cmaps/ai0/CMap/Identity-H:print/adobe-cmaps
 _TTF_MODULES+=	gscjk
 .endif
 
 .if defined(_TTF_MODULES)
-RUN_DEPENDS+=	${PREFIX}/bin/ttfm.sh:${PORTSDIR}/chinese/ttfm
+RUN_DEPENDS+=	${PREFIX}/bin/ttfm.sh:chinese/ttfm
 .endif
 
 check-makefile: check-makefile-ttf
diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile
index 161bb338db79..8c649c8cbbb1 100644
--- a/chinese/xpdf/Makefile
+++ b/chinese/xpdf/Makefile
@@ -16,11 +16,11 @@ DIST_SUBDIR=	${PORTNAME}-chinese-${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Chinese font support for xpdf
 
-RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
-		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${FONTSDIR}/STHeiti-Regular:${PORTSDIR}/chinese/font-std \
-		${FONTSDIR}/STSong-Light:${PORTSDIR}/chinese/font-std \
-		${FONTSDIR}/MSung-Light:${PORTSDIR}/chinese/font-std
+RUN_DEPENDS=	xpdf:graphics/xpdf \
+		${ADOBECMAPDIR}/ai0/CMap/Identity-H:print/adobe-cmaps \
+		${FONTSDIR}/STHeiti-Regular:chinese/font-std \
+		${FONTSDIR}/STSong-Light:chinese/font-std \
+		${FONTSDIR}/MSung-Light:chinese/font-std
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile
index b229039a2445..c5d76be256b8 100644
--- a/comms/acfax/Makefile
+++ b/comms/acfax/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Receive faxes using sound card and radio
 
-LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 
 PLIST_FILES=	bin/acfax
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 3be10c652a6d..dcb59d818633 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	lambert@lambertfam.org
 COMMENT=	Morse code training program
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:audio/libao
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/comms/amtterm/Makefile b/comms/amtterm/Makefile
index 19bbb98470c8..0958ace7ddcb 100644
--- a/comms/amtterm/Makefile
+++ b/comms/amtterm/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Serial-over-lan client for Intel AMT
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite
+RUN_DEPENDS=	p5-SOAP-Lite>=0.5:net/p5-SOAP-Lite
 
 USES=		gmake dos2unix shebangfix
 DOS2UNIX_FILES=	RedirectionConstants.h
diff --git a/comms/anyremote/Makefile b/comms/anyremote/Makefile
index 62a1993871c3..40077a1b457e 100644
--- a/comms/anyremote/Makefile
+++ b/comms/anyremote/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS DBUS X11
 OPTIONS_DEFAULT=	DBUS X11
 
 DBUS_CONFIGURE_ENABLE=dbus
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 
 X11_CONFIGURE_ENABLE=xtest
 X11_USE=	XORG=x11,xtst
diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile
index 30605ea75b93..c98a306b277a 100644
--- a/comms/atslog/Makefile
+++ b/comms/atslog/Makefile
@@ -48,14 +48,14 @@ USE_PHP+=	pgsql
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
-BUILD_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+BUILD_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
-BUILD_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
+BUILD_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
+RUN_DEPENDS+=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 .endif
 
 .if ! ${PORT_OPTIONS:MLIBWRAP}
diff --git a/comms/chirp/Makefile b/comms/chirp/Makefile
index 46a53934813f..36c4835bb90b 100644
--- a/comms/chirp/Makefile
+++ b/comms/chirp/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${CHIRP_DEPENDS}
 RUN_DEPENDS=	${CHIRP_DEPENDS}
-CHIRP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \
-		${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial
+CHIRP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 \
+		${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial
 
 USES=		desktop-file-utils gettext python
 USE_PYTHON=	distutils
diff --git a/comms/concordance/Makefile b/comms/concordance/Makefile
index aa048cd980fd..cf0f98b2b639 100644
--- a/comms/concordance/Makefile
+++ b/comms/concordance/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Command-line Logitech Harmony configuration tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libconcord.so:${PORTSDIR}/comms/libconcord
+LIB_DEPENDS=	libconcord.so:comms/libconcord
 
 USES=		tar:bzip2
 WRKSRC_SUBDIR=	${PORTNAME}
diff --git a/comms/congruity/Makefile b/comms/congruity/Makefile
index 70b56e96f19c..d73bbe87b32a 100644
--- a/comms/congruity/Makefile
+++ b/comms/congruity/Makefile
@@ -12,7 +12,7 @@ COMMENT=	GUI Logitech Harmony configuration tool
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libconcord>=0:${PORTSDIR}/comms/py-libconcord
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord
 
 MAKE_ARGS=	MANDIR=${PREFIX}/man
 USES=		desktop-file-utils gmake tar:bzip2 python:2.7+
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 02aaeb2ebd49..a0ff2708a257 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -13,8 +13,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Manage remote serial consoles via TCP/IP
 
-BUILD_DEPENDS=	makeme:${PORTSDIR}/devel/msrc0 \
-		mkcmd:${PORTSDIR}/devel/mkcmd
+BUILD_DEPENDS=	makeme:devel/msrc0 \
+		mkcmd:devel/mkcmd
 
 CONFLICTS_INSTALL=	conserver-com-[0-9]*
 
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 0c628c0f17b7..30711e9e5b35 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
-LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+BUILD_DEPENDS=	lazbuild:editors/lazarus
+LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
@@ -35,11 +35,11 @@ OPTIONS_SINGLE_LCL=	GTK2 QT4
 OPTIONS_DEFAULT=	GTK2
 
 GTK2_USE=	fpc=gtk2 gnome=gtk20
-GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2
 GTK2_MAKE_ARGS=	PLATFORM=gtk2
 
-QT4_LIB_DEPENDS=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
-QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
+QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
+QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:editors/lazarus-lcl-qt
 QT4_MAKE_ARGS=	PLATFORM=qt
 
 post-extract:
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
index ce573a190759..964ff01ac6fd 100644
--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://cutecom.sourceforge.net/
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Graphical serial terminal
 
-RUN_DEPENDS=	lsz:${PORTSDIR}/comms/lrzsz
+RUN_DEPENDS=	lsz:comms/lrzsz
 
 USE_QT4=	qt3support qmake_build moc_build rcc_build uic_build
 USES=		cmake
diff --git a/comms/cwdaemon/Makefile b/comms/cwdaemon/Makefile
index 4bdf1d6101b3..6282b7a261e0 100644
--- a/comms/cwdaemon/Makefile
+++ b/comms/cwdaemon/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Amateur Radio cw (Morse code) keyer daemon
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcw.so:${PORTSDIR}/comms/unixcw
+LIB_DEPENDS=	libcw.so:comms/unixcw
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc
 
 GNU_CONFIGURE=	yes
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index e8316c609fb1..868e5eaf1773 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -13,13 +13,13 @@ COMMENT=	DAB/DAB+ and wideband FM receiver for RTL2832-based USB sticks
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	librtlsdr.so:comms/rtl-sdr \
+		libqwt.so:x11-toolkits/qwt5 \
+		libportaudio.so:audio/portaudio \
+		libsndfile.so:audio/libsndfile \
+		libavcodec.so:multimedia/ffmpeg \
+		libfftw3.so:math/fftw3 \
+		libfaad.so:audio/faad
 
 USES=		tar:tgz
 USE_QT4=	gui qt3support qmake_build moc_build rcc_build uic_build
diff --git a/comms/dcf77pi/Makefile b/comms/dcf77pi/Makefile
index c5da76a470b6..ac9148a29dbf 100644
--- a/comms/dcf77pi/Makefile
+++ b/comms/dcf77pi/Makefile
@@ -15,7 +15,7 @@ GH_ACCOUNT=	rene0
 
 OPTIONS_DEFINE=	DOXYGEN
 
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_ALL_TARGET=	all doxygen
 
 USES=		ncurses
diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile
index 6b0cef05b62e..5740fa80d90c 100644
--- a/comms/deforaos-phone/Makefile
+++ b/comms/deforaos-phone/Makefile
@@ -14,15 +14,15 @@ COMMENT=	DeforaOS telephony application
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libSystem.so:${PORTSDIR}/devel/deforaos-libsystem \
-		libDesktop.so:${PORTSDIR}/x11/deforaos-libdesktop \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libpurple.so:${PORTSDIR}/net-im/libpurple \
-		libsofia-sip-ua.so:${PORTSDIR}/net/sofia-sip
-BUILD_DEPENDS=	locker:${PORTSDIR}/x11/deforaos-locker \
-		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
+		libDesktop.so:x11/deforaos-libdesktop \
+		libpulse.so:audio/pulseaudio \
+		libpurple.so:net-im/libpurple \
+		libsofia-sip-ua.so:net/sofia-sip
+BUILD_DEPENDS=	locker:x11/deforaos-locker \
+		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
+		xsltproc:textproc/libxslt \
+		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 USES=		desktop-file-utils gettext pkgconfig
 USE_GNOME=	gtk20
diff --git a/comms/dump1090/Makefile b/comms/dump1090/Makefile
index 13821e8d4b58..64ff6ae3a5b2 100644
--- a/comms/dump1090/Makefile
+++ b/comms/dump1090/Makefile
@@ -14,7 +14,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	antirez
 GH_TAGNAME=	4c53e25
 
-LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr
+LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr
 
 USES=	gmake
 
diff --git a/comms/dump1090_mr/Makefile b/comms/dump1090_mr/Makefile
index 62595ecc8451..82db5447b906 100644
--- a/comms/dump1090_mr/Makefile
+++ b/comms/dump1090_mr/Makefile
@@ -13,7 +13,7 @@ BROKEN=		unfetchable
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr
+LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile
index fa09a311b696..a6cf129bab92 100644
--- a/comms/ebook2cw/Makefile
+++ b/comms/ebook2cw/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Convert text files into cw as an mp3 or ogg file
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
-		libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libvorbis.so:audio/libvorbis
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/comms/ebook2cwgui/Makefile b/comms/ebook2cwgui/Makefile
index 3224d0ed1a3e..58142341bc36 100644
--- a/comms/ebook2cwgui/Makefile
+++ b/comms/ebook2cwgui/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://fkurz.net/ham/ebook2cw/ \
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	gui front end for ebooks2cw
 
-RUN_DEPENDS=	ebook2cw:${PORTSDIR}/comms/ebook2cw
+RUN_DEPENDS=	ebook2cw:comms/ebook2cw
 
 USE_WX=	2.8
 WX_UNICODE=	yes
diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile
index b6425c1c5d50..39697ef944fd 100644
--- a/comms/echolinux/Makefile
+++ b/comms/echolinux/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Amateur Radio Echolink client for UNIX
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libforms.so:${PORTSDIR}/x11-toolkits/xforms \
-		libgsm.so:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libforms.so:x11-toolkits/xforms \
+		libgsm.so:audio/gsm
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index 7b048bb46fae..98a4b8b69a80 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -13,9 +13,9 @@ COMMENT=	GUI frontend for efax program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12 \
-		libcxx-gtk-utils-2-2.2.so:${PORTSDIR}/x11-toolkits/c++-gtk-utils
-RUN_DEPENDS=	ggv:${PORTSDIR}/print/ggv
+LIB_DEPENDS=	libsigc-1.2.so:devel/libsigc++12 \
+		libcxx-gtk-utils-2-2.2.so:x11-toolkits/c++-gtk-utils
+RUN_DEPENDS=	ggv:print/ggv
 
 USES=		compiler:c++11-lib ghostscript:run pkgconfig
 USE_GNOME=	gtk20
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 9e92f1e01835..4c3e09526be3 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Fax send/receive program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage
+RUN_DEPENDS=	xloadimage:x11/xloadimage
 
 DOCSDIR=	${PREFIX}/share/doc/efax
 PORTDOCS=	README printcap.sample efax.html fax.html
diff --git a/comms/fl_moxgen/Makefile b/comms/fl_moxgen/Makefile
index 9295a63cfdb3..a50e5218695e 100644
--- a/comms/fl_moxgen/Makefile
+++ b/comms/fl_moxgen/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Compute the dimensions of a Moxon Rectangle antenna
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 DESKTOP_ENTRIES=	"Fl_MoxGen" "${COMMENT}" "" "${PORTNAME}" \
 			"Network;HamRadio;" false
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	PDF
 OPTIONS_DEFAULT=	PDF
 PDF_DESC=	Enable PDF Writing (requires libharu)
 
-PDF_LIB_DEPENDS=	libhpdf.so:${PORTSDIR}/print/libharu
+PDF_LIB_DEPENDS=	libhpdf.so:print/libharu
 PDF_ALL_TARGET=	fl_moxgen
 PDF_ALL_TARGET_OFF=	fl_moxgen_no_pdf
 
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 991b547c8787..e2c8fa60a815 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Digital decoder for psk, cw, psk31, olivia
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc\
-		docbook-xsl>=1.0:${PORTSDIR}/textproc/docbook-xsl\
-		xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate\
-		libboost_system.so:${PORTSDIR}/devel/boost-libs\
-		libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc\
+		docbook-xsl>=1.0:textproc/docbook-xsl\
+		xsltproc:textproc/libxslt
+LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate\
+		libboost_system.so:devel/boost-libs\
+		libfltk.so:x11-toolkits/fltk
 
 USE_CXXSTD=	gnu++0x
 GNU_CONFIGURE=	yes
@@ -42,13 +42,13 @@ NATIVE_OPT_CONFIGURE_OFF=	--enable-optimizations=none
 FLARQ_CONFIGURE_ENABLE=		flarq
 OSS_CONFIGURE_ENABLE=		oss
 SNDFILE_CONFIGURE_WITH=		sndfile
-SNDFILE_LIB_DEPENDS=		libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 PORTAUDIO_CONFIGURE_WITH=	portaudio
-PORTAUDIO_LIB_DEPENDS=		libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=		libportaudio.so:audio/portaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
-PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 HAMLIB_CONFIGURE_WITH=		hamlib
-HAMLIB_LIB_DEPENDS=		libhamlib.so:${PORTSDIR}/comms/hamlib
+HAMLIB_LIB_DEPENDS=		libhamlib.so:comms/hamlib
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext
 
diff --git a/comms/fllog/Makefile b/comms/fllog/Makefile
index edc31945006c..19e29168d2b2 100644
--- a/comms/fllog/Makefile
+++ b/comms/fllog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ham Radio logging program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/comms/flrig/Makefile b/comms/flrig/Makefile
index e7748238638a..a6ca8385d9a6 100644
--- a/comms/flrig/Makefile
+++ b/comms/flrig/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ham Radio rig control program, cooperates with fldigi
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/comms/flwrap/Makefile b/comms/flwrap/Makefile
index 6584bf8a2f07..4143e499b6c8 100644
--- a/comms/flwrap/Makefile
+++ b/comms/flwrap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Flwrap is a companion utility for fldigi
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake dos2unix
 GNU_CONFIGURE=	yes
diff --git a/comms/freedv/Makefile b/comms/freedv/Makefile
index c25d8ee2e96b..0f320fa149dd 100644
--- a/comms/freedv/Makefile
+++ b/comms/freedv/Makefile
@@ -9,13 +9,13 @@ MASTER_SITES=	http://files.freedv.org/freedv/ \
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Narrow band digital voice
 
-LIB_DEPENDS=	libcodec2.so:${PORTSDIR}/audio/codec2 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libhamlib.so:${PORTSDIR}/comms/hamlib \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsox.so:${PORTSDIR}/audio/sox \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+LIB_DEPENDS=	libcodec2.so:audio/codec2 \
+		libportaudio.so:audio/portaudio \
+		libhamlib.so:comms/hamlib \
+		libsamplerate.so:audio/libsamplerate \
+		libsox.so:audio/sox \
+		libsndfile.so:audio/libsndfile \
+		libspeexdsp.so:audio/speexdsp
 
 USE_WX=		3.0+
 USES=		cmake:outsource compiler:c++11-lib tar:xz
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index c2325c71742d..57e477c9c6d9 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GNU All Mobile Management Utilities
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 CONFLICTS=	gammu-devel-[1-9]* gammu-python-[1-9]*
 
@@ -30,7 +30,7 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	BASH
 
-BASH_BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BASH_BUILD_DEPENDS=	bash:shells/bash
 BASH_RUN_DEPENDS=	${BASH_BUILD_DEPENDS}
 BASH_PLIST_FILES=	etc/bash_completion.d/gammu
 BASH_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-contrib_CMakeLists.txt
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index d73ced4749a4..56c7a40d5e38 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Geodetic computer for amateur radio use
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USES=		gmake
 MAKEFILE=	makefile
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index 2c304fecc602..ff7ca04122ba 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -15,7 +15,7 @@ COMMENT=	The Gnome MFSK terminal program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
+LIB_DEPENDS=	libfftw.so:math/fftw
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -33,7 +33,7 @@ OPTIONS_DEFINE=	HAMLIB
 HAMLIB_DESC=	Enable HAMLIB Support
 OPTIONS_DEFAULT=	HAMLIB
 
-HAMLIB_LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+HAMLIB_LIB_DEPENDS=	libhamlib.so:comms/hamlib
 HAMLIB_CONFIGURE_ENABLE=	hamlib
 HAMLIB_CONFIGURE_ENV=	PKG_CONFIG_PATH=${LOCALBASE}/lib/pkgconfig
 
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 96f5fa4471e5..37c0fc39af49 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.gnokii.org/download/gnocky/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical (GTK+2) frontend for gnokii
 
-LIB_DEPENDS=	libgnokii.so:${PORTSDIR}/comms/gnokii
+LIB_DEPENDS=	libgnokii.so:comms/gnokii
 
 USES=		pkgconfig tar:bzip2
 USE_GNOME=	gtk20 libglade2
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 95a232cb6d25..4f61242cfee7 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Tools to talk to GSM cellular phones
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
 GROUPS=		${PORTNAME}
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
@@ -46,10 +46,10 @@ SMSDDB_DESC=	Enable database support in smsd (select one or more)
 X11_DESC=	Build graphical version (xgnokii)
 
 ICAL_CONFIGURE_ENABLE=	libical
-ICAL_LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+ICAL_LIB_DEPENDS=	libical.so:devel/libical
 USB_CONFIGURE_ENABLE=	libusb
 PCSC_CONFIGURE_ENABLE=	libpcsclite
-PCSC_LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
+PCSC_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 .include <bsd.port.options.mk>
 
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--disable-postgres
 PLIST_SUB+=	PGM='@comment '
 . endif
 . if ${PORT_OPTIONS:MSQLITE}
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 PLIST_SUB+=	SQLT=''
 . else
 CONFIGURE_ARGS+=	--disable-sqlite
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 3841338bed81..0f2657cc94b1 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -11,26 +11,26 @@ COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	sdl-config:${PORTSDIR}/devel/sdl12 \
-		swig2.0:${PORTSDIR}/devel/swig20 \
-		cheetah:${PORTSDIR}/devel/py-cheetah \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}qt4>0:${PORTSDIR}/devel/py-qt4 \
-		xdg-open:${PORTSDIR}/devel/xdg-utils \
-		guile:${PORTSDIR}/lang/guile \
-		aconnect:${PORTSDIR}/audio/alsa-utils \
-		git:${PORTSDIR}/devel/git \
+BUILD_DEPENDS=	sdl-config:devel/sdl12 \
+		swig2.0:devel/swig20 \
+		cheetah:devel/py-cheetah \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}qt4>0:devel/py-qt4 \
+		xdg-open:devel/xdg-utils \
+		guile:lang/guile \
+		aconnect:audio/alsa-utils \
+		git:devel/git \
 		${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem
-LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libjack.so:${PORTSDIR}/audio/jack \
-		libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libgsl.so:${PORTSDIR}/math/gsl
+		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem
+LIB_DEPENDS=	libcppunit.so:devel/cppunit \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libqwt.so:x11-toolkits/qwt5 \
+		libboost_python.so:devel/boost-python-libs \
+		libportaudio.so:audio/portaudio \
+		libjack.so:audio/jack \
+		libasound.so:audio/alsa-lib \
+		libgsl.so:math/gsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 # USES=compiler:c11 is necessary because base GCC fails:
@@ -70,11 +70,11 @@ TESTING_DESC=	Include testing support
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
-			dot:${PORTSDIR}/graphics/graphviz \
-			xmlto:${PORTSDIR}/textproc/xmlto \
-			freefont-ttf>0:${PORTSDIR}/x11-fonts/freefont-ttf
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			${LOCALBASE}/bin/sphinx-apidoc:textproc/py-sphinx \
+			dot:graphics/graphviz \
+			xmlto:textproc/xmlto \
+			freefont-ttf>0:x11-fonts/freefont-ttf
 DOCS_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON" \
 		-DENABLE_BAD_BOOST="ON"
@@ -85,11 +85,11 @@ HAVE_PORTDOCS=	YES
 
 USRP_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 USRP_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
-USRP_BUILD_DEPENDS=	${LOCALBASE}/include/uhd/config.hpp:${PORTSDIR}/comms/usrp
+USRP_BUILD_DEPENDS=	${LOCALBASE}/include/uhd/config.hpp:comms/usrp
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
-TESTING_BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
+TESTING_BUILD_DEPENDS=	cppunit-config:devel/cppunit
 
 .include <bsd.port.pre.mk>
 
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index fa50925aaf2a..7d289355553d 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Amateur Radio satellite tracking and prediction
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
-		libcurl.so:${PORTSDIR}/ftp/curl \
-		libgoocanvas.so:${PORTSDIR}/graphics/goocanvas
+LIB_DEPENDS=	libhamlib.so:comms/hamlib \
+		libcurl.so:ftp/curl \
+		libgoocanvas.so:graphics/goocanvas
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index 24dc19600766..e66a11dfe730 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Software defined radio receiver powered by GNU Radio and Qt
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgnuradio-runtime.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-analog.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-blocks.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-filter.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-fft.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-audio.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-digital.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-pmt.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-osmosdr.so:${PORTSDIR}/comms/gr-osmosdr \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
+		libgnuradio-analog.so:comms/gnuradio \
+		libgnuradio-blocks.so:comms/gnuradio \
+		libgnuradio-filter.so:comms/gnuradio \
+		libgnuradio-fft.so:comms/gnuradio \
+		libgnuradio-audio.so:comms/gnuradio \
+		libgnuradio-digital.so:comms/gnuradio \
+		libgnuradio-pmt.so:comms/gnuradio \
+		libgnuradio-osmosdr.so:comms/gr-osmosdr \
+		libpulse.so:audio/pulseaudio \
+		libpulse-simple.so:audio/pulseaudio
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	csete
diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile
index 7ee60cb5c635..3bcb01946299 100644
--- a/comms/gr-osmosdr/Makefile
+++ b/comms/gr-osmosdr/Makefile
@@ -11,13 +11,13 @@ COMMENT=	GNU Radio OsmoSDR module
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
-		cheetah:${PORTSDIR}/devel/py-cheetah
-LIB_DEPENDS=	libgnuradio-runtime.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-pmt.so:${PORTSDIR}/comms/gnuradio \
-		libgnuradio-blocks.so:${PORTSDIR}/comms/gnuradio \
-		libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	swig:devel/swig13 \
+		cheetah:devel/py-cheetah
+LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
+		libgnuradio-pmt.so:comms/gnuradio \
+		libgnuradio-blocks.so:comms/gnuradio \
+		libboost_system.so:devel/boost-libs \
+		libboost_thread.so:devel/boost-libs
 
 USES=	cmake pkgconfig python tar:tgz
 USE_LDCONFIG=	yes
@@ -31,7 +31,7 @@ CMAKE_ARGS+=	-DENABLE_DEFAULT:BOOL=OFF \
 OPTIONS_DEFINE=	RTLSDR
 RTLSDR_DESC=	Enable rtl-sdr (RTL2832) support
 OPTIONS_DEFAULT=	RTLSDR
-RTLSDR_LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr
+RTLSDR_LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr
 RTLSDR_CMAKE_ON=	-DENABLE_RTL:BOOL=ON -DENABLE_RTL_TCP:BOOL=ON
 
 .include <bsd.port.mk>
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index 54b925125a88..5d022533ba2a 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Amateur Radio control front-end
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USE_GNOME=	gtk20 intltool
 GNU_CONFIGURE=	yes
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index c26c86f3a3ab..9bcba7b02841 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	SF
 MAINTAINER=	svmohr@gmail.com
 COMMENT=	Graphical frontend for scmxx
 
-RUN_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk
-BUILD_DEPENDS=	p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk \
-		scmxx:${PORTSDIR}/comms/scmxx \
-		convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-Gtk>=0:x11-toolkits/p5-Gtk
+BUILD_DEPENDS=	p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-Gtk>=0:x11-toolkits/p5-Gtk \
+		scmxx:comms/scmxx \
+		convert:graphics/ImageMagick
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/comms/gtkmmorse/Makefile b/comms/gtkmmorse/Makefile
index 7a8374bde7d0..f6a83ed7dfb1 100644
--- a/comms/gtkmmorse/Makefile
+++ b/comms/gtkmmorse/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	shurd@FreeBSD.org
 COMMENT=	Graphical Morse Code Trainer
 
-LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26
+LIB_DEPENDS=	libao.so:audio/libao \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24 \
+		libgconfmm-2.6.so:devel/gconfmm26
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig tar:bzip2
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 8cd281c493de..7c7589f4db65 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	QT application for sending and receiving facsimiles over radio
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 
 USE_QT4=	gui moc_build
 GNU_CONFIGURE=	yes
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 84beb63d96c9..389e7572c653 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 
 LICENSE=	LGPL20
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+BUILD_DEPENDS=	swig:devel/swig13
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 INFO=		hamlib
 USES=		autoreconf libtool:keepla pathfix perl5 pkgconfig python shebangfix tcl
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index d235f41540ac..40eda1639cbf 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Amateur Radio soundcard fsk, pactor 1, amtor, gtor, mt63
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	whiptail:${PORTSDIR}/devel/newt
+RUN_DEPENDS=	whiptail:devel/newt
 
 USE_GNOME=	gtk12
 USES=		gmake
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 80abcce1298f..45f2721cf7e6 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Fax software
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjbig.so:${PORTSDIR}/graphics/jbigkit
+BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:print/afm
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libjbig.so:graphics/jbigkit
 
 MAKE_JOBS_UNSAFE=	yes
 HAS_CONFIGURE=	yes
@@ -47,8 +47,8 @@ GAWK_DESC=	Use gawk for scripts
 PAM_CONFIGURE_OFF=	--disable-pam
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-GAWK_BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-GAWK_RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
+GAWK_BUILD_DEPENDS=	gawk:lang/gawk
+GAWK_RUN_DEPENDS=	gawk:lang/gawk
 GAWK_CONFIGURE_ON=	--with-AWK="${LOCALBASE}/bin/gawk"
 DOCS_CONFIGURE_ON=	--with-HTML=yes
 
diff --git a/comms/java-commapi-freebsd/Makefile b/comms/java-commapi-freebsd/Makefile
index ceb53775c0da..b63b74e3ee29 100644
--- a/comms/java-commapi-freebsd/Makefile
+++ b/comms/java-commapi-freebsd/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	freebsd-commapi-${PORTVERSION}
 MAINTAINER=	ari.suutari@syncrontech.com
 COMMENT=	Java Communication API for FreeBSD
 
-BUILD_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi
-RUN_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:${PORTSDIR}/comms/java-commapi
+BUILD_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:comms/java-commapi
+RUN_DEPENDS=	${JDKDIR}/jre/lib/ext/comm.jar:comms/java-commapi
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/comms/jsdr/Makefile b/comms/jsdr/Makefile
index c3bd382aa8ee..c2285e1d06d2 100644
--- a/comms/jsdr/Makefile
+++ b/comms/jsdr/Makefile
@@ -13,11 +13,11 @@ COMMENT=	SDR tools for RTL2832-based USB sticks
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libfftw3.so:${PORTSDIR}/math/fftw3
+LIB_DEPENDS+=	libqwt.so:x11-toolkits/qwt5 \
+		libportaudio.so:audio/portaudio \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libfftw3.so:math/fftw3
 
 USES=		tar:tgz
 USE_QT4=	gui qt3support qmake_build moc_build rcc_build uic_build
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index ccef3f42e13a..8d10f28c4737 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE frontend for your remote controls
 
-RUN_DEPENDS=	lircd:${PORTSDIR}/comms/lirc
+RUN_DEPENDS=	lircd:comms/lirc
 
 USE_KDE4=	kdeprefix automoc4 kdelibs
 USES=		cmake:outsource tar:xz
diff --git a/comms/kvasd/Makefile b/comms/kvasd/Makefile
index 610293859411..286152bd8708 100644
--- a/comms/kvasd/Makefile
+++ b/comms/kvasd/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 BUILD_DEPENDS=	${KVASD_DEPENDS}
 RUN_DEPENDS=	${KVASD_DEPENDS}
 
-KVASD_DEPENDS=	linux-${USE_LINUX}-libgfortran>0:${PORTSDIR}/devel/linux-c6-libgfortran
+KVASD_DEPENDS=	linux-${USE_LINUX}-libgfortran>0:devel/linux-c6-libgfortran
 USE_LINUX=	c6
 NO_BUILD=	yes
 PLIST_FILES=	bin/kvasd
diff --git a/comms/libcodec2/Makefile b/comms/libcodec2/Makefile
index 46229bc5fb0b..c2af50ff7c23 100644
--- a/comms/libcodec2/Makefile
+++ b/comms/libcodec2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Codec 2 speech codec
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+LIB_DEPENDS=	libspeexdsp.so:audio/speexdsp
 
 USE_LDCONFIG=	yes
 USES=		cmake:outsource tar:xz
diff --git a/comms/libconcord/Makefile b/comms/libconcord/Makefile
index 9dac5f822c2a..8be1d077fa09 100644
--- a/comms/libconcord/Makefile
+++ b/comms/libconcord/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Logitech Harmony configuration library
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconf
-LIB_DEPENDS=	libhidapi.so:${PORTSDIR}/comms/hidapi \
-		libzip.so:${PORTSDIR}/archivers/libzip
+BUILD_DEPENDS=	pkg-config:devel/pkgconf
+LIB_DEPENDS=	libhidapi.so:comms/hidapi \
+		libzip.so:archivers/libzip
 
 USE_LDCONFIG=	yes
 USES=		tar:bzip2 libtool shared-mime-info
diff --git a/comms/libimobiledevice/Makefile b/comms/libimobiledevice/Makefile
index f1e0cbc90ee1..eb6a7b3e6a89 100644
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@@ -24,8 +24,8 @@ INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == no
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
-		libusbmuxd.so:${PORTSDIR}/comms/libusbmuxd
+LIB_DEPENDS=	libplist.so:devel/libplist \
+		libusbmuxd.so:comms/libusbmuxd
 
 USE_GNOME=	glib20
 CONFIGURE_ARGS+=--without-cython
diff --git a/comms/libsdr-gui/Makefile b/comms/libsdr-gui/Makefile
index 82c90bc4b5b7..442029b9f388 100644
--- a/comms/libsdr-gui/Makefile
+++ b/comms/libsdr-gui/Makefile
@@ -10,9 +10,9 @@ COMMENT=	GUI functions (e.g. waterfall) for libsdr library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsdr.so:${PORTSDIR}/comms/libsdr
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libsdr.so:comms/libsdr
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hmatuschek
diff --git a/comms/libsdr/Makefile b/comms/libsdr/Makefile
index 39fe5efcaec2..6b9d3be93e39 100644
--- a/comms/libsdr/Makefile
+++ b/comms/libsdr/Makefile
@@ -10,10 +10,10 @@ COMMENT=	Simple software defined radio (SDR) library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		librtlsdr.so:${PORTSDIR}/comms/rtl-sdr
+LIB_DEPENDS=	libportaudio.so:audio/portaudio \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		librtlsdr.so:comms/rtl-sdr
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hmatuschek
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index fef05fb5952b..57dc5047280f 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -11,9 +11,9 @@ COMMENT=	TI calculator library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libticables2.so:${PORTSDIR}/comms/libticables2	\
-		libticonv.so:${PORTSDIR}/converters/libticonv	\
-		libtifiles2.so:${PORTSDIR}/devel/libtifiles2
+LIB_DEPENDS=	libticables2.so:comms/libticables2	\
+		libticonv.so:converters/libticonv	\
+		libtifiles2.so:devel/libtifiles2
 
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/comms/libusbmuxd/Makefile b/comms/libusbmuxd/Makefile
index 2b974b136c3e..3334404622b0 100644
--- a/comms/libusbmuxd/Makefile
+++ b/comms/libusbmuxd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Communication interface library for usbmuxd
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist
+LIB_DEPENDS=	libplist.so:devel/libplist
 
 CONFLICTS_INSTALL=usbmuxd-1.0.[6-8]
 
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS INOTIFY
 
 INOTIFY_DESC=	Use inotify instead of polling (saves energy)
 
-INOTIFY_LIB_DEPENDS=	libinotify.so:${PORTSDIR}/devel/libinotify
+INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 # *_CONFIGURE_WITH can't be used as --with-inotify doesn't work.
 INOTIFY_CONFIGURE_OFF=	--without-inotify
 INOTIFY_CFLAGS=		-I${LOCALBASE}/include
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 8a1ddad5e474..5319d9623ede 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -8,8 +8,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Simple Qt PSK31, RTTY, and MSK31 client
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libasound.so:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libasound.so:audio/alsa-lib
 
 USES=		qmake tar:tgz
 USE_QT4=	gui network corelib moc_build uic_build rcc_build qmake_build
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 4399544e765d..191433fbdf30 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -13,10 +13,10 @@ EXTRACT_SUFX=	.tbz
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio DSP utility (SDR)
 
-LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libftdi.so:${PORTSDIR}/devel/libftdi
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr \
+		libportaudio.so:audio/portaudio \
+		libftdi.so:devel/libftdi
+BUILD_DEPENDS=	nasm:devel/nasm
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0${PORTVERSION}
 
diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
index a458b3ab068b..163b67d1fc00 100644
--- a/comms/lirc/Makefile
+++ b/comms/lirc/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF/${PORTNAME}/LIRC/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux Infrared Remote Control
 
-BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
+BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 
 INSTALL_TARGET=	install-strip
 USES=		alias autoreconf gmake libtool python tar:bzip2
@@ -36,20 +36,20 @@ PORTEXAMPLES=	remotes
 SUB_FILES=	pkg-message lircd.conf
 
 .if exists(${LOCALBASE}/lib/libvga.so.1)
-LIB_DEPENDS+=	libvga.so:${PORTSDIR}/graphics/svgalib
+LIB_DEPENDS+=	libvga.so:graphics/svgalib
 PLIST_SUB+=	SMODE2=
 .else
 PLIST_SUB+=	SMODE2="@comment "
 .endif
 
-MINIMAL_LIB_DEPENDS_OFF=		libftdi.so:${PORTSDIR}/devel/libftdi \
-			libirman.so:${PORTSDIR}/comms/libirman
+MINIMAL_LIB_DEPENDS_OFF=		libftdi.so:devel/libftdi \
+			libirman.so:comms/libirman
 MINIMAL_CONFIGURE_OFF=	--with-driver=userspace
 MINIMAL_CONFIGURE_ON=	--with-driver=dvico
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
-UARTLIRC_RUN_DEPENDS=		uartlirc>=0.3:${PORTSDIR}/comms/uartlirc
+UARTLIRC_RUN_DEPENDS=		uartlirc>=0.3:comms/uartlirc
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/comms/lysdr/Makefile b/comms/lysdr/Makefile
index 75b6f931ef82..c8ddcd863ba9 100644
--- a/comms/lysdr/Makefile
+++ b/comms/lysdr/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Lysdr SDR program for Unix
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libjack.so:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libjack.so:audio/jack
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gordonjcp
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 69a4a06d1755..84e9abe84687 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/3977/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	MS-DOS Telix serial communication program "workalike"
 
-RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
+RUN_DEPENDS=	lrz:comms/lrzsz
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
diff --git a/comms/morse/Makefile b/comms/morse/Makefile
index facb60b40af8..ed88511fcf03 100644
--- a/comms/morse/Makefile
+++ b/comms/morse/Makefile
@@ -31,7 +31,7 @@ X11_CFLAGS=	-I${LOCALBASE}/include
 X11_LDFLAGS=	-L${LOCALBASE}/lib
 
 PULSEAUDIO_MAKE_ARGS=	DEVICE=PA
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_USES=	pkgconfig
 
 do-install:
diff --git a/comms/nec2c/Makefile b/comms/nec2c/Makefile
index a08ca2e97c79..cbf7fdb30f57 100644
--- a/comms/nec2c/Makefile
+++ b/comms/nec2c/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	nec2c
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Used to calculate antenna patterns useful to ham radio
 
-LIB_DEPENDS=	libccm.so:${PORTSDIR}/math/ccmath
+LIB_DEPENDS=	libccm.so:math/ccmath
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/comms/nokryptia/Makefile b/comms/nokryptia/Makefile
index 3c99c97e89bf..6dfbbb02dbe8 100644
--- a/comms/nokryptia/Makefile
+++ b/comms/nokryptia/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://tuxmobil.org/software/nokryptia/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for fast loading mp3s into Nokia 5510
 
-LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS=	libid3.so:audio/id3lib
 
 GNU_CONFIGURE=	yes
 USES=	tar:bzip2
diff --git a/comms/o2sms/Makefile b/comms/o2sms/Makefile
index f5faf6c37b4a..87f121467b75 100644
--- a/comms/o2sms/Makefile
+++ b/comms/o2sms/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	CPAN/WWW/MACKERS \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Send SMS messages via the websites of Irish mobile operators
 
-BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
-		p5-Lingua-EN-Squeeze>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Squeeze \
-		p5-TestGen4Web-Runner>=0:${PORTSDIR}/www/p5-TestGen4Web-Runner
+BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay \
+		p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
+		p5-Lingua-EN-Squeeze>=0:textproc/p5-Lingua-EN-Squeeze \
+		p5-TestGen4Web-Runner>=0:www/p5-TestGen4Web-Runner
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index 928d5d523eca..e49837a6ff8c 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://people.freebsd.org/~emax/obexapp/
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Obex application to transfer objects to mobile equipment
 
-LIB_DEPENDS=	libopenobex.so:${PORTSDIR}/comms/openobex \
-		libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libopenobex.so:comms/openobex \
+		libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index a4cbbcfe2ffc..73b9e70a82a5 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFAULT+=	DOXYGEN
 .endif
 
 OPTIONS_SUB=yes
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CMAKE_OFF=	-DBUILD_DOCUMENTATION=OFF
 
 .include <bsd.port.mk>
diff --git a/comms/owfs/Makefile b/comms/owfs/Makefile
index ef0dc2988bd2..9d6efdefcb03 100644
--- a/comms/owfs/Makefile
+++ b/comms/owfs/Makefile
@@ -100,7 +100,7 @@ PLIST_SUB+=			OWNETPYTHON="@comment "
 
 # If Perl, Python or PHP is requested, enable SWIG
 .if ${PORT_OPTIONS:MOWPERL} || ${PORT_OPTIONS:MOWPYTHON} || ${PORT_OPTIONS:MOWPHP}
-BUILD_DEPENDS+=			${LOCALBASE}/bin/swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS+=			${LOCALBASE}/bin/swig2.0:devel/swig20
 CONFIGURE_ARGS+=		--enable-swig SWIG=${LOCALBASE}/bin/swig2.0
 .else
 CONFIGURE_ARGS+=		--disable-swig
diff --git a/comms/p5-Cisco-UCS/Makefile b/comms/p5-Cisco-UCS/Makefile
index 2372340afb4e..4a4164d94a00 100644
--- a/comms/p5-Cisco-UCS/Makefile
+++ b/comms/p5-Cisco-UCS/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Perl interface to the Cisco UCS XML API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-XML-Simple>=0:textproc/p5-XML-Simple \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-Device-Gsm/Makefile b/comms/p5-Device-Gsm/Makefile
index aeb5320605e6..8f8262c889cc 100644
--- a/comms/p5-Device-Gsm/Makefile
+++ b/comms/p5-Device-Gsm/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to GSM phones/modems on serial ports
 
-BUILD_DEPENDS=	p5-Device-Modem>=0:${PORTSDIR}/comms/p5-Device-Modem
-RUN_DEPENDS=	p5-Device-Modem>=0:${PORTSDIR}/comms/p5-Device-Modem
+BUILD_DEPENDS=	p5-Device-Modem>=0:comms/p5-Device-Modem
+RUN_DEPENDS=	p5-Device-Modem>=0:comms/p5-Device-Modem
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/comms/p5-Device-Modem/Makefile b/comms/p5-Device-Modem/Makefile
index 1e869f667a62..280d6c7d2a46 100644
--- a/comms/p5-Device-Modem/Makefile
+++ b/comms/p5-Device-Modem/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Perl class to interface generic modems (AT-compliant)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Device-SerialPort>=0:${PORTSDIR}/comms/p5-Device-SerialPort
+BUILD_DEPENDS=	p5-Device-SerialPort>=0:comms/p5-Device-SerialPort
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/comms/p5-Fax-Hylafax-Client/Makefile b/comms/p5-Fax-Hylafax-Client/Makefile
index 6ecd680f8bcc..51e509730b07 100644
--- a/comms/p5-Fax-Hylafax-Client/Makefile
+++ b/comms/p5-Fax-Hylafax-Client/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple Perl client for the HylaFAX fax server
 
-BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
+BUILD_DEPENDS=	p5-Net>=0:net/p5-Net
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-Nexmo-SMS/Makefile b/comms/p5-Nexmo-SMS/Makefile
index 286e8f93bdc1..fc54084404a9 100644
--- a/comms/p5-Nexmo-SMS/Makefile
+++ b/comms/p5-Nexmo-SMS/Makefile
@@ -12,13 +12,13 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	Send SMS via http://www.nexmo.com/ API
 
-BUILD_DEPENDS=	p5-HTTP-Message>=5.836:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON-PP>=2.26000:${PORTSDIR}/converters/p5-JSON-PP \
-		p5-libwww>=5.835:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=5.836:www/p5-HTTP-Message \
+		p5-JSON-PP>=2.26000:converters/p5-JSON-PP \
+		p5-libwww>=5.835:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-TEST_DEPENDS=	p5-Test-Pod>=1.22:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.08:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-Pod>=1.22:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/comms/p5-SMS-SMS77/Makefile b/comms/p5-SMS-SMS77/Makefile
index 67c037aec637..aaac823146ad 100644
--- a/comms/p5-SMS-SMS77/Makefile
+++ b/comms/p5-SMS-SMS77/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	steinex@nognu.de
 COMMENT=	Perl interface and script to send SMS via SMS77.de
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/comms/p5-SMS-Send-DeviceGsm/Makefile b/comms/p5-SMS-Send-DeviceGsm/Makefile
index dddefb125637..a83ffebc0cff 100644
--- a/comms/p5-SMS-Send-DeviceGsm/Makefile
+++ b/comms/p5-SMS-Send-DeviceGsm/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SMS::Send driver for Device::Gsm
 
-BUILD_DEPENDS=	p5-SMS-Send>=0.04:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-Device-Gsm>=1.45:${PORTSDIR}/comms/p5-Device-Gsm
+BUILD_DEPENDS=	p5-SMS-Send>=0.04:comms/p5-SMS-Send \
+		p5-Device-Gsm>=1.45:comms/p5-Device-Gsm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-NexmoUnicode/Makefile b/comms/p5-SMS-Send-NexmoUnicode/Makefile
index d6494639dcd5..fb386ace50c6 100644
--- a/comms/p5-SMS-Send-NexmoUnicode/Makefile
+++ b/comms/p5-SMS-Send-NexmoUnicode/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	SMS::Send driver for www.nexmo.com (Unicode)
 
-BUILD_DEPENDS=	p5-Nexmo-SMS>=0.04:${PORTSDIR}/comms/p5-Nexmo-SMS \
-		p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send
+BUILD_DEPENDS=	p5-Nexmo-SMS>=0.04:comms/p5-Nexmo-SMS \
+		p5-SMS-Send>=0:comms/p5-SMS-Send
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-HiAir/Makefile b/comms/p5-SMS-Send-TW-HiAir/Makefile
index 57d1ab19c4c7..2960d5754a2d 100644
--- a/comms/p5-SMS-Send-TW-HiAir/Makefile
+++ b/comms/p5-SMS-Send-TW-HiAir/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	SMS::Send driver for http://hiair.hinet.net/
 
-BUILD_DEPENDS=	p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Crypt-SSLeay>=0.51:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
+BUILD_DEPENDS=	p5-SMS-Send>=0:comms/p5-SMS-Send \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Crypt-SSLeay>=0.51:security/p5-Crypt-SSLeay \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-PChome/Makefile b/comms/p5-SMS-Send-TW-PChome/Makefile
index 73aa6e1419e9..f678beb2de12 100644
--- a/comms/p5-SMS-Send-TW-PChome/Makefile
+++ b/comms/p5-SMS-Send-TW-PChome/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	 p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SMS::Send driver for sms.pchome.com.tw
 
-RUN_DEPENDS=	p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-SMS-Send>=0:comms/p5-SMS-Send \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-Qma/Makefile b/comms/p5-SMS-Send-TW-Qma/Makefile
index 9a15cd044827..14a48d28a0ac 100644
--- a/comms/p5-SMS-Send-TW-Qma/Makefile
+++ b/comms/p5-SMS-Send-TW-Qma/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SMS::Send driver for http://www.qma.com/
 
-RUN_DEPENDS=	p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-Crypt-SSLeay>=0.57:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
+RUN_DEPENDS=	p5-SMS-Send>=0:comms/p5-SMS-Send \
+		p5-Crypt-SSLeay>=0.57:security/p5-Crypt-SSLeay \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-ShareSMS/Makefile b/comms/p5-SMS-Send-TW-ShareSMS/Makefile
index ea0996264323..030ee9c8fccb 100644
--- a/comms/p5-SMS-Send-TW-ShareSMS/Makefile
+++ b/comms/p5-SMS-Send-TW-ShareSMS/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SMS::Send driver for www.ShareSMS.com
 
-BUILD_DEPENDS=	p5-SMS-Send>=0.03:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=2:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-SMS-Send>=0.03:comms/p5-SMS-Send \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=2:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-Socket2Air/Makefile b/comms/p5-SMS-Send-TW-Socket2Air/Makefile
index dec0b09ef632..199b2e078135 100644
--- a/comms/p5-SMS-Send-TW-Socket2Air/Makefile
+++ b/comms/p5-SMS-Send-TW-Socket2Air/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	SMS::Send driver for Socket2Air
 
-RUN_DEPENDS=	p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-Switch>=0:${PORTSDIR}/lang/p5-Switch \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
+RUN_DEPENDS=	p5-SMS-Send>=0:comms/p5-SMS-Send \
+		p5-Switch>=0:lang/p5-Switch \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-chtsns/Makefile b/comms/p5-SMS-Send-TW-chtsns/Makefile
index a2327f28e9ce..22f845fe39f6 100644
--- a/comms/p5-SMS-Send-TW-chtsns/Makefile
+++ b/comms/p5-SMS-Send-TW-chtsns/Makefile
@@ -11,11 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	SMS::Send driver for SNS service of CHT
 
-RUN_DEPENDS=	p5-SMS-Send>=0:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-Switch>=0:${PORTSDIR}/lang/p5-Switch \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
+RUN_DEPENDS=	p5-SMS-Send>=0:comms/p5-SMS-Send \
+		p5-Switch>=0:lang/p5-Switch \
+		p5-libwww>=0:www/p5-libwww \
+		p5-WWW-Mechanize>=0:www/p5-WWW-Mechanize \
+		p5-Text-Iconv>=0:converters/p5-Text-Iconv
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send-TW-emome/Makefile b/comms/p5-SMS-Send-TW-emome/Makefile
index ed39dc3f1fea..910f71c2e217 100644
--- a/comms/p5-SMS-Send-TW-emome/Makefile
+++ b/comms/p5-SMS-Send-TW-emome/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	SMS::Send driver for www.emome.net
 
-RUN_DEPENDS=	p5-SMS-Send>=0.03:${PORTSDIR}/comms/p5-SMS-Send \
-		p5-Crypt-SSLeay>=0.57:${PORTSDIR}/security/p5-Crypt-SSLeay \
-		p5-WWW-Mechanize>=1.20:${PORTSDIR}/www/p5-WWW-Mechanize \
-		p5-Text-Iconv>=:${PORTSDIR}/converters/p5-Text-Iconv
+RUN_DEPENDS=	p5-SMS-Send>=0.03:comms/p5-SMS-Send \
+		p5-Crypt-SSLeay>=0.57:security/p5-Crypt-SSLeay \
+		p5-WWW-Mechanize>=1.20:www/p5-WWW-Mechanize \
+		p5-Text-Iconv>=:converters/p5-Text-Iconv
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/comms/p5-SMS-Send/Makefile b/comms/p5-SMS-Send/Makefile
index 4f4682401278..89bd3d4b7720 100644
--- a/comms/p5-SMS-Send/Makefile
+++ b/comms/p5-SMS-Send/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Driver-based API for sending SMS messages
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Class-Adapter>=1.05:${PORTSDIR}/devel/p5-Class-Adapter \
-		p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util
+BUILD_DEPENDS=	p5-Class-Adapter>=1.05:devel/p5-Class-Adapter \
+		p5-Params-Util>=1.00:devel/p5-Params-Util
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/comms/py-gammu/Makefile b/comms/py-gammu/Makefile
index 8bcdbf9bae90..8c5a8ea078aa 100644
--- a/comms/py-gammu/Makefile
+++ b/comms/py-gammu/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for Gammu library
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libGammu.so:${PORTSDIR}/comms/gammu
+LIB_DEPENDS=	libGammu.so:comms/gammu
 
 USES=		pkgconfig python:-2.7 tar:bz2
 USE_PYTHON=	distutils autoplist
diff --git a/comms/py-libconcord/Makefile b/comms/py-libconcord/Makefile
index 5d87798b78da..f65b1e4474f9 100644
--- a/comms/py-libconcord/Makefile
+++ b/comms/py-libconcord/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for Logitech Harmony library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libconcord.so:${PORTSDIR}/comms/libconcord
+LIB_DEPENDS=	libconcord.so:comms/libconcord
 
 USE_LDCONFIG=	yes
 USES=		python:2.7+ tar:bzip2
diff --git a/comms/py-libimobiledevice/Makefile b/comms/py-libimobiledevice/Makefile
index d79b799ce269..f4462bd39b17 100644
--- a/comms/py-libimobiledevice/Makefile
+++ b/comms/py-libimobiledevice/Makefile
@@ -7,10 +7,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Python bindings for libimobiledevice
 
-LIB_DEPENDS=	libimobiledevice.so:${PORTSDIR}/${MASTER_PORT}
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython \
-		${PYTHON_SITELIBDIR}/plist.so:${PORTSDIR}/devel/py-libplist
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/plist.so:${PORTSDIR}/devel/py-libplist
+LIB_DEPENDS=	libimobiledevice.so:${MASTER_PORT}
+BUILD_DEPENDS=	cython:lang/cython \
+		${PYTHON_SITELIBDIR}/plist.so:devel/py-libplist
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/plist.so:devel/py-libplist
 
 USES=		python
 CONFIGURE_ENV=	PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`"
diff --git a/comms/py-lirc/Makefile b/comms/py-lirc/Makefile
index 43278768844b..6554ccbc9875 100644
--- a/comms/py-lirc/Makefile
+++ b/comms/py-lirc/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	pylirc-${PORTVERSION}
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Lirc support library for Python
 
-LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIB_DEPENDS=	liblirc_client.so:comms/lirc
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index 3d93efc9e90a..3d78d4b44d32 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 API_DESC=		Install QtSerialPort API for QScintilla2
 API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${QSCIDIR}
 API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2-qt5.so:${PORTSDIR}/devel/qscintilla2-qt5
+API_LIB_DEPENDS=	libqscintilla2-qt5.so:devel/qscintilla2-qt5
 DEBUG_CONFIGURE_ON=	--debug --trace
 
 .include <bsd.port.mk>
diff --git a/comms/pyla/Makefile b/comms/pyla/Makefile
index f74552f7e190..e6c65d4c1eba 100644
--- a/comms/pyla/Makefile
+++ b/comms/pyla/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	pyla${PORTVERSION}
 MAINTAINER=	mike@Reifenberger.com
 COMMENT=	Hylafax client written in Python
 
-#LIB_DEPENDS=	lirc_client.0:${PORTSDIR}/comms/lirc
+#LIB_DEPENDS=	lirc_client.0:comms/lirc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 DATADIR=	${PREFIX}/lib/pyla
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index c28eb26c2453..6ccba293f1e5 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Amateur Radio SSTV/FAX reception program for unix
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libhamlib.so:${PORTSDIR}/comms/hamlib \
-		libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libjasper.so:${PORTSDIR}/graphics/jasper
-BUILD_DEPENDS=	v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libhamlib.so:comms/hamlib \
+		libasound.so:audio/alsa-lib \
+		libjasper.so:graphics/jasper
+BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 
 USES=		qmake
 USE_QT4=	gui network xml moc_build rcc_build uic_build
diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile
index f0ac5b573c08..b1013233b4ea 100644
--- a/comms/qtel/Makefile
+++ b/comms/qtel/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Qtel Echolink client
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libecholib.so:${PORTSDIR}/comms/svxlink
+LIB_DEPENDS=	libecholib.so:comms/svxlink
 
 MASTERDIR=	${.CURDIR}/../svxlink
 USE_QT4=	corelib gui network qmake_build linguist_build moc_build rcc_build uic_build
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index 3e440273372a..2ab12f18c5a9 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Software Defined Radio (SDR)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio \
-		libasound.so:${PORTSDIR}/audio/alsa-lib \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libportaudio.so:audio/portaudio \
+		libasound.so:audio/alsa-lib \
+		libpulse.so:audio/pulseaudio
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/comms/rtl-sdr/Makefile b/comms/rtl-sdr/Makefile
index 521579ba010e..137e551cc214 100644
--- a/comms/rtl-sdr/Makefile
+++ b/comms/rtl-sdr/Makefile
@@ -24,7 +24,7 @@ DOCSDIR=	${PREFIX}/share/doc/librtlsdr
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile.am
 
 post-patch:
diff --git a/comms/rubygem-callsign/Makefile b/comms/rubygem-callsign/Makefile
index f527eebd17fc..43055b2b257e 100644
--- a/comms/rubygem-callsign/Makefile
+++ b/comms/rubygem-callsign/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Provides a Ruby-Frontend to callook.info ham Radio Callsign Lookup
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-hashie>=0:${PORTSDIR}/devel/rubygem-hashie \
-		rubygem-json>=0:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-hashie>=0:devel/rubygem-hashie \
+		rubygem-json>=0:devel/rubygem-json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/comms/sdr-wspr/Makefile b/comms/sdr-wspr/Makefile
index d9681b2bb664..d5e26d269946 100644
--- a/comms/sdr-wspr/Makefile
+++ b/comms/sdr-wspr/Makefile
@@ -10,7 +10,7 @@ COMMENT=	WSPR receiver/decoder using libsdr
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libsdr-gui.so:${PORTSDIR}/comms/libsdr-gui
+LIB_DEPENDS=	libsdr-gui.so:comms/libsdr-gui
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hmatuschek
diff --git a/comms/smstools3/Makefile b/comms/smstools3/Makefile
index d4d1ecd689ce..d8e791b5a92b 100644
--- a/comms/smstools3/Makefile
+++ b/comms/smstools3/Makefile
@@ -42,7 +42,7 @@ SUB_FILES=	pkg-install pkg-deinstall
 PORTDOCS=	*
 PORTEXAMPLES=	.procmailrc .qmailrc *
 
-STATS_LIB_DEPENDS=	libmm.so:${PORTSDIR}/devel/mm
+STATS_LIB_DEPENDS=	libmm.so:devel/mm
 STATS_CFLAGS=	-I${LOCALBASE}/include
 STATS_CFLAGS_OFF=	-DNOSTATS
 
diff --git a/comms/soundmodem/Makefile b/comms/soundmodem/Makefile
index cc976da0ecba..becb789b0c89 100644
--- a/comms/soundmodem/Makefile
+++ b/comms/soundmodem/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Amateur Radio sound modem
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
+LIB_DEPENDS=	libaudiofile.so:audio/libaudiofile
 
 CONFIGURE_ARGS=	--disable-alsatest
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile
index 1650c3cab6d0..fb2b3cb20e44 100644
--- a/comms/spandsp/Makefile
+++ b/comms/spandsp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	DSP library and software FAX machine
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index 53483be5fe93..5c935d40b1df 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -10,15 +10,15 @@ COMMENT?=	General purpose ham radio voice services
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS?=	libgsm.so:${PORTSDIR}/audio/gsm \
-		libspeex.so:${PORTSDIR}/audio/speex \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
-		libpopt.so:${PORTSDIR}/devel/popt \
-		libopus.so:${PORTSDIR}/audio/opus
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconf \
-		${LOCALBASE}/include/linux/input.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS?=	libgsm.so:audio/gsm \
+		libspeex.so:audio/speex \
+		libgpg-error.so:security/libgpg-error \
+		libgcrypt.so:security/libgcrypt \
+		libsigc-2.0.so:devel/libsigc++20 \
+		libpopt.so:devel/popt \
+		libopus.so:audio/opus
+BUILD_DEPENDS=	pkg-config:devel/pkgconf \
+		${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sm0svx
@@ -41,7 +41,7 @@ STATIC_CMAKE_ON=	-DBUILD_STATIC_LIBS=YES
 OPTIONS_DEFAULT=OSS ALSA
 OPTIONS_MULTI=	SOUND
 OPTIONS_MULTI_SOUND=	ALSA OSS
-ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=OFF
 ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=ON
 OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=OFF
@@ -49,8 +49,8 @@ OSS_CMAKE_ON=	-DUSE_OSS:BOOL=ON
 .endif
 DOCS_ALL_TARGET=doc
 DOCS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=TRUE
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
-			dot:${PORTSDIR}/graphics/graphviz
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
 OPTIONS_SUB=	yes
 PORTDOCS=	*
 
diff --git a/comms/telldus-core/Makefile b/comms/telldus-core/Makefile
index 3efde174cb59..147c16643e9d 100644
--- a/comms/telldus-core/Makefile
+++ b/comms/telldus-core/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Tellstick Telldus daemon + library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
-LIB_DEPENDS=	libftdi.so:${PORTSDIR}/devel/libftdi \
-		libconfuse.so:${PORTSDIR}/devel/libconfuse \
-		libargp.so:${PORTSDIR}/devel/argp-standalone
+BUILD_DEPENDS=	help2man:misc/help2man
+LIB_DEPENDS=	libftdi.so:devel/libftdi \
+		libconfuse.so:devel/libconfuse \
+		libargp.so:devel/argp-standalone
 
 USES= 		cmake compiler:c++11-lang iconv:wchar_t
 
diff --git a/comms/thebridge/Makefile b/comms/thebridge/Makefile
index c3579a9a4b40..e1067f623068 100644
--- a/comms/thebridge/Makefile
+++ b/comms/thebridge/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Amateur Radio Echolink conference bridge
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake shebangfix tar:tgz
 GNU_CONFIGURE=	yes
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index 4fca8744b073..230695bc3901 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -11,10 +11,10 @@ COMMENT=	TI Linking Program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libticables2.so:${PORTSDIR}/comms/libticables2	\
-		libtifiles2.so:${PORTSDIR}/devel/libtifiles2	\
-		libticalcs2.so:${PORTSDIR}/comms/libticalcs2	\
-		libticonv.so:${PORTSDIR}/converters/libticonv
+LIB_DEPENDS=	libticables2.so:comms/libticables2	\
+		libtifiles2.so:devel/libtifiles2	\
+		libticalcs2.so:comms/libticalcs2	\
+		libticonv.so:converters/libticonv
 
 USES=		desktop-file-utils gmake pkgconfig shared-mime-info tar:bzip2
 USE_GNOME=	gtk20 intltool
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 4c764ad05ebc..5b1ed7732c13 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/tk interface to Sam Leffler's fax package
 
-RUN_DEPENDS=	sendfax:${PORTSDIR}/comms/hylafax \
-		gv:${PORTSDIR}/print/gv
+RUN_DEPENDS=	sendfax:comms/hylafax \
+		gv:print/gv
 
 USES=		tk:run
 
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index ea1ea6eb747c..cd624e48b54b 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Amateur Radio curses based logging program
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libglib-2.0.so:${PORTSDIR}/devel/glib20
+LIB_DEPENDS=	libglib-2.0.so:devel/glib20
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	HAMLIB
 HAMLIB_DESC=	Support rig control via hamlib
 OPTION_DEFAULT=	HAMLIB
 
-HAMLIB_LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+HAMLIB_LIB_DEPENDS=	libhamlib.so:comms/hamlib
 HAMLIB_CONFIGURE_ENABLE=hamlib
 
 .include <bsd.port.mk>
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 7d4e5bf09047..f62e00687615 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	American Radio Relay League, Inc. All rights reserved.
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USE_BDB=	5+
 
diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile
index 358a6b32569c..d111ef0303c5 100644
--- a/comms/twpsk/Makefile
+++ b/comms/twpsk/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 
 USES=		motif pkgconfig
 
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-L${LOCALBASE}/lib -I${PREFIX}/include
diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile
index d909df1881a1..b1ae2bb1e742 100644
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Daemon for multiplexing connections over USB to iPhone/iPod Touch
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
-		libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
+LIB_DEPENDS=	libplist.so:devel/libplist \
+		libimobiledevice.so:comms/libimobiledevice
 
 USES=		autoreconf cpe libtool pathfix pkgconfig tar:bzip2
 CPE_VENDOR=	nikias_bassen
diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile
index a5c0c6559f53..86c2217bc44b 100644
--- a/comms/usrp/Makefile
+++ b/comms/usrp/Makefile
@@ -10,12 +10,12 @@ DISTNAME=	Ettus-USRP-3.4.3
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Ettus Research USRP driver framework
 
-LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs \
-		cheetah-analyze:${PORTSDIR}/devel/py-cheetah \
-		rst2html:${PORTSDIR}/textproc/py-docutils \
-		orcc:${PORTSDIR}/devel/orc \
-		sdcc:${PORTSDIR}/lang/sdcc
+LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \
+		cheetah-analyze:devel/py-cheetah \
+		rst2html:textproc/py-docutils \
+		orcc:devel/orc \
+		sdcc:lang/sdcc
 
 USES=			compiler:c++0x cmake:outsource gmake pkgconfig dos2unix
 COMPILER_FEATURES=	libc++
@@ -40,13 +40,13 @@ BROKEN_i386=	does not build on i386 FreeBSD 11.x and later
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+BUILD_DEPENDS+=	doxygen:devel/doxygen
 CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="ON"
 HAVEDOCS=	YES
 .endif
 
 .if ${PORT_OPTIONS:MUSRP1}
-BUILD_DEPENDS+=	sdcc:${PORTSDIR}/lang/sdcc
+BUILD_DEPENDS+=	sdcc:lang/sdcc
 USRP1=	YES
 PLIST_SUB+=	PUSRP1=""
 .else
@@ -54,8 +54,8 @@ PLIST_SUB+=	PUSRP1="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUSRP2}
-BUILD_DEPENDS+=	${LOCALBASE}/zpu/bin/zpu-elf-gcc:${PORTSDIR}/devel/zpu-gcc \
-		${LOCALBASE}/zpu/bin/zpu-elf-as:${PORTSDIR}/devel/zpu-binutils
+BUILD_DEPENDS+=	${LOCALBASE}/zpu/bin/zpu-elf-gcc:devel/zpu-gcc \
+		${LOCALBASE}/zpu/bin/zpu-elf-as:devel/zpu-binutils
 USRP2=	YES
 PLIST_SUB+=	PUSRP2=""
 .else
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index fa6f7736486e..441b4054a4ba 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -11,18 +11,18 @@ COMMENT=	Weak signal ham radio communication package
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd \
+RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:comms/kvasd \
 		${WSJT_DEPENDS}
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
+BUILD_DEPENDS=	python:lang/python \
 		${WSJT_DEPENDS}
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libsamplerate.so:audio/libsamplerate \
+		libportaudio.so:audio/portaudio
 
-WSJT_DEPENDS=	${PYTHON_LIBDIR}/lib-dynload/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
-		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
+WSJT_DEPENDS=	${PYTHON_LIBDIR}/lib-dynload/_tkinter.so:x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/scipy:science/py-scipy \
+		${PYTHON_SITELIBDIR}/PIL:graphics/py-pillow \
 		${PYNUMPY}
 
 USE_GCC=	yes
@@ -44,14 +44,14 @@ PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
 #portlint freaks over this but it's only for dev. so ignore.
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 SVN_REV!=	svn info http://svn.code.sf.net/p/wsjt/wsjt/ | ${GREP} Revision | cut -d' ' -f2
 .else
 .include "Makefile.svn_rev"
 .endif
 
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/comms/wsjtx/Makefile b/comms/wsjtx/Makefile
index 19d3d5d5ef4d..9f570e77a8b0 100644
--- a/comms/wsjtx/Makefile
+++ b/comms/wsjtx/Makefile
@@ -15,13 +15,13 @@ COMMENT=	Weak signal ham radio communication package
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libhamlib.so:${PORTSDIR}/comms/hamlib
-RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:${PORTSDIR}/comms/kvasd
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+		xsltproc:textproc/libxslt \
+		docbook-xsl>0:textproc/docbook-xsl
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libhamlib.so:comms/hamlib
+RUN_DEPENDS=	${LOCALBASE}/bin/kvasd:comms/kvasd
 
 MAKE_JOBS_UNSAFE=	yes
 USE_QT5=	gui buildtools qmake_build widgets multimedia concurrent serialport
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 623fac2ad5d6..56bca2115d98 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Weak signal for HF ham radio communication package
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
-		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy
-LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
-		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
-		libportaudio.so:${PORTSDIR}/audio/portaudio
+RUN_DEPENDS=	${PYTHON_LIBDIR}/tkinter:x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/PIL:graphics/py-pillow \
+		${PYTHON_SITELIBDIR}/scipy:science/py-scipy
+LIB_DEPENDS=	libhamlib.so:comms/hamlib \
+		libfftw3f.so:math/fftw3-float \
+		libsamplerate.so:audio/libsamplerate \
+		libportaudio.so:audio/portaudio
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		autoreconf dos2unix fortran gmake libtool python:3.3 tar:bzip2
@@ -46,7 +46,7 @@ SVN_REV!=	svn info svn://svn.code.sf.net/p/wsjt/wsjt/branches/wspr | ${GREP} Rev
 .include "Makefile.svn_rev"
 .endif
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
-FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+FETCH_DEPENDS+=	svn:devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index c5b1abdf6af5..2cd2b07fad49 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	carl@stagecraft.cx
 COMMENT=	X Amateur Station Tracking and Information Reporting
 
-BUILD_DEPENDS=	xfontsel:${PORTSDIR}/x11-fonts/xfontsel
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png
+BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
+RUN_DEPENDS=	wget:ftp/wget
+LIB_DEPENDS=	libtiff.so:graphics/tiff \
+		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake jpeg motif shebangfix
@@ -40,27 +40,27 @@ OPTCFLAGS_DESC=	Use optimized CFLAGS (-O2 -pipe)
 
 OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
 
-SHAPELIB_LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
+SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
 SHAPELIB_CONFIGURE_WITH=	shapelib
 
-MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:${PORTSDIR}/graphics/GraphicsMagick
+MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 MAGICK_CONFIGURE_WITH=	imagemagick graphicsmagick
 
-DBFAWK_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+DBFAWK_LIB_DEPENDS=	libpcre.so:devel/pcre
 DBFAWK_CONFIGURE_WITH=	dbfawk
 
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
-GEOTIFF_LIB_DEPENDS=	libgeotiff.so:${PORTSDIR}/graphics/libgeotiff
+GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
 
-GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_CONFIGURE_WITH=	gdal
 
-GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp
+GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman
 
-FESTIVAL_BUILD_DEPENDS=	festival:${PORTSDIR}/audio/festival
+FESTIVAL_BUILD_DEPENDS=	festival:audio/festival
 FESTIVAL_CONFIGURE_WITH=festival
 
 RTREE_CONFIGURE_WITH=	rtree
diff --git a/comms/xcwcp/Makefile b/comms/xcwcp/Makefile
index 17e5d675f128..aec149ea71d9 100644
--- a/comms/xcwcp/Makefile
+++ b/comms/xcwcp/Makefile
@@ -7,7 +7,7 @@ COMMENT=	X11 CW Tutor using unixcw
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcw.so:${PORTSDIR}/comms/unixcw
+LIB_DEPENDS=	libcw.so:comms/unixcw
 
 MASTERDIR=	${.CURDIR}/../unixcw
 
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index dcdfb61060c1..373554bf023a 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Amateur Radio logging application
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib
+LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USES=		pkgconfig shared-mime-info
 USE_GNOME=	gtk20
diff --git a/comms/xmorse/Makefile b/comms/xmorse/Makefile
index 3d614af46272..f675ea42c580 100644
--- a/comms/xmorse/Makefile
+++ b/comms/xmorse/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sunrychen@gmail.com
 COMMENT=	Fully automatic Morse code teaching machine
 
-LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
 
 USE_SDL=	sdl
 
diff --git a/comms/xnec2c/Makefile b/comms/xnec2c/Makefile
index 3aeba4e225f9..e657c8f2127b 100644
--- a/comms/xnec2c/Makefile
+++ b/comms/xnec2c/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Used to calculate antenna patterns useful to ham radio
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libccm.so:${PORTSDIR}/math/ccmath
+LIB_DEPENDS=	libccm.so:math/ccmath
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig tar:bzip2
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index 58a6458e70c8..17018580e912 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	A X viewer of nec2c data
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake pkgconfig tar:tgz
 USE_GNOME=	gtk20
diff --git a/comms/yfklog/Makefile b/comms/yfklog/Makefile
index f06213f5c865..5f867e0f7e5f 100644
--- a/comms/yfklog/Makefile
+++ b/comms/yfklog/Makefile
@@ -15,11 +15,11 @@ COMMENT=	Amateur Radio curses based logging program
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses \
-		p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
-		p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
-		hamlib>=0:${PORTSDIR}/comms/hamlib \
-		p5-Net-FTP-File>=0:${PORTSDIR}/net/p5-Net-FTP-File
+RUN_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
+		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI \
+		hamlib>=0:comms/hamlib \
+		p5-Net-FTP-File>=0:net/p5-Net-FTP-File
 
 USES=		perl5
 NO_BUILD=	yes
diff --git a/comms/zssh/Makefile b/comms/zssh/Makefile
index 02b100af5ebf..753e92a9391d 100644
--- a/comms/zssh/Makefile
+++ b/comms/zssh/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.5
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactively transferring files to a remote machine while using ssh
 
-RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
+RUN_DEPENDS=	lrz:comms/lrzsz
 
 HAS_CONFIGURE=	yes
 USES=		readline tar:tgz
diff --git a/converters/bibtexconv/Makefile b/converters/bibtexconv/Makefile
index 1bcb0e895cec..bca4b5331b2b 100644
--- a/converters/bibtexconv/Makefile
+++ b/converters/bibtexconv/Makefile
@@ -12,7 +12,7 @@ COMMENT=	BibTeX Converter
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/converters/chmview/Makefile b/converters/chmview/Makefile
index 0fded9e9a1ae..e35b0d6a698b 100644
--- a/converters/chmview/Makefile
+++ b/converters/chmview/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extractor from .chm files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libchm.so:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS=	libchm.so:misc/chmlib
 
 USES=		tar:xz uidfix
 
diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile
index a555e8eef2d3..299de737076e 100644
--- a/converters/cl-babel-sbcl/Makefile
+++ b/converters/cl-babel-sbcl/Makefile
@@ -10,14 +10,14 @@ DISTFILES=	# none
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Charset encoding/decoding library written in Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:${PORTSDIR}/converters/cl-babel \
-		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/arrays.fasl:${PORTSDIR}/devel/cl-alexandria-sbcl \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:${PORTSDIR}/devel/cl-trivial-features-sbcl \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:${PORTSDIR}/devel/cl-trivial-gray-streams-sbcl
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:${PORTSDIR}/converters/cl-babel \
-		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/arrays.fasl:${PORTSDIR}/devel/cl-alexandria-sbcl \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:${PORTSDIR}/devel/cl-trivial-features-sbcl \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:${PORTSDIR}/devel/cl-trivial-gray-streams-sbcl
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:converters/cl-babel \
+		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/arrays.fasl:devel/cl-alexandria-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:devel/cl-trivial-features-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:devel/cl-trivial-gray-streams-sbcl
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/babel/babel.asd:converters/cl-babel \
+		${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/sbclfasl/arrays.fasl:devel/cl-alexandria-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/sbclfasl/src/tf-sbcl.fasl:devel/cl-trivial-features-sbcl \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/sbclfasl/package.fasl:devel/cl-trivial-gray-streams-sbcl
 
 USE_ASDF_FASL=	yes
 FASL_TARGET=	sbcl
diff --git a/converters/cl-babel/Makefile b/converters/cl-babel/Makefile
index 74c9f2da65de..c6189f8406d1 100644
--- a/converters/cl-babel/Makefile
+++ b/converters/cl-babel/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	LOCAL/olgeni
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Charset encoding/decoding library written in Common Lisp
 
-BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:${PORTSDIR}/devel/cl-alexandria \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:${PORTSDIR}/devel/cl-trivial-features \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:${PORTSDIR}/devel/cl-trivial-gray-streams
-RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:${PORTSDIR}/devel/cl-alexandria \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:${PORTSDIR}/devel/cl-trivial-features \
-		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:${PORTSDIR}/devel/cl-trivial-gray-streams
+BUILD_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
+RUN_DEPENDS=	${LOCALBASE}/${CL_LIBDIR_REL}/alexandria/alexandria.asd:devel/cl-alexandria \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-features/trivial-features.asd:devel/cl-trivial-features \
+		${LOCALBASE}/${CL_LIBDIR_REL}/trivial-gray-streams/trivial-gray-streams.asd:devel/cl-trivial-gray-streams
 
 NO_BUILD=	yes
 
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index db00703ec0d6..07d07a265f47 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Detect encoding of text files
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	umap:${PORTSDIR}/converters/p5-Unicode-Map8
-LIB_DEPENDS=	librecode.so:${PORTSDIR}/converters/recode
-RUN_DEPENDS=	umap:${PORTSDIR}/converters/p5-Unicode-Map8
+BUILD_DEPENDS=	umap:converters/p5-Unicode-Map8
+LIB_DEPENDS=	librecode.so:converters/recode
+RUN_DEPENDS=	umap:converters/p5-Unicode-Map8
 
 USES=		gmake iconv libtool pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
diff --git a/converters/fix-mime-charset/Makefile b/converters/fix-mime-charset/Makefile
index 6645f785a927..afa378a7aaa2 100644
--- a/converters/fix-mime-charset/Makefile
+++ b/converters/fix-mime-charset/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fix incorrect Content-Type MIME headers of e-mail messages
 
 OPTIONS_DEFINE=	DOCS
 
-LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
+LIB_DEPENDS=	libenca.so:converters/enca
 
 PORTDOCS=	README.koi8r README
 
diff --git a/converters/gbsdconv/Makefile b/converters/gbsdconv/Makefile
index cc4253712cbd..07b4994c6fcd 100644
--- a/converters/gbsdconv/Makefile
+++ b/converters/gbsdconv/Makefile
@@ -10,8 +10,8 @@ COMMENT=	GUI for bsdconv
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsdconv>=8.0:${PORTSDIR}/converters/py-bsdconv
+LIB_DEPENDS=	libtag.so:audio/taglib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsdconv>=8.0:converters/py-bsdconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/converters/i18ntools/Makefile b/converters/i18ntools/Makefile
index b850dd2bc728..b07ebc5e55c5 100644
--- a/converters/i18ntools/Makefile
+++ b/converters/i18ntools/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Tools for the conversion to and from UTF-8 Unicode encoding
 
 LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libutf-8.so:${PORTSDIR}/converters/libutf-8
-RUN_DEPENDS=	tuc:${PORTSDIR}/converters/tuc
+LIB_DEPENDS=	libutf-8.so:converters/libutf-8
+RUN_DEPENDS=	tuc:converters/tuc
 
 DATADIR=	${PREFIX}/share/i18n
 DOCSDIR=	${PREFIX}/share/doc/i18n
diff --git a/converters/ical2html/Makefile b/converters/ical2html/Makefile
index 5a328adcd763..10638cbe5b8c 100644
--- a/converters/ical2html/Makefile
+++ b/converters/ical2html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.w3.org/Tools/Ical2html/
 MAINTAINER=	keiichi@iijlab.net
 COMMENT=	Manipulation commands for iCalendar files
 
-LIB_DEPENDS=	libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS=	libical.so:devel/libical
 
 GNU_CONFIGURE=	yes
 
diff --git a/converters/iconv-extra/Makefile b/converters/iconv-extra/Makefile
index c56f508701e0..6ddbde967c95 100644
--- a/converters/iconv-extra/Makefile
+++ b/converters/iconv-extra/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/bland
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Additional charsets for the iconv library (those from the Unicode site)
 
-LIB_DEPENDS=	libbiconv.so:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	libbiconv.so:converters/iconv
 
 USES=		perl5 uidfix
 
diff --git a/converters/iconv-rfc1345/Makefile b/converters/iconv-rfc1345/Makefile
index af1e1fc011f3..b4256689136e 100644
--- a/converters/iconv-rfc1345/Makefile
+++ b/converters/iconv-rfc1345/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LOCAL/bland
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Additional charset modules for the iconv library (from RFC1345)
 
-LIB_DEPENDS=	libbiconv.so:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	libbiconv.so:converters/iconv
 
 USES=		perl5 uidfix
 
diff --git a/converters/libb64/Makefile b/converters/libb64/Makefile
index 41bc5179f01a..822069306b28 100644
--- a/converters/libb64/Makefile
+++ b/converters/libb64/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ismail.yenigul@surgate.com
 COMMENT=	Library for fast Base64 encoding and decoding
 
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
+BUILD_DEPENDS=	makedepend:devel/makedepend
 
 USES=		gmake zip
 ALL_TARGET=	all_src
diff --git a/converters/lua-json/Makefile b/converters/lua-json/Makefile
index 3591870fc955..efc511ae866a 100644
--- a/converters/lua-json/Makefile
+++ b/converters/lua-json/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JSON parser/creator for Lua
 
-RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:${PORTSDIR}/devel/lua-lpeg
+RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg
 
 MAKE_ARGS=	INSTALL_CMOD=${LUA_MODLIBDIR} INSTALL_LMOD=${LUA_MODSHAREDIR}
 USES=		lua:run
diff --git a/converters/ocaml-jsonm/Makefile b/converters/ocaml-jsonm/Makefile
index a2e85a0fb5fd..f7d31ef3e659 100644
--- a/converters/ocaml-jsonm/Makefile
+++ b/converters/ocaml-jsonm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Non-blocking streaming JSON codec for OCaml
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${SA_DIR}/uutf/uutf.a:${PORTSDIR}/devel/ocaml-uutf
-RUN_DEPENDS=	${SA_DIR}/uutf/uutf.a:${PORTSDIR}/devel/ocaml-uutf
+BUILD_DEPENDS=	${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
+RUN_DEPENDS=	${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
 
 USES=	tar:tbz
 USE_OCAML=		yes
diff --git a/converters/osm2mp/Makefile b/converters/osm2mp/Makefile
index 4ce24a1ec045..0a5e7a2d5d7d 100644
--- a/converters/osm2mp/Makefile
+++ b/converters/osm2mp/Makefile
@@ -10,14 +10,14 @@ MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	OpenStreetMap data into Polish map format (MP) converter
 
-RUN_DEPENDS=	p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML \
-		p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \
-		p5-Math-Polygon>=0:${PORTSDIR}/math/p5-Math-Polygon \
-		p5-Math-Polygon-Tree>=0:${PORTSDIR}/math/p5-Math-Polygon-Tree \
-		p5-Tree-R>=0:${PORTSDIR}/devel/p5-Tree-R \
-		p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-		p5-Math-Geometry-Planar-GPC-PolygonXS>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar-GPC-PolygonXS \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils
+RUN_DEPENDS=	p5-YAML>=0:textproc/p5-YAML \
+		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
+		p5-Math-Polygon>=0:math/p5-Math-Polygon \
+		p5-Math-Polygon-Tree>=0:math/p5-Math-Polygon-Tree \
+		p5-Tree-R>=0:devel/p5-Tree-R \
+		p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
+		p5-Math-Geometry-Planar-GPC-PolygonXS>=0:math/p5-Math-Geometry-Planar-GPC-PolygonXS \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
 
 LICENSE=	GPLv2
 
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 2aa345befe90..99cea8558fcb 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Convert OSM XML data to PostgreSQL database
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
-		libboost_thread.so:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libproj.so:graphics/proj \
+		libgeos.so:graphics/geos \
+		libprotobuf-c.so:devel/protobuf-c \
+		libboost_thread.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index 5ba88865d24e..a610e55b6263 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	API for hierarchical tag/value structures
 
-BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Convert-Bencode_XS/Makefile b/converters/p5-Convert-Bencode_XS/Makefile
index 30330be85a71..524163a90a2e 100644
--- a/converters/p5-Convert-Bencode_XS/Makefile
+++ b/converters/p5-Convert-Bencode_XS/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Faster conversions to/from Bencode format
 
-RUN_DEPENDS=	p5-Convert-Bencode>=0:${PORTSDIR}/converters/p5-Convert-Bencode
+RUN_DEPENDS=	p5-Convert-Bencode>=0:converters/p5-Convert-Bencode
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	extras/*.pl
diff --git a/converters/p5-Convert-BinHex/Makefile b/converters/p5-Convert-BinHex/Makefile
index 947109e0a3d8..bcf79febf955 100644
--- a/converters/p5-Convert-BinHex/Makefile
+++ b/converters/p5-Convert-BinHex/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Perl module to extract data from Macintosh BinHex files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
-		p5-Test-Most>=0:${PORTSDIR}/devel/p5-Test-Most
+TEST_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-Test-Most>=0:devel/p5-Test-Most
 
 NO_ARCH=	yes
 USES=		perl5
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index ae510cb1d11a..8b1beb32d9c6 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Read/write access to ASN.1-encoded PEM files with optional encryption
 
-RUN_DEPENDS=	p5-Class-ErrorHandler>=0:${PORTSDIR}/devel/p5-Class-ErrorHandler \
-		p5-Convert-ASN1>=0.10:${PORTSDIR}/converters/p5-Convert-ASN1 \
-		p5-Crypt-DES_EDE3>=0:${PORTSDIR}/security/p5-Crypt-DES_EDE3
+RUN_DEPENDS=	p5-Class-ErrorHandler>=0:devel/p5-Class-ErrorHandler \
+		p5-Convert-ASN1>=0.10:converters/p5-Convert-ASN1 \
+		p5-Crypt-DES_EDE3>=0:security/p5-Crypt-DES_EDE3
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index 88a403687285..1693acba8aa4 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Front end to the GNU recode program
 
-BUILD_DEPENDS=	recode:${PORTSDIR}/converters/recode
-RUN_DEPENDS=	recode:${PORTSDIR}/converters/recode
+BUILD_DEPENDS=	recode:converters/recode
+RUN_DEPENDS=	recode:converters/recode
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Convert-TNEF/Makefile b/converters/p5-Convert-TNEF/Makefile
index a863eec14731..90cc921f1ceb 100644
--- a/converters/p5-Convert-TNEF/Makefile
+++ b/converters/p5-Convert-TNEF/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Perl module to read TNEF files
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-IO-stringy>=0:${PORTSDIR}/devel/p5-IO-stringy \
-		p5-MIME-Tools>=4.109:${PORTSDIR}/mail/p5-MIME-Tools
+BUILD_DEPENDS=	p5-IO-stringy>=0:devel/p5-IO-stringy \
+		p5-MIME-Tools>=4.109:mail/p5-MIME-Tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index 97a380a9954f..5b26068f4b4f 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Perl5 interface to the uulib library (a.k.a. uudeview/uuenview)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Canary-Stability>=0:${PORTSDIR}/devel/p5-Canary-Stability
+BUILD_DEPENDS=	p5-Canary-Stability>=0:devel/p5-Canary-Stability
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Cpanel-JSON-XS/Makefile b/converters/p5-Cpanel-JSON-XS/Makefile
index 14d711e41115..a53b805bcc83 100644
--- a/converters/p5-Cpanel-JSON-XS/Makefile
+++ b/converters/p5-Cpanel-JSON-XS/Makefile
@@ -14,15 +14,15 @@ COMMENT=	JSON::XS for Cpanel, fast and correct serialising
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Mojolicious>=6.11:${PORTSDIR}/www/p5-Mojolicious \
-		p5-Perl-MinimumVersion>=1.20:${PORTSDIR}/textproc/p5-Perl-MinimumVersion \
-		p5-Test-CPAN-Meta>=1.20:${PORTSDIR}/devel/p5-Test-CPAN-Meta \
-		p5-Test-LeakTrace>=0:${PORTSDIR}/devel/p5-Test-LeakTrace \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:${PORTSDIR}/devel/p5-Test-Pod-Coverage \
-		p5-common-sense>=3.50:${PORTSDIR}/devel/p5-common-sense
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Mojolicious>=6.11:www/p5-Mojolicious \
+		p5-Perl-MinimumVersion>=1.20:textproc/p5-Perl-MinimumVersion \
+		p5-Test-CPAN-Meta>=1.20:devel/p5-Test-CPAN-Meta \
+		p5-Test-LeakTrace>=0:devel/p5-Test-LeakTrace \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
+		p5-common-sense>=3.50:devel/p5-common-sense
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/converters/p5-Data-AMF/Makefile b/converters/p5-Data-AMF/Makefile
index 509278972208..424daac6caac 100644
--- a/converters/p5-Data-AMF/Makefile
+++ b/converters/p5-Data-AMF/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to serialize, deserialize AMF data
 
 RUN_DEPENDS=	\
-	p5-DateTime>0:${PORTSDIR}/devel/p5-DateTime \
-	p5-Any-Moose>0:${PORTSDIR}/devel/p5-Any-Moose \
-	p5-UNIVERSAL-require>0:${PORTSDIR}/devel/p5-UNIVERSAL-require \
-	p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML
+	p5-DateTime>0:devel/p5-DateTime \
+	p5-Any-Moose>0:devel/p5-Any-Moose \
+	p5-UNIVERSAL-require>0:devel/p5-UNIVERSAL-require \
+	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Encode-IMAPUTF7/Makefile b/converters/p5-Encode-IMAPUTF7/Makefile
index d1bddae0f01b..7c563180381b 100644
--- a/converters/p5-Encode-IMAPUTF7/Makefile
+++ b/converters/p5-Encode-IMAPUTF7/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Modification of UTF-7 encoding for IMAP
 
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Encode-Punycode/Makefile b/converters/p5-Encode-Punycode/Makefile
index 3f4f550f979b..4aea1d7e99d1 100644
--- a/converters/p5-Encode-Punycode/Makefile
+++ b/converters/p5-Encode-Punycode/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Encode plugin for Punycode
 
-RUN_DEPENDS=	p5-Net-IDN-Encode>=0:${PORTSDIR}/textproc/p5-Net-IDN-Encode
+RUN_DEPENDS=	p5-Net-IDN-Encode>=0:textproc/p5-Net-IDN-Encode
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/converters/p5-Encode-compat/Makefile b/converters/p5-Encode-compat/Makefile
index c23b3b06c223..9956b0ae7edd 100644
--- a/converters/p5-Encode-compat/Makefile
+++ b/converters/p5-Encode-compat/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Compatibility interfaces for Encode.pm on Perl < 5.7.1
 
-BUILD_DEPENDS=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
+BUILD_DEPENDS=	p5-Text-Iconv>=0:converters/p5-Text-Iconv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-JSON-Any/Makefile b/converters/p5-JSON-Any/Makefile
index b2bb4a8ee698..3f54df7a8a23 100644
--- a/converters/p5-JSON-Any/Makefile
+++ b/converters/p5-JSON-Any/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Perl Wrapper Class for the various JSON classes
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-TEST_DEPENDS=	p5-Cpanel-JSON-XS>=0:${PORTSDIR}/converters/p5-Cpanel-JSON-XS \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \
-		p5-Test-Warnings>=0.009:${PORTSDIR}/devel/p5-Test-Warnings \
-		p5-Test-Without-Module>=0.17:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-JSON-DWIW>=0:converters/p5-JSON-DWIW \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Test-Fatal>=0:devel/p5-Test-Fatal \
+		p5-Test-Requires>=0:devel/p5-Test-Requires \
+		p5-Test-Warnings>=0.009:devel/p5-Test-Warnings \
+		p5-Test-Without-Module>=0.17:devel/p5-Test-Without-Module
 
 DEPRECATED=	Deprecated by upstream
 
@@ -37,15 +37,15 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-CPANEL_BUILD_DEPENDS=	p5-Cpanel-JSON-XS>=0:${PORTSDIR}/converters/p5-Cpanel-JSON-XS
-CPANEL_RUN_DEPENDS=	p5-Cpanel-JSON-XS>=0:${PORTSDIR}/converters/p5-Cpanel-JSON-XS
-JSON_BUILD_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
-JSON_RUN_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
-JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW
-JSON_DWIW_RUN_DEPENDS=	p5-JSON-DWIW>=0:${PORTSDIR}/converters/p5-JSON-DWIW
-JSON_PP_BUILD_DEPENDS=	p5-JSON-PP>=0:${PORTSDIR}/converters/p5-JSON-PP
-JSON_PP_RUN_DEPENDS=	p5-JSON-PP>=0:${PORTSDIR}/converters/p5-JSON-PP
-JSON_XS_BUILD_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
-JSON_XS_RUN_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+CPANEL_BUILD_DEPENDS=	p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS
+CPANEL_RUN_DEPENDS=	p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS
+JSON_BUILD_DEPENDS=	p5-JSON>=0:converters/p5-JSON
+JSON_RUN_DEPENDS=	p5-JSON>=0:converters/p5-JSON
+JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:converters/p5-JSON-DWIW
+JSON_DWIW_RUN_DEPENDS=	p5-JSON-DWIW>=0:converters/p5-JSON-DWIW
+JSON_PP_BUILD_DEPENDS=	p5-JSON-PP>=0:converters/p5-JSON-PP
+JSON_PP_RUN_DEPENDS=	p5-JSON-PP>=0:converters/p5-JSON-PP
+JSON_XS_BUILD_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
+JSON_XS_RUN_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
 
 .include <bsd.port.mk>
diff --git a/converters/p5-JSON-MaybeXS/Makefile b/converters/p5-JSON-MaybeXS/Makefile
index 91f2a94e2535..4c1330a73040 100644
--- a/converters/p5-JSON-MaybeXS/Makefile
+++ b/converters/p5-JSON-MaybeXS/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Use Cpanel::JSON::XS with a fallback to JSON::PP
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Cpanel-JSON-XS>=2.3310:${PORTSDIR}/converters/p5-Cpanel-JSON-XS
+BUILD_DEPENDS=	p5-Cpanel-JSON-XS>=2.3310:converters/p5-Cpanel-JSON-XS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-Test-Without-Module>=0.17:${PORTSDIR}/devel/p5-Test-Without-Module
+TEST_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-Test-Without-Module>=0.17:devel/p5-Test-Without-Module
 
 USE_PERL5=	configure
 USES=		perl5
@@ -24,8 +24,8 @@ USES=		perl5
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501800
-BUILD_DEPENDS+=	p5-JSON-PP>=2.27202:${PORTSDIR}/converters/p5-JSON-PP
-RUN_DEPENDS+=	p5-JSON-PP>=2.27202:${PORTSDIR}/converters/p5-JSON-PP
+BUILD_DEPENDS+=	p5-JSON-PP>=2.27202:converters/p5-JSON-PP
+RUN_DEPENDS+=	p5-JSON-PP>=2.27202:converters/p5-JSON-PP
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/converters/p5-JSON-Tiny/Makefile b/converters/p5-JSON-Tiny/Makefile
index 88e0be9785e3..cf707829c0c9 100644
--- a/converters/p5-JSON-Tiny/Makefile
+++ b/converters/p5-JSON-Tiny/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Minimalistic JSON
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	p5-Test-Pod>=1.26:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Pod>=1.26:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	configure
diff --git a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
index c2b11dc4cde2..bd4047cad702 100644
--- a/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
+++ b/converters/p5-JSON-XS-VersionOneAndTwo/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Support versions 1 and 2 of JSON::XS
 
-RUN_DEPENDS=	p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS
+RUN_DEPENDS=	p5-JSON-XS>=0:converters/p5-JSON-XS
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-JSON-XS/Makefile b/converters/p5-JSON-XS/Makefile
index 24f3d88a5d53..1bc29040d1d4 100644
--- a/converters/p5-JSON-XS/Makefile
+++ b/converters/p5-JSON-XS/Makefile
@@ -13,8 +13,8 @@ COMMENT=	JSON serialising/deserialising, done correctly and fast
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Types-Serialiser>=0:${PORTSDIR}/devel/p5-Types-Serialiser \
-		p5-common-sense>0:${PORTSDIR}/devel/p5-common-sense
+BUILD_DEPENDS=	p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
+		p5-common-sense>0:devel/p5-common-sense
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile
index 867e89eba75c..cc868940c4a3 100644
--- a/converters/p5-JSON1/Makefile
+++ b/converters/p5-JSON1/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	1
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl extension to convert to JSON (JavaScript Object Notation)
 
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 CONFLICTS=	p5-JSON-2.*
diff --git a/converters/p5-LaTeXML/Makefile b/converters/p5-LaTeXML/Makefile
index 9b7b72d8ee19..ca897208cced 100644
--- a/converters/p5-LaTeXML/Makefile
+++ b/converters/p5-LaTeXML/Makefile
@@ -14,20 +14,20 @@ COMMENT=	LaTeX to XML/HTML/MathML converter in Perl
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git \
-		p5-File-Which>=0:${PORTSDIR}/sysutils/p5-File-Which \
-		p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
-		p5-Image-Size>=0:${PORTSDIR}/graphics/p5-Image-Size \
-		p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
-		p5-XML-LibXML>=1.62:${PORTSDIR}/textproc/p5-XML-LibXML \
-		p5-XML-LibXSLT>=1.58:${PORTSDIR}/textproc/p5-XML-LibXSLT \
-		p5-Parse-RecDescent>=0:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
-		p5-Getopt-Long>=2.37:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Pod-Parser>=0:${PORTSDIR}/textproc/p5-Pod-Parser \
-		p5-Test-More-UTF8>=0:${PORTSDIR}/devel/p5-Test-More-UTF8 \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS=	${LOCALBASE}/bin/git:devel/git \
+		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-IO-String>=0:devel/p5-IO-String \
+		p5-Image-Size>=0:graphics/p5-Image-Size \
+		p5-JSON-XS>=0:converters/p5-JSON-XS \
+		p5-XML-LibXML>=1.62:textproc/p5-XML-LibXML \
+		p5-XML-LibXSLT>=1.58:textproc/p5-XML-LibXSLT \
+		p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \
+		p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+		p5-Getopt-Long>=2.37:devel/p5-Getopt-Long \
+		p5-libwww>=0:www/p5-libwww \
+		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
+		p5-Test-More-UTF8>=0:devel/p5-Test-More-UTF8 \
+		p5-URI>=0:net/p5-URI
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-MIME-Base64-URLSafe/Makefile b/converters/p5-MIME-Base64-URLSafe/Makefile
index d2765d30ce0d..c2e15ed87330 100644
--- a/converters/p5-MIME-Base64-URLSafe/Makefile
+++ b/converters/p5-MIME-Base64-URLSafe/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	citric@cubicone.tmetic.com
 COMMENT=	Perl version of Python's URL-safe base64 codec
 
-RUN_DEPENDS=	p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS=	p5-MIME-Base64>=0:converters/p5-MIME-Base64
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/00//}
diff --git a/converters/p5-Net-IDN-Nameprep/Makefile b/converters/p5-Net-IDN-Nameprep/Makefile
index b1fa38762493..86ea601b3c76 100644
--- a/converters/p5-Net-IDN-Nameprep/Makefile
+++ b/converters/p5-Net-IDN-Nameprep/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Normalization of domain names (Nameprep, RFC 3491)
 
-RUN_DEPENDS=	p5-Unicode-Stringprep>=0:${PORTSDIR}/converters/p5-Unicode-Stringprep
+RUN_DEPENDS=	p5-Unicode-Stringprep>=0:converters/p5-Unicode-Stringprep
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
-		p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings
+		p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/converters/p5-Number-Nary/Makefile b/converters/p5-Number-Nary/Makefile
index 1e75e2db6eb8..7f15460b175d 100644
--- a/converters/p5-Number-Nary/Makefile
+++ b/converters/p5-Number-Nary/Makefile
@@ -10,9 +10,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Encode and decode numbers as n-ary strings
 
-BUILD_DEPENDS=	p5-Sub-Exporter>=0:${PORTSDIR}/devel/p5-Sub-Exporter \
-		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
-		p5-UDCode>=0:${PORTSDIR}/devel/p5-UDCode
+BUILD_DEPENDS=	p5-Sub-Exporter>=0:devel/p5-Sub-Exporter \
+		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
+		p5-UDCode>=0:devel/p5-UDCode
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-PerlIO-via-Unidecode/Makefile b/converters/p5-PerlIO-via-Unidecode/Makefile
index e502dcc63dc0..2f7a9a8ff20f 100644
--- a/converters/p5-PerlIO-via-Unidecode/Makefile
+++ b/converters/p5-PerlIO-via-Unidecode/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Perlio layer for Unidecode
 
-BUILD_DEPENDS=	p5-Text-Unidecode>=0:${PORTSDIR}/converters/p5-Text-Unidecode
-RUN_DEPENDS=	p5-Text-Unidecode>=0:${PORTSDIR}/converters/p5-Text-Unidecode
+BUILD_DEPENDS=	p5-Text-Unidecode>=0:converters/p5-Text-Unidecode
+RUN_DEPENDS=	p5-Text-Unidecode>=0:converters/p5-Text-Unidecode
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Sereal-Decoder/Makefile b/converters/p5-Sereal-Decoder/Makefile
index e4fb7b71b4ce..b04bceaff994 100644
--- a/converters/p5-Sereal-Decoder/Makefile
+++ b/converters/p5-Sereal-Decoder/Makefile
@@ -14,9 +14,9 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 TEST_DEPENDS=	\
-	p5-Sereal-Encoder>=3.001:${PORTSDIR}/converters/p5-Sereal-Encoder \
-	p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString \
-	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+	p5-Sereal-Encoder>=3.001:converters/p5-Sereal-Encoder \
+	p5-Test-LongString>0:devel/p5-Test-LongString \
+	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Sereal-Encoder/Makefile b/converters/p5-Sereal-Encoder/Makefile
index a8478f8a19a3..bd4cfba0a673 100644
--- a/converters/p5-Sereal-Encoder/Makefile
+++ b/converters/p5-Sereal-Encoder/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 TEST_DEPENDS=	\
-	p5-Test-Deep>0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-LongString>0:${PORTSDIR}/devel/p5-Test-LongString \
-	p5-Test-Warn>0:${PORTSDIR}/devel/p5-Test-Warn \
-	p5-Sereal-Decoder>=3.00:${PORTSDIR}/converters/p5-Sereal-Decoder
+	p5-Test-Deep>0:devel/p5-Test-Deep \
+	p5-Test-LongString>0:devel/p5-Test-LongString \
+	p5-Test-Warn>0:devel/p5-Test-Warn \
+	p5-Sereal-Decoder>=3.00:converters/p5-Sereal-Decoder
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Sereal/Makefile b/converters/p5-Sereal/Makefile
index da5ed19b0fd6..9f9626a0a7b9 100644
--- a/converters/p5-Sereal/Makefile
+++ b/converters/p5-Sereal/Makefile
@@ -14,13 +14,13 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	\
-	p5-Sereal-Decoder>=3.007:${PORTSDIR}/converters/p5-Sereal-Decoder \
-	p5-Sereal-Encoder>=3.007:${PORTSDIR}/converters/p5-Sereal-Encoder
+	p5-Sereal-Decoder>=3.007:converters/p5-Sereal-Decoder \
+	p5-Sereal-Encoder>=3.007:converters/p5-Sereal-Encoder
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
-	p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
-	p5-Test-LongString>=0:${PORTSDIR}/devel/p5-Test-LongString \
-	p5-Test-Warn>=0:${PORTSDIR}/devel/p5-Test-Warn
+	p5-Test-Deep>=0:devel/p5-Test-Deep \
+	p5-Test-LongString>=0:devel/p5-Test-LongString \
+	p5-Test-Warn>=0:devel/p5-Test-Warn
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Text-Bidi/Makefile b/converters/p5-Text-Bidi/Makefile
index 2a661263a8a1..15b02fdc92e7 100644
--- a/converters/p5-Text-Bidi/Makefile
+++ b/converters/p5-Text-Bidi/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Perl interface to the libfribidi
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-ExtUtils-PkgConfig>=0:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
-		swig3.0:${PORTSDIR}/devel/swig30
-LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+BUILD_DEPENDS=	p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig \
+		swig3.0:devel/swig30
+LIB_DEPENDS=	libfribidi.so:converters/fribidi
 
 USE_PERL5=	configure
 USES=		perl5
diff --git a/converters/p5-Unicode-IMAPUtf7/Makefile b/converters/p5-Unicode-IMAPUtf7/Makefile
index 24f0760dd988..9d472f37254d 100644
--- a/converters/p5-Unicode-IMAPUtf7/Makefile
+++ b/converters/p5-Unicode-IMAPUtf7/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Perl extension to deal with IMAP UTF-7
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
-RUN_DEPENDS=	p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS=	p5-Unicode-String>=0:converters/p5-Unicode-String
+RUN_DEPENDS=	p5-Unicode-String>=0:converters/p5-Unicode-String
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-Unicode-Map8/Makefile b/converters/p5-Unicode-Map8/Makefile
index 4165643f25be..d750b2beaa57 100644
--- a/converters/p5-Unicode-Map8/Makefile
+++ b/converters/p5-Unicode-Map8/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mapping table between 8-bit chars and Unicode
 
-BUILD_DEPENDS=	p5-Unicode-String>=2:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS=	p5-Unicode-String>=2:converters/p5-Unicode-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Unicode-MapUTF8/Makefile b/converters/p5-Unicode-MapUTF8/Makefile
index 07ba83cbe0b6..6086898a750e 100644
--- a/converters/p5-Unicode-MapUTF8/Makefile
+++ b/converters/p5-Unicode-MapUTF8/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl class that implements conversion between arbitrary charsets
 
-BUILD_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
-		p5-Unicode-Map>=0:${PORTSDIR}/converters/p5-Unicode-Map \
-		p5-Unicode-Map8>=0:${PORTSDIR}/converters/p5-Unicode-Map8 \
-		p5-Unicode-String>=0:${PORTSDIR}/converters/p5-Unicode-String
+BUILD_DEPENDS=	ja-p5-Jcode>=0:japanese/p5-Jcode \
+		p5-Unicode-Map>=0:converters/p5-Unicode-Map \
+		p5-Unicode-Map8>=0:converters/p5-Unicode-Map8 \
+		p5-Unicode-String>=0:converters/p5-Unicode-String
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/converters/p5-Unicode-Stringprep/Makefile b/converters/p5-Unicode-Stringprep/Makefile
index 070ff53eb067..2cb7435d54b4 100644
--- a/converters/p5-Unicode-Stringprep/Makefile
+++ b/converters/p5-Unicode-Stringprep/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Preparation of Internationalized Strings (RFC 3454)
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Unicode-Normalize>=1:${PORTSDIR}/textproc/p5-Unicode-Normalize
+BUILD_DEPENDS=	p5-Unicode-Normalize>=1:textproc/p5-Unicode-Normalize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-NoWarnings>=0:${PORTSDIR}/devel/p5-Test-NoWarnings \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings \
+		p5-Test-Pod>=1:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-WAP-wbxml/Makefile b/converters/p5-WAP-wbxml/Makefile
index a52b75ff0f5d..41ccb6b3112e 100644
--- a/converters/p5-WAP-wbxml/Makefile
+++ b/converters/p5-WAP-wbxml/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Binarization of XML file
 
 LICENSE=	ART20
 
-BUILD_DEPENDS=	p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM \
-		p5-I18N-Charset>=0:${PORTSDIR}/misc/p5-I18N-Charset \
-		p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper
+BUILD_DEPENDS=	p5-XML-DOM>=0:textproc/p5-XML-DOM \
+		p5-I18N-Charset>=0:misc/p5-I18N-Charset \
+		p5-Data-Dumper>=0:devel/p5-Data-Dumper
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix perl5
diff --git a/converters/p5-XML-WBXML/Makefile b/converters/p5-XML-WBXML/Makefile
index a3898d32a3bf..8efa79d8b767 100644
--- a/converters/p5-XML-WBXML/Makefile
+++ b/converters/p5-XML-WBXML/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Convert between XML and WBXML using libwbxml2
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libwbxml2.so:${PORTSDIR}/textproc/wbxml2
+LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/converters/p5-bsdconv/Makefile b/converters/p5-bsdconv/Makefile
index 8eecdfd5b3e5..800ab8314b2d 100644
--- a/converters/p5-bsdconv/Makefile
+++ b/converters/p5-bsdconv/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Perl wrapper for bsdconv
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index dabe773b786d..3d09680198ee 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Pdf2djvu creates DjVu files from PDF files
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams
-LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
-		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
+BUILD_DEPENDS=	${LOCALBASE}/include/pstreams/pstream.h:devel/pstreams
+LIB_DEPENDS=	libpoppler.so:graphics/poppler \
+		libdjvulibre.so:graphics/djvulibre
 
 GNU_CONFIGURE=	yes
 USES=		compiler:c++11-lang gmake pkgconfig tar:xz
diff --git a/converters/pecl-fribidi/Makefile b/converters/pecl-fribidi/Makefile
index 5911d2b33005..5f2e2e4f8123 100644
--- a/converters/pecl-fribidi/Makefile
+++ b/converters/pecl-fribidi/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PECL extension for the Unicode Bidi algorithm
 
-LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
+LIB_DEPENDS=	libfribidi.so:converters/fribidi
 
 USES=		pkgconfig tar:tgz
 USE_PHP=	yes
diff --git a/converters/php5-bsdconv/Makefile b/converters/php5-bsdconv/Makefile
index 75e829af4bb4..305907469e52 100644
--- a/converters/php5-bsdconv/Makefile
+++ b/converters/php5-bsdconv/Makefile
@@ -11,7 +11,7 @@ COMMENT=	PHP wrapper for bsdconv
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/converters/py-bsdconv/Makefile b/converters/py-bsdconv/Makefile
index 09b66959b21b..ca1769400cf9 100644
--- a/converters/py-bsdconv/Makefile
+++ b/converters/py-bsdconv/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python wrapper for bsdconv
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buganini
diff --git a/converters/py-pisa/Makefile b/converters/py-pisa/Makefile
index 0f27c329bf7f..c3246fe662d7 100644
--- a/converters/py-pisa/Makefile
+++ b/converters/py-pisa/Makefile
@@ -13,10 +13,10 @@ COMMENT=	PDF generator using HTML and CSS
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0.11.1:${PORTSDIR}/www/py-html5lib \
-		${PYTHON_PKGNAMEPREFIX}reportlab2>=2.1:${PORTSDIR}/print/py-reportlab2 \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:${PORTSDIR}/print/py-pdf
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>=0.11.1:www/py-html5lib \
+		${PYTHON_PKGNAMEPREFIX}reportlab2>=2.1:print/py-reportlab2 \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/converters/py-rencode/Makefile b/converters/py-rencode/Makefile
index 67790fd9f76f..be44b4aae39b 100644
--- a/converters/py-rencode/Makefile
+++ b/converters/py-rencode/Makefile
@@ -11,7 +11,7 @@ COMMENT=	R-encoding and r-decoding implementation
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	cython:${PORTSDIR}/lang/cython
+BUILD_DEPENDS=	cython:lang/cython
 
 USE_PYTHON=	autoplist distutils
 USES=		python tar:xz
diff --git a/converters/py-zfec/Makefile b/converters/py-zfec/Makefile
index 957d660ae3ee..3eec1695371e 100644
--- a/converters/py-zfec/Makefile
+++ b/converters/py-zfec/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Fast erasure codec for Python
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
-BUILD_DEPENDS=	darcsver:${PORTSDIR}/devel/py-darcsver \
-		unsort:${PORTSDIR}/devel/py-pyutil
+BUILD_DEPENDS=	darcsver:devel/py-darcsver \
+		unsort:devel/py-pyutil
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/converters/rcctools/Makefile b/converters/rcctools/Makefile
index d6b5cbd3bf38..3ea32f45ce3b 100644
--- a/converters/rcctools/Makefile
+++ b/converters/rcctools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/rusxmms/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	admin@lissyara.su
 COMMENT=	Charset conversion utility with language and encoding autodetection
 
-LIB_DEPENDS=	librcc.so:${PORTSDIR}/devel/librcc
+LIB_DEPENDS=	librcc.so:devel/librcc
 
 USES=		tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/converters/rubygem-bsdconv/Makefile b/converters/rubygem-bsdconv/Makefile
index 24c4a5e8d623..bd9eb0f18995 100644
--- a/converters/rubygem-bsdconv/Makefile
+++ b/converters/rubygem-bsdconv/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Ruby wrapper for bsdconv
 
 LICENSE=	ISCL
 
-LIB_DEPENDS=	libbsdconv.so:${PORTSDIR}/converters/bsdconv
+LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 CONFIGURE_ARGS+=--with-bsdconv-dir=${LOCALBASE}
 
diff --git a/converters/shftool/Makefile b/converters/shftool/Makefile
index a2746d90b341..d5383586a4cc 100644
--- a/converters/shftool/Makefile
+++ b/converters/shftool/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.df.lth.se/~triad/krad/shftool/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converter for the Standard Hex Format (SHF)
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 GNU_CONFIGURE=	yes
 
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 247c1c94473f..eaae5cbdd3fd 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Program for uu/xx/Base64/BinHex/yEnc de-/encoding
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libuu.so:${PORTSDIR}/converters/uulib
+LIB_DEPENDS=	libuu.so:converters/uulib
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-tcl
diff --git a/converters/uudx/Makefile b/converters/uudx/Makefile
index f264731e57c0..97f002dfb9db 100644
--- a/converters/uudx/Makefile
+++ b/converters/uudx/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extractor from uuencoded files
 
-BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+BUILD_DEPENDS=	nkf:japanese/nkf
 
 USES=		lha
 NO_WRKSUBDIR=	yes
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index 9a4d9c27d301..937455fc5d70 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Convert HTML (or live webpages) to PDF or image
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libpng.so:graphics/png
 
 USES=		gmake iconv jpeg perl5 pkgconfig tar:bzip2
 USE_XORG=	x11 xext xrender
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index ef8173a2c3f4..2063c44fe03c 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -14,7 +14,7 @@ COMMENT=	X11 program for uu/xx/Base64/BinHex/yEnc de-/encoding
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libuu.so:${PORTSDIR}/converters/uulib
+LIB_DEPENDS=	libuu.so:converters/uulib
 
 USES=		desthack tk
 GNU_CONFIGURE=	yes
diff --git a/converters/ytnef/Makefile b/converters/ytnef/Makefile
index d36399fa565d..0cebfb2b6ddc 100644
--- a/converters/ytnef/Makefile
+++ b/converters/ytnef/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Unpack data in MS Outlook TNEF format
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libytnef.so:${PORTSDIR}/devel/libytnef
-RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools
+LIB_DEPENDS=	libytnef.so:devel/libytnef
+RUN_DEPENDS=	p5-MIME-Tools>=0:mail/p5-MIME-Tools
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	src/ytnef/*.pl
diff --git a/converters/zbase32/Makefile b/converters/zbase32/Makefile
index eff1492810a8..4656dfeb1567 100644
--- a/converters/zbase32/Makefile
+++ b/converters/zbase32/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Base32 Encoder/Decoder
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:${PORTSDIR}/devel/py-setuptools_darcs
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python