Update alsa-lib to 1.1.1.

I got many patches integrated upstream, still more to go.

Core

    Release v1.1.1
    Define some types if missing
    Define EBADFD in terms of EBADF if it doesn't exist.

Control API

    control: keep consistent usage of assertion
    control: initialize element channel values according to identification number at adding a new element
    control: fulfill a description about element type with integer64
    coverity fixes
    control: add missing asserts to ctl_elem_set functions

PCM API

    pcm: fix 'unable to create IPC shm instance' caused by fork from a thread
    Introduce bswap.h for portable definitions of byte swap macros.
    coverity fixes
    pcm_hw: fix possible memory leak (coverity)
    pcm: simple: Fix asserts

Sequencer API

    seq: Provide sequencer sound card number / PID via alsa-lib

Timer API

    Only use F_SETSIG fcntl where it exists.

Topology API

    topology: Add support for widget byte controls
    topology: add support for CTL access flags to config file
    topology: add support for pasring external ops in conf files
    topology: Add ops to bytes control.
    topology: Remove unnecessary includes
    topology: fix debug output to print correct "max" value.
    topology: Quit and show error message on big-endian machines
    topology: Not compare a for loop iterator with ABI __le32 variables
    topology: Fix comparison of unsigned expression < 0
    topology: Remove unused variables
    topology: Remove unused function write_data_block()
    topology: open topology files with O_TRUNC
    topology: Add missing include sys/stat.h

Use Case Manager API

    Use alphasort where versionsort is not available.

/include/Makefile.am

    Introduce bswap.h for portable definitions of byte swap macros.
    Define some types if missing

ALSA Server

    coverity fixes

Compatibility routines

    Add more compatibility defines.
    Introduce bswap.h for portable definitions of byte swap macros.
    Define some types if missing

Configuration

    Use alphasort where versionsort is not available.
    config files - do not include ucm/topology configuration when not requested

Kernel Headers

    seq: Provide sequencer sound card number / PID via alsa-lib
    Update include/sound/asequencer.h from 4.6-pre kernel uapi
    Update include/sound/asound.h from 4.6-pre kernel uapi

43 files changed, 64 insertions, 666 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 1f9310bbb86..20190515f25 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2016/02/25 10:15:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2016/04/15 08:47:50 wiz Exp $
 
-DISTNAME=	alsa-lib-1.1.0
+DISTNAME=	alsa-lib-1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 3c158d61f99..7d064444384 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,53 +1,23 @@
-$NetBSD: distinfo,v 1.20 2016/02/18 15:15:57 wiz Exp $
+$NetBSD: distinfo,v 1.21 2016/04/15 08:47:50 wiz Exp $
 
