Fix build on SunOS.

6 files changed, 62 insertions, 7 deletions

diff --git a/audio/libvisual/distinfo b/audio/libvisual/distinfo
index 961680ede4a..fee5e45d108 100644
--- a/audio/libvisual/distinfo
+++ b/audio/libvisual/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2008/02/05 20:38:33 drochner Exp $
+$NetBSD: distinfo,v 1.11 2012/02/15 21:58:44 hans Exp $
 
 SHA1 (libvisual-0.4.0.tar.gz) = bd21d621f1d54134c26138e19eaae46c5aeaec00
 RMD160 (libvisual-0.4.0.tar.gz) = df4fda944e84417def2817f248f587dea5b2d8f1
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 2493f145d37c6de8dc37beb22e788c628d43342e
 SHA1 (patch-ac) = ad124820a2a20550bf85181be284c1e000114ddd
 SHA1 (patch-ad) = e7b2493cf5880cea7497a1d8d6fb1ce4f856ba6d
 SHA1 (patch-ae) = 72affdd9a1302a16efe5f4ecaafbc37061e4db0c
+SHA1 (patch-libvisual_lv__types.h) = c33ff6113759863a85b332e1ed1abc2c49f406f9
diff --git a/audio/libvisual/patches/patch-libvisual_lv__types.h b/audio/libvisual/patches/patch-libvisual_lv__types.h
new file mode 100644
index 00000000000..d3e0f7b6841
--- /dev/null
+++ b/audio/libvisual/patches/patch-libvisual_lv__types.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-libvisual_lv__types.h,v 1.1 2012/02/15 21:58:44 hans Exp $
+
+--- libvisual/lv_types.h.orig	2006-02-13 21:54:08.000000000 +0100
++++ libvisual/lv_types.h	2012-01-11 14:44:09.647013746 +0100
+@@ -38,20 +38,6 @@ VISUAL_BEGIN_DECLS
+ 
+ #define VISUAL_TABLESIZE(table)			(sizeof (table) / sizeof (table[0]))
+ 
+-#if !defined(VISUAL_OS_WIN32)
+-#ifndef uint8_t
+-#define uint8_t		u_int8_t
+-#endif
+-
+-#ifndef uint16_t
+-#define uint16_t	u_int16_t
+-#endif
+-
+-#ifndef uint32_t
+-#define uint32_t	u_int32_t
+-#endif
+-#endif /* !VISUAL_OS_WIN32 */
+-
+ VISUAL_END_DECLS
+ 
+ #endif /* _LV_TYPES_H */
diff --git a/audio/libvisual0.2/distinfo b/audio/libvisual0.2/distinfo
index 42f0ce821de..4d90e478be9 100644
--- a/audio/libvisual0.2/distinfo
+++ b/audio/libvisual0.2/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/03 23:29:50 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/02/15 22:01:43 hans Exp $
 
 SHA1 (libvisual-0.2.0.tar.gz) = 8867f743c7407890c8cc571acab2fbcab869f3a1
 RMD160 (libvisual-0.2.0.tar.gz) = d933e849ffb8ce8f21d9d58e92fd104b137b718d
 Size (libvisual-0.2.0.tar.gz) = 431141 bytes
 SHA1 (patch-aa) = f7a0b011fa39996813bb7a8fe00aefdfaa680583
 SHA1 (patch-ab) = d4014e06622f59e31f4ee42dd24ce729e27b580d
+SHA1 (patch-libvisual_lv__types.h) = 8de893059b84e6159af977937e70fa274f49cd42
diff --git a/audio/libvisual0.2/patches/patch-libvisual_lv__types.h b/audio/libvisual0.2/patches/patch-libvisual_lv__types.h
new file mode 100644
index 00000000000..79565b5721a
--- /dev/null
+++ b/audio/libvisual0.2/patches/patch-libvisual_lv__types.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-libvisual_lv__types.h,v 1.1 2012/02/15 22:01:43 hans Exp $
+
+--- libvisual/lv_types.h.orig	2005-01-01 15:11:56.000000000 +0100
++++ libvisual/lv_types.h	2012-01-11 15:00:23.565973572 +0100
+@@ -32,18 +32,6 @@ extern "C" {
+ 
+ #define VISUAL_CHECK_CAST(uiobj, cast_type, cast)    ((cast*) (uiobj))
+ 
+-#ifndef uint8_t
+-#define uint8_t		u_int8_t
+-#endif
+-	
+-#ifndef uint16_t
+-#define uint16_t	u_int16_t
+-#endif
+-
+-#ifndef uint32_t
+-#define uint32_t	u_int32_t
+-#endif
+-
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
diff --git a/audio/libwildmidi/distinfo b/audio/libwildmidi/distinfo
index 581e1720c22..df4e875d974 100644
--- a/audio/libwildmidi/distinfo
+++ b/audio/libwildmidi/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/11/30 13:47:15 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/02/15 22:05:24 hans Exp $
 
 SHA1 (wildmidi-0.2.3.4.tar.gz) = 99ffeb54980a29c5aa44f4cb152ad37acbe877bc
 RMD160 (wildmidi-0.2.3.4.tar.gz) = 50b4102f0b305ca0afd7649957a3a94343dbf2d6
 Size (wildmidi-0.2.3.4.tar.gz) = 348971 bytes
 SHA1 (patch-src_Makefile.in) = c04041123a882bda5b0029f70e69fda17b381638
-SHA1 (patch-src_wildmidi.c) = 572136a5476461db9be6f89a0523e812feeb39b7
+SHA1 (patch-src_wildmidi.c) = 6217cb6992d1eb6e04e2b55937fc555b658dc434
diff --git a/audio/libwildmidi/patches/patch-src_wildmidi.c b/audio/libwildmidi/patches/patch-src_wildmidi.c
index 508e133a7da..111bac70ae0 100644
--- a/audio/libwildmidi/patches/patch-src_wildmidi.c
+++ b/audio/libwildmidi/patches/patch-src_wildmidi.c
@@ -1,11 +1,12 @@
-$NetBSD: patch-src_wildmidi.c,v 1.1.1.1 2011/11/30 13:47:16 wiz Exp $
+$NetBSD: patch-src_wildmidi.c,v 1.2 2012/02/15 22:05:24 hans Exp $
 
 On NetBSD, FNONBLOCK is only defined for the kernel.
+Define MAP_FILE if necessary.
 Fix device name in printf.
 
 --- src/wildmidi.c.orig	2010-07-30 00:33:46.000000000 +0000
 +++ src/wildmidi.c
-@@ -63,7 +63,11 @@
+@@ -63,7 +63,15 @@
  #include "wildmidi_lib.h"
  
  #ifndef FNONBLOCK
@@ -14,10 +15,14 @@ Fix device name in printf.
 +#else
 +#define FNONBLOCK O_NONBLOCK
 +#endif
++#endif
++
++#ifndef MAP_FILE
++#define MAP_FILE 0
  #endif
  
  
-@@ -573,11 +577,11 @@ open_oss_output( void ) {
+@@ -573,11 +581,11 @@ open_oss_output( void ) {
  	}
  
  	if ((audio_fd = open(pcmname, omode)) < 0) {