Update timidity to 2.10.2, based on a package provided by Adam Ciarcinski

in connection with pkg/8648.

18 files changed, 33 insertions, 973 deletions

diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index fd52e4620f1..5f8abe13f11 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,46 +1,20 @@
-# $NetBSD: Makefile,v 1.27 2000/11/02 03:25:32 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2000/12/17 01:37:40 wiz Exp $
 #
 
-DISTNAME=       timidity-0.2i
+DISTNAME=	TiMidity++-2.10.2
+PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
 CATEGORIES=     audio
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-TIINS=          dgguspat.zip
-DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
+MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=     mycroft@NetBSD.ORG
-HOMEPAGE=	http://www.cgs.fi/~tt/timidity/
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.goice.co.jp/member/mo/timidity/
 
-BUILD_DEPENDS=  unzip:../../archivers/unzip
-DEPENDS+=	tk-8.3.2:../../x11/tk
+DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
 
-USE_CURSES=	# defined
-
-RESTRICTED=		"Uses copyrighted patches"
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-
-EXTRACT_ONLY=   ${DISTNAME}.tar.gz
-INSTALL_TARGET= install.all
-
-do-configure:
-	@cd ${WRKSRC} && \
-	${SED} "s=%PREFIX%=${PREFIX}=" < gravis.cfg > gravis.cfg.new && \
-	${MV} gravis.cfg.new gravis.cfg
-
-post-install:
-	cd ${PREFIX}/share/timidity/patch && \
-	unzip -o -q -L ${DISTDIR}/${TIINS}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES"
-EXTRAINCS+=	-DHAVE_NCURSES_H=1 -I${LOCALBASE}/include
-EXTRALIBS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lncurses
-MAKE_ENV+=	EXTRAINCS="${EXTRAINCS}"
-.else
-EXTRALIBS+=	-lcurses -ltermcap
-.endif
-
-MAKE_ENV+=	EXTRALIBS="${EXTRALIBS}"
+USE_X11=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun --disable-debug \
+		--enable-gtk
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/files/md5 b/audio/timidity/files/md5
index a06c08d5e3e..4be80363a29 100644
--- a/audio/timidity/files/md5
+++ b/audio/timidity/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:16:56 agc Exp $
+$NetBSD: md5,v 1.3 2000/12/17 01:37:40 wiz Exp $
 
-MD5 (dgguspat.zip) = 94affd73c5b53ff0d5e12df1bc55c53d
-MD5 (timidity-0.2i.tar.gz) = 7dedd75232aaa7729e50c76cdd379b82
+MD5 (TiMidity++-2.10.2.tar.bz2) = 2f2003fff6ee4eec80c17cf5af377c5a
diff --git a/audio/timidity/files/patch-sum b/audio/timidity/files/patch-sum
index 4ea6e04c68a..ba6e0ca42d4 100644
--- a/audio/timidity/files/patch-sum
+++ b/audio/timidity/files/patch-sum
@@ -1,14 +1,6 @@
-$NetBSD: patch-sum,v 1.5 2000/08/31 16:07:43 jwise Exp $
+$NetBSD: patch-sum,v 1.6 2000/12/17 01:37:40 wiz Exp $
 
