unbroke the port (fetch)

use gus patches set now

10 files changed, 758 insertions, 808 deletions

diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 43dabd7769f9..fdc8e310a874 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -4,35 +4,26 @@
 # Date created:         17 Nov 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.7 1998/06/16 16:04:51 ache Exp $
+# $Id: Makefile,v 1.8 1998/09/28 01:53:45 steve Exp $
 #
 
 DISTNAME=       timidity-0.2i
 CATEGORIES=     audio
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/ \
-		http://www.cgs.fi/~tt/timidity/
-TIINS=          dgguspat.zip
+		http://www.goice.co.jp/member/mo/timidity/dist/
+TIINS=          goemon.tgz
 DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-BROKEN=		fetch
-
 NO_CDROM=       "Uses copyrighted patches"
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 INSTALL_TARGET= install.all
 MAN1=           timidity.1
 
-do-configure:
-	@cd ${WRKSRC} && \
-	sed "s=%PREFIX%=${PREFIX}=" < gravis.cfg > gravis.cfg.new && \
-	mv gravis.cfg.new gravis.cfg
-
 post-install:
-	cd ${PREFIX}/lib/timidity/patch && \
-	unzip -o -q -L ${DISTDIR}/${TIINS}
+	cd ${PREFIX}/lib/timidity && \
+	tar zxf ${DISTDIR}/${TIINS}
 
 .include <bsd.port.mk>
diff --git a/audio/timidity++/distinfo b/audio/timidity++/distinfo
index f39b89342963..953135d52b3b 100644
--- a/audio/timidity++/distinfo
+++ b/audio/timidity++/distinfo
@@ -1,2 +1,2 @@
-MD5 (dgguspat.zip) = 94affd73c5b53ff0d5e12df1bc55c53d
+MD5 (goemon.tgz) = c423e721be2e39bd9d69aec171074d81
 MD5 (timidity-0.2i.tar.gz) = 7dedd75232aaa7729e50c76cdd379b82
