The original version of timidity is long unmaintained now, so

switch to timidity++. help from and ok jolan@
2006-01-30 10:13:11 +00:00 · 2006-01-30 10:13:11 +00:00 · 1a18623fdd
commit 1a18623fdd
parent 75f54a77ea
14 changed files with 392 additions and 734 deletions
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@ -1,55 +1,68 @@
-# $OpenBSD: Makefile,v 1.28 2005/06/11 00:15:14 jaredy Exp $
+# $OpenBSD: Makefile,v 1.29 2006/01/30 10:13:11 jsg Exp $

 COMMENT=	"MIDI to WAV renderer and player"
-DISTNAME=	timidity-0.2i
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	TiMidity++-2.13.2
+PKGNAME=	${DISTNAME:L:S/++//}
 CATEGORIES=	audio

-MASTER_SITES=	http://sca.uwaterloo.ca/www.cgs.fi/tt/timidity/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=timidity/}
 MASTER_SITES0=	ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/
-TIINS=	goemon.tgz
+TIINS=		goemon.tgz
 DISTFILES=	${TIINS}:0 ${DISTNAME}.tar.gz
-EXTRACT_ONLY=	${DISTNAME}.tar.gz

-PERMIT_PACKAGE_CDROM=	"copyrighted patches"
-PERMIT_PACKAGE_FTP=	"copyrighted patches"
-PERMIT_DISTFILES_CDROM=	"copyrighted patches"
-PERMIT_DISTFILES_FTP=	"copyrighted patches"
-WANTLIB=		c m ossaudio
+HOMEPAGE=	http://timidity.sourceforge.net/

+# GPL, copyrighted patches in goemon patchset
+PERMIT_PACKAGE_CDROM=   "copyrighted patches"
+PERMIT_PACKAGE_FTP=     "copyrighted patches"
+PERMIT_DISTFILES_CDROM= "copyrighted patches"
+PERMIT_DISTFILES_FTP=   "copyrighted patches"
+WANTLIB=		c m ncurses 

-FLAVORS=motif curses slang
-FLAVOR?=motif
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-audio=sun \
+		--enable-vt100 \
+		--enable-ncurses \
+		--enable-server \
+		--with-default-path=${SYSCONFDIR}

-.if ${FLAVOR:L:Mcurses}
-MAKE_FLAGS+=-DCURSES
-WANTLIB+=		curses
-.endif
-.if ${FLAVOR:L:Mmotif} || ${FLAVOR:L:Mlesstif}
-MAKE_FLAGS+=-DMOTIF
-USE_MOTIF=	any
-WANTLIB+=		X11 Xext Xt
-.endif
-.if ${FLAVOR:L:Mslang}
-MAKE_FLAGS+=-DSLANG
-LIB_DEPENDS+=slang.::devel/libslang
-WANTLIB+=		curses
+FLAVORS=	gtk2
+FLAVOR?=
+
+.if ${FLAVOR:L:Mgtk2}
+CONFIGURE_ARGS+=--enable-gtk
+MODULES=	devel/gettext
+USE_X11=	Yes
+LIB_DEPENDS+=	gdk-x11-2.0.0.11,gdk_pixbuf-2.0.0.11,gtk-x11-2.0.0.11::x11/gtk+2
+BUILD_DEPENDS+=	:pkgconfig-*:devel/pkgconfig
+WANTLIB+=	X11 Xext Xft Xrender atk-1.0.0.0 fontconfig freetype \
+		glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 pango-1.0.0.0 \
+		pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 
+.else
+CONFIGURE_ARGS+=--without-x
 .endif

-MAKE_ENV=	CC="${CC}"
-
+USE_GMAKE=	Yes
 NO_REGRESS=	Yes

-INSTALL_TARGET= install.all
-FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST} ${MAKE_FLAGS}
+WRKDIST=	${WRKDIR}
+WRKSRC=		${WRKDIR}/${DISTNAME}
+DATA_DIRS=	gsdrum00 gsdrum08 gsdrum40

 post-install:
