update to pa_stable_v19_20140130, which functions on osx

4 files changed, 28 insertions, 133 deletions

diff --git a/audio/portaudio-devel/Makefile b/audio/portaudio-devel/Makefile
index fedb3a1f3c0..213cf0cb9f1 100644
--- a/audio/portaudio-devel/Makefile
+++ b/audio/portaudio-devel/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2013/01/08 16:21:49 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2014/07/21 07:15:07 dbj Exp $
 
-DISTNAME=	pa_snapshot_v19
-PKGNAME=	portaudio-devel-20060521
-PKGREVISION=	1
+DISTNAME=	pa_stable_v19_20140130
+PKGNAME=	portaudio-devel-20140130
 CATEGORIES=	audio
 MASTER_SITES=	http://www.portaudio.com/archives/
-DIST_SUBDIR=	${PKGNAME_NOREV}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.portaudio.com/
@@ -20,14 +19,31 @@ GNU_CONFIGURE=		yes
 GNU_CONFIGURE_LIBSUBDIR=portaudio2
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/portaudio2
 CONFIGURE_ARGS+=	--without-alsa
+CONFIGURE_ARGS+=	--disable-mac-universal
 LDFLAGS+=		${LIBOSSAUDIO}
 PKGCONFIG_OVERRIDE=	portaudio-2.0.pc.in
 WRKSRC=			${WRKDIR}/portaudio
 
-INSTALLATION_DIRS=	include/portaudio2 lib/portaudio2
+INSTALLATION_DIRS=	include/portaudio2 lib/portaudio2 lib/pkgconfig
 
-post-patch:
-	touch ${WRKSRC}/libtool #, so that it gets replaced later
+SUBST_CLASSES+=         pthread
+SUBST_STAGE.pthread=    pre-configure
+SUBST_MESSAGE.pthread=  Fixing -lpthread references.
+SUBST_FILES.pthread=    configure
+SUBST_SED.pthread=      -e 's/-D_REENTRANT/${PTHREAD_CFLAGS}/g'
+SUBST_SED.pthread+=     -e 's/-lpthread/${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}/g'
+
+SUBST_CLASSES+=         pkgconfig
+SUBST_STAGE.pkgconfig=  pre-configure
+SUBST_MESSAGE.pkgconfig=Fixing pkgconfig directory
+SUBST_FILES.pkgconfig=  Makefile.in
+SUBST_SED.pkgconfig=    -e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g'
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+CFLAGS+=		-Wno-deprecated-declarations
+.endif
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/portaudio-devel/distinfo b/audio/portaudio-devel/distinfo
index 663820a9e11..e4ac790896d 100644
--- a/audio/portaudio-devel/distinfo
+++ b/audio/portaudio-devel/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.6 2013/12/15 20:19:08 asau Exp $
+$NetBSD: distinfo,v 1.7 2014/07/21 07:15:07 dbj Exp $
 
-SHA1 (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = 05c35c7add9f95c79491fbacb80b057be339ed6f
-RMD160 (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = dea1e921189bd788815c3012498fc035f3df8bad
-Size (portaudio-devel-20060521/pa_snapshot_v19.tar.gz) = 722148 bytes
-SHA1 (patch-aa) = b29699d78e1216bb3d129f1736e8c7b56e8c322b
-SHA1 (patch-ac) = c86dbd0c9f49f3e793dc5e9024c5896fcbf35966
+SHA1 (pa_stable_v19_20140130.tgz) = 526a7955de59016a06680ac24209ecb6ce05527d
+RMD160 (pa_stable_v19_20140130.tgz) = 0a290cea8a102a45b2df9b72046b3eed0ab35b4f
+Size (pa_stable_v19_20140130.tgz) = 1504620 bytes
diff --git a/audio/portaudio-devel/patches/patch-aa b/audio/portaudio-devel/patches/patch-aa
deleted file mode 100644
index 0346646e0ab..00000000000
--- a/audio/portaudio-devel/patches/patch-aa
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/06/06 15:48:34 joerg Exp $
-
---- configure.orig	2006-05-19 16:20:07.000000000 +0000
-+++ configure
-@@ -18957,7 +18957,7 @@ fi
- 
- 
- 
--PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-+have_jack=no
- 
- 
- echo "$as_me:$LINENO: checking for short" >&5
-@@ -20503,13 +20503,13 @@ _ACEOF
- 
-   irix* )
- 
--echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -20572,7 +20572,7 @@ if test $ac_cv_lib_pthread_pthread_creat
- #define HAVE_LIBPTHREAD 1
- _ACEOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- 
- else
-   { { echo "$as_me:$LINENO: error: IRIX posix thread library not found!" >&5
-@@ -20746,20 +20746,20 @@ _ACEOF
- 
- 	OTHER_OBJS="pa_sgi/pa_sgi.o src/os/unix/pa_unix_hostapis.o src/os/unix/pa_unix_util.o";
- 
--			LIBS="-lm -ldmedia -laudio -lpthread";
-+			LIBS="-lm -ldmedia -laudio ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
- 	PADLL="libportaudio.so";
- 	SHARED_FLAGS="";
- 	;;
- 
-   *)
- 
--   echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+   echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -20854,8 +20854,8 @@ _ACEOF
- 
- 	fi
- 	THREAD_CFLAGS="-pthread"
--	DLL_LIBS="$DLL_LIBS -lm -lpthread";
--	LIBS="$LIBS -lm -lpthread";
-+	DLL_LIBS="$DLL_LIBS -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
-+	LIBS="$LIBS -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}";
- 	PADLL="libportaudio.so";
- 	SHARED_FLAGS="-shared -fPIC";
- 
diff --git a/audio/portaudio-devel/patches/patch-ac b/audio/portaudio-devel/patches/patch-ac
deleted file mode 100644
index cf157ea198d..00000000000
--- a/audio/portaudio-devel/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2013/12/15 20:19:08 asau Exp $
-
---- src/hostapi/oss/pa_unix_oss.c.orig	2006-05-17 08:02:24.000000000 +0000
-+++ src/hostapi/oss/pa_unix_oss.c
-@@ -42,8 +42,10 @@
- #include <sys/ioctl.h>
- #include <unistd.h>
- #include <pthread.h>
-+#if !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
- #include <alloca.h>
--#include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <assert.h>
- #include <errno.h>
- #include <sys/types.h>
-@@ -52,12 +54,15 @@
- #include <limits.h>
- #include <semaphore.h>
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__sun)
- # include <sys/soundcard.h>
- # define DEVICE_NAME_BASE            "/dev/dsp"
- #elif defined __linux__
- # include <linux/soundcard.h>
- # define DEVICE_NAME_BASE            "/dev/dsp"
-+#elif defined(__NetBSD__)
-+# include <soundcard.h>
-+# define DEVICE_NAME_BASE            "/dev/audio"
- #else
- # include <machine/soundcard.h> /* JH20010905 */
- # define DEVICE_NAME_BASE            "/dev/audio"
-@@ -1916,8 +1921,10 @@ static signed long GetStreamWriteAvailab
-     PaOssStream *stream = (PaOssStream*)s;
-     int delay = 0;
- 
-+#if !defined(__NetBSD__)
-     if( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ) < 0 )
-         return paUnanticipatedHostError;
-+#endif
-     
-     return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
- }