Fix build on SunOS.

11 files changed, 43 insertions, 16 deletions

diff --git a/audio/mppenc/distinfo b/audio/mppenc/distinfo
index 5768f7088b6..d428899464f 100644
--- a/audio/mppenc/distinfo
+++ b/audio/mppenc/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/01/29 21:04:22 joerg Exp $
+$NetBSD: distinfo,v 1.3 2012/01/11 19:51:26 hans Exp $
 
 SHA1 (mppenc-1.16.tar.bz2) = f7dc898b14e0bd954941c62435a62c23af89cb8a
 RMD160 (mppenc-1.16.tar.bz2) = 6e97bfc246b9db11532a628afba631883687554d
 Size (mppenc-1.16.tar.bz2) = 105569 bytes
 SHA1 (patch-aa) = 4cc88a533db69fbd8c650358e20f261e162d1049
-SHA1 (patch-ab) = 0aa4c32e90f18f2d2321d69942b087330fb50197
+SHA1 (patch-ab) = 2b2d5d6cffb0c6c8490b19dc45bab6d74b88530c
+SHA1 (patch-src_wave__in.c) = 588eb53916fc4ee49b1015d8b44132bbb9841527
diff --git a/audio/mppenc/patches/patch-ab b/audio/mppenc/patches/patch-ab
index 94fe852b2b1..cd71c6f9ca6 100644
--- a/audio/mppenc/patches/patch-ab
+++ b/audio/mppenc/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2007/01/29 21:04:22 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/01/11 19:51:26 hans Exp $
 
 --- src/mppdec.h.orig	2007-01-29 20:36:43.000000000 +0000
 +++ src/mppdec.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2007/01/29 21:04:22 joerg Exp $
  # if   defined __linux__        // the standard is that this file is stored somewhere on the hard disk
  #  include <linux/soundcard.h>
 -# elif defined __bsdi_  ||  defined __FreeBSD__
-+# elif defined __bsdi_  ||  defined __FreeBSD__ || defined(__DragonFly__)
++# elif defined __bsdi_  ||  defined __FreeBSD__ || defined(__DragonFly__) || defined(__sun)
  #  include <sys/soundcard.h>
  # elif defined __NetBSD__  ||  defined __OpenBSD__
  #  include <soundcard.h>
