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

With hat:	portmgr
Sponsored by:	Absolight

506 files changed, 2046 insertions, 2046 deletions

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