Make it build on DragonFly.

24 files changed, 119 insertions, 67 deletions

diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 23e701753af..9df2e2d3ace 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,40 +1,42 @@
-$NetBSD: distinfo,v 1.2 2008/12/19 05:14:00 jmcneill Exp $
+$NetBSD: distinfo,v 1.3 2008/12/25 13:18:00 hasso Exp $
 
 SHA1 (alsa-lib-1.0.18.tar.bz2) = 54e6916738e479a0eec7e9f4715c22efee4d8594
 RMD160 (alsa-lib-1.0.18.tar.bz2) = 88a7a5ce6133704d100f034b9e08e9ffdf0627d9
 Size (alsa-lib-1.0.18.tar.bz2) = 790052 bytes
 SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
-SHA1 (patch-ab) = ab300175db0e2390fa10141a23a883e92e244af4
-SHA1 (patch-ac) = 6f4e585a419d86ce9704157e45253c637494757e
-SHA1 (patch-ad) = 16d5890ac5f947a2c4e3798c15d6a90fb1f7d817
-SHA1 (patch-ae) = 6f918ae55898c1f15bfd5243e62ecd5594a312ca
-SHA1 (patch-af) = 2a3fd671144809eb8886521e21572ff67c2a86e7
+SHA1 (patch-ab) = 29787342a75ac3db13b280a60301d0cab0de8c09
+SHA1 (patch-ac) = 2ddf533a998f0c1ee8444e97e401bde1fad344ac
+SHA1 (patch-ad) = b643f65f4762128589776953c6a7c52bfc633f6d
+SHA1 (patch-ae) = 077cfc93d8168525fc47fc34c7356a30b42e8dae
+SHA1 (patch-af) = 2d7aaa4b891dc54d09d121ebc268599d79892ae7
 SHA1 (patch-ag) = bea09d714bf75735f5be6d370f7242c34b73cb95
 SHA1 (patch-ah) = 05229389b8bda654e8e979029b2bcd3a8050cf48
-SHA1 (patch-ai) = 3a5a6452f48b5dfe50f664c9e5b355cb757f1736
-SHA1 (patch-aj) = e3b23632104f62e5a9252e4045824a5a4243cd67
-SHA1 (patch-ak) = f1f53628e5c19ee670248e5f58b9e72923938d5f
+SHA1 (patch-ai) = 9f1f5477ef60549c9425bdea9dbf26683c0db4e6
+SHA1 (patch-aj) = 7fbd789a05e8a3db4cb56b0de8a3b6965d17e158
+SHA1 (patch-ak) = 58950410913a3ffd35128dd6628680de70e7e2d7
 SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
-SHA1 (patch-am) = 773b7c4acab99c4c470652a43a6b325a41eb432d
+SHA1 (patch-am) = e028c544894720fbe585b938715a4ac01fb5600e
 SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
 SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
-SHA1 (patch-ap) = 593ca8e8d8ce2813ab254cd36201067634c216e5
+SHA1 (patch-ap) = 93fba4a9f739727c009bef1716b9138be1a03ca6
 SHA1 (patch-aq) = 0e700c7e544fb6245e738a3d2356921484c55242
-SHA1 (patch-ar) = cc8bc40b55c43c002a81d68e89530109d7020dd4
+SHA1 (patch-ar) = b8ae2c11cc075e5e31766c87c7f805d8202aa9e4
 SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
-SHA1 (patch-at) = 8d3473d1641ea2599a383f5b95ad3f78c5f28633
-SHA1 (patch-au) = 35b360728729bcb8ed4d6fbf219be0e2af468055
+SHA1 (patch-at) = 66da4dfd4c3b43753ed9a220716992bc5adbb49d
+SHA1 (patch-au) = 8c5d31fe03bd9c137168d7eb31de2f1c683986e5
 SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
