In preparation for making libtool generate libraries with a sane name, fix all

LIB_DEPENDS in audio

With hat:	portmgr

271 files changed, 832 insertions, 758 deletions

diff --git a/audio/adplay/Makefile b/audio/adplay/Makefile
index 2eabfd4..36a27f1 100644
--- a/audio/adplay/Makefile
+++ b/audio/adplay/Makefile
@@ -15,7 +15,7 @@ COMMENT=	AdLib player using adplug library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	adplug:${PORTSDIR}/audio/libadplug
+LIB_DEPENDS=	libadplug.so:${PORTSDIR}/audio/libadplug
 
 GNU_CONFIGURE=	yes
 WANT_SDL=	yes
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index fba16c4..00799a0 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -11,14 +11,14 @@ MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE music player
 
-LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
-		tag-extras:${PORTSDIR}/audio/taglib-extras \
-		lastfm:${PORTSDIR}/audio/liblastfm \
-		ofa:${PORTSDIR}/audio/libofa \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg \
-		qjson:${PORTSDIR}/devel/qjson \
-		qca:${PORTSDIR}/devel/qca \
-		dbus-1:${PORTSDIR}/devel/dbus
+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
@@ -55,7 +55,7 @@ RUN_DEPENDS+=	clamz:${PORTSDIR}/net/clamz
 .endif
 
 .if ${PORT_OPTIONS:MIPOD}
-LIB_DEPENDS+=	gpod:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	libgpod.so:${PORTSDIR}/audio/libgpod
 USE_GNOME+=	gdkpixbuf2 glib20
 PLIST_SUB+=	IPOD=""
 .else
@@ -64,8 +64,8 @@ PLIST_SUB+=	IPOD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMP3TUNES}
-LIB_DEPENDS+=	loudmouth-1:${PORTSDIR}/net-im/loudmouth \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth \
+		libcurl.so:${PORTSDIR}/ftp/curl
 USE_GNOME+=	glib20 libxml2
 PLIST_SUB+=	MP3TUNES=""
 .else
@@ -74,7 +74,7 @@ PLIST_SUB+=	MP3TUNES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMTP}
-LIB_DEPENDS+=	mtp:${PORTSDIR}/audio/libmtp
+LIB_DEPENDS+=	libmtp.so:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	MTP=""
 .else
 CMAKE_ARGS+=	-DWITH_Mtp:BOOL=Off
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index 26295c3..764a9ef 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -11,26 +11,26 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \
 MAINTAINER=	jsa@FreeBSD.org
 COMMENT=	Music player with rich features
 
-LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		FLAC:${PORTSDIR}/audio/flac \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		oggz:${PORTSDIR}/audio/liboggz \
-		speex:${PORTSDIR}/audio/speex \
-		mad:${PORTSDIR}/audio/libmad \
-		modplug:${PORTSDIR}/audio/libmodplug \
-		mpcdec:${PORTSDIR}/audio/musepack \
-		mac:${PORTSDIR}/audio/mac \
-		tag:${PORTSDIR}/audio/taglib \
-		lrdf:${PORTSDIR}/textproc/liblrdf \
-		cdio:${PORTSDIR}/sysutils/libcdio \
-		mp3lame:${PORTSDIR}/audio/lame \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg \
-		strfunc:${PORTSDIR}/devel/libstrfunc \
-		wavpack:${PORTSDIR}/audio/wavpack \
-		xslt:${PORTSDIR}/textproc/libxslt \
-		cddb:${PORTSDIR}/audio/libcddb \
-		strfunc:${PORTSDIR}/devel/libstrfunc
+LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		liboggz.so:${PORTSDIR}/audio/liboggz \
+		libspeex.so:${PORTSDIR}/audio/speex \
+		libmad.so:${PORTSDIR}/audio/libmad \
+		libmodplug.so:${PORTSDIR}/audio/libmodplug \
+		libmpcdec.so:${PORTSDIR}/audio/musepack \
+		libmac.so:${PORTSDIR}/audio/mac \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		liblrdf.so:${PORTSDIR}/textproc/liblrdf \
+		libcdio.so:${PORTSDIR}/sysutils/libcdio \
+		libmp3lame.so:${PORTSDIR}/audio/lame \
+		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+		libstrfunc.so:${PORTSDIR}/devel/libstrfunc \
+		libwavpack.so:${PORTSDIR}/audio/wavpack \
+		libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libcddb.so:${PORTSDIR}/audio/libcddb \
+		libstrfunc.so:${PORTSDIR}/devel/libstrfunc
 
 NO_STAGE=	yes
 USES=		gmake pkgconfig gettext
@@ -49,14 +49,14 @@ OPTIONS_DEFINE=	JACK PULSEAUDIO DOCS
 .if ${PORT_OPTIONS:MJACK}
 CONFIGURE_ARGS+=	--with-jack=no
 .else
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 CONFIGURE_ARGS+=	--with-jack=yes
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 CONFIGURE_ARGS+=	--with-pulse=no
 .else
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=	--with-pulse=yes
 .endif
 post-patch:
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index c70011d..e52705f 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Multichannel digital audio workstation
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	lo:${PORTSDIR}/audio/liblo \
-		lrdf:${PORTSDIR}/textproc/liblrdf \
-		aubio:${PORTSDIR}/audio/aubio \
-		fftw3:${PORTSDIR}/math/fftw3 \
-		boost_date_time:${PORTSDIR}/devel/boost-libs \
-		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26
+LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo \
+		liblrdf.so:${PORTSDIR}/textproc/liblrdf \
+		libaubio.so:${PORTSDIR}/audio/aubio \
+		libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
+		libgnomecanvasmm-2.6.so:${PORTSDIR}/graphics/libgnomecanvasmm26
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
@@ -40,7 +40,7 @@ SCONS_ENV+=	VST=yes
 BUILD_DEPENDS+=	winegcc:${PORTSDIR}/emulators/wine \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS+=	wine.1:${PORTSDIR}/emulators/wine
+LIB_DEPENDS+=	libwine.so:${PORTSDIR}/emulators/wine
 
 PLIST_SUB+=	NO_VST="@comment "
 PLIST_SUB+=	VST=""
diff --git a/audio/arss/Makefile b/audio/arss/Makefile
index d8e7d63..633d19e 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=	fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 
 WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index 396aad3..0eb517b 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Dockable CD player for AfterStep or WindowMaker
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	workman:${PORTSDIR}/audio/libworkman
+LIB_DEPENDS=	libworkman.so:${PORTSDIR}/audio/libworkman
 
 NO_STAGE=	yes
 USES=		imake
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index 0a78f81..f89c4e0 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight GTK+ CD ripper
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	cddb:${PORTSDIR}/audio/libcddb
+LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
 RUN_DEPENDS=	${LOCALBASE}/bin/cdparanoia:${PORTSDIR}/audio/cdparanoia
 
 OPTIONS_DEFINE=	LAME OGG FLAC OPUS WAVPACK APE WINDOWS_CHARS NLS DOCS
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index 8329cdf..762ff2d 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -11,11 +11,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for audio labelling
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		jack:${PORTSDIR}/audio/jack \
-		fftw3f:${PORTSDIR}/math/fftw3-float \
-		lash:${PORTSDIR}/audio/lash
+LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libjack.so:${PORTSDIR}/audio/jack \
+		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+		liblash.so:${PORTSDIR}/audio/lash
 
 GNU_CONFIGURE=	yes
 # --disable-complex: does not compile due to missing carg(3) et al.
diff --git a/audio/bmp-crossfade/Makefile b/audio/bmp-crossfade/Makefile
index 9783362..2333f2d 100644
--- a/audio/bmp-crossfade/Makefile
+++ b/audio/bmp-crossfade/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 APP=		bmp
-LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
+LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
 NO_STAGE=	yes
 MASTERDIR=	${.CURDIR}/../xmms-crossfade
diff --git a/audio/bmp-fc/Makefile b/audio/bmp-fc/Makefile
index d9bfcf6..d29f1d7 100644
--- a/audio/bmp-fc/Makefile
+++ b/audio/bmp-fc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Future Composer input plug-in for beep-media-player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
+LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
 USES=		pkgconfig
 USE_BZIP2=	yes
diff --git a/audio/bmp-festalon/Makefile b/audio/bmp-festalon/Makefile
index cdd75ff..125af46 100644
--- a/audio/bmp-festalon/Makefile
+++ b/audio/bmp-festalon/Makefile
@@ -9,7 +9,7 @@ LICENSE=	GPLv2
 
 MASTERDIR=	${.CURDIR}/../festalon
 
-LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
+LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
 CONFIGURE_ARGS+=	--enable-interface=bmp
 
diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile
index 6dc7972..fc94b5d 100644
--- a/audio/bmp-wma/Makefile
+++ b/audio/bmp-wma/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.berlios.de/bmp-plugins/
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	WMA input plugin for beep-media-player
 
-LIB_DEPENDS=	beep.2:${PORTSDIR}/multimedia/beep-media-player
+LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
 PLIST_FILES=	lib/bmp/Input/libwma.so \
 		lib/bmp/Input/libwma.la \
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile
index efc641d..b756bb2 100644
--- a/audio/boodler/Makefile
+++ b/audio/boodler/Makefile
@@ -34,7 +34,7 @@ pre-everything::
 	@${ECHO} ""
 
 .if ${DRIVER:L} == "esd"
-LIB_DEPENDS+=	esd.2:${PORTSDIR}/audio/esound
+LIB_DEPENDS+=	libesd.so:${PORTSDIR}/audio/esound
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/audio/bristol/Makefile b/audio/bristol/Makefile
index dca3ce8..bf8453b 100644
--- a/audio/bristol/Makefile
+++ b/audio/bristol/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Vintage synthesiers emulation for electric pianos and organs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
-		fluidsynth:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 
 NO_STAGE=	yes
 USE_LDCONFIG=	yes
diff --git a/audio/cantus_3/Makefile b/audio/cantus_3/Makefile
index a667d67..5cdf7f2 100644
--- a/audio/cantus_3/Makefile
+++ b/audio/cantus_3/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES=	SF/${PORTNAME}/Testing%20%28unstable%29/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for tagging and renaming MP3 and OGG/Vorbis files
 
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		ogg:${PORTSDIR}/audio/libogg \
-		sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 CONFLICTS=	cantus-1*
 
diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index f4a51a2..6ca1744 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://www.gnutelephony.org/dist/tarballs/
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	C++ class framework for manipulating audio files
 
-LIB_DEPENDS=	ccgnu2:${PORTSDIR}/devel/commoncpp \
-    		ucommon:${PORTSDIR}/devel/ucommon \
-		gsm:${PORTSDIR}/audio/gsm \
-		speex:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libccgnu2.so:${PORTSDIR}/devel/commoncpp \
+    		libucommon.so:${PORTSDIR}/devel/ucommon \
+		libgsm.so:${PORTSDIR}/audio/gsm \
+		libspeex.so:${PORTSDIR}/audio/speex
 
 CONFLICTS=	ccaudio-[0-9]*
 
diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 8e40dab..45c269b 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Cross-platform music player based on Amarok 1.4
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
-		tag:${PORTSDIR}/audio/taglib \
-		chromaprint:${PORTSDIR}/audio/chromaprint \
-		protobuf:${PORTSDIR}/devel/protobuf \
-		qjson:${PORTSDIR}/devel/qjson \
-		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libchromaprint.so:${PORTSDIR}/audio/chromaprint \
+		libprotobuf.so:${PORTSDIR}/devel/protobuf \
+		libqjson.so:${PORTSDIR}/devel/qjson \
+		libfftw3.so:${PORTSDIR}/math/fftw3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
@@ -79,7 +79,7 @@ CMAKE_ARGS+=	-DENABLE_USE_BUILTIN_TAGLIB=OFF
 
 .if ${PORT_OPTIONS:MAUDIOCD}
 CMAKE_ARGS+=	-DENABLE_AUDIOCD=ON
-LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 .else
 CMAKE_ARGS+=	-DENABLE_AUDIOCD=OFF
 .endif
@@ -112,28 +112,28 @@ CMAKE_ARGS+=	-DENABLE_GOOGLE_DRIVE=OFF
 
 .if ${PORT_OPTIONS:MGPOD}
 CMAKE_ARGS+=	-DENABLE_LIBGPOD=ON
-LIB_DEPENDS+=	gpod:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	libgpod.so:${PORTSDIR}/audio/libgpod
 .else
 CMAKE_ARGS+=	-DENABLE_LIBGPOD=OFF
 .endif
 
 .if ${PORT_OPTIONS:MLASTFM}
 CMAKE_ARGS+=	-DENABLE_LIBLASTFM=ON
-LIB_DEPENDS+=	lastfm:${PORTSDIR}/audio/liblastfm
+LIB_DEPENDS+=	liblastfm.so:${PORTSDIR}/audio/liblastfm
 .else
 CMAKE_ARGS+=	-DENABLE_LIBLASTFM=OFF
 .endif
 
 .if ${PORT_OPTIONS:MMTP}
 CMAKE_ARGS+=	-DENABLE_LIBMTP=ON
-LIB_DEPENDS+=	mtp:${PORTSDIR}/audio/libmtp
+LIB_DEPENDS+=	libmtp.so:${PORTSDIR}/audio/libmtp
 .else
 CMAKE_ARGS+=	-DENABLE_LIBMTP=OFF
 .endif
 
 .if ${PORT_OPTIONS:MSPOTIFY}
 CMAKE_ARGS+=	-DENABLE_SPOTIFY=ON
-LIB_DEPENDS+=	qca:${PORTSDIR}/devel/qca
+LIB_DEPENDS+=	libqca.so:${PORTSDIR}/devel/qca
 .else
 CMAKE_ARGS+=	-DENABLE_SPOTIFY=OFF -DENABLE_SPOTIFY_BLOB=OFF
 .endif
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 7205ca8..e4fc06d 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -28,7 +28,7 @@ DISCID_DESC=	DISCID support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=CONFIG_FLAC=y
 PLIST_SUB+=	FLAC=""
 .else
@@ -37,7 +37,7 @@ PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=CONFIG_MAD=y
 PLIST_SUB+=	MAD=""
 .else
@@ -46,7 +46,7 @@ PLIST_SUB+=	MAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 CONFIGURE_ARGS+=CONFIG_MODPLUG=y
 PLIST_SUB+=	MODPLUG=""
 .else
@@ -55,7 +55,7 @@ PLIST_SUB+=	MODPLUG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=CONFIG_MIKMOD=y
 PLIST_SUB+=	MIKMOD=""
 .else
@@ -63,7 +63,7 @@ PLIST_SUB+=	MIKMOD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 CONFIGURE_ARGS+=CONFIG_MPC=y
 PLIST_SUB+=	MPC=""
 .else
@@ -72,7 +72,7 @@ PLIST_SUB+=	MPC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MTREMOR}
-LIB_DEPENDS+=	vorbisfile:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=CONFIG_VORBIS=y
 PLIST_SUB+=	VORBIS=""
 .else
@@ -81,13 +81,13 @@ PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTREMOR}
-LIB_DEPENDS+=	vorbisidec:${PORTSDIR}/audio/libtremor
+LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
 CONFIGURE_ARGS+=CONFIG_TREMOR=y
 .endif
 
 .if ${PORT_OPTIONS:MMP4}
-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
-LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
 CONFIGURE_ARGS+=CONFIG_MP4=y
 PLIST_SUB+=	MP4=""
 .else
@@ -96,7 +96,7 @@ PLIST_SUB+=	MP4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 CONFIGURE_ARGS+=CONFIG_AAC=y
 PLIST_SUB+=	AAC=""
 .else
@@ -105,7 +105,7 @@ PLIST_SUB+=	AAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 CONFIGURE_ARGS+=CONFIG_WAVPACK=y
 PLIST_SUB+=	WAVPACK=""
 .else
@@ -124,7 +124,7 @@ PLIST_SUB+=	FFMPEG="@comment "
 #.endif
 
 .if ${PORT_OPTIONS:MAO}
-LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=CONFIG_AO=y
 PLIST_SUB+=	AO=""
 .else
@@ -133,7 +133,7 @@ PLIST_SUB+=	AO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=CONFIG_PULSE=y
 PLIST_SUB+=	PULSEAUDIO=""
 .else
@@ -142,7 +142,7 @@ PLIST_SUB+=	PULSEAUDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	cddb:${PORTSDIR}/audio/libcddb
+LIB_DEPENDS+=	libcddb.so:${PORTSDIR}/audio/libcddb
 CONFIGURE_ARGS+=CONFIG_CDDB=y
 PLIST_SUB+=	CDDB=""
 .else
@@ -151,7 +151,7 @@ PLIST_SUB+=	CDDB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCDIO}
-LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 CONFIGURE_ARGS+=CONFIG_CDIO=y
 PLIST_SUB+=	CDIO=""
 .else
@@ -160,7 +160,7 @@ PLIST_SUB+=	CDIO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCUE}
-LIB_DEPENDS+=	cue:${PORTSDIR}/textproc/libcue
+LIB_DEPENDS+=	libcue.so:${PORTSDIR}/textproc/libcue
 CONFIGURE_ARGS+=CONFIG_CUE=y
 PLIST_SUB+=	CUE=""
 .else
@@ -169,7 +169,7 @@ PLIST_SUB+=	CUE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDISCID}
-LIB_DEPENDS+=	discid:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS+=	libdiscid.so:${PORTSDIR}/audio/libdiscid
 CONFIGURE_ARGS+=CONFIG_DISCID=y
 .else
 CONFIGURE_ARGS+=CONFIG_DISCID=n
