From 3649d77fd4e2ddc0b05c1960417b374c509962dd Mon Sep 17 00:00:00 2001 From: mycroft Date: Sat, 4 Jul 1998 07:50:09 +0000 Subject: Update to 3.0.3. --- audio/mikmod/Makefile | 29 ++++++++++------- audio/mikmod/files/md5 | 2 +- audio/mikmod/patches/patch-aa | 18 ----------- audio/mikmod/patches/patch-ab | 25 +++++++++------ audio/mikmod/patches/patch-ac | 16 +++++----- audio/mikmod/patches/patch-ad | 74 ------------------------------------------- audio/mikmod/patches/patch-ae | 14 ++------ audio/mikmod/patches/patch-af | 51 ----------------------------- audio/mikmod/patches/patch-ag | 26 --------------- audio/mikmod/patches/patch-ba | 16 ++++++++++ audio/mikmod/patches/patch-bb | 44 +++++++++++++++++++++++++ audio/mikmod/patches/patch-bc | 32 +++++++++++++++++++ audio/mikmod/patches/patch-bd | 16 ++++++++++ audio/mikmod/pkg/COMMENT | 2 +- audio/mikmod/pkg/DESCR | 11 +++---- audio/mikmod/pkg/PLIST | 11 ++++--- 16 files changed, 163 insertions(+), 224 deletions(-) delete mode 100644 audio/mikmod/patches/patch-aa delete mode 100644 audio/mikmod/patches/patch-ad delete mode 100644 audio/mikmod/patches/patch-af delete mode 100644 audio/mikmod/patches/patch-ag create mode 100644 audio/mikmod/patches/patch-ba create mode 100644 audio/mikmod/patches/patch-bb create mode 100644 audio/mikmod/patches/patch-bc create mode 100644 audio/mikmod/patches/patch-bd (limited to 'audio') diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index f05c851218e..54c024e958e 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -1,29 +1,34 @@ -# $NetBSD: Makefile,v 1.10 1998/06/18 16:15:10 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/07/04 07:50:09 mycroft Exp $ # -DISTNAME= mikmod-2.14-unix -PKGNAME= mikmod-2.14 +DISTNAME= mikmod-3.0.3 CATEGORIES= audio -MASTER_SITES= http://www.chiark.greenend.org.uk/~stevem/mikmod/ +MASTER_SITES= http://www.freenet.tlh.fl.us/~amstpi/ \ + ${MASTER_SITE_SUNSITE} +MASTER_SITE_SUBDIR= apps/sound/players MAINTAINER= mycroft@NetBSD.ORG -DEPENDS+= ncurses-1.9.9g:../../devel/ncurses +CONFLICTS= mikmod-2.14 -RESTRICTED= "Registration required for redistribution and commercial use." -MIRROR_DISTFILE= no +DEPENDS+= ncurses-1.9.9g:../../devel/ncurses +USE_GMAKE= yes .include "../../mk/bsd.prefs.mk" -WRKSRC= ${WRKDIR}/${DISTNAME}/source +post-patch: + chmod a+x ${WRKSRC}/build-mikmod.netbsd.sh + +do-build: + @(cd ${WRKSRC}; ${SETENV} PREFIX=${PREFIX} ./build-mikmod.netbsd.sh) do-install: - ( cd ${WRKSRC} ; ${INSTALL_PROGRAM} mikmod mikcvt ${PREFIX}/bin ) - ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/mikmod.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/usercode/mikmod ${PREFIX}/bin + #${INSTALL_MAN} ${WRKSRC}/docs/mikmod.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/mikmod -.for f in credits.txt mikmod.txt register.frm - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/$f ${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 .endif diff --git a/audio/mikmod/files/md5 b/audio/mikmod/files/md5 index 61601d9edf2..2fe9715ac61 100644 --- a/audio/mikmod/files/md5 +++ b/audio/mikmod/files/md5 @@ -1 +1 @@ -MD5 (mikmod-2.14-unix.tar.gz) = 916e16e34af36fdc333f041ac7782877 +MD5 (mikmod-3.0.3.tar.gz) = a096e8258410459189ff535111887ff1 diff --git a/audio/mikmod/patches/patch-aa b/audio/mikmod/patches/patch-aa deleted file mode 100644 index 370477d94e3..00000000000 --- a/audio/mikmod/patches/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.orig Sun Apr 20 17:12:31 1997 -+++ Makefile Sun Apr 20 17:12:41 1997 -@@ -167,13 +167,13 @@ - # realtime priority (ie. it'll get all the cpu it wants) using - # sched_setscheduler(). Default behaviour remains the same, i.e. to not use - # these --SNAG=-DCPUTIME_SNAGGER -+#SNAG=-DCPUTIME_SNAGGER - - # Does your system have usleep()? If not, you'll need to uncomment this... - #USLEEP=-DNEEDS_USLEEP - - # Does your system have curses or ncurses? If the latter, define NCURSES. --#NCURSES=-DNCURSES -+NCURSES=-DNCURSES - - CFLAGS = $(OSFLAGS) $(ZIP) $(SNAG) $(USLEEP) $(NCURSES) - diff --git a/audio/mikmod/patches/patch-ab b/audio/mikmod/patches/patch-ab index 682ab9264f2..0627e99d520 100644 --- a/audio/mikmod/patches/patch-ab +++ b/audio/mikmod/patches/patch-ab @@ -1,11 +1,16 @@ ---- ui.c.orig Sun Apr 20 17:14:10 1997 -+++ ui.c Sun Apr 20 17:14:18 1997 -@@ -25,7 +25,7 @@ - #include - - #ifdef NCURSES --#include -+#include - #else - #include +--- 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 + #include + #include +-#ifndef __FreeBSD__ +-#include +-#else ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include ++#else ++#include #endif + #if (!defined(SGI)) + #include diff --git a/audio/mikmod/patches/patch-ac b/audio/mikmod/patches/patch-ac index 6491fa8a90b..46680f77218 100644 --- a/audio/mikmod/patches/patch-ac +++ b/audio/mikmod/patches/patch-ac @@ -1,11 +1,11 @@ ---- display.c.orig Sun Apr 20 17:13:42 1997 -+++ display.c Sun Apr 20 17:13:59 1997 -@@ -26,7 +26,7 @@ - #include "mikmod.h" - +--- 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 -+#include + #include + #else +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include #else #include - #endif diff --git a/audio/mikmod/patches/patch-ad b/audio/mikmod/patches/patch-ad deleted file mode 100644 index 79c9354dfc8..00000000000 --- a/audio/mikmod/patches/patch-ad +++ /dev/null @@ -1,74 +0,0 @@ ---- Makefile.orig Sat Mar 7 05:45:21 1998 -+++ Makefile Sat Mar 7 05:47:52 1998 -@@ -25,8 +25,8 @@ - # - ############################################################################ - --OSDEF=-DOSS --CC = gcc -+#OSDEF=-DOSS -+#CC = gcc - - # if you want to use the Ultra driver uncomment the 3 lines below. - # You need a Gravis Ultrasound and the library from the Linux Ultrasound -@@ -35,12 +35,25 @@ - #ULTRALIB=-lgus - #ULTRADRV=drv_ultra.o - --OSFLAGS = -O2 $(OSDEF) $(ULTRA) -+#OSFLAGS = -O2 $(OSDEF) $(ULTRA) - #debug options - #OSFLAGS = -g $(OSDEF) $(ULTRA) - --LIBS=-lncurses -lm $(ULTRALIB) --DRIVERS = drv_nos.o drv_raw.o drv_vox.o $(ULTRADRV) -+#LIBS=-lncurses -lm $(ULTRALIB) -+#DRIVERS = drv_nos.o drv_raw.o drv_vox.o $(ULTRADRV) -+ -+############################################################################ -+# -+# NetBSD definitions -+# -+# for output on the Sun-like audio device (/dev/audio) -+# -+############################################################################ -+ -+CC = cc -+OSFLAGS = -O2 -I${PREFIX}/include -Dunix -+LIBS = -L${PREFIX}/lib -lncurses -lm -+DRIVERS = drv_nos.o drv_raw.o drv_sun.o - - ############################################################################ - # ---- mikmod.h.orig Sun Dec 29 13:46:39 1996 -+++ mikmod.h Sat Mar 7 05:49:57 1998 -@@ -59,11 +59,15 @@ - - #elif defined(SUN) - #define mikbannerdriver \ --" - Sun/Solaris driver by Valtteri Vuorikoski \n" -+" - Sun/Solaris/NetBSD driver by Valtteri Vuorikoski \n" - - #elif defined(SOLARIS) - #define mikbannerdriver \ --" - Sun/Solaris driver by Valtteri Vuorikoski \n" -+" - Sun/Solaris/NetBSD driver by Valtteri Vuorikoski \n" -+ -+#elif defined(__NetBSD__) -+#define mikbannerdriver \ -+" - Sun/Solaris/NetBSD driver by Valtteri Vuorikoski \n" - - #elif defined(__alpha) - #define mikbannerdriver \ ---- mikmodux.c.orig Mon Dec 16 19:31:16 1996 -+++ mikmodux.c Sat Mar 7 05:45:21 1998 -@@ -199,6 +199,8 @@ - MD_RegisterDriver(&drv_sun); - #elif defined(SOLARIS) - MD_RegisterDriver(&drv_sun); -+#elif defined(__NetBSD__) -+ MD_RegisterDriver(&drv_sun); - #elif defined(__alpha) - MD_RegisterDriver(&drv_AF); - #elif defined(OSS) - diff --git a/audio/mikmod/patches/patch-ae b/audio/mikmod/patches/patch-ae index 310c745bdf3..9faae8740a9 100644 --- a/audio/mikmod/patches/patch-ae +++ b/audio/mikmod/patches/patch-ae @@ -1,5 +1,5 @@ ---- drv_sun.c.orig Sat Nov 30 22:09:55 1996 -+++ drv_sun.c Fri Mar 20 03:13:13 1998 +--- 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" @@ -9,13 +9,3 @@ static int sndfd; /* we need these in a few places */ static int play_encoding = -1, play_precision, fragsize = DEFAULT_FRAGSIZE; -@@ -173,9 +173,6 @@ - close( sndfd ); - return 0; - } -- if(!quiet) -- if( (play_stereo != 1 || play_rate != 8000) && AUDIO_ENCODING_ULAW ) -- printf( "Warning: not using 8khz mono with ulaw. This might not sound good\n" ); - - AUDIO_INITINFO( &audioinfo ); - audioinfo.play.precision = play_precision; diff --git a/audio/mikmod/patches/patch-af b/audio/mikmod/patches/patch-af deleted file mode 100644 index 64032c7acda..00000000000 --- a/audio/mikmod/patches/patch-af +++ /dev/null @@ -1,51 +0,0 @@ ---- load_xm.c.orig Sun Aug 4 06:02:57 1996 -+++ load_xm.c Wed Mar 11 11:07:41 1998 -@@ -404,6 +404,11 @@ - /* printf("numrows: %d\n",ph.numrows); */ - /* printf("packsize:%d\n",ph.packsize); */ - -+ if(feof(modfp)){ -+ myerr = ERROR_LOADING_PATTERN; -+ return 0; -+ } -+ - of.pattrows[t]=ph.numrows; - - /* -@@ -448,6 +453,12 @@ - printf("Samples:%d\n",ih.numsmp); - printf("sampleheadersize:%ld\n",ih.ssize); - */ -+ -+ if(feof(modfp)){ -+ myerr = ERROR_LOADING_SAMPLEINFO; -+ return 0; -+ } -+ - d->insname=DupStr(ih.name,22); - d->numsmp=ih.numsmp; - -@@ -477,6 +488,11 @@ - pth.volfade =_mm_read_I_UWORD(modfp); - _mm_read_I_UWORDS(pth.reserved, 11, modfp); - -+ if(feof(modfp)){ -+ myerr = ERROR_LOADING_SAMPLEINFO; -+ return 0; -+ } -+ - memcpy(d->samplenumber,pth.what,96); - - d->volfade=pth.volfade; -@@ -573,6 +589,11 @@ - _mm_read_str(wh.samplename, 22, modfp); - - /*printf("wav %d:%22.22s\n",u,wh.samplename);*/ -+ -+ if(feof(modfp)){ -+ myerr = ERROR_LOADING_SAMPLEINFO; -+ return 0; -+ } - - q->samplename =DupStr(wh.samplename,22); - q->length =wh.length; diff --git a/audio/mikmod/patches/patch-ag b/audio/mikmod/patches/patch-ag deleted file mode 100644 index e76b27993af..00000000000 --- a/audio/mikmod/patches/patch-ag +++ /dev/null @@ -1,26 +0,0 @@ ---- marchive.c.orig Sat Nov 30 21:55:28 1996 -+++ marchive.c Fri Apr 3 17:00:39 1998 -@@ -93,6 +93,10 @@ - else if(MA_identify(filename,GZ_HEADER_LOCATION,GZ_HEADER_STRING)){ - sprintf(command_buff,GZ_EXTRACT_COMMAND" %s >%s 2>/dev/null",filename,tmp_file); - archive=1; -+ } -+ else if(MA_identify(filename,BZ2_HEADER_LOCATION,BZ2_HEADER_STRING)){ -+ sprintf(command_buff,BZ2_EXTRACT_COMMAND" %s >%s 2>/dev/null",filename,tmp_file); -+ archive=1; - } - - if(archive){ ---- mikmod.h.orig Sun Dec 29 13:46:39 1996 -+++ mikmod.h Fri Apr 3 17:00:11 1998 -@@ -37,6 +37,10 @@ - #define ARJ_HEADER_LOCATION 1 - #define ARJ_HEADER_STRING "ê" - -+#define BZ2_EXTRACT_COMMAND "bzip2 -dc" -+#define BZ2_HEADER_LOCATION 0 -+#define BZ2_HEADER_STRING "BZh" -+ - #define mikversion \ - "-= MIKMOD v2.14 - Unix development version, 29 Dec 96 =---\n" - diff --git a/audio/mikmod/patches/patch-ba b/audio/mikmod/patches/patch-ba new file mode 100644 index 00000000000..aef75255300 --- /dev/null +++ b/audio/mikmod/patches/patch-ba @@ -0,0 +1,16 @@ +--- /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 new file mode 100644 index 00000000000..ac5cbb29c83 --- /dev/null +++ b/audio/mikmod/patches/patch-bb @@ -0,0 +1,44 @@ +--- /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 new file mode 100644 index 00000000000..11015968c15 --- /dev/null +++ b/audio/mikmod/patches/patch-bc @@ -0,0 +1,32 @@ +--- /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 new file mode 100644 index 00000000000..febe908fa64 --- /dev/null +++ b/audio/mikmod/patches/patch-bd @@ -0,0 +1,16 @@ +--- /dev/null Sat Jul 4 02:20:57 1998 ++++ usercode/makefile.netbsd Sat Jul 4 02:29:45 1998 +@@ -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 -L$(LIBDIR) -L$(PREFIX)/lib -lmikmod -lmmio -lncurses ++ ++clean: ++ rm -f $(OBJS) mikmod diff --git a/audio/mikmod/pkg/COMMENT b/audio/mikmod/pkg/COMMENT index c33734904cb..b8114ede03c 100644 --- a/audio/mikmod/pkg/COMMENT +++ b/audio/mikmod/pkg/COMMENT @@ -1 +1 @@ -Mod player which plays MTM, STM, XM, MOD, S3M, ULT and UNI mods. +MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files. diff --git a/audio/mikmod/pkg/DESCR b/audio/mikmod/pkg/DESCR index 1ee3470a7e8..d1768d7dc67 100644 --- a/audio/mikmod/pkg/DESCR +++ b/audio/mikmod/pkg/DESCR @@ -1,6 +1,5 @@ -This is a mod player which uses ncurses as a UI. It can play S3M, XM, MOD, -MTM, STM, ULT, and UNI module types. -It uses the Open Sound System, and has features like sample interpolation, -random mod playing, and supports playing compressed modules. (Note: its -playing of compressed modules is OK, providing they don't have spaces in -their names...) +Mikmod is a MOD player. +It understands UNI, IT, XM, S3M, MOD, MTM, STM, DSM, MED, FAR, ULT, and +669 module formats. +It has features like sample interpolation, random playing, and automatic +decompression of modules. diff --git a/audio/mikmod/pkg/PLIST b/audio/mikmod/pkg/PLIST index 2bcfde7ba89..22add7be1f3 100644 --- a/audio/mikmod/pkg/PLIST +++ b/audio/mikmod/pkg/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 09:57:58 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1998/07/04 07:50:10 mycroft Exp $ bin/mikmod -bin/mikcvt -man/man1/mikmod.1.gz -share/doc/mikmod/credits.txt +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/register.frm +share/doc/mikmod/tips.txt @dirrm share/doc/mikmod -- cgit v1.2.3