Made the package build on SunOS-5.10-sparc-sunpro.

4 files changed, 51 insertions, 7 deletions

diff --git a/audio/amp/PLIST b/audio/amp/PLIST
index 721579428c9..9243443a904 100644
--- a/audio/amp/PLIST
+++ b/audio/amp/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/21 04:02:01 rillig Exp $
 bin/amp
-man/man1/amp.1.gz
+man/man1/amp.1
diff --git a/audio/amp/distinfo b/audio/amp/distinfo
index 52c0bbb0779..d222a2ba907 100644
--- a/audio/amp/distinfo
+++ b/audio/amp/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.6 2005/11/18 14:52:44 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/01/21 04:02:01 rillig Exp $
 
 SHA1 (amp-0.7.6.tgz) = 6c49d027754615677ad398c1eea858536ec804c2
 RMD160 (amp-0.7.6.tgz) = 34053f8a050ff3aafb2e723c283ac2aa0f4e2a67
 Size (amp-0.7.6.tgz) = 100337 bytes
 SHA1 (patch-aa) = 56696e88276b770d24b20076e780bc28798d5f8c
 SHA1 (patch-ab) = ebc50cdbad38f3099c633659ecb47d5b99924bc7
-SHA1 (patch-ac) = 9d63992ce148b978b2a6b5179d97e23154e18833
+SHA1 (patch-ac) = 67b9b1e200e901ef7ee98f0e384b062c7a99886b
 SHA1 (patch-ad) = 2ef2d0b7c5357309c462261e2c669cc39a774add
 SHA1 (patch-ae) = c084fa45bc144c29ed7548ffc609fb964d375ac8
 SHA1 (patch-af) = bba8fafa25e516df77905865a677667a9d48a152
 SHA1 (patch-ag) = 30198a34d1998630c9bea4d7d1242d3e46d099db
+SHA1 (patch-ah) = c0e41494ad4c71be2f8dd63e9fef4d9b1038310f
diff --git a/audio/amp/patches/patch-ac b/audio/amp/patches/patch-ac
index 583d15801ca..2841f9d733c 100644
--- a/audio/amp/patches/patch-ac
+++ b/audio/amp/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2003/03/22 05:44:38 dillo Exp $
+$NetBSD: patch-ac,v 1.6 2007/01/21 04:02:01 rillig Exp $
 
---- audioIO_SunOS.c.orig	Sat May 31 13:47:58 1997
-+++ audioIO_SunOS.c
+--- audioIO_SunOS.c.orig	1997-05-31 19:47:58.000000000 +0200
++++ audioIO_SunOS.c	2007-01-21 04:50:43.135430140 +0100
 @@ -8,7 +8,11 @@
  
  #include "amp.h"
@@ -14,6 +14,15 @@ $NetBSD: patch-ac,v 1.5 2003/03/22 05:44:38 dillo Exp $
  #include <fcntl.h>
  #include <unistd.h>
  #include <stdio.h>
+@@ -18,7 +22,7 @@
+ 
+ /* declare these static to effectively isolate the audio device */
+ 
+-static audio_fd;
++static int audio_fd;
+ static audio_info_t auinfo;
+ 
+ /* audioOpen() */
 @@ -31,13 +35,12 @@ audioOpen(int frequency, int stereo, int
  {
  	int res;
@@ -30,3 +39,21 @@ $NetBSD: patch-ac,v 1.5 2003/03/22 05:44:38 dillo Exp $
  
  	auinfo.play.precision=16;
  	auinfo.play.encoding=AUDIO_ENCODING_LINEAR;
+@@ -70,7 +73,7 @@ audioSetVolume(int volume)
+ /* audioFlush() */
+ /* should flush the audio device */
+ 
+-inline void
++void
+ audioFlush()
+ {
+ 	DB(audio, msg("audio: flush %d\n",audio_fd) );
+@@ -91,7 +94,7 @@ audioClose()
+ /* writes count bytes from buffer to the audio device */
+ /* returns the number of bytes actually written */
+ 
+-int inline
++int
+ audioWrite(char *buffer, int count)
+ {
+ 	return(write(audio_fd,buffer,count));
diff --git a/audio/amp/patches/patch-ah b/audio/amp/patches/patch-ah
new file mode 100644
index 00000000000..b2e6064ecb6
--- /dev/null
+++ b/audio/amp/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2007/01/21 04:02:01 rillig Exp $
+
+sunpro does not like non-static inline functions that refer to static
+variables.
+
+--- buffer.c.orig	1997-08-18 17:54:20.000000000 +0200
++++ buffer.c	2007-01-21 04:44:48.242585932 +0100
+@@ -46,7 +46,7 @@ static int control_fd;
+ /* This is a separate (but inlined) function to make it easier to implement */
+ /* a threaded buffer */
+ 
+-inline void
++static inline void
+ audioBufferWrite(char *buf,int bytes)
+ {
+         write(buffer_fd, buf, bytes);