-MD5 (patch-ab) = 0877a599324fbffd719fded1cbaa9b71
-MD5 (patch-ac) = b00b62c0d213a28b5523125c5fd6d869
-MD5 (patch-ad) = 3ed4050addabb2bac9f42989d9f53d0c
-MD5 (patch-ba) = 2d489eb28c4e6f0f6f8d74137af3a857
-MD5 (patch-bb) = b9a76caba807ffdd3860dab0e3cf40b9
-MD5 (patch-bc) = 85e7d701f9508aee853c0e0ce7e75d68
-MD5 (patch-bd) = 4fa3bb07ab5476dc710330f1ead63b1b
-MD5 (patch-be) = df99699640fbd1f0f1cf1423589aaf29
-MD5 (patch-bf) = 18d23a6f4dbdf74e49ad73bd51003b26
-MD5 (patch-bg) = e88dabce6f6864944cb0ccd4c9563cd1
-MD5 (patch-bh) = 8c2d76414acafacf63e0473277d57441
-MD5 (patch-bi) = b2287228c110a6245f174808c9569535
+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/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab
deleted file mode 100644
index b23c7c02112..00000000000
--- a/audio/timidity/patches/patch-ab
+++ /dev/null
@@ -1,135 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2000/08/31 16:07:43 jwise Exp $
-
---- Makefile.orig	Sun May 26 05:26:46 1996
-+++ Makefile	Fri Jul 28 17:19:20 2000
-@@ -24,22 +24,23 @@
- # But where to change without revealing my secret identity?
- 
- ########### Compiler and flags.
--CC = gcc
--DEBUGFLAGS = -Wall -O2
-+CC = cc
-+DEBUGFLAGS = -Wall -O3 -fomit-frame-pointer -funroll-loops -ffast-math
- 
- ########### Install.
--INSTALL = /usr/bin/install
-+#INSTALL = /usr/bin/install
-+INSTALL= install -c
- 
- # Where to install the executable
--BIN_DIR = /usr/local/bin
-+BIN_DIR = ${PREFIX}/bin
- 
- # Where to install the manual pages
--MAN_DIR = /usr/local/man/man1
-+MAN_DIR = ${PREFIX}/man/man1
- 
- # Where to install the patches, config files, and MIDI files.
- # If you change this, it's a good idea to recompile the binary,
- # or you'll need to invoke timidity with the -L option.
--TIMID_DIR = /usr/local/lib/timidity
-+TIMID_DIR = ${PREFIX}/share/timidity
- 
- # Where to install the Tcl code, if you use the Tcl code that is.
- TCL_DIR = $(TIMID_DIR)
-@@ -54,8 +55,8 @@
- # do some axe work.
- 
- # Select the Linux/FreeBSD audio driver
--SYSTEM += -DAU_LINUX
--SYSEXTRAS += linux_a.c
-+#SYSTEM += -DAU_LINUX
-+#SYSEXTRAS += linux_a.c
- #EXTRAINCS +=
- #EXTRALIBS += 
- 
-@@ -77,6 +78,18 @@
- #EXTRAINCS += -I/usr/demo/SOUND/include
- #EXTRALIBS += -L/usr/demo/SOUND/lib -laudio -lsocket
- 
-+## Select the Sun audio driver (for NetBSD)
-+SYSTEM += -DAU_SUN
-+SYSEXTRAS += sun_a.c
-+EXTRAINCS +=
-+EXTRALIBS +=
-+
-+## Select the IRIX audio driver
-+#SYSTEM += -DAU_SGI
-+#SYSEXTRAS += sgi_a.c
-+#EXTRAINCS +=
-+#EXTRALIBS += -laudio
-+
- ## Select the DEC MMS audio server
- #SYSTEM += -DDEC -DAU_DEC
- #SYSEXTRAS += dec_a.c
-@@ -93,8 +106,8 @@
- # Select the ncurses full-screen interface
- SYSTEM += -DIA_NCURSES
- SYSEXTRAS += ncurs_c.c
--EXTRAINCS += -I/usr/include/ncurses
--EXTRALIBS += -lncurses
-+#EXTRAINCS += -I/usr/include/ncurses
-+#EXTRALIBS += -lncurses
- 
- ## Select the S-Lang full-screen interface
- #SYSTEM += -DIA_SLANG
-@@ -112,11 +125,11 @@
- #EXTRALIBS += -lgen
- 
- # Select the Tcl/Tk interface
--SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-+SYSTEM += -DTCLTK -DWISH=\"wish\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
- SYSEXTRAS += tk_c.c
- INST_TK = install.tk
--#EXTRAINCS +=
--#EXTRALIBS +=
-+EXTRAINCS +=
-+EXTRALIBS +=
- 
- ########### Now check out the options in config.h
- 
-@@ -136,7 +149,7 @@
- SDIST = timidity-lib-$(SUPPVERSION).tar.gz
- SDISTZIP = tilib$(FNSUPPVERSION).zip
- 
--CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
- 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
- 
- ########### All relevant files.. Anybody know autoconf?
-@@ -228,10 +241,10 @@
- wav2pat: wav2pat.c
- 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
- 
--depends depend dep:
--	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
--
--include depends
-+#depends depend dep:
-+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-+#
-+#include depends
- 
- ########### Installation targets
- 
-@@ -262,9 +275,9 @@
- 	mkdir -p $(TIMID_DIR)
- 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
- 
--install.patch: $(PATCHF)
-+install.patch: #$(PATCHF)
- 	mkdir -p $(TIMID_DIR)/patch
--	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
-+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
- 
- install.tk: $(ALLTCLF)
- 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
-@@ -281,7 +294,7 @@
- 	groff -man $< >$@
- 
- tclIndex: $(TCLF)
--	echo 'auto_mkindex . *.tcl; exit' | wish
-+	echo 'auto_mkindex . *.tcl; exit' | tclsh
- 
- ########## Some special targets
- 
diff --git a/audio/timidity/patches/patch-ac b/audio/timidity/patches/patch-ac
deleted file mode 100644
index b83b9389ba1..00000000000
--- a/audio/timidity/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:15 agc Exp $
-
-*** timidity.cfg.bak	Mon May 22 02:40:27 1995
---- timidity.cfg	Sun Nov 17 10:50:44 1996
-***************
-*** 34,42 ****
-  # This sets up the default patches in the TiMidity support package
-  # "timidity-lib-0.1.tar.gz":
-  
-! bank 0
-!    0 patch/acpiano.pat
-!   24 patch/nylongt2.pat
-  
-  ##############################################################################
-  # If you have Dustin McCartney's "wowpats" patches, you can source the 
---- 34,42 ----
-  # This sets up the default patches in the TiMidity support package
-  # "timidity-lib-0.1.tar.gz":
-  
-! #bank 0
-! #   0 patch/acpiano.pat
-! #  24 patch/nylongt2.pat
-  
-  ##############################################################################
-  # If you have Dustin McCartney's "wowpats" patches, you can source the 
-***************
-*** 67,73 ****
-  # Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
-  # almost identical.
-  #
-! #source midia.cfg
-  #
-  
-  
---- 67,73 ----
-  # Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
-  # almost identical.
-  #
-! source midia.cfg
-  #
-  
-  
diff --git a/audio/timidity/patches/patch-ad b/audio/timidity/patches/patch-ad
deleted file mode 100644
index 62b403f6eee..00000000000
--- a/audio/timidity/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/08/31 16:07:43 jwise Exp $
-
-*** gravis.cfg.bak	Mon May 20 20:10:15 1996
---- gravis.cfg	Sun Nov 17 12:43:31 1996
-***************
-*** 3,8 ****
---- 3,10 ----
-  # programs. 
-  #
-  
-+ dir %PREFIX%/share/timidity/patch
-+ 
-  bank 0
-  
-  	0 acpiano
diff --git a/audio/timidity/patches/patch-ba b/audio/timidity/patches/patch-ba
deleted file mode 100644
index f75b023be68..00000000000
--- a/audio/timidity/patches/patch-ba
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2000/07/28 21:47:52 jlam Exp $
-
---- config.h.orig	Sat Jun  1 08:54:49 1996
-+++ config.h	Fri Jul 28 17:36:20 2000
-@@ -186,7 +186,8 @@
- #define AUDIO_BUFFER_SIZE (1<<AUDIO_BUFFER_BITS)
- 
- /* Byte order, defined in <machine/endian.h> for FreeBSD and DEC OSF/1 */
--#ifdef DEC
-+#if defined(DEC) || defined(__NetBSD__)
-+#include <sys/types.h>
- #include <machine/endian.h>
- #endif
- 
-@@ -223,6 +224,14 @@
- #endif
- 
- /* DEC MMS has 64 bit long words */
-+#if defined(__NetBSD__)
-+typedef u_int32_t uint32;
-+typedef int32_t int32;
-+typedef u_int16_t uint16;
-+typedef int16_t int16;
-+typedef u_int8_t uint8;
-+typedef int8_t int8;
-+#else
- #ifdef DEC
- typedef unsigned int uint32;
- typedef int int32; 
-@@ -234,6 +243,7 @@
- typedef short int16;
- typedef unsigned char uint8;
- typedef char int8;
-+#endif
- 
- /* Instrument files are little-endian, MIDI files big-endian, so we
-    need to do some conversions. */
-@@ -323,6 +333,18 @@
-   extern char *optarg;
-   #define PI 3.14159265358979323846
-   #define rindex(s,c) strrchr(s,c)
-+#endif
-+
-+#ifdef __NetBSD__
-+#  include <errno.h>
-+#  include <math.h>
-+#  define PI M_PI
-+#endif
-+
-+#ifdef sgi
-+#  include <errno.h>
-+#  include <math.h>
-+#  define PI M_PI
- #endif
- 
- #ifdef __WIN32__
diff --git a/audio/timidity/patches/patch-bb b/audio/timidity/patches/patch-bb
deleted file mode 100644
index c7f2578b914..00000000000
--- a/audio/timidity/patches/patch-bb
+++ /dev/null
@@ -1,151 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1998/08/07 10:36:16 agc Exp $
-
---- motif_c.c.orig	Mon May 20 09:14:09 1996
-+++ motif_c.c	Sat Mar  7 13:19:57 1998
-@@ -370,15 +370,10 @@
-  */
- static int ctl_read(int32 *valp)
- {
--  int num;
--
--  /* We don't wan't to lock on reading  */
--  num=pipe_read_ready(); 
--
--  if (num==0)
--      return RC_NONE;
--  
--  return(ctl_blocking_read(valp));
-+    if (pipe_read_ready())
-+	return(ctl_blocking_read(valp));
-+    else
-+	return RC_NONE;
- }
- 
- static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
---- motif_p.c.orig	Mon May 20 09:09:46 1996
-+++ motif_p.c	Sat Mar  7 13:22:05 1998
-@@ -29,7 +29,11 @@
- #include <stdarg.h>
- #include <sys/ioctl.h>
- #ifdef SOLARIS
--#include <sys/filio.h>
-+#include <sys/stropts.h>
-+#endif
-+#ifdef sgi
-+#include <sys/time.h>
-+#include <bstring.h>
- #endif
- 
- #include "config.h"
-@@ -39,6 +43,9 @@
- int pipeAppli[2],pipeMotif[2]; /* Pipe for communication with MOTIF process   */
- int fpip_in, fpip_out;	/* in and out depends in which process we are */
- int pid;	               /* Pid for child process */
-+#ifdef sgi
-+static fd_set selector;
-+#endif
- 
- /* DATA VALIDITY CHECK */
- #define INT_CODE 214
-@@ -146,7 +153,20 @@
- {
-     int num;
-     
-+#ifdef sgi
-+    static struct timeval zero = {0, 0};
-+    FD_SET(fpip_in, &selector);
-+    num = select(fpip_in + 1, &selector, (fd_set *)0, (fd_set *)0, &zero);
-+    if (num < 0)
-+	pipe_error("pipe_read_ready");
-+    num = FD_ISSET(fpip_in, &selector);
-+#else
-+#ifdef SOLARIS
-+    ioctl(fpip_in,I_NREAD,&num); /* see how many chars in buffer. */
-+#else
-     ioctl(fpip_in,FIONREAD,&num); /* see how many chars in buffer. */
-+#endif
-+#endif
-     return num;
- }
- 
---- output.c.orig	Mon May 20 10:04:54 1996
-+++ output.c	Sat Mar  7 13:31:24 1998
-@@ -48,6 +48,11 @@
- #define DEFAULT_PLAY_MODE &sun_play_mode
- #endif
- 
-+#ifdef AU_SGI
-+extern PlayMode sgi_play_mode;
-+#define DEFAULT_PLAY_MODE &sgi_play_mode
-+#endif
-+
- #ifdef AU_WIN32
- extern PlayMode win32_play_mode;
- #define DEFAULT_PLAY_MODE &win32_play_mode
---- tk_c.c.orig	Mon May 20 09:14:24 1996
-+++ tk_c.c	Sat Mar  7 13:27:08 1998
-@@ -17,6 +17,13 @@
- #include <stdarg.h>
- #include <string.h>
- #include <sys/ioctl.h>
-+#ifdef SOLARIS
-+#include <sys/stropts.h>
-+#endif
-+#ifdef sgi
-+#include <sys/time.h>
-+#include <bstring.h>
-+#endif
- 
- #include "config.h"
- #include "common.h"
-@@ -362,15 +369,10 @@
-  */
- static int ctl_read(int32 *valp)
- {
--	int num;
--
--	/* We don't wan't to lock on reading  */
--	num=pipe_read_ready(); 
--
--	if (num==0)
--		return RC_NONE;
--  
-+    if (pipe_read_ready())
- 	return(ctl_blocking_read(valp));
-+    else
-+	return RC_NONE;
- }
- 
- static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-@@ -439,6 +441,9 @@
- static int pipeAppli[2],pipePanel[2]; /* Pipe for communication with Tcl/Tk process   */
- static int fpip_in, fpip_out;	/* in and out depends in which process we are */
- static int pid;	               /* Pid for child process */
-+#ifdef sgi
-+static fd_set selector;
-+#endif
- 
- static void pipe_open()
- {
-@@ -477,7 +482,21 @@
- static int pipe_read_ready()
- {
-     int num;
-+    
-+#ifdef sgi
-+    static struct timeval zero = {0, 0};
-+    FD_SET(fpip_in, &selector);
-+    num = select(fpip_in + 1, &selector, (fd_set *)0, (fd_set *)0, &zero);
-+    if (num < 0)
-+	pipe_error("pipe_read_ready");
-+    num = FD_ISSET(fpip_in, &selector);
-+#else
-+#ifdef SOLARIS
-+    ioctl(fpip_in,I_NREAD,&num); /* see how many chars in buffer. */
-+#else
-     ioctl(fpip_in,FIONREAD,&num); /* see how many chars in buffer. */
-+#endif
-+#endif
-     return num;
- }
- 
diff --git a/audio/timidity/patches/patch-bc b/audio/timidity/patches/patch-bc
deleted file mode 100644
index 58b45f7f3f6..00000000000
--- a/audio/timidity/patches/patch-bc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2000/04/27 14:44:23 mycroft Exp $
-
---- sun_a.c.orig	Mon May 20 09:09:47 1996
-+++ sun_a.c	Thu Apr 27 10:37:28 2000
-@@ -28,12 +28,13 @@
- */
- 
- #include <unistd.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <errno.h>
- 
- #include <sys/ioctl.h> 
- 
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__NetBSD__)
-  #include <sys/audioio.h>
- #else
-  #include <sun/audioio.h>
-@@ -81,7 +82,7 @@
-   
-   /* Open the audio device */
- 
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__NetBSD__)
-   fd=open(dpm.name, O_RDWR );
- #else
-   fd=open(dpm.name, O_RDWR | O_NDELAY);
diff --git a/audio/timidity/patches/patch-bd b/audio/timidity/patches/patch-bd
deleted file mode 100644
index a978d164238..00000000000
--- a/audio/timidity/patches/patch-bd
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-bd,v 1.2 1998/08/07 10:36:16 agc Exp $
-
---- /dev/null	Sat Mar  7 13:11:05 1998
-+++ sgi_a.c	Sat Mar  7 13:30:25 1998
-@@ -0,0 +1,161 @@
-+/* 
-+
-+    TiMidity -- Experimental MIDI to WAVE converter
-+    Copyright (C) 1995 Tuukka Toivonen <toivonen@clinet.fi>
-+
-+    This program is free software; you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation; either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program; if not, write to the Free Software
-+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+    sgi_audio.c
-+
-+    Functions to play sound on a SGI's audio device.
-+
-+    THESE ARE UNTESTED -- If you need to make modifications to get
-+    them to work, please send me the diffs, preferrably with a brief 
-+    explanation of what was wrong. Thanks!
-+
-+*/
-+
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+
-+#include <sys/ioctl.h> 
-+
-+#include <audio.h>
-+
-+#include "config.h"
-+#include "output.h"
-+#include "controls.h"
-+
-+static int open_output(void); /* 0=success, 1=warning, -1=fatal error */
-+static void close_output(void);
-+static void output_data(int32 *buf, int32 count);
-+static void flush_output(void);
-+static void purge_output(void);
-+
-+/* export the playback mode */
-+
-+#define dpm sgi_play_mode
-+
-+PlayMode dpm = {
-+  DEFAULT_RATE, PE_16BIT|PE_SIGNED,
-+  -1,
-+  {0,0,0,0,0}, /* no extra parameters so far */
-+  "SGI audio device", 'd',
-+  NULL,
-+  open_output,
-+  close_output,
-+  output_data,
-+  flush_output,
-+  purge_output  
-+};
-+
-+static ALport port;
-+static ALconfig config;
-+
-+/*************************************************************************/
-+/*
-+   Encoding will be 16-bit linear signed, unless PE_ULAW is set, in
-+   which case it'll be 8-bit uLaw. I don't think it's worthwhile to
-+   implement any 8-bit linear modes as the sound quality is
-+   unrewarding. PE_MONO is honored.  */
-+
-+static int open_output(void)
-+{
-+  int warnings=0;
-+  long params[2];
-+  
-+  /* Open the audio device */
-+
-+  config = ALnewconfig();
-+
-+  /* Does any device need byte-swapped data? Turn the bit off here. */
-+  dpm.encoding &= ~PE_BYTESWAP;
-+
-+  ctl->cmsg(CMSG_INFO,VERB_DEBUG, 
-+	    "1. (dpm.encoding=0x%02x  dpm.rate=%d)",
-+	    dpm.encoding, dpm.rate);
-+
-+  /* Select 16-bit linear / 8-bit uLaw encoding */
-+
-+  dpm.encoding &= ~PE_ULAW;
-+  dpm.encoding |= PE_16BIT|PE_SIGNED;
-+  ALsetwidth(config, AL_SAMPLE_16);
-+  ALsetsampfmt(config, AL_SAMPFMT_TWOSCOMP);
-+
-+  if (dpm.encoding & PE_MONO)
-+    ALsetchannels(config, AL_MONO);
-+  else
-+    ALsetchannels(config, AL_STEREO);
-+
-+  ALsetqueuesize(config, 32768);
-+
-+  port = ALopenport("tiMIDIty audio", "w", config);
-+
-+  if (port == 0)
-+    {
-+      ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
-+		"Can't open audio port");
-+      return -1;
-+    }
-+
-+  params[0] = AL_OUTPUT_RATE;
-+  params[1] = dpm.rate;
-+  ALsetparams(AL_DEFAULT_DEVICE, params, 2);
-+  ALgetparams(AL_DEFAULT_DEVICE, params, 2);
-+
-+  if (dpm.rate != params[1])
-+    {
-+      dpm.rate = params[1];
-+      ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
-+		"Output rate adjusted to %d Hz", dpm.rate);
-+      warnings=1;
-+    }
-+
-+  ctl->cmsg(CMSG_INFO,VERB_DEBUG, 
-+	    "1. (dpm.encoding=0x%02x  dpm.rate=%d)",
-+	    dpm.encoding, dpm.rate);
-+
-+  return warnings;
-+}
-+
-+static void output_data(int32 *buf, int32 count)
-+{
-+  /* Convert data to signed 16-bit PCM */
-+  if (dpm.encoding & PE_MONO)
-+    {
-+      s32tos16(buf, count);
-+      ALwritesamps(port, buf, count);
-+    }
-+  else
-+    {
-+      s32tos16(buf, count * 2);
-+      ALwritesamps(port, buf, count * 2);
-+    }
-+}
-+
-+static void close_output(void)
-+{
-+  ALcloseport(port);
-+  ALfreeconfig(config);
-+}
-+
-+static void flush_output(void)
-+{
-+}
-+
-+static void purge_output(void)
-+{
-+}
diff --git a/audio/timidity/patches/patch-be b/audio/timidity/patches/patch-be
deleted file mode 100644
index 17993fde60f..00000000000
--- a/audio/timidity/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.2 1998/08/07 10:36:17 agc Exp $
-
---- misc.tcl.orig	Fri Mar 29 04:19:49 1996
-+++ misc.tcl	Sat Mar  7 14:17:27 1998
-@@ -207,7 +207,7 @@
- proc my-random {max} {
-     global pseudo_random
-     if {$pseudo_random} {
--	return [expr [exec bash -c {echo $RANDOM}] % $max]
-+	return [exec jot -r 1 0 [expr $max - 1]]
-     } else {
- 	return [random $max]
-     }
diff --git a/audio/timidity/patches/patch-bf b/audio/timidity/patches/patch-bf
deleted file mode 100644
index b433b696e14..00000000000
--- a/audio/timidity/patches/patch-bf
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-bf,v 1.4 2000/07/28 21:47:52 jlam Exp $
-
---- ncurs_c.c.orig	Mon May 20 17:27:35 1996
-+++ ncurs_c.c	Fri Jul 28 17:27:35 2000
-@@ -26,7 +26,11 @@
- #include <unistd.h>
- #include <stdarg.h>
- 
-+#ifdef HAVE_NCURSES_H
- #include <ncurses.h>
-+#else
-+#include <curses.h>
-+#endif
- 
- #include "config.h"
- #include "common.h"
-@@ -354,7 +358,13 @@
-   if (ctl.trace_playing)
-     dftwin=stdscr;
-   else
--    dftwin=newwin(6,COLS,0,0);
-+    {
-+      dftwin=newwin(6,COLS,0,0);
-+      nodelay(dftwin, 1);
-+      scrollok(dftwin, 0);
-+      idlok(dftwin, 1);
-+      keypad(dftwin, TRUE);
-+    }
- 
-   werase(dftwin);
-   wmove(dftwin, 0,0);
-@@ -422,7 +432,7 @@
- static int ctl_read(int32 *valp)
- {
-   int c;
--  while ((c=getch())!=ERR)
-+  while ((c=wgetch(dftwin))!=ERR)
-     {
-       switch(c)
- 	{
diff --git a/audio/timidity/patches/patch-bg b/audio/timidity/patches/patch-bg
deleted file mode 100644
index f3c617398f8..00000000000
--- a/audio/timidity/patches/patch-bg
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2000/04/27 14:44:24 mycroft Exp $
-
---- common.c.orig	Sat Jun  1 08:20:19 1996
-+++ common.c	Thu Apr 27 10:09:23 2000
-@@ -204,8 +204,8 @@
-   if (count > (1<<21))
-     {
-       ctl->cmsg(CMSG_FATAL, VERB_NORMAL, 
--	   "Strange, I feel like allocating %d bytes. This must be a bug.",
--	   count);
-+	   "Strange, I feel like allocating %ld bytes. This must be a bug.",
-+	   (long) count);
-     }
-   else if ((p=malloc(count)))
-     return p;
diff --git a/audio/timidity/patches/patch-bh b/audio/timidity/patches/patch-bh
deleted file mode 100644
index b8351618c53..00000000000
--- a/audio/timidity/patches/patch-bh
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2000/04/27 14:44:24 mycroft Exp $
-
---- timidity.c.orig	Tue May 21 15:16:20 1996
-+++ timidity.c	Thu Apr 27 10:35:59 2000
-@@ -204,7 +204,8 @@
- {
-   if (i<low || i > high)
-     {
--      fprintf(stderr, "%s must be between %ld and %ld\n", name, low, high);
-+      fprintf(stderr, "%s must be between %ld and %ld\n", name, (long) low,
-+	      (long) high);
-       return -1;
-     }
-   else *param=i;
diff --git a/audio/timidity/patches/patch-bi b/audio/timidity/patches/patch-bi
deleted file mode 100644
index 5ef9984ac71..00000000000
--- a/audio/timidity/patches/patch-bi
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2000/04/27 14:44:24 mycroft Exp $
-
---- wave_a.c.orig	Mon May 20 09:10:15 1996
-+++ wave_a.c	Thu Apr 27 10:37:13 2000
-@@ -26,10 +26,10 @@
- #ifdef __WIN32__
- #include <stdlib.h>
- #include <io.h>
--#include <string.h>
- #else
- #include <unistd.h>
- #endif
-+#include <string.h>
- #include <fcntl.h>
- #include <errno.h>
- 
diff --git a/audio/timidity/pkg/DESCR b/audio/timidity/pkg/DESCR
index 0a7ddfe0523..6439b25c129 100644
--- a/audio/timidity/pkg/DESCR
+++ b/audio/timidity/pkg/DESCR
@@ -1,5 +1,4 @@
-TiMidity  is  a MIDI to WAVE converter using Gravis Ultra-
-sound-compatible patch files  to  generate  digital  audio
-data from General MIDI files.  The data can be stored in a
-file for processing, or played in  real  time  through  an
-audio device.
+TiMidity is a MIDI to WAVE converter using Gravis
+Ultrasound-compatible patch files to generate digital audio data from
+General MIDI files.  The data can be stored in a file for processing,
+or played in real time through an audio device.
diff --git a/audio/timidity/pkg/MESSAGE b/audio/timidity/pkg/MESSAGE
new file mode 100644
index 00000000000..9e8c1643cb1
--- /dev/null
+++ b/audio/timidity/pkg/MESSAGE
@@ -0,0 +1,8 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2000/12/17 01:37:42 wiz Exp $
+
+  To use this program, you'll have to install either the eawpatches
+  or guspatches packages, located in pkgsrc/audio/eawpatch resp.
+  pkgsrc/audio/guspatch.
+
+======================================================================
diff --git a/audio/timidity/pkg/PLIST b/audio/timidity/pkg/PLIST
index 32db2aae8cb..003465224a3 100644
--- a/audio/timidity/pkg/PLIST
+++ b/audio/timidity/pkg/PLIST
@@ -1,225 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/08/31 16:07:43 jwise Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/12/17 01:37:42 wiz Exp $
 bin/timidity
-bin/bag
-bin/wav2pat
 man/man1/timidity.1
-share/timidity/timidity.cfg
-share/timidity/gsdrum.cfg
-share/timidity/gravis.cfg
-share/timidity/midia.cfg
-share/timidity/wowpats.cfg
-share/timidity/mt32.cfg
-share/timidity/tkmidity.tcl
-share/timidity/tkpanel.tcl
-share/timidity/browser.tcl
-share/timidity/misc.tcl
-share/timidity/tclIndex
-share/timidity/BITMAPS/prev.xbm
-share/timidity/BITMAPS/next.xbm
-share/timidity/BITMAPS/play.xbm
-share/timidity/BITMAPS/stop.xbm
-share/timidity/BITMAPS/pause.xbm
-share/timidity/BITMAPS/quit.xbm
-share/timidity/BITMAPS/timidity.xbm
-share/timidity/patch/acbass.pat
-share/timidity/patch/accordn.pat
-share/timidity/patch/acguitar.pat
-share/timidity/patch/acpiano.pat
-share/timidity/patch/agogo.pat
-share/timidity/patch/agogohi.pat
-share/timidity/patch/agogolo.pat
-share/timidity/patch/altosax.pat
-share/timidity/patch/applause.pat
-share/timidity/patch/atmosphr.pat
-share/timidity/patch/aurora.pat
-share/timidity/patch/bagpipes.pat
-share/timidity/patch/banjo.pat
-share/timidity/patch/barisax.pat
-share/timidity/patch/basslead.pat
-share/timidity/patch/bassoon.pat
-share/timidity/patch/belltree.pat
-share/timidity/patch/blank.pat
-share/timidity/patch/bongohi.pat
-share/timidity/patch/bongolo.pat
-share/timidity/patch/bottle.pat
-share/timidity/patch/bowglass.pat
-share/timidity/patch/britepno.pat
-share/timidity/patch/c550kc_1.pat
-share/timidity/patch/c550sn10.pat
-share/timidity/patch/c550sn_6.pat
-share/timidity/patch/c550vibs.pat
-share/timidity/patch/cabasa.pat
-share/timidity/patch/calliope.pat
-share/timidity/patch/carillon.pat
-share/timidity/patch/castinet.pat
-share/timidity/patch/celeste.pat
-share/timidity/patch/cello.pat
-share/timidity/patch/charang.pat
-share/timidity/patch/chiflead.pat
-share/timidity/patch/choir.pat
-share/timidity/patch/church.pat
-share/timidity/patch/claps.pat
-share/timidity/patch/clarinet.pat
-share/timidity/patch/clave.pat
-share/timidity/patch/clavinet.pat
-share/timidity/patch/cleangtr.pat
-share/timidity/patch/concrtna.pat
-share/timidity/patch/congahi1.pat
-share/timidity/patch/congahi2.pat
-share/timidity/patch/congalo.pat
-share/timidity/patch/contraba.pat
-share/timidity/patch/cowbell.pat
-share/timidity/patch/crystal.pat
-share/timidity/patch/cuica1.pat
-share/timidity/patch/cuica2.pat
-share/timidity/patch/cymbell.pat
-share/timidity/patch/cymchina.pat
-share/timidity/patch/cymcrsh1.pat
-share/timidity/patch/cymcrsh2.pat
-share/timidity/patch/cymride1.pat
-share/timidity/patch/cymride2.pat
-share/timidity/patch/cymsplsh.pat
-share/timidity/patch/distgtr.pat
-share/timidity/patch/doo.pat
-share/timidity/patch/echovox.pat
-share/timidity/patch/englhorn.pat
-share/timidity/patch/epiano1.pat
-share/timidity/patch/epiano2.pat
-share/timidity/patch/fantasia.pat
-share/timidity/patch/fiddle.pat
-share/timidity/patch/flute.pat
-share/timidity/patch/fngrbass.pat
-share/timidity/patch/frenchrn.pat
-share/timidity/patch/freshair.pat
-share/timidity/patch/fretless.pat
-share/timidity/patch/fx-blow.pat
-share/timidity/patch/fx-fret.pat
-share/timidity/patch/ghostie.pat
-share/timidity/patch/glocken.pat
-share/timidity/patch/gtrharm.pat
-share/timidity/patch/guiro1.pat
-share/timidity/patch/guiro2.pat
-share/timidity/patch/halopad.pat
-share/timidity/patch/harmonca.pat
-share/timidity/patch/harp.pat
-share/timidity/patch/helicptr.pat
-share/timidity/patch/highq.pat
-share/timidity/patch/hihatcl.pat
-share/timidity/patch/hihatop.pat
-share/timidity/patch/hihatpd.pat
-share/timidity/patch/hitbrass.pat
-share/timidity/patch/homeorg.pat
-share/timidity/patch/honky.pat
-share/timidity/patch/hrpschrd.pat
-share/timidity/patch/jazzgtr.pat
-share/timidity/patch/jingles.pat
-share/timidity/patch/jungle.pat
-share/timidity/patch/kalimba.pat
-share/timidity/patch/kick1.pat
-share/timidity/patch/kick2.pat
-share/timidity/patch/koto.pat
-share/timidity/patch/lead5th.pat
-share/timidity/patch/maracas.pat
-share/timidity/patch/marcato.pat
-share/timidity/patch/marimba.pat
-share/timidity/patch/metalpad.pat
-share/timidity/patch/metbell.pat
-share/timidity/patch/metclick.pat
-share/timidity/patch/musicbox.pat
-share/timidity/patch/mutegtr.pat
-share/timidity/patch/mutetrum.pat
-share/timidity/patch/nyguitar.pat
-share/timidity/patch/oboe.pat
-share/timidity/patch/ocarina.pat
-share/timidity/patch/odguitar.pat
-share/timidity/patch/orchhit.pat
-share/timidity/patch/percorg.pat
-share/timidity/patch/piccolo.pat
-share/timidity/patch/pickbass.pat
-share/timidity/patch/pistol.pat
-share/timidity/patch/pizzcato.pat
-share/timidity/patch/polysyn.pat
-share/timidity/patch/recorder.pat
-share/timidity/patch/reedorg.pat
-share/timidity/patch/revcym.pat
-share/timidity/patch/ringwhsl.pat
-share/timidity/patch/rockorg.pat
-share/timidity/patch/santur.pat
-share/timidity/patch/sawwave.pat
-share/timidity/patch/scratch1.pat
-share/timidity/patch/scratch2.pat
-share/timidity/patch/seashore.pat
-share/timidity/patch/shakazul.pat
-share/timidity/patch/shaker.pat
-share/timidity/patch/shamisen.pat
-share/timidity/patch/shannai.pat
-share/timidity/patch/sitar.pat
-share/timidity/patch/slap.pat
-share/timidity/patch/slapbas1.pat
-share/timidity/patch/slapbas2.pat
-share/timidity/patch/slowstr.pat
-share/timidity/patch/snare1.pat
-share/timidity/patch/snare2.pat
-share/timidity/patch/soundtrk.pat
-share/timidity/patch/sprnosax.pat
-share/timidity/patch/sqrclick.pat
-share/timidity/patch/sqrwave.pat
-share/timidity/patch/startrak.pat
-share/timidity/patch/steeldrm.pat
-share/timidity/patch/stickrim.pat
-share/timidity/patch/sticks.pat
-share/timidity/patch/surdo1.pat
-share/timidity/patch/surdo2.pat
-share/timidity/patch/sweeper.pat
-share/timidity/patch/synbass1.pat
-share/timidity/patch/synbass2.pat
-share/timidity/patch/synbras1.pat
-share/timidity/patch/synbras2.pat
-share/timidity/patch/synpiano.pat
-share/timidity/patch/synstr1.pat
-share/timidity/patch/synstr2.pat
-share/timidity/patch/syntom.pat
-share/timidity/patch/taiko.pat
-share/timidity/patch/tamborin.pat
-share/timidity/patch/telephon.pat
-share/timidity/patch/tenorsax.pat
-share/timidity/patch/timbaleh.pat
-share/timidity/patch/timbalel.pat
-share/timidity/patch/timpani.pat
-share/timidity/patch/tomhi1.pat
-share/timidity/patch/tomhi2.pat
-share/timidity/patch/tomlo1.pat
-share/timidity/patch/tomlo2.pat
-share/timidity/patch/tommid1.pat
-share/timidity/patch/tommid2.pat
-share/timidity/patch/toms.pat
-share/timidity/patch/tremstr.pat
-share/timidity/patch/triangl1.pat
-share/timidity/patch/triangl2.pat
-share/timidity/patch/trombone.pat
-share/timidity/patch/trumpet.pat
-share/timidity/patch/tuba.pat
-share/timidity/patch/tubebell.pat
-share/timidity/patch/unicorn.pat
-share/timidity/patch/vibes.pat
-share/timidity/patch/vibslap.pat
-share/timidity/patch/viola.pat
-share/timidity/patch/violin.pat
-share/timidity/patch/voices.pat
-share/timidity/patch/voxlead.pat
-share/timidity/patch/warmpad.pat
-share/timidity/patch/whistle.pat
-share/timidity/patch/whistle1.pat
-share/timidity/patch/whistle2.pat
-share/timidity/patch/woodblk.pat
-share/timidity/patch/woodblk1.pat
-share/timidity/patch/woodblk2.pat
-share/timidity/patch/woodflut.pat
-share/timidity/patch/xylophon.pat
-share/timidity/patch/chris6.cfg
-share/timidity/patch/default.cfg
-share/timidity/patch/maplerag.cfg
-share/timidity/patch/ultramid.ini
-@dirrm share/timidity/BITMAPS
-@dirrm share/timidity/patch
-@dirrm share/timidity
+man/man5/timidity.cfg.5