Update xsidplay to 1.3.8. Provided in pr 7911 by Antti Kantee.

9 files changed, 13 insertions, 168 deletions

diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 39dafa18806..ea52dd9a81c 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.3 1999/07/04 14:42:39 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/07/08 07:35:25 frueauf Exp $
 #
 
-DISTNAME=	xsidplay-1_3_5
-PKGNAME=	xsidplay-1.3.5
-WRKSRC=		${WRKDIR}/xsidplay-1.3.5
+DISTNAME=	xsidplay-1_3_8
+PKGNAME=	xsidplay-1.3.8
+WRKSRC=		${WRKDIR}/xsidplay-1.3.8
 CATEGORIES=	audio x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	_tar.gz
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	pooka@iki.fi
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
 
-DEPENDS+=	sidplay-1.36.35:../../audio/sidplay
-DEPENDS+=	qt-1.44:../../x11/qt
+DEPENDS=	sidplay-1.36.35:../../audio/sidplay \
+		qt-1.44:../../x11/qt
 
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/xsidplay/files/md5 b/audio/xsidplay/files/md5
index 37eb2523afb..035210eaad0 100644
--- a/audio/xsidplay/files/md5
+++ b/audio/xsidplay/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/05/12 08:05:36 frueauf Exp $
+$NetBSD: md5,v 1.2 1999/07/08 07:35:26 frueauf Exp $
 
