Fix build on SunOS.

6 files changed, 33 insertions, 11 deletions

diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index da230e71b75..c31d8c1852b 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/02/01 01:51:50 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2012/03/01 17:30:00 hans Exp $
 #
 
 DISTNAME=		ubs-0.17
@@ -19,6 +19,8 @@ RCD_SCRIPTS=		ubs
 PKG_SYSCONFSUBDIR=	ubs
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
+CFLAGS.SunOS+=		-std=c99 -D_XOPEN_SOURCE=600
+
 .include "../../mk/bsd.prefs.mk"
 
 UBS_BASEDIR?=		/var/spool/ubs
diff --git a/audio/ubs/distinfo b/audio/ubs/distinfo
index c30117090af..5484bf6ff1d 100644
--- a/audio/ubs/distinfo
+++ b/audio/ubs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/12/14 03:14:13 sbd Exp $
+$NetBSD: distinfo,v 1.6 2012/03/01 17:30:00 hans Exp $
 
 SHA1 (ubs-0.17.tar.gz) = f0f67d437e4c5c7026b2f05d1aaff53688eb3253
 RMD160 (ubs-0.17.tar.gz) = 4e0e46bb8346f0c86989b0b33973000bbb86f1aa
@@ -6,3 +6,4 @@ Size (ubs-0.17.tar.gz) = 372222 bytes
 SHA1 (patch-aa) = 4f8d8085a8925ffe866f2d8cec72232f6da70811
 SHA1 (patch-ab) = 88d06fca850e7bf2d38ad587021e4352c96cc89b
 SHA1 (patch-ac) = af22e0ca907b22eedb86e79ce2e81e4fb87283e9
+SHA1 (patch-lib_get__song.c) = 1158e4dacb1f47e27902af0e42b60ecbc96e82f6
diff --git a/audio/ubs/patches/patch-lib_get__song.c b/audio/ubs/patches/patch-lib_get__song.c
new file mode 100644
index 00000000000..1d298639361
--- /dev/null
+++ b/audio/ubs/patches/patch-lib_get__song.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_get__song.c,v 1.1 2012/03/01 17:30:01 hans Exp $
+
+--- lib/get_song.c.orig	2003-10-29 06:17:10.000000000 +0100
++++ lib/get_song.c	2012-03-01 18:17:56.807135414 +0100
+@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include <string.h>
+ #include <dirent.h>
+ #include <sys/types.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ 
diff --git a/audio/xanalyser/distinfo b/audio/xanalyser/distinfo
index 418d9b3398e..262c64c626b 100644
--- a/audio/xanalyser/distinfo
+++ b/audio/xanalyser/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2008/08/02 19:33:21 dholland Exp $
+$NetBSD: distinfo,v 1.11 2012/03/01 17:38:56 hans Exp $
 
 SHA1 (xanalyser-1.24.tar.bz2) = 0b261568b8573d81b7e99980c2ffede6be683bdb
 RMD160 (xanalyser-1.24.tar.bz2) = 9fa7c1ae489be127ca8e519168eb7b48bbabab24
 Size (xanalyser-1.24.tar.bz2) = 73451 bytes
-SHA1 (patch-aa) = c0504392de44bcde7235bf6e5617764ae34b1ec4
-SHA1 (patch-ab) = 505f9814afdad9aa558ccf980321805f66d8c9e3
+SHA1 (patch-aa) = 3b8fe1686be9709f34651ee396c1b155df53728e
+SHA1 (patch-ab) = 1aa906424853aeb0d3af6ef19c8c6fb220e40a0b
 SHA1 (patch-ac) = 71cad35978414fc2ce1a339b97d22bdb1e5f2c69
 SHA1 (patch-ad) = 46d15c6ff4ddc236de7d424dee667088dd693062
diff --git a/audio/xanalyser/patches/patch-aa b/audio/xanalyser/patches/patch-aa
index 632ffd3a373..377f4ec7c2a 100644
--- a/audio/xanalyser/patches/patch-aa
+++ b/audio/xanalyser/patches/patch-aa
@@ -1,17 +1,21 @@
-$NetBSD: patch-aa,v 1.3 2005/12/11 20:46:50 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2012/03/01 17:38:56 hans Exp $
 
 --- src/pcm.cc.orig	2005-12-11 20:35:40.000000000 +0000
 +++ src/pcm.cc
-@@ -9,6 +9,8 @@
+@@ -9,6 +9,12 @@
  #include <stdlib.h>
  #ifdef __NetBSD__
  #  include <machine/byte_swap.h>
 +#elif defined(__DragonFly__)
 +#  include <sys/endian.h>
++#elif defined(__sun)
++#  include <sys/byteorder.h>
++#  define bswap_16 BSWAP_16
++#  define bswap_32 BSWAP_32
  #else
  #  include <byteswap.h>
  #endif
-@@ -122,7 +124,7 @@ PCM::swap_buffer (void* buffer, int fram
+@@ -122,7 +128,7 @@ PCM::swap_buffer (void* buffer, int fram
  	case S16: {
  	    int16_t* tmp_buffer = (int16_t*) buffer;
  	    for (int i = n; i != 0; i--) {
@@ -20,7 +24,7 @@ $NetBSD: patch-aa,v 1.3 2005/12/11 20:46:50 joerg Exp $
  		*tmp_buffer = bswap16 (*tmp_buffer);
  #else
  		*tmp_buffer = bswap_16 (*tmp_buffer);
-@@ -134,7 +136,7 @@ PCM::swap_buffer (void* buffer, int fram
+@@ -134,7 +140,7 @@ PCM::swap_buffer (void* buffer, int fram
  	case S32: {
  	    int32_t* tmp_buffer = (int32_t*) buffer;
  	    for (int i = n; i != 0; i--) {
diff --git a/audio/xanalyser/patches/patch-ab b/audio/xanalyser/patches/patch-ab
index d0f2d1d011f..a6a5a700cda 100644
--- a/audio/xanalyser/patches/patch-ab
+++ b/audio/xanalyser/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.6 2005/12/11 20:46:50 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2012/03/01 17:38:56 hans Exp $
 
 --- src/Sample.cc.orig	2005-12-11 20:37:17.000000000 +0000
 +++ src/Sample.cc
-@@ -12,6 +12,8 @@
+@@ -12,6 +12,10 @@
  #include <errno.h>
  #ifdef __NetBSD__
  #  include <machine/endian.h>
 +#elif defined(__DragonFly__)
 +#  include <sys/endian.h>
++#elif defined(__sun)
++#  include <sys/byteorder.h>
  #else
  #  include <endian.h>
  #endif