Modify directory structure used by guspatches and eawpatches.

1) install patches into separate directories to eliminate pkgsrc conflict
2) leave timidity configuration up to user, with instructions in MESSAGE
3) make timidity read configuration from PKG_SYSCONFDIR
4) bump PKGREVISION on eawpatches, guspatches, and timidity

10 files changed, 650 insertions, 614 deletions

diff --git a/audio/eawpatches/MESSAGE b/audio/eawpatches/MESSAGE
new file mode 100644
index 00000000000..3db4fd789bf
--- /dev/null
+++ b/audio/eawpatches/MESSAGE
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/12/03 14:20:03 ben Exp $
+
+  To use timidity with eawpatches, you have a couple of options.
+
+  1) at the command-line:
+
+     timidity -L ${PREFIX}/share/eawpatches -c timidity.cfg file.mid
+
+  2) in the system-wide timidity configuration:
+
+     cp ${PREFIX}/share/eawpatches/timidity.cfg ${PKG_SYSCONFDIR}/timidity
+
+===========================================================================
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 0de26a215f1..3a5eb13c023 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/11/27 16:48:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/03 14:20:03 ben Exp $
 #
 
 DISTNAME=	eawpats12_full
 PKGNAME=	eawpatches-12
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.stardate.bc.ca/eawpatches/
 EXTRACT_SUFX=	.rar
@@ -13,21 +14,20 @@ COMMENT=	Eric A. Welsh' patches (audio samples) for TiMidity
 
 BUILD_DEPENDS=  unrar-[0-9]*:../../archivers/unrar
 
-CONFLICTS=	guspatches-[0-9]*
-
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/timidity
-	cd ${PREFIX}/share/timidity && \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/eawpatches
+	cd ${PREFIX}/share/eawpatches && \
 	unrar x -o+ -inul ${DISTDIR}/${DISTNAME}
-	${CHMOD} 644 ${PREFIX}/share/timidity/*.* \
-		${PREFIX}/share/timidity/*/*.*
-	${SED}  -e "s@c:.timidity@${PREFIX}/share/timidity@" \
+	${CHMOD} 644 ${PREFIX}/share/eawpatches/*.* \
+		${PREFIX}/share/eawpatches/*/*.*
+	${SED}  -e "s@c:.timidity@${PREFIX}/share/eawpatches@" \
 		-e "s@dir c:.eawpats@@" \