-SHA1 (alsa-lib-1.1.0.tar.bz2) = 94b9af685488221561a73ae285c4fddaa93663e4
-RMD160 (alsa-lib-1.1.0.tar.bz2) = 0a9ecf05c136ae025df7ab749db907ad81c4db8f
-SHA512 (alsa-lib-1.1.0.tar.bz2) = 2939d0b621c1c619b0a492b05f2e84f354d588c9cc982d93dbcf01c582319258dd5f803ff5c10be52343cd8827d690f671ab5b20ad586a0ee371f0949c9e98f4
-Size (alsa-lib-1.1.0.tar.bz2) = 929874 bytes
-SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
-SHA1 (patch-ab) = 4853bdbdd559c4fa6a9d00dca3e880022d7fc6ba
-SHA1 (patch-ad) = 43b9a214626bac91cf5b9afb19b6785b100fd7de
-SHA1 (patch-ae) = c2165e3b3d644eb42a6bc9260fb079adcb0da1ba
-SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
-SHA1 (patch-ag) = bea09d714bf75735f5be6d370f7242c34b73cb95
-SHA1 (patch-ah) = 3d2aa98ba2791c2beb152d7e3a454b8d6bb527d3
-SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
-SHA1 (patch-aj) = 82a5b4cf2501c94d4cc5e3275078d84ded1e7a79
-SHA1 (patch-ak) = 39a782c8882a86226f18137d33c70a3736c48cc6
-SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
-SHA1 (patch-am) = 7b5cf015ec0612c1c4a9a864d42d84bba7a78e47
-SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
-SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
-SHA1 (patch-ap) = 3a3c8316b56997052d27f084ed178acbc49d1b17
-SHA1 (patch-aq) = 6a6cf97a17997a9ffc5d269ad2231fc0451bd532
-SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
-SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
-SHA1 (patch-at) = 831c8b94e079a33057effcbee7113dfc3ca5533e
-SHA1 (patch-au) = 3dbf68b4ad655f2b2c91dcce8ca5daac6e80a361
-SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
-SHA1 (patch-aw) = dfad5799001f9e1de7f5892b9a89bc4b6defd9e9
-SHA1 (patch-ax) = cab065c0b4fb697e21c058b3be1fc1665692ffd3
-SHA1 (patch-ay) = 889656f4627c108fdb8f6db7003c8f823efbc1f8
-SHA1 (patch-az) = 6664cb045360c770c80e8d0a7e8e7192d8267487
-SHA1 (patch-ba) = ab5b3fbd497e29c9b1e548e3f510fce7b994f5f3
-SHA1 (patch-bb) = 300c18e806b090cbe6dca1f133bbaace9625fb91
-SHA1 (patch-bc) = 0b034b98d536c4ab7f785420d0d51c3d0763d960
-SHA1 (patch-bd) = 63a102186f4df59da93bedaac772530e166a9fde
-SHA1 (patch-be) = e071d0f3518dac8bbda216d4bd850a2a3557b103
-SHA1 (patch-bf) = 10588dd9f8faac208b8f314676558c2c7da12063
-SHA1 (patch-bg) = 29c0fb6c1fb6a11e7f42778bdd965b9d25ddfd0c
-SHA1 (patch-bh) = a64e54b14946697fdc15b274238851fe8bd32106
-SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
+SHA1 (alsa-lib-1.1.1.tar.bz2) = 09f7e9b2d88287e04a4bb0d56e0cbc9018e524ec
+RMD160 (alsa-lib-1.1.1.tar.bz2) = 619a6c224cb52b9013e59c2f167e4375651ae03e
+SHA512 (alsa-lib-1.1.1.tar.bz2) = dacd0a74adc682ac0034cbeba2de3d1a141e0ac2e564c9e04dae202ffaf87ef3a1e01307afc2fd2d9cfe679e5b101c379f9b6ea5f7ccceeed14a427bd5232bc7
+Size (alsa-lib-1.1.1.tar.bz2) = 932105 bytes
+SHA1 (patch-ad) = 79a0f048751899247ec12990cd02332b977af248
+SHA1 (patch-ae) = 65e20f89ba847625b7632e62a787147c5138a300
+SHA1 (patch-af) = 257b06f10616c04c2724e30777b027e5e7e443f9
+SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
+SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
+SHA1 (patch-bg) = b726769272dd214e67f2407ed5a0199189540557
+SHA1 (patch-bi) = 7e74ebe53cc2ab273f5235775e391a6ef28d1006
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
+SHA1 (patch-configure.ac) = 1c407e8a9d9ea745ab1b79175f6fc0ec6d475acc
 SHA1 (patch-include_iatomic.h) = 7096f31a6b38c10b2e11a907f8431d33d98cce94
-SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5
-SHA1 (patch-include_sound_asoc.h) = d5c274e838f70c22c9e0ba94ef7b7db6f4310e74
-SHA1 (patch-include_sound_asound.h) = dc11957bc69f59a86284afc81c7719b3a955f7ad
-SHA1 (patch-src_conf.c) = 27795c60a05ced40c42dbfb474eed88f3b284cc6
+SHA1 (patch-src_conf.c) = 432e04179798c54a76f5ce072dd9c0b79221df85
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
 SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
 SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
 SHA1 (patch-src_shmarea.c) = d6d0876ae7911ff16138bb82a3b1c79e795218cf