-SHA1 (patch-aw) = 0d64254b04ce74f830ee44a2f5d6aba4f89f1f2c
-SHA1 (patch-ax) = c9f0a3dfb5cdca67d8fc4a85087163436ca5af45
-SHA1 (patch-ay) = d216823bf2451bb14787c1d97b00367be86f6451
-SHA1 (patch-az) = c8838d84841ffcfa19c299e574914ff326be6e04
-SHA1 (patch-ba) = 5c8e0169bc203d485d8c296007fa7910c73ec574
-SHA1 (patch-bb) = 3dcafe7f7694197170d2b2b0c02596f9b3594fec
+SHA1 (patch-aw) = b7d748f161e11ac80908bd514ee9b7b579bc8632
+SHA1 (patch-ax) = 04525af5fc4b4b1a46ebb16c5e897a5b40896b3a
+SHA1 (patch-ay) = 370b81790e3a2399edae3c8d906b64c79567aa6a
+SHA1 (patch-az) = f49fc2a777fded2707486cd2f615393164ab8d5c
+SHA1 (patch-ba) = d9a3edc166bc5f2013bb0ee1317ee404c59bbf82
+SHA1 (patch-bb) = 4af36cefc1d5df489941ef41b4bb6702b8ad45a2
 SHA1 (patch-bc) = 0b034b98d536c4ab7f785420d0d51c3d0763d960
 SHA1 (patch-bd) = 63a102186f4df59da93bedaac772530e166a9fde
 SHA1 (patch-be) = e071d0f3518dac8bbda216d4bd850a2a3557b103
-SHA1 (patch-bf) = a1159663f1c03437a9afdfc781ac3d0019c4774b
+SHA1 (patch-bf) = f9846b9eae6d9225a45e4a1bdadd983733efa8aa
 SHA1 (patch-bg) = 19d678643c68c250eebc75fbe17119d478e738cc
-SHA1 (patch-bh) = 2d05c967caa72a9256057c6fef4190288871b1c2
+SHA1 (patch-bh) = 4c927eaa0f4fd38934433fe7480b62972ca52634
 SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
+SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
+SHA1 (patch-bk) = 7740eea6a0d4a8ce3db3b93b2af5faacdb9424b1
diff --git a/audio/alsa-lib/patches/patch-ab b/audio/alsa-lib/patches/patch-ab
index c6cbf58ddb9..1c3608df04f 100644
--- a/audio/alsa-lib/patches/patch-ab
+++ b/audio/alsa-lib/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2008/12/19 05:14:00 jmcneill Exp $
+$NetBSD: patch-ab,v 1.3 2008/12/25 13:18:00 hasso Exp $
 
 --- configure.orig	2008-10-29 08:46:35.000000000 -0400
 +++ configure	2008-12-19 00:09:49.000000000 -0500
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.2 2008/12/19 05:14:00 jmcneill Exp $
  
  DEFS=-DHAVE_CONFIG_H
 +case $host_os in
-+  netbsd*)
++  netbsd*|dragonfly*)
 +    DEFS="$DEFS -Dbswap_32=bswap32 -Dbswap_16=bswap16 -Dbswap_64=bswap64"
 +    ;;
 +esac
diff --git a/audio/alsa-lib/patches/patch-ac b/audio/alsa-lib/patches/patch-ac
index 87ea1dde59c..8001b325f25 100644
--- a/audio/alsa-lib/patches/patch-ac
+++ b/audio/alsa-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- include/asoundlib-head.h.orig	2008-12-18 22:01:21.000000000 -0500
 +++ include/asoundlib-head.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
  #include <string.h>
  #include <fcntl.h>
  #include <assert.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#else
  #include <endian.h>
diff --git a/audio/alsa-lib/patches/patch-ad b/audio/alsa-lib/patches/patch-ad
index c2d21dd4cb1..dd35627bd9e 100644
--- a/audio/alsa-lib/patches/patch-ad
+++ b/audio/alsa-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ad,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- include/global.h.orig	2008-10-29 08:42:10.000000000 -0400
 +++ include/global.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
  int snd_user_file(const char *file, char **result);
  
 -#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__NetBSD__)
