Update to libmikmod 3.1.10. Numerous bug fixes across the board; output is

noticably better.
Tested with all the pkgs that use it: mikmod, xmms, xpuyopuyo, xscorch.

5 files changed, 23 insertions, 81 deletions

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 7868ff398d5..9697c896b6f 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2002/02/18 15:14:02 seb Exp $
+# $NetBSD: Makefile,v 1.16 2002/07/13 01:03:35 mycroft Exp $
 
-DISTNAME=		libmikmod-3.1.9
+DISTNAME=		libmikmod-3.1.10
 CATEGORIES=		audio
 MASTER_SITES=		http://www.mikmod.org/files/libmikmod/
 
diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST
index f956e942b24..16604d22d4f 100644
--- a/audio/libmikmod/PLIST
+++ b/audio/libmikmod/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/13 01:03:35 mycroft Exp $
 bin/libmikmod-config
 include/mikmod.h
 @unexec ${INSTALL_INFO} --delete %D/info/mikmod.info %D/info/dir
@@ -8,6 +8,6 @@ lib/libmikmod.a
 lib/libmikmod.la
 lib/libmikmod.so
 lib/libmikmod.so.2
-lib/libmikmod.so.2.2
+lib/libmikmod.so.2.4
 man/man1/libmikmod-config.1
 share/aclocal/libmikmod.m4
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index dc015b1c952..1abe16f843e 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/06/19 16:00:05 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/07/13 01:03:35 mycroft Exp $
 
-SHA1 (libmikmod-3.1.9.tar.gz) = 1ecc623770f6cf8131a5cc68522acb027db6680b
-Size (libmikmod-3.1.9.tar.gz) = 513042 bytes
+SHA1 (libmikmod-3.1.10.tar.gz) = 8d4daec66b17e556e8977cb077c4186111808e0d
+Size (libmikmod-3.1.10.tar.gz) = 528929 bytes
 SHA1 (patch-aa) = bfff6a9a77238e159e039bfa7d3f590bce8c9c9c
 SHA1 (patch-ab) = afda9a7d29e70e42c037163ac5b2d2742c77daab
-SHA1 (patch-ac) = 19d7896c66818def7957e6fdfed44d3535aabc4a
-SHA1 (patch-ad) = fc5ac261ccf7ccd42ce49a30956f862e37d58723
+SHA1 (patch-ac) = 6815dda12e1534cbbca7a24e43e3724390d95d6e
+SHA1 (patch-ad) = 6b5df049ef7ea3c8a527de59361a17a5b64829d6
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index 4119f50ca4c..b88db973800 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2001/06/19 16:00:06 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2002/07/13 01:03:35 mycroft Exp $
 
---- configure.orig	Mon Feb 14 15:20:17 2000
-+++ configure
-@@ -1862,6 +1862,7 @@
+--- configure.orig	Tue Jan 22 01:21:19 2002
++++ configure	Thu Jul 11 02:05:35 2002
+@@ -1865,6 +1865,7 @@
  fi
  
  
@@ -10,15 +10,15 @@ $NetBSD: patch-ac,v 1.4 2001/06/19 16:00:06 jlam Exp $
  # Check if makeinfo support html output. If it doesn't, pretend it's missing
  # rather than failing rebuilding the documentation.
  echo $ac_n "checking if makeinfo supports html output""... $ac_c" 1>&6
-@@ -1882,6 +1883,7 @@
- then
- 	MAKEINFO="$missing_dir/missing makeinfo"
+@@ -1887,6 +1888,7 @@
+ else
+ 	MAKEINFO="$MAKEINFO --no-split"
  fi
 +fi
  
  # ====================
  # Check for libraries.
-@@ -2447,7 +2449,7 @@
+@@ -2667,7 +2669,7 @@
  if eval "test \"`echo '$''{'libmikmod_cv_esd_needs_alsa'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
