Update portaudio to v19/Remove portaudio2 [1]

Chase portaudio change
Add patches from debian for games/cultivation
Add patches from upsteam for audio/rezound
Mark py-fastaudio as broken

Approved by:	maintainer

74 files changed, 514 insertions, 637 deletions

diff --git a/MOVED b/MOVED
index 4d8f4c7..69bead1 100644
--- a/MOVED
+++ b/MOVED
@@ -7605,3 +7605,4 @@ net/rubygem-rightslicehost|net/rubygem-right_slicehost|2015-05-27|Rename to matc
 audio/rubygem-shout|audio/rubygem-ruby-shout|2015-05-27|Rename to match our rubygems naming
 devel/rubygem-test|devel/rubygem-rubygems-test|2015-05-29|Rename to match our rubygems naming
 devel/rubygem-deeptest|devel/rubygem-deep_test|2015-05-30|Rename to match our rubygems naming
+audio/portaudio2|audio/portaudio|2015-05-30|Merged into the main port
diff --git a/audio/Makefile b/audio/Makefile
index 8645f0c..ca64adc 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -592,7 +592,6 @@
     SUBDIR += pms
     SUBDIR += pocketsphinx
     SUBDIR += portaudio
-    SUBDIR += portaudio2
     SUBDIR += praat
     SUBDIR += puddletag
     SUBDIR += pulseaudio
diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 83851a3..4321baf 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	baresip
 PORTVERSION=	0.4.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.creytiv.com/pub/
 
@@ -108,7 +108,7 @@ post-patch:
 	${ECHO_CMD} '	@${ECHO_CMD} $$(MODULES)' >> ${WRKSRC}/Makefile
 	${REINPLACE_CMD} 's,-lcelt[0-9]*,$$(pkg-config --libs celt),' \
 		${WRKSRC}/modules/celt/module.mk
-	${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib/portaudio2 -lportaudio,' \
+	${REINPLACE_CMD} 's,-lportaudio[0-9]*,-L${LOCALBASE}/lib -lportaudio,' \
 		${WRKSRC}/modules/portaudio/module.mk
 
 do-install:
diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
index 12f78e4..d1a44f3 100644
--- a/audio/baresip/Makefile.depends
+++ b/audio/baresip/Makefile.depends
@@ -17,7 +17,7 @@ L16_DEPEND=
 OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:${PORTSDIR}/audio/opus
 OSS_DEPEND=	# In base
 PLC_DEPEND=	${LOCALBASE}/include/spandsp/plc.h:${PORTSDIR}/comms/spandsp
-PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_DEPEND=	${LOCALBASE}/include/portaudio.h:${PORTSDIR}/audio/portaudio
 SDL_DEPEND=	# Handled with USE_SDL in Makefile
 SNDFILE_DEPEND=	${LOCALBASE}/include/sndfile.h:${PORTSDIR}/audio/libsndfile
 SPEEX_DEPEND=	${LOCALBASE}/include/speex/speex.h:${PORTSDIR}/audio/speex
diff --git a/audio/baresip/files/patch-modules-portaudio-portaudio-c b/audio/baresip/files/patch-modules-portaudio-portaudio-c
deleted file mode 100644
index 0a51193..0000000
--- a/audio/baresip/files/patch-modules-portaudio-portaudio-c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/portaudio/portaudio.c.orig	2012-09-03 19:10:56.385452152 +0100
-+++ modules/portaudio/portaudio.c	2012-09-03 19:11:06.160451716 +0100
-@@ -4,7 +4,7 @@
-  * Copyright (C) 2010 Creytiv.com
-  */
- #include <string.h>
--#include <portaudio.h>
-+#include <portaudio2/portaudio.h>
- #include <re.h>
- #include <baresip.h>
- 
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 3a803a4..bd12948 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -107,15 +107,10 @@ MAKE_ARGS+=	useOSC=0
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-BUILD_DEPENDS+=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
-RUN_DEPENDS+=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
 MAKE_ARGS+=	usePortAudio=1
-PORTAUDIO_L=	"${LOCALBASE}/lib/portaudio2"
-PORTAUDIO_R=	"-Wl,-rpath,${LOCALBASE}/lib/portaudio2"
 .else
 MAKE_ARGS+=	usePortAudio=0
-PORTAUDIO_L=	# empty
-PORTAUDIO_R=	# empty
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
@@ -157,9 +152,7 @@ CXXLIB=		# empty
 
 post-patch:
 	@${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
-		s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|; \
-		s|%%PORTAUDIO_L%%|${PORTAUDIO_L}|; \
-		s|%%PORTAUDIO_R%%|${PORTAUDIO_R}|" \
+		s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|" \
 		< ${FILESDIR}/custom.py.in > ${WRKSRC}/custom.py
 	@${REINPLACE_CMD} -e "s|'unsupported'|'linux'|; \
 		s|Exit(-1)|print \"\"|; \
@@ -170,7 +163,6 @@ post-patch:
 		/LINKFLAGS/s|\['-Wl,-Bdynamic'\]|Split('${LDFLAGS}')|; \
 		s|\"pthread\"|\"\"|; \
 		s|'pthread'|''|; \
-		s|\"portaudio.h\"|\"portaudio2/portaudio.h\"|; \
 		s|\"boost/any.hpp\"|\"##boost/any.hpp##\"|; \
 		s|\"alsa/asoundlib.h\"|\"${ALSA_H}\"|; \
 		s|'xmlfile.h'|'##xmlfile.h##'|; \
@@ -186,8 +178,6 @@ post-patch:
 		/jpluginEnvironment/s|'asound'|''|; \
 		/portaudioEnvironment/s|'asound'|''|; \
 		/jackEnvironment/s|'asound'|''|" ${WRKSRC}/SConstruct
-	@${REINPLACE_CMD} -e "s|<portaudio.h>|<portaudio2/portaudio.h>|" \
-		${WRKSRC}/InOut/rtpa.c
 	@${REINPLACE_CMD} -e "s|linux/if.h|sys/types.h|" \
 		${WRKSRC}/OOps/remote.c
 
diff --git a/audio/csound/files/custom.py.in b/audio/csound/files/custom.py.in
index ed2ccc0..2ee0733 100644
--- a/audio/csound/files/custom.py.in
+++ b/audio/csound/files/custom.py.in
@@ -6,7 +6,7 @@ customCPPPATH = [ '%%LOCALBASE%%/include', '%%PYTHON_INCLUDEDIR%%' ]
 customCCFLAGS = [  ]
 customCXXFLAGS = [ ]
 customLIBS = [ 'intl' ]
-customLIBPATH = [ '%%PORTAUDIO_L%%', '%%LOCALBASE%%/lib' ]
-customSHLINKFLAGS = [ '%%PORTAUDIO_R%%' ]
+customLIBPATH = [ '%%LOCALBASE%%/lib' ]
+customSHLINKFLAGS = [ ]
 customSWIGFLAGS = []
 platform = 'linux'
diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index f67cc3c..534f0e5 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	csound
 PORTVERSION=	6.04
+PORTREVISION=	1
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
 PKGNAMESUFFIX=	6
@@ -86,10 +87,8 @@ PNG_DESC=		Build Image opcodes
 PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 PNG_CMAKE_OFF=		-DBUILD_IMAGE_OPCODES:BOOL=OFF
 PORTAUDIO_DESC=		Build PortAudio I/O module
-PORTAUDIO_BUILD_DEPENDS=portaudio2>0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_CMAKE_ON=	-DPORTAUDIO_INCLUDE_PATH:STRING="${LOCALBASE}/include/portaudio2" \
-			-DPORTAUDIO_LIBRARY:STRING="${LOCALBASE}/lib/portaudio2/libportaudio.so"
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PORTAUDIO_CMAKE_ON=	-DUSE_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DUSE_PORTAUDIO:BOOL=OFF
 PULSEAUDIO_DESC=	Build PulseAudio I/O module
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
@@ -120,9 +119,6 @@ post-patch:
 		's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/InOut/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
-		's|<portaudio.h>|<portaudio2/portaudio.h>|' \
-		${WRKSRC}/InOut/rtpa.c
-	@${REINPLACE_CMD} -e \
 		's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
 		 s|/usr/local|${LOCALBASE}| ; \
 		 /linuxjoystick/s|^|#| ; \
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index e1f450a..ef1d7c2 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	denemo
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	GNU
 
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libaubio.so:${PORTSDIR}/audio/aubio \
 		libjack.so:${PORTSDIR}/audio/jack \
 		libsmf.so:${PORTSDIR}/audio/libsmf \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		librubberband.so:${PORTSDIR}/audio/rubberband \
 		libguile-2.0.so:${PORTSDIR}/lang/guile2 \
 		libfftw3.so:${PORTSDIR}/math/fftw3
@@ -32,10 +33,8 @@ CONFIGURE_ARGS=	--enable-jack \
 		--disable-gtk-doc-html \
 		--disable-gtk-doc-pdf
 
-CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 \
-		-I${LOCALBASE}/include
-LDFLAGS+=	${LOCALBASE}/lib/portaudio2/libportaudio.so \
-		-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/audio/espeak/Makefile b/audio/espeak/Makefile
index 66aaf56..fbc9089 100644
--- a/audio/espeak/Makefile
+++ b/audio/espeak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	espeak
 PORTVERSION=	1.48.04
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -19,7 +19,7 @@ OPTIONS_RADIO=	AUDIO_SYSTEM
 OPTIONS_RADIO_AUDIO_SYSTEM=	PORTAUDIO PULSEAUDIO RUNTIME
 RUNTIME_DESC=	Sound interface selected at runtime
 
-PORTAUDIOLIB=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
+PORTAUDIOLIB=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PULSEAUDIOLIB=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 
 PORTAUDIO_LIB_DEPENDS=	${PORTAUDIOLIB}
@@ -49,8 +49,13 @@ REINPLACE_ARGS=	-i.bak -e "s|%%DATADIR%%|${DATADIR}|g"
 
 BROKEN_sparc64=	Does not compile on sparc64
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES}
+.if ${PORT_OPTIONS:MPORTAUDIO}
+	${MV} ${WRKSRC}/src/portaudio19.h ${WRKSRC}/src/portaudio.h
+.endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 3c04748..c6e3ea7 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fluidsynth
 PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -22,9 +22,6 @@ CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
 		-Denable-midishare:BOOL=FALSE
 USE_LDCONFIG=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
-
 JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CMAKE_OFF=		-Denable-jack:BOOL=FALSE
 
@@ -41,8 +38,7 @@ LADSPA_CMAKE_ON=	-Denable-ladspa:BOOL=TRUE
 LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
 LASH_CMAKE_OFF=		-Denable-lash:BOOL=FALSE
 
-PORTAUDIO_BUILD_DEPENDS=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CMAKE_ON=	-Denable-portaudio:BOOL=TRUE
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index c9e337c..c2944a7 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fmit
 PORTVERSION=	0.99.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/fmit/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
@@ -38,8 +38,7 @@ JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 JACK_CMAKE_ON=		-DSOUNDSYSTEM_USE_JACK:BOOL=true
 JACK_CMAKE_OFF=		-DSOUNDSYSTEM_USE_JACK:BOOL=false
 
-PORTAUDIO_BUILD_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=	portaudio2>=0:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CMAKE_ON=	-DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true
 PORTAUDIO_CMAKE_OFF=	-DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false
 
diff --git a/audio/gnaural/Makefile b/audio/gnaural/Makefile
index 6cefe45..126c023 100644
--- a/audio/gnaural/Makefile
+++ b/audio/gnaural/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnaural
 PORTVERSION=	1.0.20110606
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Gnaural/
 
@@ -13,7 +13,7 @@ COMMENT=	Binaural beat generator
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 GNU_CONFIGURE=	yes
diff --git a/audio/hydrogen-devel/Makefile b/audio/hydrogen-devel/Makefile
index 0f98ba1..90466f4 100644
--- a/audio/hydrogen-devel/Makefile
+++ b/audio/hydrogen-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hydrogen
 PORTVERSION=	0.9.6r2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-devel
 
@@ -64,11 +64,9 @@ LIBARCHIVE_LIB_DEPENDS=	libarchive.so:${PORTSDIR}/archivers/libarchive
 OSS_CMAKE_ON=		-DWANT_OSS:BOOL=ON
 OSS_CMAKE_OFF=		-DWANT_OSS:BOOL=OFF
 
-PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON \
-			-DPORTAUDIO_INCLUDE_DIR:STRING=${LOCALBASE}/include/portaudio2 \
-			-DPORTAUDIO_LIBRARIES:STRING=${LOCALBASE}/lib/portaudio2/libportaudio.so
+PORTAUDIO_CMAKE_ON=	-DWANT_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DWANT_PORTAUDIO:BOOL=OFF
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 RDF_DESC=		RDF File support
 RDF_CMAKE_ON=		-DWANT_LRDF:BOOL=ON
diff --git a/audio/listener/Makefile b/audio/listener/Makefile
index 1f2c771..af80083 100644
--- a/audio/listener/Makefile
+++ b/audio/listener/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	listener
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	audio security
 MASTER_SITES=	PACKETSTORM/linux/security \
 		http://www.vanheusden.com/listener/
@@ -12,13 +13,13 @@ COMMENT=	Program to listen for and record sound activity
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 USES=		ncurses tar:tgz
 
-CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index a85b67f..003ba38 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lmms
 PORTVERSION=	0.4.15
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF
diff --git a/audio/lmms/files/patch-CMakeLists.txt b/audio/lmms/files/patch-CMakeLists.txt
index e4117f0..9f050d8 100644
--- a/audio/lmms/files/patch-CMakeLists.txt
+++ b/audio/lmms/files/patch-CMakeLists.txt
@@ -9,15 +9,6 @@
  #SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}")
  #SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}")
  
-@@ -424,7 +424,7 @@
- ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
- 
- INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
--LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
-+LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib/portaudio2 ${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
- LINK_LIBRARIES(${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES})
- 
- ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz")
 @@ -462,7 +462,7 @@
  	ENDIF(NOT LMMS_BUILD_APPLE)
  
diff --git a/audio/lmms/files/patch-include_AudioPortAudio.h b/audio/lmms/files/patch-include_AudioPortAudio.h
deleted file mode 100644
index 50f7ab5..0000000
--- a/audio/lmms/files/patch-include_AudioPortAudio.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/AudioPortAudio.h.orig	2011-10-04 21:28:47.000000000 +0000
-+++ include/AudioPortAudio.h	2011-10-04 21:29:25.000000000 +0000
-@@ -45,7 +45,7 @@
- 
- #ifdef LMMS_HAVE_PORTAUDIO
- 
--#include <portaudio.h>
-+#include <portaudio2/portaudio.h>
- 
- #include "AudioDevice.h"
- 
diff --git a/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h b/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h
deleted file mode 100644
index d95fa38..0000000
--- a/audio/lmms/files/patch-plugins_zynaddsubfx_src_Output_PAaudiooutput.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/zynaddsubfx/src/Output/PAaudiooutput.h.orig	2011-10-04 21:29:52.000000000 +0000
-+++ plugins/zynaddsubfx/src/Output/PAaudiooutput.h	2011-10-04 21:30:34.000000000 +0000
-@@ -22,7 +22,7 @@
- #ifndef PA_AUDIO_OUTPUT_H
- #define PA_AUDIO_OUTPUT_H
- 
--#include <portaudio.h>
-+#include <portaudio2/portaudio.h>
- 
- #include "../globals.h"
- #include "../Misc/Master.h"
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index fe040f1..42a37f4 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mhwaveedit
 PORTVERSION=	1.4.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/mhwaveedit/
 
@@ -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.0:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${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 9f8f60a..c84e35c 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	mixxx
 PORTVERSION=	1.11.0
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
 
@@ -16,7 +16,7 @@ LICENSE=	GPLv2 # (or later)
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libid3tag.so:${PORTSDIR}/audio/libid3tag \
 		libmad.so:${PORTSDIR}/audio/libmad \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
 		libtag.so:${PORTSDIR}/audio/taglib \
diff --git a/audio/mixxx/files/patch-build__depends.py b/audio/mixxx/files/patch-build__depends.py
index 4102f89..e638fe6 100644
--- a/audio/mixxx/files/patch-build__depends.py
+++ b/audio/mixxx/files/patch-build__depends.py
@@ -67,7 +67,7 @@
          elif build.toolchain_is_msvs:
              # Validate the specified winlib directory exists
              mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')
-@@ -851,16 +847,20 @@
+@@ -851,16 +847,19 @@
  
          elif build.platform_is_bsd:
              build.env.Append(CPPDEFINES='__BSD__')
@@ -84,8 +84,7 @@
 +            build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2',
 +                                      '%%LOCALBASE%%/lib/qt4',
 +                                      '%%LOCALBASE%%/lib'])
-+            build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/portaudio2/libportaudio.so',
-+                                        '-Wl,-rpath,%%LOCALBASE%%/lib/portaudio2',
++            build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/libportaudio.so',
 +                                        '-Wl,-rpath,%%LOCALBASE%%/lib/qt4',
 +                                        '-Wl,-rpath,%%LOCALBASE%%/lib'])
              # why do we need to do this on OpenBSD and not on Linux?  if we
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index dd5a53d..57623e0 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	musescore
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/mscore/mscore/MuseScore-${PORTVERSION}/
 DISTNAME=	mscore-${PORTVERSION}