++#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__NetBSD__) && !defined(__DragonFly__)
  struct timeval {
  	time_t		tv_sec;		/* seconds */
  	long		tv_usec;	/* microseconds */
diff --git a/audio/alsa-lib/patches/patch-ae b/audio/alsa-lib/patches/patch-ae
index 3430dffe010..2727469d13f 100644
--- a/audio/alsa-lib/patches/patch-ae
+++ b/audio/alsa-lib/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ae,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- include/local.h.orig	2008-10-29 08:42:10.000000000 -0400
 +++ include/local.h
@@ -6,7 +6,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
  #include <string.h>
  #include <fcntl.h>
  #include <assert.h>
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#else
  #include <endian.h>
diff --git a/audio/alsa-lib/patches/patch-af b/audio/alsa-lib/patches/patch-af
index a1a6c47e409..2b8c971ec40 100644
--- a/audio/alsa-lib/patches/patch-af
+++ b/audio/alsa-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-af,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- include/search.h.orig	2008-10-29 08:42:10.000000000 -0400
 +++ include/search.h
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
  #ifndef _SEARCH_H
  #define	_SEARCH_H 1
  
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <features.h>
 +#else
 +#define __PMT __P
diff --git a/audio/alsa-lib/patches/patch-ai b/audio/alsa-lib/patches/patch-ai
index 0dcb2936bcb..556387dae76 100644
--- a/audio/alsa-lib/patches/patch-ai
+++ b/audio/alsa-lib/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ai,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_adpcm.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_adpcm.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
    come across a good description of XA yet.
   */
  
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-aj b/audio/alsa-lib/patches/patch-aj
index 7564ba9bd42..481c101ce00 100644
--- a/audio/alsa-lib/patches/patch-aj
+++ b/audio/alsa-lib/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-aj,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_alaw.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_alaw.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-ak b/audio/alsa-lib/patches/patch-ak
index 128063e9bc0..89530711887 100644
--- a/audio/alsa-lib/patches/patch-ak
+++ b/audio/alsa-lib/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ak,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_copy.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_copy.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-am b/audio/alsa-lib/patches/patch-am
index c10e10874fc..912b0e590ab 100644
--- a/audio/alsa-lib/patches/patch-am
+++ b/audio/alsa-lib/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-am,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_dmix_generic.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_dmix_generic.c
@@ -6,7 +6,7 @@ $NetBSD: patch-am,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
  	 (1ULL << SND_PCM_FORMAT_S24_3LE) | \
  	 (1ULL << SND_PCM_FORMAT_U8))
  
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  
diff --git a/audio/alsa-lib/patches/patch-ap b/audio/alsa-lib/patches/patch-ap
index 3f8eab99e79..f67950b8dd1 100644
--- a/audio/alsa-lib/patches/patch-ap
+++ b/audio/alsa-lib/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ap,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_file.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_file.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <endian.h>
  #include <byteswap.h>
 +#endif
diff --git a/audio/alsa-lib/patches/patch-ar b/audio/alsa-lib/patches/patch-ar
index 09932387b7e..cfec240d286 100644
--- a/audio/alsa-lib/patches/patch-ar
+++ b/audio/alsa-lib/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ar,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_iec958.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_iec958.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-at b/audio/alsa-lib/patches/patch-at
index a30de8bc92f..ed784d6767a 100644
--- a/audio/alsa-lib/patches/patch-at
+++ b/audio/alsa-lib/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-at,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_lfloat.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_lfloat.c
@@ -6,7 +6,7 @@ $NetBSD: patch-at,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-au b/audio/alsa-lib/patches/patch-au
index 01371339ed0..0f686615e48 100644
--- a/audio/alsa-lib/patches/patch-au
+++ b/audio/alsa-lib/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-au,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_linear.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_linear.c
@@ -6,7 +6,7 @@ $NetBSD: patch-au,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-aw b/audio/alsa-lib/patches/patch-aw
index 70809e9d14c..66dfc5825e3 100644
--- a/audio/alsa-lib/patches/patch-aw
+++ b/audio/alsa-lib/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_misc.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_misc.c
-@@ -23,7 +23,11 @@
+--- src/pcm/pcm_misc.c.orig	2008-10-29 14:42:10 +0200
++++ src/pcm/pcm_misc.c	2008-12-21 17:08:14 +0200
+@@ -23,7 +23,13 @@
  #include <stdlib.h>
  #include <unistd.h>
  #include <string.h>
 +#ifdef __NetBSD__
 +#include <sys/bswap.h>
++#elif defined(__DragonFly__)
++#include <sys/endian.h>
 +#else
  #include <byteswap.h>
 +#endif