diff --git a/audio/creox/Makefile b/audio/creox/Makefile
index 9921794..6ff518f 100644
--- a/audio/creox/Makefile
+++ b/audio/creox/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Realtime sound processor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	laudrup
diff --git a/audio/cripple/Makefile b/audio/cripple/Makefile
index 616c3a0..601e5d4 100644
--- a/audio/cripple/Makefile
+++ b/audio/cripple/Makefile
@@ -14,7 +14,7 @@ NO_STAGE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame\
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
 		cdda2wav:${PORTSDIR}/sysutils/cdrtools
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index f757c3f..976eff9 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -21,7 +21,7 @@ DIST_SUBDIR=	csound
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 \
 		${LOCALBASE}/include/gmm/gmm.h:${PORTSDIR}/math/gmm++ \
 		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 OPTIONS_DEFINE=	ALSA DSSI FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK
 OPTIONS_DEFAULT=FLTK
@@ -55,7 +55,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 SCONS_ARGS+=	useALSA=1
 PLIST_SUB+=	ALSA=""
 ALSA_H=		alsa/asoundlib.h
@@ -76,7 +76,7 @@ PLIST_SUB+=	DSSI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLUIDSYNTH}
-LIB_DEPENDS+=	fluidsynth:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS+=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 PLIST_SUB+=	FLUIDSYNTH=""
 FLUIDSYNTH_H=	fluidsynth.h
 .else
@@ -85,7 +85,7 @@ FLUIDSYNTH_H=	##fluidsynth.h##
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 SCONS_ARGS+=	useJack=1
 PLIST_SUB+=	JACK=""
 .else
@@ -94,7 +94,7 @@ PLIST_SUB+=	JACK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOSC}
-LIB_DEPENDS+=	lo:${PORTSDIR}/audio/liblo
+LIB_DEPENDS+=	liblo.so:${PORTSDIR}/audio/liblo
 SCONS_ARGS+=	useOSC=1
 PLIST_SUB+=	OSC=""
 .else
@@ -117,7 +117,7 @@ PORTAUDIO_R=	# empty
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSEAUDIO=""
 PULSEAUDIO_H=	pulse/simple.h
 .else
@@ -126,7 +126,7 @@ PULSEAUDIO_H=	##pulse/simple.h##
 .endif
 
 .if ${PORT_OPTIONS:MFLTK}
-LIB_DEPENDS+=	fltk:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS+=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 PLIST_SUB+=	FLTK=""
 SCONS_ARGS+=	buildCsound5GUI=1 buildCSEditor=1 buildWinsound=1 useFLTK=1
 .else
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index bec14ea..28c6fd7 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -36,56 +36,56 @@ MAN5=		darkice.cfg.5
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 CONFIGURE_ARGS+=	--with-jack-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=	--with-pulseaudio-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-pulseaudio
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MOPUS}
-LIB_DEPENDS+=	opus:${PORTSDIR}/audio/opus
+LIB_DEPENDS+=	libopus.so:${PORTSDIR}/audio/opus
 CONFIGURE_ARGS+=	--with-opus-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-opus
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-lame
 .endif
 
 .if ${PORT_OPTIONS:MTWOLAME}
-LIB_DEPENDS+=	twolame:${PORTSDIR}/audio/twolame
+LIB_DEPENDS+=	libtwolame.so:${PORTSDIR}/audio/twolame
 CONFIGURE_ARGS+=	--with-twolame-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-twolame
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--with-faac-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-faac
 .endif
 
 .if ${PORT_OPTIONS:MAACPLUS}
-LIB_DEPENDS+=	aacplus:${PORTSDIR}/audio/libaacplus \
+LIB_DEPENDS+=	libaacplus.so:${PORTSDIR}/audio/libaacplus \
 		samplerate:${PORTSDIR}/audio/libsamplerate
 CONFIGURE_ARGS+=	--with-aacplus-prefix=${LOCALBASE} \
 			--with-samplerate-prefix=${LOCALBASE}
diff --git a/audio/dcd/Makefile b/audio/dcd/Makefile
index 8e39601..fff786f 100644
--- a/audio/dcd/Makefile
+++ b/audio/dcd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}player/${PORTNAME}player/${PORTVERSION}
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A simple, programmable, intelligent CD player
 
-LIB_DEPENDS=	cdaudio:${PORTSDIR}/audio/libcdaudio
+LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
 
 USES=		gmake
 NO_STAGE=	yes
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 4f308c0..c4fc99e 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Ultimate music player for Unix-like systems
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	samplerate:${PORTSDIR}/audio/libsamplerate \
-		mad:${PORTSDIR}/audio/libmad \
-		execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libmad.so:${PORTSDIR}/audio/libmad \
+		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig gettext iconv shebangfix
@@ -68,7 +68,7 @@ VFS_ZIP_DESC=		ZIP support
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 PLIST_SUB+=	PULSE=""
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 .else
 CONFIGURE_ARGS+=	--disable-pulse
 PLIST_SUB+=	PULSE="@comment "
@@ -85,7 +85,7 @@ PLIST_SUB+=	GUI="@comment "
 
 .if ${PORT_OPTIONS:MVFS}
 PLIST_SUB+=	VFS=""
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--disable-vfs-curl
 PLIST_SUB+=	VFS="@comment "
@@ -93,7 +93,7 @@ PLIST_SUB+=	VFS="@comment "
 
 .if ${PORT_OPTIONS:MLASTFM}
 PLIST_SUB+=	LASTFM=""
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--disable-lfm
 PLIST_SUB+=	LASTFM="@comment "
@@ -103,7 +103,7 @@ PLIST_SUB+=	LASTFM="@comment "
 .if ${PORT_OPTIONS:MVFS}
 CONFIGURE_ARTS+=	--disable-artwork-imlib2
 PLIST_SUB+=	ART=""
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
 		jpeg:${PORTSDIR}/graphics/jpeg
 .else
 BROKEN=		VFS plugin required for album art loader, please rerun 'make config' and either disable ART or enable VFS
@@ -157,7 +157,7 @@ PLIST_SUB+=	HOTKEYS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MOGG}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	OGG=""
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
@@ -176,7 +176,7 @@ PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
 .else
 CONFIGURE_ARGS+=	--disable-flac
@@ -184,7 +184,7 @@ PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 PLIST_SUB+=	SNDFILE=""
 .else
 CONFIGURE_ARGS+=	--disable-sndfile
@@ -192,7 +192,7 @@ PLIST_SUB+=	SNDFILE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MWAV}
-LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 PLIST_SUB+=	WAV=""
 .else
 CONFIGURE_ARGS+=	--disable-wavpack
@@ -201,8 +201,8 @@ PLIST_SUB+=	WAV="@comment "
 
 .if ${PORT_OPTIONS:MCDDA}
 PLIST_SUB+=	CDDA=""
-LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio \
-		cddb:${PORTSDIR}/audio/libcddb
+LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
+		libcddb.so:${PORTSDIR}/audio/libcddb
 .else
 CONFIGURE_ARGS+=	--disable-cdda
 PLIST_SUB+=	CDDA="@comment "
@@ -224,7 +224,7 @@ PLIST_SUB+=	DUMB="@comment "
 
 .if ${PORT_OPTIONS:MNOTIFY}
 PLIST_SUB+=	NOTIFY=""
-LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 .else
 CONFIGURE_ARGS+=	--disable-notify
 PLIST_SUB+=	NOTIFY="@comment "
@@ -261,7 +261,7 @@ PLIST_SUB+=	DCA="@comment "
 
 .if ${PORT_OPTIONS:MAAC}
 PLIST_SUB+=	AAC=""
-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 .else
 CONFIGURE_ARGS+=	--disable-aac
 PLIST_SUB+=	AAC="@comment "
@@ -330,7 +330,7 @@ PLIST_SUB+=	PSF="@comment "
 
 .if ${PORT_OPTIONS:MDSP}
 PLIST_SUB+=	DSP=""
-LIB_DEPENDS+=	samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 .else
 CONFIGURE_ARGS+=	--disable-src
 PLIST_SUB+=	DSP="@comment "
@@ -345,7 +345,7 @@ PLIST_SUB+=	MONO2STEREO="@comment "
 
 .if ${PORT_OPTIONS:MVFS_ZIP}
 PLIST_SUB+=	VFS_ZIP=""
-LIB_DEPENDS+=	zip:${PORTSDIR}/archivers/libzip
+LIB_DEPENDS+=	libzip.so:${PORTSDIR}/archivers/libzip
 .else
 CONFIGURE_ARGS+=	--disable-vfs-zip
 PLIST_SUB+=	VFS_ZIP="@comment "
diff --git a/audio/decibel-audio-player/Makefile b/audio/decibel-audio-player/Makefile
index 1e662c3..a26dc7a 100644
--- a/audio/decibel-audio-player/Makefile
+++ b/audio/decibel-audio-player/Makefile
@@ -53,12 +53,12 @@ USE_GSTREAMER+=	mp3
 .endif
 
 .if ${PORT_OPTIONS:MMPEG4IP}
-LIB_DEPENDS+=	mp4v2.10:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS+=	libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
 USE_GSTREAMER+=	faad
 .endif
 
 .if ${PORT_OPTIONS:MOGG}
-USE_GSTREAMER+=	ogg
+USE_GSTREAMER+=	libogg.so
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
@@ -70,7 +70,7 @@ USE_GSTREAMER+=	vorbis
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 USE_GSTREAMER+=	wavpack
 .endif
 
diff --git a/audio/dumb/Makefile b/audio/dumb/Makefile
index 1ef1c08..c0e55aa 100644
--- a/audio/dumb/Makefile
+++ b/audio/dumb/Makefile
@@ -19,7 +19,7 @@ ALLEGRO_DESC=	Enable allegro support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALLEGRO}
-LIB_DEPENDS+=	alleg:${PORTSDIR}/devel/allegro
+LIB_DEPENDS+=	liballeg.so:${PORTSDIR}/devel/allegro
 PLIST_SUB+=	ALLEGRO=""
 MAKE_ARGS=	_PORT_ALLEGRO_CFLAGS="`allegro-config --cflags`"
 MAKE_ARGS+=	LINK_ALLEGRO="-lm -L${LOCALBASE}/lib -lalleg"
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 3810f6c..3e2ea3c 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Author and playback unencrypted and uncompressed Audio-DVDs
 
-LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 	libogg.so:${PORTSDIR}/audio/libogg \
 	libsox.so:${PORTSDIR}/audio/sox \
 	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 55c7b96..58cba3f 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFINE=	WAVPACK
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=		wavpack:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=		libwavpack.so:${PORTSDIR}/audio/wavpack
 CONFIGURE_ARGS+=	--enable-wavpack
 .else
 CONFIGURE_ARGS+=	--disable-wavpack
diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile
index a062e03..f2c64da 100644
--- a/audio/enscribe/Makefile
+++ b/audio/enscribe/Makefile
@@ -11,11 +11,11 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Create digital audio watermark images from photographic images
 
-LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
-		gd:${PORTSDIR}/graphics/gd \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libgd.so:${PORTSDIR}/graphics/gd \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index d4d4662..93f4b04 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -22,8 +22,8 @@ OPTIONS_RADIO=	AUDIO_SYSTEM
 OPTIONS_RADIO_AUDIO_SYSTEM=	PORTAUDIO PULSEAUDIO RUNTIME
 RUNTIME_DESC=	Sound interface selected at runtime
 
-PORTAUDIOLIB=	portaudio:${PORTSDIR}/audio/portaudio
-PULSEAUDIOLIB=	pulse:${PORTSDIR}/audio/pulseaudio
+PORTAUDIOLIB=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PULSEAUDIOLIB=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 CONFLICTS=	speak-1.[0-9]
 
diff --git a/audio/esperanza/Makefile b/audio/esperanza/Makefile
index e2b163a..5b0451b 100644
--- a/audio/esperanza/Makefile
+++ b/audio/esperanza/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:R}+git${PORTVERSION:E}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Advanced QT4 XMMS2 client
 
-LIB_DEPENDS=	xmmsclient++.4:${PORTSDIR}/audio/cpp-xmms2
+LIB_DEPENDS=	libxmmsclient++.so:${PORTSDIR}/audio/cpp-xmms2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}+git${PORTVERSION:E}
 
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 8be372d..723a356 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -42,7 +42,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:${PORTSDIR}/devel/py-dbus
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index 37660b8..b04abd0 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=	fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 
 USES=        pathfix pkgconfig
 NO_STAGE=	yes
diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile
index 16a95cd..4be9f3e 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=	A command line utility for streaming to icecast servers
 
-LIB_DEPENDS=	shout:${PORTSDIR}/audio/libshout2 \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout2 \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 OPTIONS_DEFINE=	TAGLIB
 OPTIONS_DEFAULT=	TAGLIB
@@ -41,7 +41,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .if ${PORT_OPTIONS:MTAGLIB}
 CONFIGURE_ARGS+=	--without-taglib
 .else
-LIB_DEPENDS+=		tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS+=		libtag.so:${PORTSDIR}/audio/taglib
 CONFIGURE_ARGS+=	--with-taglib=${LOCALBASE}
 .endif
 
diff --git a/audio/fapg/Makefile b/audio/fapg/Makefile
index ca3692e..c5e7850 100644
--- a/audio/fapg/Makefile
+++ b/audio/fapg/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://royale.zerezo.com/${PORTNAME}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast Audio Playlist Generator
 
-LIB_DEPENDS=	uriparser:${PORTSDIR}/net/uriparser
+LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
 
 MAKE_ARGS+=	CC="${CC}"
 NO_STAGE=	yes
diff --git a/audio/fdmf/Makefile b/audio/fdmf/Makefile
index 3ed40cd..8abf752 100644
--- a/audio/fdmf/Makefile
+++ b/audio/fdmf/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://w140.com/audio/ CENKES
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Find similar music by perceptual hashing
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
-		plot.4:${PORTSDIR}/graphics/plotutils \
-		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libplot.so:${PORTSDIR}/graphics/plotutils \
+		libfftw3.so:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
 		mpg123:${PORTSDIR}/audio/mpg123 \
 		ogg123:${PORTSDIR}/audio/vorbis-tools \
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index ed94ada..e908253 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+=	samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index b0dbfc1..1a70e65 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -84,7 +84,7 @@ post-patch::
 
 .for m in nas esd
 .	if ${PORT_OPTIONS:M${m:U}}
-LIB_DEPENDS+=	${m:nas=audio}:${PORTSDIR}/audio/${m:esd=esound}
+LIB_DEPENDS+=	lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound}
 post-patch::
 	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:U}_AUDIO,INCLUDE_MODULES += ${m:U}_AUDIO,' \
 		${WRKDIR}/*/config/config.in
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
index ba5e237..37308f9 100644
--- a/audio/firefly/Makefile
+++ b/audio/firefly/Makefile
@@ -18,9 +18,9 @@ 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=	ogg:${PORTSDIR}/audio/libogg \
-		sqlite3:${PORTSDIR}/databases/sqlite3 \
-		id3tag:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag
 
 GNU_CONFIGURE=	yes
 NO_STAGE=	yes
diff --git a/audio/fluidsynth-dssi/Makefile b/audio/fluidsynth-dssi/Makefile
index 90d9af8..a3d2658 100644
--- a/audio/fluidsynth-dssi/Makefile
+++ b/audio/fluidsynth-dssi/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/dssi/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wrapper for FluidSynth allowing it to function as a DSSI plugin
 
-LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
-		lo:${PORTSDIR}/audio/liblo \
-		fluidsynth.1:${PORTSDIR}/audio/fluidsynth \
-		jack.0:${PORTSDIR}/audio/jack
+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
 
 GNU_CONFIGURE=	yes
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index 423fda1..4d40061 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Free Music Instrument Tuner
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 
 USE_BZIP2=	yes
 USE_XORG=	xmu
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index fdd9775..9ccad54 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=	mpd.4:${PORTSDIR}/audio/libmpd \
-		curl:${PORTSDIR}/ftp/curl \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index ed8ee6b..d786361 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	NAS DOCS
 .if ${PKGNAMEPREFIX} == ""
 
 .if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
+LIB_DEPENDS+=	libaudio.so:${PORTSDIR}/audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas
 .endif
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index 768cdcb..4d393e7 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -19,9 +19,9 @@ BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \
 # 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=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
-		lo:${PORTSDIR}/audio/liblo \
-		jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
+		liblo.so:${PORTSDIR}/audio/liblo \
+		libjack.so:${PORTSDIR}/audio/jack
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index 96e1370..6fdd78b 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Instrument editor for gig files
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS=	gig.10:${PORTSDIR}/audio/libgig \
-		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
+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:=	${RUN_DEPENDS}
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 6ed171e..26a8be0 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -11,9 +11,9 @@ MASTER_SITE_SUBDIR=	gimmix
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gimmix is a graphical MPD client written in C using GTK+2
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		tag.1:${PORTSDIR}/audio/taglib \
-		nxml:${PORTSDIR}/textproc/libnxml
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libnxml.so:${PORTSDIR}/textproc/libnxml
 
 LICENSE=	GPLv2
 
