Fix build on SunOS.

4 files changed, 54 insertions, 7 deletions

diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 994a1edfb18..302c523266d 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2012/02/06 12:39:31 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2012/02/15 23:13:32 hans Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -21,6 +21,7 @@ USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}	# not really needed
 CONFIGURE_ENV+=		ac_cv_path_AUDIOFILE_CONFIG="pkg-config audiofile"
+CONFIGURE_ENV+=		TOOLS_PATH_SH=${TOOLS_PATH.sh}
 PKG_SYSCONFSUBDIR=	WindowMaker
 EGDIR=			${PREFIX}/share/examples/wsoundserver
 CONF_FILES=		${EGDIR:Q}/WMSound ${PKG_SYSCONFDIR:Q}/WMSound
diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo
index b5df6228064..328af655392 100644
--- a/audio/wsoundserver/distinfo
+++ b/audio/wsoundserver/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2011/12/19 13:16:16 wiz Exp $
+$NetBSD: distinfo,v 1.10 2012/02/15 23:13:32 hans Exp $
 
 SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4
 RMD160 (WSoundServer-0.4.0.tar.gz) = ac58045fbe7f2c327b0c87514b06cb0941518b25
 Size (WSoundServer-0.4.0.tar.gz) = 147044 bytes
 SHA1 (patch-aa) = 30414c5c0d6112b02098f4bb901d02b98330919b
 SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982
-SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252
+SHA1 (patch-ad) = 66d2b1d3b7157040cf6f20449c85448ed117f757
 SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea
 SHA1 (patch-af) = c1b88824803ff293bb78c130ab9bb6ae5404a133
-SHA1 (patch-configure) = ce1042164be0198f9c0eee3494eaf550f2f4106b
+SHA1 (patch-configure) = baacdec4650d0792371284a67a557064188f91ed
diff --git a/audio/wsoundserver/patches/patch-ad b/audio/wsoundserver/patches/patch-ad
index 33b12344616..bcf0587f9d8 100644
--- a/audio/wsoundserver/patches/patch-ad
+++ b/audio/wsoundserver/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2012/02/15 23:13:32 hans Exp $
 
 --- wslib/audio_voxware.c.orig	Fri Mar 31 22:14:40 2000
 +++ wslib/audio_voxware.c
-@@ -106,7 +106,7 @@
+@@ -106,7 +106,7 @@ resetAudioDevice(int audiofd)
  {
  	assert(audiofd > 0);
  
@@ -11,3 +11,39 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/12 21:10:25 wiz Exp $
  		perror("SNDCTL_DSP_RESET");
  		SErrorCode = SERR_DEVRESET;
  		return -1;
+@@ -398,7 +398,7 @@ writeAudioData(int audiofd, SAudioFileIn
+ static int
+ write8bitAudioData(int audiofd, SAudioFileInfo *afInfo)
+ {
+-	u_int8_t	*buffer;		/* audio buffer */
++	uint8_t		*buffer;		/* audio buffer */
+ 	long		curFrame;		/* current framecount */
+ 	long		blkFrames;		/* number of frames in current audio block */
+ 	int		blockSize = 8192;	/* Size of an audio block buffer in frames */
+@@ -408,7 +408,7 @@ write8bitAudioData(int audiofd, SAudioFi
+ 	fprintf(stderr, " >> writing data\n");
+ #endif
+ 
+-	buffer = (u_int8_t *) malloc( blockSize * (afInfo->SampleWidth/8) * afInfo->Channels * sizeof(u_int8_t));
++	buffer = (uint8_t *) malloc( blockSize * (afInfo->SampleWidth/8) * afInfo->Channels * sizeof(uint8_t));
+ 	if (!buffer) {
+ 		SErrorCode = SERR_NOMEMORY;
+ 		return -1;
+@@ -498,7 +498,7 @@ write8bitAudioData(int audiofd, SAudioFi
+ static int
+ write16bitAudioData(int audiofd, SAudioFileInfo *afInfo)
+ {
+-	u_int16_t	*buffer;		/* audio buffer */
++	uint16_t	*buffer;		/* audio buffer */
+ 	long		curFrame;		/* current framecount */
+ 	long		blkFrames;		/* number of frames in current audio block */
+ 	int		blockSize = 4096;	/* Size of an audio block buffer in frames */
+@@ -508,7 +508,7 @@ write16bitAudioData(int audiofd, SAudioF
+ 	fprintf(stderr, " >> writing data\n");
+ #endif
+ 
+-	buffer = (u_int16_t *) malloc( blockSize * (afInfo->SampleWidth/8) * afInfo->Channels * sizeof(u_int16_t));
++	buffer = (uint16_t *) malloc( blockSize * (afInfo->SampleWidth/8) * afInfo->Channels * sizeof(uint16_t));
+ 	if (!buffer) {
+ 		SErrorCode = SERR_NOMEMORY;
+ 		return -1;
diff --git a/audio/wsoundserver/patches/patch-configure b/audio/wsoundserver/patches/patch-configure
index a7d44f1dd20..2b283eadcca 100644
--- a/audio/wsoundserver/patches/patch-configure
+++ b/audio/wsoundserver/patches/patch-configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-configure,v 1.1 2011/12/19 13:16:16 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2012/02/15 23:13:32 hans Exp $
 
 Fix configury with libaudiofile-0.3+.
+Fix interpreter in get-wsound-flags.
 
 --- configure.orig	2011-12-19 13:10:25.000000000 +0000
 +++ configure
@@ -19,3 +20,12 @@ Fix configury with libaudiofile-0.3+.
      if test "x$enable_audiofiletest" = "xyes" ; then
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
+@@ -4272,7 +4272,7 @@ test "$no_create" = yes || ${CONFIG_SHEL
+ 
+ 
+ cat <<EOF >get-wsound-flags
+-#!/bin/sh
++#!${TOOLS_PATH_SH}
+ 
+ prefix="$prefix"
+ exec_prefix=\$prefix