diff --git a/audio/mppenc/patches/patch-src_wave__in.c b/audio/mppenc/patches/patch-src_wave__in.c
new file mode 100644
index 00000000000..adaec7f94b2
--- /dev/null
+++ b/audio/mppenc/patches/patch-src_wave__in.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_wave__in.c,v 1.1 2012/01/11 19:51:26 hans Exp $
+
+--- src/wave_in.c.orig  2006-11-03 22:48:56.000000000 +0100
++++ src/wave_in.c       2012-01-02 12:03:16.188471300 +0100
+@@ -19,6 +19,11 @@
+ 
+ #include "mppenc.h"
+ 
++#ifdef __sun
++#define SOUND_PCM_WRITE_CHANNELS	SNDCTL_DSP_CHANNELS
++#define SOUND_PCM_WRITE_BITS		SNDCTL_DSP_SETFMT
++#define SOUND_PCM_WRITE_RATE		SNDCTL_DSP_SPEED
++#endif
+ 
+ static int
+ init_in ( const int  SampleCount,
+
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index e655807e586..eb6ecd3a515 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2011/08/23 13:06:46 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/01/11 19:55:55 hans Exp $
 
 DISTNAME=	mt-daapd-0.2.4.2
 PKGREVISION=	2
@@ -18,6 +18,8 @@ GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
+CPPFLAGS.SunOS+=	-std=c99 -Du_int32_t=uint32_t
+
 RCD_SCRIPTS=	mtdaapd
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 MTDAAPD_USER?=	mtdaapd
diff --git a/audio/mt-daapd/distinfo b/audio/mt-daapd/distinfo
index 1b121946b05..ceea8597d4c 100644
--- a/audio/mt-daapd/distinfo
+++ b/audio/mt-daapd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/11/23 22:57:05 tron Exp $
+$NetBSD: distinfo,v 1.6 2012/01/11 19:55:55 hans Exp $
 
 SHA1 (mt-daapd-0.2.4.2.tar.gz) = 5f1c04100b1d18a9cf6f03f879b5c3e9a7bd172f
 RMD160 (mt-daapd-0.2.4.2.tar.gz) = 918b76ffe3af7b0413be1cbbafdd11274f5d3e9d
 Size (mt-daapd-0.2.4.2.tar.gz) = 436513 bytes
 SHA1 (patch-aa) = e177bb33c19badb1da8638af61a3c3bfddf2a2ad
-SHA1 (patch-ab) = be78b7f5089d3283e0cb9ee3c64a4a53360899d7
+SHA1 (patch-ab) = 33eb0e43fbef31ede52660af24350ca0ac52e434
 SHA1 (patch-ac) = 363a0a2ec43b7fcc8fbff75ce13885cf9969e0a4
 SHA1 (patch-ad) = ec48904eaf6cb77448f04cfe5022411b8bda9ae1
diff --git a/audio/mt-daapd/patches/patch-ab b/audio/mt-daapd/patches/patch-ab
index 15264da6234..8aaade9f7d4 100644
--- a/audio/mt-daapd/patches/patch-ab
+++ b/audio/mt-daapd/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2006/12/06 16:41:26 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/01/11 19:55:56 hans Exp $
 
 --- src/mp3-scanner.c.orig	2006-12-06 16:35:37.000000000 +0000
 +++ src/mp3-scanner.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2006/12/06 16:41:26 joerg Exp $
  int scan_path(char *path) {
      DIR *current_dir;
 -    char de[sizeof(struct dirent) + MAXNAMLEN + 1]; /* overcommit for solaris */
-+    char de[sizeof(struct dirent) + NAME_MAX + 1]; /* overcommit for solaris */
++    char de[sizeof(struct dirent) + FILENAME_MAX + 1]; /* overcommit for solaris */
      struct dirent *pde;
      int err;
      char mp3_path[PATH_MAX];
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 567c9533c04..dd271f3c897 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2011/12/17 10:14:48 sbd Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/11 19:59:35 hans Exp $
 #
 
 DISTNAME=	MuSE-0.9
@@ -27,6 +27,8 @@ LIBS+=			${LIBOSSAUDIO}
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 MAKE_FLAGS+=		docsdir=${PREFIX:Q}/share/doc/MuSE
 
+LIBS.SunOS+=		-lsocket -lnsl
+
 SUBST_CLASSES+=		dsp
 SUBST_STAGE.dsp=	post-patch
 SUBST_FILES.dsp=	src/jmixer.cpp src/libmpeg/fileplayer.cc
diff --git a/audio/muse/distinfo b/audio/muse/distinfo
index 13d77c8f20a..077931f7454 100644
--- a/audio/muse/distinfo
+++ b/audio/muse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/11/22 20:50:53 wiz Exp $
+$NetBSD: distinfo,v 1.12 2012/01/11 19:59:35 hans Exp $
 
 SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
 RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 5020bece9b44c5006efe0c90b23f3c54f9313b57
 SHA1 (patch-ab) = e283bc69d90c330ecc2b06ebed70b574ef0f31c5
 SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
 SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
-SHA1 (patch-ae) = 54d5cd059c72ecd2b60d1ac188540c29343322f7
+SHA1 (patch-ae) = 7b176763091b03671ec7455ecea11fb5d31536c6
 SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
 SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
 SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa
diff --git a/audio/muse/patches/patch-ae b/audio/muse/patches/patch-ae
index 98f6216eeb5..6c09217f365 100644
--- a/audio/muse/patches/patch-ae
+++ b/audio/muse/patches/patch-ae
@@ -1,10 +1,11 @@
-$NetBSD: patch-ae,v 1.2 2010/02/01 01:25:29 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2012/01/11 19:59:36 hans Exp $
 
 --- po/Makefile.orig	2004-04-14 17:52:44.000000000 -0500
 +++ po/Makefile
 @@ -1,5 +1,5 @@
- INSTALL= /usr/bin/install -c
+-INSTALL= /usr/bin/install -c
 -INSTALLNLSDIR=$(BASEDIR)/usr/local/share/locale
++INSTALL= install -c
 +INSTALLNLSDIR=$(DESTDIR)${PREFIX}/${PKGLOCALEDIR}/locale
  
  PACKAGE = muse
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 7a5f3ceb1c8..e9f1cbca176 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2011/11/16 01:33:19 sbd Exp $
+# $NetBSD: Makefile,v 1.54 2012/01/11 20:02:57 hans Exp $
 
 DISTNAME=		mpd-0.16.2
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
@@ -22,6 +22,8 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
 
+CPPFLAGS.SunOS+=	-std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+
 .include "options.mk"
 
 EGDIR=			${PREFIX}/share/examples/mpd
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index d17dd386142..22fe0aebc56 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/08/22 13:36:31 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/01/11 20:03:44 hans Exp $
 
 DISTNAME=	openal-0.0.8
 PKGREVISION=	5
@@ -23,6 +23,8 @@ INSTALLATION_DIRS=	${PKGINFODIR} include/AL
 PKGCONFIG_OVERRIDE=	admin/pkgconfig/openal.pc.in
 LIBS+=			${LIBOSSAUDIO}
 
+CPPFLAGS.SunOS+=	-D__EXTENSIONS__
+
 SUBST_CLASSES+=		fixdev
 SUBST_STAGE.fixdev=	post-configure
 SUBST_FILES.fixdev=	src/backends/alc_backend_bsd.c