diff --git a/audio/gkrellmss2/Makefile b/audio/gkrellmss2/Makefile
index ecd8919..cb9e6b9 100644
--- a/audio/gkrellmss2/Makefile
+++ b/audio/gkrellmss2/Makefile
@@ -13,7 +13,7 @@ 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=	fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 USES=		gmake
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 051adfb..db38d8d 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -11,10 +11,10 @@ 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=	mp3lame:${PORTSDIR}/audio/lame \
-		mad:${PORTSDIR}/audio/libmad \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		guile:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
+		libmad.so:${PORTSDIR}/audio/libmad \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libguile.so:${PORTSDIR}/lang/guile
 
 USE_AUTOTOOLS=	libltdl libtool
 NO_STAGE=	yes
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 2fb8bba..08568cd 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=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/gmidimonitor/Makefile b/audio/gmidimonitor/Makefile
index 62a7873..447cbc4 100644
--- a/audio/gmidimonitor/Makefile
+++ b/audio/gmidimonitor/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://download.gna.org/gmidimonitor/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ application that shows MIDI events
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		lash.2:${PORTSDIR}/audio/lash
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+		liblash.so:${PORTSDIR}/audio/lash
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index f0c0150..06c9b5d 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Alarm plugin for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index 840e8df..a374be1 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Draws all album covers
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index ce8475d..3c53597 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Album Image fetcher for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index 4b984c5..2c0c279 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A favorites plugin for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 1042bc9..857b52f 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	gmpc-last-fm-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Last.FM metadata fetcher plugin for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 3ebb092..7630011 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A libnotify for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		notify.4:${PORTSDIR}/devel/libnotify
+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
 
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index 59eb852..6352fad 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Lyrics Provider plugin for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index c6c768f..1597811 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A fetch lyrics gmpc plugin
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index 53f0a07..7471eeb 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A Lyricswiki Provider plugin for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index 49354a1..52219e1 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	The Magnatune plugin let's you preview music from Magnatune
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+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
 
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index 15bb587..1875a82 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Collects metadata for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
 RUN_DEPENDS=	gmpc:${PORTSDIR}/audio/gmpc
 
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index 2ab321b..940b204 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -11,9 +11,9 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Lets you stream music files to your mpd that are not in your database
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		tag.1:${PORTSDIR}/audio/taglib \
-		microhttpd:${PORTSDIR}/www/libmicrohttpd
+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
 
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index da903d5..f3fce1f 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Shoutcast stream for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		cairo.2:${PORTSDIR}/graphics/cairo
+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
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 09cfe94..a56953f 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Wikipedia info for gmpc
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+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
 
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 1e965b5..96ec301 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -14,11 +14,11 @@ COMMENT=	Full featured GTK2 client for musicpd
 
 BUILD_DEPENDS=	gob2:${PORTSDIR}/devel/gob2 \
 		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd \
-		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		unique-1.0:${PORTSDIR}/x11-toolkits/unique
+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.so:${PORTSDIR}/x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20 libglade2
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--disable-mmkeys
 .endif
 
 .if ${PORT_OPTIONS:MXSPF}
-LIB_DEPENDS+=	xspf.4:${PORTSDIR}/multimedia/libxspf
+LIB_DEPENDS+=	libxspf.so:${PORTSDIR}/multimedia/libxspf
 CONFIGURE_ARGS+=--enable-libxspf
 .else
 CONFIGURE_ARGS+=--disable-libxspf
diff --git a/audio/gmtp/Makefile b/audio/gmtp/Makefile
index 8a9958d..9d3c59c 100644
--- a/audio/gmtp/Makefile
+++ b/audio/gmtp/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Media Transfer Protocol (MTP) GUI client
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	mtp:${PORTSDIR}/audio/libmtp \
-		id3tag:${PORTSDIR}/audio/libid3tag \
-		FLAC:${PORTSDIR}/audio/flac \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libmtp.so:${PORTSDIR}/audio/libmtp \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 WRKSRC=		${WRKDIR}/gMTP
 
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index cdec78f..fe2aa3d 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Multimedia applications for the GNOME 2 desktop
 
 BUILD_DEPENDS=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils
-LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 
 CONFLICTS=	gnome-control-center-3.[0-9]* libgnome-media-profiles-3.[0-9]*
 
@@ -40,7 +40,7 @@ OPTIONS_DEFAULT=PULSEAUDIO
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=--enable-pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index f75ba05..6f11980 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -11,12 +11,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		gahr@FreeBSD.org
 COMMENT=		A program for finding and playing free music from the Internet
 
-LIB_DEPENDS=		sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
-			gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
-			gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
-			xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
-			vorbis:${PORTSDIR}/audio/libvorbis \
-			ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS=		libssigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
+			libsgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
+			libsgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
+			libsxml\\+\\+-2.6.so:${PORTSDIR}/textproc/libxml++26 \
+			libsvorbis.so:${PORTSDIR}/audio/libvorbis \
+			libsao.so:${PORTSDIR}/audio/libao
 
 USES=			pathfix pkgconfig
 NO_STAGE=	yes
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 727a39a..7dc5963 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	gnustep-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep CD player with CDDB support
 
-LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
+LIB_DEPENDS+=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
 
 LICENSE=	GPLv2
 
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 3f0b0f6..c8d8c1b 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -13,10 +13,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD player and ripper for GNOME Desktop environment
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
-		musicbrainz3:${PORTSDIR}/audio/libmusicbrainz3 \
-		brasero-media:${PORTSDIR}/sysutils/brasero \
-		unique-1.0:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid \
+		libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
+		libbrasero-media.so:${PORTSDIR}/sysutils/brasero \
+		libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_XORG=	x11
@@ -39,7 +39,7 @@ OPTIONS_DEFAULT=NOTIFY
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notification
 .else
 CONFIGURE_ARGS+=--disable-notification
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 3522e23..c2fdb62 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF
 MAINTAINER?=	lyngbol@wheel.dk
 COMMENT?=	Another gtk-based MP3 frontend
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools \
 		xmp:${PORTSDIR}/audio/xmp
 
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index e6858cd..26b4da2 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -15,7 +15,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Audio recording and tick/scratch reduction for e.g. vinyl records
 
-LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
+LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw
 
 ALL_TARGET=	gramofile
 USES=		gmake perl5
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index 41aa72b..579ae1a 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=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile
index f6f1e55..b572aca 100644
--- a/audio/gstreamer-plugins-moodbar/Makefile
+++ b/audio/gstreamer-plugins-moodbar/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	moodbar-0.1.2
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Shows the "moods" of audio tracks in Amarok
 
-LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
-		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+		libfftw3.so:${PORTSDIR}/math/fftw3
 
 CFLAGS:=	${CFLAGS} -O2
 USE_GSTREAMER=	yes good
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index a4aad36..7fb4c01 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-gtk2-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guitar (and other instruments) tuner for GTK+2
 
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index ad312ad..76ac125 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -12,8 +12,8 @@ COMMENT=	GUI for Apple iPod using GTK2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag \
-		gpod:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libgpod.so:${PORTSDIR}/audio/libgpod
 
 USES=		gettext gmake pkgconfig
 NO_STAGE=	yes
@@ -34,19 +34,19 @@ CURL_DESC=	Cover art download support via libcurl
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisfile:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--without-ogg
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
diff --git a/audio/harp/Makefile b/audio/harp/Makefile
index 4eb6095..58dadd1 100644
--- a/audio/harp/Makefile
+++ b/audio/harp/Makefile
@@ -28,7 +28,7 @@ PORTDOCS=	README
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 PLIST_SUB+=	AAC=""
 .else
 CONFIGURE_ARGS+=	--without-aac
@@ -36,7 +36,7 @@ PLIST_SUB+=	AAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 PLIST_SUB+=	FLAC=""
 .else
 CONFIGURE_ARGS+=	--without-flac
@@ -44,7 +44,7 @@ PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMP3}
-LIB_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
+LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
 PLIST_SUB+=	MP3=""
 .else
 CONFIGURE_ARGS+=	--without-mp3
@@ -59,7 +59,7 @@ PLIST_SUB+=	STREAM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisfile:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 CONFIGURE_ARGS+=	--without-vorbis
@@ -68,7 +68,7 @@ PLIST_SUB+=	VORBIS="@comment "
 
 .if ${PORT_OPTIONS:MJACK}
 CONFIGURE_ARGS+=	--with-jack
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 9fb246d..a89b4a6 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -36,41 +36,41 @@ CONFIGURE_ARGS+=ncurses
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad:${PORTSDIR}/audio/mad \
-		id3tag:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/mad \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag
 .else
 CONFIGURE_ARGS+=no_mp3
 .endif
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=no_vorbis
 .endif
 .if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 .else
 CONFIGURE_ARGS+=no_sndfile
 .endif
 .if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 .else
 CONFIGURE_ARGS+=no_modplug
 .endif
 .if ${PORT_OPTIONS:MHTTP}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libbcurl.so:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=no_http no_scrobbler
 .endif
 .if ${PORT_OPTIONS:MLIBAO}
-LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=ao
 .endif
 .if ${PORT_OPTIONS:MXCURSES}
-LIB_DEPENDS+=	XCurses:${PORTSDIR}/devel/pdcurses
+LIB_DEPENDS+=	libXCurses.so:${PORTSDIR}/devel/pdcurses
 CONFIGURE_ARGS+=xcurses
 .endif
 .if ${PORT_OPTIONS:MXSPF}
-LIB_DEPENDS+=	xspf:${PORTSDIR}/multimedia/libxspf
+LIB_DEPENDS+=	libxspf.so:${PORTSDIR}/multimedia/libxspf
 .else
 CONFIGURE_ARGS+=no_xspf
 .endif
diff --git a/audio/jack-keyboard/Makefile b/audio/jack-keyboard/Makefile
index c829844..b42b7ae 100644
--- a/audio/jack-keyboard/Makefile
+++ b/audio/jack-keyboard/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Virtual keyboard for JACK MIDI
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 MAN1=		jack-keyboard.1
 
@@ -28,7 +28,7 @@ OPTIONS_DEFAULT=       LASH
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLASH}
-LIB_DEPENDS+=  lash:${PORTSDIR}/audio/lash
+LIB_DEPENDS+=	liblash.so:${PORTSDIR}/audio/lash
 CMAKE_ARGS+=	-DLashEnable:BOOL=On
 .else
 CMAKE_ARGS+=	-DLashEnable:BOOL=Off
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 11f1856..fa8d4d4 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	LADSPA effects rack for the JACK audio server
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
-		lrdf:${PORTSDIR}/textproc/liblrdf
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+		liblrdf.so:${PORTSDIR}/textproc/liblrdf
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 USE_BZIP2=	yes
diff --git a/audio/jack-smf-utils/Makefile b/audio/jack-smf-utils/Makefile
index caddd65..de5dc96 100644
--- a/audio/jack-smf-utils/Makefile
+++ b/audio/jack-smf-utils/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Standard MIDI File file player and recorder for JACK MIDI
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		lash.2:${PORTSDIR}/audio/lash
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+		liblash.so:${PORTSDIR}/audio/lash
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/jack_ghero/Makefile b/audio/jack_ghero/Makefile
index ec8af03..17f3710 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=	BSD
 
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/jack_mixer/Makefile b/audio/jack_mixer/Makefile
index 4f35274..eba5b6b 100644
--- a/audio/jack_mixer/Makefile
+++ b/audio/jack_mixer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.gna.org/${PORTNAME:S/_//}/
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A mixer for the jack audio connection kit
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack
+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
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/audio/jack_umidi/Makefile b/audio/jack_umidi/Makefile
index b867369..c6ddc6f 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=	BSD
 
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/jamin/Makefile b/audio/jamin/Makefile
index da6d9db..66aeb2b 100644
--- a/audio/jamin/Makefile
+++ b/audio/jamin/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JACK Audio Mastering interface
 
-LIB_DEPENDS=	fftw3f:${PORTSDIR}/math/fftw3-float \
-		jack.0:${PORTSDIR}/audio/jack \
-		lo:${PORTSDIR}/audio/liblo
+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
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 8078b52..3ee6914 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Jukebox, tagger and music collection manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
 
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index 056d57f..29ff06c 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=	FLAC:${PORTSDIR}/audio/flac \
-		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
-		ogg.8:${PORTSDIR}/audio/libogg \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
 
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 1f7509e..8891afb 100644
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	ALSA PULSEAUDIO
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
 .endif
@@ -35,8 +35,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
 .if ${PORT_OPTIONS:MPULSEAUDIO}
 CMAKE_ARGS+=	-DWITH_Canberra:BOOL=ON \
 		-DWITH_PulseAudio:BOOL=ON
-LIB_DEPENDS+=	canberra.0:${PORTSDIR}/audio/libcanberra \
-		pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libcanberra.so:${PORTSDIR}/audio/libcanberra \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio
 USE_GNOME=	glib20
 .else
 CMAKE_ARGS+=	-DWITH_Canberra:BOOL=OFF \
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
index 00da7a0..ac4c5b8 100644
--- a/audio/kscd/Makefile
+++ b/audio/kscd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CD Player for KDE
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3
+LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3
 
 CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
 
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	ALSA
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
 .endif
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index fd1a3d0..bb4194d 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses-based MP3 player
 
-LIB_DEPENDS=	smpeg:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 
 GNU_CONFIGURE=	yes
 USES=	pathfix
diff --git a/audio/lash/Makefile b/audio/lash/Makefile
index b7f68d8..d8d779c 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=	jack:${PORTSDIR}/audio/jack \
-		dssialsacompat:${PORTSDIR}/audio/libdssialsacompat \
-		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+		libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
+		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 OPTIONS_DEFINE=	READLINE DOCS
 OPTIONS_DEFAULT=READLINE
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 799f399..ca10279 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -37,8 +37,8 @@ FFTW3_DESC=	Use FFTW3 library for performance
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFFTW3}
-LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3 \
-		fftw3f:${PORTSDIR}/math/fftw3-float
+LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libfftw3f.so:${PORTSDIR}/math/fftw3-float
 CONFIGURE_ARGS+=--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-fftw3=no
diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile
index 9ee5b85..3124a01 100644
--- a/audio/libadplug/Makefile
+++ b/audio/libadplug/Makefile
@@ -12,7 +12,7 @@ COMMENT=	AdLib emulator library supporting many formats
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	binio:${PORTSDIR}/devel/libbinio
+LIB_DEPENDS=	libbinio.so:${PORTSDIR}/devel/libbinio
 
 USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index 8895f49..b72a14b 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF/bs2b/bs2b/${PORTVERSION}
 MAINTAINER=	liangtai.s4@gmail.com
 COMMENT=	Bauer Stereophonic-to-Binaural DSP
 
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
-		ogg:${PORTSDIR}/audio/libogg \
-		FLAC:${PORTSDIR}/audio/flac \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index e60f053..0ae4095 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Implementation of the Freedesktop sound theme spec
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL
 
-LIB_DEPENDS=	vorbisfile:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
@@ -37,13 +37,13 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 
 .if defined(SLAVEPORT)
 USE_GNOME+=	gtk30
-LIB_DEPENDS+=	canberra:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS+=	libcanberra.so:${PORTSDIR}/audio/libcanberra
 CONFIGURE_ARGS+=--enable-gtk3
 .else
 CONFIGURE_ARGS+=--disable-gtk3
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CONFIGURE_ARGS+=--disable-pulse
diff --git a/audio/libconvolve/Makefile b/audio/libconvolve/Makefile
index d5fc070..cc8814a 100644
--- a/audio/libconvolve/Makefile
+++ b/audio/libconvolve/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Simple C library for partitioned convolution
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		fftw3f:${PORTSDIR}/math/fftw3-float \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index c06a2ac..eab2a664 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=	qjson:${PORTSDIR}/devel/qjson
+LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson
 
 GH_ACCOUNT=	lfranchi
 GH_PROJECT=	${PORTNAME}
diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index 4c25a33..340f88a 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Gigasampler file loader library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index 7d4bd55..fc246cf 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=	musicbrainz5:${PORTSDIR}/audio/libmusicbrainz5
+LIB_DEPENDS=	libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5
 
 CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
 
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 931b4c2..90a1103 100644
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE=	ALSA
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 .else
 EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
 .endif
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index f6c7f35..ffaa6f2 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Qt C++ library for the Last.fm webservices
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		fftw3f:${PORTSDIR}/math/fftw3-float \
-		samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 GH_ACCOUNT=	lastfm
 GH_COMMIT=	5826fe6
diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile
index 8b8afa8..5cde84b 100644
--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES=	include/libmp3splt/mp3splt.h include/libmp3splt/version.h lib/libmp
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
 PLIST_FILES+=	lib/${PLUGIN_DIR}/libsplt_mp3.a \
 		lib/${PLUGIN_DIR}/libsplt_mp3.la \
 		lib/${PLUGIN_DIR}/libsplt_mp3.so \
@@ -47,8 +47,8 @@ CONFIGURE_ARGS+=	--disable-mp3
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_FILES+=	lib/${PLUGIN_DIR}/libsplt_ogg.a \
 		lib/${PLUGIN_DIR}/libsplt_ogg.la \
 		lib/${PLUGIN_DIR}/libsplt_ogg.so \
@@ -58,13 +58,13 @@ CONFIGURE_ARGS+=	--disable-ogg
 .endif
 
 .if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
 .if ${PORT_OPTIONS:MID3}
-LIB_DEPENDS+=	id3tag:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+=	libid3tag.so:${PORTSDIR}/audio/libid3tag
 .else
 CONFIGURE_ARGS+=	--disable-id3tag
 .endif
diff --git a/audio/liboggz/Makefile b/audio/liboggz/Makefile
index 2fba7b0..e8426f9 100644
--- a/audio/liboggz/Makefile
+++ b/audio/liboggz/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/liboggz/ \
 MAINTAINER=	jsa@FreeBSD.org
 COMMENT=	Simple Ogg API
 
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
 
 USE_AUTOTOOLS=	libtool
 NO_STAGE=	yes
diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile
index fa644fb..ad06dea 100644
--- a/audio/libsmf/Makefile
+++ b/audio/libsmf/Makefile
@@ -9,9 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Standard MIDI File format library
 
-LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
-
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig readline:port
 NO_STAGE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 59f51fe..146e76f 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -45,8 +45,8 @@ CONFIGURE_ARGS+=	--disable-cpu-clip
 .endif
 
 .if ${PORT_OPTIONS:MEXTERNAL}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=--disable-external-libs
 .endif