diff --git a/audio/alsa-lib/patches/patch-ax b/audio/alsa-lib/patches/patch-ax
index 037a4283e06..d8995b299d1 100644
--- a/audio/alsa-lib/patches/patch-ax
+++ b/audio/alsa-lib/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ax,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_mulaw.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_mulaw.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ax,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-ay b/audio/alsa-lib/patches/patch-ay
index 5453490bf4f..87e51ed9885 100644
--- a/audio/alsa-lib/patches/patch-ay
+++ b/audio/alsa-lib/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ay,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_null.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_null.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ay,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include <limits.h>
diff --git a/audio/alsa-lib/patches/patch-az b/audio/alsa-lib/patches/patch-az
index 0629f362cc1..bca02685cfa 100644
--- a/audio/alsa-lib/patches/patch-az
+++ b/audio/alsa-lib/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-az,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_rate.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_rate.c
@@ -6,7 +6,7 @@ $NetBSD: patch-az,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
  #include <inttypes.h>
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-ba b/audio/alsa-lib/patches/patch-ba
index 7dec17d72b9..c00f71690e9 100644
--- a/audio/alsa-lib/patches/patch-ba
+++ b/audio/alsa-lib/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-ba,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_rate_linear.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_rate_linear.c
@@ -6,7 +6,7 @@ $NetBSD: patch-ba,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   */
  
  #include <inttypes.h>
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-bb b/audio/alsa-lib/patches/patch-bb
index f67c3619dbd..a73bc2fdcb3 100644
--- a/audio/alsa-lib/patches/patch-bb
+++ b/audio/alsa-lib/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-bb,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_route.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_route.c
@@ -6,7 +6,7 @@ $NetBSD: patch-bb,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
    
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include <math.h>
diff --git a/audio/alsa-lib/patches/patch-bf b/audio/alsa-lib/patches/patch-bf
index 5c15b9ea446..a97be29c93a 100644
--- a/audio/alsa-lib/patches/patch-bf
+++ b/audio/alsa-lib/patches/patch-bf
@@ -1,4 +1,4 @@
-$NetBSD: patch-bf,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
+$NetBSD: patch-bf,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_softvol.c.orig	2008-10-29 08:42:10.000000000 -0400
 +++ src/pcm/pcm_softvol.c
@@ -6,7 +6,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
   *
   */
  
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include <math.h>
diff --git a/audio/alsa-lib/patches/patch-bh b/audio/alsa-lib/patches/patch-bh
index 7f61c81e98d..f18f95e7fac 100644
--- a/audio/alsa-lib/patches/patch-bh
+++ b/audio/alsa-lib/patches/patch-bh
@@ -1,4 +1,4 @@
-$NetBSD: patch-bh,v 1.1 2008/12/19 05:14:00 jmcneill Exp $
+$NetBSD: patch-bh,v 1.2 2008/12/25 13:18:00 hasso Exp $
 
 --- src/pcm/pcm_meter.c.orig	2008-12-19 00:05:13.000000000 -0500
 +++ src/pcm/pcm_meter.c	2008-12-19 00:05:34.000000000 -0500
@@ -6,7 +6,7 @@ $NetBSD: patch-bh,v 1.1 2008/12/19 05:14:00 jmcneill Exp $
   */
    
  
-+#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  #include <byteswap.h>
 +#endif
  #include <time.h>
diff --git a/audio/alsa-lib/patches/patch-bj b/audio/alsa-lib/patches/patch-bj
new file mode 100644
index 00000000000..d25e0d30563
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-bj
@@ -0,0 +1,22 @@
+$NetBSD: patch-bj,v 1.1 2008/12/25 13:18:00 hasso Exp $
+
+--- src/pcm/pcm_direct.c.orig	2008-12-25 07:49:08 +0200
++++ src/pcm/pcm_direct.c	2008-12-25 07:48:37 +0200
+@@ -44,7 +44,7 @@
+  *
+  */
+  
+-union semun {
++union semun_l {
+ 	int              val;    /* Value for SETVAL */
+ 	struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
+ 	unsigned short  *array;  /* Array for GETALL, SETALL */
+@@ -58,7 +58,7 @@ union semun {
+ 
+ int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix)
+ {
+-	union semun s;
++	union semun_l s;
+ 	struct semid_ds buf;
+ 	int i;
+ 
diff --git a/audio/alsa-lib/patches/patch-bk b/audio/alsa-lib/patches/patch-bk
new file mode 100644
index 00000000000..d4ada7b0b3c
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-bk
@@ -0,0 +1,28 @@
+$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $
+
+--- src/async.c.orig	2008-12-25 08:18:22 +0200
++++ src/async.c	2008-12-25 08:20:39 +0200
+@@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers);
+ 
+ static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
+ {
++#if defined(__DragonFly__)
++	/* XXX XXX XXX */
++	struct list_head *i;
++	list_for_each(i, &snd_async_handlers) {
++		snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist);
++		if (h->callback)
++			h->callback(h);
++	}
++#else
+ 	int fd;
+ 	struct list_head *i;
+ 	//assert(siginfo->si_code == SI_SIGIO);
+@@ -60,6 +69,7 @@ static void snd_async_handler(int signo 
+ 		if (h->fd == fd && h->callback)
+ 			h->callback(h);
+ 	}
++#endif
+ }
+ 
+ /**