-SHA1 (patch-src_topology_tplg__local.h) = a0105a243027a1d439d7c450cf20144fe477fecc
-SHA1 (patch-src_ucm_parser.c) = 3c376ae30f11d749ea5e41da89a72269710a3b10
+SHA1 (patch-src_ucm_parser.c) = 13dc6b85281d996450c1010cec1bc6e9e87e6b3c
diff --git a/audio/alsa-lib/patches/patch-aa b/audio/alsa-lib/patches/patch-aa
deleted file mode 100644
index 8fe8b59c16d..00000000000
--- a/audio/alsa-lib/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- aserver/aserver.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ aserver/aserver.c
-@@ -35,6 +35,10 @@
- 
- #include "aserver.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- char *command;
- 
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
diff --git a/audio/alsa-lib/patches/patch-ab b/audio/alsa-lib/patches/patch-ab
deleted file mode 100644
index 330aa8442a9..00000000000
--- a/audio/alsa-lib/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2014/06/09 12:21:07 ryoon Exp $
-
---- configure.orig	2013-07-08 12:32:46.000000000 +0000
-+++ configure
-@@ -13322,6 +13322,11 @@ test "x$prefix" = xNONE && prefix=$ac_de
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- 
- DEFS=-DHAVE_CONFIG_H
-+case $host_os in
-+  netbsd*|freebsd*|dragonfly*)
-+    DEFS="$DEFS -Dbswap_32=bswap32 -Dbswap_16=bswap16 -Dbswap_64=bswap64"
-+    ;;
-+esac
- 
- ac_libobjs=
- ac_ltlibobjs=
-@@ -15815,6 +15820,14 @@ if test -n "$ac_unrecognized_opts" && te
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
- 
-+case $host_os in
-+  netbsd*|freebsd*|dragonfly*)
-+    HAVE_LIBDL=yes
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBDL 1
-+_ACEOF
-+    ;;
-+esac
- 
- echo "Creating asoundlib.h..."
- cp "$srcdir"/include/asoundlib-head.h include/asoundlib.h
diff --git a/audio/alsa-lib/patches/patch-ad b/audio/alsa-lib/patches/patch-ad
index e41e2db9cc6..9623ffb9429 100644
--- a/audio/alsa-lib/patches/patch-ad
+++ b/audio/alsa-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2016/02/18 15:15:57 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2016/04/15 08:47:50 wiz Exp $
 
 --- include/global.h.orig	2015-11-09 07:39:18.000000000 +0000
 +++ include/global.h