diff --git a/audio/timidity++/files/patch-ab b/audio/timidity++/files/patch-ab
index 34e8d69c27af..ca9ccdf6fcfe 100644
--- a/audio/timidity++/files/patch-ab
+++ b/audio/timidity++/files/patch-ab
@@ -1,150 +1,92 @@
-*** Makefile.orig	Sun May 26 13:26:46 1996
---- Makefile	Sun Nov 17 13:09:19 1996
-***************
-*** 24,45 ****
-  # But where to change without revealing my secret identity?
-  
-  ########### Compiler and flags.
-! CC = gcc
-! DEBUGFLAGS = -Wall -O2
-  
-  ########### Install.
-! INSTALL = /usr/bin/install
-  
-  # Where to install the executable
-! BIN_DIR = /usr/local/bin
-  
-  # Where to install the manual pages
-! MAN_DIR = /usr/local/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
-  
-  # Where to install the Tcl code, if you use the Tcl code that is.
-  TCL_DIR = $(TIMID_DIR)
---- 24,45 ----
-  # But where to change without revealing my secret identity?
-  
-  ########### Compiler and flags.
-! #CC = gcc
-! DEBUGFLAGS = -Wall
-  
-  ########### Install.
-! #INSTALL = /usr/bin/install
-  
-  # Where to install the executable
-! BIN_DIR = ${PREFIX}/bin
-  
-  # Where to install the manual pages
-! 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 = ${PREFIX}/lib/timidity
-  
-  # Where to install the Tcl code, if you use the Tcl code that is.
-  TCL_DIR = $(TIMID_DIR)
-***************
-*** 93,100 ****
-  # Select the ncurses full-screen interface
-  SYSTEM += -DIA_NCURSES
-  SYSEXTRAS += ncurs_c.c
-! EXTRAINCS += -I/usr/include/ncurses
-! EXTRALIBS += -lncurses
-  
-  ## Select the S-Lang full-screen interface
-  #SYSTEM += -DIA_SLANG
---- 93,100 ----
-  # Select the ncurses full-screen interface
-  SYSTEM += -DIA_NCURSES
-  SYSEXTRAS += ncurs_c.c
-! #EXTRAINCS += -I/usr/include/ncurses
-! EXTRALIBS += -lncurses -lmytinfo
-  
-  ## Select the S-Lang full-screen interface
-  #SYSTEM += -DIA_SLANG
-***************
-*** 112,120 ****
-  #EXTRALIBS += -lgen
-  
-  # Select the Tcl/Tk interface
-! SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-! SYSEXTRAS += tk_c.c
-! INST_TK = install.tk
-  #EXTRAINCS +=
-  #EXTRALIBS +=
-  
---- 112,120 ----
-  #EXTRALIBS += -lgen
-  
-  # Select the Tcl/Tk interface
-! #SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-! #SYSEXTRAS += tk_c.c
-! #INST_TK = install.tk
-  #EXTRAINCS +=
-  #EXTRALIBS +=
-  
-***************
-*** 136,142 ****
-  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
-  SDISTZIP = tilib$(FNSUPPVERSION).zip
-  
-! CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
-  
-  ########### All relevant files.. Anybody know autoconf?
---- 136,142 ----
-  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
-  SDISTZIP = tilib$(FNSUPPVERSION).zip
-  
-! CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
-  
-  ########### All relevant files.. Anybody know autoconf?
-***************
-*** 228,237 ****
-  wav2pat: wav2pat.c
-  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
-  
-! depends depend dep:
-! 	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-! 
-! include depends
-  
-  ########### Installation targets
-  
---- 228,237 ----
-  wav2pat: wav2pat.c
-  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
-  
-! #depends depend dep:
-! #        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-! #
-! #include depends
-  
-  ########### Installation targets
-  
-***************
-*** 262,270 ****
-  	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.tk: $(ALLTCLF)
-  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
---- 262,270 ----
-  	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.tk: $(ALLTCLF)
-  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
+--- Makefile.orig	Sun May 26 13:26:46 1996
++++ Makefile	Mon Jan  4 04:08:35 1999
+@@ -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 = ${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}/lib/timidity
+ 
+ # Where to install the Tcl code, if you use the Tcl code that is.
+ TCL_DIR = $(TIMID_DIR)
+@@ -93,8 +93,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 -lmytinfo
+ 
+ ## Select the S-Lang full-screen interface
+ #SYSTEM += -DIA_SLANG
+@@ -112,9 +112,9 @@
+ #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 +136,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 +228,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 +262,9 @@
+ 	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)
diff --git a/audio/timidity++/files/patch-ac b/audio/timidity++/files/patch-ac
index ad4e745c08e9..76b2da1f5441 100644
--- a/audio/timidity++/files/patch-ac
+++ b/audio/timidity++/files/patch-ac
@@ -1,40 +1,23 @@
-*** 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
-  #
-  
-  
+--- timidity.cfg.orig	Mon May 22 02:40:27 1995
++++ timidity.cfg	Mon Jan  4 03:55:42 1999
+@@ -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 @@
+ #source midia.cfg
+ #
+ 
++source goemon.cfg
+ 
+ ##############################################################################
+ # End of configuration file
diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist
index 2eb3a0c48e01..c8b393a49881 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -1,206 +1,265 @@
 bin/timidity
 bin/bag
 bin/wav2pat
-lib/timidity/timidity.cfg
-lib/timidity/gsdrum.cfg
+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/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/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/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/wowpats.cfg
 lib/timidity/mt32.cfg
