Update libmikmod to 3.1.9. Changes since 3.1.7 are numerous, see file NEWS

included in the distribution for a complete list.

8 files changed, 68 insertions, 31 deletions

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 101cda36f2a..af0d742b027 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2000/03/07 22:42:00 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/04/02 16:07:04 pooka Exp $
 
-DISTNAME=	libmikmod-3.1.7
+DISTNAME=	libmikmod-3.1.9
 CATEGORIES=	audio
-# The files at multimania.com seem to be corrupted
-MASTER_SITES=	http://mikmod.darkorb.net/libmikmod/ \
-		http://www.multimania.com/miodrag/mikmod/libmikmod/
+MASTER_SITES=	http://mikmod.darkorb.net/libmikmod/
 
 MAINTAINER=	kuebart@mathematik.uni-ulm.de
-HOMEPAGE=	http://www.multimania.com/miodrag/mikmod/
+HOMEPAGE=	http://mikmod.darkorb.net/
 
 DEPENDS+=	esound-0.2.*:../../audio/esound
 
diff --git a/audio/libmikmod/files/md5 b/audio/libmikmod/files/md5
index 9c6d8e129db..ed563517e53 100644
--- a/audio/libmikmod/files/md5
+++ b/audio/libmikmod/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/12/10 01:33:28 hubertf Exp $
+$NetBSD: md5,v 1.2 2000/04/02 16:07:05 pooka Exp $
 
-MD5 (libmikmod-3.1.7.tar.gz) = fc799491d514dd78154d34b3364a6f21
+MD5 (libmikmod-3.1.9.tar.gz) = 0d50670d34653490a0c87a9fa5cc804a
diff --git a/audio/libmikmod/files/patch-sum b/audio/libmikmod/files/patch-sum
index 3a685ec2001..03c6734198a 100644
--- a/audio/libmikmod/files/patch-sum
+++ b/audio/libmikmod/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/03/07 22:45:10 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/04/02 16:07:05 pooka Exp $
 
-MD5 (patch-aa) = cd8cccf5c14738092ba5bbac4a906555
-MD5 (patch-ab) = 08ee0f93834cabaa286e692072e884d4
-MD5 (patch-ac) = 1ade5eed1ed50c172ee4048a8586a899
+MD5 (patch-aa) = 409427b33c38499e3914bf366dedbc66
+MD5 (patch-ab) = bb4e0d79708262a16bcd657ef6f354f5
+MD5 (patch-ac) = db119d37d4413263f3334a4cdc6dba24
+MD5 (patch-ad) = 04ffc7eb83402832f5d07cc656bc01d9
diff --git a/audio/libmikmod/patches/patch-aa b/audio/libmikmod/patches/patch-aa
index ec56bf150b3..da0cf989793 100644
--- a/audio/libmikmod/patches/patch-aa
+++ b/audio/libmikmod/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/10 01:33:28 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2000/04/02 16:07:05 pooka Exp $
 
---- docs/Makefile.in.orig	Sun Oct  3 18:22:08 1999
-+++ docs/Makefile.in	Sun Oct  3 18:22:19 1999
-@@ -77,7 +77,7 @@
+--- docs/Makefile.in.orig	Tue Feb 15 00:19:59 2000
++++ docs/Makefile.in	Sun Apr  2 14:46:09 2000
+@@ -76,7 +76,7 @@
  LIB_LDADD = @LIB_LDADD@
  LN_S = @LN_S@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
  OBJDUMP = @OBJDUMP@
  PACKAGE = @PACKAGE@
+ PLAYER_LIB = @PLAYER_LIB@
diff --git a/audio/libmikmod/patches/patch-ab b/audio/libmikmod/patches/patch-ab
index caf977b1dd4..797398b9085 100644
--- a/audio/libmikmod/patches/patch-ab
+++ b/audio/libmikmod/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/10 01:33:28 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2000/04/02 16:07:05 pooka Exp $
 
