From 06fd32cdc1ff3fd300c3c3e2e54782fab6bb6fcf Mon Sep 17 00:00:00 2001 From: frueauf Date: Mon, 10 May 1999 11:26:11 +0000 Subject: Update sidplay to 1.36.34, provided in pr 7325 by Antti Kantee. --- audio/sidplay/Makefile | 8 ++++---- audio/sidplay/files/md5 | 4 ++-- audio/sidplay/patches/patch-aa | 26 +++----------------------- audio/sidplay/patches/patch-ab | 34 +++++----------------------------- audio/sidplay/patches/patch-ac | 29 +++++++++++------------------ audio/sidplay/patches/patch-ad | 16 ---------------- audio/sidplay/patches/patch-ae | 13 ------------- audio/sidplay/patches/patch-af | 13 ------------- audio/sidplay/pkg/COMMENT | 2 +- 9 files changed, 26 insertions(+), 119 deletions(-) delete mode 100644 audio/sidplay/patches/patch-ad delete mode 100644 audio/sidplay/patches/patch-ae delete mode 100644 audio/sidplay/patches/patch-af (limited to 'audio/sidplay') diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile index dcef50a2503..c5b5eca6671 100644 --- a/audio/sidplay/Makefile +++ b/audio/sidplay/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/02/09 13:09:55 frueauf Exp $ +# $NetBSD: Makefile,v 1.2 1999/05/10 11:26:11 frueauf Exp $ # -DISTNAME= sidplay-1_36_32 -PKGNAME= sidplay-1.36.32 -WRKSRC= ${WRKDIR}/sidplay-1.36.32 +DISTNAME= sidplay-1_36_34 +PKGNAME= sidplay-1.36.34 +WRKSRC= ${WRKDIR}/sidplay-1.36.34 CATEGORIES= audio MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ EXTRACT_SUFX= .tgz diff --git a/audio/sidplay/files/md5 b/audio/sidplay/files/md5 index d24c0dddb65..cd84fc014dd 100644 --- a/audio/sidplay/files/md5 +++ b/audio/sidplay/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/02/09 13:09:55 frueauf Exp $ +$NetBSD: md5,v 1.2 1999/05/10 11:26:11 frueauf Exp $ -MD5 (sidplay-1_36_32.tgz) = 31dd86fca0742d02cdb5e69ec12314a7 +MD5 (sidplay-1_36_34.tgz) = 7cc3356abb9a22ad4af7e1c524495587 diff --git a/audio/sidplay/patches/patch-aa b/audio/sidplay/patches/patch-aa index 0b27a8260ad..7d4cc29e895 100644 --- a/audio/sidplay/patches/patch-aa +++ b/audio/sidplay/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $ +$NetBSD: patch-aa,v 1.2 1999/05/10 11:26:11 frueauf Exp $ ---- configure.in.orig Tue Sep 15 01:17:27 1998 -+++ configure.in Sun Jan 31 12:45:24 1999 +--- configure.in.orig Mon Apr 5 14:20:03 1999 ++++ configure.in Mon Apr 5 14:20:50 1999 @@ -1,7 +1,7 @@ AC_INIT(libsidplay/sidtune.cpp) AC_CONFIG_HEADER(libsidplay/include/config.h) @@ -11,23 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $ AC_PROG_CXX AC_LANG_CPLUSPLUS -@@ -38,7 +38,7 @@ - AC_CHECK_HEADERS(limits.h) - AC_CHECK_HEADERS(strstream.h strstrea.h fstream.h iostream.h iomanip.h) - AC_CHECK_HEADERS(sys/ioctl.h linux/soundcard.h machine/soundcard.h \ -- sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \ -+ soundcard.h sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \ - audio.h dmedia/audio.h) - - AC_CHECK_LIB(m,main,[LIBM=-lm],) dnl For FreeBSD. -@@ -91,6 +91,10 @@ - *sunos*) AC_DEFINE(HAVE_SUNOS,1) - $CP console/audio/sparc/* console - AC_MSG_RESULT(sparc) -+ ;; -+ *netbsd*) AC_DEFINE(HAVE_NETBSD,1) -+ $CP console/audio/linux/* console -+ AC_MSG_RESULT(linux) - ;; - esac - diff --git a/audio/sidplay/patches/patch-ab b/audio/sidplay/patches/patch-ab index 970a7342fc1..88a5f421ea0 100644 --- a/audio/sidplay/patches/patch-ab +++ b/audio/sidplay/patches/patch-ab @@ -1,39 +1,15 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $ +$NetBSD: patch-ab,v 1.2 1999/05/10 11:26:11 frueauf Exp $ ---- configure.orig Tue Sep 15 01:19:16 1998 -+++ configure Sun Jan 31 12:45:05 1999 -@@ -9,9 +9,9 @@ +--- configure.orig Mon Apr 5 14:21:38 1999 ++++ configure Mon Apr 5 14:22:46 1999 +@@ -9,9 +9,7 @@ # Defaults: ac_help= -ac_default_prefix=/usr/local -+ac_default_prefix=${PREFIX} - # Any additions from configure.in: +-# Any additions from configure.in: -ac_default_prefix=/usr +ac_default_prefix=${PREFIX} # Initialize some variables set by options. # The variables have the same names as the options, with -@@ -1363,7 +1363,7 @@ - done - - for ac_hdr in sys/ioctl.h linux/soundcard.h machine/soundcard.h \ -- sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \ -+ soundcard.h sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \ - audio.h dmedia/audio.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -@@ -1826,6 +1826,13 @@ - - $CP console/audio/sparc/* console - echo "$ac_t""sparc" 1>&6 -+ ;; -+ *netbsd*) cat >> confdefs.h <<\EOF -+#define HAVE_NETBSD 1 -+EOF -+ -+ $CP console/audio/linux/* console -+ echo "$ac_t""linux" 1>&6 - ;; - esac - diff --git a/audio/sidplay/patches/patch-ac b/audio/sidplay/patches/patch-ac index 885a1a7f425..9f3a3579810 100644 --- a/audio/sidplay/patches/patch-ac +++ b/audio/sidplay/patches/patch-ac @@ -1,22 +1,15 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $ +$NetBSD: patch-ac,v 1.2 1999/05/10 11:26:11 frueauf Exp $ ---- ./libsidplay/include/config.h.in.orig Thu Jul 2 21:45:06 1998 -+++ ./libsidplay/include/config.h.in Sun Jan 31 12:47:40 1999 -@@ -21,6 +21,7 @@ - #undef HAVE_MSDOS - #undef HAVE_BEOS - #undef HAVE_RISCOS -+#undef HAVE_NETBSD +--- console/Makefile.in.orig Mon Nov 30 17:08:02 1998 ++++ console/Makefile.in Mon Apr 5 14:08:28 1999 +@@ -24,8 +24,8 @@ - /* Define the file/path separator(s) that your filesystem uses: - FS_IS_COLON_AND_BACKSLASH, FS_IS_COLON_AND_SLASH, FS_IS_BACKSLASH, -@@ -79,6 +80,9 @@ + LIBM = @LIBM@ + LIBIOS = @LIBIOS@ +-SIDLIB = -L$(TOPDIR)/libsidplay -lsidplay +-LIBS = @LIBS@ $(LIBM) $(LIBIOS) $(SIDLIB) ++SIDLIB = -L$(TOPDIR)/libsidplay -lsidplay ++LIBS = @LIBS@ $(LIBM) $(LIBIOS) $(SIDLIB) @LIBAUDIO@ - /* Define if you have the header file. */ - #undef HAVE_MACHINE_SOUNDCARD_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SOUNDCARD_H + #-------------------------------------------------------------- - /* Define if you have the header file. */ - #undef HAVE_SUN_AUDIOIO_H diff --git a/audio/sidplay/patches/patch-ad b/audio/sidplay/patches/patch-ad deleted file mode 100644 index ce416f0c5aa..00000000000 --- a/audio/sidplay/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $ - ---- ./console/audio/linux/audiodrv.h.orig Mon Oct 5 19:20:27 1998 -+++ ./console/audio/linux/audiodrv.h Sun Jan 31 11:21:24 1999 -@@ -16,8 +16,10 @@ - - #if defined(HAVE_LINUX) && defined(HAVE_LINUX_SOUNDCARD_H) - #include --#elif defined(HAVE_FREEBSD) && defined((HAVE_MACHINE_SOUNDCARD_H) -+#elif defined(HAVE_FREEBSD) && defined(HAVE_MACHINE_SOUNDCARD_H) - #include -+#elif defined(HAVE_NETBSD) && defined(HAVE_SOUNDCARD_H) -+ #include - #else - #error Audio driver not supported. - #endif diff --git a/audio/sidplay/patches/patch-ae b/audio/sidplay/patches/patch-ae deleted file mode 100644 index 81e61856938..00000000000 --- a/audio/sidplay/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/02/09 13:09:56 frueauf Exp $ - ---- ./console/Makefile.in.orig Sat May 23 02:30:46 1998 -+++ ./console/Makefile.in Sun Jan 31 11:33:05 1999 -@@ -24,7 +24,7 @@ - DEFS = @DEFS@ - INCLUDES = -I$(SRCDIR) -I$(TOPDIR)/libsidplay/include - --LIBM = @LIBM@ -+LIBM = @LIBM@ -lossaudio - LIBIOS = @LIBIOS@ - SIDLIB = -L$(TOPDIR)/libsidplay -lsidplay - LIBS = @LIBS@ $(LIBM) $(LIBIOS) $(SIDLIB) diff --git a/audio/sidplay/patches/patch-af b/audio/sidplay/patches/patch-af deleted file mode 100644 index 8e7eb1510d4..00000000000 --- a/audio/sidplay/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.2 1999/02/09 13:34:10 frueauf Exp $ - ---- console/audio/linux/audiodrv.cpp-orig Mon Oct 5 18:20:27 1998 -+++ console/audio/linux/audiodrv.cpp Tue Feb 9 14:27:18 1999 -@@ -7,7 +7,7 @@ - - #include "audiodrv.h" - --const char audioDriver::AUDIODEVICE[] = "/dev/dsp"; -+const char audioDriver::AUDIODEVICE[] = "/dev/audio"; - - audioDriver::audioDriver() - { diff --git a/audio/sidplay/pkg/COMMENT b/audio/sidplay/pkg/COMMENT index 285a87ba4df..75b7a956856 100644 --- a/audio/sidplay/pkg/COMMENT +++ b/audio/sidplay/pkg/COMMENT @@ -1 +1 @@ -some tools for playing sidtunes. +tools for playing sidtunes. -- cgit v1.2.3