-lib/timidity/patch/acbass.pat
-lib/timidity/patch/accordn.pat
-lib/timidity/patch/acguitar.pat
-lib/timidity/patch/acpiano.pat
-lib/timidity/patch/agogo.pat
-lib/timidity/patch/agogohi.pat
-lib/timidity/patch/agogolo.pat
-lib/timidity/patch/altosax.pat
-lib/timidity/patch/applause.pat
-lib/timidity/patch/atmosphr.pat
-lib/timidity/patch/aurora.pat
-lib/timidity/patch/bagpipes.pat
-lib/timidity/patch/banjo.pat
-lib/timidity/patch/barisax.pat
-lib/timidity/patch/basslead.pat
-lib/timidity/patch/bassoon.pat
-lib/timidity/patch/belltree.pat
-lib/timidity/patch/blank.pat
-lib/timidity/patch/bongohi.pat
-lib/timidity/patch/bongolo.pat
-lib/timidity/patch/bottle.pat
-lib/timidity/patch/bowglass.pat
-lib/timidity/patch/britepno.pat
-lib/timidity/patch/c550kc_1.pat
-lib/timidity/patch/c550sn10.pat
-lib/timidity/patch/c550sn_6.pat
-lib/timidity/patch/c550vibs.pat
-lib/timidity/patch/cabasa.pat
-lib/timidity/patch/calliope.pat
-lib/timidity/patch/carillon.pat
-lib/timidity/patch/castinet.pat
-lib/timidity/patch/celeste.pat
-lib/timidity/patch/cello.pat
-lib/timidity/patch/charang.pat
-lib/timidity/patch/chiflead.pat
-lib/timidity/patch/choir.pat
-lib/timidity/patch/church.pat
-lib/timidity/patch/claps.pat
-lib/timidity/patch/clarinet.pat
-lib/timidity/patch/clave.pat
-lib/timidity/patch/clavinet.pat
-lib/timidity/patch/cleangtr.pat
-lib/timidity/patch/concrtna.pat
-lib/timidity/patch/congahi1.pat
-lib/timidity/patch/congahi2.pat
-lib/timidity/patch/congalo.pat
-lib/timidity/patch/contraba.pat
-lib/timidity/patch/cowbell.pat
-lib/timidity/patch/crystal.pat
-lib/timidity/patch/cuica1.pat
-lib/timidity/patch/cuica2.pat
-lib/timidity/patch/cymbell.pat
-lib/timidity/patch/cymchina.pat
-lib/timidity/patch/cymcrsh1.pat
-lib/timidity/patch/cymcrsh2.pat
-lib/timidity/patch/cymride1.pat
-lib/timidity/patch/cymride2.pat
-lib/timidity/patch/cymsplsh.pat
-lib/timidity/patch/distgtr.pat
-lib/timidity/patch/doo.pat
-lib/timidity/patch/echovox.pat
-lib/timidity/patch/englhorn.pat
-lib/timidity/patch/epiano1.pat
-lib/timidity/patch/epiano2.pat
-lib/timidity/patch/fantasia.pat
-lib/timidity/patch/fiddle.pat
-lib/timidity/patch/flute.pat
-lib/timidity/patch/fngrbass.pat
-lib/timidity/patch/frenchrn.pat
-lib/timidity/patch/freshair.pat
-lib/timidity/patch/fretless.pat
-lib/timidity/patch/fx-blow.pat
-lib/timidity/patch/fx-fret.pat
-lib/timidity/patch/ghostie.pat
-lib/timidity/patch/glocken.pat
-lib/timidity/patch/gtrharm.pat
-lib/timidity/patch/guiro1.pat
-lib/timidity/patch/guiro2.pat
-lib/timidity/patch/halopad.pat
-lib/timidity/patch/harmonca.pat
-lib/timidity/patch/harp.pat
-lib/timidity/patch/helicptr.pat
-lib/timidity/patch/highq.pat
-lib/timidity/patch/hihatcl.pat
-lib/timidity/patch/hihatop.pat
-lib/timidity/patch/hihatpd.pat
-lib/timidity/patch/hitbrass.pat
-lib/timidity/patch/homeorg.pat
-lib/timidity/patch/honky.pat
-lib/timidity/patch/hrpschrd.pat
-lib/timidity/patch/jazzgtr.pat
-lib/timidity/patch/jingles.pat
-lib/timidity/patch/jungle.pat
-lib/timidity/patch/kalimba.pat
-lib/timidity/patch/kick1.pat
-lib/timidity/patch/kick2.pat
-lib/timidity/patch/koto.pat
-lib/timidity/patch/lead5th.pat
-lib/timidity/patch/maracas.pat
-lib/timidity/patch/marcato.pat
-lib/timidity/patch/marimba.pat
-lib/timidity/patch/metalpad.pat
-lib/timidity/patch/metbell.pat
-lib/timidity/patch/metclick.pat
-lib/timidity/patch/musicbox.pat
-lib/timidity/patch/mutegtr.pat
-lib/timidity/patch/mutetrum.pat
-lib/timidity/patch/nyguitar.pat
-lib/timidity/patch/oboe.pat
-lib/timidity/patch/ocarina.pat
-lib/timidity/patch/odguitar.pat
-lib/timidity/patch/orchhit.pat
-lib/timidity/patch/percorg.pat
-lib/timidity/patch/piccolo.pat
-lib/timidity/patch/pickbass.pat
-lib/timidity/patch/pistol.pat
-lib/timidity/patch/pizzcato.pat
-lib/timidity/patch/polysyn.pat
-lib/timidity/patch/recorder.pat
-lib/timidity/patch/reedorg.pat
-lib/timidity/patch/revcym.pat
-lib/timidity/patch/ringwhsl.pat
-lib/timidity/patch/rockorg.pat
-lib/timidity/patch/santur.pat
-lib/timidity/patch/sawwave.pat
-lib/timidity/patch/scratch1.pat
-lib/timidity/patch/scratch2.pat
-lib/timidity/patch/seashore.pat
-lib/timidity/patch/shakazul.pat
-lib/timidity/patch/shaker.pat
-lib/timidity/patch/shamisen.pat
-lib/timidity/patch/shannai.pat
-lib/timidity/patch/sitar.pat
-lib/timidity/patch/slap.pat
-lib/timidity/patch/slapbas1.pat
-lib/timidity/patch/slapbas2.pat
-lib/timidity/patch/slowstr.pat
-lib/timidity/patch/snare1.pat
-lib/timidity/patch/snare2.pat
-lib/timidity/patch/soundtrk.pat
-lib/timidity/patch/sprnosax.pat
-lib/timidity/patch/sqrclick.pat
-lib/timidity/patch/sqrwave.pat
-lib/timidity/patch/startrak.pat
-lib/timidity/patch/steeldrm.pat
-lib/timidity/patch/stickrim.pat
-lib/timidity/patch/sticks.pat
-lib/timidity/patch/surdo1.pat
-lib/timidity/patch/surdo2.pat
-lib/timidity/patch/sweeper.pat
-lib/timidity/patch/synbass1.pat
-lib/timidity/patch/synbass2.pat
-lib/timidity/patch/synbras1.pat
-lib/timidity/patch/synbras2.pat
-lib/timidity/patch/synpiano.pat
-lib/timidity/patch/synstr1.pat
-lib/timidity/patch/synstr2.pat
-lib/timidity/patch/syntom.pat
-lib/timidity/patch/taiko.pat
-lib/timidity/patch/tamborin.pat
-lib/timidity/patch/telephon.pat
-lib/timidity/patch/tenorsax.pat
-lib/timidity/patch/timbaleh.pat
-lib/timidity/patch/timbalel.pat
-lib/timidity/patch/timpani.pat
-lib/timidity/patch/tomhi1.pat
-lib/timidity/patch/tomhi2.pat
-lib/timidity/patch/tomlo1.pat
-lib/timidity/patch/tomlo2.pat
-lib/timidity/patch/tommid1.pat
-lib/timidity/patch/tommid2.pat
-lib/timidity/patch/toms.pat
-lib/timidity/patch/tremstr.pat
-lib/timidity/patch/triangl1.pat
-lib/timidity/patch/triangl2.pat
-lib/timidity/patch/trombone.pat
-lib/timidity/patch/trumpet.pat
-lib/timidity/patch/tuba.pat
-lib/timidity/patch/tubebell.pat
-lib/timidity/patch/unicorn.pat
-lib/timidity/patch/vibes.pat
-lib/timidity/patch/vibslap.pat
-lib/timidity/patch/viola.pat
-lib/timidity/patch/violin.pat
-lib/timidity/patch/voices.pat
-lib/timidity/patch/voxlead.pat
-lib/timidity/patch/warmpad.pat
-lib/timidity/patch/whistle.pat
-lib/timidity/patch/whistle1.pat
-lib/timidity/patch/whistle2.pat
-lib/timidity/patch/woodblk.pat
-lib/timidity/patch/woodblk1.pat
-lib/timidity/patch/woodblk2.pat
-lib/timidity/patch/woodflut.pat
-lib/timidity/patch/xylophon.pat
-@dirrm lib/timidity/patch
+lib/timidity/timidity.cfg
+lib/timidity/wowpats.cfg
+@dirrm lib/timidity/goemon/gsdrum40
+@dirrm lib/timidity/goemon/gsdrum08
+@dirrm lib/timidity/goemon/gsdrum00
+@dirrm lib/timidity/goemon
 @dirrm lib/timidity
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 43dabd7769f9..fdc8e310a874 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -4,35 +4,26 @@
 # Date created:         17 Nov 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.7 1998/06/16 16:04:51 ache Exp $