diff --git a/audio/lingot/Makefile b/audio/lingot/Makefile
index c3bb00b..753c62e 100644
--- a/audio/lingot/Makefile
+++ b/audio/lingot/Makefile
@@ -27,15 +27,15 @@ OPTIONS_DEFAULT=	JACK
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 CONFIGURE_ARGS+=--enable-jack
 .else
 CONFIGURE_ARGS+=--disable-jack
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
 CONFIGURE_ARGS+=--enable-alsa
 .else
diff --git a/audio/linnya/Makefile b/audio/linnya/Makefile
index 6f4387d..78b127e 100644
--- a/audio/linnya/Makefile
+++ b/audio/linnya/Makefile
@@ -10,7 +10,7 @@ COMMENT=	A Linnya Audio Player
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USE_GITHUB=	yes
 NO_STAGE=	yes
diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index d853509..728e85a 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=	gig:${PORTSDIR}/audio/libgig
+LIB_DEPENDS=	libgig.so:${PORTSDIR}/audio/libgig
 
 RESTRICTED=	no commercial use
 
@@ -40,13 +40,13 @@ CONFIGURE_ARGS+=--disable-arts-driver
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=--disable-jack-driver
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 .else
 CONFIGURE_ARGS+=--disable-alsa-driver
 .endif
diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile
index d140b4b..6811789 100644
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@@ -107,27 +107,27 @@ PORT_OPTIONS+=	LAME
 # alsa and portaudio disabled permanently - alsa is linux only, portaudio broken
 _ALL_PACKAGES=	aacplus alsa ao cry dssi faad flac gavl gstreamer ladspa lame lo mad ogg vorbis schroedinger speex theora samplerate soundtouch voaacenc portaudio pulseaudio taglib xmlplaylist lastfm
 
-LIB_DEPENDS_aacplus=	aacplus.2:${PORTSDIR}/audio/libaacplus
-LIB_DEPENDS_ao=		ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS_aacplus=	libaacplus.so:${PORTSDIR}/audio/libaacplus
+LIB_DEPENDS_ao=		libao.so:${PORTSDIR}/audio/libao
 BUILD_DEPENDS_dssi=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
-LIB_DEPENDS_faad=	faad.2:${PORTSDIR}/audio/faad
-LIB_DEPENDS_gavl=	gavl.1:${PORTSDIR}/multimedia/gavl
+LIB_DEPENDS_faad=	libfaad.so:${PORTSDIR}/audio/faad
+LIB_DEPENDS_gavl=	libgavl.so:${PORTSDIR}/multimedia/gavl
 BUILD_DEPENDS_gstreamer=${LOCALBASE}/lib/ocaml/libcamlidl.a:${PORTSDIR}/lang/ocaml-camlidl
-LIB_DEPENDS_gstreamer=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
-			gstapp-0.10.0:${PORTSDIR}/multimedia/gstreamer-plugins
+LIB_DEPENDS_gstreamer=	libgstreamer-0.10:${PORTSDIR}/multimedia/gstreamer \
+			libgstapp-0.10:${PORTSDIR}/multimedia/gstreamer-plugins
 BUILD_DEPENDS_ladspa=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS_lame=	mp3lame.0:${PORTSDIR}/audio/lame
-LIB_DEPENDS_mad=	mad.2:${PORTSDIR}/audio/libmad
-LIB_DEPENDS_ogg=	ogg:${PORTSDIR}/audio/libogg
-LIB_DEPENDS_vorbis=	vorbis.4:${PORTSDIR}/audio/libvorbis
-LIB_DEPENDS_speex=	speex.1:${PORTSDIR}/audio/speex
-LIB_DEPENDS_theora=	theora.0:${PORTSDIR}/multimedia/libtheora
-LIB_DEPENDS_samplerate=	samplerate.1:${PORTSDIR}/audio/libsamplerate
-LIB_DEPENDS_soundtouch=	SoundTouch.0:${PORTSDIR}/audio/soundtouch bpm:${PORTSDIR}/audio/libbpm
-LIB_DEPENDS_portaudio=	portaudio.2:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS_pulseaudio=	pulse.0:${PORTSDIR}/audio/pulseaudio
-LIB_DEPENDS_taglib=	tag.1:${PORTSDIR}/audio/taglib
-LIB_DEPENDS_voaacenc=	vo-aacenc.0:${PORTSDIR}/audio/vo-aacenc
+LIB_DEPENDS_lame=	libmp3lame.so:${PORTSDIR}/audio/lame
+LIB_DEPENDS_mad=	libmad.so:${PORTSDIR}/audio/libmad
+LIB_DEPENDS_ogg=	libogg.so:${PORTSDIR}/audio/libogg
+LIB_DEPENDS_vorbis=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS_speex=	libspeex.so:${PORTSDIR}/audio/speex
+LIB_DEPENDS_theora=	libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS_samplerate=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS_soundtouch=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch bpm:${PORTSDIR}/audio/libbpm
+LIB_DEPENDS_portaudio=	libportaudio.so:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS_pulseaudio=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS_taglib=	libtag.so:${PORTSDIR}/audio/taglib
+LIB_DEPENDS_voaacenc=	libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc
 
 .if ${PORT_OPTIONS:MFESTIVAL}
 RUN_DEPENDS+=	${LOCALBASE}/bin/festival:${PORTSDIR}/audio/festival
@@ -159,7 +159,7 @@ IGNORE=	ladspa required for dssi. Please rerun make config and select ladspa
 
 #Server is known as JACK, but module named ocaml-bjack
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 _DISABLE_SED_ARGS+=	-e "s/^ocaml-bjack/\#ocaml-bjack/"
 CONFIGURE_ARGS+=	--disable-bjack
diff --git a/audio/listener/Makefile b/audio/listener/Makefile
index b3a95ad..b5ee81e 100644
--- a/audio/listener/Makefile
+++ b/audio/listener/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	A program to listen for and record sound activity
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 NO_STAGE=	yes
 PORTDOCS=	manual.html
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
new file mode 100644
index 0000000..50ae5f0
--- /dev/null
+++ b/audio/liteamp/Makefile
@@ -0,0 +1,40 @@
+# Created by: Hye-Shik Chang <perky@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	liteamp
+PORTVERSION=	0.2.4.2
+PORTREVISION=	2
+CATEGORIES=	audio gnome
+MASTER_SITES=	http://kldp.net/frs/download.php/1153/
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Light-weight Music Player for GNOME2
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+DEPRECATED=	Dead upstream since 2004, does not build with clang
+EXPIRATION_DATE=	2013-12-01
+
+LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libao.so:${PORTSDIR}/audio/libao \
+		libmad.so:${PORTSDIR}/audio/libmad \
+		libvorbisfile.so:${PORTSDIR}/audio/libvorbis
+
+USES=		gmake pathfix gettext pkgconfig
+NO_STAGE=	yes
+USE_GNOME=	libgnomeui
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	LDFLAGS="${LDFLAGS}"
+
+MAN1=		liteamp.1
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/-DGLADE_DIR/s|\\$$|| ; \
+		 /-DG.*_DISABLE_DEPRECATED/d' ${WRKSRC}/src/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/audio/liteamp/distinfo b/audio/liteamp/distinfo
new file mode 100644
index 0000000..5b1afe7
--- /dev/null
+++ b/audio/liteamp/distinfo
@@ -0,0 +1,2 @@
+SHA256 (liteamp-0.2.4.2.tar.gz) = da629af3caa28dab56d74c91a0633e617d197945315a71a99da190efe77ff3f4
+SIZE (liteamp-0.2.4.2.tar.gz) = 496190
diff --git a/audio/liteamp/files/patch-src_playback.c b/audio/liteamp/files/patch-src_playback.c
new file mode 100644
index 0000000..17e83df
--- /dev/null
+++ b/audio/liteamp/files/patch-src_playback.c
@@ -0,0 +1,10 @@
+--- src/playback.c.orig	2010-06-05 23:11:54.000000000 +0200
++++ src/playback.c	2010-06-05 23:12:22.000000000 +0200
+@@ -275,6 +275,7 @@ void playback_open_playdevice(int srate,
+            and restore it afterwards */
+         signal(SIGINT, SIG_DFL);
+         
++        memset(&format, 0, sizeof(format));
+         format.bits = bitrate;
+         format.rate = srate;
+         format.channels = nch;
diff --git a/audio/liteamp/pkg-descr b/audio/liteamp/pkg-descr
new file mode 100644
index 0000000..97b1055
--- /dev/null
+++ b/audio/liteamp/pkg-descr
@@ -0,0 +1,3 @@
+A light-weight music player for GNOME
+
+WWW: http://kldp.net/projects/liteamp
diff --git a/audio/liteamp/pkg-plist b/audio/liteamp/pkg-plist
new file mode 100644
index 0000000..bd248b8
--- /dev/null
+++ b/audio/liteamp/pkg-plist
@@ -0,0 +1,24 @@
+bin/liteamp
+share/application-registry/liteamp.applications
+share/applications/liteamp.desktop
+%%DATADIR%%/pixmaps/adddir.png
+%%DATADIR%%/pixmaps/addfile.png
+%%DATADIR%%/pixmaps/liteamp-logo.png
+%%DATADIR%%/pixmaps/liteamp.png
+%%DATADIR%%/pixmaps/loop.png
+%%DATADIR%%/pixmaps/next.png
+%%DATADIR%%/pixmaps/pause.png
+%%DATADIR%%/pixmaps/playlist.png
+%%DATADIR%%/pixmaps/prev.png
+%%DATADIR%%/pixmaps/shuffle.png
+%%DATADIR%%/pixmaps/start.png
+%%DATADIR%%/pixmaps/stop.png
+%%DATADIR%%/pixmaps/vol.png
+%%DATADIR%%/pixmaps/vol_down.png
+%%DATADIR%%/pixmaps/vol_mute.png
+%%DATADIR%%/pixmaps/vol_up.png
+share/locale/ko/LC_MESSAGES/liteamp.mo
+share/pixmaps/liteamp.png
+@dirrm %%DATADIR%%/pixmaps
+@dirrmtry share/liteamp
+@dirrmtry share/application-registry
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index f0d0baf..c5f48b0 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -13,13 +13,13 @@ COMMENT=	All-in-one sequencer, drum machine, sampler, and more
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
-		fluidsynth:${PORTSDIR}/audio/fluidsynth \
-		samplerate:${PORTSDIR}/audio/libsamplerate \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		fftw3:${PORTSDIR}/math/fftw3 \
-		fftw3f:${PORTSDIR}/math/fftw3-float
+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 \
@@ -53,13 +53,13 @@ USE_DOS2UNIX=	plugins/midi_import/portsmf/allegrowr.cpp plugins/midi_import/port
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CMAKE_ARGS+=	-DWANT_JACK:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 .else
 CMAKE_ARGS+=	-DWANT_PULSEAUDIO:BOOL=OFF
 .endif
diff --git a/audio/lxmusic/Makefile b/audio/lxmusic/Makefile
index 3aeb269..5273c3d 100644
--- a/audio/lxmusic/Makefile
+++ b/audio/lxmusic/Makefile
@@ -12,8 +12,8 @@ COMMENT=	LXDE music player based on xmms2
 LICENSE=	MIT GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2 \
-		notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
+		libnotify.so:${PORTSDIR}/devel/libnotify
 
 USES=		gmake desktop-file-utils pkgconfig
 NO_STAGE=	yes
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 9daa50e..583ed66 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=	mad:${PORTSDIR}/audio/libmad \
-		id3tag:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag
 
 WANT_GNOME=	yes
 
diff --git a/audio/mangler/Makefile b/audio/mangler/Makefile
index 71810be..bf6c3e5 100644
--- a/audio/mangler/Makefile
+++ b/audio/mangler/Makefile
@@ -11,11 +11,11 @@ MASTER_SITES=	http://www.mangler.org/downloads/ \
 MAINTAINER=	janik@hikarihq.com
 COMMENT=	A Ventrilo VOIP compatible client
 
-LIB_DEPENDS=	celt0.2:${PORTSDIR}/audio/celt \
-		speex.1:${PORTSDIR}/audio/speex \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		gsm.1:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libcelt0.so:${PORTSDIR}/audio/celt \
+		libspeex..so:${PORTSDIR}/audio/speex \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libgtkmm-2.4..so:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		libgsm.so:${PORTSDIR}/audio/gsm
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
@@ -34,7 +34,7 @@ MAN1=   mangler.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=--with-pulseaudio
 .else
 CONFIGURE_ARGS+=--without-pulseaudio
diff --git a/audio/mcplay/Makefile b/audio/mcplay/Makefile
index 30b4479..a66e546 100644
--- a/audio/mcplay/Makefile
+++ b/audio/mcplay/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Curses based front-end to various audio players
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	glib-12:${PORTSDIR}/devel/glib12
+USE_GNOME=	glib12
 
 NO_STAGE=	yes
 MAN1=		${PORTNAME}.1
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 158dbc3..95651ca 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -67,13 +67,13 @@ CONFIGURE_ARGS+=	--with-double-samples
 .if empty(PORT_OPTIONS:MSNDFILE)
 CONFIGURE_ARGS+=	--without-libsndfile
 .else
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 .endif
 
 .if empty(PORT_OPTIONS:MSAMPLERATE)
 CONFIGURE_ARGS+=	--without-libsamplerate
 .else
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 .endif
 
 .if empty(PORT_OPTIONS:MOSS)
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=	--without-oss
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	portaudio.0:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
 .else
 CONFIGURE_ARGS+=	--without-portaudio
 .endif
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--without-sdl
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 5aeaa4e..3be46c7 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=	mikmod:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile
index 81b5d6a..48fd7b6 100644
--- a/audio/milkytracker/Makefile
+++ b/audio/milkytracker/Makefile
@@ -15,8 +15,8 @@ LICENSE=	GPLv3
 
 NOT_FOR_ARCH=	powerpc
 
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack \
-		zzip:${PORTSDIR}/devel/zziplib
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
+		libzzip.so:${PORTSDIR}/devel/zziplib
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 1cb52ed..8e89bd1 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -29,14 +29,14 @@ RCC_DESC=	RCC support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
 
 .if ${PORT_OPTIONS:MMP3}
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
-		id3tag.0:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag
 PLIST_FILES+=	lib/moc/decoder_plugins/libmp3_decoder.a \
 		lib/moc/decoder_plugins/libmp3_decoder.la \
 		lib/moc/decoder_plugins/libmp3_decoder.so
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--without-mp3
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack \
+LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack \
 		tag_c.0:${PORTSDIR}/audio/taglib
 PLIST_FILES+=	lib/moc/decoder_plugins/libmusepack_decoder.a \
 		lib/moc/decoder_plugins/libmusepack_decoder.la \
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+=	--without-musepack
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_FILES+=	lib/moc/decoder_plugins/libvorbis_decoder.a \
 		lib/moc/decoder_plugins/libvorbis_decoder.la \
 		lib/moc/decoder_plugins/libvorbis_decoder.so
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--without-ogg
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 PLIST_FILES+=	lib/moc/decoder_plugins/libflac_decoder.a \
 		lib/moc/decoder_plugins/libflac_decoder.la \
 		lib/moc/decoder_plugins/libflac_decoder.so
@@ -73,7 +73,7 @@ CONFIGURE_ARGS+=	--without-flac
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 PLIST_FILES+=   lib/moc/decoder_plugins/libffmpeg_decoder.a \
 		lib/moc/decoder_plugins/libffmpeg_decoder.la \
 		lib/moc/decoder_plugins/libffmpeg_decoder.so
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 PLIST_FILES+=	lib/moc/decoder_plugins/libsndfile_formats_decoder.a \
 		lib/moc/decoder_plugins/libsndfile_formats_decoder.la \
 		lib/moc/decoder_plugins/libsndfile_formats_decoder.so
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+=	--without-sndfile
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 PLIST_FILES+=	lib/moc/decoder_plugins/libspeex_decoder.a \
 		lib/moc/decoder_plugins/libspeex_decoder.la \
 		lib/moc/decoder_plugins/libspeex_decoder.so
@@ -100,20 +100,20 @@ CONFIGURE_ARGS+=	--without-speex
 .endif
 
 .if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 .else
 CONFIGURE_ARGS+=	--without-samplerate
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
 .if ${PORT_OPTIONS:MRCC}
-LIB_DEPENDS+=	rcc.2:${PORTSDIR}/devel/librcc \
-		rcd.1:${PORTSDIR}/devel/librcd
+LIB_DEPENDS+=	librcc.so:${PORTSDIR}/devel/librcc \
+		librcd.so:${PORTSDIR}/devel/librcd
 .else
 CONFIGURE_ARGS+=	--without-rcc
 .endif
diff --git a/audio/modplugplay/Makefile b/audio/modplugplay/Makefile
index 0c58ea8..59b823f 100644
--- a/audio/modplugplay/Makefile
+++ b/audio/modplugplay/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Command-line music mod player using libmodplug
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	modplug.1:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 
 PLIST_FILES=	bin/modplugplay man/man1/modplugplay.1.gz
 
diff --git a/audio/mous/Makefile b/audio/mous/Makefile
index 713a6f8..435b37b 100644
--- a/audio/mous/Makefile
+++ b/audio/mous/Makefile
@@ -81,7 +81,7 @@ PLIST_SUB+=	OSS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 CMAKE_ARGS+=	-DWithPluginAlsaRenderer=1
 PLIST_SUB+=	ALSA=""
 .else
@@ -90,7 +90,7 @@ PLIST_SUB+=	ALSA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAO}
-LIB_DEPENDS+=	libao:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 CMAKE_ARGS+=	-DWithPluginAoRenderer=1
 PLIST_SUB+=	AO=""
 .else
@@ -99,7 +99,7 @@ PLIST_SUB+=	AO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTAGLIB}
-LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS+=	libtag.so:${PORTSDIR}/audio/taglib
 CMAKE_ARGS+=	-DWithPluginTagLibParser=1
 PLIST_SUB+=	TAGLIB=""
 .else