@@ -38,7 +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_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CMAKE_ON=	-DBUILD_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DBUILD_PORTAUDIO:BOOL=OFF
 
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 19a1aba..62c5296 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openal-soft
 PORTVERSION=	1.16.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 
@@ -38,11 +38,9 @@ CONFIG_USE=		QT4=gui
 FLUIDSYNTH_CMAKE_ON=	-DALSOFT_REQUIRE_FLUIDSYNTH:BOOL=ON
 FLUIDSYNTH_CMAKE_OFF=	-DALSOFT_MIDI_FLUIDSYNTH:BOOL=OFF
 FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
-PORTAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON \
-			-DPORTAUDIO_LIBRARY=${LOCALBASE}/lib/portaudio2/libportaudio.so
-PORTAUDIO_LDFLAGS=	-L${LOCALBASE}/lib/portaudio2
+PORTAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PORTAUDIO:BOOL=ON
 PORTAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PORTAUDIO:BOOL=OFF
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PULSEAUDIO_CMAKE_ON=	-DALSOFT_REQUIRE_PULSEAUDIO:BOOL=ON
 PULSEAUDIO_CMAKE_OFF=	-DALSOFT_BACKEND_PULSEAUDIO:BOOL=OFF
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
@@ -53,7 +51,5 @@ post-patch:
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} 's|share/openal|${ETCDIR}|' \
 		${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} 's|portaudio.h|portaudio2/portaudio.h|' \
-		${WRKSRC}/Alc/backends/portaudio.c
 
 .include <bsd.port.mk>
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index abd9e38..8972e59 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	portaudio
-PORTVERSION=	18.1
-PORTREVISION=	4
+DISTVERSION=	19_20140130
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.portaudio.com/archives/
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/}
+DISTNAME=	pa_stable_v${DISTVERSION}
 
 MAINTAINER=	koalative@gmail.com
 COMMENT=	Portable cross-platform Audio API
@@ -14,46 +14,81 @@ COMMENT=	Portable cross-platform Audio API
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		gmake dos2unix zip
+USES=		dos2unix gmake libtool pathfix pkgconfig tar:tgz
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
+CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig \
+			--without-alsa
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
-PLIST_SUB+=	SHLIB_VERSION=${SHLIB_VERSION}
-SHLIB_VERSION=	0
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		DOCS PATEST
-OPTIONS_DEFAULT=	PATEST
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	README.txt index.html
+
+OPTIONS_DEFINE=	DOCS DOXYGEN EXAMPLES JACK PATEST
+OPTIONS_DEFAULT=PATEST
 
 PATEST_DESC=	PortAudio Test Programs
