Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Mar 2013 16:51:20 GMT
From:      Green Dog <fiziologus@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/177074: [fix] audio/timidity and audio/guspat
Message-ID:  <201303181651.r2IGpKGF037486@red.freebsd.org>
Resent-Message-ID: <201303181700.r2IH00lD069768@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         177074
>Category:       ports
>Synopsis:       [fix] audio/timidity and audio/guspat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 18 17:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Green Dog
>Release:        
>Organization:
>Environment:
>Description:
[audio/timidity] add audio/guspat as alternative for goemon
[audio/guspat] fix path in timidity.cfg (whitout this fix timidity+guspat don't work)

both patch in one file.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN timidity.orig/Makefile timidity/Makefile
--- timidity.orig/Makefile	2013-03-18 20:43:35.000000000 +0400
+++ timidity/Makefile	2013-03-18 20:40:41.000000000 +0400
@@ -4,9 +4,8 @@
 PORTVERSION=	0.2i
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://www.onicos.com/staff/iz/timidity/dist/:timidity	\
-		http://www.anime.net/~goemon/timidity/:tiins
-DISTFILES=	${TIINS}:tiins ${DISTNAME}.tar.gz:timidity
+MASTER_SITES+=	http://www.onicos.com/staff/iz/timidity/dist/:timidity
+DISTFILES+=	${DISTNAME}.tar.gz:timidity
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	kevinz5000@gmail.com
@@ -18,14 +17,38 @@
 INSTALL_TARGET=	install.all
 MAN1=		timidity.1
 
+OPTIONS_DEFINE=	GUS
+
+GUS_DESC=	Use audio/guspat instead goemon
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUS}
+RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:${PORTSDIR}/audio/guspat
+TDIR=		${LOCALBASE}/share/timidity
+TCONFIG=	timidity.cfg-guspat
+PLIST_SUB+=	GOEMON="@comment "
+.else
+# Goemon
+MASTER_SITES+=	http://www.anime.net/~goemon/timidity/:tiins
+DISTFILES+=	${TIINS}:tiins
+TDIR=		${PREFIX}/lib/timidity
+TCONFIG=	goemon.cfg
+PLIST_SUB+=	GOEMON=""
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
 		${WRKSRC}/linux_a.c
+	${REINPLACE_CMD} -e 's|%%TDIR%%|${TDIR}| ; s|%%TCONFIG%%|${TCONFIG}|' \
+		${WRKSRC}/timidity.cfg
 
 post-install:
+.if ! ${PORT_OPTIONS:MGUS}
 	cd ${PREFIX}/lib/timidity && \
 	${TAR} --no-same-owner --no-same-permissions -zxf ${DISTDIR}/${TIINS} && \
 	${REINPLACE_CMD} -i "" -e 's,dir goemon,dir ${PREFIX}/lib/timidity/goemon,' \
 		goemon.cfg
+.endif
 
 .include <bsd.port.mk>
diff -ruN timidity.orig/files/patch-ac timidity/files/patch-ac
--- timidity.orig/files/patch-ac	2012-07-14 16:56:14.000000000 +0400
+++ timidity/files/patch-ac	1970-01-01 03:00:00.000000000 +0300
@@ -1,23 +0,0 @@
---- timidity.cfg.orig	Mon May 22 02:40:27 1995
-+++ timidity.cfg	Mon Jan  4 03:55:42 1999
-@@ -34,9 +34,9 @@
- # This sets up the default patches in the TiMidity support package
- # "timidity-lib-0.1.tar.gz":
- 
--bank 0
--   0 patch/acpiano.pat
--  24 patch/nylongt2.pat
-+#bank 0
-+#   0 patch/acpiano.pat
-+#  24 patch/nylongt2.pat
- 
- ##############################################################################
- # If you have Dustin McCartney's "wowpats" patches, you can source the 
-@@ -70,6 +70,7 @@
- #source midia.cfg
- #
- 
-+source goemon.cfg
- 
- ##############################################################################
- # End of configuration file
diff -ruN timidity.orig/files/patch-timidity.cfg timidity/files/patch-timidity.cfg
--- timidity.orig/files/patch-timidity.cfg	1970-01-01 03:00:00.000000000 +0300
+++ timidity/files/patch-timidity.cfg	2013-03-17 19:07:57.000000000 +0400
@@ -0,0 +1,31 @@
+--- timidity.cfg.orig	1995-05-22 02:40:27.000000000 +0400
++++ timidity.cfg	2013-03-17 19:05:47.000000000 +0400
+@@ -27,16 +27,16 @@
+ # If you've moved things around since compiling, uncomment and edit this to
+ # point to the library directory: 
+ #
+-#dir /usr/local/lib/timidity
++dir %%TDIR%%
+ #
+ 
+ ##############################################################################
+ # This sets up the default patches in the TiMidity support package
+ # "timidity-lib-0.1.tar.gz":
+ 
+-bank 0
+-   0 patch/acpiano.pat
+-  24 patch/nylongt2.pat
++#bank 0
++#   0 patch/acpiano.pat
++#  24 patch/nylongt2.pat
+ 
+ ##############################################################################
+ # If you have Dustin McCartney's "wowpats" patches, you can source the 
+@@ -70,6 +70,7 @@
+ #source midia.cfg
+ #
+ 
++source %%TCONFIG%%
+ 
+ ##############################################################################
+ # End of configuration file
diff -ruN timidity.orig/pkg-plist timidity/pkg-plist
--- timidity.orig/pkg-plist	2012-07-14 16:56:14.000000000 +0400
+++ timidity/pkg-plist	2013-03-17 20:44:43.000000000 +0400
@@ -1,265 +1,265 @@
 bin/timidity
 bin/bag
 bin/wav2pat
