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

5 files changed, 228 insertions, 215 deletions

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
 #
 
 ##############################################################################