Update mikmod to 3.1.6-a. Changes since 3.0.3 are numerous, including

integrated patches from the package system, an on-screen configuration
facility and a "don't loop" interal module option. See NEWS in distribution
for a full list of changes.

11 files changed, 18 insertions, 195 deletions

diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index d3c2cb39275..7ccf23f505b 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,30 +1,22 @@
-# $NetBSD: Makefile,v 1.19 2000/01/15 18:46:23 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2000/04/02 16:32:34 pooka Exp $
 #
 
-DISTNAME=	mikmod-3.0.3
+DISTNAME=	mikmod-3.1.6-a
+PKGNAME=	mikmod-3.1.6a
 CATEGORIES=	audio
-MASTER_SITES=	http://www.freenet.tlh.fl.us/~amstpi/	\
-		${MASTER_SITE_SUNSITE:=apps/sound/players/}
+MASTER_SITES=	http://mikmod.darkorb.net/libmikmod/
 
 MAINTAINER=	mycroft@NetBSD.ORG
-HOMEPAGE=	http://www.freenet.tlh.fl.us/~amstpi/mikmod.html
+HOMEPAGE=	http://mikmod.darkorb.net/
 
 DEPENDS+=	ncurses>=4.2:../../devel/ncurses
+DEPENDS+=	libmikmod>=3.1.9:../../audio/libmikmod
 
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
-post-patch:
-	${CHMOD} a+x ${WRKSRC}/build-mikmod.netbsd.sh
+CPPFLAGS+=	-I${LOCALBASE}/include
 
-do-build:
-	@( cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build-mikmod.netbsd.sh )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/usercode/mikmod ${PREFIX}/bin
-	#${INSTALL_MAN} ${WRKSRC}/docs/mikmod.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mikmod
-.for f in bugs.txt changes.txt future.txt mikmod.doc mikmod.txt tips.txt
-	${INSTALL_DATA} ${WRKSRC}/docs/$f ${PREFIX}/share/doc/mikmod
-.endfor
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mikmod/files/md5 b/audio/mikmod/files/md5
index 4ded7c5aa3d..74923d6d0a5 100644
--- a/audio/mikmod/files/md5
+++ b/audio/mikmod/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:16:54 agc Exp $
+$NetBSD: md5,v 1.4 2000/04/02 16:32:35 pooka Exp $
 
-MD5 (mikmod-3.0.3.tar.gz) = a096e8258410459189ff535111887ff1
+MD5 (mikmod-3.1.6-a.tar.gz) = eb66900fac76e9cc280a1c85efec3733
diff --git a/audio/mikmod/files/patch-sum b/audio/mikmod/files/patch-sum
index 8a07e1dc22b..456617bcb69 100644
--- a/audio/mikmod/files/patch-sum
+++ b/audio/mikmod/files/patch-sum
@@ -1,9 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:13 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/02 16:32:35 pooka Exp $
 