+DOXYGEN_DESC=	Install API documentation (requires DOCS)
 
 OPTIONS_SUB=	yes
 
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_ON=	--with-jack
+JACK_CONFIGURE_OFF=	--without-jack
+
+EXAMPLES_BIN=	pa_d* pa_f* paex_*
+PATEST_BIN=	pa_m* paqa_* patest*
+
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|#include <malloc.h>|#include <stdlib.h>|' \
-		${WRKSRC}/pa_unix_oss/pa_unix.h
-	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \
-		${WRKSRC}/pa_unix_oss/pa_unix_oss.c
+	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \
+		${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript
+	@${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure
 
-pre-configure:
-	@${CHMOD} +x ${WRKSRC}/configure
+.if ! ${PORT_OPTIONS:MEXAMPLES}
+	@${REINPLACE_CMD} -i '' '/EXAMPLES =/,/bin\/paex_write_sine_nonint/s/^/#/' \
+		${WRKSRC}/Makefile.in
+.endif
 
 post-install:
-	@${LN} -sf libportaudio.so \
-		${STAGEDIR}${PREFIX}/lib/libportaudio.so.${SHLIB_VERSION}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libportaudio.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libportaudio.so.2
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+.for f in ${EXAMPLES_BIN}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
+.endfor
+.endif
+
 .if ${PORT_OPTIONS:MPATEST}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin/
+.for f in ${PATEST_BIN}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
+.endfor
 .endif
+
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "README.txt index.html \
-		docs/*.html docs/*.txt docs/*.pdf" ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+.endif
+
+.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
+	@cd ${WRKSRC} && doxygen
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
+.endif 
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index 2d715d2..e61fa83a 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (portaudio_v18_1.zip) = 9da7f1ba0b8029f934d5a8300199e29095127e6abfa03dbb3c1ce40e10751f0a
-SIZE (portaudio_v18_1.zip) = 550130
+SHA256 (pa_stable_v19_20140130.tgz) = 8fe024a5f0681e112c6979808f684c3516061cc51d3acc0b726af98fc96c8d57
+SIZE (pa_stable_v19_20140130.tgz) = 1504620
diff --git a/audio/portaudio/files/patch-Makefile.in b/audio/portaudio/files/patch-Makefile.in
deleted file mode 100644
index 782b22c..0000000
--- a/audio/portaudio/files/patch-Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
---- Makefile.in.orig	2011-03-12 12:04:08.000000000 -0600
-+++ Makefile.in	2011-03-12 12:04:22.000000000 -0600
-@@ -15,6 +15,7 @@
- DLL_LIBS = @DLL_LIBS@
- 
- OTHER_OBJS = @OTHER_OBJS@
-+OTHER_SHOBJS = @OTHER_SHOBJS@
- 
- PALIB = libportaudio.a
- PADLL = @PADLL@
-@@ -25,6 +26,10 @@
- 	pa_common/pa_convert.o \
- 	pa_common/pa_lib.o
- 
-+COMMON_SHOBJS = \
-+	pa_common/pa_convert.So \
-+	pa_common/pa_lib.So
-+
- TESTS = \
- 	bin/patest_buffer \
- 	bin/patest_clip \
-@@ -50,8 +55,15 @@
- 	bin/patest_underflow \
- 	bin/patest_wire
- 
-+.SUFFIXES: .o .So
-+
-+.c.So:
-+	$(CC) $(CFLAGS) -fPIC -o $*.So -c $?
-+
- OBJS = $(COMMON_OBJS) $(OTHER_OBJS)
- 
-+SHOBJS = $(COMMON_SHOBJS) $(OTHER_SHOBJS)
-+
- all: lib/$(PALIB) lib/$(PADLLV) tests
- 
- tests: bin/ $(TESTS)
-@@ -60,8 +72,8 @@
- 	$(AR) ruv lib/$(PALIB) $(OBJS)
- 	$(RANLIB) lib/$(PALIB)
- 
--lib/$(PADLLV): lib/ $(OBJS) Makefile $(PAINC)
--	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(OBJS) $(DLL_LIBS)
-+lib/$(PADLLV): lib/ $(SHOBJS) Makefile $(PAINC)
-+	$(CC) $(SHARED_FLAGS) -o lib/$(PADLLV) $(SHOBJS) $(DLL_LIBS)
- 
- $(TESTS): bin/%: lib/$(PALIB) Makefile $(PAINC) pa_tests/%.c
- 	$(CC) -o $@ $(CFLAGS) pa_tests/$*.c lib/$(PALIB) $(LIBS)
-@@ -89,8 +101,8 @@
- %.o: %.c Makefile $(PAINC)
- 	$(CC) -c $(CFLAGS) $< -o $@
- 
--bin:
-+bin/:
- 	mkdir bin
- 
--lib:
-+lib/:
- 	mkdir lib
diff --git a/audio/portaudio/files/patch-configure b/audio/portaudio/files/patch-configure
deleted file mode 100644
index 25233c7..0000000
--- a/audio/portaudio/files/patch-configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Mon Mar 15 15:52:38 2004
-+++ configure	Mon Mar 15 15:53:00 2004
-@@ -1972,6 +1972,7 @@
- fi
- 
- 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
-+	OTHER_SHOBJS="pa_unix_oss/pa_unix_oss.So pa_unix_oss/pa_unix.So";
- 	LIBS="-lm -lpthread";
- 	PADLL="libportaudio.so";
- 	SHARED_FLAGS="-shared";
-@@ -2404,6 +2405,7 @@
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
- s,@AR@,$AR,;t t
- s,@OTHER_OBJS@,$OTHER_OBJS,;t t
-+s,@OTHER_SHOBJS@,$OTHER_SHOBJS,;t t
- s,@PADLL@,$PADLL,;t t
- s,@SHARED_FLAGS@,$SHARED_FLAGS,;t t
- s,@DLL_LIBS@,$DLL_LIBS,;t t
diff --git a/audio/portaudio/files/patch-pa_tests-patest__record.c b/audio/portaudio/files/patch-pa_tests-patest__record.c
deleted file mode 100644
index e462fc9..0000000
--- a/audio/portaudio/files/patch-pa_tests-patest__record.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- pa_tests/patest_record.c.orig	2012-12-22 13:48:25.000000000 +0100
-+++ pa_tests/patest_record.c	2012-12-22 13:48:25.000000000 +0100
-@@ -138,10 +138,10 @@
-     SAMPLE *wptr = (SAMPLE*)outputBuffer;
-     unsigned int i;
-     int finished;
-+    int framesToPlay, samplesToPlay, samplesPerBuffer;
-     unsigned int framesLeft = data->maxFrameIndex - data->frameIndex;
-     (void) inputBuffer; /* Prevent unused variable warnings. */
-     (void) outTime;
--    int framesToPlay, samplesToPlay, samplesPerBuffer;
- 
-     if( framesLeft < framesPerBuffer )
-     {
diff --git a/audio/portaudio/files/patch-pa_tests-patest__wire.c b/audio/portaudio/files/patch-pa_tests-patest__wire.c
deleted file mode 100644
index e9f3d5d..0000000
--- a/audio/portaudio/files/patch-pa_tests-patest__wire.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- pa_tests/patest_wire.c.orig	2012-12-22 13:48:25.000000000 +0100
-+++ pa_tests/patest_wire.c	2012-12-22 13:48:25.000000000 +0100
-@@ -74,9 +74,9 @@
-     SAMPLE *out = (SAMPLE*)outputBuffer;
-     SAMPLE *in = (SAMPLE*)inputBuffer;
-     unsigned int i;
--    (void) outTime;
-     int samplesPerFrame;
-     int numSamples;
-+    (void) outTime;
-     
-     samplesPerFrame = (int) userData;
-     numSamples =  framesPerBuffer * samplesPerFrame;
diff --git a/audio/portaudio/pkg-plist b/audio/portaudio/pkg-plist
index a8a0c5b..0d4b7fc 100644
--- a/audio/portaudio/pkg-plist
+++ b/audio/portaudio/pkg-plist
@@ -1,28 +1,49 @@
+%%PORTEXAMPLES%%bin/pa_devs
+%%PORTEXAMPLES%%bin/pa_fuzz
+%%PATEST%%bin/pa_minlat
+%%PORTEXAMPLES%%bin/paex_pink
+%%PORTEXAMPLES%%bin/paex_read_write_wire
+%%PORTEXAMPLES%%bin/paex_record
+%%PORTEXAMPLES%%bin/paex_saw
+%%PORTEXAMPLES%%bin/paex_sine
+%%PORTEXAMPLES%%bin/paex_write_sine
+%%PORTEXAMPLES%%bin/paex_write_sine_nonint
+%%PATEST%%bin/paqa_devs
+%%PATEST%%bin/paqa_errs
+%%PATEST%%bin/paqa_latency
+%%PATEST%%bin/patest1
 %%PATEST%%bin/patest_buffer
+%%PATEST%%bin/patest_callbackstop
 %%PATEST%%bin/patest_clip
 %%PATEST%%bin/patest_dither
 %%PATEST%%bin/patest_hang
+%%PATEST%%bin/patest_in_overflow
 %%PATEST%%bin/patest_latency
 %%PATEST%%bin/patest_leftright
 %%PATEST%%bin/patest_longsine
 %%PATEST%%bin/patest_many
 %%PATEST%%bin/patest_maxsines
+%%PATEST%%bin/patest_mono
 %%PATEST%%bin/patest_multi_sine
-%%PATEST%%bin/patest_pink
-%%PATEST%%bin/patest_record
+%%PATEST%%bin/patest_out_underflow
+%%PATEST%%bin/patest_prime
 %%PATEST%%bin/patest_ringmix
-%%PATEST%%bin/patest_saw
-%%PATEST%%bin/patest_sine
 %%PATEST%%bin/patest_sine8
+%%PATEST%%bin/patest_sine_channelmaps
 %%PATEST%%bin/patest_sine_formats
+%%PATEST%%bin/patest_sine_srate
 %%PATEST%%bin/patest_sine_time
+%%PATEST%%bin/patest_start_stop
 %%PATEST%%bin/patest_stop
-%%PATEST%%bin/patest_sync
+%%PATEST%%bin/patest_stop_playout
 %%PATEST%%bin/patest_toomanysines
+%%PATEST%%bin/patest_two_rates
 %%PATEST%%bin/patest_underflow
 %%PATEST%%bin/patest_wire
+%%JACK%%include/pa_jack.h
 include/portaudio.h
 lib/libportaudio.a
 lib/libportaudio.so
-lib/libportaudio.so.0.0.18
-lib/libportaudio.so.%%SHLIB_VERSION%%
+lib/libportaudio.so.2
+lib/libportaudio.so.2.0.0
+libdata/pkgconfig/portaudio-2.0.pc
diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile
deleted file mode 100644
index 064d6d2..0000000
--- a/audio/portaudio2/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# Created by: michaelnottebrock@gmx.net and lioux@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	portaudio
-DISTVERSION=	19_20140130
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	http://www.portaudio.com/archives/
-PKGNAMESUFFIX=	2
-DISTNAME=	pa_stable_v${DISTVERSION}
-
-MAINTAINER=	koalative@gmail.com
-COMMENT=	Portable cross-platform Audio API
-
-LICENSE=	MIT
-
-WRKSRC=		${WRKDIR}/${PORTNAME:S/2//}
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=PKG_CONFIG_LIBDIR=${PREFIX}/libdata/pkgconfig \
-			--without-alsa \
-			--libdir=${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX} \
-			--includedir=${PREFIX}/include/${PORTNAME}${PKGNAMESUFFIX}
-
-USES=		dos2unix gmake libtool pathfix pkgconfig tar:tgz
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
-
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	README.txt index.html
-
-OPTIONS_DEFINE=	DOCS DOXYGEN EXAMPLES JACK PATEST
-OPTIONS_DEFAULT=PATEST
-
-PATEST_DESC=	PortAudio Test Programs
-DOXYGEN_DESC=	Install API documentation (requires DOCS)
-
-OPTIONS_SUB=	yes
-
-JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
-JACK_CONFIGURE_ON=	--with-jack
-JACK_CONFIGURE_OFF=	--without-jack
-
-EXAMPLES_BIN=	pa_d* pa_f* paex_*
-PATEST_BIN=	pa_m* paqa_* patest*
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' ${WRKSRC}/configure.in \
-		${WRKSRC}/src/hostapi/oss/pa_unix_oss.c ${WRKSRC}/src/SConscript
-	@${REINPLACE_CMD} -e 's|PACKAGE_NAME=|PACKAGE_NAME=portaudio2|' ${WRKSRC}/configure
-
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-	@${REINPLACE_CMD} -i '' '/EXAMPLES =/,/bin\/paex_write_sine_nonint/s/^/#/' \
-		${WRKSRC}/Makefile.in
-.endif
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/portaudio2/libportaudio.so.2
-
-.if ${PORT_OPTIONS:MEXAMPLES} || ${PORT_OPTIONS:MPATEST}
-	@(cd ${WRKSRC}/bin && for i in *; do ${MV} "$$i" "$${i}"-${PKGNAMESUFFIX}; done)
-.endif
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-.for f in ${EXAMPLES_BIN}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
-.endfor
-.endif
-
-.if ${PORT_OPTIONS:MPATEST}
-.for f in ${PATEST_BIN}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin/
-.endfor
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-.endif
-
-.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
-	@cd ${WRKSRC} && doxygen
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-.endif 
-
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
-
-.include <bsd.port.mk>
diff --git a/audio/portaudio2/distinfo b/audio/portaudio2/distinfo
deleted file mode 100644
index e61fa83a..0000000
--- a/audio/portaudio2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pa_stable_v19_20140130.tgz) = 8fe024a5f0681e112c6979808f684c3516061cc51d3acc0b726af98fc96c8d57
-SIZE (pa_stable_v19_20140130.tgz) = 1504620
diff --git a/audio/portaudio2/pkg-descr b/audio/portaudio2/pkg-descr
deleted file mode 100644
index e7271f6..0000000
--- a/audio/portaudio2/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-PortAudio is a free, cross-platform, open-source, audio I/O library.
-It lets you write simple audio programs in 'C' or C++ that will compile and run
-on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA).
-It is intended to promote the exchange of audio software between developers
-on different platforms. Many applications use PortAudio for Audio I/O.
-
-PortAudio provides a very simple API for recording and/or playing sound using
-a simple callback function or a blocking read/write interface.
-Example programs are included that play sine waves, process audio input
-(guitar fuzz), record and playback audio, list available audio devices, etc.
-
-WWW: http://www.portaudio.com/
diff --git a/audio/portaudio2/pkg-plist b/audio/portaudio2/pkg-plist
deleted file mode 100644
index aab113f..0000000
--- a/audio/portaudio2/pkg-plist
+++ /dev/null
@@ -1,49 +0,0 @@
-%%PORTEXAMPLES%%bin/pa_devs-2
-%%PORTEXAMPLES%%bin/pa_fuzz-2
-%%PATEST%%bin/pa_minlat-2
-%%PORTEXAMPLES%%bin/paex_pink-2
-%%PORTEXAMPLES%%bin/paex_read_write_wire-2
-%%PORTEXAMPLES%%bin/paex_record-2
-%%PORTEXAMPLES%%bin/paex_saw-2
-%%PORTEXAMPLES%%bin/paex_sine-2
-%%PORTEXAMPLES%%bin/paex_write_sine-2
-%%PORTEXAMPLES%%bin/paex_write_sine_nonint-2
-%%PATEST%%bin/paqa_devs-2
-%%PATEST%%bin/paqa_errs-2
-%%PATEST%%bin/paqa_latency-2
-%%PATEST%%bin/patest1-2
-%%PATEST%%bin/patest_buffer-2
-%%PATEST%%bin/patest_callbackstop-2
-%%PATEST%%bin/patest_clip-2
-%%PATEST%%bin/patest_dither-2
-%%PATEST%%bin/patest_hang-2
-%%PATEST%%bin/patest_in_overflow-2
-%%PATEST%%bin/patest_latency-2
-%%PATEST%%bin/patest_leftright-2
-%%PATEST%%bin/patest_longsine-2
-%%PATEST%%bin/patest_many-2
-%%PATEST%%bin/patest_maxsines-2
-%%PATEST%%bin/patest_mono-2
-%%PATEST%%bin/patest_multi_sine-2
-%%PATEST%%bin/patest_out_underflow-2
-%%PATEST%%bin/patest_prime-2
-%%PATEST%%bin/patest_ringmix-2
-%%PATEST%%bin/patest_sine8-2
-%%PATEST%%bin/patest_sine_channelmaps-2
-%%PATEST%%bin/patest_sine_formats-2
-%%PATEST%%bin/patest_sine_srate-2
-%%PATEST%%bin/patest_sine_time-2
-%%PATEST%%bin/patest_start_stop-2
-%%PATEST%%bin/patest_stop-2
-%%PATEST%%bin/patest_stop_playout-2
-%%PATEST%%bin/patest_toomanysines-2
-%%PATEST%%bin/patest_two_rates-2
-%%PATEST%%bin/patest_underflow-2
-%%PATEST%%bin/patest_wire-2
-%%JACK%%include/portaudio2/pa_jack.h
-include/portaudio2/portaudio.h
-lib/portaudio2/libportaudio.a
-lib/portaudio2/libportaudio.so
-lib/portaudio2/libportaudio.so.2
-lib/portaudio2/libportaudio.so.2.0.0
-libdata/pkgconfig/portaudio-2.0.pc
diff --git a/audio/pure-audio/Makefile b/audio/pure-audio/Makefile
index 93468bd..a28bf5f 100644
--- a/audio/pure-audio/Makefile
+++ b/audio/pure-audio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pure-audio
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	https://cdn.bitbucket.org/purelang/pure-lang/downloads/
 DIST_SUBDIR=	pure
@@ -14,19 +14,13 @@ COMMENT=	Digital audio interface for the Pure language
 LICENSE=	BSD3CLAUSE
 
 BROKEN=		Unfetchable
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libfftw3.so:${PORTSDIR}/math/fftw3
 
 USES=		pure
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e "s|-lportaudio|-I${LOCALBASE}/include/portaudio2 -L${LOCALBASE}/lib/portaudio2 -lportaudio|" \
-		-e "s|portaudio.h|portaudio2/portaudio.h|g" \
-			${WRKSRC}/Makefile
-
 PORTDOCS=	README
 PORTEXAMPLES=	*
 
diff --git a/audio/py-fastaudio/Makefile b/audio/py-fastaudio/Makefile
index 3f29fd6..9895e89 100644
--- a/audio/py-fastaudio/Makefile
+++ b/audio/py-fastaudio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fastaudio
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	http://freenet.mcnabhosting.com/python/pyPortAudio/:site1 \
 		http://www.portaudio.com/archives/:site2
@@ -15,8 +15,10 @@ DIST_SUBDIR=	python
 MAINTAINER=	ninjin@kth.se
 COMMENT=	Python bindings for the PortAudio multi-platform audio library
 
+BROKEN=		Does not work with portaudio v19
+
 BUILD_DEPENDS=	pyrex>=0.9.6.2:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	libportaudio.so.0:${PORTSDIR}/audio/portaudio \
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/fastaudio.so
diff --git a/audio/py-pyaudio/Makefile b/audio/py-pyaudio/Makefile
index 96e8b3b..f0ffbb0 100644
--- a/audio/py-pyaudio/Makefile
+++ b/audio/py-pyaudio/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyaudio
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://people.csail.mit.edu/hubert/pyaudio/packages/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Portaudio toolkit bindings for Python
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/audio/py-pyaudio/files/patch-setup.py b/audio/py-pyaudio/files/patch-setup.py
index 4855cc0..016b127 100644
--- a/audio/py-pyaudio/files/patch-setup.py
+++ b/audio/py-pyaudio/files/patch-setup.py
@@ -6,9 +6,9 @@
  
 +if sys.platform.startswith('dragonfly') or \
 +   sys.platform.startswith('freebsd'):
-+    include_dirs = ['%%LOCALBASE%%/include/portaudio2']
++    include_dirs = ['%%LOCALBASE%%/include/']
 +    external_libraries = []
-+    extra_link_args = ['%%LOCALBASE%%/lib/portaudio2/libportaudio.so']
++    extra_link_args = ['%%LOCALBASE%%/lib/libportaudio.so']
 +
  if sys.platform == 'darwin':
      defines += [('MACOSX', '1')]
diff --git a/audio/rezound/Makefile b/audio/rezound/Makefile
index 3e69d35..bea1298 100644
--- a/audio/rezound/Makefile
+++ b/audio/rezound/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rezound
 DISTVERSION=	0.12.3beta
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/ReZound/${DISTVERSION}
 
@@ -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.0:${PORTSDIR}/audio/portaudio
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${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
@@ -47,6 +47,8 @@ LADSPA_CONFIGURE_OFF=	--disable-ladspa
 LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
 
+EXTRA_PATCHES=		${FILESDIR}/050_all_portaudio19.patch:-p1
+
 .include <bsd.port.options.mk>
 
 # NLS support is broken as of recent versions of libstdc++; rezound dies at
@@ -59,6 +61,10 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MPORTAUDIO}
+LIBS+=	-lportaudio
+.endif
+
 post-patch: .SILENT
 	${REINPLACE_CMD} -E '/atoll|round|nearbyint/d' \
 		${WRKSRC}/config/platform/bsd.h
@@ -99,4 +105,9 @@ post-patch: .SILENT
 	${REINPLACE_CMD} -e 's/ install-pkgdocDATA$$//' ${WRKSRC}/Makefile.in
 .endif
 
+.if ${PORT_OPTIONS:MPORTAUDIO}
+post-configure:
+	${ECHO_CMD} "#define ENABLE_PORTAUDIO_V19 1" >> ${WRKSRC}/config/config.h
+.endif
+
 .include <bsd.port.mk>
diff --git a/audio/rezound/files/050_all_portaudio19.patch b/audio/rezound/files/050_all_portaudio19.patch
new file mode 100644
index 0000000..3757e91
--- /dev/null
+++ b/audio/rezound/files/050_all_portaudio19.patch
@@ -0,0 +1,196 @@
+Index: rezound-0.12.3beta/configure.ac
+===================================================================
+--- rezound-0.12.3beta.orig/configure.ac
++++ rezound-0.12.3beta/configure.ac
+@@ -372,13 +372,22 @@ AC_ARG_ENABLE(
+ 
+ # handle the --enable-portaudio flag
+ AH_TEMPLATE(ENABLE_PORTAUDIO)
++AH_TEMPLATE(ENABLE_PORTAUDIO_V19)
+ if test -z "$enable_standalone"; then
+ 	AC_ARG_ENABLE(
+ 		portaudio,
+ 		AC_HELP_STRING([--enable/disable-portaudio],[enable/disable ReZound to use PortAudio for audio I/O]),
+ 		[
+ 			if [[ "$enableval" = "yes" ]]
+-			then 
++			then
++				PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:)
++				if test "x$portaudio_v19" = "xyes"; then
++					AC_DEFINE(ENABLE_PORTAUDIO)
++					AC_DEFINE(ENABLE_PORTAUDIO_V19)
++					LIBS="$LIBS $PORTAUDIO_19_LIBS"
++					AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O])
++					using_portaudio=1
++				else
+ 				# --enable-portaudio was given
+ 				# Require that the portaudio library can be found
+ 				AC_CHECK_LIB(
+@@ -404,12 +413,21 @@ if test -z "$enable_standalone"; then
+ 
+ 					AC_MSG_ERROR([***** libportaudio.a not found (http://www.portaudio.com) *****])
+ 				)
++				fi
+ 			else
+ 				AC_MSG_RESULT([*** disabling libportaudio for audio I/O])
+ 			fi
+ 		],
+ 		[ # action if neither enable or disable flag was given
+ 			# if libportaudio and portaudio.h are found, then enable it
++			PKG_CHECK_MODULES(PORTAUDIO_19,portaudio-2.0 >= 0.21 ,[portaudio_v19=yes],:)
++			if test "x$portaudio_v19" = "xyes"; then
++				AC_DEFINE(ENABLE_PORTAUDIO)
++				AC_DEFINE(ENABLE_PORTAUDIO_V19)
++				LIBS="$LIBS $PORTAUDIO_19_LIBS"
++				AC_MSG_RESULT([*** enabling libportaudio v19 for audio I/O])
++				using_portaudio=1
++			else
+ 			AC_CHECK_LIB(
+ 				portaudio,
+ 				Pa_Initialize,
+@@ -430,6 +448,7 @@ if test -z "$enable_standalone"; then
+ 					]
+ 				)]
+ 			)
++			fi
+ 		]
+ 	)
+ else
+Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp
+===================================================================
+--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.cpp
++++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.cpp
+@@ -70,6 +70,24 @@ void CPortAudioSoundPlayer::initialize()
+ 		
+ 
+ 		// open a PortAudio stream
++#ifdef ENABLE_PORTAUDIO_V19
++		PaStreamParameters output = { gPortAudioOutputDevice, 
++			gDesiredOutputChannelCount, 
++			sampleFormat,
++			Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowOutputLatency ,
++			NULL};
++
++		err = Pa_OpenStream(
++				&stream,
++				NULL,
++				&output,
++				gDesiredOutputSampleRate,
++				gDesiredOutputBufferSize * gDesiredOutputBufferCount,
++				paClipOff|paDitherOff,
++				CPortAudioSoundPlayer::PortAudioCallback,
++				this);
++
++#else
+ 		err = Pa_OpenStream(
+ 			&stream,
+ 			paNoDevice,			/* recording parameter, we're not recording */
+@@ -86,6 +104,7 @@ void CPortAudioSoundPlayer::initialize()
+ 			paClipOff|paDitherOff,
+ 			CPortAudioSoundPlayer::PortAudioCallback,
+ 			this);
++#endif
+ 
+ 		if(err!=paNoError) 
+ 			throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err));
+@@ -156,7 +175,11 @@ void CPortAudioSoundPlayer::doneRecordin
+ }
+ 
+ 
++#ifdef ENABLE_PORTAUDIO_V19
++int CPortAudioSoundPlayer::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData)
++#else
+ int CPortAudioSoundPlayer::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData)
++#endif
+ {
+ 	try
+ 	{
+Index: rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h
+===================================================================
+--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundPlayer.h
++++ rezound-0.12.3beta/src/backend/CPortAudioSoundPlayer.h
+@@ -45,10 +45,14 @@ public:
+ 
+ private:
+ 	bool initialized;
+-	PortAudioStream *stream;
++	PaStream *stream;
+ 	bool supportsFullDuplex;
+ 
++#ifdef ENABLE_PORTAUDIO_V19
++	static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData);
++#else
+ 	static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData);
++#endif
+ 
+ };
+ 
+Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp
+===================================================================
+--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.cpp
++++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.cpp
+@@ -65,6 +65,24 @@ void CPortAudioSoundRecorder::initialize
+ 		ASoundRecorder::initialize(sound);
+ 
+ 		// open a PortAudio stream
++#ifdef ENABLE_PORTAUDIO_V19
++		PaStreamParameters input = { 
++                        gPortAudioOutputDevice, 
++                        sound->getChannelCount(), 
++                        sampleFormat, 
++                        Pa_GetDeviceInfo(gPortAudioOutputDevice)->defaultLowInputLatency ,
++                        NULL};
++		err = Pa_OpenStream(
++			&stream,
++			&input,
++			NULL,
++			sound->getSampleRate(),
++			BUFFER_SIZE_FRAMES*12,
++			paClipOff|paDitherOff,
++			CPortAudioSoundRecorder::PortAudioCallback,
++			this);
++
++#else
+ 		err = Pa_OpenStream(
+ 			&stream,
+ 			gPortAudioOutputDevice,
+@@ -81,6 +99,7 @@ void CPortAudioSoundRecorder::initialize
+ 			paClipOff|paDitherOff,
+ 			CPortAudioSoundRecorder::PortAudioCallback,
+ 			this);
++#endif
+ 
+ 		if(err!=paNoError) 
+ 			throw runtime_error(string(__func__)+" -- error opening PortAudio stream -- "+Pa_GetErrorText(err));
+@@ -131,7 +150,11 @@ void CPortAudioSoundRecorder::redo()
+ 	Pa_StartStream(stream);
+ }
+ 
++#ifdef ENABLE_PORTAUDIO_V19
++int CPortAudioSoundRecorder::PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData)
++#else
+ int CPortAudioSoundRecorder::PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData)
++#endif
+ {
+ 	try
+ 	{
+Index: rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h
+===================================================================
+--- rezound-0.12.3beta.orig/src/backend/CPortAudioSoundRecorder.h
++++ rezound-0.12.3beta/src/backend/CPortAudioSoundRecorder.h
+@@ -42,10 +42,14 @@ public:
+ 	void redo();
+ 
+ private:
+-	PortAudioStream *stream;
++	PaStream *stream;
+ 	bool initialized;
+ 
++#ifdef ENABLE_PORTAUDIO_V19
++	static int PortAudioCallback(const void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,const PaStreamCallbackTimeInfo* outTime, PaStreamCallbackFlags statusFlags, void *userData);
++#else
+ 	static int PortAudioCallback(void *inputBuffer,void *outputBuffer,unsigned long framesPerBuffer,PaTimestamp outTime,void *userData);
++#endif
+ };
+ 
+ #endif // ENABLE_PORTAUDIO
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index bfa09d8..8153653 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zynaddsubfx
 PORTVERSION=	2.4.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF
 DISTNAME=	ZynAddSubFX-${PORTVERSION}
@@ -54,10 +54,9 @@ LASH_CMAKE_OFF=			-DLashEnabe:BOOL=OFF
 JACK_LIB_DEPENDS=		libjack.so:${PORTSDIR}/audio/jack
 JACK_CMAKE_OFF=			-DJackEnable:BOOL=OFF
 
-PORTAUDIO_LIB_DEPENDS=		libportaudio.so.2:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_CFLAGS=		-I${LOCALBASE}/include/portaudio2
+PORTAUDIO_LIB_DEPENDS=		libportaudio.so:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CMAKE_OFF=		-DPaEnabe:BOOL=OFF
-PORTAUDIO_LDFLAGS=		${LOCALBASE}/lib/portaudio2/libportaudio.so
+PORTAUDIO_LDFLAGS=		-lportaudio
 
 PORTDOCS=	*
 
diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index a767ad4..77ec205 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dabstick-radio
 PORTVERSION=	0.96
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://www.sdr-j.tk/ \
 		LOCAL/nox/
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr \
 		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index e7d9d67..efd6e99 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	3.22.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/\
 		LOCAL/shurd
@@ -47,8 +47,7 @@ OSS_CONFIGURE_ENABLE=		oss
 SNDFILE_CONFIGURE_WITH=		sndfile
 SNDFILE_LIB_DEPENDS=		libsndfile.so:${PORTSDIR}/audio/libsndfile
 PORTAUDIO_CONFIGURE_WITH=	portaudio
-PORTAUDIO_BUILD_DEPENDS=	${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=		libportaudio.so:${PORTSDIR}/audio/portaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
 HAMLIB_CONFIGURE_WITH=		hamlib
diff --git a/comms/fldigi/files/patch-Makefile.in b/comms/fldigi/files/patch-Makefile.in
deleted file mode 100644
index ed3a7f9a..0000000
--- a/comms/fldigi/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2015-04-24 12:55:28 UTC
-+++ Makefile.in
-@@ -145,7 +145,7 @@ CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = "-I%%LOCALBASE%%/include/portaudio2 @CPPFLAGS@"
- CXX = @CXX@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index c2279d8..419d39e 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.7.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
@@ -29,7 +29,7 @@ LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/devel/cppunit \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
 		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
 		libboost_python.so:${PORTSDIR}/devel/boost-python-libs \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libjack.so:${PORTSDIR}/audio/jack \
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libgsl.so:${PORTSDIR}/math/gsl
diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake
deleted file mode 100644
index fe86a14..0000000
--- a/comms/gnuradio/files/patch-cmake_Modules_FindPortaudio.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/Modules/FindPortaudio.cmake.orig	2014-05-16 18:55:22.000000000 -0400
-+++ cmake/Modules/FindPortaudio.cmake	2014-08-04 21:57:47.000000000 -0400
-@@ -8,6 +8,15 @@
- include(FindPkgConfig)
- pkg_check_modules(PC_PORTAUDIO portaudio-2.0)
- 
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  message("--- Using Portaudio2 for FreeBSD")
-+  set(PORTAUDIO_FOUND_TRUE)
-+  set(PORTAUDIO_INCLUDE_DIRS "/usr/local/include/portaudio2")
-+  set(PORTAUDIO_LIBRARIES "/usr/local/lib/portaudio2/libportaudio.so")
-+  mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
-+  INCLUDE(FindPackageHandleStandardArgs)
-+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(PORTAUDIO DEFAULT_MSG PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
-+else()
- find_path(PORTAUDIO_INCLUDE_DIRS
-   NAMES
-     portaudio.h
-@@ -50,3 +59,6 @@
-     set(PORTAUDIO_FOUND FALSE)
-   endif(PORTAUDIO2_FOUND)
- endif()
-+
-+endif()
-+
diff --git a/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
index 56e1c0c..cf59ae0 100644
--- a/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
+++ b/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
@@ -1,16 +1,5 @@
 --- gr-audio/lib/CMakeLists.txt.orig	2014-07-02 21:09:41.000000000 -0400
 +++ gr-audio/lib/CMakeLists.txt	2014-08-02 14:55:41.000000000 -0400
-@@ -136,8 +136,8 @@
- 
- if(PORTAUDIO_FOUND)
- 
--    include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/portaudio)
--    include_directories(${PORTAUDIO_INCLUDE_DIRS})
-+    include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio)
-+    include_directories(BEFORE ${PORTAUDIO_INCLUDE_DIRS})
-     list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES})
-     add_definitions(${PORTAUDIO_DEFINITIONS})
-     list(APPEND gr_audio_sources
 @@ -184,7 +184,15 @@
  target_link_libraries(gnuradio-audio ${gr_audio_libs})
  GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
diff --git a/comms/jsdr/Makefile b/comms/jsdr/Makefile
index 54ee7e7..e40926c 100644
--- a/comms/jsdr/Makefile
+++ b/comms/jsdr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jsdr
 PORTVERSION=	4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://www.sdr-j.tk/ \
 		LOCAL/nox/
@@ -14,7 +14,7 @@ COMMENT=	SDR tools for RTL2832-based USB sticks
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libfftw3.so:${PORTSDIR}/math/fftw3
diff --git a/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro b/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro
index 39de395..afe4894 100644
--- a/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro
+++ b/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro
@@ -1,6 +1,6 @@
 --- make-x64/fmreceiver/fmreceiver.pro.orig
 +++ make-x64/fmreceiver/fmreceiver.pro
-@@ -137,9 +137,18 @@ LIBS += -lstdc++
+@@ -137,9 +137,16 @@ LIBS += -lstdc++
  #}
  
  #for fedora use the second set
@@ -14,9 +14,7 @@
 +
 +#for FreeBSD use the third set
 +unix {  INCLUDEPATH += ${LOCALBASE}/include/qwt
-+	INCLUDEPATH += ${LOCALBASE}/include/portaudio2
 +	INCLUDEPATH += ${LOCALBASE}/include
-+	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 +	QMAKE_LIBDIR += ${LOCALBASE}/lib
 +	LIBS+=  -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3
  }
diff --git a/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro b/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro
index f0f3ea2..db0bb84 100644
--- a/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro
+++ b/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro
@@ -1,6 +1,6 @@
 --- make-x64/mini-receiver/mini-receiver.pro.orig
 +++ make-x64/mini-receiver/mini-receiver.pro
-@@ -108,9 +108,18 @@ LIBS += -lstdc++
+@@ -108,9 +108,16 @@ LIBS += -lstdc++
  #}
  
  #for fedora use the second set
@@ -14,9 +14,7 @@
 +
 +#for FreeBSD use the third set
 +unix {  INCLUDEPATH += ${LOCALBASE}/include/qwt
-+	INCLUDEPATH += ${LOCALBASE}/include/portaudio2
 +	INCLUDEPATH += ${LOCALBASE}/include
-+	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 +	QMAKE_LIBDIR += ${LOCALBASE}/lib
 +	LIBS+=  -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3
  }
diff --git a/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro b/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro
index f7e7fea..6647b07 100644
--- a/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro
+++ b/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro
@@ -1,6 +1,6 @@
 --- make-x64/swreceiver/swreceiver.pro.orig
 +++ make-x64/swreceiver/swreceiver.pro
-@@ -180,13 +180,21 @@ LIBS += -lwinmm
+@@ -180,13 +180,19 @@ LIBS += -lwinmm
  #}
  
  #for Fedora use the second set
@@ -23,9 +23,7 @@
  
 +#for FreeBSD use the third set
 +unix {  INCLUDEPATH += ${LOCALBASE}/include/qwt
-+	INCLUDEPATH += ${LOCALBASE}/include/portaudio2
 +	INCLUDEPATH += ${LOCALBASE}/include
-+	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 +	QMAKE_LIBDIR += ${LOCALBASE}/lib
 +	LIBS +=  -lqwt -lrt -lsndfile -lsamplerate  -lportaudio -lusb -lfftw3
 +}
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index f9a8fd3..4399544 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	linrad
 PORTVERSION=	4.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
 		http://g7rau.demon.co.uk/sm5bsz/linuxdsp/archive/\
@@ -14,7 +14,7 @@ MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio DSP utility (SDR)
 
 LIB_DEPENDS=	librtlsdr.so:${PORTSDIR}/comms/rtl-sdr \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libftdi.so:${PORTSDIR}/devel/libftdi
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
diff --git a/comms/quisk/Makefile b/comms/quisk/Makefile
index 2ca5bbd..46ea883 100644
--- a/comms/quisk/Makefile
+++ b/comms/quisk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	quisk
 PORTVERSION=	3.6.22
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://james.ahlstrom.name/quisk/ \
 		LOCAL/shurd
@@ -13,7 +14,7 @@ COMMENT=	Software Defined Radio (SDR)
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libpulse.so:${PORTSDIR}/audio/pulseaudio
 
diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile
index 2e015cc..decd72f 100644
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wsjt
 VERSION=	9.1
-PORTREVISION=	10
+PORTREVISION=	11
 DISTVERSION=	${VERSION}.r${SVN_REV}
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
@@ -15,17 +15,17 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinte
 		${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libportaudio.so:${PORTSDIR}/audio/portaudio
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
-		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
 		${PYNUMPY}
 
 USE_GCC=	yes
 USES=		fortran gmake python tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${STAGEDIR}${LOCALBASE} \
-		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
-		--with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2
+		--with-portaudio-include-dir=${LOCALBASE}/include/ \
+		--with-portaudio-lib-dir=${LOCALBASE}/lib/
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 # Adding this breaks configure
diff --git a/comms/wspr/Makefile b/comms/wspr/Makefile
index 3872e34..22ca2fd 100644
--- a/comms/wspr/Makefile
+++ b/comms/wspr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wspr
 DISTVERSION=	${VERSION}.r${SVN_REV}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	LOCAL/db
 DISTNAME=	wspr-r${SVN_REV}
@@ -15,11 +15,11 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYTHON_LIBDIR}/tkinter:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/PIL:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
-		${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
+		${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy
 LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib \
 		libfftw3f.so:${PORTSDIR}/math/fftw3-float \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
+		libportaudio.so:${PORTSDIR}/audio/portaudio
 
 DISABLE_MAKE_JOBS=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/comms/wspr/files/patch-configure.ac b/comms/wspr/files/patch-configure.ac
index bebfbec..30083ff 100644
--- a/comms/wspr/files/patch-configure.ac
+++ b/comms/wspr/files/patch-configure.ac
@@ -150,35 +150,6 @@
  	FCV=gnu95
  	FC_LIB_PATH=`${FC} -print-file-name=`
  	AC_DEFINE_UNQUOTED([FC_LIB_PATH], ["${FC_LIB_PATH}"], [Path to Gfortran libs.])
-@@ -266,12 +300,27 @@
- dnl ----------------------------------------------------------------------------
- dnl check portaudio
- dnl ----------------------------------------------------------------------------
-+#
-+# This unpleasant hack due to FreeBSD supporting both portaudio2 (v19+)
-+# and older portaudio. Many programs depend on older. Sorry :-( - db
-+#
-+
-+case "${host_os}" in
-+	*freebsd* )
-+	AC_SUBST([PORTAUDIO_INCLUDE], ["-I/usr/local/include/portaudio2"])
-+	AC_SUBST([PORTAUDIO_LIBDIR], ["-L/usr/local/lib/portaudio2"])
-+	LDFLAGS="-L/usr/local/lib/portaudio2 ${LDFLAGS}"
-+	;;
-+	*)
-+	;;
-+esac
- 
- AC_CHECK_LIB([portaudio], [Pa_Initialize], [], [])
- if test "$ac_cv_lib_portaudio_Pa_Initialize" = "yes"; then
--		LIBS="-lportaudio ${LIBS}"
-+	LIBS="-lportaudio ${LIBS}"
- fi
- 
-+
- # if headers and libs found, set define
- if test "$ac_cv_header_portaudio_h" = "yes" -a "$ac_cv_lib_portaudio_Pa_Initialize" = "yes"; then
- 	HAVE_PORTAUDIO=1
 @@ -279,7 +328,6 @@
  	AC_DEFINE([HAVE_PORTAUDIO_LIB], [1], [Portaudio Lib])
  fi
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 51af379..f989861 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	4.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
@@ -47,7 +47,7 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PULSEAUDIO_CMAKE_ON=	-DDISABLE_PULSEAUDIO:BOOL=OFF
 PULSEAUDIO_CMAKE_OFF=	-DDISABLE_PULSEAUDIO:BOOL=ON
 PORTAUDIO_DESC=	Enable PortAudio (mic) support
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CMAKE_ON=	-DDISABLE_PORTAUDIO:BOOL=OFF
 PORTAUDIO_CMAKE_OFF=	-DDISABLE_PORTAUDIO:BOOL=ON
 DEBUG_MAKE_ENV=	VERBOSE=yes
diff --git a/emulators/dolphin-emu/files/patch-CMakeLists.txt b/emulators/dolphin-emu/files/patch-CMakeLists.txt
index 45ad27d..33dadd6 100644
--- a/emulators/dolphin-emu/files/patch-CMakeLists.txt
+++ b/emulators/dolphin-emu/files/patch-CMakeLists.txt
@@ -113,51 +113,6 @@
  
  	if(UNIX AND NOT APPLE)
  		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
-@@ -455,21 +485,32 @@
- 		check_libav()
- 	endif()
- 
--	set(CMAKE_REQUIRED_LIBRARIES portaudio)
--	CHECK_CXX_SOURCE_RUNS(
--		"#include <portaudio.h>
--		int main(int argc, char **argv)
--		{ if(Pa_GetVersion() >= 1890) return 0; else return 1; }"
--		PORTAUDIO)
--	if(PORTAUDIO)
--		message("PortAudio found, enabling mic support")
--		add_definitions(-DHAVE_PORTAUDIO=1)
--		set(PORTAUDIO_FOUND TRUE)
-+	option(DISABLE_PORTAUDIO "Disable PortAudio (mic) support" OFF)
-+	if(NOT DISABLE_PORTAUDIO)
-+		include_directories(BEFORE ${CMAKE_INSTALL_PREFIX}/include/portaudio2)
-+		link_directories(${CMAKE_INSTALL_PREFIX}/lib/portaudio2)
-+		set(CMAKE_REQUIRED_INCLUDES ${CMAKE_INSTALL_PREFIX}/include/portaudio2)
-+		set(CMAKE_REQUIRED_FLAGS -L${CMAKE_INSTALL_PREFIX}/lib/portaudio2)
-+		set(CMAKE_REQUIRED_LIBRARIES portaudio)
-+		CHECK_CXX_SOURCE_RUNS(
-+			"#include <portaudio.h>
-+			int main(int argc, char **argv)
-+			{ if(Pa_GetVersion() >= 1890) return 0; else return 1; }"
-+			PORTAUDIO)
-+		if(PORTAUDIO)
-+			message("PortAudio found, enabling mic support")
-+			add_definitions(-DHAVE_PORTAUDIO=1)
-+			set(PORTAUDIO_FOUND TRUE)
-+		else()
-+			message("PortAudio not found, disabling mic support")
-+			add_definitions(-DHAVE_PORTAUDIO=0)
-+			set(PORTAUDIO_FOUND FALSE)
-+		endif(PORTAUDIO)
- 	else()
--		message("PortAudio not found, disabling mic support")
-+		message("PortAudio (mic) support disabled")
- 		add_definitions(-DHAVE_PORTAUDIO=0)
- 		set(PORTAUDIO_FOUND FALSE)
--	endif(PORTAUDIO)
-+	endif()
- 
- 	if(OPROFILING)
- 		check_lib(OPROFILE opagent opagent.h)
 @@ -577,14 +618,14 @@
  set(SFML_FIND_VERSION_MAJOR 1)
  set(SFML_FIND_VERSION_MINOR 5)
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index bbeb64e..049b3b1 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hatari
 PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.tuxfamily.org/hatari/${PORTVERSION}/
 
@@ -12,23 +12,18 @@ COMMENT=	Atari ST emulator
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libpng.so:${PORTSDIR}/graphics/png
 
 USES=		cmake readline tar:bzip2
 USE_GNOME=	pygtk2
 USE_SDL=	sdl
-CMAKE_ARGS=	-DPORTAUDIO_INCLUDE_DIR:STRING="${PA2_INCLUDE_DIR}" \
-		-DPORTAUDIO_LIBRARY:STRING="${PA2_LIBRARY}" \
-		-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
+CMAKE_ARGS=	-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
 		-DETCDIR:STRING="${PREFIX}/etc" \
 		-DMANDIR:STRING="man/man1"
 
 OPTIONS_DEFINE=	DOCS
 
-PA2_INCLUDE_DIR=${LOCALBASE}/include/portaudio2
-PA2_LIBRARY=	${LOCALBASE}/lib/portaudio2/libportaudio.so
-
 post-patch:
 .for i in doc/hatari.1 doc/fr/hatari.1 tools/hconsole/hconsole.1
 	@${REINPLACE_CMD} -e \
diff --git a/games/crrcsim/Makefile b/games/crrcsim/Makefile
index 1352124..1177eea 100644
--- a/games/crrcsim/Makefile
+++ b/games/crrcsim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	crrcsim
 PORTVERSION=	0.9.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	BERLIOS
 
@@ -11,7 +11,7 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Model-airplane flight simulation program
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 GNU_CONFIGURE=	yes
@@ -19,8 +19,8 @@ USES=		gmake
 USE_SDL=	sdl
 USE_GL=		gl glu
 
-CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 PORTDOCS=	*
diff --git a/games/cultivation/Makefile b/games/cultivation/Makefile
index 6fefc8e..a26acf3 100644
--- a/games/cultivation/Makefile
+++ b/games/cultivation/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cultivation
 PORTVERSION=	8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
@@ -11,7 +11,7 @@ DISTNAME=	Cultivation_${PORTVERSION}_UnixSource
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Unique game of conflict and cooperation in a gardening community
 
-LIB_DEPENDS=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 USES=		gmake
 USE_XORG=	x11 xi xext xmu
@@ -21,6 +21,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/game2
 BUILD_WRKSRC=	${WRKSRC}/gameSource
 MAKE_ARGS=	CXX=${CXX}
 
+EXTRA_PATCHES=	${FILESDIR}/portaudio19.patch:-p2
+
 PLIST_FILES=	bin/Cultivation
 PORTDATA=	*
 PORTDOCS=	changeLog.txt how_to_play.txt
diff --git a/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp b/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp
new file mode 100644
index 0000000..b43b590
--- /dev/null
+++ b/games/cultivation/files/patch-gameSource_sound_SoundEffectsBank.cpp
@@ -0,0 +1,10 @@
+--- gameSource/sound/SoundEffectsBank.cpp.orig	2007-08-09 15:45:15 UTC
++++ gameSource/sound/SoundEffectsBank.cpp
+@@ -10,6 +10,7 @@
+ 
+ #include "minorGems/util/random/StdRandomSource.h"
+ 
++#include <math.h>
+ 
+ extern int globalSoundSampleRate;
+ 
diff --git a/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h b/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h
new file mode 100644
index 0000000..1ffd5d9
--- /dev/null
+++ b/games/cultivation/files/patch-gameSource_sound_SoundPlayer.h
@@ -0,0 +1,13 @@
+--- gameSource/sound/SoundPlayer.h.orig	2015-05-30 19:01:03 UTC
++++ gameSource/sound/SoundPlayer.h
+@@ -52,9 +52,7 @@
+ #include "SoundFilter.h"
+ #include "PlayableSound.h"
+ 
+-#include "minorGems/sound/portaudio/pa_common/portaudio.h"
+-#include "minorGems/sound/portaudio/pablio/pablio.h"
+-
++#include <portaudio.h>
+ 
+ #include "minorGems/util/SimpleVector.h"
+ 
diff --git a/games/cultivation/files/portaudio19.patch b/games/cultivation/files/portaudio19.patch
new file mode 100644
index 0000000..4cac2eb
--- /dev/null
+++ b/games/cultivation/files/portaudio19.patch
@@ -0,0 +1,78 @@
+Author: Barry deFreese <bdefreese@debian.org>
+Description: Patch system to utilize portaudio v19
+Bug-Debian: http://bugs.debian.org/594015
+Last-Update: 2013-06-01
+--- a/game2/gameSource/sound/SoundPlayer.h
++++ b/game2/gameSource/sound/SoundPlayer.h
+@@ -239,7 +239,7 @@
+         char mFadingIn;
+         int mNumFadeFramesRemaining;
+         
+-        PortAudioStream *mAudioStream;
++        PaStream *mAudioStream;
+ 
+         // realtime sounds that should be mixed into the next to-speaker call
+         SimpleVector<PlayableSound *> *mRealtimeSounds;
+--- a/game2/gameSource/sound/SoundPlayer.cpp
++++ b/game2/gameSource/sound/SoundPlayer.cpp
+@@ -52,9 +52,11 @@
+ 
+ 
+ // callback passed into portaudio
+-static int portaudioCallback( void *inputBuffer, void *outputBuffer,
++int portaudioCallback( const void *inputBuffer, void *outputBuffer,
+                               unsigned long framesPerBuffer,
+-                              PaTimestamp outTime, void *userData ) {
++                              const PaStreamCallbackTimeInfo *outTime,
++                              PaStreamCallbackFlags statusFlags,
++                              void *userData ) {
+ 
+ 
+     SoundPlayer *player = (SoundPlayer *)userData;
+@@ -157,21 +159,13 @@
+ 
+     if( error == paNoError ) {
+     
+-        error = Pa_OpenStream(
++        error = Pa_OpenDefaultStream(
+             &mAudioStream,
+-            paNoDevice,// default input device 
+             0,              // no input 
+-            paFloat32,  // 32 bit floating point input 
+-            NULL,
+-            Pa_GetDefaultOutputDeviceID(),
+             2,          // stereo output 
+             paFloat32,      // 32 bit floating point output 
+-            NULL,
+             mSampleRate,
+             1024,   // frames per buffer
+-            0,    // number of buffers, if zero then use default minimum 
+-            paClipOff, // we won't output out of range samples so
+-                       // don't bother clipping them 
+             portaudioCallback,
+             (void *)this );  // pass self-pointer to callback function
+         
+--- a/game2/gameSource/sound/MusicPlayer.cpp
++++ b/game2/gameSource/sound/MusicPlayer.cpp
+@@ -112,13 +112,14 @@
+ 
+     // get parts and positions of gardeners
+     int numParts = 0;
+-    Vector3D **positions =
+-        globalWorld->getAllGardenerPositions( &numParts );
+-    MusicPart **musicParts =
+-        globalWorld->getAllGardenerMusicParts( &numParts );
+-    double *volumeModifiers =
+-        globalWorld->getAllGardenerMusicVolumeModifiers( &numParts );
+-
++    Vector3D **positions = NULL;
++    MusicPart **musicParts = NULL;
++    double *volumeModifiers = NULL;
++    if ( globalWorld ){
++        positions = globalWorld->getAllGardenerPositions( &numParts );
++        musicParts = globalWorld->getAllGardenerMusicParts( &numParts );
++        volumeModifiers = globalWorld->getAllGardenerMusicVolumeModifiers( &numParts );
++    }
+     
+     // get center position from current player position
+     Vector3D *centerPosition = new Vector3D( &globalPlayerCurrentPosition );
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 2854e0e..0e75c70 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -26,15 +26,13 @@ USE_SDL=	image net sdl ttf
 USE_GL=		gl glu
 MAKE_ARGS=	CCFLAGS="${CFLAGS}" \
 		LINKFLAGS="${LDFLAGS}" \
-		LIBPATH="${LIBPATH}" \
 		BINDIR="${STAGEDIR}${PREFIX}/bin" \
 		INSTALLDIR="${STAGEDIR}${PREFIX}/share" \
 		DATADIR="${DATADIR}"
 INSTALLS_ICONS=	yes
 
-CFLAGS+=	${PA2_CFLAGS} -I${LOCALBASE}/include -Wno-return-type
-LDFLAGS+=	-lpthread ${PA2_LDFLAGS} -L${LOCALBASE}/lib
-LIBPATH=	${LIBPATH2}${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include -Wno-return-type
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PORTDOCS=	README
 SUB_FILES=	pkg-message
@@ -42,10 +40,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
-PA2_CFLAGS+=	-I${LOCALBASE}/include/portaudio2
-PA2_LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2
-LIBPATH2=	${LOCALBASE}/lib/portaudio2:
+LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
 MAKE_ARGS+=	--portaudio=true
 .else
 MAKE_ARGS+=	--portaudio=false
@@ -56,9 +51,6 @@ pre-configure:
 		's|"-g"|""|' \
 		${WRKSRC}/SConstruct
 	${REINPLACE_CMD} -e \
-		's|portaudio.h|portaudio2/portaudio.h|' \
-		${WRKSRC}/src/VoiceRecorder.cpp
-	${REINPLACE_CMD} -e \
 		'/^Icon/s|=.*|=${PORTNAME}|' \
 		${WRKSRC}/data/${PORTNAME}.desktop
 	${REINPLACE_CMD} -e \
diff --git a/math/freemat/Makefile b/math/freemat/Makefile
index 2b0019a..10876b9 100644
--- a/math/freemat/Makefile
+++ b/math/freemat/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	FreeMat
 PORTVERSION=	4.2
 DISTVERSIONSUFFIX=	-Source
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math science
 MASTER_SITES=	SF/freemat/FreeMat4
 
@@ -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.0:${PORTSDIR}/audio/portaudio		\
+		libportaudio.so:${PORTSDIR}/audio/portaudio		\
 		libumfpack.so:${PORTSDIR}/math/suitesparse
 
 USES=		blaslapack cmake:outsource dos2unix fortran pkgconfig python:build
diff --git a/math/freemat/files/patch-CMakeLists.txt b/math/freemat/files/patch-CMakeLists.txt
index 8ab3a7e..5414cad 100644
--- a/math/freemat/files/patch-CMakeLists.txt
+++ b/math/freemat/files/patch-CMakeLists.txt
@@ -1,14 +1,5 @@
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -204,7 +204,7 @@
- FIND_PACKAGE(PORTAUDIO)
- 
- if (PORTAUDIO_FOUND)
--  ADD_DEFINITIONS(-DHAVE_PORTAUDIO19)
-+  ADD_DEFINITIONS(-DHAVE_PORTAUDIO18)
-   SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${PORTAUDIO_LIBS})
-   INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE})
- endif()
 @@ -257,7 +257,7 @@
    add_definitions(-DHAVE_LLVM)
    include_directories(${LLVM_INCLUDE_DIRS})
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index a3daa71..76b7d09 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-ltfat
 PORTVERSION=	2.0.1
+PORTEVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
@@ -12,7 +13,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
-		libportaudio.so.2:${PORTSDIR}/audio/portaudio2 \
+		libportaudio.so:${PORTSDIR}/audio/portaudio \
 		libcblas.so:${PORTSDIR}/math/cblas
 
 BROKEN=		Installation has unresolved issues
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 7d6d9b9..784fc6f 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aegisub
 PORTVERSION=	3.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ftp.aegisub.org/pub/archives/releases/source/:aegisub \
 		ftp://ftp.aegisub.org/pub/archives/releases/source/:aegisub \
@@ -69,11 +69,7 @@ HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
 HUNSPELL_CONFIGURE_OFF=	--without-hunspell
 OPENAL_USES=		openal
 OPENAL_CONFIGURE_OFF=	--without-openal
-PORTAUDIO_BUILD_DEPENDS=\
-			portaudio2>0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_RUN_DEPENDS=	portaudio2>0:${PORTSDIR}/audio/portaudio2
-PORTAUDIO_CFLAGS=	-isystem ${LOCALBASE}/include/portaudio2
-PORTAUDIO_LDFLAGS=	-L${LOCALBASE}/lib/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 PORTAUDIO_CONFIGURE_OFF=\
 			--without-portaudio
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile
index 6973916..c7e44fe 100644
--- a/multimedia/mplayer2/Makefile
+++ b/multimedia/mplayer2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mplayer2
 PORTVERSION=	${MPLAYER2_PORT_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	multimedia audio
 MASTER_SITES=	LOCAL/gblach/
 
@@ -23,9 +23,7 @@ USES=		cpe gmake iconv ncurses pkgconfig tar:xz
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc=${CC} \
-		--extra-cflags='-I${LOCALBASE}/include/portaudio2' \
-		--extra-libs='-lavresample' \
-		--extra-ldflags='-L${LOCALBASE}/lib/portaudio2' \
+		--extra-libs='-lavresample ${PORTAUDIOLIB}' \
 		--mandir=${PREFIX}/man \
 		--enable-libavresample \
 		--disable-alsa \
@@ -141,7 +139,8 @@ CONFIGURE_ARGS+=	--disable-pulse
 .endif
 
 .if ${PORT_OPTIONS:MPORTAUDIO}
-LIB_DEPENDS+=		libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS+=		libportaudio.so:${PORTSDIR}/audio/portaudio2
+PORTAUDIOLIB=		-lportaudio
 .else
 CONFIGURE_ARGS+=	--disable-portaudio
 .endif
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index ac233ee..7bc4f8b 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pjsip
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
 DISTNAME=	pjproject-${DISTVERSION}
@@ -12,7 +12,7 @@ COMMENT=	Multimedia communication library written in C language
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 CONFLICTS=	pjsip-extsrtp-[0-9]*
 
@@ -22,8 +22,8 @@ CONFIGURE_ARGS=	--with-external-pa \
 USES=		gmake tar:bz2
 USE_LDCONFIG=	yes
 PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"
-LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	FFMPEG G711 G722 G7221 GSM ILBC L16 OPENH264 RESAMPLE RESAMPLEDLL \
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 7822b05..6ca0a03 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	wireshark
 PORTVERSION=	1.12.5
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
 		http://ftp.uni-kl.de/pub/wireshark/src/ \
@@ -131,7 +132,7 @@ PLIST_SUB+=	LUA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MRTP} && !defined(LITE)
-LIB_DEPENDS+=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
+LIB_DEPENDS+=	libportaudio.so:${PORTSDIR}/audio/portaudio
 CONFIGURE_ARGS+=--with-portaudio=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-portaudio
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
index 01c969c..0f95b4f 100644
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	emkatic
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	russian emulators
 MASTER_SITES=	SF/${PORTNAME}/eMKatic%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -36,7 +37,7 @@ OPTIONS_DEFAULT=	GTK2 PORTAUDIO
 GTK2_DESC=	Build with GTK+ 2 interface
 QT4_DESC=	Build with Qt 4 interface
 
-PORTAUDIO_RUN_DEPENDS=	${LOCALBASE}/lib/portaudio2/libportaudio.so.2:${PORTSDIR}/audio/portaudio2
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 .include <bsd.port.pre.mk>