Fix pthread usage. Add DragonFly support.

4 files changed, 82 insertions, 28 deletions

diff --git a/audio/portaudio-devel/distinfo b/audio/portaudio-devel/distinfo
index f68bf3917ef..14dadd63b33 100644
--- a/audio/portaudio-devel/distinfo
+++ b/audio/portaudio-devel/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/21 22:21:10 ben Exp $
+$NetBSD: distinfo,v 1.2 2006/06/06 15:48:34 joerg 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) = f46283bc89b788e5e639cf9004b81e31d089ce6d
-SHA1 (patch-ab) = 22ffb8f52d4fde3f74793b81905aa5a1865ce01a
+SHA1 (patch-aa) = b29699d78e1216bb3d129f1736e8c7b56e8c322b
 SHA1 (patch-ac) = 79f6c5e206689c30e1dff4985462d3272ed43a1a
diff --git a/audio/portaudio-devel/patches/patch-aa b/audio/portaudio-devel/patches/patch-aa
index a0be9b69b35..0346646e0ab 100644
--- a/audio/portaudio-devel/patches/patch-aa
+++ b/audio/portaudio-devel/patches/patch-aa
@@ -1,14 +1,75 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/21 22:21:10 ben Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/06 15:48:34 joerg Exp $
 
---- configure.in.orig	2006-05-19 09:20:07.000000000 -0700
-+++ configure.in
-@@ -79,7 +79,8 @@ dnl that then requires pkg-config availa
- dnl MinGW systems and can be a pain to install.
- dnl AC_CANONICAL_HOST
+--- 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)
-+dnl PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
 +have_jack=no
  
- dnl sizeof checks: we will need a 16-bit and a 32-bit type
+ 
+ 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-ab b/audio/portaudio-devel/patches/patch-ab
deleted file mode 100644
index e56099ef57a..00000000000
--- a/audio/portaudio-devel/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/05/21 22:21:10 ben Exp $
-
---- configure.orig	2006-05-21 12:07:29.000000000 -0700
-+++ 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
diff --git a/audio/portaudio-devel/patches/patch-ac b/audio/portaudio-devel/patches/patch-ac
index 73dbf9b721a..35c845bab4c 100644
--- a/audio/portaudio-devel/patches/patch-ac
+++ b/audio/portaudio-devel/patches/patch-ac
@@ -1,18 +1,25 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/05/21 22:21:10 ben Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/06 15:48:34 joerg Exp $
 
---- src/hostapi/oss/pa_unix_oss.c.orig	2006-05-17 01:02:24.000000000 -0700
+--- src/hostapi/oss/pa_unix_oss.c.orig	2006-05-17 08:02:24.000000000 +0000
 +++ src/hostapi/oss/pa_unix_oss.c
 @@ -42,7 +42,9 @@
  #include <sys/ioctl.h>
  #include <unistd.h>
  #include <pthread.h>
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <alloca.h>
 +#endif
  #include <malloc.h>
  #include <assert.h>
  #include <errno.h>
-@@ -58,6 +60,9 @@
+@@ -52,12 +54,15 @@
+ #include <limits.h>
+ #include <semaphore.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <sys/soundcard.h>
+ # define DEVICE_NAME_BASE            "/dev/dsp"
  #elif defined __linux__
  # include <linux/soundcard.h>
  # define DEVICE_NAME_BASE            "/dev/dsp"