-lib/timidity/goemon.cfg
-lib/timidity/goemon/acbass.pat
-lib/timidity/goemon/accordn.pat
-lib/timidity/goemon/acguitar2.pat
-lib/timidity/goemon/agogo.pat
-lib/timidity/goemon/agogohi.pat
-lib/timidity/goemon/agogolo.pat
-lib/timidity/goemon/airpipe.pat
-lib/timidity/goemon/altosax.pat
-lib/timidity/goemon/an_trmp1.pat
-lib/timidity/goemon/applause.pat
-lib/timidity/goemon/atmosphr.pat
-lib/timidity/goemon/aurora.pat
-lib/timidity/goemon/bagpipes.pat
-lib/timidity/goemon/banjo.pat
-lib/timidity/goemon/barisax.pat
-lib/timidity/goemon/basslead.pat
-lib/timidity/goemon/bassoon.pat
-lib/timidity/goemon/bellpad.pat
-lib/timidity/goemon/bells.pat
-lib/timidity/goemon/belltree.pat
-lib/timidity/goemon/bongohi.pat
-lib/timidity/goemon/bongolo.pat
-lib/timidity/goemon/bottleit.pat
-lib/timidity/goemon/bowglass.pat
-lib/timidity/goemon/britenss.pat
-lib/timidity/goemon/britepno.pat
-lib/timidity/goemon/cabasa.pat
-lib/timidity/goemon/carillon.pat
-lib/timidity/goemon/castinet.pat
-lib/timidity/goemon/celeste.pat
-lib/timidity/goemon/cello.pat
-lib/timidity/goemon/charang.pat
-lib/timidity/goemon/chiflead.pat
-lib/timidity/goemon/choir.pat
-lib/timidity/goemon/church.pat
-lib/timidity/goemon/claps.pat
-lib/timidity/goemon/clarinet.pat
-lib/timidity/goemon/clave.pat
-lib/timidity/goemon/clavinet.pat
-lib/timidity/goemon/cleangtr.pat
-lib/timidity/goemon/concrtna.pat
-lib/timidity/goemon/congahi1.pat
-lib/timidity/goemon/congahi2.pat
-lib/timidity/goemon/congalo.pat
-lib/timidity/goemon/contraba.pat
-lib/timidity/goemon/cowbell.pat
-lib/timidity/goemon/cuica1.pat
-lib/timidity/goemon/cuica2.pat
-lib/timidity/goemon/cymbell.pat
-lib/timidity/goemon/cymchina.pat
-lib/timidity/goemon/cymcrsh1.pat
-lib/timidity/goemon/cymcrsh2.pat
-lib/timidity/goemon/cymride1.pat
-lib/timidity/goemon/cymride2.pat
-lib/timidity/goemon/cymsplsh.pat
-lib/timidity/goemon/digitel.pat
-lib/timidity/goemon/distgtr2.pat
-lib/timidity/goemon/englhorn.pat
-lib/timidity/goemon/epiano1.pat
-lib/timidity/goemon/epiano2.pat
-lib/timidity/goemon/fiddle.pat
-lib/timidity/goemon/flute.pat
-lib/timidity/goemon/fngrbass.pat
-lib/timidity/goemon/frenchrn.pat
-lib/timidity/goemon/freshair.pat
-lib/timidity/goemon/fretless.pat
-lib/timidity/goemon/fretnoyz.pat
-lib/timidity/goemon/fx-blow.pat
-lib/timidity/goemon/ghostie.pat
-lib/timidity/goemon/glocken.pat
-lib/timidity/goemon/gsdrum00/bank.inf
-lib/timidity/goemon/gsdrum00/bongohi.pat
-lib/timidity/goemon/gsdrum00/bongolo.pat
-lib/timidity/goemon/gsdrum00/cabasa.pat
-lib/timidity/goemon/gsdrum00/congahi1.pat
-lib/timidity/goemon/gsdrum00/congahi2.pat
-lib/timidity/goemon/gsdrum00/congalo.pat
-lib/timidity/goemon/gsdrum00/cowbell.pat
-lib/timidity/goemon/gsdrum00/cuica1.pat
-lib/timidity/goemon/gsdrum00/cuica2.pat
-lib/timidity/goemon/gsdrum00/cymbell.pat
-lib/timidity/goemon/gsdrum00/cymchina.pat
-lib/timidity/goemon/gsdrum00/cymcrsh1.pat
-lib/timidity/goemon/gsdrum00/cymcrsh2.pat
-lib/timidity/goemon/gsdrum00/cymride1.pat
-lib/timidity/goemon/gsdrum00/cymride2.pat
-lib/timidity/goemon/gsdrum00/cymsplsh.pat
-lib/timidity/goemon/gsdrum00/gsdrum00.doc
-lib/timidity/goemon/gsdrum00/gsdrum00.txt
-lib/timidity/goemon/gsdrum00/guiro1.pat
-lib/timidity/goemon/gsdrum00/guiro2.pat
-lib/timidity/goemon/gsdrum00/hihatcl.pat
-lib/timidity/goemon/gsdrum00/hihatop.pat
-lib/timidity/goemon/gsdrum00/hihatpd.pat
-lib/timidity/goemon/gsdrum00/kick1.pat
-lib/timidity/goemon/gsdrum00/kick2.pat
-lib/timidity/goemon/gsdrum00/scratch1.pat
-lib/timidity/goemon/gsdrum00/scratch2.pat
-lib/timidity/goemon/gsdrum00/shaker.pat
-lib/timidity/goemon/gsdrum00/snare1.pat
-lib/timidity/goemon/gsdrum00/snare2.pat
-lib/timidity/goemon/gsdrum00/stickrim.pat
-lib/timidity/goemon/gsdrum00/tamborin.pat
-lib/timidity/goemon/gsdrum00/tomhi1.pat
-lib/timidity/goemon/gsdrum00/tomhi2.pat
-lib/timidity/goemon/gsdrum00/tomlo1.pat
-lib/timidity/goemon/gsdrum00/tomlo2.pat
-lib/timidity/goemon/gsdrum00/tommid1.pat
-lib/timidity/goemon/gsdrum00/tommid2.pat
-lib/timidity/goemon/gsdrum00/woodblk1.pat
-lib/timidity/goemon/gsdrum00/woodblk2.pat
-lib/timidity/goemon/gsdrum08/bank.inf
-lib/timidity/goemon/gsdrum08/gsdrum08.doc
-lib/timidity/goemon/gsdrum08/gsdrum08.txt
-lib/timidity/goemon/gsdrum08/roomhi1.pat
-lib/timidity/goemon/gsdrum08/roomhi2.pat
-lib/timidity/goemon/gsdrum08/roomlow1.pat
-lib/timidity/goemon/gsdrum08/roomlow2.pat
-lib/timidity/goemon/gsdrum08/roommid1.pat
-lib/timidity/goemon/gsdrum08/roommid2.pat
-lib/timidity/goemon/gsdrum40/bank.inf
-lib/timidity/goemon/gsdrum40/br_slap.pat
-lib/timidity/goemon/gsdrum40/br_swirl.pat
-lib/timidity/goemon/gsdrum40/br_swish.pat
-lib/timidity/goemon/gsdrum40/gsdrum40.bak
-lib/timidity/goemon/gsdrum40/gsdrum40.doc
-lib/timidity/goemon/gsdrum40/gsdrum40.txt
-lib/timidity/goemon/gsdrum40/hihatcl.pat
-lib/timidity/goemon/gsdrum40/hihatop.pat
-lib/timidity/goemon/gtrharm.pat
-lib/timidity/goemon/guiro1.pat
-lib/timidity/goemon/guiro2.pat
-lib/timidity/goemon/gunshot.pat
-lib/timidity/goemon/halopad.pat
-lib/timidity/goemon/hammond.pat
-lib/timidity/goemon/harmonca.pat
-lib/timidity/goemon/harp.pat
-lib/timidity/goemon/helicptr.pat
-lib/timidity/goemon/highq.pat
-lib/timidity/goemon/hihatcl.pat
-lib/timidity/goemon/hihatop.pat
-lib/timidity/goemon/hihatpd.pat
-lib/timidity/goemon/hitbrass.pat
-lib/timidity/goemon/homeorg.pat
-lib/timidity/goemon/honky.pat
-lib/timidity/goemon/hrpschrd.pat
-lib/timidity/goemon/jazzgtr2.pat
-lib/timidity/goemon/jingles.pat
-lib/timidity/goemon/jungle.pat
-lib/timidity/goemon/kalimba.pat
-lib/timidity/goemon/kick1.pat
-lib/timidity/goemon/kick2.pat
-lib/timidity/goemon/koto.pat
-lib/timidity/goemon/lcalliop.pat
-lib/timidity/goemon/lead5th.pat
-lib/timidity/goemon/maracas.pat
-lib/timidity/goemon/marcato.pat
-lib/timidity/goemon/marimba.pat
-lib/timidity/goemon/metalpad.pat
-lib/timidity/goemon/metbell.pat
-lib/timidity/goemon/metclick.pat
-lib/timidity/goemon/mutegtr2.pat
-lib/timidity/goemon/mutetrum.pat
-lib/timidity/goemon/nyguitar.pat
-lib/timidity/goemon/ob8.pat
-lib/timidity/goemon/oboe.pat
-lib/timidity/goemon/ocarina.pat
-lib/timidity/goemon/odguitar.pat
-lib/timidity/goemon/orchhit.pat
-lib/timidity/goemon/percorg.pat
-lib/timidity/goemon/piccolo.pat
-lib/timidity/goemon/pickbass.pat
-lib/timidity/goemon/pizzcato.pat
-lib/timidity/goemon/recorder.pat
-lib/timidity/goemon/reedorg.pat
-lib/timidity/goemon/revcym.pat
-lib/timidity/goemon/rhodes.pat
-lib/timidity/goemon/rvrbxylo.pat
-lib/timidity/goemon/santur.pat
-lib/timidity/goemon/sawwave.pat
-lib/timidity/goemon/scratch1.pat
-lib/timidity/goemon/scratch2.pat
-lib/timidity/goemon/seagulls.pat
-lib/timidity/goemon/shakazul.pat
-lib/timidity/goemon/shaker.pat
-lib/timidity/goemon/shamisen.pat
-lib/timidity/goemon/shannai.pat
-lib/timidity/goemon/sitar.pat
-lib/timidity/goemon/slap.pat
-lib/timidity/goemon/slapbas1.pat
-lib/timidity/goemon/slapbas2.pat
-lib/timidity/goemon/slapbass.pat
-lib/timidity/goemon/snare1.pat
-lib/timidity/goemon/snare2.pat
-lib/timidity/goemon/sologrnd.pat
-lib/timidity/goemon/soundtrk.pat
-lib/timidity/goemon/spctbell.pat
-lib/timidity/goemon/sprnosax.pat
-lib/timidity/goemon/sqrclick.pat
-lib/timidity/goemon/sqrwave.pat
-lib/timidity/goemon/startrak.pat
-lib/timidity/goemon/steeldrm.pat
-lib/timidity/goemon/stickrim.pat
-lib/timidity/goemon/sticks.pat
-lib/timidity/goemon/strings.pat
-lib/timidity/goemon/surdo1.pat
-lib/timidity/goemon/surdo2.pat
-lib/timidity/goemon/sweeper.pat
-lib/timidity/goemon/synbass1.pat
-lib/timidity/goemon/synbass2.pat
-lib/timidity/goemon/synbras1.pat
-lib/timidity/goemon/synbras2.pat
-lib/timidity/goemon/synstr1.pat
-lib/timidity/goemon/synstr2.pat
-lib/timidity/goemon/syntom.pat
-lib/timidity/goemon/synvoic1.pat
-lib/timidity/goemon/taiko.pat
-lib/timidity/goemon/tamborin.pat
-lib/timidity/goemon/tenorsax.pat
-lib/timidity/goemon/timbaleh.pat
-lib/timidity/goemon/timbalel.pat
-lib/timidity/goemon/timpani.pat
-lib/timidity/goemon/tomhi1.pat
-lib/timidity/goemon/tomhi2.pat
-lib/timidity/goemon/tomlo1.pat
-lib/timidity/goemon/tomlo2.pat
-lib/timidity/goemon/tommid1.pat
-lib/timidity/goemon/tommid2.pat
-lib/timidity/goemon/toms.pat
-lib/timidity/goemon/tremstr.pat
-lib/timidity/goemon/triangl1.pat
-lib/timidity/goemon/triangl2.pat
-lib/timidity/goemon/trombone.pat
-lib/timidity/goemon/tuba.pat
-lib/timidity/goemon/tubebell.pat
-lib/timidity/goemon/unicorn.pat
-lib/timidity/goemon/vibes.pat
-lib/timidity/goemon/vibslap.pat
-lib/timidity/goemon/viola.pat
-lib/timidity/goemon/violin.pat
-lib/timidity/goemon/voicedoo.pat
-lib/timidity/goemon/voices.pat
-lib/timidity/goemon/warmpad.pat
-lib/timidity/goemon/whistle.pat
-lib/timidity/goemon/whistle1.pat
-lib/timidity/goemon/whistle2.pat
-lib/timidity/goemon/woodblk.pat
-lib/timidity/goemon/woodblk1.pat
-lib/timidity/goemon/woodblk2.pat
-lib/timidity/goemon/woodflut.pat
+%%GOEMON%%lib/timidity/goemon.cfg
+%%GOEMON%%lib/timidity/goemon/acbass.pat
+%%GOEMON%%lib/timidity/goemon/accordn.pat
+%%GOEMON%%lib/timidity/goemon/acguitar2.pat
+%%GOEMON%%lib/timidity/goemon/agogo.pat
+%%GOEMON%%lib/timidity/goemon/agogohi.pat
+%%GOEMON%%lib/timidity/goemon/agogolo.pat
+%%GOEMON%%lib/timidity/goemon/airpipe.pat
+%%GOEMON%%lib/timidity/goemon/altosax.pat
+%%GOEMON%%lib/timidity/goemon/an_trmp1.pat
+%%GOEMON%%lib/timidity/goemon/applause.pat
+%%GOEMON%%lib/timidity/goemon/atmosphr.pat
+%%GOEMON%%lib/timidity/goemon/aurora.pat
+%%GOEMON%%lib/timidity/goemon/bagpipes.pat
+%%GOEMON%%lib/timidity/goemon/banjo.pat
+%%GOEMON%%lib/timidity/goemon/barisax.pat
+%%GOEMON%%lib/timidity/goemon/basslead.pat
+%%GOEMON%%lib/timidity/goemon/bassoon.pat
+%%GOEMON%%lib/timidity/goemon/bellpad.pat
+%%GOEMON%%lib/timidity/goemon/bells.pat
+%%GOEMON%%lib/timidity/goemon/belltree.pat
+%%GOEMON%%lib/timidity/goemon/bongohi.pat
+%%GOEMON%%lib/timidity/goemon/bongolo.pat
+%%GOEMON%%lib/timidity/goemon/bottleit.pat
+%%GOEMON%%lib/timidity/goemon/bowglass.pat
+%%GOEMON%%lib/timidity/goemon/britenss.pat
+%%GOEMON%%lib/timidity/goemon/britepno.pat
+%%GOEMON%%lib/timidity/goemon/cabasa.pat
+%%GOEMON%%lib/timidity/goemon/carillon.pat
+%%GOEMON%%lib/timidity/goemon/castinet.pat
+%%GOEMON%%lib/timidity/goemon/celeste.pat
+%%GOEMON%%lib/timidity/goemon/cello.pat
+%%GOEMON%%lib/timidity/goemon/charang.pat
+%%GOEMON%%lib/timidity/goemon/chiflead.pat
+%%GOEMON%%lib/timidity/goemon/choir.pat
+%%GOEMON%%lib/timidity/goemon/church.pat
+%%GOEMON%%lib/timidity/goemon/claps.pat
+%%GOEMON%%lib/timidity/goemon/clarinet.pat
+%%GOEMON%%lib/timidity/goemon/clave.pat
+%%GOEMON%%lib/timidity/goemon/clavinet.pat
+%%GOEMON%%lib/timidity/goemon/cleangtr.pat
+%%GOEMON%%lib/timidity/goemon/concrtna.pat
+%%GOEMON%%lib/timidity/goemon/congahi1.pat
+%%GOEMON%%lib/timidity/goemon/congahi2.pat
+%%GOEMON%%lib/timidity/goemon/congalo.pat
+%%GOEMON%%lib/timidity/goemon/contraba.pat
+%%GOEMON%%lib/timidity/goemon/cowbell.pat
+%%GOEMON%%lib/timidity/goemon/cuica1.pat
+%%GOEMON%%lib/timidity/goemon/cuica2.pat
+%%GOEMON%%lib/timidity/goemon/cymbell.pat
+%%GOEMON%%lib/timidity/goemon/cymchina.pat
+%%GOEMON%%lib/timidity/goemon/cymcrsh1.pat
+%%GOEMON%%lib/timidity/goemon/cymcrsh2.pat
+%%GOEMON%%lib/timidity/goemon/cymride1.pat
+%%GOEMON%%lib/timidity/goemon/cymride2.pat
+%%GOEMON%%lib/timidity/goemon/cymsplsh.pat
+%%GOEMON%%lib/timidity/goemon/digitel.pat
+%%GOEMON%%lib/timidity/goemon/distgtr2.pat
+%%GOEMON%%lib/timidity/goemon/englhorn.pat
+%%GOEMON%%lib/timidity/goemon/epiano1.pat
+%%GOEMON%%lib/timidity/goemon/epiano2.pat
+%%GOEMON%%lib/timidity/goemon/fiddle.pat
+%%GOEMON%%lib/timidity/goemon/flute.pat
+%%GOEMON%%lib/timidity/goemon/fngrbass.pat
+%%GOEMON%%lib/timidity/goemon/frenchrn.pat
+%%GOEMON%%lib/timidity/goemon/freshair.pat
+%%GOEMON%%lib/timidity/goemon/fretless.pat
+%%GOEMON%%lib/timidity/goemon/fretnoyz.pat
+%%GOEMON%%lib/timidity/goemon/fx-blow.pat
+%%GOEMON%%lib/timidity/goemon/ghostie.pat
+%%GOEMON%%lib/timidity/goemon/glocken.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/bank.inf
+%%GOEMON%%lib/timidity/goemon/gsdrum00/bongohi.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/bongolo.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cabasa.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/congahi1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/congahi2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/congalo.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cowbell.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cuica1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cuica2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymbell.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymchina.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymcrsh1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymcrsh2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymride1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymride2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/cymsplsh.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/gsdrum00.doc
+%%GOEMON%%lib/timidity/goemon/gsdrum00/gsdrum00.txt
+%%GOEMON%%lib/timidity/goemon/gsdrum00/guiro1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/guiro2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/hihatcl.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/hihatop.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/hihatpd.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/kick1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/kick2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/scratch1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/scratch2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/shaker.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/snare1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/snare2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/stickrim.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tamborin.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tomhi1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tomhi2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tomlo1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tomlo2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tommid1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/tommid2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/woodblk1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum00/woodblk2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum08/bank.inf
+%%GOEMON%%lib/timidity/goemon/gsdrum08/gsdrum08.doc
+%%GOEMON%%lib/timidity/goemon/gsdrum08/gsdrum08.txt
+%%GOEMON%%lib/timidity/goemon/gsdrum08/roomhi1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum08/roomhi2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum08/roomlow1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum08/roomlow2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum08/roommid1.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum08/roommid2.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum40/bank.inf
+%%GOEMON%%lib/timidity/goemon/gsdrum40/br_slap.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum40/br_swirl.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum40/br_swish.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum40/gsdrum40.bak
+%%GOEMON%%lib/timidity/goemon/gsdrum40/gsdrum40.doc
+%%GOEMON%%lib/timidity/goemon/gsdrum40/gsdrum40.txt
+%%GOEMON%%lib/timidity/goemon/gsdrum40/hihatcl.pat
+%%GOEMON%%lib/timidity/goemon/gsdrum40/hihatop.pat
+%%GOEMON%%lib/timidity/goemon/gtrharm.pat
+%%GOEMON%%lib/timidity/goemon/guiro1.pat
+%%GOEMON%%lib/timidity/goemon/guiro2.pat
+%%GOEMON%%lib/timidity/goemon/gunshot.pat
+%%GOEMON%%lib/timidity/goemon/halopad.pat
+%%GOEMON%%lib/timidity/goemon/hammond.pat
+%%GOEMON%%lib/timidity/goemon/harmonca.pat
+%%GOEMON%%lib/timidity/goemon/harp.pat
+%%GOEMON%%lib/timidity/goemon/helicptr.pat
+%%GOEMON%%lib/timidity/goemon/highq.pat
+%%GOEMON%%lib/timidity/goemon/hihatcl.pat
+%%GOEMON%%lib/timidity/goemon/hihatop.pat
+%%GOEMON%%lib/timidity/goemon/hihatpd.pat
+%%GOEMON%%lib/timidity/goemon/hitbrass.pat
+%%GOEMON%%lib/timidity/goemon/homeorg.pat
+%%GOEMON%%lib/timidity/goemon/honky.pat
+%%GOEMON%%lib/timidity/goemon/hrpschrd.pat
+%%GOEMON%%lib/timidity/goemon/jazzgtr2.pat
+%%GOEMON%%lib/timidity/goemon/jingles.pat
+%%GOEMON%%lib/timidity/goemon/jungle.pat
+%%GOEMON%%lib/timidity/goemon/kalimba.pat
+%%GOEMON%%lib/timidity/goemon/kick1.pat
+%%GOEMON%%lib/timidity/goemon/kick2.pat
+%%GOEMON%%lib/timidity/goemon/koto.pat
+%%GOEMON%%lib/timidity/goemon/lcalliop.pat
+%%GOEMON%%lib/timidity/goemon/lead5th.pat
+%%GOEMON%%lib/timidity/goemon/maracas.pat
+%%GOEMON%%lib/timidity/goemon/marcato.pat
+%%GOEMON%%lib/timidity/goemon/marimba.pat
+%%GOEMON%%lib/timidity/goemon/metalpad.pat
+%%GOEMON%%lib/timidity/goemon/metbell.pat
+%%GOEMON%%lib/timidity/goemon/metclick.pat
+%%GOEMON%%lib/timidity/goemon/mutegtr2.pat
+%%GOEMON%%lib/timidity/goemon/mutetrum.pat
+%%GOEMON%%lib/timidity/goemon/nyguitar.pat
+%%GOEMON%%lib/timidity/goemon/ob8.pat
+%%GOEMON%%lib/timidity/goemon/oboe.pat
+%%GOEMON%%lib/timidity/goemon/ocarina.pat
+%%GOEMON%%lib/timidity/goemon/odguitar.pat
+%%GOEMON%%lib/timidity/goemon/orchhit.pat
+%%GOEMON%%lib/timidity/goemon/percorg.pat
+%%GOEMON%%lib/timidity/goemon/piccolo.pat
+%%GOEMON%%lib/timidity/goemon/pickbass.pat
+%%GOEMON%%lib/timidity/goemon/pizzcato.pat
+%%GOEMON%%lib/timidity/goemon/recorder.pat
+%%GOEMON%%lib/timidity/goemon/reedorg.pat
+%%GOEMON%%lib/timidity/goemon/revcym.pat
+%%GOEMON%%lib/timidity/goemon/rhodes.pat
+%%GOEMON%%lib/timidity/goemon/rvrbxylo.pat
+%%GOEMON%%lib/timidity/goemon/santur.pat
+%%GOEMON%%lib/timidity/goemon/sawwave.pat
+%%GOEMON%%lib/timidity/goemon/scratch1.pat
+%%GOEMON%%lib/timidity/goemon/scratch2.pat
+%%GOEMON%%lib/timidity/goemon/seagulls.pat
+%%GOEMON%%lib/timidity/goemon/shakazul.pat
+%%GOEMON%%lib/timidity/goemon/shaker.pat
+%%GOEMON%%lib/timidity/goemon/shamisen.pat
+%%GOEMON%%lib/timidity/goemon/shannai.pat
+%%GOEMON%%lib/timidity/goemon/sitar.pat
+%%GOEMON%%lib/timidity/goemon/slap.pat
+%%GOEMON%%lib/timidity/goemon/slapbas1.pat
+%%GOEMON%%lib/timidity/goemon/slapbas2.pat
+%%GOEMON%%lib/timidity/goemon/slapbass.pat
+%%GOEMON%%lib/timidity/goemon/snare1.pat
+%%GOEMON%%lib/timidity/goemon/snare2.pat
+%%GOEMON%%lib/timidity/goemon/sologrnd.pat
+%%GOEMON%%lib/timidity/goemon/soundtrk.pat
+%%GOEMON%%lib/timidity/goemon/spctbell.pat
+%%GOEMON%%lib/timidity/goemon/sprnosax.pat
+%%GOEMON%%lib/timidity/goemon/sqrclick.pat
+%%GOEMON%%lib/timidity/goemon/sqrwave.pat
+%%GOEMON%%lib/timidity/goemon/startrak.pat
+%%GOEMON%%lib/timidity/goemon/steeldrm.pat
+%%GOEMON%%lib/timidity/goemon/stickrim.pat
+%%GOEMON%%lib/timidity/goemon/sticks.pat
+%%GOEMON%%lib/timidity/goemon/strings.pat
+%%GOEMON%%lib/timidity/goemon/surdo1.pat
+%%GOEMON%%lib/timidity/goemon/surdo2.pat
+%%GOEMON%%lib/timidity/goemon/sweeper.pat
+%%GOEMON%%lib/timidity/goemon/synbass1.pat
+%%GOEMON%%lib/timidity/goemon/synbass2.pat
+%%GOEMON%%lib/timidity/goemon/synbras1.pat
+%%GOEMON%%lib/timidity/goemon/synbras2.pat
+%%GOEMON%%lib/timidity/goemon/synstr1.pat
+%%GOEMON%%lib/timidity/goemon/synstr2.pat
+%%GOEMON%%lib/timidity/goemon/syntom.pat
+%%GOEMON%%lib/timidity/goemon/synvoic1.pat
+%%GOEMON%%lib/timidity/goemon/taiko.pat
+%%GOEMON%%lib/timidity/goemon/tamborin.pat
+%%GOEMON%%lib/timidity/goemon/tenorsax.pat
+%%GOEMON%%lib/timidity/goemon/timbaleh.pat
+%%GOEMON%%lib/timidity/goemon/timbalel.pat
+%%GOEMON%%lib/timidity/goemon/timpani.pat
+%%GOEMON%%lib/timidity/goemon/tomhi1.pat
+%%GOEMON%%lib/timidity/goemon/tomhi2.pat
+%%GOEMON%%lib/timidity/goemon/tomlo1.pat
+%%GOEMON%%lib/timidity/goemon/tomlo2.pat
+%%GOEMON%%lib/timidity/goemon/tommid1.pat
+%%GOEMON%%lib/timidity/goemon/tommid2.pat
+%%GOEMON%%lib/timidity/goemon/toms.pat
+%%GOEMON%%lib/timidity/goemon/tremstr.pat
+%%GOEMON%%lib/timidity/goemon/triangl1.pat
+%%GOEMON%%lib/timidity/goemon/triangl2.pat
+%%GOEMON%%lib/timidity/goemon/trombone.pat
+%%GOEMON%%lib/timidity/goemon/tuba.pat
+%%GOEMON%%lib/timidity/goemon/tubebell.pat
+%%GOEMON%%lib/timidity/goemon/unicorn.pat
+%%GOEMON%%lib/timidity/goemon/vibes.pat
+%%GOEMON%%lib/timidity/goemon/vibslap.pat
+%%GOEMON%%lib/timidity/goemon/viola.pat
+%%GOEMON%%lib/timidity/goemon/violin.pat
+%%GOEMON%%lib/timidity/goemon/voicedoo.pat
+%%GOEMON%%lib/timidity/goemon/voices.pat
+%%GOEMON%%lib/timidity/goemon/warmpad.pat
+%%GOEMON%%lib/timidity/goemon/whistle.pat
+%%GOEMON%%lib/timidity/goemon/whistle1.pat
+%%GOEMON%%lib/timidity/goemon/whistle2.pat
+%%GOEMON%%lib/timidity/goemon/woodblk.pat
+%%GOEMON%%lib/timidity/goemon/woodblk1.pat
+%%GOEMON%%lib/timidity/goemon/woodblk2.pat
+%%GOEMON%%lib/timidity/goemon/woodflut.pat
 lib/timidity/gravis.cfg
 lib/timidity/gsdrum.cfg
 lib/timidity/midia.cfg
 lib/timidity/mt32.cfg
 lib/timidity/timidity.cfg
 lib/timidity/wowpats.cfg
