Index: audio/py-pyaudio/Makefile
===================================================================
--- audio/py-pyaudio/Makefile	(revision 374655)
+++ audio/py-pyaudio/Makefile	(working copy)
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Portaudio toolkit bindings for Python
 
-LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio2
+LIB_DEPENDS=	portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
@@ -21,7 +21,8 @@ OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/setup.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: audio/py-pyaudio/files/patch-setup.py
===================================================================
--- audio/py-pyaudio/files/patch-setup.py	(revision 374655)
+++ audio/py-pyaudio/files/patch-setup.py	(working copy)
@@ -1,29 +1,15 @@
 --- ./setup.py.orig	2012-11-07 00:17:06.624869638 +0100
 +++ ./setup.py	2012-11-07 00:37:17.129040078 +0100
-@@ -57,7 +57,7 @@
- 
- pyaudio_module_sources = ['src/_portaudiomodule.c']
- 
--include_dirs = []
-+include_dirs = ['%%PREFIX%%/include/portaudio2']
- external_libraries = []
- extra_compile_args = ['-fno-strict-aliasing']
- extra_link_args = []
-@@ -74,6 +74,9 @@
+@@ -74,6 +74,12 @@ else:
      external_libraries = ['portaudio']
      extra_link_args = []
  
-+if sys.platform.startswith('freebsd'):
-+    extra_link_args = ['-L%%PREFIX%%/lib/portaudio2']
++if sys.platform.startswith('dragonfly') or \
++   sys.platform.startswith('freebsd'):
++    include_dirs = ['%%LOCALBASE%%/include/portaudio2']
++    external_libraries = []
++    extra_link_args = ['%%LOCALBASE%%/lib/portaudio2/libportaudio.so']
 +
  if sys.platform == 'darwin':
      defines += [('MACOSX', '1')]
  
-@@ -83,7 +86,6 @@
- 
- if STATIC_LINKING:
- 
--    # platform specific configuration
-     if sys.platform == 'darwin':
-         extra_link_args += ['-framework', 'CoreAudio',
-                             '-framework', 'AudioToolbox',