-		< ${PREFIX}/share/timidity/timidity.cfg > /tmp/timidity.tmp
-	${MV} /tmp/timidity.tmp ${PREFIX}/share/timidity/timidity.cfg
+		< ${PREFIX}/share/eawpatches/timidity.cfg > /tmp/timidity.tmp
+	${MV} /tmp/timidity.tmp ${PREFIX}/share/eawpatches/timidity.cfg
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/eawpatches/PLIST b/audio/eawpatches/PLIST
index b7baa1f12f3..602dfe6fe17 100644
--- a/audio/eawpatches/PLIST
+++ b/audio/eawpatches/PLIST
@@ -1,384 +1,384 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/13 18:12:34 wiz Exp $
-share/timidity/acbass.pat
-share/timidity/accordn.pat
-share/timidity/acguitar.pat
-share/timidity/acpiano.pat
-share/timidity/agogo.pat
-share/timidity/agogohi.pat
-share/timidity/agogolo.pat
-share/timidity/altosax.pat
-share/timidity/applause.pat
-share/timidity/atmosphr.pat
-share/timidity/aurora.pat
-share/timidity/bagpipes.pat
-share/timidity/banjo.pat
-share/timidity/barisax.pat
-share/timidity/basslead.pat
-share/timidity/bassoon.pat
-share/timidity/belltree.pat
-share/timidity/blank.pat
-share/timidity/bongohi.pat
-share/timidity/bongolo.pat
-share/timidity/bottle.pat
-share/timidity/bowglass.pat
-share/timidity/britepno.pat
-share/timidity/cabasa.pat
-share/timidity/calliope.pat
-share/timidity/carillon.pat
-share/timidity/castinet.pat
-share/timidity/celeste.pat
-share/timidity/cello.pat
-share/timidity/changelog.txt
-share/timidity/charang.pat
-share/timidity/chiflead.pat
-share/timidity/choir.pat
-share/timidity/church.pat
-share/timidity/claps.pat
-share/timidity/clarinet.pat
-share/timidity/clave.pat
-share/timidity/clavinet.pat
-share/timidity/cleangtr.pat
-share/timidity/concrtbd.pat
-share/timidity/concrtna.pat
-share/timidity/congahi1.pat
-share/timidity/congahi2.pat
-share/timidity/congalo.pat
-share/timidity/contraba.pat
-share/timidity/copyrigh.txt
-share/timidity/cowbell.pat
-share/timidity/crystal.pat
-share/timidity/cuica1.pat
-share/timidity/cuica2.pat
-share/timidity/cymbell.pat
-share/timidity/cymchina.pat
-share/timidity/cymcrsh1.pat
-share/timidity/cymcrsh2.pat
-share/timidity/cymride1.pat
-share/timidity/cymride2.pat
-share/timidity/cymsplsh.pat
-share/timidity/default.cfg
-share/timidity/distgtr.pat
-share/timidity/doo.pat
-share/timidity/drumsfx.txt
-share/timidity/eawpats.txt
-share/timidity/echovox.pat
-share/timidity/englhorn.pat
-share/timidity/epiano1.pat
-share/timidity/epiano2.pat
-share/timidity/ethnic/gong.pat
-share/timidity/ethnic/tabla.pat
-share/timidity/ethnic/tabla.txt
-share/timidity/ethnic/talkbend.pat
-share/timidity/ethnic/talkdrum.pat
-share/timidity/fiddle.pat
-share/timidity/flute.pat
-share/timidity/fngrbass.pat
-share/timidity/frenchrn.pat
-share/timidity/freshair.pat
-share/timidity/fretless.pat
-share/timidity/fx-blow.pat
-share/timidity/fx-fret.pat
-share/timidity/ghostie.pat
-share/timidity/glocken.pat
-share/timidity/gravis.cfg
-share/timidity/gsdrum08/gsdrum08.txt
-share/timidity/gsdrum08/roomhi1.pat
-share/timidity/gsdrum08/roomhi2.pat
-share/timidity/gsdrum08/roomkick.pat
-share/timidity/gsdrum08/roomlow1.pat
-share/timidity/gsdrum08/roomlow2.pat
-share/timidity/gsdrum08/roommid1.pat
-share/timidity/gsdrum08/roommid2.pat
-share/timidity/gsdrum25/78hhc.pat
-share/timidity/gsdrum25/78hho.pat
-share/timidity/gsdrum25/78kick.pat
-share/timidity/gsdrum25/78snare.pat
-share/timidity/gsdrum25/808bd2.pat
-share/timidity/gsdrum25/808clap1.pat
-share/timidity/gsdrum25/808clap2.pat
-share/timidity/gsdrum25/808cowbl.pat
-share/timidity/gsdrum25/808crsh1.pat
-share/timidity/gsdrum25/808cymb.pat
-share/timidity/gsdrum25/808hhc.pat
-share/timidity/gsdrum25/808hho.pat
-share/timidity/gsdrum25/808kick.pat
-share/timidity/gsdrum25/808sd1.pat
-share/timidity/gsdrum25/808sd2.pat
-share/timidity/gsdrum25/808snar2.pat
-share/timidity/gsdrum25/808snare.pat
-share/timidity/gsdrum25/808stick.pat
-share/timidity/gsdrum25/808tomh1.pat
-share/timidity/gsdrum25/808tomh2.pat
-share/timidity/gsdrum25/808toml1.pat
-share/timidity/gsdrum25/808toml2.pat
-share/timidity/gsdrum25/808tomm1.pat
-share/timidity/gsdrum25/808tomm2.pat
-share/timidity/gsdrum25/909hhc.pat
-share/timidity/gsdrum25/909hho.pat
-share/timidity/gsdrum25/909kick.pat
-share/timidity/gsdrum25/909snare.pat
-share/timidity/gsdrum25/909stick.pat
-share/timidity/gsdrum25/gsdrm25p.txt
-share/timidity/gsdrum25/revcym.pat
-share/timidity/gsdrum25/scratch.pat
-share/timidity/gsdrum40/br_slap.pat
-share/timidity/gsdrum40/br_swirl.pat
-share/timidity/gsdrum40/br_swish.pat
-share/timidity/gsdrum40/gsdrum40.txt
-share/timidity/gsdrum40/hihatcl.pat
-share/timidity/gsdrum40/hihatop.pat
-share/timidity/gsdrums.cfg
-share/timidity/gssfx.cfg
-share/timidity/gtrharm.pat
-share/timidity/guiro1.pat
-share/timidity/guiro2.pat
-share/timidity/gus/scratch1.pat
-share/timidity/gus/scratch2.pat
-share/timidity/gus/slap.pat
-share/timidity/gus/sqrwave.pat
-share/timidity/halopad.pat
-share/timidity/hammond.pat
-share/timidity/harmonca.pat
-share/timidity/harp.pat
-share/timidity/helicptr.pat
-share/timidity/highq.pat
-share/timidity/hihatcl.pat
-share/timidity/hihatop.pat
-share/timidity/hihatpd.pat
-share/timidity/hitbrass.pat
-share/timidity/honky.pat
-share/timidity/hrpschrd.pat
-share/timidity/install.txt
-share/timidity/jazzgtr.pat
-share/timidity/jingles.pat
-share/timidity/jungle.pat
-share/timidity/kalimba.pat
-share/timidity/kick1.pat
-share/timidity/kick2.pat
-share/timidity/koto.pat
-share/timidity/lead5th.pat
-share/timidity/maracas.pat
-share/timidity/marcato.pat
-share/timidity/marimba.pat
-share/timidity/mazpat/fx/birdy5.pat
-share/timidity/mazpat/fx/carstart.pat
-share/timidity/mazpat/fx/drop.pat
-share/timidity/mazpat/fx/footstep.pat
-share/timidity/mazpat/fx/jet.pat
-share/timidity/mazpat/fx/jungle.pat
-share/timidity/mazpat/fx/laser2.pat
-share/timidity/mazpat/fx/newstep.pat
-share/timidity/mazpat/fx/newtrain.pat
-share/timidity/mazpat/fx/rainyday.pat
-share/timidity/mazpat/fx/sn-roll.pat
-share/timidity/mazpat/fx/steps.pat
-share/timidity/mazpat/fx/train.pat
-share/timidity/mazpat/fx/water1.pat
-share/timidity/mazpat/fx/water2.pat
-share/timidity/mazpat/fx/water3.pat
-share/timidity/mazpat/fx/water4.pat
-share/timidity/mazpat/fx/watrbird.pat
-share/timidity/mazpat/fx/wind3a.pat
-share/timidity/mazpat/fx/windnois.pat
-share/timidity/metalpad.pat
-share/timidity/metbell.pat
-share/timidity/metclick.pat
-share/timidity/mt-32.cfg
-share/timidity/musicbox.pat
-share/timidity/mutegtr.pat
-share/timidity/mutetrum.pat
-share/timidity/newage.pat
-share/timidity/nyguitar.pat
-share/timidity/oboe.pat
-share/timidity/ocarina.pat
-share/timidity/odguitar.pat
-share/timidity/orchhit.pat
-share/timidity/patguide.txt
-share/timidity/patref24.hlp
-share/timidity/percorg.pat
-share/timidity/piccolo.pat
-share/timidity/pickbass.pat
-share/timidity/pistol.pat
-share/timidity/pizzcato.pat
-share/timidity/polysyn.pat
-share/timidity/power/e_power.txt
-share/timidity/power/gatedbd.pat
-share/timidity/power/gatesd0.pat
-share/timidity/power/gatesd1.pat
-share/timidity/power/gatesd2.pat
-share/timidity/power/h-bd.pat
-share/timidity/power/h-crash.pat
-share/timidity/power/h-hihatc.pat
-share/timidity/power/h-hihato.pat
-share/timidity/power/h-hihatp.pat
-share/timidity/power/h-ride.pat
-share/timidity/power/h-rim.pat
-share/timidity/power/h-snare.pat
-share/timidity/power/h-splash.pat
-share/timidity/power/h-tomhi1.pat
-share/timidity/power/h-tomhi2.pat
-share/timidity/power/h-tomlo1.pat
-share/timidity/power/h-tomlo2.pat
-share/timidity/power/h-tommd1.pat
-share/timidity/power/h-tommd2.pat
-share/timidity/power/hihatcl.pat
-share/timidity/power/hihatop.pat
-share/timidity/power/hihatpd.pat
-share/timidity/power/powrkic0.pat
-share/timidity/power/powrkic1.pat
-share/timidity/power/powrkic2.pat
-share/timidity/power/powrkic3.pat
-share/timidity/power/roomhi1.pat
-share/timidity/power/roomhi2.pat
-share/timidity/power/roomkick.pat
-share/timidity/power/roomlow1.pat
-share/timidity/power/roomlow2.pat
-share/timidity/power/roommid1.pat
-share/timidity/power/roommid2.pat
-share/timidity/proteus2.cfg
-share/timidity/recorder.pat
-share/timidity/reedorg.pat
-share/timidity/revcym.pat
-share/timidity/rockorg.pat
-share/timidity/santur.pat
-share/timidity/sawwave.pat
-share/timidity/scratch1.pat
-share/timidity/scratch2.pat
-share/timidity/seashore.pat
-share/timidity/sfx/ambulanc.pat
-share/timidity/sfx/badmaou.pat
-share/timidity/sfx/birdtwee.pat
-share/timidity/sfx/bubbles1.pat
-share/timidity/sfx/bubbling.pat
-share/timidity/sfx/carcrash.pat
-share/timidity/sfx/carengin.pat
-share/timidity/sfx/carpass.pat
-share/timidity/sfx/carstop.pat
-share/timidity/sfx/cat1.pat
-share/timidity/sfx/creak.pat
-share/timidity/sfx/cutnoiz.pat
-share/timidity/sfx/dialtone.pat
-share/timidity/sfx/dog1.pat
-share/timidity/sfx/dog2.pat
-share/timidity/sfx/doggrowl.pat
-share/timidity/sfx/door.pat
-share/timidity/sfx/explsion.pat
-share/timidity/sfx/firework.pat
-share/timidity/sfx/flclick.pat
-share/timidity/sfx/fretnoyz.pat
-share/timidity/sfx/funkgtr.pat
-share/timidity/sfx/gallop.pat
-share/timidity/sfx/ghost.pat
-share/timidity/sfx/ghost2.pat
-share/timidity/sfx/heartbt.pat
-share/timidity/sfx/hoofs.pat
-share/timidity/sfx/laugh.pat
-share/timidity/sfx/machgun1.pat
-share/timidity/sfx/machgun2.pat
-share/timidity/sfx/meow.pat
-share/timidity/sfx/newwind.pat
-share/timidity/sfx/punch.pat
-share/timidity/sfx/rain1.pat
-share/timidity/sfx/scratch1.pat
-share/timidity/sfx/scratch2.pat
-share/timidity/sfx/scream.pat
-share/timidity/sfx/siren1.pat
-share/timidity/sfx/siren2.pat
-share/timidity/sfx/starship.pat
-share/timidity/sfx/stream.pat
-share/timidity/sfx/stream1.pat
-share/timidity/sfx/telephon.pat
-share/timidity/sfx/thunder1.pat
-share/timidity/sfx/thunder2.pat
-share/timidity/sfx/train.pat
-share/timidity/sfx/whales.pat
-share/timidity/sfx/windchim.pat
-share/timidity/shakazul.pat
-share/timidity/shaker.pat
-share/timidity/shamisen.pat
-share/timidity/shannai.pat
-share/timidity/sitar.pat
-share/timidity/slap.pat
-share/timidity/slapbas1.pat
-share/timidity/slapbas2.pat
-share/timidity/slowstr.pat
-share/timidity/snap.pat
-share/timidity/snare1.pat
-share/timidity/snare2.pat
-share/timidity/snarerol.pat
-share/timidity/sndfont.cfg
-share/timidity/soundtrk.pat
-share/timidity/sprnosax.pat
-share/timidity/sqrclick.pat
-share/timidity/sqrwave.pat
-share/timidity/startrak.pat
-share/timidity/steeldrm.pat
-share/timidity/stickrim.pat
-share/timidity/sticks.pat
-share/timidity/surdo1.pat
-share/timidity/surdo2.pat
-share/timidity/sustain.cfg
-share/timidity/sweeper.pat
-share/timidity/synbass1.pat
-share/timidity/synbass2.pat
-share/timidity/synbras1.pat
-share/timidity/synbras2.pat
-share/timidity/synpiano.pat
-share/timidity/synstr1.pat
-share/timidity/synstr2.pat
-share/timidity/syntom.pat
-share/timidity/taiko.pat
-share/timidity/tamborin.pat
-share/timidity/telephon.pat
-share/timidity/tenorsax.pat
-share/timidity/timbaleh.pat
-share/timidity/timbalel.pat
-share/timidity/timidity.cfg
-share/timidity/timpani.pat
-share/timidity/tomhi1.pat
-share/timidity/tomhi2.pat
-share/timidity/tomlo1.pat
-share/timidity/tomlo2.pat
-share/timidity/tommid1.pat
-share/timidity/tommid2.pat
-share/timidity/toms.pat
-share/timidity/tremstr.pat
-share/timidity/triangl1.pat
-share/timidity/triangl2.pat
-share/timidity/trombone.pat
-share/timidity/trump2.pat
-share/timidity/trumpet.pat
-share/timidity/tuba.pat
-share/timidity/tubebell.pat
-share/timidity/ultrasnd.ini
-share/timidity/unicorn.pat
-share/timidity/vibes.pat
-share/timidity/vibslap.pat
-share/timidity/viola.pat
-share/timidity/violin.pat
-share/timidity/voices.pat
-share/timidity/voxlead.pat
-share/timidity/warmpad.pat
-share/timidity/whistle.pat
-share/timidity/whistle1.pat
-share/timidity/whistle2.pat
-share/timidity/wime/wime.txt
-share/timidity/wime/wimebd.pat
-share/timidity/wime/wimesd.pat
-share/timidity/woodblk.pat
-share/timidity/woodblk1.pat
-share/timidity/woodblk2.pat
-share/timidity/woodflut.pat
-share/timidity/xgmap2.cfg
-share/timidity/xylophon.pat
-@dirrm share/timidity/wime
-@dirrm share/timidity/sfx
-@dirrm share/timidity/power
-@dirrm share/timidity/mazpat/fx
-@dirrm share/timidity/mazpat
-@dirrm share/timidity/gus
-@dirrm share/timidity/gsdrum40
-@dirrm share/timidity/gsdrum25
-@dirrm share/timidity/gsdrum08
-@dirrm share/timidity/ethnic
-@dirrm share/timidity
+@comment $NetBSD: PLIST,v 1.3 2004/12/03 14:20:03 ben Exp $
+share/eawpatches/acbass.pat
+share/eawpatches/accordn.pat
+share/eawpatches/acguitar.pat
+share/eawpatches/acpiano.pat
+share/eawpatches/agogo.pat
+share/eawpatches/agogohi.pat
+share/eawpatches/agogolo.pat
+share/eawpatches/altosax.pat
+share/eawpatches/applause.pat
+share/eawpatches/atmosphr.pat
+share/eawpatches/aurora.pat
+share/eawpatches/bagpipes.pat
+share/eawpatches/banjo.pat
+share/eawpatches/barisax.pat
+share/eawpatches/basslead.pat
+share/eawpatches/bassoon.pat
+share/eawpatches/belltree.pat
+share/eawpatches/blank.pat
+share/eawpatches/bongohi.pat
+share/eawpatches/bongolo.pat
+share/eawpatches/bottle.pat
+share/eawpatches/bowglass.pat
+share/eawpatches/britepno.pat
+share/eawpatches/cabasa.pat
+share/eawpatches/calliope.pat
+share/eawpatches/carillon.pat
+share/eawpatches/castinet.pat
+share/eawpatches/celeste.pat
+share/eawpatches/cello.pat
+share/eawpatches/changelog.txt
+share/eawpatches/charang.pat
+share/eawpatches/chiflead.pat
+share/eawpatches/choir.pat
+share/eawpatches/church.pat
+share/eawpatches/claps.pat
+share/eawpatches/clarinet.pat
+share/eawpatches/clave.pat
+share/eawpatches/clavinet.pat
+share/eawpatches/cleangtr.pat
+share/eawpatches/concrtbd.pat
+share/eawpatches/concrtna.pat
+share/eawpatches/congahi1.pat
+share/eawpatches/congahi2.pat
+share/eawpatches/congalo.pat
+share/eawpatches/contraba.pat
+share/eawpatches/copyrigh.txt
+share/eawpatches/cowbell.pat
+share/eawpatches/crystal.pat
+share/eawpatches/cuica1.pat
+share/eawpatches/cuica2.pat
+share/eawpatches/cymbell.pat
+share/eawpatches/cymchina.pat
+share/eawpatches/cymcrsh1.pat
+share/eawpatches/cymcrsh2.pat
+share/eawpatches/cymride1.pat
+share/eawpatches/cymride2.pat
+share/eawpatches/cymsplsh.pat
+share/eawpatches/default.cfg
+share/eawpatches/distgtr.pat
+share/eawpatches/doo.pat
+share/eawpatches/drumsfx.txt
+share/eawpatches/eawpats.txt
+share/eawpatches/echovox.pat
+share/eawpatches/englhorn.pat
+share/eawpatches/epiano1.pat
+share/eawpatches/epiano2.pat
+share/eawpatches/ethnic/gong.pat
+share/eawpatches/ethnic/tabla.pat
+share/eawpatches/ethnic/tabla.txt
+share/eawpatches/ethnic/talkbend.pat
+share/eawpatches/ethnic/talkdrum.pat
+share/eawpatches/fiddle.pat
+share/eawpatches/flute.pat
+share/eawpatches/fngrbass.pat
+share/eawpatches/frenchrn.pat
+share/eawpatches/freshair.pat
+share/eawpatches/fretless.pat
+share/eawpatches/fx-blow.pat
+share/eawpatches/fx-fret.pat
+share/eawpatches/ghostie.pat
+share/eawpatches/glocken.pat
+share/eawpatches/gravis.cfg
+share/eawpatches/gsdrum08/gsdrum08.txt
+share/eawpatches/gsdrum08/roomhi1.pat
+share/eawpatches/gsdrum08/roomhi2.pat
+share/eawpatches/gsdrum08/roomkick.pat
+share/eawpatches/gsdrum08/roomlow1.pat
+share/eawpatches/gsdrum08/roomlow2.pat
+share/eawpatches/gsdrum08/roommid1.pat
+share/eawpatches/gsdrum08/roommid2.pat
+share/eawpatches/gsdrum25/78hhc.pat
+share/eawpatches/gsdrum25/78hho.pat
+share/eawpatches/gsdrum25/78kick.pat
+share/eawpatches/gsdrum25/78snare.pat
+share/eawpatches/gsdrum25/808bd2.pat
+share/eawpatches/gsdrum25/808clap1.pat
+share/eawpatches/gsdrum25/808clap2.pat
+share/eawpatches/gsdrum25/808cowbl.pat
+share/eawpatches/gsdrum25/808crsh1.pat
+share/eawpatches/gsdrum25/808cymb.pat
+share/eawpatches/gsdrum25/808hhc.pat
+share/eawpatches/gsdrum25/808hho.pat
+share/eawpatches/gsdrum25/808kick.pat
+share/eawpatches/gsdrum25/808sd1.pat
+share/eawpatches/gsdrum25/808sd2.pat
+share/eawpatches/gsdrum25/808snar2.pat
+share/eawpatches/gsdrum25/808snare.pat
+share/eawpatches/gsdrum25/808stick.pat
+share/eawpatches/gsdrum25/808tomh1.pat
+share/eawpatches/gsdrum25/808tomh2.pat
+share/eawpatches/gsdrum25/808toml1.pat
+share/eawpatches/gsdrum25/808toml2.pat
+share/eawpatches/gsdrum25/808tomm1.pat
+share/eawpatches/gsdrum25/808tomm2.pat
+share/eawpatches/gsdrum25/909hhc.pat
+share/eawpatches/gsdrum25/909hho.pat
+share/eawpatches/gsdrum25/909kick.pat
+share/eawpatches/gsdrum25/909snare.pat
+share/eawpatches/gsdrum25/909stick.pat
+share/eawpatches/gsdrum25/gsdrm25p.txt
+share/eawpatches/gsdrum25/revcym.pat
+share/eawpatches/gsdrum25/scratch.pat
+share/eawpatches/gsdrum40/br_slap.pat
+share/eawpatches/gsdrum40/br_swirl.pat
+share/eawpatches/gsdrum40/br_swish.pat
+share/eawpatches/gsdrum40/gsdrum40.txt
+share/eawpatches/gsdrum40/hihatcl.pat
+share/eawpatches/gsdrum40/hihatop.pat
+share/eawpatches/gsdrums.cfg
+share/eawpatches/gssfx.cfg
+share/eawpatches/gtrharm.pat
+share/eawpatches/guiro1.pat
+share/eawpatches/guiro2.pat
+share/eawpatches/gus/scratch1.pat
+share/eawpatches/gus/scratch2.pat
+share/eawpatches/gus/slap.pat
+share/eawpatches/gus/sqrwave.pat
+share/eawpatches/halopad.pat
+share/eawpatches/hammond.pat
+share/eawpatches/harmonca.pat
+share/eawpatches/harp.pat
+share/eawpatches/helicptr.pat
+share/eawpatches/highq.pat
+share/eawpatches/hihatcl.pat
+share/eawpatches/hihatop.pat
+share/eawpatches/hihatpd.pat
+share/eawpatches/hitbrass.pat
+share/eawpatches/honky.pat
+share/eawpatches/hrpschrd.pat
+share/eawpatches/install.txt
+share/eawpatches/jazzgtr.pat
+share/eawpatches/jingles.pat
+share/eawpatches/jungle.pat
+share/eawpatches/kalimba.pat
+share/eawpatches/kick1.pat
+share/eawpatches/kick2.pat
+share/eawpatches/koto.pat
+share/eawpatches/lead5th.pat
+share/eawpatches/maracas.pat
+share/eawpatches/marcato.pat
+share/eawpatches/marimba.pat
+share/eawpatches/mazpat/fx/birdy5.pat
+share/eawpatches/mazpat/fx/carstart.pat
+share/eawpatches/mazpat/fx/drop.pat
+share/eawpatches/mazpat/fx/footstep.pat
+share/eawpatches/mazpat/fx/jet.pat
+share/eawpatches/mazpat/fx/jungle.pat
+share/eawpatches/mazpat/fx/laser2.pat
+share/eawpatches/mazpat/fx/newstep.pat
+share/eawpatches/mazpat/fx/newtrain.pat
+share/eawpatches/mazpat/fx/rainyday.pat
+share/eawpatches/mazpat/fx/sn-roll.pat
+share/eawpatches/mazpat/fx/steps.pat
+share/eawpatches/mazpat/fx/train.pat
+share/eawpatches/mazpat/fx/water1.pat
+share/eawpatches/mazpat/fx/water2.pat
+share/eawpatches/mazpat/fx/water3.pat
+share/eawpatches/mazpat/fx/water4.pat
+share/eawpatches/mazpat/fx/watrbird.pat
+share/eawpatches/mazpat/fx/wind3a.pat
+share/eawpatches/mazpat/fx/windnois.pat
+share/eawpatches/metalpad.pat
+share/eawpatches/metbell.pat
+share/eawpatches/metclick.pat
+share/eawpatches/mt-32.cfg
+share/eawpatches/musicbox.pat
+share/eawpatches/mutegtr.pat
+share/eawpatches/mutetrum.pat
+share/eawpatches/newage.pat
+share/eawpatches/nyguitar.pat
+share/eawpatches/oboe.pat
+share/eawpatches/ocarina.pat
+share/eawpatches/odguitar.pat
+share/eawpatches/orchhit.pat
+share/eawpatches/patguide.txt
+share/eawpatches/patref24.hlp
+share/eawpatches/percorg.pat
+share/eawpatches/piccolo.pat
+share/eawpatches/pickbass.pat
+share/eawpatches/pistol.pat
+share/eawpatches/pizzcato.pat
+share/eawpatches/polysyn.pat
+share/eawpatches/power/e_power.txt
+share/eawpatches/power/gatedbd.pat
+share/eawpatches/power/gatesd0.pat
+share/eawpatches/power/gatesd1.pat
+share/eawpatches/power/gatesd2.pat
+share/eawpatches/power/h-bd.pat
+share/eawpatches/power/h-crash.pat
+share/eawpatches/power/h-hihatc.pat
+share/eawpatches/power/h-hihato.pat
+share/eawpatches/power/h-hihatp.pat
+share/eawpatches/power/h-ride.pat
+share/eawpatches/power/h-rim.pat
+share/eawpatches/power/h-snare.pat
+share/eawpatches/power/h-splash.pat
+share/eawpatches/power/h-tomhi1.pat
+share/eawpatches/power/h-tomhi2.pat
+share/eawpatches/power/h-tomlo1.pat
+share/eawpatches/power/h-tomlo2.pat
+share/eawpatches/power/h-tommd1.pat
+share/eawpatches/power/h-tommd2.pat
+share/eawpatches/power/hihatcl.pat
+share/eawpatches/power/hihatop.pat
+share/eawpatches/power/hihatpd.pat
+share/eawpatches/power/powrkic0.pat
+share/eawpatches/power/powrkic1.pat
+share/eawpatches/power/powrkic2.pat
+share/eawpatches/power/powrkic3.pat
+share/eawpatches/power/roomhi1.pat
+share/eawpatches/power/roomhi2.pat
+share/eawpatches/power/roomkick.pat
+share/eawpatches/power/roomlow1.pat
+share/eawpatches/power/roomlow2.pat
+share/eawpatches/power/roommid1.pat
+share/eawpatches/power/roommid2.pat
+share/eawpatches/proteus2.cfg
+share/eawpatches/recorder.pat
+share/eawpatches/reedorg.pat
+share/eawpatches/revcym.pat
+share/eawpatches/rockorg.pat
+share/eawpatches/santur.pat
+share/eawpatches/sawwave.pat
+share/eawpatches/scratch1.pat
+share/eawpatches/scratch2.pat
+share/eawpatches/seashore.pat
+share/eawpatches/sfx/ambulanc.pat
+share/eawpatches/sfx/badmaou.pat
+share/eawpatches/sfx/birdtwee.pat
+share/eawpatches/sfx/bubbles1.pat
+share/eawpatches/sfx/bubbling.pat
+share/eawpatches/sfx/carcrash.pat
+share/eawpatches/sfx/carengin.pat
+share/eawpatches/sfx/carpass.pat
+share/eawpatches/sfx/carstop.pat
+share/eawpatches/sfx/cat1.pat
+share/eawpatches/sfx/creak.pat
+share/eawpatches/sfx/cutnoiz.pat
+share/eawpatches/sfx/dialtone.pat
+share/eawpatches/sfx/dog1.pat
+share/eawpatches/sfx/dog2.pat
+share/eawpatches/sfx/doggrowl.pat
+share/eawpatches/sfx/door.pat
+share/eawpatches/sfx/explsion.pat
+share/eawpatches/sfx/firework.pat
+share/eawpatches/sfx/flclick.pat
+share/eawpatches/sfx/fretnoyz.pat
+share/eawpatches/sfx/funkgtr.pat
+share/eawpatches/sfx/gallop.pat
+share/eawpatches/sfx/ghost.pat
+share/eawpatches/sfx/ghost2.pat
+share/eawpatches/sfx/heartbt.pat
+share/eawpatches/sfx/hoofs.pat
+share/eawpatches/sfx/laugh.pat
+share/eawpatches/sfx/machgun1.pat
+share/eawpatches/sfx/machgun2.pat
+share/eawpatches/sfx/meow.pat
+share/eawpatches/sfx/newwind.pat
+share/eawpatches/sfx/punch.pat
+share/eawpatches/sfx/rain1.pat
+share/eawpatches/sfx/scratch1.pat
+share/eawpatches/sfx/scratch2.pat
+share/eawpatches/sfx/scream.pat
+share/eawpatches/sfx/siren1.pat
+share/eawpatches/sfx/siren2.pat
+share/eawpatches/sfx/starship.pat
+share/eawpatches/sfx/stream.pat
+share/eawpatches/sfx/stream1.pat
+share/eawpatches/sfx/telephon.pat
+share/eawpatches/sfx/thunder1.pat
+share/eawpatches/sfx/thunder2.pat
+share/eawpatches/sfx/train.pat
+share/eawpatches/sfx/whales.pat
+share/eawpatches/sfx/windchim.pat
+share/eawpatches/shakazul.pat
+share/eawpatches/shaker.pat
+share/eawpatches/shamisen.pat
+share/eawpatches/shannai.pat
+share/eawpatches/sitar.pat
+share/eawpatches/slap.pat
+share/eawpatches/slapbas1.pat
+share/eawpatches/slapbas2.pat
+share/eawpatches/slowstr.pat
+share/eawpatches/snap.pat
+share/eawpatches/snare1.pat
+share/eawpatches/snare2.pat
+share/eawpatches/snarerol.pat
+share/eawpatches/sndfont.cfg
+share/eawpatches/soundtrk.pat
+share/eawpatches/sprnosax.pat
+share/eawpatches/sqrclick.pat
+share/eawpatches/sqrwave.pat
+share/eawpatches/startrak.pat
+share/eawpatches/steeldrm.pat
+share/eawpatches/stickrim.pat
+share/eawpatches/sticks.pat
+share/eawpatches/surdo1.pat
+share/eawpatches/surdo2.pat
+share/eawpatches/sustain.cfg
+share/eawpatches/sweeper.pat
+share/eawpatches/synbass1.pat
+share/eawpatches/synbass2.pat
+share/eawpatches/synbras1.pat
+share/eawpatches/synbras2.pat
+share/eawpatches/synpiano.pat
+share/eawpatches/synstr1.pat
+share/eawpatches/synstr2.pat
+share/eawpatches/syntom.pat
+share/eawpatches/taiko.pat
+share/eawpatches/tamborin.pat
+share/eawpatches/telephon.pat
+share/eawpatches/tenorsax.pat
+share/eawpatches/timbaleh.pat
+share/eawpatches/timbalel.pat
+share/eawpatches/timidity.cfg
+share/eawpatches/timpani.pat
+share/eawpatches/tomhi1.pat
+share/eawpatches/tomhi2.pat
+share/eawpatches/tomlo1.pat
+share/eawpatches/tomlo2.pat
+share/eawpatches/tommid1.pat
+share/eawpatches/tommid2.pat
+share/eawpatches/toms.pat
+share/eawpatches/tremstr.pat
+share/eawpatches/triangl1.pat
+share/eawpatches/triangl2.pat
+share/eawpatches/trombone.pat
+share/eawpatches/trump2.pat
+share/eawpatches/trumpet.pat
+share/eawpatches/tuba.pat
+share/eawpatches/tubebell.pat
+share/eawpatches/ultrasnd.ini
+share/eawpatches/unicorn.pat
+share/eawpatches/vibes.pat
+share/eawpatches/vibslap.pat
+share/eawpatches/viola.pat
+share/eawpatches/violin.pat
+share/eawpatches/voices.pat
+share/eawpatches/voxlead.pat
+share/eawpatches/warmpad.pat
+share/eawpatches/whistle.pat
+share/eawpatches/whistle1.pat
+share/eawpatches/whistle2.pat
+share/eawpatches/wime/wime.txt
+share/eawpatches/wime/wimebd.pat
+share/eawpatches/wime/wimesd.pat
+share/eawpatches/woodblk.pat
+share/eawpatches/woodblk1.pat
+share/eawpatches/woodblk2.pat
+share/eawpatches/woodflut.pat
+share/eawpatches/xgmap2.cfg
+share/eawpatches/xylophon.pat
+@dirrm share/eawpatches/wime
+@dirrm share/eawpatches/sfx
+@dirrm share/eawpatches/power
+@dirrm share/eawpatches/mazpat/fx
+@dirrm share/eawpatches/mazpat
+@dirrm share/eawpatches/gus
+@dirrm share/eawpatches/gsdrum40
+@dirrm share/eawpatches/gsdrum25
+@dirrm share/eawpatches/gsdrum08
+@dirrm share/eawpatches/ethnic
+@dirrm share/eawpatches
diff --git a/audio/guspatches/MESSAGE b/audio/guspatches/MESSAGE
new file mode 100644
index 00000000000..346387ceb82
--- /dev/null
+++ b/audio/guspatches/MESSAGE
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/12/03 14:20:03 ben Exp $
+
+  To use timidity with guspatches, you have a couple of options.
+
+  1) at the command-line:
+
+     timidity -L ${PREFIX}/share/guspatches -c timidity.cfg file.mid
+
+  2) in the system-wide timidity configuration:
+
+     cp ${PREFIX}/share/guspatches/timidity.cfg ${PKG_SYSCONFDIR}/timidity
+
+===========================================================================
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index b72fb01128d..9ad1da82c56 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:22:23 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/03 14:20:03 ben Exp $
 #
 
 DISTNAME=	dgguspat
 PKGNAME=	guspatches-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.zip