-@dirrm lib/timidity/goemon/gsdrum40
-@dirrm lib/timidity/goemon/gsdrum08
-@dirrm lib/timidity/goemon/gsdrum00
-@dirrm lib/timidity/goemon
+%%GOEMON%%@dirrm lib/timidity/goemon/gsdrum40
+%%GOEMON%%@dirrm lib/timidity/goemon/gsdrum08
+%%GOEMON%%@dirrm lib/timidity/goemon/gsdrum00
+%%GOEMON%%@dirrm lib/timidity/goemon
 @dirrm lib/timidity
diff -ruN guspat.orig/Makefile guspat/Makefile
--- guspat.orig/Makefile	2012-11-17 09:54:34.000000000 +0400
+++ guspat/Makefile	2013-03-18 19:39:25.000000000 +0400
@@ -14,9 +14,6 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Izumo collection of Gravis Ultrasound MIDI patches
 
-# Not useful without timidity.
-RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity++
-
 NO_CDROM=	Some of the patches are marked no-commercial-use
 
 NO_BUILD=	yes
@@ -26,6 +23,10 @@
 
 TIMIDITY_DATADIR=	share/timidity
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/timidity|/guspat|g' \
+		${WRKSRC}/timidity.cfg
+
 do-install:
 	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303181651.r2IGpKGF037486>