@@ -108,7 +108,7 @@ PLIST_SUB+=	TAGLIB="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCUE}
-LIB_DEPENDS+=	cue:${PORTSDIR}/textproc/libcue
+LIB_DEPENDS+=	libcue.so:${PORTSDIR}/textproc/libcue
 CMAKE_ARGS+=	-DWithPluginCuePack=1
 PLIST_SUB+=	CUE=""
 .else
@@ -133,7 +133,7 @@ PLIST_SUB+=	WAVENCODER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 CMAKE_ARGS+=	-DWithPluginFaadDecoder=1
 PLIST_SUB+=	FAAD=""
 .else
@@ -142,7 +142,7 @@ PLIST_SUB+=	FAAD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
 CMAKE_ARGS+=	-DWithPluginFaacEncoder=1
 PLIST_SUB+=	FAAC=""
 .else
@@ -151,7 +151,7 @@ PLIST_SUB+=	FAAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMPG123}
-LIB_DEPENDS+=	mpg123:${PORTSDIR}/audio/mpg123
+LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
 CMAKE_ARGS+=	-DWithPluginMpg123Decoder=1
 PLIST_SUB+=	MPG123=""
 .else
@@ -160,7 +160,7 @@ PLIST_SUB+=	MPG123="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 CMAKE_ARGS+=	-DWithPluginLameEncoder=1
 PLIST_SUB+=	LAME=""
 .else
@@ -185,7 +185,7 @@ PLIST_SUB+=	MAC4="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMACDECODER}
-LIB_DEPENDS+=	mac:${PORTSDIR}/audio/mac
+LIB_DEPENDS+=	libmac.so:${PORTSDIR}/audio/mac
 CMAKE_ARGS+=	-DWithPluginMacDecoder=1
 PLIST_SUB+=	MAC=""
 .else
@@ -194,7 +194,7 @@ PLIST_SUB+=	MAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 CMAKE_ARGS+=	-DWithPluginFlacDecoder=1
 PLIST_SUB+=	FLAC=""
 .else
@@ -203,7 +203,7 @@ PLIST_SUB+=	FLAC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisfile:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 CMAKE_ARGS+=	-DWithPluginOggDecoder=1
 PLIST_SUB+=	OGG=""
 .else
diff --git a/audio/mp-player/Makefile b/audio/mp-player/Makefile
index b82938d..a06af63 100644
--- a/audio/mp-player/Makefile
+++ b/audio/mp-player/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Curses based module tracker using libmikmod
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lmikmod ${PTHREAD_LIBS} -lncurses -lpanel
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index eea226f..c7eb020 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -32,18 +32,18 @@ PORTDOCS=	AUTHORS CREDITS ChangeLog FAQ README TODO
 .endif
 
 .if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=		lirc_client.2:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=		liblirc_client.so:${PORTSDIR}/comms/lirc
 CONFIGURE_ARGS+=	--with-lirc
 .endif
 
 .if ${PORT_OPTIONS:MSIDPLAY}
-LIB_DEPENDS+=		sidplay.1:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS+=		libsidplay.so:${PORTSDIR}/audio/libsidplay
 .else
 CONFIGURE_ARGS+=	--without-sidplay
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=		vorbisfile.6:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--without-oggvorbis
 .endif
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--without-sdl
 
 .if ${PORT_OPTIONS:MNAS}
 CONFIGURE_ARGS+=	--with-nas
-LIB_DEPENDS+=		audio.2:${PORTSDIR}/audio/nas
+LIB_DEPENDS+=		libaudio.so:${PORTSDIR}/audio/nas
 LDFLAGS+=		-laudio
 .else
 CONFIGURE_ARGS+=	--without-nas
diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index 1b24127..6d316f5 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://p.outlyer.net/mp3plot/files/
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Mp3 bitrate plot tool
 
-LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 OPTIONS_DEFINE=	GD IMAGEMAGICK
 OPTIONS_DEFAULT=	GD
@@ -32,13 +32,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGD}
-LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
+LIB_DEPENDS+=	libgd.so:${PORTSDIR}/graphics/gd
 .else
 CONFIGURE_ARGS+=	--disable-gd
 .endif
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	Magick++.5:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--disable-magick
 .endif
diff --git a/audio/mp3splt-gtk/Makefile b/audio/mp3splt-gtk/Makefile
index ec7be12..1ead9e7 100644
--- a/audio/mp3splt-gtk/Makefile
+++ b/audio/mp3splt-gtk/Makefile
@@ -43,7 +43,7 @@ NLS_USES=	gettext
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-LIB_DEPENDS+=	gvc:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=	libgvc.so:${PORTSDIR}/graphics/graphviz
 BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 .else
 CONFIGURE_ARGS+=	--disable-doxygen-doc
diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile
index 659f8ab..c589dbf 100644
--- a/audio/mp3splt/Makefile
+++ b/audio/mp3splt/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Utility to split MP3 and Ogg files (via CUE sheets)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	mp3splt:${PORTSDIR}/audio/libmp3splt
+LIB_DEPENDS=	libmp3splt.so:${PORTSDIR}/audio/libmp3splt
 
 USES=	pkgconfig:build
 NO_STAGE=	yes
diff --git a/audio/mp3stat/Makefile b/audio/mp3stat/Makefile
index ae884e5..8ec17b8 100644
--- a/audio/mp3stat/Makefile
+++ b/audio/mp3stat/Makefile
@@ -36,7 +36,7 @@ PLIST_DIRS=	lib/mp3stat
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_FILES+=	lib/mp3stat/input_vorb.so
 .else
 MAKE_ARGS+=	VORBIS=""
diff --git a/audio/mpdas/Makefile b/audio/mpdas/Makefile
index a106fd7..54ff02c 100644
--- a/audio/mpdas/Makefile
+++ b/audio/mpdas/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://50hz.ws/mpdas/
 MAINTAINER=	hrkfdn@gmail.com
 COMMENT=	MPD AudioScrobbler written in C++ supporting the latest protocol
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libmpd.so:${PORTSDIR}/audio/libmpd
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
index 77d69d5..d6eae79 100644
--- a/audio/mpdscribble/Makefile
+++ b/audio/mpdscribble/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Musicpd last.fm client
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	mpdclient.2:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS+=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
@@ -29,10 +29,10 @@ SOUP_DESC=	Use libsoup instead of libcurl
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOUP}
-LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 CONFIGURE_ARGS+=	--with-http-client=soup
 .else
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-http-client=curl
 .endif
 
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 6ed81b5..7fa9d73 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Command-line player for MPEG Layer 1, 2, and 3 audio files
 
 LICENSE=	LGPL21
 
-USES=		gmake
+USES=		gmake pathfix
 USE_BZIP2=	yes
-NO_STAGE=	yes
 USE_AUTOTOOLS=	libtool libltdl
-USE_GNOME=	gnomehack ltverhack
+#USE_GNOME=	ltverhack
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
@@ -27,8 +26,6 @@ CONFIGURE_ENV=	CONFIG_SHELL=${SH}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		${PORTNAME}.1
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
diff --git a/audio/muine/Makefile b/audio/muine/Makefile
index 213e6c8..77386e4 100644
--- a/audio/muine/Makefile
+++ b/audio/muine/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Mono based Gnome audio player
 
 IGNORE=		Fails to run
 
-LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
-		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		gdbm:${PORTSDIR}/databases/gdbm \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
 		${LOCALBASE}/libdata/pkgconfig/taglib-sharp.pc:${PORTSDIR}/audio/taglib-sharp
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 93660d9..9c79174 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Multiple Streaming Engine
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
-		ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libogg.so:${PORTSDIR}/audio/libogg
 
 OPTIONS_DEFINE=	X11 LAME SNDFILE DOCS
 OPTIONS_DEFAULT=X11
@@ -42,13 +42,13 @@ CONFIGURE_ARGS+=--without-x --with-rubik
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 .else
 CONFIGURE_ENV+=	ac_cv_header_lame_lame_h=no
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 .endif
 
 post-patch:
diff --git a/audio/musicbox-tag-editor/Makefile b/audio/musicbox-tag-editor/Makefile
index c2eeae0..6067fc0 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=	tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 USES=		pathfix pkgconfig
 NO_STAGE=	yes
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 55941b2..dbb8001 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	mpd-${PORTVERSION}
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Remote-controllable music daemon
 
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 LICENSE=	GPLv2
 
@@ -77,32 +77,32 @@ IGNORE=${MSG}  You also have musicpd.conf-- check carefully to see which one you
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=--disable-flac \
 		--disable-oggflac
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MTREMOR}
 CONFIGURE_ARGS+=--with-tremor
-LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+LIB_DEPENDS+=	libvorbisidec.so:${PORTSDIR}/audio/libtremor
 .endif
 
 .if ${PORT_OPTIONS:MAAC}
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 .else
 CONFIGURE_ARGS+=--disable-aac
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
 CONFIGURE_ARGS+=--enable-lame-encoder
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 .else
 CONFIGURE_ARGS+=--disable-lame-encoder
 .endif
@@ -120,20 +120,20 @@ CONFIGURE_ARGS+=--disable-audiofile
 .endif
 
 .if ${PORT_OPTIONS:MMUSEPACK}
-LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 .else
 CONFIGURE_ARGS+=--disable-mpc
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 CONFIGURE_ARGS+=--enable-mikmod
 .else
 CONFIGURE_ARGS+=--disable-mikmod
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 CONFIGURE_ARGS+=--enable-modplug
 .else
 CONFIGURE_ARGS+=--disable-modplug
@@ -143,7 +143,7 @@ CONFIGURE_ARGS+=--disable-modplug
 CONFIGURE_ARGS+=--enable-bzip2 \
 		--enable-zip \
 		--enable-iso9660
-LIB_DEPENDS+=	zzip.13:${PORTSDIR}/devel/zziplib \
+LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib \
 		iso9660.8:${PORTSDIR}/sysutils/libcdio
 .endif
 
@@ -163,13 +163,13 @@ CONFIGURE_ARGS+=--disable-lastfm
 
 .if ${PORT_OPTIONS:MMMS}
 CONFIGURE_ARGS+=--enable-mms
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
 .else
 CONFIGURE_ARGS+=--disable-mms
 .endif
 
 .if ${PORT_OPTIONS:MID3TAG}
-LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+=	libid3tag.so:${PORTSDIR}/audio/libid3tag
 .else
 CONFIGURE_ARGS+=--disable-id3
 .endif
@@ -182,33 +182,33 @@ CONFIGURE_ARGS+=--disable-ipv6
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=--with-zeroconf=avahi
-LIB_DEPENDS+=	avahi-client.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 .else
 CONFIGURE_ARGS+=--with-zeroconf=no
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 CONFIGURE_ARGS+=--with-zeroconf=bonjour
-LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 .else
 CONFIGURE_ARGS+=--with-zeroconf=no
 .endif
 
 .if ${PORT_OPTIONS:MAO}
 CONFIGURE_ARGS+=--enable-ao
-LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
 .else
 CONFIGURE_ARGS+=--disable-ao
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 .else
 CONFIGURE_ARGS+=--disable-pulse
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=--disable-jack
 .endif
@@ -219,7 +219,7 @@ CONFIGURE_ARGS+=--disable-jack
 .  if ${PORT_OPTIONS:MTREMOR}
 IGNORE=		shoutcast and tremor do not coexist; use vorbis instead
 .  endif
-LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS+=	libshout.so:${PORTSDIR}/audio/libshout2
 CONFIGURE_ARGS+=--enable-vorbis-encoder \
 		--enable-shout
 .else
@@ -227,21 +227,21 @@ CONFIGURE_ARGS+=--disable-shout
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 CONFIGURE_ARGS+=	--enable-sndfile
 .else
 CONFIGURE_ARGS+=	--disable-sndfile
 .endif
 
 .if ${PORT_OPTIONS:MSAMPLERATE}
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 CONFIGURE_ARGS+=--enable-lsr
 .else
 CONFIGURE_ARGS+=--disable-lsr
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE3}
-LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	libsqlite3.so:${ORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=--enable-sqlite
 .else
 CONFIGURE_ARGS+=--disable-sqlite
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index ae79a14..c591e89 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/musicpd/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	henrik@affekt.org
 COMMENT=	Ncurses client for the musicpd
 
-LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient
+LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 5b7a725..542ba8d 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	http://unkart.ovh.org/ncmpcpp/ \
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A ncurses mpd client, clone of ncmpc with some new features
 
-LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient \
-		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
+		libfftw3.so:${PORTSDIR}/math/fftw3
 
 USES=		iconv ncurses pkgconfig
 NO_STAGE=	yes
@@ -46,7 +46,7 @@ PLIST_FILES=	bin/ncmpcpp \
 PLIST_DIRS=	%%DOCSDIR%%
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--with-curl
 .else
 CONFIGURE_ARGS+=	--with-curl=no
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=	--disable-unicode
 .endif
 
 .if ${PORT_OPTIONS:MTAGLIB}
-LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS+=	libtag.so:${PORTSDIR}/audio/taglib
 CONFIGURE_ARGS+=	--with-taglib
 .else
 CONFIGURE_ARGS+=	--with-taglib=no
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index d968999..6535b30 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -13,9 +13,9 @@ COMMENT=	DSSI plugin that emulates the sound of the TB-303 Bassline
 LICENSE=	GPLv2 # (or later)
 
 BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
-LIB_DEPENDS=	dssialsacompat:${PORTSDIR}/audio/libdssialsacompat \
-		lo:${PORTSDIR}/audio/liblo \
-		jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
+		liblo.so:${PORTSDIR}/audio/liblo \
+		libjack.so:${PORTSDIR}/audio/jack
 
 USE_GITHUB=	yes
 NO_STAGE=	yes
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 4db9e59..4d2d7ba 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SAVANNAH
 MAINTAINER=	alex@fafula.com
 COMMENT=	A tool for adjusting the volume of wave/MP3 files to a standard level
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
 
 USE_BZIP2=		yes
 NO_STAGE=	yes
@@ -29,7 +29,7 @@ XMMS_DESC=	XMMS plugin
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .else
 CONFIGURE_ARGS+=--disable-xmms
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index ec326b8..76f119e 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -14,10 +14,10 @@ COMMENT=	The legendary Open Cubic Player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag \
-		mad:${PORTSDIR}/audio/libmad \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		sidplay:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libmad.so:${PORTSDIR}/audio/libmad \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libsidplay.so:${PORTSDIR}/audio/libsidplay
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -76,7 +76,7 @@ PLIST_SUB+=		XORG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MADPLUG}
-LIB_DEPENDS+=		adplug:${PORTSDIR}/audio/libadplug
+LIB_DEPENDS+=		libadplug.so:${PORTSDIR}/audio/libadplug
 CONFIGURE_ARGS+=	--with-adplug
 PLIST_SUB+=		ADPLUG=""
 .else
@@ -101,7 +101,7 @@ PLIST_SUB+=		DESKTOP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=		FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=		libFLAC.so:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=	--with-flac
 PLIST_SUB+=		FLAC=""
 .else
diff --git a/audio/oggsplit/Makefile b/audio/oggsplit/Makefile
index 5eba097..fe9ef19 100644
--- a/audio/oggsplit/Makefile
+++ b/audio/oggsplit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://homepage.ntlworld.com/jfe1205/OggVorbis/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Split multiplexed (grouped or chained) Ogg files into separate streams
 
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
 
 USES=		gmake
 NO_STAGE=	yes
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index c9fa4ee..9e15ccb 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -52,14 +52,14 @@ CONFIGURE_ARGS+=--disable-sdl
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--enable-vorbis
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 CONFIGURE_ARGS+=--enable-smpeg
 .else
 CONFIGURE_ARGS+=--disable-smpeg
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 949af36..a3497de 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -11,8 +11,8 @@ MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Open Source Audio Library Project
 
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
-LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
-    		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
+    		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC -DPIC
diff --git a/audio/osd-lyrics/Makefile b/audio/osd-lyrics/Makefile
index 45fa6af..4e9ab75 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=	notify:${PORTSDIR}/devel/libnotify \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DATADIRNAME=share
@@ -35,9 +35,9 @@ MPD_DESC=	Enable MPD support
 XMMS2_DESC=	Enable XMMS2 support
 AMAROK_DESC=	Enable Amarok 1.4 support
 
-MPD_LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
+MPD_LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 MPD_CONFIGURE_OFF=	--disable-mpd
-XMMS2_LIB_DEPENDS=	xmmsclient:${PORTSDIR}/audio/xmms2
+XMMS2_LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
 XMMS2_CONFIGURE_OFF=	--disable-xmms2
 AMAROK_CONFIGURE_ENABLE=	amarok1
 
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 970d420..58f795d 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -61,7 +61,7 @@ OPTIONS_DEFAULT=VORBIS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ENV+=	OGG_SUPPORT=YES
 .endif
 
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 3fbc001..8c0a074 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to libcdaudio (cd + cddb)
 
-LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
+LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/audio/p5-Audio-FLAC-Header/Makefile b/audio/p5-Audio-FLAC-Header/Makefile
index 71b4be9..71fd654 100644
--- a/audio/p5-Audio-FLAC-Header/Makefile
+++ b/audio/p5-Audio-FLAC-Header/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Interface to FLAC header metadata
 
-LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 
 USES=		perl5
 NO_STAGE=	yes