+# $Id: Makefile,v 1.8 1998/09/28 01:53:45 steve Exp $
 #
 
 DISTNAME=       timidity-0.2i
 CATEGORIES=     audio
 MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/ \
-		http://www.cgs.fi/~tt/timidity/
-TIINS=          dgguspat.zip
+		http://www.goice.co.jp/member/mo/timidity/dist/
+TIINS=          goemon.tgz
 DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-BROKEN=		fetch
-
 NO_CDROM=       "Uses copyrighted patches"
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 INSTALL_TARGET= install.all
 MAN1=           timidity.1
 
-do-configure:
-	@cd ${WRKSRC} && \
-	sed "s=%PREFIX%=${PREFIX}=" < gravis.cfg > gravis.cfg.new && \
-	mv gravis.cfg.new gravis.cfg
-
 post-install:
-	cd ${PREFIX}/lib/timidity/patch && \
-	unzip -o -q -L ${DISTDIR}/${TIINS}
+	cd ${PREFIX}/lib/timidity && \
+	tar zxf ${DISTDIR}/${TIINS}
 
 .include <bsd.port.mk>
diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo
index f39b89342963..953135d52b3b 100644
--- a/audio/timidity/distinfo
+++ b/audio/timidity/distinfo
@@ -1,2 +1,2 @@
-MD5 (dgguspat.zip) = 94affd73c5b53ff0d5e12df1bc55c53d
+MD5 (goemon.tgz) = c423e721be2e39bd9d69aec171074d81
 MD5 (timidity-0.2i.tar.gz) = 7dedd75232aaa7729e50c76cdd379b82