diff --git a/audio/libmikmod/patches/patch-ad b/audio/libmikmod/patches/patch-ad
index b7301959636..a26023f7b11 100644
--- a/audio/libmikmod/patches/patch-ad
+++ b/audio/libmikmod/patches/patch-ad
@@ -1,74 +1,16 @@
-$NetBSD: patch-ad,v 1.4 2001/03/31 03:03:09 mycroft Exp $
+$NetBSD: patch-ad,v 1.5 2002/07/13 01:03:35 mycroft Exp $
 
---- drivers/drv_sun.c.orig	Mon Feb 14 22:10:21 2000
-+++ drivers/drv_sun.c	Sat Mar 31 03:01:36 2001
-@@ -61,7 +61,7 @@
- #include <sys/audioio.h>
- #endif
- 
--#define DEFAULT_FRAGSIZE 12
-+#define DEFAULT_FRAGSIZE 13
- 
- #if !defined __NetBSD__  && !defined __OpenBSD__
- #ifdef HAVE_SUN_AUDIOIO_H
-@@ -72,26 +72,12 @@
+--- drivers/drv_sun.c.orig	Sun Jan 13 00:58:57 2002
++++ drivers/drv_sun.c	Thu Jul 11 02:12:04 2002
+@@ -79,9 +79,9 @@
  #endif
  
  /* Sound device to open */
 -#ifdef SUNOS4
 +#ifndef SOLARIS /* SunOS, NetBSD */
  #define SOUNDDEVICE "/dev/sound"
- #else /* Solaris, *BSD */
+-#else /* Solaris, *BSD */
++#else /* Solaris */
  #define SOUNDDEVICE "/dev/audio"
  #endif
  
--/* Compatibility defines, for old *BSD or SunOS systems */
--#ifndef AUDIO_ENCODING_PCM16
--#define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR
--#endif
--#ifndef AUDIO_ENCODING_PCM8
--#define AUDIO_ENCODING_PCM8 AUDIO_ENCODING_LINEAR8
--#endif
--#ifndef AUDIO_ENCODING_SLINEAR_LE
--#define AUDIO_ENCODING_SLINEAR_LE AUDIO_ENCODING_PCM16
--#endif
--#ifndef AUDIO_ENCODING_ULINEAR_LE
--#define AUDIO_ENCODING_ULINEAR_LE AUDIO_ENCODING_PCM8
--#endif
--
- /* Compatibility defines, for old *BSD systems */
- #ifndef AUDIO_SPEAKER
- #define AUDIO_SPEAKER 0x01
-@@ -262,7 +248,7 @@
- 			md_mode |= (DMODE_STEREO | DMODE_16BITS);
- 			play_precision = 16;
- 			play_stereo = 2;
--			play_encoding = AUDIO_ENCODING_SLINEAR_LE;
-+			play_encoding = AUDIO_ENCODING_LINEAR;
- 		}
- #endif
- 	}
-@@ -273,13 +259,7 @@
- 		if ((play_precision == 8) && (play_stereo == 1) &&
- 			(play_rate <= 8000)) play_encoding = AUDIO_ENCODING_ULAW;
- 		else
--#ifdef SUNOS4
- 			play_encoding = AUDIO_ENCODING_LINEAR;
--#else
--			play_encoding =
--				(play_precision ==
--				 16) ? AUDIO_ENCODING_SLINEAR_LE : AUDIO_ENCODING_ULINEAR_LE;
--#endif
- 	}
- 
- 	/* get current audio settings if we want to keep the playback output
-@@ -319,7 +299,9 @@
- 	}
- 	if ((audioinfo.play.precision != play_precision) ||
- 		(audioinfo.play.channels != play_stereo) ||
-+#if 0
- 		(audioinfo.play.encoding != play_encoding) ||
-+#endif
- 		(audioinfo.play.sample_rate != play_rate)) {
- 		_mm_errno = MMERR_SUN_INIT;
- 		return 1;