@@ -16,12 +16,3 @@ $NetBSD: patch-ad,v 1.6 2016/02/18 15:15:57 wiz Exp $
  
  #ifdef __cplusplus
  extern "C" {
-@@ -134,7 +141,7 @@ int snd_shm_area_destroy(struct snd_shm_
- int snd_user_file(const char *file, char **result);
- 
- #ifdef __GLIBC__
--#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- 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 a43a0a8eb98..50148174cb0 100644
--- a/audio/alsa-lib/patches/patch-ae
+++ b/audio/alsa-lib/patches/patch-ae
@@ -1,23 +1,10 @@
-$NetBSD: patch-ae,v 1.7 2016/02/18 15:15:57 wiz Exp $
+$NetBSD: patch-ae,v 1.8 2016/04/15 08:47:50 wiz Exp $
 
- - Handle endian detection for assorted operating systems.
- - Fix up linuxism.
  - Don't assert GNU ld on Solaris, where it might not be true.
 
---- include/local.h.orig	2015-11-09 07:39:18.000000000 +0000
+--- include/local.h.orig	2016-02-29 14:44:47.000000000 +0000
 +++ include/local.h
-@@ -50,8 +50,10 @@
- #include <sys/poll.h>
- #include <sys/types.h>
- #include <errno.h>
-+#if defined(__linux__)
- #include <linux/types.h>
- #include <linux/ioctl.h>
-+#endif
- 
- #ifdef SUPPORT_RESMGR
- #include <resmgr.h>
-@@ -249,7 +251,9 @@ extern snd_lib_error_handler_t snd_err_m
+@@ -253,7 +253,9 @@ extern snd_lib_error_handler_t snd_err_m
  
  /*
   */
diff --git a/audio/alsa-lib/patches/patch-af b/audio/alsa-lib/patches/patch-af
index a064c182671..b48b056e0b8 100644
--- a/audio/alsa-lib/patches/patch-af
+++ b/audio/alsa-lib/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-af,v 1.5 2016/04/15 08:47:50 wiz 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.4 2014/03/25 23:06:07 asau Exp $
  #ifndef _SEARCH_H
  #define	_SEARCH_H 1
  
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
++#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
  #include <features.h>
 +#else
 +#ifdef __sun
diff --git a/audio/alsa-lib/patches/patch-ag b/audio/alsa-lib/patches/patch-ag
deleted file mode 100644
index 21d22d69032..00000000000
--- a/audio/alsa-lib/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/control/control_shm.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/control/control_shm.c
-@@ -35,6 +35,10 @@
- #include <netdb.h>
- #include "aserver.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_control_shm = "";
diff --git a/audio/alsa-lib/patches/patch-ah b/audio/alsa-lib/patches/patch-ah
index 44cbd8c955c..12b449a1745 100644
--- a/audio/alsa-lib/patches/patch-ah
+++ b/audio/alsa-lib/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2014/06/09 12:21:07 ryoon Exp $
+$NetBSD: patch-ah,v 1.4 2016/04/15 08:47:50 wiz Exp $
 
 --- src/pcm/pcm.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/pcm/pcm.c
@@ -11,14 +11,3 @@ $NetBSD: patch-ah,v 1.3 2014/06/09 12:21:07 ryoon Exp $
  #include <stdarg.h>
  #include <signal.h>
  #include <ctype.h>
-@@ -640,6 +640,10 @@ playback devices.
- #include <limits.h>
- #include "pcm_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- /**
-  * \brief get identifier of PCM handle
-  * \param pcm PCM handle
diff --git a/audio/alsa-lib/patches/patch-ai b/audio/alsa-lib/patches/patch-ai
deleted file mode 100644
index 7a211727814..00000000000
--- a/audio/alsa-lib/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_adpcm.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_adpcm.c
-@@ -56,7 +56,9 @@ IMA compatibility project proceedings, V
-   come across a good description of XA yet.
-  */
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-aj b/audio/alsa-lib/patches/patch-aj
deleted file mode 100644
index 33ed0de9fde..00000000000
--- a/audio/alsa-lib/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_alaw.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_alaw.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-ak b/audio/alsa-lib/patches/patch-ak
deleted file mode 100644
index 8b3905ea0b1..00000000000
--- a/audio/alsa-lib/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_copy.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_copy.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-al b/audio/alsa-lib/patches/patch-al
deleted file mode 100644
index 209c06728df..00000000000
--- a/audio/alsa-lib/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_dmix.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_dmix.c
-@@ -45,6 +45,10 @@
- #include <sys/mman.h>
- #include "pcm_direct.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_dmix = "";
diff --git a/audio/alsa-lib/patches/patch-am b/audio/alsa-lib/patches/patch-am
deleted file mode 100644
index 16e2fa8d38f..00000000000
--- a/audio/alsa-lib/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.5 2014/06/09 12:21:07 ryoon Exp $
-
---- src/pcm/pcm_dmix_generic.c.orig	2013-07-08 12:31:36.000000000 +0000
-+++ src/pcm/pcm_dmix_generic.c
-@@ -125,7 +125,9 @@ static void mix_select_callbacks(snd_pcm
- 	 (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \
- 	 (1ULL << SND_PCM_FORMAT_U8))
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- 
- static void generic_mix_areas_16_native(unsigned int size,
- 					volatile signed short *dst,
diff --git a/audio/alsa-lib/patches/patch-an b/audio/alsa-lib/patches/patch-an
deleted file mode 100644
index 8417f2dcb02..00000000000
--- a/audio/alsa-lib/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_dshare.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_dshare.c
-@@ -45,6 +45,10 @@
- #include <sys/mman.h>
- #include "pcm_direct.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_dshare = "";
diff --git a/audio/alsa-lib/patches/patch-ao b/audio/alsa-lib/patches/patch-ao
deleted file mode 100644
index b39488f709b..00000000000
--- a/audio/alsa-lib/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_dsnoop.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_dsnoop.c
-@@ -45,6 +45,10 @@
- #include <sys/mman.h>
- #include "pcm_direct.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_dsnoop = "";
diff --git a/audio/alsa-lib/patches/patch-ap b/audio/alsa-lib/patches/patch-ap
deleted file mode 100644
index c2883155853..00000000000
--- a/audio/alsa-lib/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.6 2016/02/18 15:15:57 wiz Exp $
-
---- src/pcm/pcm_file.c.orig	2015-11-09 07:39:18.000000000 +0000
-+++ src/pcm/pcm_file.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <ctype.h>
- #include <string.h>
- #include "pcm_local.h"
diff --git a/audio/alsa-lib/patches/patch-aq b/audio/alsa-lib/patches/patch-aq
index 64f75f2b6ac..0df1df07a4d 100644
--- a/audio/alsa-lib/patches/patch-aq
+++ b/audio/alsa-lib/patches/patch-aq
@@ -1,18 +1,7 @@
-$NetBSD: patch-aq,v 1.3 2014/06/09 12:21:07 ryoon Exp $
+$NetBSD: patch-aq,v 1.4 2016/04/15 08:47:50 wiz Exp $
 
 --- src/pcm/pcm_hw.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/pcm/pcm_hw.c
-@@ -41,6 +41,10 @@
- #include "../control/control_local.h"
- #include "../timer/timer_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- //#define DEBUG_RW		/* use to debug readi/writei/readn/writen */
- //#define DEBUG_MMAP		/* debug mmap_commit */
- 
 @@ -220,10 +224,11 @@ static int snd_pcm_hw_nonblock(snd_pcm_t
  
  static int snd_pcm_hw_async(snd_pcm_t *pcm, int sig, pid_t pid)
diff --git a/audio/alsa-lib/patches/patch-ar b/audio/alsa-lib/patches/patch-ar
deleted file mode 100644
index ec632479af3..00000000000
--- a/audio/alsa-lib/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_iec958.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_iec958.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-as b/audio/alsa-lib/patches/patch-as
deleted file mode 100644
index b1e45473d6d..00000000000
--- a/audio/alsa-lib/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_ioplug.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_ioplug.c
-@@ -31,6 +31,10 @@
- #include "pcm_ext_parm.h"
- #include "pcm_generic.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_ioplug = "";
diff --git a/audio/alsa-lib/patches/patch-at b/audio/alsa-lib/patches/patch-at
deleted file mode 100644
index 2b258c413e8..00000000000
--- a/audio/alsa-lib/patches/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-at,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_lfloat.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_lfloat.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-au b/audio/alsa-lib/patches/patch-au
deleted file mode 100644
index 3d37746abf2..00000000000
--- a/audio/alsa-lib/patches/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-au,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_linear.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_linear.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-av b/audio/alsa-lib/patches/patch-av
deleted file mode 100644
index a14a7fc92a1..00000000000
--- a/audio/alsa-lib/patches/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-av,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_local.h.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_local.h
-@@ -393,6 +393,10 @@ int _snd_pcm_poll_descriptor(snd_pcm_t *
- #define _snd_pcm_link_descriptor _snd_pcm_poll_descriptor /* FIXME */
- #define _snd_pcm_async_descriptor _snd_pcm_poll_descriptor /* FIXME */
- 
-+#ifndef ESTRPIPE
-+#define ESTRPIPE EPIPE
-+#endif
-+
- /* handle special error cases */
- static inline int snd_pcm_check_error(snd_pcm_t *pcm, int err)
- {
diff --git a/audio/alsa-lib/patches/patch-aw b/audio/alsa-lib/patches/patch-aw
deleted file mode 100644
index 33174761557..00000000000
--- a/audio/alsa-lib/patches/patch-aw
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aw,v 1.5 2014/03/25 23:06:07 asau Exp $
-
---- 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,15 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#ifdef __NetBSD__
-+#include <sys/bswap.h>
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+#elif defined (__sun)
-+#include <sys/byteorder.h>
-+#else
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- 
- 
diff --git a/audio/alsa-lib/patches/patch-ax b/audio/alsa-lib/patches/patch-ax
deleted file mode 100644
index c77386090ff..00000000000
--- a/audio/alsa-lib/patches/patch-ax
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_mulaw.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_mulaw.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
diff --git a/audio/alsa-lib/patches/patch-ay b/audio/alsa-lib/patches/patch-ay
deleted file mode 100644
index 40343340cad..00000000000
--- a/audio/alsa-lib/patches/patch-ay
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ay,v 1.5 2016/02/18 15:15:57 wiz Exp $
-
---- src/pcm/pcm_null.c.orig	2015-11-09 07:39:18.000000000 +0000
-+++ src/pcm/pcm_null.c
-@@ -26,11 +26,17 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <limits.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_null = "";
diff --git a/audio/alsa-lib/patches/patch-az b/audio/alsa-lib/patches/patch-az
deleted file mode 100644
index 3e18c876a81..00000000000
--- a/audio/alsa-lib/patches/patch-az
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-az,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_rate.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_rate.c
-@@ -28,7 +28,9 @@
-  *
-  */
- #include <inttypes.h>
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- #include "pcm_rate.h"
-@@ -36,6 +38,10 @@
- 
- #include "plugin_ops.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #if 0
- #define DEBUG_REFINE
- #endif
diff --git a/audio/alsa-lib/patches/patch-ba b/audio/alsa-lib/patches/patch-ba
deleted file mode 100644
index f6d330f46c6..00000000000
--- a/audio/alsa-lib/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_rate_linear.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_rate_linear.c
-@@ -21,7 +21,9 @@
-  */
- 
- #include <inttypes.h>
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include "pcm_local.h"
- #include "pcm_plugin.h"
- #include "pcm_rate.h"
diff --git a/audio/alsa-lib/patches/patch-bb b/audio/alsa-lib/patches/patch-bb
deleted file mode 100644
index e7659dbf1d4..00000000000
--- a/audio/alsa-lib/patches/patch-bb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_route.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_route.c
-@@ -26,7 +26,9 @@
-  *
-  */
-   
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <math.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
diff --git a/audio/alsa-lib/patches/patch-bc b/audio/alsa-lib/patches/patch-bc
deleted file mode 100644
index 0d7454eb0c5..00000000000
--- a/audio/alsa-lib/patches/patch-bc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_share.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_share.c
-@@ -39,6 +39,10 @@
- #include <pthread.h>
- #include "pcm_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_share = "";
diff --git a/audio/alsa-lib/patches/patch-bd b/audio/alsa-lib/patches/patch-bd
deleted file mode 100644
index 556186dde25..00000000000
--- a/audio/alsa-lib/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_shm.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_shm.c
-@@ -45,6 +45,10 @@
- #include <netdb.h>
- #include "aserver.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifndef PIC
- /* entry for static linking */
- const char *_snd_module_pcm_shm = "";
diff --git a/audio/alsa-lib/patches/patch-be b/audio/alsa-lib/patches/patch-be
deleted file mode 100644
index 15126a3a913..00000000000
--- a/audio/alsa-lib/patches/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2008/12/19 03:33:00 jmcneill Exp $
-
---- src/pcm/pcm_simple.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_simple.c
-@@ -25,6 +25,10 @@
- 
- #include "pcm_local.h"
- 
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- static int set_buffer_time(snd_spcm_latency_t latency,
- 			   unsigned int *buffer_time)
- {
diff --git a/audio/alsa-lib/patches/patch-bf b/audio/alsa-lib/patches/patch-bf
deleted file mode 100644
index f9a27ac07a6..00000000000
--- a/audio/alsa-lib/patches/patch-bf
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bf,v 1.4 2014/03/25 23:06:07 asau Exp $
-
---- src/pcm/pcm_softvol.c.orig	2008-10-29 08:42:10.000000000 -0400
-+++ src/pcm/pcm_softvol.c
-@@ -26,7 +26,9 @@
-  *
-  */
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <math.h>
- #include "pcm_local.h"
- #include "pcm_plugin.h"
diff --git a/audio/alsa-lib/patches/patch-bg b/audio/alsa-lib/patches/patch-bg
index 242ed37c0ea..06547afbc8c 100644
--- a/audio/alsa-lib/patches/patch-bg
+++ b/audio/alsa-lib/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.2 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-bg,v 1.3 2016/04/15 08:47:50 wiz Exp $
 
---- src/timer/timer_hw.c.orig	2008-10-29 08:42:10.000000000 -0400
+--- src/timer/timer_hw.c.orig	2016-03-07 10:09:24.000000000 +0000
 +++ src/timer/timer_hw.c
-@@ -72,11 +72,14 @@ static int snd_timer_hw_nonblock(snd_tim
+@@ -66,11 +66,14 @@ static int snd_timer_hw_nonblock(snd_tim
  
  static int snd_timer_hw_async(snd_timer_t *timer, int sig, pid_t pid)
  {
@@ -17,7 +17,7 @@ $NetBSD: patch-bg,v 1.2 2012/02/15 19:43:51 hans Exp $
  	if ((flags = fcntl(fd, F_GETFL)) < 0) {
  		SYSERR("F_GETFL failed");
  		return -errno;
-@@ -89,12 +92,22 @@ static int snd_timer_hw_async(snd_timer_
+@@ -83,13 +86,21 @@ static int snd_timer_hw_async(snd_timer_
  		SYSERR("F_SETFL for O_ASYNC failed");
  		return -errno;
  	}
@@ -25,18 +25,18 @@ $NetBSD: patch-bg,v 1.2 2012/02/15 19:43:51 hans Exp $
  	if (sig < 0)
  		return 0;
 +#ifndef __sun
-+#ifdef F_SETSIG
+ #ifdef F_SETSIG
  	if (fcntl(fd, F_SETSIG, (long)sig) < 0) {
  		SYSERR("F_SETSIG failed");
  		return -errno;
- 	}
+-	}
++       }
 +#else
-+	if (fcntl(fd, F_SETFL, O_ASYNC) < 0) {
-+		SYSERR("F_SETFL failed");
-+		return -errno;
-+	}
-+#endif
++       if (fcntl(fd, F_SETFL, O_ASYNC) < 0) {
++               SYSERR("F_SETFL failed");
++               return -errno;
++       }
 +#endif
+ #endif
  	if (fcntl(fd, F_SETOWN, (long)pid) < 0) {
  		SYSERR("F_SETOWN failed");
- 		return -errno;
diff --git a/audio/alsa-lib/patches/patch-bh b/audio/alsa-lib/patches/patch-bh
deleted file mode 100644
index 02bcc58dac5..00000000000
--- a/audio/alsa-lib/patches/patch-bh
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bh,v 1.4 2014/03/25 23:06:07 asau 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
-@@ -27,7 +27,9 @@
-  */
-   
- 
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)
- #include <byteswap.h>
-+#endif
- #include <time.h>
- #include <pthread.h>
- #include <dlfcn.h>
diff --git a/audio/alsa-lib/patches/patch-bi b/audio/alsa-lib/patches/patch-bi
index beefafb2bd4..983fa739204 100644
--- a/audio/alsa-lib/patches/patch-bi
+++ b/audio/alsa-lib/patches/patch-bi
@@ -1,4 +1,6 @@
-$NetBSD: patch-bi,v 1.1 2008/12/19 05:14:00 jmcneill Exp $
+$NetBSD: patch-bi,v 1.2 2016/04/15 08:47:50 wiz Exp $
+
+For dlopen(), dlclose()...
 
 --- src/pcm/pcm_ladspa.c.orig	2008-12-19 00:06:18.000000000 -0500
 +++ src/pcm/pcm_ladspa.c	2008-12-19 00:06:31.000000000 -0500
diff --git a/audio/alsa-lib/patches/patch-configure.ac b/audio/alsa-lib/patches/patch-configure.ac
new file mode 100644
index 00000000000..05d90e9dadf
--- /dev/null
+++ b/audio/alsa-lib/patches/patch-configure.ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure.ac,v 1.1 2016/04/15 08:47:50 wiz Exp $
+
+--- configure.ac.orig	2016-02-24 08:33:29.000000000 +0000
++++ configure.ac
+@@ -665,6 +671,15 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict
+ 	  test/Makefile test/lsb/Makefile \
+ 	  utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
+ 
++case $host_os in
++  netbsd*|freebsd*|dragonfly*)
++    HAVE_LIBDL=yes
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBDL 1
++_ACEOF
++    ;;
++esac
++
+ dnl Create asoundlib.h dynamically according to configure options
+ echo "Creating asoundlib.h..."
+ cp "$srcdir"/include/asoundlib-head.h include/asoundlib.h
diff --git a/audio/alsa-lib/patches/patch-include_pcm.h b/audio/alsa-lib/patches/patch-include_pcm.h
deleted file mode 100644
index d6d44ba44bc..00000000000
--- a/audio/alsa-lib/patches/patch-include_pcm.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-include_pcm.h,v 1.4 2014/06/09 12:21:07 ryoon Exp $
-
---- include/pcm.h.orig	2013-07-08 12:31:36.000000000 +0000
-+++ include/pcm.h
-@@ -579,7 +579,9 @@ int snd_pcm_chmap_print(const snd_pcm_ch
- unsigned int snd_pcm_chmap_from_string(const char *str);
- snd_pcm_chmap_t *snd_pcm_chmap_parse_string(const char *str);
- 
-+/*
- //int snd_pcm_mixer_element(snd_pcm_t *pcm, snd_mixer_t *mixer, snd_mixer_elem_t **elem);
-+ */
- 
- /*
-  * application helpers - these functions are implemented on top
-@@ -1048,10 +1050,17 @@ int snd_pcm_format_width(snd_pcm_format_
- int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
- ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
-+#ifdef __sun
-+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
-+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
-+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
-+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+#else
- u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
- u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
- u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
- u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+#endif
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
- 
- snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
diff --git a/audio/alsa-lib/patches/patch-include_sound_asoc.h b/audio/alsa-lib/patches/patch-include_sound_asoc.h
deleted file mode 100644
index 860c4344075..00000000000
--- a/audio/alsa-lib/patches/patch-include_sound_asoc.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-include_sound_asoc.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
-
---- include/sound/asoc.h.orig	2015-11-09 07:39:18.000000000 +0000
-+++ include/sound/asoc.h
-@@ -111,6 +111,16 @@
-  * Block Header.
-  * This header precedes all object and object arrays below.
-  */
-+#ifndef __le16
-+#define __le16 uint16_t
-+#endif
-+#ifndef __le32
-+#define __le32 uint32_t
-+#endif
-+#ifndef __le64
-+#define __le64 uint64_t
-+#endif
-+
- struct snd_soc_tplg_hdr {
- 	__le32 magic;		/* magic number */
- 	__le32 abi;		/* ABI version */
diff --git a/audio/alsa-lib/patches/patch-include_sound_asound.h b/audio/alsa-lib/patches/patch-include_sound_asound.h
deleted file mode 100644
index 118cdb6cb22..00000000000
--- a/audio/alsa-lib/patches/patch-include_sound_asound.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-include_sound_asound.h,v 1.2 2016/02/18 15:15:57 wiz Exp $
-
---- include/sound/asound.h.orig	2015-11-09 07:39:18.000000000 +0000
-+++ include/sound/asound.h
-@@ -23,8 +23,14 @@
- #ifndef _UAPI__SOUND_ASOUND_H
- #define _UAPI__SOUND_ASOUND_H
- 
-+#if defined(__linux__)
- #include <linux/types.h>
--
-+#else
-+#include <sys/ioctl.h>
-+#define __bitwise
-+typedef uint32_t __u32;
-+typedef int __kernel_pid_t;
-+#endif
- #ifndef __KERNEL__
- #include <stdlib.h>
- #endif
-@@ -415,7 +421,11 @@ struct snd_pcm_sw_params {
- 
- struct snd_pcm_channel_info {
- 	unsigned int channel;
-+#ifdef __linux__
- 	__kernel_off_t offset;		/* mmap offset */
-+#else
-+	off_t offset;		/* mmap offset */
-+#endif
- 	unsigned int first;		/* offset to first sample in bits */
- 	unsigned int step;		/* samples distance in bits */
- };
diff --git a/audio/alsa-lib/patches/patch-src_conf.c b/audio/alsa-lib/patches/patch-src_conf.c
index d423719df37..3962af3823c 100644
--- a/audio/alsa-lib/patches/patch-src_conf.c
+++ b/audio/alsa-lib/patches/patch-src_conf.c
@@ -1,7 +1,6 @@
-$NetBSD: patch-src_conf.c,v 1.4 2016/02/18 15:15:57 wiz Exp $
+$NetBSD: patch-src_conf.c,v 1.5 2016/04/15 08:47:50 wiz Exp $
 
-* NetBSD has no PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-* SunOS has no versionsort or dirent d_type
+* SunOS has no dirent d_type
 
 --- src/conf.c.orig	2015-11-09 07:39:18.000000000 +0000
 +++ src/conf.c
@@ -25,12 +24,3 @@ $NetBSD: patch-src_conf.c,v 1.4 2016/02/18 15:15:57 wiz Exp $
  		return 0;
  
  	flen = strlen(dirent->d_name);
-@@ -3549,7 +3557,7 @@ int snd_config_hook_load(snd_config_t *r
- 			int n;
- 
- #ifndef DOC_HIDDEN
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
- #define SORTFUNC	versionsort
- #else
- #define SORTFUNC	alphasort
diff --git a/audio/alsa-lib/patches/patch-src_topology_tplg__local.h b/audio/alsa-lib/patches/patch-src_topology_tplg__local.h
deleted file mode 100644
index facd4a82eda..00000000000
--- a/audio/alsa-lib/patches/patch-src_topology_tplg__local.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_topology_tplg__local.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
-
---- src/topology/tplg_local.h.orig	2015-11-09 07:39:18.000000000 +0000
-+++ src/topology/tplg_local.h
-@@ -12,7 +12,9 @@
- 
- #include <limits.h>
- #include <stdint.h>
-+#ifdef __linux__
- #include <linux/types.h>
-+#endif
- 
- #include "local.h"
- #include "list.h"
diff --git a/audio/alsa-lib/patches/patch-src_ucm_parser.c b/audio/alsa-lib/patches/patch-src_ucm_parser.c
index e5d2cdeef8f..ca57d096116 100644
--- a/audio/alsa-lib/patches/patch-src_ucm_parser.c
+++ b/audio/alsa-lib/patches/patch-src_ucm_parser.c
@@ -1,8 +1,6 @@
-$NetBSD: patch-src_ucm_parser.c,v 1.3 2014/06/26 20:23:14 asau Exp $
+$NetBSD: patch-src_ucm_parser.c,v 1.4 2016/04/15 08:47:50 wiz Exp $
 
-* NetBSD has no versionsort
-* FreeBSD doesn't have it either
-* SunOS has no versionsort or dirent d_type
+* SunOS has no dirent d_type
 
 --- src/ucm/parser.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/ucm/parser.c
@@ -24,12 +22,3 @@ $NetBSD: patch-src_ucm_parser.c,v 1.3 2014/06/26 20:23:14 asau Exp $
  		if (dirent->d_name[0] == '.') {
  			if (dirent->d_name[1] == '\0')
  				return 0;
-@@ -1254,7 +1262,7 @@ int uc_mgr_scan_master_configs(const cha
- 		"%s", env ? env : ALSA_USE_CASE_DIR);
- 	filename[MAX_FILE-1] = '\0';
- 
--#ifdef _GNU_SOURCE
-+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
- #define SORTFUNC	versionsort
- #else
- #define SORTFUNC	alphasort