---- docs/mikmod.texi.orig	Sun Oct  3 18:47:56 1999
-+++ docs/mikmod.texi	Sun Oct  3 18:48:33 1999
+--- docs/mikmod.texi.orig	Tue Feb 15 00:10:21 2000
++++ docs/mikmod.texi	Sun Apr  2 14:47:50 2000
 @@ -78,12 +78,14 @@
  @direntry
  * MikMod: (mikmod).            MikMod Sound Library.
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/12/10 01:33:28 hubertf Exp $
  @menu
  * Introduction::          What is MikMod ?
  * Tutorial::              Your first steps with MikMod.
-@@ -3077,15 +3079,11 @@
+@@ -3117,15 +3119,11 @@
  @end menu
  @end ifnottex
  
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index a3e837ef2b6..215a6f3c7ab 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2000/03/07 22:45:10 tron Exp $
+$NetBSD: patch-ac,v 1.2 2000/04/02 16:07:05 pooka Exp $
 
---- configure.orig	Mon Jun 28 05:57:18 1999
-+++ configure	Tue Mar  7 23:38:45 2000
-@@ -1618,6 +1618,7 @@
+--- configure.orig	Mon Feb 14 22:20:17 2000
++++ configure	Sun Apr  2 14:50:50 2000
+@@ -1646,6 +1646,7 @@
+ *) lt_target="$target" ;;
+ esac
  
- 
- 
-+if false; then
++if false ; then
  # Check for any special flags to pass to ltconfig.
  libtool_flags="--cache-file=$cache_file"
  test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1771,6 +1772,7 @@
+@@ -1799,6 +1800,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -18,3 +18,19 @@ $NetBSD: patch-ac,v 1.1 2000/03/07 22:45:10 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
+@@ -1862,6 +1864,7 @@
+ fi
+ 
+ 
++if false ; then
+ # 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
+@@ -1881,6 +1884,7 @@
+ if test $libmikmod_cv_makeinfo_html = no
+ then
+ 	MAKEINFO="$missing_dir/missing makeinfo"
++fi
+ fi
+ 
+ # ====================
diff --git a/audio/libmikmod/patches/patch-ad b/audio/libmikmod/patches/patch-ad
new file mode 100644
index 00000000000..3d67e2cffb8
--- /dev/null
+++ b/audio/libmikmod/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2000/04/02 16:07:05 pooka Exp $
+
+*** drivers/drv_sun.c.orig	Tue Feb 15 00:10:21 2000
+--- drivers/drv_sun.c	Sun Apr  2 15:18:28 2000
+***************
+*** 61,67 ****
+  #include <sys/audioio.h>
+  #endif
+  
+! #define DEFAULT_FRAGSIZE 12
+  
+  #if !defined __NetBSD__  && !defined __OpenBSD__
+  #ifdef HAVE_SUN_AUDIOIO_H
+--- 61,67 ----
+  #include <sys/audioio.h>
+  #endif
+  
+! #define DEFAULT_FRAGSIZE 13
+  
+  #if !defined __NetBSD__  && !defined __OpenBSD__
+  #ifdef HAVE_SUN_AUDIOIO_H
diff --git a/audio/libmikmod/pkg/PLIST b/audio/libmikmod/pkg/PLIST
index 54c63713461..a1c530df451 100644
--- a/audio/libmikmod/pkg/PLIST
+++ b/audio/libmikmod/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2000/03/07 22:45:10 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/04/02 16:07:06 pooka Exp $
 include/mikmod.h
-lib/libmikmod.so.2.0
+lib/libmikmod.so.2.2
 lib/libmikmod.a
 @unexec install-info --delete %D/info/mikmod.info %D/info/dir
 info/mikmod.info
 @exec install-info %D/info/mikmod.info %D/info/dir
 bin/libmikmod-config
 share/aclocal/libmikmod.m4
+man/man1/libmikmod-config.1