-MD5 (xsidplay-1_3_5.tgz) = b26aee06cd2003f8e6c1c7524cf55e46
+MD5 (xsidplay-1_3_8_tar.gz) = 9b22b10115323f87fd208a798b5252f1
diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa
deleted file mode 100644
index ba2e97984cd..00000000000
--- a/audio/xsidplay/patches/patch-aa
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/12 08:05:36 frueauf Exp $
-
---- configure.orig	Sat Apr 10 12:43:55 1999
-+++ configure	Sat Apr 10 12:45:13 1999
-@@ -9,9 +9,7 @@
- 
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
--# Any additions from configure.in:
--ac_default_prefix=/usr
-+ac_default_prefix=${PREFIX}
- ac_help="$ac_help
-   --with-sidplay-includes=DIR
-                           where the sidplay includes are located"
-@@ -1533,6 +1531,42 @@
- else
-   echo "$ac_t""no" 1>&6
- fi
-+
-+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-+echo "configure:1446: 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 1454 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+main()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
-  
- echo $ac_n "checking for main in -liostream""... $ac_c" 1>&6
- echo "configure:1539: checking for main in -liostream" >&5
-@@ -1827,6 +1861,10 @@
-     $CP src/audio/linux/* src
-     echo "$ac_t""freebsd" 1>&6
-        ;;
-+  *netbsd*) ac_have_audio_driver=yes
-+    $CP src/audio/linux/* src
-+    echo "$ac_t""linux" 1>&6
-+       ;;
-   *solaris*) ac_have_audio_driver=yes
-     $CP src/audio/sparc/* src
-     echo "$ac_t""sparc" 1>&6
-@@ -2017,6 +2055,7 @@
- s%@QT_LDFLAGS@%$QT_LDFLAGS%g
- s%@MOC@%$MOC%g
- s%@LIBM@%$LIBM%g
-+s%@LIBAUDIO@%$LIBAUDIO%g
- s%@LIBIOS@%$LIBIOS%g
- s%@MAKE@%$MAKE%g
- s%@MAKE2@%$MAKE2%g
diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab
deleted file mode 100644
index ed9d4e6de58..00000000000
--- a/audio/xsidplay/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/05/12 08:05:36 frueauf Exp $
-
---- configure.in.orig	Sat Apr 10 10:50:45 1999
-+++ configure.in	Sat Apr 10 11:10:30 1999
-@@ -2,7 +2,7 @@
- VERSION=1.3.5
- dnl AC_CONFIG_HEADER(src/config.h)
- AC_CANONICAL_SYSTEM
--AC_PREFIX_DEFAULT(/usr)
-+AC_PREFIX_DEFAULT(${PREFIX})
- 
- AC_PROG_CXX
- AC_LANG_CPLUSPLUS
-@@ -23,6 +23,8 @@
- 
- AC_CHECK_LIB(m,main,[LIBM=-lm],) dnl For FreeBSD and some others.
- AC_SUBST(LIBM)
-+AC_CHECK_LIB(ossaudio,main,[LIBAUDIO=-lossaudio],) dnl For NetBSD.
-+AC_SUBST(LIBAUDIO)
- AC_CHECK_LIB(iostream,main,[LIBIOS=-liostream],) dnl For old systems.
- AC_SUBST(LIBIOS)
- 
-@@ -56,6 +58,10 @@
-   *freebsd*) ac_have_audio_driver=yes
-     $CP src/audio/linux/* src
-     AC_MSG_RESULT(freebsd)
-+       ;;
-+  *netbsd*) ac_have_audio_driver=yes
-+    $CP src/audio/linux/* src
-+    AC_MSG_RESULT(linux)
-        ;;
-   *solaris*) ac_have_audio_driver=yes
-     $CP src/audio/sparc/* src
diff --git a/audio/xsidplay/patches/patch-ac b/audio/xsidplay/patches/patch-ac
deleted file mode 100644
index 49b8d294472..00000000000
--- a/audio/xsidplay/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/05/12 08:05:36 frueauf Exp $
-
---- src/Makefile.in.orig	Sat Apr 10 11:42:39 1999
-+++ src/Makefile.in	Sat Apr 10 11:42:54 1999
-@@ -29,7 +29,7 @@
- INCLUDES			= -I$(SRCDIR) $(QT_INCLUDES) $(X_INCLUDES) $(SIDPLAY_INCLUDES)
- LIBM				= @LIBM@
- LIBIOS				= @LIBIOS@
--LIBS				= @LIBS@ -lqt -lX11 -lsidplay $(LIBM) $(LIBIOS)
-+LIBS				= @LIBS@ -lqt -lX11 -lsidplay $(LIBM) $(LIBIOS) @LIBAUDIO@
- 
- # Part of Qt.
- MOC					= @MOC@
diff --git a/audio/xsidplay/patches/patch-ad b/audio/xsidplay/patches/patch-ad
deleted file mode 100644
index 7327f0e957b..00000000000
--- a/audio/xsidplay/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/05/12 08:05:36 frueauf Exp $
-
---- src/audio/linux/AudioDriver.h.orig	Sat Apr 10 12:02:43 1999
-+++ src/audio/linux/AudioDriver.h	Sat Apr 10 12:03:29 1999
-@@ -13,8 +13,10 @@
- #include <sidplay/compconf.h>
- #if defined(HAVE_LINUX) && defined(HAVE_LINUX_SOUNDCARD_H)
-   #include <linux/soundcard.h>
--#elif defined(HAVE_FREEBSD) && defined((HAVE_MACHINE_SOUNDCARD_H)
-+#elif defined(HAVE_FREEBSD) && defined(HAVE_MACHINE_SOUNDCARD_H)
-   #include <machine/soundcard.h>
-+#elif defined(HAVE_NETBSD) && defined(HAVE_SOUNDCARD_H)
-+  #include <soundcard.h>
- #else
-   #error Audio driver not supported.
- #endif
diff --git a/audio/xsidplay/patches/patch-ae b/audio/xsidplay/patches/patch-ae
deleted file mode 100644
index a1695c09337..00000000000
--- a/audio/xsidplay/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/05/12 08:05:36 frueauf Exp $
-
---- src/audio/linux/AudioDriver.cpp.orig	Sat Apr 10 13:28:53 1999
-+++ src/audio/linux/AudioDriver.cpp	Sat Apr 10 13:29:58 1999
-@@ -4,7 +4,11 @@
- 
- #include "AudioDriver.h"
- 
-+#if defined(HAVE_NETBSD)
-+const char AudioDriver::AUDIODEVICE[] = "/dev/audio";
-+#else
- const char AudioDriver::AUDIODEVICE[] = "/dev/dsp";
-+#endif
- 
- AudioDriver::AudioDriver()
- {
diff --git a/audio/xsidplay/pkg/COMMENT b/audio/xsidplay/pkg/COMMENT
index ba03f2ac208..1930898e059 100644
--- a/audio/xsidplay/pkg/COMMENT
+++ b/audio/xsidplay/pkg/COMMENT
@@ -1 +1 @@
-a sidplay x11 frontend.
+a Commdore 64 music player and SID chip emulator for X11.
diff --git a/audio/xsidplay/pkg/DESCR b/audio/xsidplay/pkg/DESCR
index dc0e3495277..0fc5ef8f3f1 100644
--- a/audio/xsidplay/pkg/DESCR
+++ b/audio/xsidplay/pkg/DESCR
@@ -1,2 +1,2 @@
-XSidplay is a graphical frontend to the sidplay sidtune player. Uses
-the Qt library.
+xsidplay is a Commodore 64 music player and SID chip emulator for X11. It
+uses the qt library.