[pkgsrc/trunk]: pkgsrc/audio Modify directory structure used by guspatches an...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2bf6091b2c11
branches:  trunk
changeset: 485052:2bf6091b2c11
user:      ben <ben%pkgsrc.org@localhost>
date:      Fri Dec 03 14:20:03 2004 +0000

description:
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

diffstat:

 audio/eawpatches/MESSAGE            |   14 +
 audio/eawpatches/Makefile           |   20 +-
 audio/eawpatches/PLIST              |  768 ++++++++++++++++++------------------
 audio/guspatches/MESSAGE            |   14 +
 audio/guspatches/Makefile           |   17 +-
 audio/guspatches/PLIST              |  408 +++++++++---------
 audio/guspatches/files/gravis.cfg   |    2 +-
 audio/guspatches/files/timidity.cfg |    2 +-
 audio/timidity/MESSAGE              |    9 +-
 audio/timidity/Makefile             |   10 +-
 10 files changed, 650 insertions(+), 614 deletions(-)

diffs (truncated from 1379 to 300 lines):

diff -r c71fcc35bbde -r 2bf6091b2c11 audio/eawpatches/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/eawpatches/MESSAGE  Fri Dec 03 14:20:03 2004 +0000
@@ -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 -r c71fcc35bbde -r 2bf6091b2c11 audio/eawpatches/Makefile
--- a/audio/eawpatches/Makefile Fri Dec 03 14:09:18 2004 +0000
+++ b/audio/eawpatches/Makefile Fri Dec 03 14:20:03 2004 +0000
@@ -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 @@
 
 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 -r c71fcc35bbde -r 2bf6091b2c11 audio/eawpatches/PLIST
--- a/audio/eawpatches/PLIST    Fri Dec 03 14:09:18 2004 +0000
+++ b/audio/eawpatches/PLIST    Fri Dec 03 14:20:03 2004 +0000
@@ -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