@@ -11,14 +11,13 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=     tech-pkg@NetBSD.org
 COMMENT=	GUS (Gravis Ultrasound) patches (audio samples) for TiMidity
 
-CONFLICTS=	eawpatches-[0-9]*
-
 RESTRICTED=		"Uses copyrighted patches"
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 EXTRACT_ONLY=	# empty
 NO_CONFIGURE=	yes
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 do-build:
 	${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/gravis.cfg > \
@@ -27,10 +26,10 @@ do-build:
 		${WRKDIR}/timidity.cfg
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/timidity
-	cd ${PREFIX}/share/timidity && unzip -oqL ${DISTDIR}/${DISTFILES}
-	${INSTALL_DATA} ${FILESDIR}/midia.cfg ${PREFIX}/share/timidity
-	${INSTALL_DATA} ${WRKDIR}/gravis.cfg ${PREFIX}/share/timidity
-	${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${PREFIX}/share/timidity
+	${INSTALL_DATA_DIR} ${PREFIX}/share/guspatches
+	cd ${PREFIX}/share/guspatches && unzip -oqL ${DISTDIR}/${DISTFILES}
+	${INSTALL_DATA} ${FILESDIR}/midia.cfg ${PREFIX}/share/guspatches
+	${INSTALL_DATA} ${WRKDIR}/gravis.cfg ${PREFIX}/share/guspatches
+	${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${PREFIX}/share/guspatches
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/guspatches/PLIST b/audio/guspatches/PLIST
index 2ad69d2a0a5..4a63fa9deb5 100644
--- a/audio/guspatches/PLIST
+++ b/audio/guspatches/PLIST
@@ -1,204 +1,204 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:47 zuntum Exp $
-share/timidity/timidity.cfg
-share/timidity/gravis.cfg
-share/timidity/midia.cfg
-share/timidity/acbass.pat
-share/timidity/accordn.pat
-share/timidity/acguitar.pat
-share/timidity/acpiano.pat
-share/timidity/agogo.pat
-share/timidity/agogohi.pat
-share/timidity/agogolo.pat
-share/timidity/altosax.pat
-share/timidity/applause.pat
-share/timidity/atmosphr.pat
-share/timidity/aurora.pat
-share/timidity/bagpipes.pat
-share/timidity/banjo.pat
-share/timidity/barisax.pat
-share/timidity/basslead.pat
-share/timidity/bassoon.pat
-share/timidity/belltree.pat
-share/timidity/blank.pat
-share/timidity/bongohi.pat
-share/timidity/bongolo.pat
-share/timidity/bottle.pat
-share/timidity/bowglass.pat
-share/timidity/britepno.pat
-share/timidity/c550kc_1.pat
-share/timidity/c550sn10.pat
-share/timidity/c550sn_6.pat
-share/timidity/c550vibs.pat
-share/timidity/cabasa.pat
-share/timidity/calliope.pat
-share/timidity/carillon.pat
-share/timidity/castinet.pat
-share/timidity/celeste.pat
-share/timidity/cello.pat
-share/timidity/charang.pat
-share/timidity/chiflead.pat
-share/timidity/choir.pat
-share/timidity/church.pat
-share/timidity/claps.pat
-share/timidity/clarinet.pat
-share/timidity/clave.pat
-share/timidity/clavinet.pat
-share/timidity/cleangtr.pat
-share/timidity/concrtna.pat
-share/timidity/congahi1.pat
-share/timidity/congahi2.pat
-share/timidity/congalo.pat
-share/timidity/contraba.pat
-share/timidity/cowbell.pat
-share/timidity/crystal.pat
-share/timidity/cuica1.pat
-share/timidity/cuica2.pat
-share/timidity/cymbell.pat
-share/timidity/cymchina.pat
-share/timidity/cymcrsh1.pat
-share/timidity/cymcrsh2.pat
-share/timidity/cymride1.pat
-share/timidity/cymride2.pat
-share/timidity/cymsplsh.pat
-share/timidity/distgtr.pat
-share/timidity/doo.pat
-share/timidity/echovox.pat
-share/timidity/englhorn.pat
-share/timidity/epiano1.pat
-share/timidity/epiano2.pat
-share/timidity/fantasia.pat
-share/timidity/fiddle.pat
-share/timidity/flute.pat
-share/timidity/fngrbass.pat
-share/timidity/frenchrn.pat
-share/timidity/freshair.pat
-share/timidity/fretless.pat
-share/timidity/fx-blow.pat
-share/timidity/fx-fret.pat
-share/timidity/ghostie.pat
-share/timidity/glocken.pat
-share/timidity/gtrharm.pat
-share/timidity/guiro1.pat
-share/timidity/guiro2.pat
-share/timidity/halopad.pat
-share/timidity/harmonca.pat
-share/timidity/harp.pat
-share/timidity/helicptr.pat
-share/timidity/highq.pat
-share/timidity/hihatcl.pat
-share/timidity/hihatop.pat
-share/timidity/hihatpd.pat
-share/timidity/hitbrass.pat
-share/timidity/homeorg.pat
-share/timidity/honky.pat
-share/timidity/hrpschrd.pat
-share/timidity/jazzgtr.pat
-share/timidity/jingles.pat
-share/timidity/jungle.pat
-share/timidity/kalimba.pat
-share/timidity/kick1.pat
-share/timidity/kick2.pat
-share/timidity/koto.pat
-share/timidity/lead5th.pat
-share/timidity/maracas.pat
-share/timidity/marcato.pat
-share/timidity/marimba.pat
-share/timidity/metalpad.pat
-share/timidity/metbell.pat
-share/timidity/metclick.pat
-share/timidity/musicbox.pat
-share/timidity/mutegtr.pat
-share/timidity/mutetrum.pat
-share/timidity/nyguitar.pat
-share/timidity/oboe.pat
-share/timidity/ocarina.pat
-share/timidity/odguitar.pat
-share/timidity/orchhit.pat
-share/timidity/percorg.pat
-share/timidity/piccolo.pat
-share/timidity/pickbass.pat
-share/timidity/pistol.pat
-share/timidity/pizzcato.pat
-share/timidity/polysyn.pat
-share/timidity/recorder.pat
-share/timidity/reedorg.pat
-share/timidity/revcym.pat
-share/timidity/ringwhsl.pat
-share/timidity/rockorg.pat
-share/timidity/santur.pat
-share/timidity/sawwave.pat
-share/timidity/scratch1.pat
-share/timidity/scratch2.pat
-share/timidity/seashore.pat
-share/timidity/shakazul.pat
-share/timidity/shaker.pat
-share/timidity/shamisen.pat
-share/timidity/shannai.pat
-share/timidity/sitar.pat
-share/timidity/slap.pat
-share/timidity/slapbas1.pat
-share/timidity/slapbas2.pat
-share/timidity/slowstr.pat
-share/timidity/snare1.pat
-share/timidity/snare2.pat
-share/timidity/soundtrk.pat
-share/timidity/sprnosax.pat
-share/timidity/sqrclick.pat
-share/timidity/sqrwave.pat
-share/timidity/startrak.pat
-share/timidity/steeldrm.pat
-share/timidity/stickrim.pat
-share/timidity/sticks.pat
-share/timidity/surdo1.pat
-share/timidity/surdo2.pat
-share/timidity/sweeper.pat
-share/timidity/synbass1.pat
-share/timidity/synbass2.pat
-share/timidity/synbras1.pat
-share/timidity/synbras2.pat
-share/timidity/synpiano.pat
-share/timidity/synstr1.pat
-share/timidity/synstr2.pat
-share/timidity/syntom.pat
-share/timidity/taiko.pat
-share/timidity/tamborin.pat
-share/timidity/telephon.pat
-share/timidity/tenorsax.pat
-share/timidity/timbaleh.pat
-share/timidity/timbalel.pat
-share/timidity/timpani.pat
-share/timidity/tomhi1.pat
-share/timidity/tomhi2.pat
-share/timidity/tomlo1.pat
-share/timidity/tomlo2.pat
-share/timidity/tommid1.pat
-share/timidity/tommid2.pat
-share/timidity/toms.pat
-share/timidity/tremstr.pat
-share/timidity/triangl1.pat
-share/timidity/triangl2.pat
-share/timidity/trombone.pat
-share/timidity/trumpet.pat
-share/timidity/tuba.pat
-share/timidity/tubebell.pat
-share/timidity/unicorn.pat
-share/timidity/vibes.pat
-share/timidity/vibslap.pat
-share/timidity/viola.pat
-share/timidity/violin.pat
-share/timidity/voices.pat
-share/timidity/voxlead.pat
-share/timidity/warmpad.pat
-share/timidity/whistle.pat
-share/timidity/whistle1.pat
-share/timidity/whistle2.pat
-share/timidity/woodblk.pat
-share/timidity/woodblk1.pat
-share/timidity/woodblk2.pat
-share/timidity/woodflut.pat
-share/timidity/xylophon.pat
-share/timidity/chris6.cfg
-share/timidity/default.cfg
-share/timidity/maplerag.cfg
-share/timidity/ultramid.ini
-@dirrm share/timidity
+@comment $NetBSD: PLIST,v 1.2 2004/12/03 14:20:03 ben Exp $
+share/guspatches/timidity.cfg
+share/guspatches/gravis.cfg
+share/guspatches/midia.cfg
+share/guspatches/acbass.pat
+share/guspatches/accordn.pat
+share/guspatches/acguitar.pat
+share/guspatches/acpiano.pat
+share/guspatches/agogo.pat
+share/guspatches/agogohi.pat
+share/guspatches/agogolo.pat
+share/guspatches/altosax.pat
+share/guspatches/applause.pat
+share/guspatches/atmosphr.pat
+share/guspatches/aurora.pat
+share/guspatches/bagpipes.pat
+share/guspatches/banjo.pat
+share/guspatches/barisax.pat
+share/guspatches/basslead.pat
+share/guspatches/bassoon.pat
+share/guspatches/belltree.pat
+share/guspatches/blank.pat
+share/guspatches/bongohi.pat
+share/guspatches/bongolo.pat
+share/guspatches/bottle.pat
+share/guspatches/bowglass.pat
+share/guspatches/britepno.pat
+share/guspatches/c550kc_1.pat
+share/guspatches/c550sn10.pat
+share/guspatches/c550sn_6.pat
+share/guspatches/c550vibs.pat
+share/guspatches/cabasa.pat
+share/guspatches/calliope.pat
+share/guspatches/carillon.pat
+share/guspatches/castinet.pat
+share/guspatches/celeste.pat
+share/guspatches/cello.pat
+share/guspatches/charang.pat
+share/guspatches/chiflead.pat
+share/guspatches/choir.pat
+share/guspatches/church.pat
+share/guspatches/claps.pat
+share/guspatches/clarinet.pat
+share/guspatches/clave.pat
+share/guspatches/clavinet.pat
+share/guspatches/cleangtr.pat
+share/guspatches/concrtna.pat
+share/guspatches/congahi1.pat
+share/guspatches/congahi2.pat
+share/guspatches/congalo.pat
+share/guspatches/contraba.pat
+share/guspatches/cowbell.pat
+share/guspatches/crystal.pat
+share/guspatches/cuica1.pat
+share/guspatches/cuica2.pat
+share/guspatches/cymbell.pat
+share/guspatches/cymchina.pat
+share/guspatches/cymcrsh1.pat
+share/guspatches/cymcrsh2.pat
+share/guspatches/cymride1.pat
+share/guspatches/cymride2.pat
+share/guspatches/cymsplsh.pat
+share/guspatches/distgtr.pat
+share/guspatches/doo.pat
+share/guspatches/echovox.pat
+share/guspatches/englhorn.pat
+share/guspatches/epiano1.pat
+share/guspatches/epiano2.pat
+share/guspatches/fantasia.pat
+share/guspatches/fiddle.pat
+share/guspatches/flute.pat
+share/guspatches/fngrbass.pat
+share/guspatches/frenchrn.pat
+share/guspatches/freshair.pat
+share/guspatches/fretless.pat
+share/guspatches/fx-blow.pat
+share/guspatches/fx-fret.pat
+share/guspatches/ghostie.pat
+share/guspatches/glocken.pat
+share/guspatches/gtrharm.pat
+share/guspatches/guiro1.pat
+share/guspatches/guiro2.pat
+share/guspatches/halopad.pat
+share/guspatches/harmonca.pat
+share/guspatches/harp.pat
+share/guspatches/helicptr.pat
+share/guspatches/highq.pat
+share/guspatches/hihatcl.pat
+share/guspatches/hihatop.pat
+share/guspatches/hihatpd.pat
+share/guspatches/hitbrass.pat
+share/guspatches/homeorg.pat
+share/guspatches/honky.pat
+share/guspatches/hrpschrd.pat
+share/guspatches/jazzgtr.pat
+share/guspatches/jingles.pat
+share/guspatches/jungle.pat
+share/guspatches/kalimba.pat
+share/guspatches/kick1.pat
+share/guspatches/kick2.pat
+share/guspatches/koto.pat
+share/guspatches/lead5th.pat
+share/guspatches/maracas.pat
+share/guspatches/marcato.pat
+share/guspatches/marimba.pat
+share/guspatches/metalpad.pat
+share/guspatches/metbell.pat
+share/guspatches/metclick.pat
+share/guspatches/musicbox.pat
+share/guspatches/mutegtr.pat
+share/guspatches/mutetrum.pat
+share/guspatches/nyguitar.pat
+share/guspatches/oboe.pat
+share/guspatches/ocarina.pat
+share/guspatches/odguitar.pat
+share/guspatches/orchhit.pat
+share/guspatches/percorg.pat
+share/guspatches/piccolo.pat
+share/guspatches/pickbass.pat
+share/guspatches/pistol.pat
+share/guspatches/pizzcato.pat
+share/guspatches/polysyn.pat
+share/guspatches/recorder.pat
+share/guspatches/reedorg.pat
+share/guspatches/revcym.pat
+share/guspatches/ringwhsl.pat
+share/guspatches/rockorg.pat
+share/guspatches/santur.pat
+share/guspatches/sawwave.pat
+share/guspatches/scratch1.pat
+share/guspatches/scratch2.pat
+share/guspatches/seashore.pat
+share/guspatches/shakazul.pat
+share/guspatches/shaker.pat
+share/guspatches/shamisen.pat
+share/guspatches/shannai.pat
+share/guspatches/sitar.pat
+share/guspatches/slap.pat
+share/guspatches/slapbas1.pat
+share/guspatches/slapbas2.pat
+share/guspatches/slowstr.pat
+share/guspatches/snare1.pat
+share/guspatches/snare2.pat
+share/guspatches/soundtrk.pat
+share/guspatches/sprnosax.pat
+share/guspatches/sqrclick.pat
+share/guspatches/sqrwave.pat
+share/guspatches/startrak.pat
+share/guspatches/steeldrm.pat
+share/guspatches/stickrim.pat
+share/guspatches/sticks.pat
+share/guspatches/surdo1.pat
+share/guspatches/surdo2.pat
+share/guspatches/sweeper.pat
+share/guspatches/synbass1.pat
+share/guspatches/synbass2.pat
+share/guspatches/synbras1.pat
+share/guspatches/synbras2.pat
+share/guspatches/synpiano.pat
+share/guspatches/synstr1.pat
+share/guspatches/synstr2.pat
+share/guspatches/syntom.pat
+share/guspatches/taiko.pat
+share/guspatches/tamborin.pat
+share/guspatches/telephon.pat
+share/guspatches/tenorsax.pat
+share/guspatches/timbaleh.pat
+share/guspatches/timbalel.pat
+share/guspatches/timpani.pat
+share/guspatches/tomhi1.pat
+share/guspatches/tomhi2.pat
+share/guspatches/tomlo1.pat
+share/guspatches/tomlo2.pat
+share/guspatches/tommid1.pat
+share/guspatches/tommid2.pat
+share/guspatches/toms.pat
+share/guspatches/tremstr.pat
+share/guspatches/triangl1.pat
+share/guspatches/triangl2.pat
+share/guspatches/trombone.pat
+share/guspatches/trumpet.pat
+share/guspatches/tuba.pat
+share/guspatches/tubebell.pat
+share/guspatches/unicorn.pat
+share/guspatches/vibes.pat
+share/guspatches/vibslap.pat
+share/guspatches/viola.pat
+share/guspatches/violin.pat
+share/guspatches/voices.pat
+share/guspatches/voxlead.pat
+share/guspatches/warmpad.pat
+share/guspatches/whistle.pat
+share/guspatches/whistle1.pat
+share/guspatches/whistle2.pat
+share/guspatches/woodblk.pat
+share/guspatches/woodblk1.pat
+share/guspatches/woodblk2.pat
+share/guspatches/woodflut.pat
+share/guspatches/xylophon.pat
+share/guspatches/chris6.cfg
+share/guspatches/default.cfg
+share/guspatches/maplerag.cfg
+share/guspatches/ultramid.ini
+@dirrm share/guspatches
diff --git a/audio/guspatches/files/gravis.cfg b/audio/guspatches/files/gravis.cfg
index 42c4331a3d1..a4df1aa0ea6 100644
--- a/audio/guspatches/files/gravis.cfg
+++ b/audio/guspatches/files/gravis.cfg
@@ -3,7 +3,7 @@
 # programs. 
 #
 
-dir @PREFIX@/share/timidity/patch
+dir @PREFIX@/share/guspatches/patch
 
 bank 0
 
diff --git a/audio/guspatches/files/timidity.cfg b/audio/guspatches/files/timidity.cfg
index ba61245237e..b8b709ea086 100644
--- a/audio/guspatches/files/timidity.cfg
+++ b/audio/guspatches/files/timidity.cfg
@@ -27,7 +27,7 @@
 # If you've moved things around since compiling, uncomment and edit this to
 # point to the library directory: 
 #
-dir @PREFIX@/share/timidity
+dir @PREFIX@/share/guspatches
 #
 
 ##############################################################################
diff --git a/audio/timidity/MESSAGE b/audio/timidity/MESSAGE
index 16ae9885c4f..7e1ba049fa7 100644
--- a/audio/timidity/MESSAGE
+++ b/audio/timidity/MESSAGE
@@ -1,8 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/12 17:06:59 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2004/12/03 14:20:03 ben Exp $
 
-  To use this program, you'll have to install either the eawpatches
-  or guspatches packages, located in pkgsrc/audio/eawpatches resp.
-  pkgsrc/audio/guspatches.
+  To use this program, you'll have to install one of the following:
+	* pkgsrc/audio/eawpatches
+	* pkgsrc/audio/freepats
+	* pkgsrc/audio/guspatches
 
 ===========================================================================
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index e183bc537a7..b74184c048d 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2004/10/13 15:23:40 adam Exp $
+# $NetBSD: Makefile,v 1.51 2004/12/03 14:20:03 ben Exp $
 
 DISTNAME=	TiMidity++-2.13.2
 PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
+PKGREVISION=	1
 CATEGORIES=     audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=timidity/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +20,13 @@ CONFIGURE_ARGS+=	--enable-gtk --enable-wrd --enable-xaw --enable-ncurses
 CONFIGURE_ARGS+=	--with-libFLAC="${BUILDLINK_DIR}/include"
 CONFIGURE_ARGS+=	--with-ogg="${BUILDLINK_DIR}/include"
 CONFIGURE_ARGS+=	--with-vorbis="${BUILDLINK_DIR}/include"
+CONFIGURE_ARGS+=	--with-default-path="${PKG_SYSCONFDIR}"
+
+SUBST_CLASSES+=		confdir
+SUBST_MESSAGE.confdir=	"Configuring to use PKG_SYSCONFDIR."
+SUBST_STAGE.confdir=    post-patch
+SUBST_FILES.confdir=	doc/C/timidity.cfg.5 doc/ja_JP.eucJP/timidity.cfg.5
+SUBST_SED.confdir=	-e 's,/usr/local/share/timidity,${PKG_SYSCONFDIR},g'
 
 .include "../../mk/bsd.prefs.mk"