Fix build on SunOS.

4 files changed, 15 insertions, 9 deletions

diff --git a/audio/portaudio-devel/distinfo b/audio/portaudio-devel/distinfo
index 5b39ff73eb7..0bc8b55b6bb 100644
--- a/audio/portaudio-devel/distinfo
+++ b/audio/portaudio-devel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2007/07/30 08:29:00 joerg Exp $
+$NetBSD: distinfo,v 1.5 2012/01/11 20:15:36 hans 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) = 24275e02ba31b3d96afcc1f1e6183b0ec0739ab7
+SHA1 (patch-ac) = 6dece8b29f30465ad12404c87436e4530b723272
diff --git a/audio/portaudio-devel/patches/patch-ac b/audio/portaudio-devel/patches/patch-ac
index c01b4ac6ff9..5f63691ce02 100644
--- a/audio/portaudio-devel/patches/patch-ac
+++ b/audio/portaudio-devel/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2007/07/30 08:29:00 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2012/01/11 20:15:37 hans Exp $
 
 --- src/hostapi/oss/pa_unix_oss.c.orig	2006-05-17 08:02:24.000000000 +0000
 +++ src/hostapi/oss/pa_unix_oss.c
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.3 2007/07/30 08:29:00 joerg Exp $
  #include <semaphore.h>
  
 -#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__sun)
  # include <sys/soundcard.h>
  # define DEVICE_NAME_BASE            "/dev/dsp"
  #elif defined __linux__
diff --git a/audio/portaudio/distinfo b/audio/portaudio/distinfo
index 9cfd8da161c..31cda22e938 100644
--- a/audio/portaudio/distinfo
+++ b/audio/portaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/10/12 21:50:49 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/01/11 20:14:10 hans Exp $
 
 SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
 RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
 SHA1 (patch-ac) = 08740265e8957d2ce655b54dba40e8d90407f4f6
 SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a
 SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59
-SHA1 (patch-af) = da42578e66137f95edbbb86bde724af32e398d57
+SHA1 (patch-af) = 89be73767984ffb9df0e065c493194a0cfdaeb8c
 SHA1 (patch-ag) = 8aadcd18189dd1c8ae64885dbd209e5d7eae63a1
diff --git a/audio/portaudio/patches/patch-af b/audio/portaudio/patches/patch-af
index 285ca1fd79e..b59df10a285 100644
--- a/audio/portaudio/patches/patch-af
+++ b/audio/portaudio/patches/patch-af
@@ -1,8 +1,14 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/04/20 17:52:49 ben Exp $
+$NetBSD: patch-af,v 1.2 2012/01/11 20:14:10 hans Exp $
 
 --- pa_unix_oss/pa_unix_oss.c~	Mon Jun 30 11:05:50 2003
 +++ pa_unix_oss/pa_unix_oss.c	Wed Nov 26 02:40:25 2003
-@@ -47,6 +47,9 @@
+@@ -43,10 +43,15 @@
+ 
+ #ifdef __linux__
+ #include <linux/soundcard.h>
++#elif defined(__sun)
++#include <sys/soundcard.h>
+ #else
  #include <machine/soundcard.h> /* JH20010905 */
  #endif
  
@@ -12,7 +18,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/04/20 17:52:49 ben Exp $
  
  #ifndef AFMT_S16_NE
  #define AFMT_S16_NE  Get_AFMT_S16_NE()
-@@ -236,7 +239,11 @@
+@@ -236,7 +241,11 @@ PaError Pa_SetupDeviceFormat( int devHan
          ERR_RPT(("Pa_SetupDeviceFormat: HW does not support AFMT_S16_NE\n" ));
          return paHostError;
      }