-	${INSTALL_MAN} ${WRKSRC}/timidity.1 ${PREFIX}/man/man1
-	@cd ${PREFIX}/lib/timidity && \
-	${TAR} zxf ${FULLDISTDIR}/${TIINS} && \
-	cp goemon.cfg goemon.cfg.bak && \
-	sed 's=dir goemon=dir ${TRUEPREFIX}/lib/timidity/goemon=' \
-	   < goemon.cfg.bak > goemon.cfg && \
-	rm -f goemon.cfg.bak
+	${INSTALL_DATA_DIR} ${PREFIX}/share/timidity/goemon
+	${INSTALL_DATA} ${WRKDIST}/goemon/*.* ${PREFIX}/share/timidity/goemon
+.for DDIR in ${DATA_DIRS}
+	${INSTALL_DATA_DIR} ${PREFIX}/share/timidity/goemon/${DDIR}
+	${INSTALL_DATA} ${WRKDIST}/goemon/${DDIR}/*.* \
+	    ${PREFIX}/share/timidity/goemon/${DDIR}
+.endfor
+	${INSTALL_DATA} ${WRKDIST}/goemon.cfg ${PREFIX}/share/timidity/goemon
+	@echo -e "dir ${TRUEPREFIX}/share/timidity/goemon\nsource goemon.cfg" \
+	    >> ${WRKDIR}/timidity.cfg
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/timidity
+	${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${PREFIX}/share/examples/timidity

 .include <bsd.port.mk>
--- a/audio/timidity/distinfo
+++ b/audio/timidity/distinfo
@ -1,8 +1,8 @@
+MD5 (TiMidity++-2.13.2.tar.gz) = 4a1644d1893437b372769cf331611e76
 MD5 (goemon.tgz) = c423e721be2e39bd9d69aec171074d81
-MD5 (timidity-0.2i.tar.gz) = 7dedd75232aaa7729e50c76cdd379b82
+RMD160 (TiMidity++-2.13.2.tar.gz) = 7a644902ab318c52e9c714903ff7688c4e7aa6a6
 RMD160 (goemon.tgz) = 285af506a4d55841432f2cb992d320e591d9cb29
-RMD160 (timidity-0.2i.tar.gz) = f2a581c6ad919ebb5727482b85211d175572df7e
+SHA1 (TiMidity++-2.13.2.tar.gz) = 8d1762aeda0ed765f2f49e5560a8700f490c1853
 SHA1 (goemon.tgz) = 03543c47ac2447f2f016544b8bf9acc51cf04cde
-SHA1 (timidity-0.2i.tar.gz) = 741e7e2521311a01e9d7cf4417837a1cb810e050
+SIZE (TiMidity++-2.13.2.tar.gz) = 1849553
 SIZE (goemon.tgz) = 10804344
-SIZE (timidity-0.2i.tar.gz) = 151638
--- a/audio/timidity/patches/patch-Makefile
+++ b/audio/timidity/patches/patch-Makefile
@ -1,135 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2004/10/29 10:48:44 alek Exp $
--- Makefile.orig	Sun May 26 11:26:46 1996
-+++ Makefile	Fri Jul  6 08:53:41 2001
-@@ -24,22 +24,22 @@
- # But where to change without revealing my secret identity?
- 
- ########### Compiler and flags.
-CC = gcc
-DEBUGFLAGS = -Wall -O2
-+#CC = gcc
-+DEBUGFLAGS = -Wall
- 
- ########### Install.
-INSTALL = /usr/bin/install
-+#INSTALL = /usr/bin/install
- 
- # Where to install the executable
-BIN_DIR = /usr/local/bin
-+BIN_DIR = ${DESTDIR}${PREFIX}/bin
- 
- # Where to install the manual pages
-MAN_DIR = /usr/local/man/man1
-+MAN_DIR = ${DESTDIR}${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 = ${DESTDIR}${PREFIX}/lib/timidity
- 
- # Where to install the Tcl code, if you use the Tcl code that is.
- TCL_DIR = $(TIMID_DIR)
-@@ -59,6 +59,10 @@ SYSEXTRAS += linux_a.c
- #EXTRAINCS +=
- #EXTRALIBS += 
- 
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
-+EXTRALIBS += -lossaudio
-+#endif
-+
- ## Select the HP-UX network audio server
- #SYSTEM += -DHPUX -DAU_HPUX
- #SYSEXTRAS += hpux_a.c
-@@ -90,31 +94,37 @@ SYSEXTRAS += linux_a.c
- # have to make do with a non-interactive interface that just prints out
- # messages.
- 
-+.if defined(CURSES)
- # Select the ncurses full-screen interface
- SYSTEM += -DIA_NCURSES
- SYSEXTRAS += ncurs_c.c
-EXTRAINCS += -I/usr/include/ncurses
-EXTRALIBS += -lncurses
-+EXTRALIBS += -lcurses
-+.endif
- 
-+.if defined(SLANG)
- ## Select the S-Lang full-screen interface
-#SYSTEM += -DIA_SLANG
-#SYSEXTRAS += slang_c.c
-#EXTRAINCS += -I/usr/include/slang
-#EXTRALIBS += -lslang
-
-## Select the MOTIF interface
-#SYSTEM += -DMOTIF
-#SYSEXTRAS += motif_c.c motif_i.c motif_p.c
-#EXTRAINCS += -I/usr/local/X11R5/include -L/usr/local/X11R5/lib
-#EXTRAINCS += -I/usr/include/X11
-#EXTRALIBS += -lXm -lXt -lX11
-## Solaris needs libgen?
-+SYSTEM += -DIA_SLANG
-+SYSEXTRAS += slang_c.c
-+EXTRAINCS += -I${LOCALBASE}/include
-+EXTRALIBS += -L${LOCALBASE}/lib -lslang -lcurses
-+.endif
-+
-+.if defined(MOTIF)
-+# Select the MOTIF interface
-+SYSTEM += -DMOTIF
-+SYSEXTRAS += motif_c.c motif_i.c motif_p.c
-+EXTRAINCS += -I${LOCALBASE}/include -L${LOCALBASE}/lib
-+EXTRAINCS += -I${X11BASE}/include -L${X11BASE}/lib
-+EXTRALIBS += -lXm -lXext -lXt -lX11
-+.endif
-+
-+# Solaris needs libgen?
- #EXTRALIBS += -lgen
- 
- # Select the Tcl/Tk interface
-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-SYSEXTRAS += tk_c.c
-INST_TK = install.tk
-+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-+#SYSEXTRAS += tk_c.c
-+#INST_TK = install.tk
- #EXTRAINCS +=
- #EXTRALIBS +=
- 
-@@ -136,7 +146,7 @@ DISTZIP = timid$(FNVERSION).zip
- 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 +238,10 @@ bag: bag.c
- 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 +272,9 @@ install.config: $(CONFIGF)
- 	mkdir -p $(TIMID_DIR)
- 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
- 
-install.patch: $(PATCHF)
-	mkdir -p $(TIMID_DIR)/patch
-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
-+install.patch: #$(PATCHF)
-+#        mkdir -p $(TIMID_DIR)/patch
-+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
- 
- install.tk: $(ALLTCLF)
- 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
--- a/audio/timidity/patches/patch-TiMidity++-2_13_2_configure
+++ b/audio/timidity/patches/patch-TiMidity++-2_13_2_configure
@ -0,0 +1,28 @@
+$OpenBSD: patch-TiMidity++-2_13_2_configure,v 1.1 2006/01/30 10:13:11 jsg Exp $
+--- TiMidity++-2.13.2/configure.orig	Sun Oct  3 22:39:51 2004
+++ TiMidity++-2.13.2/configure	Sat Jan 21 01:07:46 2006
+@@ -16190,7 +16190,7 @@ if test "${ac_cv_lib_slang_SLang_init_tt
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lslang  $LIBS"
+LIBS="-lslang  -ltermcap $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -16426,13 +16426,13 @@ else
+   ENABLE_SLANG_FALSE=
+ fi
+ 
+-   LIBS="$LIBS -lslang"
+   LIBS="$LIBS -lslang -ltermcap"
+     INTERFACE_SRCS="$INTERFACE_SRCS slang_c.c"
+ 
+   ;;
+ xdynamic)
+   dynamic_targets="$dynamic_targets interface_s.\$(so)"
+-   s_so_libs="-lslang"
+   s_so_libs="-lslang -ltermcap"
+     echo "$as_me:$LINENO: checking for initscr in -ltermcap" >&5
+ echo $ECHO_N "checking for initscr in -ltermcap... $ECHO_C" >&6
+ if test "${ac_cv_lib_termcap_initscr+set}" = set; then
--- a/audio/timidity/patches/patch-TiMidity++-2_13_2_timidity_sun_a_c
+++ b/audio/timidity/patches/patch-TiMidity++-2_13_2_timidity_sun_a_c
@ -0,0 +1,21 @@
+$OpenBSD: patch-TiMidity++-2_13_2_timidity_sun_a_c,v 1.1 2006/01/30 10:13:11 jsg Exp $
+--- TiMidity++-2.13.2/timidity/sun_a.c.orig	Mon Sep 27 09:40:14 2004
+++ TiMidity++-2.13.2/timidity/sun_a.c	Sat Jan 21 01:06:52 2006
+@@ -54,7 +54,7 @@
+ #include "output.h"
+ #include "controls.h"
+ 
+-#if defined(__NetBSD__) /* NetBSD */
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+ #ifdef LITTLE_ENDIAN
+ #define AUDIO_LINEAR_TAG	AUDIO_ENCODING_SLINEAR_LE
+ #else
+@@ -331,7 +331,7 @@ static int acntl(int request, void *arg)
+       case PM_REQ_GETFILLED:
+ 	if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
+ 	    return -1;
+-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+ 	*((int *)arg) = auinfo.play.seek;
+ #else
+ 	if(auinfo.play.samples == play_samples_offset)
--- a/audio/timidity/patches/patch-config_h
+++ b/audio/timidity/patches/patch-config_h
@ -1,42 +0,0 @@
-$OpenBSD: patch-config_h,v 1.2 2005/06/10 23:30:48 jaredy Exp $
--- config.h.orig	Sat Jun  1 08:54:49 1996
-+++ config.h	Fri May 27 21:28:18 2005
-@@ -121,7 +121,7 @@
- /* Make envelopes twice as fast. Saves ~20% CPU time (notes decay
-    faster) and sounds more like a GUS. There is now a command line
-    option to toggle this as well. */
-#define FAST_DECAY
-+/* #define FAST_DECAY */
- 
- /* How many bits to use for the fractional part of sample positions.
-    This affects tonal accuracy. The entire position counter must fit
-@@ -217,13 +217,19 @@
- # endif
- #endif /* linux */
- 
-+#ifdef __OpenBSD__
-+#include <errno.h>
-+#define USE_LDEXP
-+#define PI M_PI
-+#endif
-+
- /* Win32 on Intel machines */
- #ifdef __WIN32__
- #  define LITTLE_ENDIAN
- #endif
- 
- /* DEC MMS has 64 bit long words */
-#ifdef DEC
-+#if defined(DEC) || defined(__LP64__)
- typedef unsigned int uint32;
- typedef int int32; 
- #else
-@@ -267,7 +273,7 @@ typedef char int8;
- 
- /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
-    then specify the library directory in the configuration file. */
-#define CONFIG_FILE	"timidity.cfg"
-+#define CONFIG_FILE	"/usr/local/lib/timidity/timidity.cfg"
- 
- /* These affect general volume */
- #define GUARD_BITS 3
--- a/audio/timidity/patches/patch-goemon_cfg
+++ b/audio/timidity/patches/patch-goemon_cfg
@ -0,0 +1,12 @@
+$OpenBSD: patch-goemon_cfg,v 1.1 2006/01/30 10:13:11 jsg Exp $
+--- goemon.cfg.orig	Wed Jan 11 22:39:35 2006
+++ goemon.cfg	Wed Jan 11 22:39:47 2006
+@@ -6,8 +6,6 @@
+ # Only a partial GS drum set.
+ # Anyone got a GS map so I can do the rest?
+ #
+-dir goemon
+-
+ bank 0
+ 
+ # Accoustic grand
--- a/audio/timidity/patches/patch-instrum_c
+++ b/audio/timidity/patches/patch-instrum_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-instrum_c,v 1.1 2001/07/05 10:48:22 espie Exp $
--- instrum.c.orig	Mon May 20 15:15:10 1996
-+++ instrum.c	Fri Apr 27 08:01:39 2001
-@@ -31,7 +31,7 @@
- #include <strings.h>
- #endif
- 
-#if defined(__FreeBSD__) || defined (__WIN32__)
-+#if defined(__FreeBSD__) || defined (__WIN32__) || defined(__OpenBSD__)
- #include <stdlib.h>
- #else
- #include <malloc.h>
--- a/audio/timidity/patches/patch-linux_a_c
+++ b/audio/timidity/patches/patch-linux_a_c
@ -1,174 +0,0 @@
-$OpenBSD: patch-linux_a_c,v 1.2 2001/07/05 10:50:30 espie Exp $
--- linux_a.c.orig	Mon May 20 15:09:46 1996
-+++ linux_a.c	Thu Jul  5 12:49:08 2001
-@@ -37,6 +37,11 @@
- #include <machine/soundcard.h>
- #endif
- 
-+#ifdef __OpenBSD__
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#endif
-+
- #include "config.h"
- #include "output.h"
- #include "controls.h"
-@@ -56,7 +61,7 @@ PlayMode dpm = {
-   -1,
-   {0}, /* default: get all the buffer fragments you can */
-   "Linux dsp device", 'd',
-  "/dev/dsp",
-+  "/dev/audio",
-   open_output,
-   close_output,
-   output_data,
-@@ -71,12 +76,15 @@ PlayMode dpm = {
-    then 8-bit unsigned if it fails. If you have a sound device that
-    can't handle either, let me know. */
- 
-+/* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
-+static luigi_driver = 0;
-+
- static int open_output(void)
- {
-   int fd, tmp, i, warnings=0;
-   
-   /* Open the audio device */
-  fd=open(dpm.name, O_RDWR | O_NDELAY);
-+  fd=open(dpm.name, O_WRONLY);
-   if (fd<0)
-     {
-       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
-@@ -84,6 +92,23 @@ static int open_output(void)
-       return -1;
-     }
- 
-+  /* Figure out if we're running with the Luigi driver or
-+     the original VoxWare driver, with code based on dburr/luigi
-+     in ports/5607.  It'd be great if we could do this before
-+     opening the audio device, but oh well... */
-+#if defined(AIOGFMT)	/* only defined in Luigi driver */
-+  {
-+    snd_chan_param s;
-+    int i;
-+    i = ioctl(fd, AIOGFMT, &s);
-+    if (i != -1)
-+      luigi_driver = 1;
-+  }
-+#endif defined (AIOGFMT)
-+
-+  ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
-+	    luigi_driver ? "luigi" : "VoxWare");
-+
-   /* They can't mean these */
-   dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
- 
-@@ -92,6 +117,29 @@ static int open_output(void)
-      the other one. */
- 
-   i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
-+  if (luigi_driver)
-+    {
-+      if (dpm.encoding & PE_16BIT) {
-+	int fmt = AFMT_S16_LE ;
-+
-+	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
-+	    fmt = AFMT_U8 ;
-+	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
-+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
-+		      "%s doesn't support 16- or 8-bit sample width",
-+		      dpm.name);
-+		close(fd);
-+		return -1;
-+	    }
-+	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
-+		  "Sample width adjusted to %d bits", tmp);
-+	    dpm.encoding ^= PE_16BIT;
-+	    warnings = 1;
-+	}
-+      }
-+    }
-+  else
-+    {
-   if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
-     {
-       /* Try the other one */
-@@ -109,6 +157,7 @@ static int open_output(void)
-       dpm.encoding ^= PE_16BIT;
-       warnings=1;
-     }
-+    }
-   if (dpm.encoding & PE_16BIT)
-     dpm.encoding |= PE_SIGNED;
-   else
-@@ -163,6 +212,8 @@ static int open_output(void)
-   /* Set buffer fragments (in extra_param[0]) */
-   
-   tmp=AUDIO_BUFFER_BITS;
-+  if (luigi_driver)
-+    tmp += 2;
-   if (!(dpm.encoding & PE_MONO)) tmp++;
-   if (dpm.encoding & PE_16BIT) tmp++;
-   tmp |= (dpm.extra_param[0]<<16);
-@@ -189,28 +240,35 @@ static int open_output(void)
-   return warnings;
- }
- 
-+/* output_data comes from Luigi's linux_a.c.  This version seems to allow
-+   for partial writes to the sound device, where as the original version
-+   doesn't. */
- static void output_data(int32 *buf, int32 count)
- {
-+  char *p;
-+  int res, l;
-+  
-   if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
-   
-  if (dpm.encoding & PE_16BIT)
-    {
-+  if (dpm.encoding & PE_16BIT) {
-       /* Convert data to signed 16-bit PCM */
-       s32tos16(buf, count);
-      
-      /* Write the data out. Linux likes to give an EINTR if you suspend
-	 a program while waiting on a write, so we may need to retry. */
-      while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
-	;
-    }
-  else
-    {
-+      res = count*2;
-+  } else {
-       /* Convert to 8-bit unsigned and write out. */
-       s32tou8(buf, count);
-      
-      while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
-	;
-+      res = count;
-+  }
-+  for (p = (char *) buf; res > 0; res -= l) {
-+again:
-+    l = write(dpm.fd, p, res);
-+    if (l < 0) {
-+	if (errno == EINTR)
-+		goto again;
-+	return;
-     }
-+    p += l;
-+  }
- }
- 
- static void close_output(void)
-@@ -220,10 +278,10 @@ static void close_output(void)
- 
- static void flush_output(void)
- {
-  ioctl(dpm.fd, SNDCTL_DSP_SYNC);
-+  ioctl(dpm.fd, SNDCTL_DSP_SYNC,0);
- }
- 
- static void purge_output(void)
- {
-  ioctl(dpm.fd, SNDCTL_DSP_RESET);
-+  ioctl(dpm.fd, SNDCTL_DSP_RESET,0);
- }
--- a/audio/timidity/patches/patch-mix_c
+++ b/audio/timidity/patches/patch-mix_c
@ -1,16 +0,0 @@
-$OpenBSD: patch-mix_c,v 1.1 2001/07/05 10:48:23 espie Exp $
--- mix.c.orig	Mon May 20 15:09:46 1996
-+++ mix.c	Fri Apr 27 08:01:39 2001
-@@ -23,7 +23,12 @@
- 
- #include <math.h>
- #include <stdio.h>
-+
-+#ifdef __OpenBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- 
- #include "config.h"
- #include "common.h"
--- a/audio/timidity/patches/patch-resample_c
+++ b/audio/timidity/patches/patch-resample_c
@ -1,16 +0,0 @@
-$OpenBSD: patch-resample_c,v 1.1 2001/07/05 10:48:24 espie Exp $
--- resample.c.orig	Mon May 20 15:09:47 1996
-+++ resample.c	Fri Apr 27 08:01:39 2001
-@@ -22,7 +22,12 @@
- 
- #include <math.h>
- #include <stdio.h>
-+
-+#ifdef __OpenBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- 
- #include "config.h"
- #include "common.h"
--- a/audio/timidity/patches/patch-timidity_cfg
+++ b/audio/timidity/patches/patch-timidity_cfg
@ -1,24 +1,9 @@
-$OpenBSD: patch-timidity_cfg,v 1.1 2001/07/05 10:48:24 espie Exp $
--- timidity.cfg.orig	Mon May 22 00:40:27 1995
-+++ timidity.cfg	Fri Apr 27 08:01:39 2001
-@@ -34,9 +34,9 @@
- # 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
-+#bank 0
-+#   0 patch/acpiano.pat
-+#  24 patch/nylongt2.pat
- 
- ##############################################################################
- # If you have Dustin McCartney's "wowpats" patches, you can source the 
-@@ -70,6 +70,7 @@ bank 0
- #source midia.cfg
- #
- 
-+source goemon.cfg
- 
- ##############################################################################
- # End of configuration file
+$OpenBSD: patch-timidity_cfg,v 1.2 2006/01/30 10:13:11 jsg Exp $
+--- timidity.cfg.orig	Wed Jan 11 23:23:03 2006
+++ timidity.cfg	Wed Jan 11 23:22:56 2006
+@@ -0,0 +1,5 @@
+#
+#  Instrument configuration for timidity
+#  see timidity.cfg(5) for further details
+#
+
--- a/audio/timidity/pkg/DESCR
+++ b/audio/timidity/pkg/DESCR
@ -1,10 +1,8 @@
-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 or soundfonts 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.

-Flavors (non exclusive):
-	motif, lesstif: motif interface
-	slang: 		text interface
-	curses:		ncurses interface, currently non functional)
+FLAVORs:
+
+	gtk2 - build gtk+2 interface which may be used via 'timidity -ig'
--- a/audio/timidity/pkg/PLIST
+++ b/audio/timidity/pkg/PLIST
@ -1,267 +1,263 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/14 23:16:55 espie Exp $
-bin/bag
+@comment $OpenBSD: PLIST,v 1.5 2006/01/30 10:13:11 jsg Exp $
 bin/timidity