diff --git a/audio/p5-MusicBrainz-DiscID/Makefile b/audio/p5-MusicBrainz-DiscID/Makefile
index 7f1e07d..7dc54d3 100644
--- a/audio/p5-MusicBrainz-DiscID/Makefile
+++ b/audio/p5-MusicBrainz-DiscID/Makefile
@@ -12,7 +12,7 @@ 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=	discid.0:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	libdiscid.so:${PORTSDIR}/audio/libdiscid
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pkgconfig perl5
diff --git a/audio/p5-Net-LibLO/Makefile b/audio/p5-Net-LibLO/Makefile
index cd4b7fa..4f81004 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=	lo:${PORTSDIR}/audio/liblo
+LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
 
 USES=		pkgconfig perl5
 NO_STAGE=	yes
diff --git a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
index a5ae2cc..f16b318 100644
--- a/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header-PurePerl/Makefile
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dominique.goncalves@gmail.com
 COMMENT=	Manipulate / fetch info from Ogg-Vorbis audio files
 
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 USES=		perl5
 NO_STAGE=	yes
diff --git a/audio/p5-Ogg-Vorbis-Header/Makefile b/audio/p5-Ogg-Vorbis-Header/Makefile
index b21bf48..cef053a 100644
--- a/audio/p5-Ogg-Vorbis-Header/Makefile
+++ b/audio/p5-Ogg-Vorbis-Header/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manipulate / fetch info from Ogg-Vorbis audio files
 
 BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile
index f76dcbe..d8b01f0 100644
--- a/audio/p5-Shout/Makefile
+++ b/audio/p5-Shout/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl glue for libshout MP3 streaming source library
 
-LIB_DEPENDS=	shout.5:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout2
 
 USES=		perl5 pkgconfig
 NO_STAGE=	yes
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index f4a9116..ef49d17 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=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 
 USES=		perl5
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 07d102f..63214ac 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK icon tray for PulseAudio
 
-LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		pulse.0:${PORTSDIR}/audio/pulseaudio \
-		notify.4:${PORTSDIR}/devel/libnotify \
-		avahi-core:${PORTSDIR}/net/avahi
+LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libnotify.so:${PORTSDIR}/devel/libnotify \
+		libavahi-core.so:${PORTSDIR}/net/avahi
 RUN_DEPENDES=	dbus-daemon:${PORTSDIR}/devel/dbus
 
 GNU_CONFIGURE=	yes
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index f197c90..9b2ced1 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=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 677e53c..b8639bc 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK configuration dialog for PulseAudio
 
-LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		gconfmm-2.6.1:${PORTSDIR}/devel/gconfmm26 \
-		pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
+		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake pathfix pkgconfig
@@ -27,7 +27,7 @@ PK_DESC=	Force dependency on PackageKit
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPK}
-LIB_DEPENDS+=	packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit
+LIB_DEPENDS+=	libpackagekit-glib2.so:${PORTSDIR}/ports-mgmt/packagekit
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index 1175004..1fc3024 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -14,13 +14,13 @@ COMMENT=	Modular patch bay for Jack
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		raul.10:${PORTSDIR}/audio/raul \
-		boost_date_time:${PORTSDIR}/devel/boost-libs \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
-		glademm-2.4:${PORTSDIR}/devel/libglademm24 \
-		flowcanvas.5:${PORTSDIR}/x11-toolkits/flowcanvas
+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
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 9b12adf..6989b3c 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	GTK mixer for PulseAudio
 
-LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		pulse.0:${PORTSDIR}/audio/pulseaudio \
-		canberra:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio \
+		libcanberra.so:${PORTSDIR}/audio/libcanberra
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index 521c2df..e1424ea 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -12,8 +12,8 @@ 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=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
-		pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
+		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/pidgin-musictracker/Makefile b/audio/pidgin-musictracker/Makefile
index 1e5adf7..7e246dc 100644
--- a/audio/pidgin-musictracker/Makefile
+++ b/audio/pidgin-musictracker/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pidgin/pidgin.h:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/playgsf/Makefile b/audio/playgsf/Makefile
index 64d1bb4..7381a33 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=	ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 
 USES=		gmake
 USE_DOS2UNIX=	yes
diff --git a/audio/pms/Makefile b/audio/pms/Makefile
index fb5b7a6..bf59691 100644
--- a/audio/pms/Makefile
+++ b/audio/pms/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	A ncurses-based client for the Music Player Daemon
 
-LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index de44963..7adf5be 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech recognition system
 
-LIB_DEPENDS=	sphinxad:${PORTSDIR}/audio/sphinxbase
+LIB_DEPENDS=	libsphinxad.so:${PORTSDIR}/audio/sphinxbase
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 21fd38a..6eb5666 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -16,13 +16,13 @@ MASTER_SITES=	http://freedesktop.org/software/pulseaudio/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound server for UNIX
 
-LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		speexdsp.1:${PORTSDIR}/audio/speex \
-		dbus-1.3:${PORTSDIR}/devel/dbus \
-		gdbm.4:${PORTSDIR}/databases/gdbm \
-		execinfo:${PORTSDIR}/devel/libexecinfo \
-		ck-connector.0:${PORTSDIR}/sysutils/consolekit
+LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libspeexdsp.so${PORTSDIR}/audio/speex \
+		libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libck-connector.so:${PORTSDIR}/sysutils/consolekit
 
 USE_GNOME=	gnomehack glib20 intltool ltverhack
 NO_STAGE=	yes
@@ -69,7 +69,7 @@ MAN5=		default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 PLIST_SUB+=	JACK=""
 .else
 PLIST_SUB+=	JACK="@comment "
@@ -77,7 +77,7 @@ CONFIGURE_ARGS+=--disable-jack
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	avahi-client.3:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 PLIST_SUB+=	AVAHI=""
 .else
 CONFIGURE_ARGS+=--disable-avahi
@@ -85,7 +85,7 @@ PLIST_SUB+=	AVAHI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MHAL}
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
 PLIST_SUB+=	HAL=""
 .else
 CONFIGURE_ARGS+=--disable-hal
diff --git a/audio/pure-audio/Makefile b/audio/pure-audio/Makefile
index e25a7d4..81ff037 100644
--- a/audio/pure-audio/Makefile
+++ b/audio/pure-audio/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Digital audio interface for the Pure language
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	portaudio.2:${PORTSDIR}/audio/portaudio2 \
-		samplerate:${PORTSDIR}/audio/libsamplerate \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio2 \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libfftw3.so:${PORTSDIR}/math/fftw3
 
 USES=		pure
 NO_STAGE=	yes
diff --git a/audio/py-fastaudio/Makefile b/audio/py-fastaudio/Makefile
index 3402964..b9cd634 100644
--- a/audio/py-fastaudio/Makefile
+++ b/audio/py-fastaudio/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	ninjin@kth.se
 COMMENT=	Python bindings for the PortAudio multi-platform audio library
 
 BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	portaudio:${PORTSDIR}/audio/portaudio \
-		sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/fastaudio.so
 PLIST_DIRS=
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 55b4ddb..7c42694 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 LICENSE=	LGPL21 # (or later)
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
-LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		aa:${PORTSDIR}/graphics/aalib
+LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libaa.so:${PORTSDIR}/graphics/aalib
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game \
 		dejavu>0:${PORTSDIR}/x11-fonts/dejavu \
 		${PYNUMPY}
diff --git a/audio/py-pyacoustid/Makefile b/audio/py-pyacoustid/Makefile
index 564e143..992a4b7 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=	chromaprint:${PORTSDIR}/audio/chromaprint
+LIB_DEPENDS=	libchromaprint.so:${PORTSDIR}/audio/chromaprint
 
 USE_PYTHON=	yes
 NO_STAGE=	yes
diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile
index 0c84608..db87f29 100644
--- a/audio/py-pyaudio/Makefile
+++ b/audio/py-pyaudio/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Portaudio toolkit bindings for Python
 
-LIB_DEPENDS=	portaudio.2:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio2
 
 USE_PYTHON=		yes
 NO_STAGE=	yes
diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile
index 8b46557..639524a 100644
--- a/audio/py-pyliblo/Makefile
+++ b/audio/py-pyliblo/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A Python wrapper for the Liblo OSC Library
 
 BUILD_DEPENDS=	pyrex>=0.9.4:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	lo:${PORTSDIR}/audio/liblo
+LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
 
 USE_PYTHON=		yes
 NO_STAGE=	yes
diff --git a/audio/py-shout/Makefile b/audio/py-shout/Makefile
index 6ee5e30..851061c 100644
--- a/audio/py-shout/Makefile
+++ b/audio/py-shout/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-python-${PORTVERSION}
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings for libshout2
 
-LIB_DEPENDS=	shout.5:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout2
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
diff --git a/audio/py-speex/Makefile b/audio/py-speex/Makefile
index 6b1a52f..2bdc74e 100644
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	cjg@bsdmail.org
 COMMENT=	Python bindings for the Speex compressor/decompressor audio codec
 
 BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex
+LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/speex.so
 USE_PYTHON=	yes
diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile
index efa9611..f57d033 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=	boost_python:${PORTSDIR}/devel/boost-python-libs \
-		tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
+		libtag;so:${PORTSDIR}/audio/taglib
 
 USES=		shebangfix
 HAS_CONFIGURE=	yes
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index f38c962..f5f9082 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	PyTone-${PORTVERSION}
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	A music jukebox written in Python with a curses GUI
 
-LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
 
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 9c84690..a60114b 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Qt Interface for the JACK Audio Connection Kit
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib \
-		jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
+		libjack.so:${PORTSDIR}/audio/jack
 
 USE_QT4=	corelib dbus gui xml \
 		linguist_build moc_build qmake_build rcc_build uic_build
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 41b5de6..bcd4636 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Qt fluidsynth front-end application
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	fluidsynth:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 
 OPTIONS_DEFINE=	GRADIENT SYSTEM_TRAY
 OPTIONS_DEFAULT=	GRADIENT SYSTEM_TRAY
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index de103df..4ac8b1e 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/raop-play/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	A music file player for Apple Airport Express
 
-LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
-		id3tag.0:${PORTSDIR}/audio/libid3tag
+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 \
diff --git a/audio/raul/Makefile b/audio/raul/Makefile
index c5e4670..05c3e59 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=	boost_date_time:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index 0a66d28..ce779b0 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphical audio file editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	FOX-1.4:${PORTSDIR}/x11-toolkits/fox14
+LIB_DEPENDS=	libFOX-1.4.so:${PORTSDIR}/x11-toolkits/fox14
 
 USES=		bison
 NO_STAGE=	yes
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--enable-largefile
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .endif
 
 .if ${PORT_OPTIONS:MAUDIOFILE}
@@ -48,27 +48,27 @@ LIB_DEPENDS+=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	portaudio:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
 .endif
 
 .if ${PORT_OPTIONS:MOGG}
-LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
+LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 .endif
 
 .if ${PORT_OPTIONS:MFFTW}
-LIB_DEPENDS+=	fftw:${PORTSDIR}/math/fftw
+LIB_DEPENDS+=	libfftw.so:${PORTSDIR}/math/fftw
 .endif
 
 .if ${PORT_OPTIONS:MSOUNDTOUCH}
-LIB_DEPENDS+=	SoundTouch:${PORTSDIR}/audio/soundtouch
+LIB_DEPENDS+=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 .endif
 
 .if ${PORT_OPTIONS:MLADSPA}
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 031be47..b283979 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -13,14 +13,14 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Audio player for GNOME
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
-		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
-		soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
-		brasero-media.3:${PORTSDIR}/sysutils/brasero
+LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libtotem-plparser.so:${PORTSDIR}/multimedia/totem-pl-parser \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libsexy.so:${PORTSDIR}/x11-toolkits/libsexy \
+		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+		libgnome-media-profiles.so:${PORTSDIR}/audio/gnome-media \
+		libbrasero-media.so:${PORTSDIR}/sysutils/brasero
 
 CONFLICTS=	rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*
 
@@ -64,7 +64,7 @@ USE_GSTREAMER+=		faad
 .endif
 
 .if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
+LIB_DEPENDS+=	liblirc_client.so${PORTSDIR}/comms/lirc
 PLIST_SUB+=	LIRC=""
 CONFIGURE_ARGS+=--enable-lirc
 .else
@@ -73,7 +73,7 @@ PLIST_SUB+=	LIRC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMTP}
-LIB_DEPENDS+=		mtp:${PORTSDIR}/audio/libmtp
+LIB_DEPENDS+=		libmtp.so:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=		MTP=""
 CONFIGURE_ARGS+=	--with-mtp
 .else
@@ -83,19 +83,19 @@ PLIST_SUB+=		MTP="@comment "
 
 .if ${PORT_OPTIONS:MDAAP}
 CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
-LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app \
+LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app \
     			gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 PLIST_SUB+=		DAAP=""
 .else
 .if exists(${LOCALBASE}/lib/libavahi-client.a)
-LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
 .endif
 CONFIGURE_ARGS+=	--disable-daap
 PLIST_SUB+=		DAAP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=		notify.4:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=		libnotify.so:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS+=		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
 .else
 CONFIGURE_ARGS+=	--disable-libnotify
@@ -113,7 +113,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIPOD}
-LIB_DEPENDS+=	gpod.7:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	libgpod.so:${PORTSDIR}/audio/libgpod
 CONFIGURE_ARGS+=--with-ipod
 PLIST_SUB+=	IPOD=""
 .else
diff --git a/audio/ripperx/Makefile b/audio/ripperx/Makefile
index 85de707..b501e72 100644
--- a/audio/ripperx/Makefile
+++ b/audio/ripperx/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ripperX-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK program to rip CD audio tracks and encode them
 
-LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib
+LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
 RUN_DEPENDS=	cdparanoia:${PORTSDIR}/audio/cdparanoia
 
 GNU_CONFIGURE=	yes
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 65a3300..d31a1c2 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://rplay.doit.org/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network audio player
 
-LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm
+LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
 
 USE_LDCONFIG=	yes
 NO_STAGE=	yes
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index dc13466..1f91918 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Speech synthesizer
 
-LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm	\
-		audio:${PORTSDIR}/audio/nas
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm	\
+		libaudio.so:${PORTSDIR}/audio/nas
 
 NO_STAGE=	yes
 
diff --git a/audio/rubberband/Makefile b/audio/rubberband/Makefile
index a21eee1..ce767e6 100644
--- a/audio/rubberband/Makefile
+++ b/audio/rubberband/Makefile
@@ -13,10 +13,10 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
-		samplerate:${PORTSDIR}/audio/libsamplerate \
-		vamp-sdk.2:${PORTSDIR}/audio/vamp-plugin-sdk \
-		fftw3.6:${PORTSDIR}/math/fftw3
+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
 
 USES=		gmake pkgconfig
diff --git a/audio/ruby-esound/Makefile b/audio/ruby-esound/Makefile
index 7cd4fba..b8dbf45 100644
--- a/audio/ruby-esound/Makefile
+++ b/audio/ruby-esound/Makefile
@@ -15,7 +15,7 @@ COMMENT=	A Ruby binding to the EsounD library
 
 BROKEN=	Fails to configure
 
-LIB_DEPENDS=	esd:${PORTSDIR}/audio/esound
+LIB_DEPENDS=	libesd.so:${PORTSDIR}/audio/esound
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/ruby-taglib/Makefile b/audio/ruby-taglib/Makefile
index 29cd190..c6d3501 100644
--- a/audio/ruby-taglib/Makefile
+++ b/audio/ruby-taglib/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	t.hiroaki.209@gmail.com
 COMMENT=	A Ruby library wrapping the Taglib library
 
-LIB_DEPENDS=    tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=    libtag.so:${PORTSDIR}/audio/taglib
 
 USE_RUBY=	yes
 NO_STAGE=	yes
diff --git a/audio/ruby-xmms2/Makefile b/audio/ruby-xmms2/Makefile
index 7f12e19..4d497dd 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+=	xmmsclient.6:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS+=	libxmmsclient.so:${PORTSDIR}/audio/xmms2
 
 MASTERDIR=	${.CURDIR}/../xmms2
 
diff --git a/audio/rubygem-shout/Makefile b/audio/rubygem-shout/Makefile
index f9922fb0..bc0127e 100644
--- a/audio/rubygem-shout/Makefile
+++ b/audio/rubygem-shout/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A Ruby binding to the libshout library
 
-LIB_DEPENDS=	shout.5:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS=	libshout.so:${PORTSDIR}/audio/libshout2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index dbc4416..6375625 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=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 CONFLICTS=	bmp-scrobbler-[0-9]* \
 		xmms-scrobbler-[0-9]*
@@ -33,7 +33,7 @@ WITH_BMP=	yes
 .endif
 
 .if defined(WITH_XMMS)
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
 PLIST_FILES+=	lib/xmms/General/libxmms_scrobbler.la \
 		lib/xmms/General/libxmms_scrobbler.so
 .else
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--disable-xmms-plugin
 .endif
 
 .if defined(WITH_BMP)
-LIB_DEPENDS+=	beep.2:${PORTSDIR}/multimedia/beep-media-player
+LIB_DEPENDS+=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 PLIST_FILES+=	lib/bmp/General/libbmp_scrobbler.la \
 		lib/bmp/General/libbmp_scrobbler.so
 .else
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index eaf95a7..fe0e01c 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -40,13 +40,13 @@ MIKMOD_CONFIGURE_ENABLE=	music-mod
 MODPLUG_LIB_DEPENDS=		libmodplug.so:${PORTSDIR}/audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	music-mod-modplug
 
-FLAC_LIB_DEPENDS=		FLAC:${PORTSDIR}/audio/flac
+FLAC_LIB_DEPENDS=		libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_ENABLE=		music-flac
 
-SMPEG_LIB_DEPENDS=		smpeg:${PORTSDIR}/multimedia/smpeg
+SMPEG_LIB_DEPENDS=		libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 SMPEG_CONFIGURE_ENABLE=		music-mp3
 
-VORBIS_LIB_DEPENDS=		vorbis:${PORTSDIR}/audio/libvorbis
+VORBIS_LIB_DEPENDS=		libvorbis.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	music-ogg
 
 .include <bsd.port.pre.mk>
diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index b539d58..73500c2 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -28,38 +28,38 @@ SMPEG_DESC=	MP3 audio format
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=--disable-flac
 .endif
 
 .if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS+=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 .else
 CONFIGURE_ARGS+=--disable-mikmod
 .endif
 
 .if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
 .else
 CONFIGURE_ARGS+=--disable-modplug
 .endif
 
 .if ${PORT_OPTIONS:MPHYSFS}
-LIB_DEPENDS+=	physfs:${PORTSDIR}/devel/physfs
+LIB_DEPENDS+=	libphysfs.so:${PORTSDIR}/devel/physfs
 .else
 CONFIGURE_ARGS+=--disable-physfs
 .endif
 
 .if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+=	smpeg:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 CONFIGURE_ARGS+=--disable-mpglib
 .else
 CONFIGURE_ARGS+=--disable-smpeg
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=--disable-midi
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=--disable-ogg
 .endif
diff --git a/audio/shairport/Makefile b/audio/shairport/Makefile
index 9132a3c..7e1635d 100644
--- a/audio/shairport/Makefile
+++ b/audio/shairport/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	miks-${PORTNAME}-${REV}
 MAINTAINER=	miks.mikelsons@gmail.com
 COMMENT=	Airtunes emulator
 
-LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao
+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 \
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index c9157ed..1299f13 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commodore SID-chip emulator that plays SID music files
 
-LIB_DEPENDS=	sidplay:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
 
 CONFIGURE_ARGS=	--with-sidplay-includes=${LOCALBASE}/include \
 		--with-sidplay-library=${LOCALBASE}/lib
diff --git a/audio/sidplay2/Makefile b/audio/sidplay2/Makefile
index e85aac7..77e46c7 100644
--- a/audio/sidplay2/Makefile
+++ b/audio/sidplay2/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	sidplay-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commodore SID music player using libsidplay2
 
-LIB_DEPENDS=	sidplay2:${PORTSDIR}/audio/libsidplay2
+LIB_DEPENDS=	libsidplay2.so:${PORTSDIR}/audio/libsidplay2
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
diff --git a/audio/simplemod/Makefile b/audio/simplemod/Makefile
index 5af26a7..23786a5 100644
--- a/audio/simplemod/Makefile
+++ b/audio/simplemod/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://borderworlds.dk/projects/sm/
 MAINTAINER=	xi@borderworlds.dk
 COMMENT=	A minimalistic module player
 
-LIB_DEPENDS=	mikmod.2:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS=	libmikmod.so:${PORTSDIR}/audio/libmikmod
 
 WRKSRC=		${WRKDIR}/simplemod
 
diff --git a/audio/smasher/Makefile b/audio/smasher/Makefile
index 8316dab..a8769b9 100644
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	c.petrik.sosa@gmail.com
 COMMENT=	Cross platform audio loop slicer
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
-		mad.2:${PORTSDIR}/audio/libmad \
-		csound64.5:${PORTSDIR}/audio/csound
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libmad.so:${PORTSDIR}/audio/libmad \
+		libcsound64.so:${PORTSDIR}/audio/csound
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 4326896..5ec9a29 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -36,7 +36,7 @@ CFLAGS+=	-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
 		-I${LOCALBASE}/include
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-ogg-include=${LOCALBASE}/include \
 			--with-ogg-lib=${LOCALBASE}/lib
 ALL_TARGET=	all libsnackogg.so
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index ac25069..e44f6f8 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -38,13 +38,13 @@ BROKEN=		does not compile on sparc64
 .endif
 
 .if ${PORT_OPTIONS:MFFTW3}
-LIB_DEPENDS+=	fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS+=	libfftw3.so:${PORTSDIR}/math/fftw3
 .else
 CONFIGURE_ARGS+=	--without-fftw
 .endif
 
 .if ${PORT_OPTIONS:MGSL}
-LIB_DEPENDS+=	gsl:${PORTSDIR}/math/gsl
+LIB_DEPENDS+=	libgsl.so:${PORTSDIR}/math/gsl
 .else
 CONFIGURE_ARGS+=	--without-gsl
 .endif
diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile
index e8ea803..724a2e7 100644
--- a/audio/sooperlooper/Makefile
+++ b/audio/sooperlooper/Makefile
@@ -14,14 +14,14 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	fftw3.6:${PORTSDIR}/math/fftw3 \
-		jack.0:${PORTSDIR}/audio/jack \
-		lo:${PORTSDIR}/audio/liblo \
-		rubberband.2:${PORTSDIR}/audio/rubberband \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		vamp-sdk.2:${PORTSDIR}/audio/vamp-plugin-sdk
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libjack.so:${PORTSDIR}/audio/jack \
+		liblo.so:${PORTSDIR}/audio/liblo \
+		librubberband.so:${PORTSDIR}/audio/rubberband \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12 \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libvamp-sdk.so:${PORTSDIR}/audio/vamp-plugin-sdk
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 
 GNU_CONFIGURE=	yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index a9ed8bd..42d2355 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -12,13 +12,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clean, mean, and lean CD ripper for GNOME2
 
-LIB_DEPENDS=	musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
-		gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
-		cdio.13:${PORTSDIR}/sysutils/libcdio \
-    		tag.1:${PORTSDIR}/audio/taglib \
-		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		brasero-media.3:${PORTSDIR}/sysutils/brasero
+LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \
+		libgnome-media-profiles.so:${PORTSDIR}/audio/gnome-media \
+		libcdio.so:${PORTSDIR}/sysutils/libcdio \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libbrasero-media.so:${PORTSDIR}/sysutils/brasero
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 8ac8031..759c1d1 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--enable-asm
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=		jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=		libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index ed4d2b1..a346c18 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 CONFIGURE_ARGS+=	--with-distro="${CONFIGURE_TARGET} ${PKGNAME}"
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=		asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=		libasound.so:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=		${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
 CONFIGURE_ARGS+=	--with-alsa
 .else
@@ -49,21 +49,21 @@ CONFIGURE_ARGS+=	--without-alsa
 
 .if ${PORT_OPTIONS:MAO}
 CONFIGURE_ARGS+=	--with-ao
-LIB_DEPENDS+=		ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=		libao.so:${PORTSDIR}/audio/libao
 .else
 CONFIGURE_ARGS+=	--without-ao
 .endif
 
 .if ${PORT_OPTIONS:MAMRNB}
 CONFIGURE_ARGS+=	--with-amrnb
-LIB_DEPENDS+=		amrnb.3:${PORTSDIR}/audio/libamrnb
+LIB_DEPENDS+=		libamrnb.so:${PORTSDIR}/audio/libamrnb
 .else
 CONFIGURE_ARGS+=	--without-amrnb
 .endif
 
 .if ${PORT_OPTIONS:MAMRWB}
 CONFIGURE_ARGS+=	--with-amrwb
-LIB_DEPENDS+=		amrwb.3:${PORTSDIR}/audio/libamrwb
+LIB_DEPENDS+=		libamrwb.so:${PORTSDIR}/audio/libamrwb
 .else
 CONFIGURE_ARGS+=	--without-amrwb
 .endif
@@ -77,14 +77,14 @@ CONFIGURE_ARGS+=	--without-ffmpeg
 
 .if ${PORT_OPTIONS:MVORBIS}
 CONFIGURE_ARGS+=	--with-oggvorbis
-LIB_DEPENDS+=		vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		libvorbis.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--without-oggvorbis
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
 CONFIGURE_ARGS+=	--with-sndfile
-LIB_DEPENDS+=		sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=		libsndfile.so:${PORTSDIR}/audio/libsndfile
 .else
 CONFIGURE_ARGS+=	--without-sndfile
 .endif
@@ -99,35 +99,35 @@ CONFIGURE_ARGS+=	--without-ladspa
 
 .if ${PORT_OPTIONS:MLAME}
 CONFIGURE_ARGS+=	--with-lame
-LIB_DEPENDS+=		mp3lame.0:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=		libmp3lame.so:${PORTSDIR}/audio/lame
 .else
 CONFIGURE_ARGS+=	--without-lame
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
 CONFIGURE_ARGS+=	--with-flac
-LIB_DEPENDS+=		FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=		libFLAC.so:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
 CONFIGURE_ARGS+=	--with-mad
-LIB_DEPENDS+=		mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=		libmad.so:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=	--without-mad
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
 CONFIGURE_ARGS+=	--with-png
-LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		libpng15.so:${PORTSDIR}/graphics/png
 .else
 CONFIGURE_ARGS+=	--without-png
 .endif
 
 .if ${PORT_OPTIONS:MGSM}
 CONFIGURE_ARGS+=	--with-gsm
-LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
+LIB_DEPENDS+=		libgsm.so:${PORTSDIR}/audio/gsm
 .else
 CONFIGURE_ARGS+=	--with-gsm
 # We cannot ask for gsm to be enabled without it trying to use external gsm,
@@ -138,14 +138,14 @@ CONFIGURE_ENV+=	ac_cv_header_gsm_h=no ac_cv_header_gsm_gsm_h=no \
 
 .if ${PORT_OPTIONS:MID3TAG}
 CONFIGURE_ARGS+=	--with-id3tag
-LIB_DEPENDS+=		id3tag.0:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS+=		libid3tag.so:${PORTSDIR}/audio/libid3tag
 .else
 CONFIGURE_ARGS+=	--without-id3tag
 .endif
 
 .if ${PORT_OPTIONS:MWAVPACK}
 CONFIGURE_ARGS+=	--with-wavpack
-LIB_DEPENDS+=		wavpack.2:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=		libwavpack.so:${PORTSDIR}/audio/wavpack
 .else
 CONFIGURE_ARGS+=	--without-wavpack
 .endif
diff --git a/audio/specimen/Makefile b/audio/specimen/Makefile
index d8d6fa5..6b91f50 100644
--- a/audio/specimen/Makefile
+++ b/audio/specimen/Makefile
@@ -15,11 +15,11 @@ COMMENT=	MIDI controllable audio sampler
 # is supposed to work around that.
 
 BUILD_DEPENDS=	jackit>=0.109.2:${PORTSDIR}/audio/jack
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
-		lash:${PORTSDIR}/audio/lash \
-		samplerate:${PORTSDIR}/audio/libsamplerate \
-		sndfile:${PORTSDIR}/audio/libsndfile \
-		phat:${PORTSDIR}/x11-toolkits/phat
+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
 
 USES=		pkgconfig gmake
 NO_STAGE=	yes
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index cd7f01d..992b02d 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=	sphinxbase:${PORTSDIR}/audio/sphinxbase
+LIB_DEPENDS=	libsphinxbase.so:${PORTSDIR}/audio/sphinxbase
 
 USE_LDCONFIG=	yes
 NO_STAGE=	yes
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index a638b16..0aaf499 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -33,7 +33,7 @@ THREADS_DESC=	Build with thread safety support
 
 .if ${PORT_OPTIONS:MSNDFILE}
 USES+=		pkgconfig
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 .else
 CONFIGURE_ENV+=	HAVE_PKGCONFIG=no
 .endif
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 48d4d49..dff833d 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	SpiralLoops-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Loop-based sampler
 
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
 NO_STAGE=	yes
 DOCDIR=		share/doc/${PORTNAME}
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 5113395..8a99b6e 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=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
 NO_STAGE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index 691e7a0..583de63 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Object-oriented modular softsynth/sequencer/sampler
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
 		jackd:${PORTSDIR}/audio/jack
-LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk \
-		sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 NO_STAGE=	yes
 USE_XORG=	x11
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index be64d32..7c359a4 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -11,12 +11,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Learning console-based MP3/OGG player
 
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac \
-		fftw:${PORTSDIR}/math/fftw \
-		id3:${PORTSDIR}/audio/id3lib \
-		mad:${PORTSDIR}/audio/mad \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libfftw.so:${PORTSDIR}/math/fftw \
+		libid3.so:${PORTSDIR}/audio/id3lib \
+		libmad.so:${PORTSDIR}/audio/mad \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libao.so:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	id3v2:${PORTSDIR}/audio/id3v2
 
 NO_STAGE=	yes
diff --git a/audio/streamripper/Makefile b/audio/streamripper/Makefile
index 8eac653..ac2978e 100644
--- a/audio/streamripper/Makefile
+++ b/audio/streamripper/Makefile
@@ -14,8 +14,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Splits SHOUTcast stream into tracks
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
-		tre.5:${PORTSDIR}/textproc/libtre
+LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
+		libtre.so:${PORTSDIR}/textproc/libtre
 
 OPTIONS_DEFINE=	FAAD VORBIS
 OPTIONS_DEFAULT=	FAAD VORBIS
@@ -45,13 +45,13 @@ CDK_VERSION=	5.0-20060507
 .if ! ${PORT_OPTIONS:MFAAD}
 CONFIGURE_ARGS+=	ac_cv_lib_faad_NeAACDecDecode2=no
 .else
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 .endif
 
 .if ! ${PORT_OPTIONS:MVORBIS}
 CONFIGURE_ARGS+=	--without-ogg
 .else
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .endif
 
 post-extract:
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index a3766c5..54c9b83 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.oddsock.org/tools/streamTranscoder/
 MAINTAINER=	mark@mkproductions.org
 COMMENT=	Transcode and stream audio to a SHOUTcast/Icecast/Peercast server
 
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		mad:${PORTSDIR}/audio/libmad \
-		curl:${PORTSDIR}/ftp/curl \
-		mp3lame:${PORTSDIR}/audio/lame
+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
 
 NO_STAGE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index d5d6a8aa..5b6c987 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ stream directory browser
 
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 NO_STAGE=	yes
@@ -58,7 +58,7 @@ PLIST_SUB+=	XIPH="@comment "
 .if ${PORT_OPTIONS:MLOCAL}
 PLIST_SUB+=	LOCAL=""
 .if ${PORT_OPTIONS:MLOCAL_METADATA}
-LIB_DEPENDS+=	tag_c:${PORTSDIR}/audio/taglib
+LIB_DEPENDS+=	libtag_c.so:${PORTSDIR}/audio/taglib
 .else
 CONFIGURE_ARGS+=	--disable-local-metadata
 .endif
diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile
index 607fedc..0727d1c 100644
--- a/audio/swhplugins/Makefile
+++ b/audio/swhplugins/Makefile
@@ -14,7 +14,7 @@ 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=	fftw3f:${PORTSDIR}/math/fftw3-float
+LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
 
 # includes assembler code
 ONLY_FOR_ARCHS=	i386 amd64
diff --git a/audio/taglib-extras/Makefile b/audio/taglib-extras/Makefile
index 848d2be..e410ec9 100644
--- a/audio/taglib-extras/Makefile
+++ b/audio/taglib-extras/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.kollide.net/~jefferai/
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra taglib features for Amarok 2.2
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 USES=		cmake
 NO_STAGE=	yes
diff --git a/audio/taglookup/Makefile b/audio/taglookup/Makefile
index 87a9e1ed..7f4ae07 100644
--- a/audio/taglookup/Makefile
+++ b/audio/taglookup/Makefile
@@ -11,8 +11,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	alex@kamaz.org.uk
 COMMENT=	Utility for tagging groups of audio files using CDDB
 
-LIB_DEPENDS=	cddb.4:${PORTSDIR}/audio/libcddb \
-		tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb \
+		libtag.so:${PORTSDIR}/audio/taglib
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index 694e6d4..97ebb36 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME MP3/Ogg file tagger
 
-LIB_DEPENDS=	id3-3.8:${PORTSDIR}/audio/id3lib \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libid3-3.8.so:${PORTSDIR}/audio/id3lib \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/tepsonic/Makefile b/audio/tepsonic/Makefile
index db20970..bf50034 100644
--- a/audio/tepsonic/Makefile
+++ b/audio/tepsonic/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	TepSonic is a simple and fast audio player
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 USES=		cmake
 NO_STAGE=	yes
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 23cf96c..b558fa7 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -18,7 +18,7 @@ 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 \
-		lrdf:${PORTSDIR}/textproc/liblrdf
+		liblrdf.so:${PORTSDIR}/textproc/liblrdf
 
 OPTIONS_DEFINE=	ALSA JACK MPG123 SOX VORBIS MAD
 OPTIONS_DEFAULT=	JACK MPG123 SOX VORBIS MAD
@@ -47,11 +47,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .if ${PORT_OPTIONS:MALSA}
 CONFIGURE_ARGS+=	--disable-alsa
 .else
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 .else
 CONFIGURE_ARGS+=	--disable-jack
 .endif
@@ -70,13 +70,13 @@ CONFIGURE_ARGS+=	--disable-sox
 
 .if ${PORT_OPTIONS:MVORBIS}
 BUILD_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad:${PORTSDIR}/audio/mad
+LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/mad
 .else
 CONFIGURE_ARGS+=	--disable-mad
 .endif
diff --git a/audio/timemachine/Makefile b/audio/timemachine/Makefile
index 54a3b7f..700e010 100644
--- a/audio/timemachine/Makefile
+++ b/audio/timemachine/Makefile
@@ -12,9 +12,9 @@ COMMENT=	JACK audio capture tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack \
-		lo:${PORTSDIR}/audio/liblo \
-		sndfile:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+		liblo.so:${PORTSDIR}/audio/liblo \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 OPTIONS_DEFINE=	LASH
 
@@ -27,7 +27,7 @@ LDFLAGS+=	-lm
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLASH}
-LIB_DEPENDS+=	lash:${PORTSDIR}/audio/lash
+LIB_DEPENDS+=	liblash.so:${PORTSDIR}/audio/lash
 .else
 CONFIGURE_ARGS+=--disable-lash
 .endif
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 72ece19..06bf928 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -12,8 +12,8 @@ MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Software MIDI player
 
 .if !defined(PKGNAMESUFFIX)
-LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis	\
-		arc:${PORTSDIR}/archivers/libarc
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis	\
+		libarc.so:${PORTSDIR}/archivers/libarc
 RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
 
 CONFLICTS=	timidity-0.*
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynami
 .else
 CONFIGURE_ARGS+=--with-x    --enable-spectrogram  --enable-wrd  --enable-dynamic
 USE_XORG=	x11 xext
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 CPPFLAGS+=	-I${LOCALBASE}/include/libpng15
 .endif
 
diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index b928f96..c1fe438 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -11,16 +11,16 @@ COMMENT=	Multi-source, social, and smart music player
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	attica:${PORTSDIR}/x11-toolkits/attica \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		boost_thread:${PORTSDIR}/devel/boost-libs \
-		echonest:${PORTSDIR}/audio/libechonest \
-		jreen:${PORTSDIR}/net-im/libjreen \
-		lastfm:${PORTSDIR}/audio/liblastfm \
-		qca:${PORTSDIR}/devel/qca \
-		qjson:${PORTSDIR}/devel/qjson \
-		quazip:${PORTSDIR}/archivers/quazip \
-		tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libattica.so:${PORTSDIR}/x11-toolkits/attica \
+		libclucene-core.so:${PORTSDIR}/textproc/clucene \
+		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
+		libechonest.so:${PORTSDIR}/audio/libechonest \
+		libjreen.so:${PORTSDIR}/net-im/libjreen \
+		liblastfm.so:${PORTSDIR}/audio/liblastfm \
+		libqca.so:${PORTSDIR}/devel/qca \
+		libqjson.so:${PORTSDIR}/devel/qjson \
+		libquazip.so:${PORTSDIR}/archivers/quazip \
+		libtag.so:${PORTSDIR}/audio/taglib
 RUN_DEPENDS=	qca-ossl>=2.0.0.b3_4:${PORTSDIR}/security/qca-ossl
 
 CMAKE_ARGS+=	-DWITH_BREAKPAD:BOOL="OFF" \
@@ -54,7 +54,7 @@ USE_QT4=	dbus designer gui linguist_build moc_build \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQTWEETLIB}
-LIB_DEPENDS+=	QTweetLib:${PORTSDIR}/net/qtweetlib
+LIB_DEPENDS+=	libQTweetLib.so:${PORTSDIR}/net/qtweetlib
 .else
 CMAKE_ARGS+=	-DWITH_QTweetLib:BOOL="OFF"
 .endif
diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index c0057ab..3f828ff 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -20,8 +20,8 @@ BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel \
 		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \
 		${JAVALIBDIR}/gervill.jar:${PORTSDIR}/audio/gervill
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-LIB_DEPENDS=	fluidsynth.1:${PORTSDIR}/audio/fluidsynth \
-    		jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
+		libjack.so:${PORTSDIR}/audio/jack
 
 MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index 62fbe95..1522620 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Unix Amiga Delitracker Emulator
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
 
 USES=		gmake pkgconfig
 HAS_CONFIGURE=	yes
@@ -55,7 +55,7 @@ PLIST_SUB+=	FUSE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXMMS}
-LIB_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	libxmms.so:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .else
 CONFIGURE_ARGS+=--without-xmms
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index cd65965..a0ef0d7 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console module player
 
-LIB_DEPENDS=	modplug.1:${PORTSDIR}/audio/libmodplug \
-		ao.4:${PORTSDIR}/audio/libao
+LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug \
+		libao.so:${PORTSDIR}/audio/libao
 BUILD_DEPENDS=	${LOCALBASE}/lib/libaiff.a:${PORTSDIR}/audio/libaiff
 
 NO_STAGE=	yes
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index ad016c6..428df3a 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Minimalistic Murmur (Mumble server)
 
-LIB_DEPENDS=	config.10:${PORTSDIR}/devel/libconfig \
-		protobuf-c.0:${PORTSDIR}/devel/protobuf-c
+LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
+		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
 NO_STAGE=	yes
 USES=		gmake
diff --git a/audio/vamp-plugin-sdk/Makefile b/audio/vamp-plugin-sdk/Makefile
index 733c341..feb47e2 100644
--- a/audio/vamp-plugin-sdk/Makefile
+++ b/audio/vamp-plugin-sdk/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Vamp audio analysis plugin SDK
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 GNU_CONFIGURE=	yes
 NO_STAGE=	yes
diff --git a/audio/ventrilo-server/Makefile b/audio/ventrilo-server/Makefile
index 7ce5149..98d6547 100644
--- a/audio/ventrilo-server/Makefile
+++ b/audio/ventrilo-server/Makefile
@@ -11,9 +11,9 @@ DISTNAME=	ventrilo_srv-${PORTVERSION}-FreeBSD-i386
 MAINTAINER=	bob@immure.com
 COMMENT=	Server side of the Ventrilo group voice chat system
 
-LIB_DEPENDS=	stdc\\+\\+.3:${PORTSDIR}/misc/compat4x \
-		m.2:${PORTSDIR}/misc/compat4x \
-		c.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS=	libstdc\\+\\+.so.3:${PORTSDIR}/misc/compat4x \
+		libm.so.2:${PORTSDIR}/misc/compat4x \
+		libc.so.4:${PORTSDIR}/misc/compat4x
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
diff --git a/audio/vitunes/Makefile b/audio/vitunes/Makefile
index 8936053..9ecc8bc 100644
--- a/audio/vitunes/Makefile
+++ b/audio/vitunes/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A curses-based media player with vim-like keybinds
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
+LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
 NO_STAGE=	yes
 ALL_TARGET=	vitunes
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
index 39473ff..8848bfb 100644
--- a/audio/vorbisgain/Makefile
+++ b/audio/vorbisgain/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://sjeng.org/ftp/vorbis/
 MAINTAINER=	gamato@users.sf.net
 COMMENT=	Calculates the perceived sound level of an Ogg Vorbis file
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 GNU_CONFIGURE=	yes
 NO_STAGE=	yes
diff --git a/audio/waon/Makefile b/audio/waon/Makefile
index 51332be..d41363f 100644
--- a/audio/waon/Makefile
+++ b/audio/waon/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES=	SF
 MAINTAINER=	kichiki@users.sourceforge.net
 COMMENT=	Wave-to-Notes transcriber and some utility tools
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		ao.4:${PORTSDIR}/audio/libao \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libao.so:${PORTSDIR}/audio/libao \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 USES=		pkgconfig
 NO_STAGE=	yes
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index 7c324a5..dcce171 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -27,7 +27,7 @@ MAN1=		wavbreaker.1 wavinfo.1 wavmerge.1
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 .else
 CONFIGURE_ARGS+=	--disable-pulse
 .endif
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index a274025..311dca1 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	A dockapp to display album covers for xmms
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		gdk_pixbuf_xlib.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
+		libgdk_pixbuf_xlib.so:${PORTSDIR}/graphics/gdk-pixbuf
 
 GNU_CONFIGURE=	yes
 NO_STAGE=	yes
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index d250116..088f24e 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Generic music player for Unix-like systems
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag
+LIB_DEPENDS=	libid3tag.so:${PORTSDIR}/audio/libid3tag
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 USE_GNOME=	gtk20
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 69c6033..d797bf8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/3.3.2/src/
 MAINTAINER=	eischen@vigrid.com
 COMMENT=	Motif CD player
 
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis \
-		FLAC:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libFLAC.so:${PORTSDIR}/audio/flac
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 
 USES=		imake motif
diff --git a/audio/xmms-a52dec/Makefile b/audio/xmms-a52dec/Makefile
index 61f2bca..4c0ff34 100644
--- a/audio/xmms-a52dec/Makefile
+++ b/audio/xmms-a52dec/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A52 (aka AC3) decoder plugin for XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		a52.0:${PORTSDIR}/audio/liba52
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
+		liba52.so:${PORTSDIR}/audio/liba52
 RUN_DEPENDS=	${LOCALBASE}/lib/xmms/Output/libOSSSurround.so:${PORTSDIR}/audio/xmms-osssurround
 
 USE_BZIP2=	yes
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index e83cd6e..e2b5c1c 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	xmms-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Crossfading/Gapless Plugin
 
-LIB_DEPENDS?=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS?=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 HAS_CONFIGURE=	yes
 USE_CSTD=	gnu89
@@ -30,7 +30,7 @@ DOCSDIR?=	${PREFIX}/share/doc/${UNIQUENAME}
 CONFIGURE_ARGS+=	--enable-player=${APP}
 
 .ifndef WITHOUT_SAMPLERATE
-LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-samplerate
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index 75a11e9..7237bef 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-plugin-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Realtime XMMS plugin for remastering mp3 sound
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USE_GNOME=	imlib
 NO_STAGE=	yes
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index 1a4c7cd..26be161 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A ncurses program for (remote) controlling multimedia/xmms
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
 
 USES=		gettext iconv
 NO_STAGE=	yes
diff --git a/audio/xmms-defx/Makefile b/audio/xmms-defx/Makefile
index a79fd51..4acab27 100644
--- a/audio/xmms-defx/Makefile
+++ b/audio/xmms-defx/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/defx/defx/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-effects processor plug-in for XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USES=		gmake
 NO_STAGE=	yes
diff --git a/audio/xmms-efxmms/Makefile b/audio/xmms-efxmms/Makefile
index e0070b9..e684898 100644
--- a/audio/xmms-efxmms/Makefile
+++ b/audio/xmms-efxmms/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	EFXmms-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Send the XMMS audio output through a queue of multiple effect plugins
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USES=		gmake
 NO_STAGE=	yes
diff --git a/audio/xmms-eq/Makefile b/audio/xmms-eq/Makefile
index b775482..6a8fc11 100644
--- a/audio/xmms-eq/Makefile
+++ b/audio/xmms-eq/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-xmms-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Real-time graphical equalizer plugin for XMMS
 
-LIB_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/xmms-fxt/Makefile b/audio/xmms-fxt/Makefile
index ef4d598..414d872 100644
--- a/audio/xmms-fxt/Makefile
+++ b/audio/xmms-fxt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}oolbox/${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Surround/Echo effect plugin for XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/audio/xmms-infopipe/Makefile b/audio/xmms-infopipe/Makefile
index efecac8..d9f5456 100644
--- a/audio/xmms-infopipe/Makefile
+++ b/audio/xmms-infopipe/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create a named pipe to retrieve xmms info about currently playing song
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 
 USE_GNOME=	gtk12
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 2c1e7ac..078e9fd 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS plugin for jack
 
-LIB_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
-		jack:${PORTSDIR}/audio/jack \
-		samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
+		libjack.so:${PORTSDIR}/audio/jack \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/audio/xmms-ladspa/Makefile b/audio/xmms-ladspa/Makefile
index abd2377..5c90a30 100644
--- a/audio/xmms-ladspa/Makefile
+++ b/audio/xmms-ladspa/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 PLIST_FILES=	lib/xmms/Effect/ladspa.so
 
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 1306d78..c0cd8d0 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	liveice-xmms
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Use XMMS for streaming audio to Icecast servers
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 
 WRKSRC=		${WRKDIR}/LiveIce-${PORTVERSION}
diff --git a/audio/xmms-mac/Makefile b/audio/xmms-mac/Makefile
index 3e33686..816a5a4 100644
--- a/audio/xmms-mac/Makefile
+++ b/audio/xmms-mac/Makefile
@@ -16,8 +16,8 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	alexbestms@wwu.de
 COMMENT=	Native Monkey Audio Codec plugin for the XMMS1 Multimedia Player
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		mac.2:${PORTSDIR}/audio/mac
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
+		libmac.so:${PORTSDIR}/audio/mac
 
 USES=		gmake
 NO_STAGE=	yes
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index c75672b..c35e26e 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -9,9 +9,9 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS input plugin that uses libmad
 
-LIB_DEPENDS=	mad:${PORTSDIR}/audio/libmad \
-		id3tag:${PORTSDIR}/audio/libid3tag \
-		xmms:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USES=		gmake pkgconfig
 USE_BZIP2=	yes
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index a8e0b5d..209f69d 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	arved
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	XMMS plugin, that plays a sound on incoming mail and opens the MUA
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 6478e4e..d5c3752 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS input plugin to play midi files
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity
 
 USES=		gmake
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index ada7da4..7bc463a 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}${PKGNAMEPREFIX}2.05
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ModPlug-based plugin for XMMS
 
-LIB_DEPENDS?=	xmms:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS?=	libxmms.so:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
 
 USES=		pkgconfig
diff --git a/audio/xmms-mp3cue/Makefile b/audio/xmms-mp3cue/Makefile
index dd2b56b..804d7bf 100644
--- a/audio/xmms-mp3cue/Makefile
+++ b/audio/xmms-mp3cue/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	XMMS-mp3cue-${PORTVERSION}
 MAINTAINER=	r2@music.lt
 COMMENT=	XMMS mp3cue adds cue file support to XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 GNU_CONFIGURE=	yes
 USES=		gmake
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 2414a1b..868ca5b 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://dl.slik.org/musepack/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS input plugin for playing MPC Musepack (.mpc, .mp+) files
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 PLIST_FILES=	lib/xmms/Input/xmms-mpegplus-1.8.0.so
 USES=		gmake
diff --git a/audio/xmms-nas/Makefile b/audio/xmms-nas/Makefile
index 2876fdf..75b3d97 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=	bitbucket63-it@yahoo.com
 COMMENT=	A Network Audio System (NAS) output plugin for XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms \
-		audio.2:${PORTSDIR}/audio/nas
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms \
+		libaudio.so:${PORTSDIR}/audio/nas
 
 USE_GNOME=	gtk12
 NO_STAGE=	yes
diff --git a/audio/xmms-osssurround/Makefile b/audio/xmms-osssurround/Makefile
index 244e057..de5ae81 100644
--- a/audio/xmms-osssurround/Makefile
+++ b/audio/xmms-osssurround/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	xmms-a52dec-1.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OSSSuround adds Surround Sound capabilities to XMMS
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USE_BZIP2=	yes
 NO_STAGE=	yes
diff --git a/audio/xmms-quix3dn/Makefile b/audio/xmms-quix3dn/Makefile
index 81c63fa..398daa4 100644
--- a/audio/xmms-quix3dn/Makefile
+++ b/audio/xmms-quix3dn/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	quix3dn-${PORTVERSION}-freebsd
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D-sound effect plugin for XMMS
 
-LIB_DEPENDS=	c.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS=	libc.so.4:${PORTSDIR}/misc/compat4x
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
 NO_STAGE=	yes
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index c38f42c..22e3bdb 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.tnsp.org/xs-files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS input plugin to play SID files
 
-LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
+LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile
index ba214d1..2e64c09 100644
--- a/audio/xmms-sndfile/Makefile
+++ b/audio/xmms-sndfile/Makefile
@@ -12,8 +12,8 @@ DISTNAME=	xmms_sndfile-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS plugin to allow playing libsndfile supported files
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
-		xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
+		libxmms.so:${PORTSDIR}/multimedia/xmms
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile
index a9ba7d1..2c8d486 100644
--- a/audio/xmms-tfmx/Makefile
+++ b/audio/xmms-tfmx/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XMMS Input plugin for playing TFMX tunes
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USE_GNOME=	gtk12 lthack
 NO_STAGE=	yes
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index a814096..27a55cd 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=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index 0ecf1d4..2a8069c 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WMA plugin for xmms
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
 
 USES=		gmake
 NO_STAGE=	yes
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index ad52674..8ceb35e 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Last.fm submission client for XMMS2
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	xmmsclient.6:${PORTSDIR}/audio/xmms2 \
-		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libxmmsclient.so:${PORTSDIR}/audio/xmms2 \
+		libcurl.so:${PORTSDIR}/ftp/curl
 
 USES=		gmake pkgconfig
 NO_STAGE=	yes
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 2337c9f..cdd0d79 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=	xmp:${PORTSDIR}/audio/libxmp
+LIB_DEPENDS=	libxmp.so:${PORTSDIR}/audio/libxmp
 
 USES=		pkgconfig gmake
 WANT_GNOME=	yes
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	ALSA PULSEAUDIO
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
 CONFIGURE_ARGS+=	--enable-alsa
 .else
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse-simple:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
 CONFIGURE_ARGS+=	--enable-pulseaudio
 .else
 CONFIGURE_ARGS+=	--disable-pulseaudio
diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile
index a4a2317..b6e7646 100644
--- a/audio/xsynth-dssi/Makefile
+++ b/audio/xsynth-dssi/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Classic analog style software synthesizer
 
 BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \
 		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
-		lo:${PORTSDIR}/audio/liblo \
-		jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
+		liblo.so:${PORTSDIR}/audio/liblo \
+		libjack.so:${PORTSDIR}/audio/jack
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
diff --git a/audio/xvmixer/Makefile b/audio/xvmixer/Makefile
index 551ea79..1d55dc3 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=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	libxview.so:${PORTSDIR}/x11-toolkits/xview
 
 NO_STAGE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DUSE_XBM_ICON" \
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 44d3e85..8114ec2 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=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
-		gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	libid3-3.8.so:${PORTSDIR}/audio/id3lib \
+		libgdbm.so:${PORTSDIR}/databases/gdbm
 
 USES=		pathfix gettext gmake perl5
 NO_STAGE=	yes
@@ -46,7 +46,7 @@ PLIST_SUB+=	ESOUND="@comment "
 .endif
 
 .if !defined(WITHOUT_VORBIS) || defined(WITH_ALL_PLUGINS)
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 0f109eb..717f049 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Realtime software synthesizer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
-		mxml:${PORTSDIR}/textproc/mxml
+LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
+		libmxml.so:${PORTSDIR}/textproc/mxml
 
 USE_BZIP2=	yes
 USES=		cmake pkgconfig