-MD5 (patch-ab) = 78b2fcd7ddcd4f76ff24ab2515cfb04e
-MD5 (patch-ac) = d6f8c58099ae95797f6f6ee5100ba739
-MD5 (patch-ae) = aeeaf63ae5d9b05da1e4bcdc5f2899f7
-MD5 (patch-ba) = d2b59be162226f63590491a5a9fc3409
-MD5 (patch-bb) = d788bcbabf775948c4210406adaafb0f
-MD5 (patch-bc) = fc6eaa67a80f8db399819c676a2df6b4
-MD5 (patch-bd) = c4d792ba0f4e59b44ab21e2b83d46a86
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/audio/mikmod/patches/patch-ab b/audio/mikmod/patches/patch-ab
deleted file mode 100644
index 2f7147a1721..00000000000
--- a/audio/mikmod/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:35:57 agc Exp $
-
---- usercode/mikmodux.c.orig	Sat Mar 21 14:52:24 1998
-+++ usercode/mikmodux.c	Sat Jul  4 02:12:26 1998
-@@ -33,10 +33,10 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#ifndef __FreeBSD__
--#include <curses.h>
--#else
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <ncurses.h>
-+#else
-+#include <curses.h>
- #endif
- #if (!defined(SGI))
- #include <fnmatch.h>
diff --git a/audio/mikmod/patches/patch-ac b/audio/mikmod/patches/patch-ac
deleted file mode 100644
index 08aa72a4370..00000000000
--- a/audio/mikmod/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 10:35:57 agc Exp $
-
---- usercode/display.c.orig	Sat Mar 21 14:44:23 1998
-+++ usercode/display.c	Sat Jul  4 02:11:46 1998
-@@ -37,7 +37,7 @@
- #ifdef NCURSES
- #include <ncurses/ncurses.h>
- #else
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <ncurses.h>
- #else
- #include <curses.h>
diff --git a/audio/mikmod/patches/patch-ae b/audio/mikmod/patches/patch-ae
deleted file mode 100644
index abf7d524574..00000000000
--- a/audio/mikmod/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 1998/08/07 10:35:58 agc Exp $
-
---- playercode/unix_drv/drv_sun.c.orig	Wed Jan 14 15:33:36 1998
-+++ playercode/unix_drv/drv_sun.c	Sat Jul  4 02:14:56 1998
-@@ -33,7 +33,7 @@
- 
- #include "mikmod.h"
- 
--#define DEFAULT_FRAGSIZE 2048
-+#define DEFAULT_FRAGSIZE 8192
- 
- static int sndfd; /* we need these in a few places */
- static int play_encoding = -1, play_precision, fragsize = DEFAULT_FRAGSIZE;
diff --git a/audio/mikmod/patches/patch-ba b/audio/mikmod/patches/patch-ba
deleted file mode 100644
index 3e927a0b5d4..00000000000
--- a/audio/mikmod/patches/patch-ba
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ba,v 1.2 1998/08/07 10:35:58 agc Exp $
-
---- /dev/null	Sat Jul  4 02:20:57 1998
-+++ build-mikmod.netbsd.sh	Sat Jul  4 02:28:22 1998
-@@ -0,0 +1,13 @@
-+#!/bin/sh -e
-+cd playercode
-+gmake -f makefile.netbsd
-+cd ..
-+cd mmio
-+gmake -f makefile.netbsd
-+cd ..
-+cd usercode
-+gmake -f makefile.netbsd
-+cp mikmod ../..
-+cd ../..
-+strip mikmod
-+echo All done.
diff --git a/audio/mikmod/patches/patch-bb b/audio/mikmod/patches/patch-bb
deleted file mode 100644
index fdf555203ac..00000000000
--- a/audio/mikmod/patches/patch-bb
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1998/08/07 10:35:58 agc Exp $
-
---- /dev/null	Sat Jul  4 02:20:57 1998
-+++ playercode/makefile.netbsd	Sat Jul  4 02:31:51 1998
-@@ -0,0 +1,41 @@
-+# MikMod Library Makefile for NetBSD
-+# Divine Entertainment Game Programming Pack
-+
-+
-+####################
-+### User Options ###
-+####################
-+
-+# Use the C or C++ compiler
-+CC                = gcc 
-+CFLAGS  = -Wall -O6 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -pipe -I. -I../include -DSOLARIS
-+
-+Lib_file          = ../lib/libmikmod.a
-+
-+LoaderObjs        = mloader.o mlreg.o npertab.o sloader.o load_uni.o \
-+    load_mod.o load_m15.o load_mtm.o load_s3m.o load_stm.o load_669.o \
-+    load_far.o load_dsm.o load_med.o load_xm.o load_ult.o load_it.o \
-+    s3m_it.o
-+
-+DriverObjs        = mdriver.o mdreg.o drv_nos.o drv_raw.o drv_wav.o \
-+	unix_drv/drv_sun.o 
-+# unix_drv/drv_AF.o unix_drv/drv_aix.o unix_drv/drv_hp.o
-+# unix_drv/drv_oss.o unix_drv/drv_sgi.o
-+
-+PlayerObjs        = mplayer.o
-+
-+####################
-+## Makefile rules ##
-+####################
-+
-+all: $(Lib_file)
-+
-+$(Lib_file): stream.o virtch.o munitrk.o \
-+	$(LoaderObjs) $(DriverObjs) $(PlayerObjs)
-+	ar r $(Lib_file) stream.o virtch.o munitrk.o \
-+        $(LoaderObjs) $(PlayerObjs) $(DriverObjs)
-+
-+clean:
-+	rm -f *.o
-+	rm -f unix_drv/*.o
-+	rm -f $(Lib_file)
diff --git a/audio/mikmod/patches/patch-bc b/audio/mikmod/patches/patch-bc
deleted file mode 100644
index b0a60ac88da..00000000000
--- a/audio/mikmod/patches/patch-bc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bc,v 1.2 1998/08/07 10:35:58 agc Exp $
-
---- /dev/null	Sat Jul  4 02:20:57 1998
-+++ mmio/makefile.netbsd	Sat Jul  4 02:32:11 1998
-@@ -0,0 +1,29 @@
-+# MMIO Library Makefile for NetBSD
-+# Divine Entertainment Game Programming Pack
-+#
-+
-+##########################
-+## User settable macros ##
-+##########################
-+
-+Compiler          = gcc
-+Librarian         = ar
-+Compiler_Options  = -Wall -O6 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -pipe -I. -I../mikmod -I../include
-+
-+Lib_file          = ../lib/libmmio.a
-+
-+Object_files      = mmio.o mmalloc.o mmerror.o
-+
-+####################
-+## Makefile rules ##
-+####################
-+
-+$(Lib_file): $(Object_files)
-+	$(Librarian) r $(Lib_file) $(Object_files)
-+
-+.c.o:
-+	$(CC) -c $(Compiler_Options) $<
-+
-+clean:
-+	rm -f *.o
-+	rm -f $(Lib_file)
diff --git a/audio/mikmod/patches/patch-bd b/audio/mikmod/patches/patch-bd
deleted file mode 100644
index e9dd247adc6..00000000000
--- a/audio/mikmod/patches/patch-bd
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bd,v 1.3 1999/07/06 07:54:35 jlam Exp $
-
---- /dev/null	Tue Jul  6 03:03:17 1999
-+++ usercode/makefile.netbsd	Tue Jul  6 03:05:03 1999
-@@ -0,0 +1,13 @@
-+# MikMod User Code Makefile for NetBSD
-+
-+OBJS = mikmodux.o mlist.o display.o marchive.o
-+LIBDIR = ../lib
-+INCLUDEDIR = ../include
-+
-+CFLAGS = -O6 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -pipe -I$(INCLUDEDIR) -I$(PREFIX)/include -DSOLARIS -DUSE_ZIP
-+
-+mikmod: $(OBJS) $(LIBDIR)/libmikmod.a $(LIBDIR)/libmmio.a
-+	cc -o mikmod $(OBJS) ../playercode/munitrk.o ../playercode/virtch.o ../playercode/npertab.o ${LDFLAGS} -L$(LIBDIR) -lmikmod -lmmio -lncurses
-+
-+clean: 
-+	rm -f $(OBJS) mikmod
diff --git a/audio/mikmod/pkg/PLIST b/audio/mikmod/pkg/PLIST
index 22add7be1f3..d53e1adb902 100644
--- a/audio/mikmod/pkg/PLIST
+++ b/audio/mikmod/pkg/PLIST
@@ -1,9 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/04 07:50:10 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/04/02 16:32:37 pooka Exp $
 bin/mikmod
-share/doc/mikmod/bugs.txt
-share/doc/mikmod/changes.txt
-share/doc/mikmod/future.txt
-share/doc/mikmod/mikmod.doc
-share/doc/mikmod/mikmod.txt
-share/doc/mikmod/tips.txt
-@dirrm share/doc/mikmod
+man/man1/mikmod.1