diff --git a/audio/timidity/files/patch-ab b/audio/timidity/files/patch-ab
index 34e8d69c27af..ca9ccdf6fcfe 100644
--- a/audio/timidity/files/patch-ab
+++ b/audio/timidity/files/patch-ab
@@ -1,150 +1,92 @@
-*** Makefile.orig	Sun May 26 13:26:46 1996
---- Makefile	Sun Nov 17 13:09:19 1996
-***************
-*** 24,45 ****
-  # But where to change without revealing my secret identity?
-  
-  ########### Compiler and flags.
-! CC = gcc
-! DEBUGFLAGS = -Wall -O2
-  
-  ########### Install.
-! INSTALL = /usr/bin/install
-  
-  # Where to install the executable
-! BIN_DIR = /usr/local/bin
-  
-  # Where to install the manual pages
-! MAN_DIR = /usr/local/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
-  
-  # Where to install the Tcl code, if you use the Tcl code that is.
-  TCL_DIR = $(TIMID_DIR)
---- 24,45 ----
-  # But where to change without revealing my secret identity?
-  
-  ########### Compiler and flags.
-! #CC = gcc
-! DEBUGFLAGS = -Wall
-  
-  ########### Install.
-! #INSTALL = /usr/bin/install
-  
-  # Where to install the executable
-! BIN_DIR = ${PREFIX}/bin
-  
-  # Where to install the manual pages
-! 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 = ${PREFIX}/lib/timidity
-  
-  # Where to install the Tcl code, if you use the Tcl code that is.
-  TCL_DIR = $(TIMID_DIR)
-***************
-*** 93,100 ****
-  # Select the ncurses full-screen interface
-  SYSTEM += -DIA_NCURSES
-  SYSEXTRAS += ncurs_c.c
-! EXTRAINCS += -I/usr/include/ncurses
-! EXTRALIBS += -lncurses
-  
-  ## Select the S-Lang full-screen interface
-  #SYSTEM += -DIA_SLANG
---- 93,100 ----
-  # Select the ncurses full-screen interface
-  SYSTEM += -DIA_NCURSES
-  SYSEXTRAS += ncurs_c.c
-! #EXTRAINCS += -I/usr/include/ncurses
-! EXTRALIBS += -lncurses -lmytinfo
-  
-  ## Select the S-Lang full-screen interface
-  #SYSTEM += -DIA_SLANG
-***************
-*** 112,120 ****
-  #EXTRALIBS += -lgen
-  
-  # Select the Tcl/Tk interface
-! SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-! SYSEXTRAS += tk_c.c
-! INST_TK = install.tk
-  #EXTRAINCS +=
-  #EXTRALIBS +=
-  
---- 112,120 ----
-  #EXTRALIBS += -lgen
-  
-  # Select the Tcl/Tk interface
-! #SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-! #SYSEXTRAS += tk_c.c
-! #INST_TK = install.tk
-  #EXTRAINCS +=
-  #EXTRALIBS +=
-  
-***************
-*** 136,142 ****
-  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
-  SDISTZIP = tilib$(FNSUPPVERSION).zip
-  
-! CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
-  
-  ########### All relevant files.. Anybody know autoconf?
---- 136,142 ----
-  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
-  SDISTZIP = tilib$(FNSUPPVERSION).zip
-  
-! CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
-  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
-  
-  ########### All relevant files.. Anybody know autoconf?
-***************
-*** 228,237 ****
-  wav2pat: wav2pat.c
-  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
-  
-! depends depend dep:
-! 	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-! 
-! include depends
-  
-  ########### Installation targets
-  
---- 228,237 ----
-  wav2pat: wav2pat.c
-  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
-  
-! #depends depend dep:
-! #        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-! #
-! #include depends
-  
-  ########### Installation targets
-  
-***************
-*** 262,270 ****
-  	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.tk: $(ALLTCLF)
-  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
---- 262,270 ----
-  	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.tk: $(ALLTCLF)
-  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
+--- Makefile.orig	Sun May 26 13:26:46 1996
++++ Makefile	Mon Jan  4 04:08:35 1999
+@@ -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 = ${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}/lib/timidity
+ 
+ # Where to install the Tcl code, if you use the Tcl code that is.
+ TCL_DIR = $(TIMID_DIR)
+@@ -93,8 +93,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 -lmytinfo
+ 
+ ## Select the S-Lang full-screen interface
+ #SYSTEM += -DIA_SLANG
+@@ -112,9 +112,9 @@
+ #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 +136,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 +228,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 +262,9 @@
+ 	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)
diff --git a/audio/timidity/files/patch-ac b/audio/timidity/files/patch-ac
index ad4e745c08e9..76b2da1f5441 100644
--- a/audio/timidity/files/patch-ac
+++ b/audio/timidity/files/patch-ac
@@ -1,40 +1,23 @@
-*** 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
-  #
-  
-  
+--- timidity.cfg.orig	Mon May 22 02:40:27 1995
++++ timidity.cfg	Mon Jan  4 03:55:42 1999
+@@ -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 @@
+ #source midia.cfg
+ #
+ 
++source goemon.cfg
+ 
+ ##############################################################################
+ # End of configuration file
diff --git a/audio/timidity/pkg-plist b/audio/timidity/pkg-plist
index 2eb3a0c48e01..c8b393a49881 100644
--- a/audio/timidity/pkg-plist
+++ b/audio/timidity/pkg-plist
@@ -1,206 +1,265 @@
 bin/timidity
 bin/bag
 bin/wav2pat
