Fix detection of libportaudio libraries

PR:		196427
Submitted by:	myself
Approved by:	hselasky, stephen, marcus, maintainer timeout from others

15 files changed, 18 insertions, 24 deletions

diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index c4c34ca4eec5..1c373974788c 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -12,17 +12,16 @@ COMMENT=	Graphical score editor
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	libaubio.so:${PORTSDIR}/audio/aubio \
 		libfluidsynth.so:${PORTSDIR}/audio/fluidsynth \
 		libjack.so:${PORTSDIR}/audio/jack \
+		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
 		libsmf.so:${PORTSDIR}/audio/libsmf \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		librubberband.so:${PORTSDIR}/audio/rubberband \
 		libguile.so:${PORTSDIR}/lang/guile \
 		libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2 \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 USES=		bison gettext gmake pkgconfig
 USE_GNOME=	librsvg2 libxml2
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 12e2a3f8b2db..4bbeff50d507 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Low latency audio server
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
+LIB_DEPENDS=	libportaudio.so.0:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libcelt0.so:${PORTSDIR}/audio/celt \
diff --git a/audio/listener/Makefile b/audio/listener/Makefile
index 8959dd846fe6..1f2c771a5bfe 100644
--- a/audio/listener/Makefile
+++ b/audio/listener/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Program to listen for and record sound activity
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 USES=		ncurses tar:tgz
 
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index a7f00d6a488d..fe040f1e29cc 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -50,7 +50,7 @@ LADSPA_BUILD_DEPENDS=	ladspa>0:${PORTSDIR}/audio/ladspa
 LADSPA_RUN_DEPENDS=	ladspa>0:${PORTSDIR}/audio/ladspa
 LADSPA_CONFIGURE_ENV_OFF=	ac_cv_header_ladspa_h=no
 OSS_CONFIGURE_WITH=	oss
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulse
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index f5ab07df4300..1c6ced259dca 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -13,15 +13,14 @@ COMMENT=	DJ mixing application
 
 LICENSE=	GPLv2 # (or later)
 
-BUILD_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libid3tag.so:${PORTSDIR}/audio/libid3tag \
 		libmad.so:${PORTSDIR}/audio/libmad \
+		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libtag.so:${PORTSDIR}/audio/taglib \
 		libprotobuf.so:${PORTSDIR}/devel/protobuf
-RUN_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index bff86d9325f7..d686bbfc2a5f 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -38,8 +38,7 @@ JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CMAKE_ON=		-DBUILD_JACK:BOOL=ON
 JACK_CMAKE_OFF=		-DBUILD_JACK:BOOL=OFF
 
-PORTAUDIO_BUILD_DEPENDS=portaudio2>=0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
 PORTAUDIO_CMAKE_ON=	-DBUILD_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DBUILD_PORTAUDIO:BOOL=OFF
 
diff --git a/audio/py-fastaudio/Makefile b/audio/py-fastaudio/Makefile
index 983c493ee490..3f29fd628dce 100644
--- a/audio/py-fastaudio/Makefile
+++ b/audio/py-fastaudio/Makefile
@@ -16,7 +16,7 @@ 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=	libportaudio.so:${PORTSDIR}/audio/portaudio \
+LIB_DEPENDS=	libportaudio.so.0:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/fastaudio.so
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index d781700a7f85..3e69d354458e 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -36,7 +36,7 @@ BROKEN_NLS_DESC=	${NLS_DESC} (broken!)
 LARGEFILE_CONFIGURE_ON=	--enable-largefile
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
 OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index b8af08a511e0..bfa09d8fc665 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -54,8 +54,7 @@ LASH_CMAKE_OFF=			-DLashEnabe:BOOL=OFF
 JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
 JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
 
-PORTAUDIO_BUILD_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=		portaudio2>=0:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=		libportaudio.so.2:${PORTSDIR}/audio/portaudio2
 PORTAUDIO_CFLAGS=		-I${LOCALBASE}/include/portaudio2
 PORTAUDIO_CMAKE_OFF=		-DPaEnabe:BOOL=OFF
 PORTAUDIO_LDFLAGS=		${LOCALBASE}/lib/portaudio2/libportaudio.so
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index c885a49fbbf9..4ac0edea6c89 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio DSP utility (SDR)
 
 LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr \
-		libportaudio.so:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
 		libftdi.so:${PORTSDIR}/devel/libftdi
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index cb1fca9926ca..3a2784be5b88 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Software Defined Radio (SDR)
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 4e1c9ec46611..421fb836f26a 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Atari ST emulator
 
 LICENSE=	GPLv2 # (or later)
 
-BUILD_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libpng.so:${PORTSDIR}/graphics/png
 
 USES=		cmake readline tar:bzip2
 USE_GNOME=	pygtk2
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 37158b5583f8..34c12f0b7aeb 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack			\
 		libfftw3.so:${PORTSDIR}/math/fftw3			\
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float		\
 		libpcre.so:${PORTSDIR}/devel/pcre			\
-		libportaudio.so:${PORTSDIR}/audio/portaudio		\
+		libportaudio.so.0:${PORTSDIR}/audio/portaudio		\
 		libumfpack.so:${PORTSDIR}/math/suitesparse
 
 USES=		blaslapack cmake:outsource dos2unix fortran pkgconfig python:build
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index 17cdedd230de..fb4e901888f4 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libportaudio.so:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
 		libcblas.so:${PORTSDIR}/math/cblas
 
 # OCTSRC is the name of the directory of the package.
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index d99f00e0785f..dfb0c9d94542 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -109,7 +109,7 @@ PLIST_SUB+=	LUA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MRTP} && !defined(LITE)
-LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS+=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
 CONFIGURE_ARGS+=--with-portaudio=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-portaudio