Re: IMPROVE: make audio/timidity packageable

Tue, 01 Aug 2017 23:17:55 -0700 


On 08/02/17 02:14, Antoine Jacoutot wrote:

On Wed, Aug 02, 2017 at 02:09:32AM -0400, Brian Callahan wrote:

Hi Antoine --

On 08/02/17 01:25, Antoine Jacoutot wrote:

On Wed, Aug 02, 2017 at 12:42:28AM -0400, Brian Callahan wrote:

Hi ports --

The recent conversation about CorsixTH I had with Donovan Watteau reminded
me that I always hated the fact that Timidity was never packageable since it
used the copyrighted goemon patchset. So I fixed it, and now Timidity is
packageable.

It turns out that soundfonts and GUS patch files are closely related enough
that it's rather trivial to convert soundfonts to GUS patchsets. So I took
TimGM6mb, a GPLv2-licensed soundfont from MuseScore 1.3 and converted it to
a GUS patchset. And I made Timidity use my patchset instead of the goemon
patchset--problem solved! Yes, it sounds different from the goemon patchset
but I think that's a small price to pay if you happen to like the new
patchset less.

FWIW, I also did this with the generaluser-gs-soundfont package we offer.
While the results sound so much better, it ballooned the package to 1.2 GB.
I don't think we want that unless there's huge clamor for it (but I am happy
to share that patchset if people want it--ping me off-list). For comparison,
using the TimGM6mb patchset shrunk the timidity package down to 9.1 MB from
10.8 MB (with the goemon patchset).

I would like to go through the tree and add an RDEP on timidity for all the
ports that have pkg-readmes that say something like "install timidity for
sound" and whatnot.

Take maintainer too. Not because I think timidity will ever be updated, but
people should know to yell at me if there's something wrong with the
patchset.

OK?

Somewhat related: have you built the FLAVORs? Last time I tried they were 
broken.
No one ever noticed because they are not built by default (missing in
audio/Makefile) -- maybe we should add them.
Also you should remove the gettext module.

Done and done. xaw FLAVOR built/ran no problem. gtk2 FLAVOR needed a small
patch and its WANTLIB re-synced, ran just fine after. New diff attached, can
add the FLAVORs to audio/Makefile with this.

Cool. Yeah this way we'll spot breakage right when it happens.
I don't have an opinion on your original patch because I don't use/know 
timidity.
But it reads good except for one nitpick below.


  

~Brian


~Brian

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/timidity/Makefile,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 Makefile
--- Makefile    24 Jan 2015 11:07:57 -0000      1.46
+++ Makefile    2 Aug 2017 04:30:55 -0000
@@ -5,20 +5,20 @@ COMMENT=      MIDI to WAV renderer and player
   V=           2.13.2
   DISTNAME=    TiMidity++-${V}
   PKGNAME=     timidity-${V}
-REVISION=      5
+REVISION=      6
   CATEGORIES=  audio
   MASTER_SITES=        ${MASTER_SITE_SOURCEFORGE:=timidity/}
-MASTER_SITES0= http://www.anime.net/~goemon/timidity/
-TIINS=         goemon.tgz
+MASTER_SITES0= https://devio.us/~bcallah/source/
+TIINS=         TimGM6mb-20170802.tar.gz
   DISTFILES=   ${TIINS}:0 ${DISTNAME}.tar.gz
   HOMEPAGE=    http://timidity.sourceforge.net/
+MAINTAINER=    Brian Callahan <[email protected]>
-# GPL, copyrighted patches in goemon patchset
-PERMIT_PACKAGE_CDROM=   copyrighted patches
-PERMIT_PACKAGE_FTP=     copyrighted patches
-PERMIT_DISTFILES_FTP=   copyrighted patches
+# timidity: GPL
+# TimGM6mb: GPLv2
+PERMIT_PACKAGE_CDROM=  Yes
   WANTLIB=             c m ncurses sndio
@@ -62,7 +62,6 @@ NO_TEST=      Yes
   WRKDIST=     ${WRKDIR}
   WRKSRC=              ${WRKDIR}/${DISTNAME}
-DATA_DIRS=     gsdrum00 gsdrum08 gsdrum40
   post-patch:
        cp ${FILESDIR}/sndio_a.c \
@@ -76,15 +75,10 @@ pre-configure:
                --foreign --add-missing --copy
   post-install:
-       ${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" \
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/timidity/TimGM6mb
+       ${INSTALL_DATA} ${WRKDIST}/TimGM6mb/* \
+               ${PREFIX}/share/timidity/TimGM6mb
+       @echo -e "dir ${TRUEPREFIX}/share/timidity/TimGM6mb\nsource 
TimGM6mb.cfg" \
            >> ${WRKDIR}/timidity.cfg

You really want to use a patch and SUBST_CMD here. Otherwise if 'make install'
fails and you re try it again, the line will be appended twice.




That makes sense. I left it unchanged from the goemon stuff, but I might 
as well do it right since I'm touching everything else.


~Brian


        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/timidity
        ${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${PREFIX}/share/examples/timidity
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/timidity/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo    18 Jan 2015 03:12:49 -0000      1.5
+++ distinfo    2 Aug 2017 04:30:55 -0000
@@ -1,4 +1,4 @@
   SHA256 (TiMidity++-2.13.2.tar.gz) = 
8AclLp8/fzwEOh1RWJghRqRu4ybDsXoiJa/HM8MzK0c=
-SHA256 (goemon.tgz) = OgxgP4h1HI1Ux8I/AT1Mka52kKYnAdjkODxgEpxU/Pc=
+SHA256 (TimGM6mb-20170802.tar.gz) = 
tyxC4aU+yDs5vXpT6ftWcbkcOekt/DUFtZk5hVzCcUQ=
   SIZE (TiMidity++-2.13.2.tar.gz) = 1849553
-SIZE (goemon.tgz) = 10804344
+SIZE (TimGM6mb-20170802.tar.gz) = 9032726
Index: patches/patch-goemon_cfg
===================================================================
RCS file: patches/patch-goemon_cfg
diff -N patches/patch-goemon_cfg
--- patches/patch-goemon_cfg    30 Jan 2006 10:13:11 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/timidity/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST   30 Jul 2009 19:35:00 -0000      1.7
+++ pkg/PLIST   2 Aug 2017 04:30:55 -0000
@@ -6,259 +6,187 @@ 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
+share/timidity/TimGM6mb/
+share/timidity/TimGM6mb/5thSawWave.pat
+share/timidity/TimGM6mb/808Click.pat
+share/timidity/TimGM6mb/808Hat.pat
+share/timidity/TimGM6mb/808Snare.pat
+share/timidity/TimGM6mb/Accordion.pat
+share/timidity/TimGM6mb/AcousticBass.pat
+share/timidity/TimGM6mb/AcousticTom.pat
+share/timidity/TimGM6mb/Agogo.pat
+share/timidity/TimGM6mb/AgogoBell.pat
+share/timidity/TimGM6mb/AltoSax-TBv2.3.pat
+share/timidity/TimGM6mb/Applause.pat
+share/timidity/TimGM6mb/Atmosphere.pat
+share/timidity/TimGM6mb/Bagpipe.pat
+share/timidity/TimGM6mb/Bandoneon.pat
+share/timidity/TimGM6mb/Banjo.pat
+share/timidity/TimGM6mb/BariSax-TBv2.3.pat
+share/timidity/TimGM6mb/BassDrumNew.pat
+share/timidity/TimGM6mb/BassLead.pat
+share/timidity/TimGM6mb/Bassoon.pat
+share/timidity/TimGM6mb/BellTree.pat
+share/timidity/TimGM6mb/Bird.pat
+share/timidity/TimGM6mb/BottleChiff.pat
+share/timidity/TimGM6mb/BowedGlass.pat
+share/timidity/TimGM6mb/Brass.pat
+share/timidity/TimGM6mb/BrassTambourine.pat
+share/timidity/TimGM6mb/BreathNoise.pat
+share/timidity/TimGM6mb/Brightness.pat
+share/timidity/TimGM6mb/BrushSnare.pat
+share/timidity/TimGM6mb/Cabasa.pat
+share/timidity/TimGM6mb/Castanets.pat
+share/timidity/TimGM6mb/Celesta.pat
+share/timidity/TimGM6mb/Cello.pat
+share/timidity/TimGM6mb/Charang.pat
+share/timidity/TimGM6mb/ChifferLead.pat
+share/timidity/TimGM6mb/ChinaCrashCymb.pat
+share/timidity/TimGM6mb/ChoirAahs.pat
+share/timidity/TimGM6mb/ChurchOrgan.pat
+share/timidity/TimGM6mb/Claps808ish.pat
+share/timidity/TimGM6mb/Clarinet.pat
+share/timidity/TimGM6mb/Clavinet.pat
+share/timidity/TimGM6mb/CleanGuitar.pat
+share/timidity/TimGM6mb/Contrabass.pat
+share/timidity/TimGM6mb/Cowbell.pat
+share/timidity/TimGM6mb/Cowbell808.pat
+share/timidity/TimGM6mb/Crystal.pat
+share/timidity/TimGM6mb/DistortionGuitar.pat
+share/timidity/TimGM6mb/DrumStick.pat
+share/timidity/TimGM6mb/Dulcimer.pat
+share/timidity/TimGM6mb/E.Piano1.pat
+share/timidity/TimGM6mb/E.Piano2.pat
+share/timidity/TimGM6mb/EBongoRim.pat
+share/timidity/TimGM6mb/ESnare.pat
+share/timidity/TimGM6mb/EchoDrops.pat
+share/timidity/TimGM6mb/EnglishHorn.pat
+share/timidity/TimGM6mb/Fantasia.pat
+share/timidity/TimGM6mb/Fiddle.pat
+share/timidity/TimGM6mb/FilterSnap.pat
+share/timidity/TimGM6mb/FingeredBass.pat
+share/timidity/TimGM6mb/FluteTB.pat
+share/timidity/TimGM6mb/FrenchHorns.pat
+share/timidity/TimGM6mb/FretNoise.pat
+share/timidity/TimGM6mb/FretlessBass.pat
+share/timidity/TimGM6mb/Glockenspiel.pat
+share/timidity/TimGM6mb/Goblin.pat
+share/timidity/TimGM6mb/GuiroDown.pat
+share/timidity/TimGM6mb/GuiroUp.pat
+share/timidity/TimGM6mb/GuitarHarmonics.pat
+share/timidity/TimGM6mb/GuitarMutes.pat
+share/timidity/TimGM6mb/GunShot.pat
+share/timidity/TimGM6mb/HaloPad.pat
+share/timidity/TimGM6mb/Harmonica.pat
+share/timidity/TimGM6mb/HarpLP.pat
+share/timidity/TimGM6mb/Harpsichord.pat
+share/timidity/TimGM6mb/Helicopter.pat
+share/timidity/TimGM6mb/HighHatClosed.pat
+share/timidity/TimGM6mb/HighHatFoot.pat
+share/timidity/TimGM6mb/HonkyTonk.pat
+share/timidity/TimGM6mb/IceRain.pat
+share/timidity/TimGM6mb/JazzGuitar.pat
+share/timidity/TimGM6mb/Kalimba.pat
+share/timidity/TimGM6mb/Koto.pat
+share/timidity/TimGM6mb/LowTumbaTone.pat
+share/timidity/TimGM6mb/MBongoTone.pat
+share/timidity/TimGM6mb/Maracas.pat
+share/timidity/TimGM6mb/Marimba.pat
+share/timidity/TimGM6mb/MedCrashCymbal.pat
+share/timidity/TimGM6mb/MelodicTom.pat
+share/timidity/TimGM6mb/MetClick.pat
+share/timidity/TimGM6mb/MetalPad.pat
+share/timidity/TimGM6mb/MusicBox.pat
+share/timidity/TimGM6mb/MuteTriangle.pat
+share/timidity/TimGM6mb/MuteTrumpet.pat
+share/timidity/TimGM6mb/NoiseSlap.pat
+share/timidity/TimGM6mb/NylonGuitar.pat
+share/timidity/TimGM6mb/Oboe-Orch.pat
+share/timidity/TimGM6mb/Ocarina.pat
+share/timidity/TimGM6mb/OceanWave.pat
+share/timidity/TimGM6mb/OpenHighHat.pat
+share/timidity/TimGM6mb/OrchestraHit.pat
+share/timidity/TimGM6mb/Organ1.pat
+share/timidity/TimGM6mb/Organ2.pat
+share/timidity/TimGM6mb/Organ3.pat
+share/timidity/TimGM6mb/OverdriveGuitar.pat
+share/timidity/TimGM6mb/PanFlute.pat
+share/timidity/TimGM6mb/Piano1.pat
+share/timidity/TimGM6mb/Piano2.pat
+share/timidity/TimGM6mb/Piano3.pat
+share/timidity/TimGM6mb/Piccolo.pat
+share/timidity/TimGM6mb/PickedBass.pat
+share/timidity/TimGM6mb/Pizzicato.pat
+share/timidity/TimGM6mb/PolySynth.pat
+share/timidity/TimGM6mb/QuicaDownstroke.pat
+share/timidity/TimGM6mb/QuicaHiTone.pat
+share/timidity/TimGM6mb/QuintoClosedSlap.pat
+share/timidity/TimGM6mb/QuintoTone.pat
+share/timidity/TimGM6mb/Recorder.pat
+share/timidity/TimGM6mb/ReedOrgan.pat
+share/timidity/TimGM6mb/ReverseCymbal.pat
+share/timidity/TimGM6mb/RideBell.pat
+share/timidity/TimGM6mb/RidePing.pat
+share/timidity/TimGM6mb/RimShot.pat
+share/timidity/TimGM6mb/RosewoodClaves.pat
+share/timidity/TimGM6mb/SambaWhistle.pat
+share/timidity/TimGM6mb/SawWave.pat
+share/timidity/TimGM6mb/Scratch.pat
+share/timidity/TimGM6mb/Seashore.pat
+share/timidity/TimGM6mb/Shakuhachi.pat
+share/timidity/TimGM6mb/Shamisen.pat
+share/timidity/TimGM6mb/Shenai.pat
+share/timidity/TimGM6mb/SineWave.pat
+share/timidity/TimGM6mb/Sinetick.pat
+share/timidity/TimGM6mb/Sitar.pat
+share/timidity/TimGM6mb/SlapBass1.pat
+share/timidity/TimGM6mb/SlapBass2.pat
+share/timidity/TimGM6mb/SleighBells.pat
+share/timidity/TimGM6mb/SlowStringsLP.pat
+share/timidity/TimGM6mb/Snare1.pat
+share/timidity/TimGM6mb/Snare2.pat
+share/timidity/TimGM6mb/SoloTrumpet.pat
+share/timidity/TimGM6mb/SoloVox.pat
+share/timidity/TimGM6mb/SopSax-TBv2.3.pat
+share/timidity/TimGM6mb/Soundtrack.pat
+share/timidity/TimGM6mb/SpaceVoice.pat
+share/timidity/TimGM6mb/SquareWave.pat
+share/timidity/TimGM6mb/StarTheme.pat
+share/timidity/TimGM6mb/SteelDrum.pat
+share/timidity/TimGM6mb/SteelGuitar.pat
+share/timidity/TimGM6mb/Strings-Tremelo.pat
+share/timidity/TimGM6mb/StringsCLP.pat
+share/timidity/TimGM6mb/SweepPad.pat
+share/timidity/TimGM6mb/SynDrumWave.pat
+share/timidity/TimGM6mb/SynthBass1.pat
+share/timidity/TimGM6mb/SynthBass2.pat
+share/timidity/TimGM6mb/SynthBrass1.pat
+share/timidity/TimGM6mb/SynthBrass2.pat
+share/timidity/TimGM6mb/SynthCalliope.pat
+share/timidity/TimGM6mb/SynthDrum.pat
+share/timidity/TimGM6mb/SynthStrings1.pat
+share/timidity/TimGM6mb/SynthStrings2.pat
+share/timidity/TimGM6mb/SynthVox.pat
+share/timidity/TimGM6mb/TaikoDrum.pat
+share/timidity/TimGM6mb/Telephone.pat
+share/timidity/TimGM6mb/TenorSax-TBv2.3.pat
+share/timidity/TimGM6mb/TimGM6mb.cfg
+share/timidity/TimGM6mb/TimbaleRimshot.pat
+share/timidity/TimGM6mb/TimbaleStrike.pat
+share/timidity/TimGM6mb/TimpDrumA1.pat
+share/timidity/TimGM6mb/Timpani.pat
+share/timidity/TimGM6mb/TinkerBell.pat
+share/timidity/TimGM6mb/TriangleWaveDb5.pat
+share/timidity/TimGM6mb/Trombone.pat
+share/timidity/TimGM6mb/Tuba.pat
+share/timidity/TimGM6mb/TubularBells.pat
+share/timidity/TimGM6mb/VibraLoop.pat
+share/timidity/TimGM6mb/Vibraphone.pat
+share/timidity/TimGM6mb/Viola.pat
+share/timidity/TimGM6mb/Violin.pat
+share/timidity/TimGM6mb/VoiceOohs.pat
+share/timidity/TimGM6mb/WarmPad.pat
+share/timidity/TimGM6mb/Whistle.pat
+share/timidity/TimGM6mb/WoodBlock.pat
+share/timidity/TimGM6mb/Xylophone.pat
   %%xaw%%

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/timidity/Makefile,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 Makefile
--- Makefile    24 Jan 2015 11:07:57 -0000      1.46
+++ Makefile    2 Aug 2017 06:07:10 -0000
@@ -5,20 +5,20 @@ COMMENT=      MIDI to WAV renderer and player
  V=            2.13.2
  DISTNAME=     TiMidity++-${V}
  PKGNAME=      timidity-${V}
-REVISION=      5
+REVISION=      6
  CATEGORIES=   audio

  
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=timidity/}

-MASTER_SITES0= http://www.anime.net/~goemon/timidity/
-TIINS=         goemon.tgz
+MASTER_SITES0= https://devio.us/~bcallah/source/
+TIINS=         TimGM6mb-20170802.tar.gz
  DISTFILES=    ${TIINS}:0 ${DISTNAME}.tar.gz

  
  HOMEPAGE=	http://timidity.sourceforge.net/

+MAINTAINER=    Brian Callahan <[email protected]>

  
-# GPL, copyrighted patches in goemon patchset

-PERMIT_PACKAGE_CDROM=   copyrighted patches
-PERMIT_PACKAGE_FTP=     copyrighted patches
-PERMIT_DISTFILES_FTP=   copyrighted patches
+# timidity: GPL
+# TimGM6mb: GPLv2
+PERMIT_PACKAGE_CDROM=  Yes

  
  WANTLIB=		c m ncurses sndio
  
@@ -37,15 +37,14 @@ FLAVOR?=
  
  .if ${FLAVOR:Mgtk2}

  CONFIGURE_ARGS+=--enable-gtk
-MODULES=       devel/gettext
-LIB_DEPENDS+=  x11/gtk+2
-WANTLIB+=      X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-               Xi Xinerama Xrandr Xrender atk-1.0 cairo expat \
+LIB_DEPENDS+=  devel/gettext \
+               x11/gtk+2
+WANTLIB+=      X11 Xcomposite Xcursor Xdamage Xext Xfixes \
+               Xi Xinerama Xrandr Xrender atk-1.0 cairo \
                fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
-               glib-2.0 gio-2.0 gmodule-2.0 gobject-2.0 \
-               gtk-x11-2.0 gthread-2.0 pango-1.0 pangocairo-1.0 \
-               pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \
-               xcb-render xcb-render-util z
+               glib-2.0 gio-2.0 gobject-2.0 \
+               gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 \
+               pangoft2-1.0 pthread z
  .endif

  
  .if ${FLAVOR:Mxaw}

@@ -62,7 +61,6 @@ NO_TEST=      Yes

  
  WRKDIST=	${WRKDIR}

  WRKSRC=               ${WRKDIR}/${DISTNAME}
-DATA_DIRS=     gsdrum00 gsdrum08 gsdrum40

  
  post-patch:

        cp ${FILESDIR}/sndio_a.c \
@@ -76,15 +74,10 @@ pre-configure:
                --foreign --add-missing --copy

  
  post-install:

-       ${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" \
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/timidity/TimGM6mb
+       ${INSTALL_DATA} ${WRKDIST}/TimGM6mb/* \
+               ${PREFIX}/share/timidity/TimGM6mb
+       @echo -e "dir ${TRUEPREFIX}/share/timidity/TimGM6mb\nsource 
TimGM6mb.cfg" \
            >> ${WRKDIR}/timidity.cfg
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/timidity
        ${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${PREFIX}/share/examples/timidity
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/timidity/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo    18 Jan 2015 03:12:49 -0000      1.5
+++ distinfo    2 Aug 2017 06:07:10 -0000
@@ -1,4 +1,4 @@
  SHA256 (TiMidity++-2.13.2.tar.gz) = 
8AclLp8/fzwEOh1RWJghRqRu4ybDsXoiJa/HM8MzK0c=
-SHA256 (goemon.tgz) = OgxgP4h1HI1Ux8I/AT1Mka52kKYnAdjkODxgEpxU/Pc=
+SHA256 (TimGM6mb-20170802.tar.gz) = 
tyxC4aU+yDs5vXpT6ftWcbkcOekt/DUFtZk5hVzCcUQ=
  SIZE (TiMidity++-2.13.2.tar.gz) = 1849553
-SIZE (goemon.tgz) = 10804344
+SIZE (TimGM6mb-20170802.tar.gz) = 9032726
Index: patches/patch-TiMidity++-2_13_2_timidity_mfi_c
===================================================================
RCS file: patches/patch-TiMidity++-2_13_2_timidity_mfi_c
diff -N patches/patch-TiMidity++-2_13_2_timidity_mfi_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-TiMidity++-2_13_2_timidity_mfi_c      2 Aug 2017 06:07:10 
-0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: TiMidity++-2.13.2/timidity/mfi.c
+--- TiMidity++-2.13.2/timidity/mfi.c.orig
++++ TiMidity++-2.13.2/timidity/mfi.c
+@@ -344,7 +344,7 @@ typedef struct LastNoteInfo {
+ #define SEND_LASTNOTEINFO(lni, ch)                            if 
(LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
+ #define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch)  if 
(LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = 
NO_LAST_NOTE_INFO; }
+
+-inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int 
duration, int note, int velocity)
++void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int 
duration, int note, int velocity)
+ {
+       info[channel].on = time;
+       info[channel].off = time + duration;
+@@ -352,7 +352,7 @@ inline void StoreLastNoteInfo(LastNoteInfo *info, int
+       info[channel].velocity = velocity;
+ }
+
+-inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
++void SendLastNoteInfo(const LastNoteInfo *info, int channel)
+ {
+       NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, 
note_name[info[channel].note % 12], info[channel].note / 12, 
info[channel].velocity, info[channel].off);
+       MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, 
info[channel].velocity);
Index: patches/patch-goemon_cfg
===================================================================
RCS file: patches/patch-goemon_cfg
diff -N patches/patch-goemon_cfg
--- patches/patch-goemon_cfg    30 Jan 2006 10:13:11 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/timidity/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST   30 Jul 2009 19:35:00 -0000      1.7
+++ pkg/PLIST   2 Aug 2017 06:07:10 -0000
@@ -6,259 +6,187 @@ 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
+share/timidity/TimGM6mb/
+share/timidity/TimGM6mb/5thSawWave.pat
+share/timidity/TimGM6mb/808Click.pat
+share/timidity/TimGM6mb/808Hat.pat
+share/timidity/TimGM6mb/808Snare.pat
+share/timidity/TimGM6mb/Accordion.pat
+share/timidity/TimGM6mb/AcousticBass.pat
+share/timidity/TimGM6mb/AcousticTom.pat
+share/timidity/TimGM6mb/Agogo.pat
+share/timidity/TimGM6mb/AgogoBell.pat
+share/timidity/TimGM6mb/AltoSax-TBv2.3.pat
+share/timidity/TimGM6mb/Applause.pat
+share/timidity/TimGM6mb/Atmosphere.pat
+share/timidity/TimGM6mb/Bagpipe.pat
+share/timidity/TimGM6mb/Bandoneon.pat
+share/timidity/TimGM6mb/Banjo.pat
+share/timidity/TimGM6mb/BariSax-TBv2.3.pat
+share/timidity/TimGM6mb/BassDrumNew.pat
+share/timidity/TimGM6mb/BassLead.pat
+share/timidity/TimGM6mb/Bassoon.pat
+share/timidity/TimGM6mb/BellTree.pat
+share/timidity/TimGM6mb/Bird.pat
+share/timidity/TimGM6mb/BottleChiff.pat
+share/timidity/TimGM6mb/BowedGlass.pat
+share/timidity/TimGM6mb/Brass.pat
+share/timidity/TimGM6mb/BrassTambourine.pat
+share/timidity/TimGM6mb/BreathNoise.pat
+share/timidity/TimGM6mb/Brightness.pat
+share/timidity/TimGM6mb/BrushSnare.pat
+share/timidity/TimGM6mb/Cabasa.pat
+share/timidity/TimGM6mb/Castanets.pat
+share/timidity/TimGM6mb/Celesta.pat
+share/timidity/TimGM6mb/Cello.pat
+share/timidity/TimGM6mb/Charang.pat
+share/timidity/TimGM6mb/ChifferLead.pat
+share/timidity/TimGM6mb/ChinaCrashCymb.pat
+share/timidity/TimGM6mb/ChoirAahs.pat
+share/timidity/TimGM6mb/ChurchOrgan.pat
+share/timidity/TimGM6mb/Claps808ish.pat
+share/timidity/TimGM6mb/Clarinet.pat
+share/timidity/TimGM6mb/Clavinet.pat
+share/timidity/TimGM6mb/CleanGuitar.pat
+share/timidity/TimGM6mb/Contrabass.pat
+share/timidity/TimGM6mb/Cowbell.pat
+share/timidity/TimGM6mb/Cowbell808.pat
+share/timidity/TimGM6mb/Crystal.pat
+share/timidity/TimGM6mb/DistortionGuitar.pat
+share/timidity/TimGM6mb/DrumStick.pat
+share/timidity/TimGM6mb/Dulcimer.pat
+share/timidity/TimGM6mb/E.Piano1.pat
+share/timidity/TimGM6mb/E.Piano2.pat
+share/timidity/TimGM6mb/EBongoRim.pat
+share/timidity/TimGM6mb/ESnare.pat
+share/timidity/TimGM6mb/EchoDrops.pat
+share/timidity/TimGM6mb/EnglishHorn.pat
+share/timidity/TimGM6mb/Fantasia.pat
+share/timidity/TimGM6mb/Fiddle.pat
+share/timidity/TimGM6mb/FilterSnap.pat
+share/timidity/TimGM6mb/FingeredBass.pat
+share/timidity/TimGM6mb/FluteTB.pat
+share/timidity/TimGM6mb/FrenchHorns.pat
+share/timidity/TimGM6mb/FretNoise.pat
+share/timidity/TimGM6mb/FretlessBass.pat
+share/timidity/TimGM6mb/Glockenspiel.pat
+share/timidity/TimGM6mb/Goblin.pat
+share/timidity/TimGM6mb/GuiroDown.pat
+share/timidity/TimGM6mb/GuiroUp.pat
+share/timidity/TimGM6mb/GuitarHarmonics.pat
+share/timidity/TimGM6mb/GuitarMutes.pat
+share/timidity/TimGM6mb/GunShot.pat
+share/timidity/TimGM6mb/HaloPad.pat
+share/timidity/TimGM6mb/Harmonica.pat
+share/timidity/TimGM6mb/HarpLP.pat
+share/timidity/TimGM6mb/Harpsichord.pat
+share/timidity/TimGM6mb/Helicopter.pat
+share/timidity/TimGM6mb/HighHatClosed.pat
+share/timidity/TimGM6mb/HighHatFoot.pat
+share/timidity/TimGM6mb/HonkyTonk.pat
+share/timidity/TimGM6mb/IceRain.pat
+share/timidity/TimGM6mb/JazzGuitar.pat
+share/timidity/TimGM6mb/Kalimba.pat
+share/timidity/TimGM6mb/Koto.pat
+share/timidity/TimGM6mb/LowTumbaTone.pat
+share/timidity/TimGM6mb/MBongoTone.pat
+share/timidity/TimGM6mb/Maracas.pat
+share/timidity/TimGM6mb/Marimba.pat
+share/timidity/TimGM6mb/MedCrashCymbal.pat
+share/timidity/TimGM6mb/MelodicTom.pat
+share/timidity/TimGM6mb/MetClick.pat
+share/timidity/TimGM6mb/MetalPad.pat
+share/timidity/TimGM6mb/MusicBox.pat
+share/timidity/TimGM6mb/MuteTriangle.pat
+share/timidity/TimGM6mb/MuteTrumpet.pat
+share/timidity/TimGM6mb/NoiseSlap.pat
+share/timidity/TimGM6mb/NylonGuitar.pat
+share/timidity/TimGM6mb/Oboe-Orch.pat
+share/timidity/TimGM6mb/Ocarina.pat
+share/timidity/TimGM6mb/OceanWave.pat
+share/timidity/TimGM6mb/OpenHighHat.pat
+share/timidity/TimGM6mb/OrchestraHit.pat
+share/timidity/TimGM6mb/Organ1.pat
+share/timidity/TimGM6mb/Organ2.pat
+share/timidity/TimGM6mb/Organ3.pat
+share/timidity/TimGM6mb/OverdriveGuitar.pat
+share/timidity/TimGM6mb/PanFlute.pat
+share/timidity/TimGM6mb/Piano1.pat
+share/timidity/TimGM6mb/Piano2.pat
+share/timidity/TimGM6mb/Piano3.pat
+share/timidity/TimGM6mb/Piccolo.pat
+share/timidity/TimGM6mb/PickedBass.pat
+share/timidity/TimGM6mb/Pizzicato.pat
+share/timidity/TimGM6mb/PolySynth.pat
+share/timidity/TimGM6mb/QuicaDownstroke.pat
+share/timidity/TimGM6mb/QuicaHiTone.pat
+share/timidity/TimGM6mb/QuintoClosedSlap.pat
+share/timidity/TimGM6mb/QuintoTone.pat
+share/timidity/TimGM6mb/Recorder.pat
+share/timidity/TimGM6mb/ReedOrgan.pat
+share/timidity/TimGM6mb/ReverseCymbal.pat
+share/timidity/TimGM6mb/RideBell.pat
+share/timidity/TimGM6mb/RidePing.pat
+share/timidity/TimGM6mb/RimShot.pat
+share/timidity/TimGM6mb/RosewoodClaves.pat
+share/timidity/TimGM6mb/SambaWhistle.pat
+share/timidity/TimGM6mb/SawWave.pat
+share/timidity/TimGM6mb/Scratch.pat
+share/timidity/TimGM6mb/Seashore.pat
+share/timidity/TimGM6mb/Shakuhachi.pat
+share/timidity/TimGM6mb/Shamisen.pat
+share/timidity/TimGM6mb/Shenai.pat
+share/timidity/TimGM6mb/SineWave.pat
+share/timidity/TimGM6mb/Sinetick.pat
+share/timidity/TimGM6mb/Sitar.pat
+share/timidity/TimGM6mb/SlapBass1.pat
+share/timidity/TimGM6mb/SlapBass2.pat
+share/timidity/TimGM6mb/SleighBells.pat
+share/timidity/TimGM6mb/SlowStringsLP.pat
+share/timidity/TimGM6mb/Snare1.pat
+share/timidity/TimGM6mb/Snare2.pat
+share/timidity/TimGM6mb/SoloTrumpet.pat
+share/timidity/TimGM6mb/SoloVox.pat
+share/timidity/TimGM6mb/SopSax-TBv2.3.pat
+share/timidity/TimGM6mb/Soundtrack.pat
+share/timidity/TimGM6mb/SpaceVoice.pat
+share/timidity/TimGM6mb/SquareWave.pat
+share/timidity/TimGM6mb/StarTheme.pat
+share/timidity/TimGM6mb/SteelDrum.pat
+share/timidity/TimGM6mb/SteelGuitar.pat
+share/timidity/TimGM6mb/Strings-Tremelo.pat
+share/timidity/TimGM6mb/StringsCLP.pat
+share/timidity/TimGM6mb/SweepPad.pat
+share/timidity/TimGM6mb/SynDrumWave.pat
+share/timidity/TimGM6mb/SynthBass1.pat
+share/timidity/TimGM6mb/SynthBass2.pat
+share/timidity/TimGM6mb/SynthBrass1.pat
+share/timidity/TimGM6mb/SynthBrass2.pat
+share/timidity/TimGM6mb/SynthCalliope.pat
+share/timidity/TimGM6mb/SynthDrum.pat
+share/timidity/TimGM6mb/SynthStrings1.pat
+share/timidity/TimGM6mb/SynthStrings2.pat
+share/timidity/TimGM6mb/SynthVox.pat
+share/timidity/TimGM6mb/TaikoDrum.pat
+share/timidity/TimGM6mb/Telephone.pat
+share/timidity/TimGM6mb/TenorSax-TBv2.3.pat
+share/timidity/TimGM6mb/TimGM6mb.cfg
+share/timidity/TimGM6mb/TimbaleRimshot.pat
+share/timidity/TimGM6mb/TimbaleStrike.pat
+share/timidity/TimGM6mb/TimpDrumA1.pat
+share/timidity/TimGM6mb/Timpani.pat
+share/timidity/TimGM6mb/TinkerBell.pat
+share/timidity/TimGM6mb/TriangleWaveDb5.pat
+share/timidity/TimGM6mb/Trombone.pat
+share/timidity/TimGM6mb/Tuba.pat
+share/timidity/TimGM6mb/TubularBells.pat
+share/timidity/TimGM6mb/VibraLoop.pat
+share/timidity/TimGM6mb/Vibraphone.pat
+share/timidity/TimGM6mb/Viola.pat
+share/timidity/TimGM6mb/Violin.pat
+share/timidity/TimGM6mb/VoiceOohs.pat
+share/timidity/TimGM6mb/WarmPad.pat
+share/timidity/TimGM6mb/Whistle.pat
+share/timidity/TimGM6mb/WoodBlock.pat
+share/timidity/TimGM6mb/Xylophone.pat
  %%xaw%%


























					Reply via email to