-lib/timidity/timidity.cfg
-lib/timidity/gsdrum.cfg
+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/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/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/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/wowpats.cfg
 lib/timidity/mt32.cfg
-lib/timidity/patch/acbass.pat
-lib/timidity/patch/accordn.pat
-lib/timidity/patch/acguitar.pat
-lib/timidity/patch/acpiano.pat
-lib/timidity/patch/agogo.pat
-lib/timidity/patch/agogohi.pat
-lib/timidity/patch/agogolo.pat
-lib/timidity/patch/altosax.pat
-lib/timidity/patch/applause.pat
-lib/timidity/patch/atmosphr.pat
-lib/timidity/patch/aurora.pat
-lib/timidity/patch/bagpipes.pat
-lib/timidity/patch/banjo.pat
-lib/timidity/patch/barisax.pat
-lib/timidity/patch/basslead.pat
-lib/timidity/patch/bassoon.pat
-lib/timidity/patch/belltree.pat
-lib/timidity/patch/blank.pat
-lib/timidity/patch/bongohi.pat
-lib/timidity/patch/bongolo.pat
-lib/timidity/patch/bottle.pat
-lib/timidity/patch/bowglass.pat
-lib/timidity/patch/britepno.pat
-lib/timidity/patch/c550kc_1.pat
-lib/timidity/patch/c550sn10.pat
-lib/timidity/patch/c550sn_6.pat
-lib/timidity/patch/c550vibs.pat
-lib/timidity/patch/cabasa.pat
-lib/timidity/patch/calliope.pat
-lib/timidity/patch/carillon.pat
-lib/timidity/patch/castinet.pat
-lib/timidity/patch/celeste.pat
-lib/timidity/patch/cello.pat
-lib/timidity/patch/charang.pat
-lib/timidity/patch/chiflead.pat
-lib/timidity/patch/choir.pat
-lib/timidity/patch/church.pat
-lib/timidity/patch/claps.pat
-lib/timidity/patch/clarinet.pat
-lib/timidity/patch/clave.pat
-lib/timidity/patch/clavinet.pat
-lib/timidity/patch/cleangtr.pat
-lib/timidity/patch/concrtna.pat
-lib/timidity/patch/congahi1.pat
-lib/timidity/patch/congahi2.pat
-lib/timidity/patch/congalo.pat
-lib/timidity/patch/contraba.pat
-lib/timidity/patch/cowbell.pat
-lib/timidity/patch/crystal.pat
-lib/timidity/patch/cuica1.pat
-lib/timidity/patch/cuica2.pat
-lib/timidity/patch/cymbell.pat
-lib/timidity/patch/cymchina.pat
-lib/timidity/patch/cymcrsh1.pat
-lib/timidity/patch/cymcrsh2.pat
-lib/timidity/patch/cymride1.pat
-lib/timidity/patch/cymride2.pat
-lib/timidity/patch/cymsplsh.pat
-lib/timidity/patch/distgtr.pat
-lib/timidity/patch/doo.pat
-lib/timidity/patch/echovox.pat
-lib/timidity/patch/englhorn.pat
-lib/timidity/patch/epiano1.pat
-lib/timidity/patch/epiano2.pat
-lib/timidity/patch/fantasia.pat
-lib/timidity/patch/fiddle.pat
-lib/timidity/patch/flute.pat
-lib/timidity/patch/fngrbass.pat
-lib/timidity/patch/frenchrn.pat
-lib/timidity/patch/freshair.pat
-lib/timidity/patch/fretless.pat
-lib/timidity/patch/fx-blow.pat
-lib/timidity/patch/fx-fret.pat
-lib/timidity/patch/ghostie.pat
-lib/timidity/patch/glocken.pat
-lib/timidity/patch/gtrharm.pat
-lib/timidity/patch/guiro1.pat
-lib/timidity/patch/guiro2.pat
-lib/timidity/patch/halopad.pat
-lib/timidity/patch/harmonca.pat
-lib/timidity/patch/harp.pat
-lib/timidity/patch/helicptr.pat
-lib/timidity/patch/highq.pat
-lib/timidity/patch/hihatcl.pat
-lib/timidity/patch/hihatop.pat
-lib/timidity/patch/hihatpd.pat
-lib/timidity/patch/hitbrass.pat
-lib/timidity/patch/homeorg.pat
-lib/timidity/patch/honky.pat
-lib/timidity/patch/hrpschrd.pat
-lib/timidity/patch/jazzgtr.pat
-lib/timidity/patch/jingles.pat
-lib/timidity/patch/jungle.pat
-lib/timidity/patch/kalimba.pat
-lib/timidity/patch/kick1.pat
-lib/timidity/patch/kick2.pat
-lib/timidity/patch/koto.pat
-lib/timidity/patch/lead5th.pat
-lib/timidity/patch/maracas.pat
-lib/timidity/patch/marcato.pat
-lib/timidity/patch/marimba.pat
-lib/timidity/patch/metalpad.pat
-lib/timidity/patch/metbell.pat
-lib/timidity/patch/metclick.pat
-lib/timidity/patch/musicbox.pat
-lib/timidity/patch/mutegtr.pat
-lib/timidity/patch/mutetrum.pat
-lib/timidity/patch/nyguitar.pat
-lib/timidity/patch/oboe.pat
-lib/timidity/patch/ocarina.pat
-lib/timidity/patch/odguitar.pat
-lib/timidity/patch/orchhit.pat
-lib/timidity/patch/percorg.pat
-lib/timidity/patch/piccolo.pat
-lib/timidity/patch/pickbass.pat
-lib/timidity/patch/pistol.pat
-lib/timidity/patch/pizzcato.pat
-lib/timidity/patch/polysyn.pat
-lib/timidity/patch/recorder.pat
-lib/timidity/patch/reedorg.pat
-lib/timidity/patch/revcym.pat
-lib/timidity/patch/ringwhsl.pat
-lib/timidity/patch/rockorg.pat
-lib/timidity/patch/santur.pat
-lib/timidity/patch/sawwave.pat
-lib/timidity/patch/scratch1.pat
-lib/timidity/patch/scratch2.pat
-lib/timidity/patch/seashore.pat
-lib/timidity/patch/shakazul.pat
-lib/timidity/patch/shaker.pat
-lib/timidity/patch/shamisen.pat
-lib/timidity/patch/shannai.pat
-lib/timidity/patch/sitar.pat
-lib/timidity/patch/slap.pat
-lib/timidity/patch/slapbas1.pat
-lib/timidity/patch/slapbas2.pat
-lib/timidity/patch/slowstr.pat
-lib/timidity/patch/snare1.pat
-lib/timidity/patch/snare2.pat
-lib/timidity/patch/soundtrk.pat
-lib/timidity/patch/sprnosax.pat
-lib/timidity/patch/sqrclick.pat
-lib/timidity/patch/sqrwave.pat
-lib/timidity/patch/startrak.pat
-lib/timidity/patch/steeldrm.pat
-lib/timidity/patch/stickrim.pat
-lib/timidity/patch/sticks.pat
-lib/timidity/patch/surdo1.pat
-lib/timidity/patch/surdo2.pat
-lib/timidity/patch/sweeper.pat
-lib/timidity/patch/synbass1.pat
-lib/timidity/patch/synbass2.pat
-lib/timidity/patch/synbras1.pat
-lib/timidity/patch/synbras2.pat
-lib/timidity/patch/synpiano.pat
-lib/timidity/patch/synstr1.pat
-lib/timidity/patch/synstr2.pat
-lib/timidity/patch/syntom.pat
-lib/timidity/patch/taiko.pat
-lib/timidity/patch/tamborin.pat
-lib/timidity/patch/telephon.pat
-lib/timidity/patch/tenorsax.pat
-lib/timidity/patch/timbaleh.pat
-lib/timidity/patch/timbalel.pat
-lib/timidity/patch/timpani.pat
-lib/timidity/patch/tomhi1.pat
-lib/timidity/patch/tomhi2.pat
-lib/timidity/patch/tomlo1.pat
-lib/timidity/patch/tomlo2.pat
-lib/timidity/patch/tommid1.pat
-lib/timidity/patch/tommid2.pat
-lib/timidity/patch/toms.pat
-lib/timidity/patch/tremstr.pat
-lib/timidity/patch/triangl1.pat
-lib/timidity/patch/triangl2.pat
-lib/timidity/patch/trombone.pat
-lib/timidity/patch/trumpet.pat
-lib/timidity/patch/tuba.pat
-lib/timidity/patch/tubebell.pat
-lib/timidity/patch/unicorn.pat
-lib/timidity/patch/vibes.pat
-lib/timidity/patch/vibslap.pat
-lib/timidity/patch/viola.pat
-lib/timidity/patch/violin.pat
-lib/timidity/patch/voices.pat
-lib/timidity/patch/voxlead.pat
-lib/timidity/patch/warmpad.pat
-lib/timidity/patch/whistle.pat
-lib/timidity/patch/whistle1.pat
-lib/timidity/patch/whistle2.pat
-lib/timidity/patch/woodblk.pat
-lib/timidity/patch/woodblk1.pat
-lib/timidity/patch/woodblk2.pat
-lib/timidity/patch/woodflut.pat
-lib/timidity/patch/xylophon.pat
-@dirrm lib/timidity/patch
+lib/timidity/timidity.cfg
+lib/timidity/wowpats.cfg
+@dirrm lib/timidity/goemon/gsdrum40
+@dirrm lib/timidity/goemon/gsdrum08
+@dirrm lib/timidity/goemon/gsdrum00
+@dirrm lib/timidity/goemon
 @dirrm lib/timidity