update to sidplay 1.0.9, makes the package compile again

changes:
Not much, basically bugfixes and re-adding of NetBSD audio support
to the mainline.

5 files changed, 6 insertions, 122 deletions

diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index b5a33d9e96b..e4b352f2e6a 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/08/31 04:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/23 18:39:30 pooka Exp $
 #
 
-DISTNAME=	sidplay-base-1.0.4
-PKGNAME=	sidplay-1.0.4
+DISTNAME=	sidplay-base-1.0.9
+PKGNAME=	sidplay-1.0.9
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/sidplay/distinfo b/audio/sidplay/distinfo
index 1ee745bafe2..425ebb9020e 100644
--- a/audio/sidplay/distinfo
+++ b/audio/sidplay/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/12/25 00:09:58 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/11/23 18:39:30 pooka Exp $
 
-SHA1 (sidplay-base-1.0.4.tgz) = 7d7940b0f1d65c8f2b0409241ea07abdf588ad68
-Size (sidplay-base-1.0.4.tgz) = 118157 bytes
-SHA1 (patch-aa) = 94c7d664615845d76f161e07f514b914949d73d4
-SHA1 (patch-ab) = 70669b794d225a3179ac7e78f7858579c6b3e7d8
-SHA1 (patch-ac) = 46616852bc2f5d8d1fe0326d25249608026fb53b
+SHA1 (sidplay-base-1.0.9.tgz) = 0a159a9710fd82c942fe011a0d2ac70fb01be29c
+Size (sidplay-base-1.0.9.tgz) = 71969 bytes
diff --git a/audio/sidplay/patches/patch-aa b/audio/sidplay/patches/patch-aa
deleted file mode 100644
index a3b2a5dcd73..00000000000
--- a/audio/sidplay/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/06/26 18:16:43 jlam Exp $
-
---- Makefile.in.orig	Wed May 31 21:52:44 2000
-+++ Makefile.in	Tue Jun 20 00:23:09 2000
-@@ -61,6 +61,7 @@
- host_triplet = @host@
- CP = @CP@
- CXX = @CXX@
-+LIBAUDIO = @LIBAUDIO@
- MAKEINFO = @MAKEINFO@
- PACKAGE = @PACKAGE@
- SIDPLAY_INCLUDES = @SIDPLAY_INCLUDES@
-@@ -80,13 +81,13 @@
- bin_PROGRAMS = sidplay sid2wav sidcon
- 
- sidplay_SOURCES = sidplay.cpp
--sidplay_LDADD = audiodrv.o @SIDPLAY_LDFLAGS@ -lsidplay
-+sidplay_LDADD = audiodrv.o @SIDPLAY_LDFLAGS@ -lsidplay @LIBAUDIO@
- 
- sid2wav_SOURCES = sid2wav.cpp
--sid2wav_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay
-+sid2wav_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay @LIBAUDIO@
- 
- sidcon_SOURCES = sidcon.cpp
--sidcon_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay
-+sidcon_LDADD = @SIDPLAY_LDFLAGS@ -lsidplay @LIBAUDIO@
- 
- INCLUDES = @SIDPLAY_INCLUDES@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/audio/sidplay/patches/patch-ab b/audio/sidplay/patches/patch-ab
deleted file mode 100644
index 4290402061a..00000000000
--- a/audio/sidplay/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2000/06/20 21:12:10 pooka Exp $
-
---- configure.orig	Wed May 31 21:52:45 2000
-+++ configure	Tue Jun 20 00:20:27 2000
-@@ -1411,10 +1411,48 @@
- done
- 
- 
-+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-+echo "configure:1416: checking for main in -lossaudio" >&5
-+ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lossaudio  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1424 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+main()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  LIBAUDIO=-lossaudio
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+
- # Extract the first word of "cp", so it can be a program name with args.
- set dummy cp; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1418: checking for $ac_word" >&5
-+echo "configure:1456: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1449,7 +1487,7 @@
- 
- 
- echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
--echo "configure:1453: checking which audio driver to install" >&5
-+echo "configure:1491: checking which audio driver to install" >&5
- case "$host" in 
-   *linux*) cat >> confdefs.h <<\EOF
- #define HAVE_LINUX 1
-@@ -1669,6 +1707,7 @@
- s%@SIDPLAY_LDFLAGS@%$SIDPLAY_LDFLAGS%g
- s%@SIDPLAY_INCLUDES@%$SIDPLAY_INCLUDES%g
- s%@CXXCPP@%$CXXCPP%g
-+s%@LIBAUDIO@%$LIBAUDIO%g
- s%@CP@%$CP%g
- 
- CEOF
diff --git a/audio/sidplay/patches/patch-ac b/audio/sidplay/patches/patch-ac
deleted file mode 100644
index dd3c38f75b3..00000000000
--- a/audio/sidplay/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2001/12/25 00:09:59 mycroft Exp $
-
---- audio/oss/audiodrv.cpp.orig	Tue Dec 25 00:04:41 2001
-+++ audio/oss/audiodrv.cpp	Tue Dec 25 00:06:01 2001
-@@ -5,7 +5,7 @@
- #include "audiodrv.h"
- 
- #if defined(HAVE_NETBSD)
--const char audioDriver::AUDIODEVICE[] = "/dev/audio";
-+const char audioDriver::AUDIODEVICE[] = "/dev/sound";
- #else
- const char audioDriver::AUDIODEVICE[] = "/dev/dsp";
- #endif