-bin/wav2pat
-lib/timidity/
-lib/timidity/goemon/
-lib/timidity/goemon.cfg
-lib/timidity/goemon/acbass.pat
-lib/timidity/goemon/accordn.pat
-lib/timidity/goemon/acguitar2.pat
-lib/timidity/goemon/agogo.pat
-lib/timidity/goemon/agogohi.pat
-lib/timidity/goemon/agogolo.pat
-lib/timidity/goemon/airpipe.pat
-lib/timidity/goemon/altosax.pat
-lib/timidity/goemon/an_trmp1.pat
-lib/timidity/goemon/applause.pat
-lib/timidity/goemon/atmosphr.pat
-lib/timidity/goemon/aurora.pat
-lib/timidity/goemon/bagpipes.pat
-lib/timidity/goemon/banjo.pat
-lib/timidity/goemon/barisax.pat
-lib/timidity/goemon/basslead.pat
-lib/timidity/goemon/bassoon.pat
-lib/timidity/goemon/bellpad.pat
-lib/timidity/goemon/bells.pat
-lib/timidity/goemon/belltree.pat
-lib/timidity/goemon/bongohi.pat
-lib/timidity/goemon/bongolo.pat
-lib/timidity/goemon/bottleit.pat
-lib/timidity/goemon/bowglass.pat
-lib/timidity/goemon/britenss.pat
-lib/timidity/goemon/britepno.pat
-lib/timidity/goemon/cabasa.pat
-lib/timidity/goemon/carillon.pat
-lib/timidity/goemon/castinet.pat
-lib/timidity/goemon/celeste.pat
-lib/timidity/goemon/cello.pat
-lib/timidity/goemon/charang.pat
-lib/timidity/goemon/chiflead.pat
-lib/timidity/goemon/choir.pat
-lib/timidity/goemon/church.pat
-lib/timidity/goemon/claps.pat
-lib/timidity/goemon/clarinet.pat
-lib/timidity/goemon/clave.pat
-lib/timidity/goemon/clavinet.pat
-lib/timidity/goemon/cleangtr.pat
-lib/timidity/goemon/concrtna.pat
-lib/timidity/goemon/congahi1.pat
-lib/timidity/goemon/congahi2.pat
-lib/timidity/goemon/congalo.pat
-lib/timidity/goemon/contraba.pat
-lib/timidity/goemon/cowbell.pat
-lib/timidity/goemon/cuica1.pat
-lib/timidity/goemon/cuica2.pat
-lib/timidity/goemon/cymbell.pat
-lib/timidity/goemon/cymchina.pat
-lib/timidity/goemon/cymcrsh1.pat
-lib/timidity/goemon/cymcrsh2.pat
-lib/timidity/goemon/cymride1.pat
-lib/timidity/goemon/cymride2.pat
-lib/timidity/goemon/cymsplsh.pat
-lib/timidity/goemon/digitel.pat
-lib/timidity/goemon/distgtr2.pat
-lib/timidity/goemon/englhorn.pat
-lib/timidity/goemon/epiano1.pat
-lib/timidity/goemon/epiano2.pat
-lib/timidity/goemon/fiddle.pat
-lib/timidity/goemon/flute.pat
-lib/timidity/goemon/fngrbass.pat
-lib/timidity/goemon/frenchrn.pat
-lib/timidity/goemon/freshair.pat
-lib/timidity/goemon/fretless.pat
-lib/timidity/goemon/fretnoyz.pat
-lib/timidity/goemon/fx-blow.pat
-lib/timidity/goemon/ghostie.pat
-lib/timidity/goemon/glocken.pat
-lib/timidity/goemon/gsdrum00/
-lib/timidity/goemon/gsdrum00/bank.inf
-lib/timidity/goemon/gsdrum00/bongohi.pat
-lib/timidity/goemon/gsdrum00/bongolo.pat
-lib/timidity/goemon/gsdrum00/cabasa.pat
-lib/timidity/goemon/gsdrum00/congahi1.pat
-lib/timidity/goemon/gsdrum00/congahi2.pat
-lib/timidity/goemon/gsdrum00/congalo.pat
-lib/timidity/goemon/gsdrum00/cowbell.pat
-lib/timidity/goemon/gsdrum00/cuica1.pat
-lib/timidity/goemon/gsdrum00/cuica2.pat
-lib/timidity/goemon/gsdrum00/cymbell.pat
-lib/timidity/goemon/gsdrum00/cymchina.pat
-lib/timidity/goemon/gsdrum00/cymcrsh1.pat
-lib/timidity/goemon/gsdrum00/cymcrsh2.pat
-lib/timidity/goemon/gsdrum00/cymride1.pat
-lib/timidity/goemon/gsdrum00/cymride2.pat
-lib/timidity/goemon/gsdrum00/cymsplsh.pat
-lib/timidity/goemon/gsdrum00/gsdrum00.doc
-lib/timidity/goemon/gsdrum00/gsdrum00.txt
-lib/timidity/goemon/gsdrum00/guiro1.pat
-lib/timidity/goemon/gsdrum00/guiro2.pat
-lib/timidity/goemon/gsdrum00/hihatcl.pat
-lib/timidity/goemon/gsdrum00/hihatop.pat
-lib/timidity/goemon/gsdrum00/hihatpd.pat
-lib/timidity/goemon/gsdrum00/kick1.pat
-lib/timidity/goemon/gsdrum00/kick2.pat
-lib/timidity/goemon/gsdrum00/scratch1.pat
-lib/timidity/goemon/gsdrum00/scratch2.pat
-lib/timidity/goemon/gsdrum00/shaker.pat
-lib/timidity/goemon/gsdrum00/snare1.pat
-lib/timidity/goemon/gsdrum00/snare2.pat
-lib/timidity/goemon/gsdrum00/stickrim.pat
-lib/timidity/goemon/gsdrum00/tamborin.pat
-lib/timidity/goemon/gsdrum00/tomhi1.pat
-lib/timidity/goemon/gsdrum00/tomhi2.pat
-lib/timidity/goemon/gsdrum00/tomlo1.pat
-lib/timidity/goemon/gsdrum00/tomlo2.pat
-lib/timidity/goemon/gsdrum00/tommid1.pat
-lib/timidity/goemon/gsdrum00/tommid2.pat
-lib/timidity/goemon/gsdrum00/woodblk1.pat
-lib/timidity/goemon/gsdrum00/woodblk2.pat
-lib/timidity/goemon/gsdrum08/
-lib/timidity/goemon/gsdrum08/bank.inf
-lib/timidity/goemon/gsdrum08/gsdrum08.doc
-lib/timidity/goemon/gsdrum08/gsdrum08.txt
-lib/timidity/goemon/gsdrum08/roomhi1.pat
-lib/timidity/goemon/gsdrum08/roomhi2.pat
-lib/timidity/goemon/gsdrum08/roomlow1.pat
-lib/timidity/goemon/gsdrum08/roomlow2.pat
-lib/timidity/goemon/gsdrum08/roommid1.pat
-lib/timidity/goemon/gsdrum08/roommid2.pat
-lib/timidity/goemon/gsdrum40/
-lib/timidity/goemon/gsdrum40/bank.inf
-lib/timidity/goemon/gsdrum40/br_slap.pat
-lib/timidity/goemon/gsdrum40/br_swirl.pat
-lib/timidity/goemon/gsdrum40/br_swish.pat
-lib/timidity/goemon/gsdrum40/gsdrum40.bak
-lib/timidity/goemon/gsdrum40/gsdrum40.doc
-lib/timidity/goemon/gsdrum40/gsdrum40.txt
-lib/timidity/goemon/gsdrum40/hihatcl.pat
-lib/timidity/goemon/gsdrum40/hihatop.pat
-lib/timidity/goemon/gtrharm.pat
-lib/timidity/goemon/guiro1.pat
-lib/timidity/goemon/guiro2.pat
-lib/timidity/goemon/gunshot.pat
-lib/timidity/goemon/halopad.pat
-lib/timidity/goemon/hammond.pat
-lib/timidity/goemon/harmonca.pat
-lib/timidity/goemon/harp.pat
-lib/timidity/goemon/helicptr.pat
-lib/timidity/goemon/highq.pat
-lib/timidity/goemon/hihatcl.pat
-lib/timidity/goemon/hihatop.pat
-lib/timidity/goemon/hihatpd.pat
-lib/timidity/goemon/hitbrass.pat
-lib/timidity/goemon/homeorg.pat
-lib/timidity/goemon/honky.pat
-lib/timidity/goemon/hrpschrd.pat
-lib/timidity/goemon/jazzgtr2.pat
-lib/timidity/goemon/jingles.pat
-lib/timidity/goemon/jungle.pat
-lib/timidity/goemon/kalimba.pat
-lib/timidity/goemon/kick1.pat
-lib/timidity/goemon/kick2.pat
-lib/timidity/goemon/koto.pat
-lib/timidity/goemon/lcalliop.pat
-lib/timidity/goemon/lead5th.pat
-lib/timidity/goemon/maracas.pat
-lib/timidity/goemon/marcato.pat
-lib/timidity/goemon/marimba.pat
-lib/timidity/goemon/metalpad.pat
-lib/timidity/goemon/metbell.pat
-lib/timidity/goemon/metclick.pat
-lib/timidity/goemon/mutegtr2.pat
-lib/timidity/goemon/mutetrum.pat
-lib/timidity/goemon/nyguitar.pat
-lib/timidity/goemon/ob8.pat
-lib/timidity/goemon/oboe.pat
-lib/timidity/goemon/ocarina.pat
-lib/timidity/goemon/odguitar.pat
-lib/timidity/goemon/orchhit.pat
-lib/timidity/goemon/percorg.pat
-lib/timidity/goemon/piccolo.pat
-lib/timidity/goemon/pickbass.pat
-lib/timidity/goemon/pizzcato.pat
-lib/timidity/goemon/recorder.pat
-lib/timidity/goemon/reedorg.pat
-lib/timidity/goemon/revcym.pat
-lib/timidity/goemon/rhodes.pat
-lib/timidity/goemon/rvrbxylo.pat
-lib/timidity/goemon/santur.pat
-lib/timidity/goemon/sawwave.pat
-lib/timidity/goemon/scratch1.pat
-lib/timidity/goemon/scratch2.pat
-lib/timidity/goemon/seagulls.pat
-lib/timidity/goemon/shakazul.pat
-lib/timidity/goemon/shaker.pat
-lib/timidity/goemon/shamisen.pat
-lib/timidity/goemon/shannai.pat
-lib/timidity/goemon/sitar.pat
-lib/timidity/goemon/slap.pat
-lib/timidity/goemon/slapbas1.pat
-lib/timidity/goemon/slapbas2.pat
-lib/timidity/goemon/slapbass.pat
-lib/timidity/goemon/snare1.pat
-lib/timidity/goemon/snare2.pat
-lib/timidity/goemon/sologrnd.pat
-lib/timidity/goemon/soundtrk.pat
-lib/timidity/goemon/spctbell.pat
-lib/timidity/goemon/sprnosax.pat
-lib/timidity/goemon/sqrclick.pat
-lib/timidity/goemon/sqrwave.pat
-lib/timidity/goemon/startrak.pat
-lib/timidity/goemon/steeldrm.pat
-lib/timidity/goemon/stickrim.pat
-lib/timidity/goemon/sticks.pat
-lib/timidity/goemon/strings.pat
-lib/timidity/goemon/surdo1.pat
-lib/timidity/goemon/surdo2.pat
-lib/timidity/goemon/sweeper.pat
-lib/timidity/goemon/synbass1.pat
-lib/timidity/goemon/synbass2.pat
-lib/timidity/goemon/synbras1.pat
-lib/timidity/goemon/synbras2.pat
-lib/timidity/goemon/synstr1.pat
-lib/timidity/goemon/synstr2.pat
-lib/timidity/goemon/syntom.pat
-lib/timidity/goemon/synvoic1.pat
-lib/timidity/goemon/taiko.pat
-lib/timidity/goemon/tamborin.pat
-lib/timidity/goemon/tenorsax.pat
-lib/timidity/goemon/timbaleh.pat
-lib/timidity/goemon/timbalel.pat
-lib/timidity/goemon/timpani.pat
-lib/timidity/goemon/tomhi1.pat
-lib/timidity/goemon/tomhi2.pat
-lib/timidity/goemon/tomlo1.pat
-lib/timidity/goemon/tomlo2.pat
-lib/timidity/goemon/tommid1.pat
-lib/timidity/goemon/tommid2.pat
-lib/timidity/goemon/toms.pat
-lib/timidity/goemon/tremstr.pat
-lib/timidity/goemon/triangl1.pat
-lib/timidity/goemon/triangl2.pat
-lib/timidity/goemon/trombone.pat
-lib/timidity/goemon/tuba.pat
-lib/timidity/goemon/tubebell.pat
-lib/timidity/goemon/unicorn.pat
-lib/timidity/goemon/vibes.pat
-lib/timidity/goemon/vibslap.pat
-lib/timidity/goemon/viola.pat
-lib/timidity/goemon/violin.pat
-lib/timidity/goemon/voicedoo.pat
-lib/timidity/goemon/voices.pat
-lib/timidity/goemon/warmpad.pat
-lib/timidity/goemon/whistle.pat
-lib/timidity/goemon/whistle1.pat
-lib/timidity/goemon/whistle2.pat
-lib/timidity/goemon/woodblk.pat
-lib/timidity/goemon/woodblk1.pat
-lib/timidity/goemon/woodblk2.pat
-lib/timidity/goemon/woodflut.pat
-lib/timidity/gravis.cfg
-lib/timidity/gsdrum.cfg
-lib/timidity/midia.cfg
-lib/timidity/mt32.cfg
-lib/timidity/timidity.cfg
-lib/timidity/wowpats.cfg
@man man/man1/timidity.1
+@man man/man5/timidity.cfg.5
+share/examples/timidity/
+share/examples/timidity/timidity.cfg
+@sample ${SYSCONFDIR}/timidity.cfg
+share/timidity/
+share/timidity/goemon/
+share/timidity/goemon/acbass.pat
+share/timidity/goemon/accordn.pat
+share/timidity/goemon/acguitar2.pat
+share/timidity/goemon/agogo.pat
+share/timidity/goemon/agogohi.pat
+share/timidity/goemon/agogolo.pat
+share/timidity/goemon/airpipe.pat
+share/timidity/goemon/altosax.pat
+share/timidity/goemon/an_trmp1.pat
+share/timidity/goemon/applause.pat
+share/timidity/goemon/atmosphr.pat
+share/timidity/goemon/aurora.pat
+share/timidity/goemon/bagpipes.pat
+share/timidity/goemon/banjo.pat
+share/timidity/goemon/barisax.pat
+share/timidity/goemon/basslead.pat
+share/timidity/goemon/bassoon.pat
+share/timidity/goemon/bellpad.pat
+share/timidity/goemon/bells.pat
+share/timidity/goemon/belltree.pat
+share/timidity/goemon/bongohi.pat
+share/timidity/goemon/bongolo.pat
+share/timidity/goemon/bottleit.pat
+share/timidity/goemon/bowglass.pat
+share/timidity/goemon/britenss.pat
+share/timidity/goemon/britepno.pat
+share/timidity/goemon/cabasa.pat
+share/timidity/goemon/carillon.pat
+share/timidity/goemon/castinet.pat
+share/timidity/goemon/celeste.pat
+share/timidity/goemon/cello.pat
+share/timidity/goemon/charang.pat
+share/timidity/goemon/chiflead.pat
+share/timidity/goemon/choir.pat
+share/timidity/goemon/church.pat
+share/timidity/goemon/claps.pat
+share/timidity/goemon/clarinet.pat
+share/timidity/goemon/clave.pat
+share/timidity/goemon/clavinet.pat
+share/timidity/goemon/cleangtr.pat
+share/timidity/goemon/concrtna.pat
+share/timidity/goemon/congahi1.pat
+share/timidity/goemon/congahi2.pat
+share/timidity/goemon/congalo.pat
+share/timidity/goemon/contraba.pat
+share/timidity/goemon/cowbell.pat
+share/timidity/goemon/cuica1.pat
+share/timidity/goemon/cuica2.pat
+share/timidity/goemon/cymbell.pat
+share/timidity/goemon/cymchina.pat
+share/timidity/goemon/cymcrsh1.pat
+share/timidity/goemon/cymcrsh2.pat
+share/timidity/goemon/cymride1.pat
+share/timidity/goemon/cymride2.pat
+share/timidity/goemon/cymsplsh.pat
+share/timidity/goemon/digitel.pat
+share/timidity/goemon/distgtr2.pat
+share/timidity/goemon/englhorn.pat
+share/timidity/goemon/epiano1.pat
+share/timidity/goemon/epiano2.pat
+share/timidity/goemon/fiddle.pat
+share/timidity/goemon/flute.pat
+share/timidity/goemon/fngrbass.pat
+share/timidity/goemon/frenchrn.pat
+share/timidity/goemon/freshair.pat
+share/timidity/goemon/fretless.pat
+share/timidity/goemon/fretnoyz.pat
+share/timidity/goemon/fx-blow.pat
+share/timidity/goemon/ghostie.pat
+share/timidity/goemon/glocken.pat
+share/timidity/goemon/goemon.cfg
+share/timidity/goemon/gsdrum00/
+share/timidity/goemon/gsdrum00/bank.inf
+share/timidity/goemon/gsdrum00/bongohi.pat
+share/timidity/goemon/gsdrum00/bongolo.pat
+share/timidity/goemon/gsdrum00/cabasa.pat
+share/timidity/goemon/gsdrum00/congahi1.pat
+share/timidity/goemon/gsdrum00/congahi2.pat
+share/timidity/goemon/gsdrum00/congalo.pat
+share/timidity/goemon/gsdrum00/cowbell.pat
+share/timidity/goemon/gsdrum00/cuica1.pat
+share/timidity/goemon/gsdrum00/cuica2.pat
+share/timidity/goemon/gsdrum00/cymbell.pat
+share/timidity/goemon/gsdrum00/cymchina.pat
+share/timidity/goemon/gsdrum00/cymcrsh1.pat
+share/timidity/goemon/gsdrum00/cymcrsh2.pat
+share/timidity/goemon/gsdrum00/cymride1.pat
+share/timidity/goemon/gsdrum00/cymride2.pat
+share/timidity/goemon/gsdrum00/cymsplsh.pat
+share/timidity/goemon/gsdrum00/gsdrum00.doc
+share/timidity/goemon/gsdrum00/gsdrum00.txt
+share/timidity/goemon/gsdrum00/guiro1.pat
+share/timidity/goemon/gsdrum00/guiro2.pat
+share/timidity/goemon/gsdrum00/hihatcl.pat
+share/timidity/goemon/gsdrum00/hihatop.pat
+share/timidity/goemon/gsdrum00/hihatpd.pat
+share/timidity/goemon/gsdrum00/kick1.pat
+share/timidity/goemon/gsdrum00/kick2.pat
+share/timidity/goemon/gsdrum00/scratch1.pat
+share/timidity/goemon/gsdrum00/scratch2.pat
+share/timidity/goemon/gsdrum00/shaker.pat
+share/timidity/goemon/gsdrum00/snare1.pat
+share/timidity/goemon/gsdrum00/snare2.pat
+share/timidity/goemon/gsdrum00/stickrim.pat
+share/timidity/goemon/gsdrum00/tamborin.pat
+share/timidity/goemon/gsdrum00/tomhi1.pat
+share/timidity/goemon/gsdrum00/tomhi2.pat
+share/timidity/goemon/gsdrum00/tomlo1.pat
+share/timidity/goemon/gsdrum00/tomlo2.pat
+share/timidity/goemon/gsdrum00/tommid1.pat
+share/timidity/goemon/gsdrum00/tommid2.pat
+share/timidity/goemon/gsdrum00/woodblk1.pat
+share/timidity/goemon/gsdrum00/woodblk2.pat
+share/timidity/goemon/gsdrum08/
+share/timidity/goemon/gsdrum08/bank.inf
+share/timidity/goemon/gsdrum08/gsdrum08.doc
+share/timidity/goemon/gsdrum08/gsdrum08.txt
+share/timidity/goemon/gsdrum08/roomhi1.pat
+share/timidity/goemon/gsdrum08/roomhi2.pat
+share/timidity/goemon/gsdrum08/roomlow1.pat
+share/timidity/goemon/gsdrum08/roomlow2.pat
+share/timidity/goemon/gsdrum08/roommid1.pat
+share/timidity/goemon/gsdrum08/roommid2.pat
+share/timidity/goemon/gsdrum40/
+share/timidity/goemon/gsdrum40/bank.inf
+share/timidity/goemon/gsdrum40/br_slap.pat
+share/timidity/goemon/gsdrum40/br_swirl.pat
+share/timidity/goemon/gsdrum40/br_swish.pat
+share/timidity/goemon/gsdrum40/gsdrum40.bak
+share/timidity/goemon/gsdrum40/gsdrum40.doc
+share/timidity/goemon/gsdrum40/gsdrum40.txt
+share/timidity/goemon/gsdrum40/hihatcl.pat
+share/timidity/goemon/gsdrum40/hihatop.pat
+share/timidity/goemon/gtrharm.pat
+share/timidity/goemon/guiro1.pat
+share/timidity/goemon/guiro2.pat
+share/timidity/goemon/gunshot.pat
+share/timidity/goemon/halopad.pat
+share/timidity/goemon/hammond.pat
+share/timidity/goemon/harmonca.pat
+share/timidity/goemon/harp.pat
+share/timidity/goemon/helicptr.pat
+share/timidity/goemon/highq.pat
+share/timidity/goemon/hihatcl.pat
+share/timidity/goemon/hihatop.pat
+share/timidity/goemon/hihatpd.pat
+share/timidity/goemon/hitbrass.pat
+share/timidity/goemon/homeorg.pat
+share/timidity/goemon/honky.pat
+share/timidity/goemon/hrpschrd.pat
+share/timidity/goemon/jazzgtr2.pat
+share/timidity/goemon/jingles.pat
+share/timidity/goemon/jungle.pat
+share/timidity/goemon/kalimba.pat
+share/timidity/goemon/kick1.pat
+share/timidity/goemon/kick2.pat
+share/timidity/goemon/koto.pat
+share/timidity/goemon/lcalliop.pat
+share/timidity/goemon/lead5th.pat
+share/timidity/goemon/maracas.pat
+share/timidity/goemon/marcato.pat
+share/timidity/goemon/marimba.pat
+share/timidity/goemon/metalpad.pat
+share/timidity/goemon/metbell.pat
+share/timidity/goemon/metclick.pat
+share/timidity/goemon/mutegtr2.pat
+share/timidity/goemon/mutetrum.pat
+share/timidity/goemon/nyguitar.pat
+share/timidity/goemon/ob8.pat
+share/timidity/goemon/oboe.pat
+share/timidity/goemon/ocarina.pat
+share/timidity/goemon/odguitar.pat
+share/timidity/goemon/orchhit.pat
+share/timidity/goemon/percorg.pat
+share/timidity/goemon/piccolo.pat
+share/timidity/goemon/pickbass.pat
+share/timidity/goemon/pizzcato.pat
+share/timidity/goemon/recorder.pat
+share/timidity/goemon/reedorg.pat
+share/timidity/goemon/revcym.pat
+share/timidity/goemon/rhodes.pat
+share/timidity/goemon/rvrbxylo.pat
+share/timidity/goemon/santur.pat
+share/timidity/goemon/sawwave.pat
+share/timidity/goemon/scratch1.pat
+share/timidity/goemon/scratch2.pat
+share/timidity/goemon/seagulls.pat
+share/timidity/goemon/shakazul.pat
+share/timidity/goemon/shaker.pat
+share/timidity/goemon/shamisen.pat
+share/timidity/goemon/shannai.pat
+share/timidity/goemon/sitar.pat
+share/timidity/goemon/slap.pat
+share/timidity/goemon/slapbas1.pat
+share/timidity/goemon/slapbas2.pat
+share/timidity/goemon/slapbass.pat
+share/timidity/goemon/snare1.pat
+share/timidity/goemon/snare2.pat
+share/timidity/goemon/sologrnd.pat
+share/timidity/goemon/soundtrk.pat
+share/timidity/goemon/spctbell.pat
+share/timidity/goemon/sprnosax.pat
+share/timidity/goemon/sqrclick.pat
+share/timidity/goemon/sqrwave.pat
+share/timidity/goemon/startrak.pat
+share/timidity/goemon/steeldrm.pat
+share/timidity/goemon/stickrim.pat
+share/timidity/goemon/sticks.pat
+share/timidity/goemon/strings.pat
+share/timidity/goemon/surdo1.pat
+share/timidity/goemon/surdo2.pat
+share/timidity/goemon/sweeper.pat
+share/timidity/goemon/synbass1.pat
+share/timidity/goemon/synbass2.pat
+share/timidity/goemon/synbras1.pat
+share/timidity/goemon/synbras2.pat
+share/timidity/goemon/synstr1.pat
+share/timidity/goemon/synstr2.pat
+share/timidity/goemon/syntom.pat
+share/timidity/goemon/synvoic1.pat
+share/timidity/goemon/taiko.pat
+share/timidity/goemon/tamborin.pat
+share/timidity/goemon/tenorsax.pat
+share/timidity/goemon/timbaleh.pat
+share/timidity/goemon/timbalel.pat
+share/timidity/goemon/timpani.pat
+share/timidity/goemon/tomhi1.pat
+share/timidity/goemon/tomhi2.pat
+share/timidity/goemon/tomlo1.pat
+share/timidity/goemon/tomlo2.pat
+share/timidity/goemon/tommid1.pat
+share/timidity/goemon/tommid2.pat
+share/timidity/goemon/toms.pat
+share/timidity/goemon/tremstr.pat
+share/timidity/goemon/triangl1.pat
+share/timidity/goemon/triangl2.pat
+share/timidity/goemon/trombone.pat
+share/timidity/goemon/tuba.pat
+share/timidity/goemon/tubebell.pat
+share/timidity/goemon/unicorn.pat
+share/timidity/goemon/vibes.pat
+share/timidity/goemon/vibslap.pat
+share/timidity/goemon/viola.pat
+share/timidity/goemon/violin.pat
+share/timidity/goemon/voicedoo.pat
+share/timidity/goemon/voices.pat
+share/timidity/goemon/warmpad.pat
+share/timidity/goemon/whistle.pat
+share/timidity/goemon/whistle1.pat
+share/timidity/goemon/whistle2.pat
+share/timidity/goemon/woodblk.pat
+share/timidity/goemon/woodblk1.pat
+share/timidity/goemon/woodblk2.pat
+share/timidity/goemon/woodflut.pat