From nobody@FreeBSD.org  Mon Mar 18 16:51:21 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 2E57027B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Mar 2013 16:51:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id E609C927
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Mar 2013 16:51:20 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2IGpKOf037490
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Mar 2013 16:51:20 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r2IGpKGF037486;
	Mon, 18 Mar 2013 16:51:20 GMT
	(envelope-from nobody)
Message-Id: <201303181651.r2IGpKGF037486@red.freebsd.org>
Date: Mon, 18 Mar 2013 16:51:20 GMT
From: Green Dog <fiziologus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [fix] audio/timidity and audio/guspat
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177074
>Category:       ports
>Synopsis:       [fix] audio/timidity and audio/guspat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marino
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 18 17:00:00 UTC 2013
>Closed-Date:    Sat May 10 23:53:11 UTC 2014
>Last-Modified:  Sat May 10 23:53:11 UTC 2014
>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:

Date: Mon, 18 Mar 2013 17:00:09 UT
From: Edwin Groothuis <edwin@FreeBSD.org>
Reply-To: bug-followup@FreeBSD.org
To: kevinz5000@gmail.com
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat

 Maintainer of audio/timidity,
 
 Please note that PR ports/177074 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177074
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

Date: Mon, 18 Mar 2013 19:55:13 -0500
From: Kevin Zheng <kevinz5000@gmail.com>
To: bug-followup@FreeBSD.org
In-Reply-To: <20130318170009.1C8DB738@hub.freebsd.org>
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat

 Is GNATS really bogged down today? I've waited for a few hours yet GNATS
 still says "No PRs Matched Query" when I follow the link.
 
 I'll look at the patch when I can actually see it :)
 
 Thanks,
 Kevin Zheng
State-Changed-From-To: open->feedback 
State-Changed-By: linimon 
State-Changed-When: Tue Mar 19 15:01:06 UTC 2013 
State-Changed-Why:  
Add in misfiled text from ports/177075 and ports/177096 and set to 
feedback.  There must have been some kind of glitch on the systems 
that handle GNATS. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177074 

From: linimon@FreeBSD.org
To: bug-followup@FreeBSD.org, linimon@FreeBSD.org, gnats-admin@FreeBSD.org,
        freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/177075: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Tue, 19 Mar 2013 14:59:56 GMT

 Synopsis: Re: ports/177074: [fix] audio/timidity and audio/guspat
 
 State-Changed-From-To: open->closed
 State-Changed-By: linimon
 State-Changed-When: Tue Mar 19 14:59:32 UTC 2013
 State-Changed-Why: 
 Misfiled followup to ports/177074; content migrated.
 
 
 Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs
 Responsible-Changed-By: linimon
 Responsible-Changed-When: Tue Mar 19 14:59:32 UTC 2013
 Responsible-Changed-Why: 
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=177075

From: Kevin Zheng <kevinz5000@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Tue, 19 Mar 2013 22:02:20 -0500

 On 03/18/2013 12:00, Edwin Groothuis wrote:
 > Maintainer of audio/timidity,
 > 
 > Please note that PR ports/177074 has just been submitted.
 > 
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 > 
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177074
 > 
 
 This patch looks very nice, thank you for your help!
 
 Thanks,
 Kevin Zheng
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Wed Mar 20 08:19:47 UTC 2013 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177074 

From: Kevin Zheng <kevinz5000@gmail.com>
To: bug-followup@FreeBSD.org, fiziologus@gmail.com
Cc:  
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Sun, 21 Apr 2013 10:53:43 -0500

 This is a multi-part message in MIME format.
 --------------000000010509030207000806
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Attached is an updated patch, the biggest change being the expansion of
 the old timidity patch files. I haven't had the opportunity to
 thoroughly test this patch, but this should be preferred over the
 previous patch.
 
 I'll follow up again when I've verified that this patch works correctly.
 
 Thanks,
 Kevin Zheng
 
 --------------000000010509030207000806
 Content-Type: text/plain; charset=UTF-8;
  name="patch-timidity-guspat.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-timidity-guspat.diff"
 
 diff -ruN /usr/ports/audio/guspat/Makefile guspat/Makefile
 --- /usr/ports/audio/guspat/Makefile	2012-11-16 23:54:34.000000000 -0600
 +++ guspat/Makefile	2013-04-21 10:09:46.000000000 -0500
 @@ -14,18 +14,17 @@
  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
 -
 -WRKSRC=		${WRKDIR}/timidity
 +NO_CDROM=	Some of the patches are marked no-commercial-use
  PLIST_SUB=	TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
 +WRKSRC=		${WRKDIR}/timidity
  
  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}
 diff -ruN /usr/ports/audio/timidity/Makefile timidity/Makefile
 --- /usr/ports/audio/timidity/Makefile	2013-03-13 12:23:05.000000000 -0500
 +++ timidity/Makefile	2013-04-21 10:11:31.000000000 -0500
 @@ -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 of included 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 /usr/ports/audio/timidity/files/patch-Makefile timidity/files/patch-Makefile
 --- /usr/ports/audio/timidity/files/patch-Makefile	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-Makefile	2013-04-21 10:20:03.000000000 -0500
 @@ -0,0 +1,81 @@
 +--- ./Makefile.orig	1996-05-26 04:26:46.000000000 -0500
 ++++ ./Makefile	2013-04-21 10:18:23.000000000 -0500
 +@@ -24,22 +24,22 @@
 + # But where to change without revealing my secret identity?
 + 
 + ########### Compiler and flags.
 +-CC = gcc
 +-DEBUGFLAGS = -Wall -O2
 ++#CC = gcc
 ++DEBUGFLAGS = -Wall
 + 
 + ########### Install.
 +-INSTALL = /usr/bin/install
 ++#INSTALL = /usr/bin/install
 + 
 + # Where to install the executable
 +-BIN_DIR = /usr/local/bin
 ++BIN_DIR = ${PREFIX}/bin
 + 
 + # Where to install the manual pages
 +-MAN_DIR = /usr/local/man/man1
 ++MAN_DIR = ${PREFIX}/man/man1
 + 
 + # Where to install the patches, config files, and MIDI files.
 + # If you change this, it's a good idea to recompile the binary,
 + # or you'll need to invoke timidity with the -L option.
 +-TIMID_DIR = /usr/local/lib/timidity
 ++TIMID_DIR = ${PREFIX}/lib/timidity
 + 
 + # Where to install the Tcl code, if you use the Tcl code that is.
 + TCL_DIR = $(TIMID_DIR)
 +@@ -112,9 +112,9 @@
 + #EXTRALIBS += -lgen
 + 
 + # Select the Tcl/Tk interface
 +-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 +-SYSEXTRAS += tk_c.c
 +-INST_TK = install.tk
 ++#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 ++#SYSEXTRAS += tk_c.c
 ++#INST_TK = install.tk
 + #EXTRAINCS +=
 + #EXTRALIBS +=
 + 
 +@@ -136,7 +136,7 @@
 + SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 + SDISTZIP = tilib$(FNSUPPVERSION).zip
 + 
 +-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 ++CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 + 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 + 
 + ########### All relevant files.. Anybody know autoconf?
 +@@ -228,10 +228,10 @@
 + wav2pat: wav2pat.c
 + 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 + 
 +-depends depend dep:
 +-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 +-
 +-include depends
 ++#depends depend dep:
 ++#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 ++#
 ++#include depends
 + 
 + ########### Installation targets
 + 
 +@@ -262,9 +262,9 @@
 + 	mkdir -p $(TIMID_DIR)
 + 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 + 
 +-install.patch: $(PATCHF)
 +-	mkdir -p $(TIMID_DIR)/patch
 +-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 ++install.patch: #$(PATCHF)
 ++#        mkdir -p $(TIMID_DIR)/patch
 ++#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 + 
 + install.tk: $(ALLTCLF)
 + 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
 diff -ruN /usr/ports/audio/timidity/files/patch-aa timidity/files/patch-aa
 --- /usr/ports/audio/timidity/files/patch-aa	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-aa	1969-12-31 18:00:00.000000000 -0600
 @@ -1,32 +0,0 @@
 -*** mix.c.orig	Mon May 20 17:09:46 1996
 ---- mix.c	Sun Nov 17 10:01:36 1996
 -***************
 -*** 23,29 ****
 ---- 23,33 ----
 -  
 -  #include <math.h>
 -  #include <stdio.h>
 -+ #ifdef __FreeBSD__
 -+ #include <stdlib.h>
 -+ #else
 -  #include <malloc.h>
 -+ #endif
 -  
 -  #include "config.h"
 -  #include "common.h"
 -*** resample.c.orig	Mon May 20 17:09:47 1996
 ---- resample.c	Sun Nov 17 09:59:29 1996
 -***************
 -*** 22,28 ****
 ---- 22,32 ----
 -  
 -  #include <math.h>
 -  #include <stdio.h>
 -+ #ifdef __FreeBSD__
 -+ #include <stdlib.h>
 -+ #else
 -  #include <malloc.h>
 -+ #endif
 -  
 -  #include "config.h"
 -  #include "common.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-ab timidity/files/patch-ab
 --- /usr/ports/audio/timidity/files/patch-ab	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ab	1969-12-31 18:00:00.000000000 -0600
 @@ -1,81 +0,0 @@
 ---- Makefile.orig	Sun May 26 13:26:46 1996
 -+++ Makefile	Mon Jan  4 04:08:35 1999
 -@@ -24,22 +24,22 @@
 - # But where to change without revealing my secret identity?
 - 
 - ########### Compiler and flags.
 --CC = gcc
 --DEBUGFLAGS = -Wall -O2
 -+#CC = gcc
 -+DEBUGFLAGS = -Wall
 - 
 - ########### Install.
 --INSTALL = /usr/bin/install
 -+#INSTALL = /usr/bin/install
 - 
 - # Where to install the executable
 --BIN_DIR = /usr/local/bin
 -+BIN_DIR = ${PREFIX}/bin
 - 
 - # Where to install the manual pages
 --MAN_DIR = /usr/local/man/man1
 -+MAN_DIR = ${PREFIX}/man/man1
 - 
 - # Where to install the patches, config files, and MIDI files.
 - # If you change this, it's a good idea to recompile the binary,
 - # or you'll need to invoke timidity with the -L option.
 --TIMID_DIR = /usr/local/lib/timidity
 -+TIMID_DIR = ${PREFIX}/lib/timidity
 - 
 - # Where to install the Tcl code, if you use the Tcl code that is.
 - TCL_DIR = $(TIMID_DIR)
 -@@ -112,9 +112,9 @@
 - #EXTRALIBS += -lgen
 - 
 - # Select the Tcl/Tk interface
 --SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 --SYSEXTRAS += tk_c.c
 --INST_TK = install.tk
 -+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 -+#SYSEXTRAS += tk_c.c
 -+#INST_TK = install.tk
 - #EXTRAINCS +=
 - #EXTRALIBS +=
 - 
 -@@ -136,7 +136,7 @@
 - SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 - SDISTZIP = tilib$(FNSUPPVERSION).zip
 - 
 --CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 -+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 - 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 - 
 - ########### All relevant files.. Anybody know autoconf?
 -@@ -228,10 +228,10 @@
 - wav2pat: wav2pat.c
 - 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 - 
 --depends depend dep:
 --	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 --
 --include depends
 -+#depends depend dep:
 -+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 -+#
 -+#include depends
 - 
 - ########### Installation targets
 - 
 -@@ -262,9 +262,9 @@
 - 	mkdir -p $(TIMID_DIR)
 - 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 - 
 --install.patch: $(PATCHF)
 --	mkdir -p $(TIMID_DIR)/patch
 --	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 -+install.patch: #$(PATCHF)
 -+#        mkdir -p $(TIMID_DIR)/patch
 -+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 - 
 - install.tk: $(ALLTCLF)
 - 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
 diff -ruN /usr/ports/audio/timidity/files/patch-ac timidity/files/patch-ac
 --- /usr/ports/audio/timidity/files/patch-ac	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ac	1969-12-31 18:00:00.000000000 -0600
 @@ -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 /usr/ports/audio/timidity/files/patch-ae timidity/files/patch-ae
 --- /usr/ports/audio/timidity/files/patch-ae	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ae	1969-12-31 18:00:00.000000000 -0600
 @@ -1,177 +0,0 @@
 -*** linux_a.c.orig	Mon May 20 17:09:46 1996
 ---- linux_a.c	Tue Jun 16 21:40:17 1998
 -***************
 -*** 71,82 ****
 -     then 8-bit unsigned if it fails. If you have a sound device that
 -     can't handle either, let me know. */
 -  
 -  static int open_output(void)
 -  {
 -    int fd, tmp, i, warnings=0;
 -    
 -    /* Open the audio device */
 -!   fd=open(dpm.name, O_RDWR | O_NDELAY);
 -    if (fd<0)
 -      {
 -        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 ---- 71,85 ----
 -     then 8-bit unsigned if it fails. If you have a sound device that
 -     can't handle either, let me know. */
 -  
 -+ /* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
 -+ static int luigi_driver = 0;
 -+ 
 -  static int open_output(void)
 -  {
 -    int fd, tmp, i, warnings=0;
 -    
 -    /* Open the audio device */
 -!   fd=open(dpm.name, O_RDWR);
 -    if (fd<0)
 -      {
 -        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 -***************
 -*** 84,89 ****
 ---- 87,109 ----
 -        return -1;
 -      }
 -  
 -+   /* Figure out if we're running with the Luigi driver or
 -+      the original VoxWare driver, with code based on dburr/luigi
 -+      in ports/5607.  It'd be great if we could do this before
 -+      opening the audio device, but oh well... */
 -+ #if defined(AIOGFMT)	/* only defined in Luigi driver */
 -+   {
 -+     snd_chan_param s;
 -+     int i;
 -+     i = ioctl(fd, AIOGFMT, &s);
 -+     if (i != -1)
 -+       luigi_driver = 1;
 -+   }
 -+ #endif
 -+ 
 -+   ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
 -+ 	    luigi_driver ? "luigi" : "VoxWare");
 -+ 
 -    /* They can't mean these */
 -    dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
 -  
 -***************
 -*** 92,97 ****
 ---- 112,140 ----
 -       the other one. */
 -  
 -    i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
 -+   if (luigi_driver)
 -+     {
 -+       if (dpm.encoding & PE_16BIT) {
 -+ 	int fmt = AFMT_S16_LE ;
 -+ 
 -+ 	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
 -+ 	    fmt = AFMT_U8 ;
 -+ 	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
 -+ 		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 -+ 		      "%s doesn't support 16- or 8-bit sample width",
 -+ 		      dpm.name);
 -+ 		close(fd);
 -+ 		return -1;
 -+ 	    }
 -+ 	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
 -+ 		  "Sample width adjusted to %d bits", tmp);
 -+ 	    dpm.encoding ^= PE_16BIT;
 -+ 	    warnings = 1;
 -+ 	}
 -+       }
 -+     }
 -+   else
 -+     {
 -    if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
 -      {
 -        /* Try the other one */
 -***************
 -*** 109,114 ****
 ---- 152,158 ----
 -        dpm.encoding ^= PE_16BIT;
 -        warnings=1;
 -      }
 -+     }
 -    if (dpm.encoding & PE_16BIT)
 -      dpm.encoding |= PE_SIGNED;
 -    else
 -***************
 -*** 163,168 ****
 ---- 207,214 ----
 -    /* Set buffer fragments (in extra_param[0]) */
 -    
 -    tmp=AUDIO_BUFFER_BITS;
 -+   if (luigi_driver)
 -+     tmp += 2;
 -    if (!(dpm.encoding & PE_MONO)) tmp++;
 -    if (dpm.encoding & PE_16BIT) tmp++;
 -    tmp |= (dpm.extra_param[0]<<16);
 -***************
 -*** 189,216 ****
 -    return warnings;
 -  }
 -  
 -  static void output_data(int32 *buf, int32 count)
 -  {
 -    if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 -    
 -!   if (dpm.encoding & PE_16BIT)
 -!     {
 -        /* Convert data to signed 16-bit PCM */
 -        s32tos16(buf, count);
 -!       
 -!       /* Write the data out. Linux likes to give an EINTR if you suspend
 -! 	 a program while waiting on a write, so we may need to retry. */
 -!       while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
 -! 	;
 -!     }
 -!   else
 -!     {
 -        /* Convert to 8-bit unsigned and write out. */
 -        s32tou8(buf, count);
 -!       
 -!       while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
 -! 	;
 -      }
 -  }
 -  
 -  static void close_output(void)
 ---- 235,269 ----
 -    return warnings;
 -  }
 -  
 -+ /* output_data comes from Luigi's linux_a.c.  This version seems to allow
 -+    for partial writes to the sound device, where as the original version
 -+    doesn't. */
 -  static void output_data(int32 *buf, int32 count)
 -  {
 -+   char *p;
 -+   int res, l;
 -+   
 -    if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 -    
 -!   if (dpm.encoding & PE_16BIT) {
 -        /* Convert data to signed 16-bit PCM */
 -        s32tos16(buf, count);
 -!       res = count*2;
 -!   } else {
 -        /* Convert to 8-bit unsigned and write out. */
 -        s32tou8(buf, count);
 -!       res = count;
 -!   }
 -!   for (p = (char *) buf; res > 0; res -= l) {
 -! again:
 -!     l = write(dpm.fd, p, res);
 -!     if (l < 0) {
 -! 	if (errno == EINTR)
 -! 		goto again;
 -! 	return;
 -      }
 -+     p += l;
 -+   }
 -  }
 -  
 -  static void close_output(void)
 diff -ruN /usr/ports/audio/timidity/files/patch-af timidity/files/patch-af
 --- /usr/ports/audio/timidity/files/patch-af	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-af	1969-12-31 18:00:00.000000000 -0600
 @@ -1,27 +0,0 @@
 -*** config.h.orig	Sat Jun  1 07:54:49 1996
 ---- config.h	Sat Sep 18 15:32:38 1999
 -***************
 -*** 217,222 ****
 ---- 217,238 ----
 -  # endif
 -  #endif /* linux */
 -  
 -+ #ifdef __FreeBSD__
 -+ #include <errno.h>
 -+ #include <machine/endian.h>
 -+ #if BYTE_ORDER == LITTLE_ENDIAN
 -+ #undef BIG_ENDIAN
 -+ #undef PDP_ENDIAN
 -+ #elif BYTE_ORDER == BIG_ENDIAN
 -+ #undef LITTLE_ENDIAN
 -+ #undef PDP_ENDIAN
 -+ #else
 -+ # error No valid byte sex defined
 -+ #endif
 -+ #define USE_LDEXP
 -+ #define PI M_PI
 -+ #endif
 -+ 
 -  /* Win32 on Intel machines */
 -  #ifdef __WIN32__
 -  #  define LITTLE_ENDIAN
 diff -ruN /usr/ports/audio/timidity/files/patch-ag timidity/files/patch-ag
 --- /usr/ports/audio/timidity/files/patch-ag	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ag	1969-12-31 18:00:00.000000000 -0600
 @@ -1,87 +0,0 @@
 ---- common.c	2003/02/08 01:42:31	1.1
 -+++ common.c	2003/02/08 01:53:36
 -@@ -24,7 +24,7 @@
 - #include <stdio.h>
 - #include <stdlib.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- instrum.c	2003/02/08 01:42:31	1.1
 -+++ instrum.c	2003/02/08 01:53:50
 -@@ -25,7 +25,7 @@
 - 
 - #include <stdio.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- playmidi.c	2003/02/08 01:42:31	1.1
 -+++ playmidi.c	2003/02/08 01:54:18
 -@@ -27,7 +27,7 @@
 - #endif
 - #include <stdlib.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - # include <string.h>
 - #else
 - #include <strings.h>
 ---- raw_a.c	2003/02/08 01:42:31	1.1
 -+++ raw_a.c	2003/02/08 01:54:38
 -@@ -35,6 +35,7 @@
 - 
 - #ifdef __FreeBSD__
 - #include <stdio.h>
 -+#include <string.h>
 - #endif
 - 
 - #include "config.h"
 ---- readmidi.c	2003/02/08 01:42:31	1.1
 -+++ readmidi.c	2003/02/08 01:53:19
 -@@ -23,7 +23,7 @@
 - #include <stdlib.h>
 - #include <errno.h>
 - 
 --#if defined(SOLARIS) | defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - # include <string.h>
 - #else
 - #include <strings.h>
 ---- timidity.c	2003/02/08 01:42:31	1.1
 -+++ timidity.c	2003/02/08 01:54:51
 -@@ -21,7 +21,7 @@
 - #include <stdio.h>
 - #include <stdlib.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- wav2pat.c	2003/02/08 01:42:31	1.1
 -+++ wav2pat.c	2003/02/08 01:55:29
 -@@ -28,7 +28,7 @@
 - #include <unistd.h>
 - #include <fcntl.h>
 - 
 --#ifdef SOLARIS
 -+#if defined(SOLARIS) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- wave_a.c	2003/02/08 01:42:31	1.1
 -+++ wave_a.c	2003/02/08 01:55:45
 -@@ -35,6 +35,7 @@
 - 
 - #ifdef __FreeBSD__
 - #include <stdio.h>
 -+#include <string.h>
 - #endif
 - 
 - #include "config.h"
 -
 diff -ruN /usr/ports/audio/timidity/files/patch-common.c timidity/files/patch-common.c
 --- /usr/ports/audio/timidity/files/patch-common.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-common.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./common.c.orig	1996-06-01 07:20:19.000000000 -0500
 ++++ ./common.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -24,7 +24,7 @@
 + #include <stdio.h>
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-config.h timidity/files/patch-config.h
 --- /usr/ports/audio/timidity/files/patch-config.h	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-config.h	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,25 @@
 +--- ./config.h.orig	1996-06-01 07:54:49.000000000 -0500
 ++++ ./config.h	2013-04-21 10:18:23.000000000 -0500
 +@@ -217,6 +217,22 @@
 + # endif
 + #endif /* linux */
 + 
 ++#ifdef __FreeBSD__
 ++#include <errno.h>
 ++#include <machine/endian.h>
 ++#if BYTE_ORDER == LITTLE_ENDIAN
 ++#undef BIG_ENDIAN
 ++#undef PDP_ENDIAN
 ++#elif BYTE_ORDER == BIG_ENDIAN
 ++#undef LITTLE_ENDIAN
 ++#undef PDP_ENDIAN
 ++#else
 ++# error No valid byte sex defined
 ++#endif
 ++#define USE_LDEXP
 ++#define PI M_PI
 ++#endif
 ++
 + /* Win32 on Intel machines */
 + #ifdef __WIN32__
 + #  define LITTLE_ENDIAN
 diff -ruN /usr/ports/audio/timidity/files/patch-dumb_c.c timidity/files/patch-dumb_c.c
 --- /usr/ports/audio/timidity/files/patch-dumb_c.c	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-dumb_c.c	2013-04-21 10:20:02.000000000 -0500
 @@ -1,5 +1,5 @@
 ---- dumb_c.c.orig	Mon May 20 16:01:17 1996
 -+++ dumb_c.c	Tue Dec  4 23:45:01 2001
 +--- ./dumb_c.c.orig	1996-05-20 09:01:17.000000000 -0500
 ++++ ./dumb_c.c	2013-04-21 10:18:23.000000000 -0500
  @@ -66,10 +66,12 @@
     ctl_expression, ctl_panning, ctl_sustain, ctl_pitch_bend
   };
 diff -ruN /usr/ports/audio/timidity/files/patch-instrum.c timidity/files/patch-instrum.c
 --- /usr/ports/audio/timidity/files/patch-instrum.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-instrum.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./instrum.c.orig	1996-05-20 08:15:10.000000000 -0500
 ++++ ./instrum.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -25,7 +25,7 @@
 + 
 + #include <stdio.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-linux_a.c timidity/files/patch-linux_a.c
 --- /usr/ports/audio/timidity/files/patch-linux_a.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-linux_a.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,139 @@
 +--- ./linux_a.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./linux_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -71,12 +71,15 @@
 +    then 8-bit unsigned if it fails. If you have a sound device that
 +    can't handle either, let me know. */
 + 
 ++/* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
 ++static int luigi_driver = 0;
 ++
 + static int open_output(void)
 + {
 +   int fd, tmp, i, warnings=0;
 +   
 +   /* Open the audio device */
 +-  fd=open(dpm.name, O_RDWR | O_NDELAY);
 ++  fd=open(dpm.name, O_RDWR);
 +   if (fd<0)
 +     {
 +       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 +@@ -84,6 +87,23 @@
 +       return -1;
 +     }
 + 
 ++  /* Figure out if we're running with the Luigi driver or
 ++     the original VoxWare driver, with code based on dburr/luigi
 ++     in ports/5607.  It'd be great if we could do this before
 ++     opening the audio device, but oh well... */
 ++#if defined(AIOGFMT)	/* only defined in Luigi driver */
 ++  {
 ++    snd_chan_param s;
 ++    int i;
 ++    i = ioctl(fd, AIOGFMT, &s);
 ++    if (i != -1)
 ++      luigi_driver = 1;
 ++  }
 ++#endif
 ++
 ++  ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
 ++	    luigi_driver ? "luigi" : "VoxWare");
 ++
 +   /* They can't mean these */
 +   dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
 + 
 +@@ -92,6 +112,29 @@
 +      the other one. */
 + 
 +   i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
 ++  if (luigi_driver)
 ++    {
 ++      if (dpm.encoding & PE_16BIT) {
 ++	int fmt = AFMT_S16_LE ;
 ++
 ++	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
 ++	    fmt = AFMT_U8 ;
 ++	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
 ++		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 ++		      "%s doesn't support 16- or 8-bit sample width",
 ++		      dpm.name);
 ++		close(fd);
 ++		return -1;
 ++	    }
 ++	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
 ++		  "Sample width adjusted to %d bits", tmp);
 ++	    dpm.encoding ^= PE_16BIT;
 ++	    warnings = 1;
 ++	}
 ++      }
 ++    }
 ++  else
 ++    {
 +   if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
 +     {
 +       /* Try the other one */
 +@@ -109,6 +152,7 @@
 +       dpm.encoding ^= PE_16BIT;
 +       warnings=1;
 +     }
 ++    }
 +   if (dpm.encoding & PE_16BIT)
 +     dpm.encoding |= PE_SIGNED;
 +   else
 +@@ -163,6 +207,8 @@
 +   /* Set buffer fragments (in extra_param[0]) */
 +   
 +   tmp=AUDIO_BUFFER_BITS;
 ++  if (luigi_driver)
 ++    tmp += 2;
 +   if (!(dpm.encoding & PE_MONO)) tmp++;
 +   if (dpm.encoding & PE_16BIT) tmp++;
 +   tmp |= (dpm.extra_param[0]<<16);
 +@@ -189,28 +235,35 @@
 +   return warnings;
 + }
 + 
 ++/* output_data comes from Luigi's linux_a.c.  This version seems to allow
 ++   for partial writes to the sound device, where as the original version
 ++   doesn't. */
 + static void output_data(int32 *buf, int32 count)
 + {
 ++  char *p;
 ++  int res, l;
 ++  
 +   if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 +   
 +-  if (dpm.encoding & PE_16BIT)
 +-    {
 ++  if (dpm.encoding & PE_16BIT) {
 +       /* Convert data to signed 16-bit PCM */
 +       s32tos16(buf, count);
 +-      
 +-      /* Write the data out. Linux likes to give an EINTR if you suspend
 +-	 a program while waiting on a write, so we may need to retry. */
 +-      while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
 +-	;
 +-    }
 +-  else
 +-    {
 ++      res = count*2;
 ++  } else {
 +       /* Convert to 8-bit unsigned and write out. */
 +       s32tou8(buf, count);
 +-      
 +-      while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
 +-	;
 ++      res = count;
 ++  }
 ++  for (p = (char *) buf; res > 0; res -= l) {
 ++again:
 ++    l = write(dpm.fd, p, res);
 ++    if (l < 0) {
 ++	if (errno == EINTR)
 ++		goto again;
 ++	return;
 +     }
 ++    p += l;
 ++  }
 + }
 + 
 + static void close_output(void)
 diff -ruN /usr/ports/audio/timidity/files/patch-mix.c timidity/files/patch-mix.c
 --- /usr/ports/audio/timidity/files/patch-mix.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-mix.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,14 @@
 +--- ./mix.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./mix.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -23,7 +23,11 @@
 + 
 + #include <math.h>
 + #include <stdio.h>
 ++#ifdef __FreeBSD__
 ++#include <stdlib.h>
 ++#else
 + #include <malloc.h>
 ++#endif
 + 
 + #include "config.h"
 + #include "common.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-playmidi.c timidity/files/patch-playmidi.c
 --- /usr/ports/audio/timidity/files/patch-playmidi.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-playmidi.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./playmidi.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./playmidi.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -27,7 +27,7 @@
 + #endif
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + # include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-raw_a.c timidity/files/patch-raw_a.c
 --- /usr/ports/audio/timidity/files/patch-raw_a.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-raw_a.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,10 @@
 +--- ./raw_a.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./raw_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -35,6 +35,7 @@
 + 
 + #ifdef __FreeBSD__
 + #include <stdio.h>
 ++#include <string.h>
 + #endif
 + 
 + #include "config.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-readmidi.c timidity/files/patch-readmidi.c
 --- /usr/ports/audio/timidity/files/patch-readmidi.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-readmidi.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./readmidi.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./readmidi.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -23,7 +23,7 @@
 + #include <stdlib.h>
 + #include <errno.h>
 + 
 +-#if defined(SOLARIS) | defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + # include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-resample.c timidity/files/patch-resample.c
 --- /usr/ports/audio/timidity/files/patch-resample.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-resample.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,14 @@
 +--- ./resample.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./resample.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -22,7 +22,11 @@
 + 
 + #include <math.h>
 + #include <stdio.h>
 ++#ifdef __FreeBSD__
 ++#include <stdlib.h>
 ++#else
 + #include <malloc.h>
 ++#endif
 + 
 + #include "config.h"
 + #include "common.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-timidity.c timidity/files/patch-timidity.c
 --- /usr/ports/audio/timidity/files/patch-timidity.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-timidity.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./timidity.c.orig	1996-05-21 14:16:20.000000000 -0500
 ++++ ./timidity.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -21,7 +21,7 @@
 + #include <stdio.h>
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-timidity.cfg timidity/files/patch-timidity.cfg
 --- /usr/ports/audio/timidity/files/patch-timidity.cfg	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-timidity.cfg	2013-04-21 10:20:03.000000000 -0500
 @@ -0,0 +1,31 @@
 +--- ./timidity.cfg.orig	1995-05-21 17:40:27.000000000 -0500
 ++++ ./timidity.cfg	2013-04-21 10:18:23.000000000 -0500
 +@@ -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 /usr/ports/audio/timidity/files/patch-wav2pat.c timidity/files/patch-wav2pat.c
 --- /usr/ports/audio/timidity/files/patch-wav2pat.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-wav2pat.c	2013-04-21 10:20:03.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./wav2pat.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./wav2pat.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -28,7 +28,7 @@
 + #include <unistd.h>
 + #include <fcntl.h>
 + 
 +-#ifdef SOLARIS
 ++#if defined(SOLARIS) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-wave_a.c timidity/files/patch-wave_a.c
 --- /usr/ports/audio/timidity/files/patch-wave_a.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-wave_a.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,10 @@
 +--- ./wave_a.c.orig	1996-05-20 08:10:15.000000000 -0500
 ++++ ./wave_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -35,6 +35,7 @@
 + 
 + #ifdef __FreeBSD__
 + #include <stdio.h>
 ++#include <string.h>
 + #endif
 + 
 + #include "config.h"
 diff -ruN /usr/ports/audio/timidity/pkg-plist timidity/pkg-plist
 --- /usr/ports/audio/timidity/pkg-plist	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/pkg-plist	2013-04-21 10:03:31.000000000 -0500
 @@ -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
 
 --------------000000010509030207000806--

From: green dog <fiziologus@gmail.com>
To: Kevin Zheng <kevinz5000@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Tue, 23 Apr 2013 08:42:20 +0400

 --001a11c2bd1289dbb204daffcf79
 Content-Type: text/plain; charset=ISO-8859-1
 
 work: build and run (local machine)
 
 
 2013/4/21 Kevin Zheng <kevinz5000@gmail.com>
 
 > Attached is an updated patch, the biggest change being the expansion of
 > the old timidity patch files. I haven't had the opportunity to
 > thoroughly test this patch, but this should be preferred over the
 > previous patch.
 >
 > I'll follow up again when I've verified that this patch works correctly.
 >
 > Thanks,
 > Kevin Zheng
 >
 
 
 
 -- 
 sorry for bad english.
 
 --001a11c2bd1289dbb204daffcf79
 Content-Type: text/html; charset=ISO-8859-1
 
 <div dir="ltr">work: build and run (local machine)</div><div class="gmail_extra"><br><br><div class="gmail_quote">2013/4/21 Kevin Zheng <span dir="ltr">&lt;<a href="mailto:kevinz5000@gmail.com" target="_blank">kevinz5000@gmail.com</a>&gt;</span><br>
 <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Attached is an updated patch, the biggest change being the expansion of<br>
 the old timidity patch files. I haven&#39;t had the opportunity to<br>
 thoroughly test this patch, but this should be preferred over the<br>
 previous patch.<br>
 <br>
 I&#39;ll follow up again when I&#39;ve verified that this patch works correctly.<br>
 <br>
 Thanks,<br>
 Kevin Zheng<br>
 </blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">sorry for bad english.</div>
 </div>
 
 --001a11c2bd1289dbb204daffcf79--

From: Kevin Zheng <kevinz5000@gmail.com>
To: bug-followup@FreeBSD.org, fiziologus@gmail.com
Cc:  
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Thu, 25 Apr 2013 21:39:02 -0500

 Hi again,
 
 RedPorts came back up and I did a build of the new ports. Apparently
 audio/guspat fails on plist with one leftover file
 (share/guspat/timidity.cfg.bak).
 
 I'll take a look at this and hopefully fix it all up to be commit-ready
 this weekend, unless someone feels like submitting a patch.
 
 Build log:
 https://redports.org/~Partmedia/20130426022816-34774-116189/guspat-20000706_2.log
 
 Thanks,
 Kevin Zheng

From: green dog <fiziologus@gmail.com>
To: Kevin Zheng <kevinz5000@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Fri, 26 Apr 2013 07:14:06 +0400

 --047d7b671ed08e1a9e04db3aedc2
 Content-Type: text/plain; charset=ISO-8859-1
 
 REINPLACE_CMD == sed -i.bak
 
 fix: add %%DATADIR%%/timidity.cfg.bak in pkg-plist for audio/guspat or
 remove timidity.bak from WRKSRC after post-patch section.
 
 
 2013/4/26 Kevin Zheng <kevinz5000@gmail.com>
 
 > Hi again,
 >
 > RedPorts came back up and I did a build of the new ports. Apparently
 > audio/guspat fails on plist with one leftover file
 > (share/guspat/timidity.cfg.bak).
 >
 > I'll take a look at this and hopefully fix it all up to be commit-ready
 > this weekend, unless someone feels like submitting a patch.
 >
 > Build log:
 >
 > https://redports.org/~Partmedia/20130426022816-34774-116189/guspat-20000706_2.log
 >
 > Thanks,
 > Kevin Zheng
 >
 
 
 
 -- 
 sorry for bad english.
 
 --047d7b671ed08e1a9e04db3aedc2
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 <div dir=3D"ltr">REINPLACE_CMD =3D=3D sed -i.bak<div><br></div><div style>f=
 ix: add=A0%%DATADIR%%/timidity.cfg.bak in pkg-plist for audio/guspat or rem=
 ove timidity.bak from WRKSRC after post-patch section.</div></div><div clas=
 s=3D"gmail_extra">
 <br><br><div class=3D"gmail_quote">2013/4/26 Kevin Zheng <span dir=3D"ltr">=
 &lt;<a href=3D"mailto:kevinz5000@gmail.com" target=3D"_blank">kevinz5000@gm=
 ail.com</a>&gt;</span><br><blockquote class=3D"gmail_quote" style=3D"margin=
 :0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
 Hi again,<br>
 <br>
 RedPorts came back up and I did a build of the new ports. Apparently<br>
 audio/guspat fails on plist with one leftover file<br>
 (share/guspat/timidity.cfg.bak).<br>
 <br>
 I&#39;ll take a look at this and hopefully fix it all up to be commit-ready=
 <br>
 this weekend, unless someone feels like submitting a patch.<br>
 <br>
 Build log:<br>
 <a href=3D"https://redports.org/~Partmedia/20130426022816-34774-116189/gusp=
 at-20000706_2.log" target=3D"_blank">https://redports.org/~Partmedia/201304=
 26022816-34774-116189/guspat-20000706_2.log</a><br>
 <br>
 Thanks,<br>
 Kevin Zheng<br>
 </blockquote></div><br><br clear=3D"all"><div><br></div>-- <br><div dir=3D"=
 ltr">sorry for bad english.</div>
 </div>
 
 --047d7b671ed08e1a9e04db3aedc2--

From: Kevin Zheng <kevinz5000@gmail.com>
To: bug-followup@FreeBSD.org, fiziologus@gmail.com
Cc:  
Subject: Re: ports/177074: [fix] audio/timidity and audio/guspat
Date: Thu, 25 Apr 2013 22:59:56 -0500

 This is a multi-part message in MIME format.
 --------------060802010503000101020409
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Hi again,
 
 The previous issue has been fixed by deleting the backup file during the
 post-patch stage. Now, both audio/timidity and audio/guspat have been
 successfully tested on RedPorts and work on actual computers.
 
 Attached are the patch files against the existing version in FreeBSD
 ports. This should be ready-to-commit.
 
 Thanks,
 Kevin Zheng
 
 --------------060802010503000101020409
 Content-Type: text/plain; charset=UTF-8;
  name="patch-guspat.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-guspat.diff"
 
 diff -ruN /usr/ports/audio/guspat/Makefile ./Makefile
 --- /usr/ports/audio/guspat/Makefile	2012-11-16 23:54:34.000000000 -0600
 +++ ./Makefile	2013-04-25 22:39:27.000000000 -0500
 @@ -14,23 +14,22 @@
  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
 -
 -WRKSRC=		${WRKDIR}/timidity
 +NO_CDROM=	Some of the patches are marked no-commercial-use
  PLIST_SUB=	TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
 +WRKSRC=		${WRKDIR}/timidity
  
  TIMIDITY_DATADIR=	share/timidity
  
 +post-patch:
 +	@${REINPLACE_CMD} -e 's|/timidity|/guspat|g' ${WRKSRC}/timidity.cfg
 +	@${RM} ${WRKSRC}/timidity.cfg.bak
 +
  do-install:
  	@${MKDIR} ${DATADIR}
  	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}
  	@${MKDIR} ${PREFIX}/${TIMIDITY_DATADIR}
 -	cd ${WRKSRC} && ${INSTALL_DATA} timidity.cfg \
 +	${INSTALL_DATA} ${WRKSRC}/timidity.cfg \
  		${PREFIX}/${TIMIDITY_DATADIR}/timidity.cfg-guspat
  
  .include <bsd.port.mk>
 
 --------------060802010503000101020409
 Content-Type: text/plain; charset=UTF-8;
  name="patch-timidity.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch-timidity.diff"
 
 diff -ruN /usr/ports/audio/timidity/Makefile timidity/Makefile
 --- /usr/ports/audio/timidity/Makefile	2013-03-13 12:23:05.000000000 -0500
 +++ timidity/Makefile	2013-04-25 22:54:51.000000000 -0500
 @@ -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=	GUSPAT
 +GUSPAT_DESC=	Use audio/guspat instead of included sound fonts (goemon)
 +
 +.include <bsd.port.options.mk>
 +
 +# Set up sound fonts from audio/guspat.
 +.if ${PORT_OPTIONS:MGUSPAT}
 +RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:${PORTSDIR}/audio/guspat
 +TDIR=		${LOCALBASE}/share/timidity
 +TCONFIG=	timidity.cfg-guspat
 +PLIST_SUB+=	GOEMON="@comment "
 +.else
 +# Set up default sound fonts (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:MGUSPAT}
  	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 /usr/ports/audio/timidity/files/patch-Makefile timidity/files/patch-Makefile
 --- /usr/ports/audio/timidity/files/patch-Makefile	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-Makefile	2013-04-21 10:20:03.000000000 -0500
 @@ -0,0 +1,81 @@
 +--- ./Makefile.orig	1996-05-26 04:26:46.000000000 -0500
 ++++ ./Makefile	2013-04-21 10:18:23.000000000 -0500
 +@@ -24,22 +24,22 @@
 + # But where to change without revealing my secret identity?
 + 
 + ########### Compiler and flags.
 +-CC = gcc
 +-DEBUGFLAGS = -Wall -O2
 ++#CC = gcc
 ++DEBUGFLAGS = -Wall
 + 
 + ########### Install.
 +-INSTALL = /usr/bin/install
 ++#INSTALL = /usr/bin/install
 + 
 + # Where to install the executable
 +-BIN_DIR = /usr/local/bin
 ++BIN_DIR = ${PREFIX}/bin
 + 
 + # Where to install the manual pages
 +-MAN_DIR = /usr/local/man/man1
 ++MAN_DIR = ${PREFIX}/man/man1
 + 
 + # Where to install the patches, config files, and MIDI files.
 + # If you change this, it's a good idea to recompile the binary,
 + # or you'll need to invoke timidity with the -L option.
 +-TIMID_DIR = /usr/local/lib/timidity
 ++TIMID_DIR = ${PREFIX}/lib/timidity
 + 
 + # Where to install the Tcl code, if you use the Tcl code that is.
 + TCL_DIR = $(TIMID_DIR)
 +@@ -112,9 +112,9 @@
 + #EXTRALIBS += -lgen
 + 
 + # Select the Tcl/Tk interface
 +-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 +-SYSEXTRAS += tk_c.c
 +-INST_TK = install.tk
 ++#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 ++#SYSEXTRAS += tk_c.c
 ++#INST_TK = install.tk
 + #EXTRAINCS +=
 + #EXTRALIBS +=
 + 
 +@@ -136,7 +136,7 @@
 + SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 + SDISTZIP = tilib$(FNSUPPVERSION).zip
 + 
 +-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 ++CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 + 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 + 
 + ########### All relevant files.. Anybody know autoconf?
 +@@ -228,10 +228,10 @@
 + wav2pat: wav2pat.c
 + 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 + 
 +-depends depend dep:
 +-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 +-
 +-include depends
 ++#depends depend dep:
 ++#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 ++#
 ++#include depends
 + 
 + ########### Installation targets
 + 
 +@@ -262,9 +262,9 @@
 + 	mkdir -p $(TIMID_DIR)
 + 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 + 
 +-install.patch: $(PATCHF)
 +-	mkdir -p $(TIMID_DIR)/patch
 +-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 ++install.patch: #$(PATCHF)
 ++#        mkdir -p $(TIMID_DIR)/patch
 ++#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 + 
 + install.tk: $(ALLTCLF)
 + 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
 diff -ruN /usr/ports/audio/timidity/files/patch-aa timidity/files/patch-aa
 --- /usr/ports/audio/timidity/files/patch-aa	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-aa	1969-12-31 18:00:00.000000000 -0600
 @@ -1,32 +0,0 @@
 -*** mix.c.orig	Mon May 20 17:09:46 1996
 ---- mix.c	Sun Nov 17 10:01:36 1996
 -***************
 -*** 23,29 ****
 ---- 23,33 ----
 -  
 -  #include <math.h>
 -  #include <stdio.h>
 -+ #ifdef __FreeBSD__
 -+ #include <stdlib.h>
 -+ #else
 -  #include <malloc.h>
 -+ #endif
 -  
 -  #include "config.h"
 -  #include "common.h"
 -*** resample.c.orig	Mon May 20 17:09:47 1996
 ---- resample.c	Sun Nov 17 09:59:29 1996
 -***************
 -*** 22,28 ****
 ---- 22,32 ----
 -  
 -  #include <math.h>
 -  #include <stdio.h>
 -+ #ifdef __FreeBSD__
 -+ #include <stdlib.h>
 -+ #else
 -  #include <malloc.h>
 -+ #endif
 -  
 -  #include "config.h"
 -  #include "common.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-ab timidity/files/patch-ab
 --- /usr/ports/audio/timidity/files/patch-ab	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ab	1969-12-31 18:00:00.000000000 -0600
 @@ -1,81 +0,0 @@
 ---- Makefile.orig	Sun May 26 13:26:46 1996
 -+++ Makefile	Mon Jan  4 04:08:35 1999
 -@@ -24,22 +24,22 @@
 - # But where to change without revealing my secret identity?
 - 
 - ########### Compiler and flags.
 --CC = gcc
 --DEBUGFLAGS = -Wall -O2
 -+#CC = gcc
 -+DEBUGFLAGS = -Wall
 - 
 - ########### Install.
 --INSTALL = /usr/bin/install
 -+#INSTALL = /usr/bin/install
 - 
 - # Where to install the executable
 --BIN_DIR = /usr/local/bin
 -+BIN_DIR = ${PREFIX}/bin
 - 
 - # Where to install the manual pages
 --MAN_DIR = /usr/local/man/man1
 -+MAN_DIR = ${PREFIX}/man/man1
 - 
 - # Where to install the patches, config files, and MIDI files.
 - # If you change this, it's a good idea to recompile the binary,
 - # or you'll need to invoke timidity with the -L option.
 --TIMID_DIR = /usr/local/lib/timidity
 -+TIMID_DIR = ${PREFIX}/lib/timidity
 - 
 - # Where to install the Tcl code, if you use the Tcl code that is.
 - TCL_DIR = $(TIMID_DIR)
 -@@ -112,9 +112,9 @@
 - #EXTRALIBS += -lgen
 - 
 - # Select the Tcl/Tk interface
 --SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 --SYSEXTRAS += tk_c.c
 --INST_TK = install.tk
 -+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 -+#SYSEXTRAS += tk_c.c
 -+#INST_TK = install.tk
 - #EXTRAINCS +=
 - #EXTRALIBS +=
 - 
 -@@ -136,7 +136,7 @@
 - SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 - SDISTZIP = tilib$(FNSUPPVERSION).zip
 - 
 --CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 -+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 - 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 - 
 - ########### All relevant files.. Anybody know autoconf?
 -@@ -228,10 +228,10 @@
 - wav2pat: wav2pat.c
 - 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 - 
 --depends depend dep:
 --	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 --
 --include depends
 -+#depends depend dep:
 -+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 -+#
 -+#include depends
 - 
 - ########### Installation targets
 - 
 -@@ -262,9 +262,9 @@
 - 	mkdir -p $(TIMID_DIR)
 - 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 - 
 --install.patch: $(PATCHF)
 --	mkdir -p $(TIMID_DIR)/patch
 --	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 -+install.patch: #$(PATCHF)
 -+#        mkdir -p $(TIMID_DIR)/patch
 -+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 - 
 - install.tk: $(ALLTCLF)
 - 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
 diff -ruN /usr/ports/audio/timidity/files/patch-ac timidity/files/patch-ac
 --- /usr/ports/audio/timidity/files/patch-ac	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ac	1969-12-31 18:00:00.000000000 -0600
 @@ -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 /usr/ports/audio/timidity/files/patch-ae timidity/files/patch-ae
 --- /usr/ports/audio/timidity/files/patch-ae	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ae	1969-12-31 18:00:00.000000000 -0600
 @@ -1,177 +0,0 @@
 -*** linux_a.c.orig	Mon May 20 17:09:46 1996
 ---- linux_a.c	Tue Jun 16 21:40:17 1998
 -***************
 -*** 71,82 ****
 -     then 8-bit unsigned if it fails. If you have a sound device that
 -     can't handle either, let me know. */
 -  
 -  static int open_output(void)
 -  {
 -    int fd, tmp, i, warnings=0;
 -    
 -    /* Open the audio device */
 -!   fd=open(dpm.name, O_RDWR | O_NDELAY);
 -    if (fd<0)
 -      {
 -        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 ---- 71,85 ----
 -     then 8-bit unsigned if it fails. If you have a sound device that
 -     can't handle either, let me know. */
 -  
 -+ /* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
 -+ static int luigi_driver = 0;
 -+ 
 -  static int open_output(void)
 -  {
 -    int fd, tmp, i, warnings=0;
 -    
 -    /* Open the audio device */
 -!   fd=open(dpm.name, O_RDWR);
 -    if (fd<0)
 -      {
 -        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 -***************
 -*** 84,89 ****
 ---- 87,109 ----
 -        return -1;
 -      }
 -  
 -+   /* Figure out if we're running with the Luigi driver or
 -+      the original VoxWare driver, with code based on dburr/luigi
 -+      in ports/5607.  It'd be great if we could do this before
 -+      opening the audio device, but oh well... */
 -+ #if defined(AIOGFMT)	/* only defined in Luigi driver */
 -+   {
 -+     snd_chan_param s;
 -+     int i;
 -+     i = ioctl(fd, AIOGFMT, &s);
 -+     if (i != -1)
 -+       luigi_driver = 1;
 -+   }
 -+ #endif
 -+ 
 -+   ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
 -+ 	    luigi_driver ? "luigi" : "VoxWare");
 -+ 
 -    /* They can't mean these */
 -    dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
 -  
 -***************
 -*** 92,97 ****
 ---- 112,140 ----
 -       the other one. */
 -  
 -    i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
 -+   if (luigi_driver)
 -+     {
 -+       if (dpm.encoding & PE_16BIT) {
 -+ 	int fmt = AFMT_S16_LE ;
 -+ 
 -+ 	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
 -+ 	    fmt = AFMT_U8 ;
 -+ 	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
 -+ 		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 -+ 		      "%s doesn't support 16- or 8-bit sample width",
 -+ 		      dpm.name);
 -+ 		close(fd);
 -+ 		return -1;
 -+ 	    }
 -+ 	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
 -+ 		  "Sample width adjusted to %d bits", tmp);
 -+ 	    dpm.encoding ^= PE_16BIT;
 -+ 	    warnings = 1;
 -+ 	}
 -+       }
 -+     }
 -+   else
 -+     {
 -    if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
 -      {
 -        /* Try the other one */
 -***************
 -*** 109,114 ****
 ---- 152,158 ----
 -        dpm.encoding ^= PE_16BIT;
 -        warnings=1;
 -      }
 -+     }
 -    if (dpm.encoding & PE_16BIT)
 -      dpm.encoding |= PE_SIGNED;
 -    else
 -***************
 -*** 163,168 ****
 ---- 207,214 ----
 -    /* Set buffer fragments (in extra_param[0]) */
 -    
 -    tmp=AUDIO_BUFFER_BITS;
 -+   if (luigi_driver)
 -+     tmp += 2;
 -    if (!(dpm.encoding & PE_MONO)) tmp++;
 -    if (dpm.encoding & PE_16BIT) tmp++;
 -    tmp |= (dpm.extra_param[0]<<16);
 -***************
 -*** 189,216 ****
 -    return warnings;
 -  }
 -  
 -  static void output_data(int32 *buf, int32 count)
 -  {
 -    if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 -    
 -!   if (dpm.encoding & PE_16BIT)
 -!     {
 -        /* Convert data to signed 16-bit PCM */
 -        s32tos16(buf, count);
 -!       
 -!       /* Write the data out. Linux likes to give an EINTR if you suspend
 -! 	 a program while waiting on a write, so we may need to retry. */
 -!       while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
 -! 	;
 -!     }
 -!   else
 -!     {
 -        /* Convert to 8-bit unsigned and write out. */
 -        s32tou8(buf, count);
 -!       
 -!       while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
 -! 	;
 -      }
 -  }
 -  
 -  static void close_output(void)
 ---- 235,269 ----
 -    return warnings;
 -  }
 -  
 -+ /* output_data comes from Luigi's linux_a.c.  This version seems to allow
 -+    for partial writes to the sound device, where as the original version
 -+    doesn't. */
 -  static void output_data(int32 *buf, int32 count)
 -  {
 -+   char *p;
 -+   int res, l;
 -+   
 -    if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 -    
 -!   if (dpm.encoding & PE_16BIT) {
 -        /* Convert data to signed 16-bit PCM */
 -        s32tos16(buf, count);
 -!       res = count*2;
 -!   } else {
 -        /* Convert to 8-bit unsigned and write out. */
 -        s32tou8(buf, count);
 -!       res = count;
 -!   }
 -!   for (p = (char *) buf; res > 0; res -= l) {
 -! again:
 -!     l = write(dpm.fd, p, res);
 -!     if (l < 0) {
 -! 	if (errno == EINTR)
 -! 		goto again;
 -! 	return;
 -      }
 -+     p += l;
 -+   }
 -  }
 -  
 -  static void close_output(void)
 diff -ruN /usr/ports/audio/timidity/files/patch-af timidity/files/patch-af
 --- /usr/ports/audio/timidity/files/patch-af	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-af	1969-12-31 18:00:00.000000000 -0600
 @@ -1,27 +0,0 @@
 -*** config.h.orig	Sat Jun  1 07:54:49 1996
 ---- config.h	Sat Sep 18 15:32:38 1999
 -***************
 -*** 217,222 ****
 ---- 217,238 ----
 -  # endif
 -  #endif /* linux */
 -  
 -+ #ifdef __FreeBSD__
 -+ #include <errno.h>
 -+ #include <machine/endian.h>
 -+ #if BYTE_ORDER == LITTLE_ENDIAN
 -+ #undef BIG_ENDIAN
 -+ #undef PDP_ENDIAN
 -+ #elif BYTE_ORDER == BIG_ENDIAN
 -+ #undef LITTLE_ENDIAN
 -+ #undef PDP_ENDIAN
 -+ #else
 -+ # error No valid byte sex defined
 -+ #endif
 -+ #define USE_LDEXP
 -+ #define PI M_PI
 -+ #endif
 -+ 
 -  /* Win32 on Intel machines */
 -  #ifdef __WIN32__
 -  #  define LITTLE_ENDIAN
 diff -ruN /usr/ports/audio/timidity/files/patch-ag timidity/files/patch-ag
 --- /usr/ports/audio/timidity/files/patch-ag	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-ag	1969-12-31 18:00:00.000000000 -0600
 @@ -1,87 +0,0 @@
 ---- common.c	2003/02/08 01:42:31	1.1
 -+++ common.c	2003/02/08 01:53:36
 -@@ -24,7 +24,7 @@
 - #include <stdio.h>
 - #include <stdlib.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- instrum.c	2003/02/08 01:42:31	1.1
 -+++ instrum.c	2003/02/08 01:53:50
 -@@ -25,7 +25,7 @@
 - 
 - #include <stdio.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- playmidi.c	2003/02/08 01:42:31	1.1
 -+++ playmidi.c	2003/02/08 01:54:18
 -@@ -27,7 +27,7 @@
 - #endif
 - #include <stdlib.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - # include <string.h>
 - #else
 - #include <strings.h>
 ---- raw_a.c	2003/02/08 01:42:31	1.1
 -+++ raw_a.c	2003/02/08 01:54:38
 -@@ -35,6 +35,7 @@
 - 
 - #ifdef __FreeBSD__
 - #include <stdio.h>
 -+#include <string.h>
 - #endif
 - 
 - #include "config.h"
 ---- readmidi.c	2003/02/08 01:42:31	1.1
 -+++ readmidi.c	2003/02/08 01:53:19
 -@@ -23,7 +23,7 @@
 - #include <stdlib.h>
 - #include <errno.h>
 - 
 --#if defined(SOLARIS) | defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - # include <string.h>
 - #else
 - #include <strings.h>
 ---- timidity.c	2003/02/08 01:42:31	1.1
 -+++ timidity.c	2003/02/08 01:54:51
 -@@ -21,7 +21,7 @@
 - #include <stdio.h>
 - #include <stdlib.h>
 - 
 --#if defined(SOLARIS) || defined(__WIN32__)
 -+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- wav2pat.c	2003/02/08 01:42:31	1.1
 -+++ wav2pat.c	2003/02/08 01:55:29
 -@@ -28,7 +28,7 @@
 - #include <unistd.h>
 - #include <fcntl.h>
 - 
 --#ifdef SOLARIS
 -+#if defined(SOLARIS) || defined(__FreeBSD__)
 - #include <string.h>
 - #else
 - #include <strings.h>
 ---- wave_a.c	2003/02/08 01:42:31	1.1
 -+++ wave_a.c	2003/02/08 01:55:45
 -@@ -35,6 +35,7 @@
 - 
 - #ifdef __FreeBSD__
 - #include <stdio.h>
 -+#include <string.h>
 - #endif
 - 
 - #include "config.h"
 -
 diff -ruN /usr/ports/audio/timidity/files/patch-common.c timidity/files/patch-common.c
 --- /usr/ports/audio/timidity/files/patch-common.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-common.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./common.c.orig	1996-06-01 07:20:19.000000000 -0500
 ++++ ./common.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -24,7 +24,7 @@
 + #include <stdio.h>
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-config.h timidity/files/patch-config.h
 --- /usr/ports/audio/timidity/files/patch-config.h	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-config.h	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,25 @@
 +--- ./config.h.orig	1996-06-01 07:54:49.000000000 -0500
 ++++ ./config.h	2013-04-21 10:18:23.000000000 -0500
 +@@ -217,6 +217,22 @@
 + # endif
 + #endif /* linux */
 + 
 ++#ifdef __FreeBSD__
 ++#include <errno.h>
 ++#include <machine/endian.h>
 ++#if BYTE_ORDER == LITTLE_ENDIAN
 ++#undef BIG_ENDIAN
 ++#undef PDP_ENDIAN
 ++#elif BYTE_ORDER == BIG_ENDIAN
 ++#undef LITTLE_ENDIAN
 ++#undef PDP_ENDIAN
 ++#else
 ++# error No valid byte sex defined
 ++#endif
 ++#define USE_LDEXP
 ++#define PI M_PI
 ++#endif
 ++
 + /* Win32 on Intel machines */
 + #ifdef __WIN32__
 + #  define LITTLE_ENDIAN
 diff -ruN /usr/ports/audio/timidity/files/patch-dumb_c.c timidity/files/patch-dumb_c.c
 --- /usr/ports/audio/timidity/files/patch-dumb_c.c	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/files/patch-dumb_c.c	2013-04-21 10:20:02.000000000 -0500
 @@ -1,5 +1,5 @@
 ---- dumb_c.c.orig	Mon May 20 16:01:17 1996
 -+++ dumb_c.c	Tue Dec  4 23:45:01 2001
 +--- ./dumb_c.c.orig	1996-05-20 09:01:17.000000000 -0500
 ++++ ./dumb_c.c	2013-04-21 10:18:23.000000000 -0500
  @@ -66,10 +66,12 @@
     ctl_expression, ctl_panning, ctl_sustain, ctl_pitch_bend
   };
 diff -ruN /usr/ports/audio/timidity/files/patch-instrum.c timidity/files/patch-instrum.c
 --- /usr/ports/audio/timidity/files/patch-instrum.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-instrum.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./instrum.c.orig	1996-05-20 08:15:10.000000000 -0500
 ++++ ./instrum.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -25,7 +25,7 @@
 + 
 + #include <stdio.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-linux_a.c timidity/files/patch-linux_a.c
 --- /usr/ports/audio/timidity/files/patch-linux_a.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-linux_a.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,139 @@
 +--- ./linux_a.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./linux_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -71,12 +71,15 @@
 +    then 8-bit unsigned if it fails. If you have a sound device that
 +    can't handle either, let me know. */
 + 
 ++/* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
 ++static int luigi_driver = 0;
 ++
 + static int open_output(void)
 + {
 +   int fd, tmp, i, warnings=0;
 +   
 +   /* Open the audio device */
 +-  fd=open(dpm.name, O_RDWR | O_NDELAY);
 ++  fd=open(dpm.name, O_RDWR);
 +   if (fd<0)
 +     {
 +       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 +@@ -84,6 +87,23 @@
 +       return -1;
 +     }
 + 
 ++  /* Figure out if we're running with the Luigi driver or
 ++     the original VoxWare driver, with code based on dburr/luigi
 ++     in ports/5607.  It'd be great if we could do this before
 ++     opening the audio device, but oh well... */
 ++#if defined(AIOGFMT)	/* only defined in Luigi driver */
 ++  {
 ++    snd_chan_param s;
 ++    int i;
 ++    i = ioctl(fd, AIOGFMT, &s);
 ++    if (i != -1)
 ++      luigi_driver = 1;
 ++  }
 ++#endif
 ++
 ++  ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
 ++	    luigi_driver ? "luigi" : "VoxWare");
 ++
 +   /* They can't mean these */
 +   dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
 + 
 +@@ -92,6 +112,29 @@
 +      the other one. */
 + 
 +   i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
 ++  if (luigi_driver)
 ++    {
 ++      if (dpm.encoding & PE_16BIT) {
 ++	int fmt = AFMT_S16_LE ;
 ++
 ++	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
 ++	    fmt = AFMT_U8 ;
 ++	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
 ++		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 ++		      "%s doesn't support 16- or 8-bit sample width",
 ++		      dpm.name);
 ++		close(fd);
 ++		return -1;
 ++	    }
 ++	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
 ++		  "Sample width adjusted to %d bits", tmp);
 ++	    dpm.encoding ^= PE_16BIT;
 ++	    warnings = 1;
 ++	}
 ++      }
 ++    }
 ++  else
 ++    {
 +   if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
 +     {
 +       /* Try the other one */
 +@@ -109,6 +152,7 @@
 +       dpm.encoding ^= PE_16BIT;
 +       warnings=1;
 +     }
 ++    }
 +   if (dpm.encoding & PE_16BIT)
 +     dpm.encoding |= PE_SIGNED;
 +   else
 +@@ -163,6 +207,8 @@
 +   /* Set buffer fragments (in extra_param[0]) */
 +   
 +   tmp=AUDIO_BUFFER_BITS;
 ++  if (luigi_driver)
 ++    tmp += 2;
 +   if (!(dpm.encoding & PE_MONO)) tmp++;
 +   if (dpm.encoding & PE_16BIT) tmp++;
 +   tmp |= (dpm.extra_param[0]<<16);
 +@@ -189,28 +235,35 @@
 +   return warnings;
 + }
 + 
 ++/* output_data comes from Luigi's linux_a.c.  This version seems to allow
 ++   for partial writes to the sound device, where as the original version
 ++   doesn't. */
 + static void output_data(int32 *buf, int32 count)
 + {
 ++  char *p;
 ++  int res, l;
 ++  
 +   if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 +   
 +-  if (dpm.encoding & PE_16BIT)
 +-    {
 ++  if (dpm.encoding & PE_16BIT) {
 +       /* Convert data to signed 16-bit PCM */
 +       s32tos16(buf, count);
 +-      
 +-      /* Write the data out. Linux likes to give an EINTR if you suspend
 +-	 a program while waiting on a write, so we may need to retry. */
 +-      while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
 +-	;
 +-    }
 +-  else
 +-    {
 ++      res = count*2;
 ++  } else {
 +       /* Convert to 8-bit unsigned and write out. */
 +       s32tou8(buf, count);
 +-      
 +-      while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
 +-	;
 ++      res = count;
 ++  }
 ++  for (p = (char *) buf; res > 0; res -= l) {
 ++again:
 ++    l = write(dpm.fd, p, res);
 ++    if (l < 0) {
 ++	if (errno == EINTR)
 ++		goto again;
 ++	return;
 +     }
 ++    p += l;
 ++  }
 + }
 + 
 + static void close_output(void)
 diff -ruN /usr/ports/audio/timidity/files/patch-mix.c timidity/files/patch-mix.c
 --- /usr/ports/audio/timidity/files/patch-mix.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-mix.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,14 @@
 +--- ./mix.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./mix.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -23,7 +23,11 @@
 + 
 + #include <math.h>
 + #include <stdio.h>
 ++#ifdef __FreeBSD__
 ++#include <stdlib.h>
 ++#else
 + #include <malloc.h>
 ++#endif
 + 
 + #include "config.h"
 + #include "common.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-playmidi.c timidity/files/patch-playmidi.c
 --- /usr/ports/audio/timidity/files/patch-playmidi.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-playmidi.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./playmidi.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./playmidi.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -27,7 +27,7 @@
 + #endif
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + # include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-raw_a.c timidity/files/patch-raw_a.c
 --- /usr/ports/audio/timidity/files/patch-raw_a.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-raw_a.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,10 @@
 +--- ./raw_a.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./raw_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -35,6 +35,7 @@
 + 
 + #ifdef __FreeBSD__
 + #include <stdio.h>
 ++#include <string.h>
 + #endif
 + 
 + #include "config.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-readmidi.c timidity/files/patch-readmidi.c
 --- /usr/ports/audio/timidity/files/patch-readmidi.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-readmidi.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./readmidi.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./readmidi.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -23,7 +23,7 @@
 + #include <stdlib.h>
 + #include <errno.h>
 + 
 +-#if defined(SOLARIS) | defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + # include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-resample.c timidity/files/patch-resample.c
 --- /usr/ports/audio/timidity/files/patch-resample.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-resample.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,14 @@
 +--- ./resample.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./resample.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -22,7 +22,11 @@
 + 
 + #include <math.h>
 + #include <stdio.h>
 ++#ifdef __FreeBSD__
 ++#include <stdlib.h>
 ++#else
 + #include <malloc.h>
 ++#endif
 + 
 + #include "config.h"
 + #include "common.h"
 diff -ruN /usr/ports/audio/timidity/files/patch-timidity.c timidity/files/patch-timidity.c
 --- /usr/ports/audio/timidity/files/patch-timidity.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-timidity.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./timidity.c.orig	1996-05-21 14:16:20.000000000 -0500
 ++++ ./timidity.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -21,7 +21,7 @@
 + #include <stdio.h>
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-timidity.cfg timidity/files/patch-timidity.cfg
 --- /usr/ports/audio/timidity/files/patch-timidity.cfg	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-timidity.cfg	2013-04-21 10:20:03.000000000 -0500
 @@ -0,0 +1,31 @@
 +--- ./timidity.cfg.orig	1995-05-21 17:40:27.000000000 -0500
 ++++ ./timidity.cfg	2013-04-21 10:18:23.000000000 -0500
 +@@ -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 /usr/ports/audio/timidity/files/patch-wav2pat.c timidity/files/patch-wav2pat.c
 --- /usr/ports/audio/timidity/files/patch-wav2pat.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-wav2pat.c	2013-04-21 10:20:03.000000000 -0500
 @@ -0,0 +1,11 @@
 +--- ./wav2pat.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./wav2pat.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -28,7 +28,7 @@
 + #include <unistd.h>
 + #include <fcntl.h>
 + 
 +-#ifdef SOLARIS
 ++#if defined(SOLARIS) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 diff -ruN /usr/ports/audio/timidity/files/patch-wave_a.c timidity/files/patch-wave_a.c
 --- /usr/ports/audio/timidity/files/patch-wave_a.c	1969-12-31 18:00:00.000000000 -0600
 +++ timidity/files/patch-wave_a.c	2013-04-21 10:20:02.000000000 -0500
 @@ -0,0 +1,10 @@
 +--- ./wave_a.c.orig	1996-05-20 08:10:15.000000000 -0500
 ++++ ./wave_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -35,6 +35,7 @@
 + 
 + #ifdef __FreeBSD__
 + #include <stdio.h>
 ++#include <string.h>
 + #endif
 + 
 + #include "config.h"
 diff -ruN /usr/ports/audio/timidity/pkg-plist timidity/pkg-plist
 --- /usr/ports/audio/timidity/pkg-plist	2012-07-14 07:56:14.000000000 -0500
 +++ timidity/pkg-plist	2013-04-21 10:03:31.000000000 -0500
 @@ -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
 
 --------------060802010503000101020409--
Responsible-Changed-From-To: freebsd-ports-bugs->marino 
Responsible-Changed-By: marino 
Responsible-Changed-When: Mon Apr 21 21:30:25 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177074 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177074: commit references a PR
Date: Sat, 10 May 2014 23:40:47 +0000 (UTC)

 Author: marino
 Date: Sat May 10 23:40:37 2014
 New Revision: 353632
 URL: http://svnweb.freebsd.org/changeset/ports/353632
 QAT: https://qat.redports.org/buildarchive/r353632/
 
 Log:
   audio/timidity & guspat: Add guspat as alternative for goemon
   
   Neither port is currently maintained
   
   PR:		ports/177074
   Submitted by:	Green Dog
   Approved by:	timidity maintainer (Kevin Zheng) before he dropped it
 
 Added:
   head/audio/timidity/files/patch-Makefile   (contents, props changed)
   head/audio/timidity/files/patch-common.c   (contents, props changed)
   head/audio/timidity/files/patch-config.h   (contents, props changed)
   head/audio/timidity/files/patch-instrum.c   (contents, props changed)
   head/audio/timidity/files/patch-linux_a.c   (contents, props changed)
   head/audio/timidity/files/patch-mix.c   (contents, props changed)
   head/audio/timidity/files/patch-playmidi.c   (contents, props changed)
   head/audio/timidity/files/patch-raw_a.c   (contents, props changed)
   head/audio/timidity/files/patch-readmidi.c   (contents, props changed)
   head/audio/timidity/files/patch-resample.c   (contents, props changed)
   head/audio/timidity/files/patch-timidity.c   (contents, props changed)
   head/audio/timidity/files/patch-timidity.cfg   (contents, props changed)
   head/audio/timidity/files/patch-wav2pat.c   (contents, props changed)
   head/audio/timidity/files/patch-wave_a.c   (contents, props changed)
 Deleted:
   head/audio/timidity/files/patch-aa
   head/audio/timidity/files/patch-ab
   head/audio/timidity/files/patch-ac
   head/audio/timidity/files/patch-ae
   head/audio/timidity/files/patch-af
   head/audio/timidity/files/patch-ag
 Modified:
   head/audio/guspat/Makefile
   head/audio/timidity/Makefile
   head/audio/timidity/files/patch-dumb_c.c
   head/audio/timidity/pkg-plist
 
 Modified: head/audio/guspat/Makefile
 ==============================================================================
 --- head/audio/guspat/Makefile	Sat May 10 23:35:00 2014	(r353631)
 +++ head/audio/guspat/Makefile	Sat May 10 23:40:37 2014	(r353632)
 @@ -14,18 +14,17 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-re
  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
 -
 -WRKSRC=		${WRKDIR}/timidity
 +NO_CDROM=	Some of the patches are marked no-commercial-use
  PLIST_SUB=	TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
 +WRKSRC=		${WRKDIR}/timidity
  
  TIMIDITY_DATADIR=	share/timidity
  
 +post-patch:
 +	@${REINPLACE_CMD} -e 's|/timidity|/guspat|g' ${WRKSRC}/timidity.cfg
 +	@${RM} ${WRKSRC}/timidity.cfg.bak
 +
  do-install:
  	@${MKDIR} ${STAGEDIR}${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 Modified: head/audio/timidity/Makefile
 ==============================================================================
 --- head/audio/timidity/Makefile	Sat May 10 23:35:00 2014	(r353631)
 +++ head/audio/timidity/Makefile	Sat May 10 23:40:37 2014	(r353632)
 @@ -4,9 +4,8 @@ PORTNAME=	timidity
  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=	ports@FreeBSD.org
 @@ -17,14 +16,38 @@ CONFLICTS=	timidity++-2.13.*
  TIINS=		goemon.tgz
  INSTALL_TARGET=	install.all
  
 +OPTIONS_DEFINE=	GUSPAT
 +GUSPAT_DESC=	Use audio/guspat instead of included sound fonts (goemon)
 +
 +.include <bsd.port.options.mk>
 +
 +# Set up sound fonts from audio/guspat.
 +.if ${PORT_OPTIONS:MGUSPAT}
 +RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:${PORTSDIR}/audio/guspat
 +TDIR=		${LOCALBASE}/share/timidity
 +TCONFIG=	timidity.cfg-guspat
 +PLIST_SUB+=	GOEMON="@comment "
 +.else
 +# Set up default sound fonts (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:MGUSPAT}
  	cd ${STAGEDIR}${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>
 
 Added: head/audio/timidity/files/patch-Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-Makefile	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,100 @@
 +--- ./Makefile.orig	1996-05-26 09:26:46.000000000 +0000
 ++++ ./Makefile	2014-02-06 21:14:36.000000000 +0000
 +@@ -24,22 +24,22 @@
 + # But where to change without revealing my secret identity?
 + 
 + ########### Compiler and flags.
 +-CC = gcc
 +-DEBUGFLAGS = -Wall -O2
 ++#CC = gcc
 ++DEBUGFLAGS = -Wall
 + 
 + ########### Install.
 +-INSTALL = /usr/bin/install
 ++#INSTALL = /usr/bin/install
 + 
 + # Where to install the executable
 +-BIN_DIR = /usr/local/bin
 ++BIN_DIR = ${PREFIX}/bin
 + 
 + # Where to install the manual pages
 +-MAN_DIR = /usr/local/man/man1
 ++MAN_DIR = ${PREFIX}/man/man1
 + 
 + # Where to install the patches, config files, and MIDI files.
 + # If you change this, it's a good idea to recompile the binary,
 + # or you'll need to invoke timidity with the -L option.
 +-TIMID_DIR = /usr/local/lib/timidity
 ++TIMID_DIR = ${PREFIX}/lib/timidity
 + 
 + # Where to install the Tcl code, if you use the Tcl code that is.
 + TCL_DIR = $(TIMID_DIR)
 +@@ -112,9 +112,9 @@
 + #EXTRALIBS += -lgen
 + 
 + # Select the Tcl/Tk interface
 +-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 +-SYSEXTRAS += tk_c.c
 +-INST_TK = install.tk
 ++#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 ++#SYSEXTRAS += tk_c.c
 ++#INST_TK = install.tk
 + #EXTRAINCS +=
 + #EXTRALIBS +=
 + 
 +@@ -136,7 +136,7 @@
 + SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 + SDISTZIP = tilib$(FNSUPPVERSION).zip
 + 
 +-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 ++CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 + 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 + 
 + ########### All relevant files.. Anybody know autoconf?
 +@@ -228,10 +228,10 @@
 + wav2pat: wav2pat.c
 + 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 + 
 +-depends depend dep:
 +-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 +-
 +-include depends
 ++#depends depend dep:
 ++#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
 ++#
 ++#include depends
 + 
 + ########### Installation targets
 + 
 +@@ -249,22 +249,22 @@
 + 
 + # install.bin: $(PROJ) Dumb make thinks it has to have $(COBJS) to install...
 + install.bin:
 +-	mkdir -p $(BIN_DIR)
 +-	$(INSTALL) -s -m 755 $(PROJ) $(TOOLS) $(BIN_DIR)
 ++	mkdir -p $(DESTDIR)$(BIN_DIR)
 ++	$(INSTALL) -s -m 755 $(PROJ) $(TOOLS) $(DESTDIR)$(BIN_DIR)
 + 
 + install.man:
 +-	mkdir -p $(MAN_DIR)
 +-	$(INSTALL) -m 644 $(MANPAGES) $(MAN_DIR)
 ++	mkdir -p $(DESTDIR)$(MAN_DIR)
 ++	$(INSTALL) -m 644 $(MANPAGES) $(DESTDIR)$(MAN_DIR)
 + 
 + install.lib: install.config install.patch $(INST_TK)
 + 
 + install.config: $(CONFIGF)
 +-	mkdir -p $(TIMID_DIR)
 +-	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 ++	mkdir -p $(DESTDIR)$(TIMID_DIR)
 ++	$(INSTALL) -m 644 $(CONFIGF) $(DESTDIR)$(TIMID_DIR)
 + 
 +-install.patch: $(PATCHF)
 +-	mkdir -p $(TIMID_DIR)/patch
 +-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 ++install.patch: #$(PATCHF)
 ++#        mkdir -p $(TIMID_DIR)/patch
 ++#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 + 
 + install.tk: $(ALLTCLF)
 + 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
 
 Added: head/audio/timidity/files/patch-common.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-common.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,11 @@
 +--- ./common.c.orig	1996-06-01 07:20:19.000000000 -0500
 ++++ ./common.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -24,7 +24,7 @@
 + #include <stdio.h>
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 
 Added: head/audio/timidity/files/patch-config.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-config.h	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,25 @@
 +--- ./config.h.orig	1996-06-01 07:54:49.000000000 -0500
 ++++ ./config.h	2013-04-21 10:18:23.000000000 -0500
 +@@ -217,6 +217,22 @@
 + # endif
 + #endif /* linux */
 + 
 ++#ifdef __FreeBSD__
 ++#include <errno.h>
 ++#include <machine/endian.h>
 ++#if BYTE_ORDER == LITTLE_ENDIAN
 ++#undef BIG_ENDIAN
 ++#undef PDP_ENDIAN
 ++#elif BYTE_ORDER == BIG_ENDIAN
 ++#undef LITTLE_ENDIAN
 ++#undef PDP_ENDIAN
 ++#else
 ++# error No valid byte sex defined
 ++#endif
 ++#define USE_LDEXP
 ++#define PI M_PI
 ++#endif
 ++
 + /* Win32 on Intel machines */
 + #ifdef __WIN32__
 + #  define LITTLE_ENDIAN
 
 Modified: head/audio/timidity/files/patch-dumb_c.c
 ==============================================================================
 --- head/audio/timidity/files/patch-dumb_c.c	Sat May 10 23:35:00 2014	(r353631)
 +++ head/audio/timidity/files/patch-dumb_c.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -1,5 +1,5 @@
 ---- dumb_c.c.orig	Mon May 20 16:01:17 1996
 -+++ dumb_c.c	Tue Dec  4 23:45:01 2001
 +--- ./dumb_c.c.orig	1996-05-20 09:01:17.000000000 -0500
 ++++ ./dumb_c.c	2013-04-21 10:18:23.000000000 -0500
  @@ -66,10 +66,12 @@
     ctl_expression, ctl_panning, ctl_sustain, ctl_pitch_bend
   };
 
 Added: head/audio/timidity/files/patch-instrum.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-instrum.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,11 @@
 +--- ./instrum.c.orig	1996-05-20 08:15:10.000000000 -0500
 ++++ ./instrum.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -25,7 +25,7 @@
 + 
 + #include <stdio.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 
 Added: head/audio/timidity/files/patch-linux_a.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-linux_a.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,139 @@
 +--- ./linux_a.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./linux_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -71,12 +71,15 @@
 +    then 8-bit unsigned if it fails. If you have a sound device that
 +    can't handle either, let me know. */
 + 
 ++/* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
 ++static int luigi_driver = 0;
 ++
 + static int open_output(void)
 + {
 +   int fd, tmp, i, warnings=0;
 +   
 +   /* Open the audio device */
 +-  fd=open(dpm.name, O_RDWR | O_NDELAY);
 ++  fd=open(dpm.name, O_RDWR);
 +   if (fd<0)
 +     {
 +       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
 +@@ -84,6 +87,23 @@
 +       return -1;
 +     }
 + 
 ++  /* Figure out if we're running with the Luigi driver or
 ++     the original VoxWare driver, with code based on dburr/luigi
 ++     in ports/5607.  It'd be great if we could do this before
 ++     opening the audio device, but oh well... */
 ++#if defined(AIOGFMT)	/* only defined in Luigi driver */
 ++  {
 ++    snd_chan_param s;
 ++    int i;
 ++    i = ioctl(fd, AIOGFMT, &s);
 ++    if (i != -1)
 ++      luigi_driver = 1;
 ++  }
 ++#endif
 ++
 ++  ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
 ++	    luigi_driver ? "luigi" : "VoxWare");
 ++
 +   /* They can't mean these */
 +   dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
 + 
 +@@ -92,6 +112,29 @@
 +      the other one. */
 + 
 +   i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
 ++  if (luigi_driver)
 ++    {
 ++      if (dpm.encoding & PE_16BIT) {
 ++	int fmt = AFMT_S16_LE ;
 ++
 ++	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
 ++	    fmt = AFMT_U8 ;
 ++	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
 ++		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
 ++		      "%s doesn't support 16- or 8-bit sample width",
 ++		      dpm.name);
 ++		close(fd);
 ++		return -1;
 ++	    }
 ++	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
 ++		  "Sample width adjusted to %d bits", tmp);
 ++	    dpm.encoding ^= PE_16BIT;
 ++	    warnings = 1;
 ++	}
 ++      }
 ++    }
 ++  else
 ++    {
 +   if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
 +     {
 +       /* Try the other one */
 +@@ -109,6 +152,7 @@
 +       dpm.encoding ^= PE_16BIT;
 +       warnings=1;
 +     }
 ++    }
 +   if (dpm.encoding & PE_16BIT)
 +     dpm.encoding |= PE_SIGNED;
 +   else
 +@@ -163,6 +207,8 @@
 +   /* Set buffer fragments (in extra_param[0]) */
 +   
 +   tmp=AUDIO_BUFFER_BITS;
 ++  if (luigi_driver)
 ++    tmp += 2;
 +   if (!(dpm.encoding & PE_MONO)) tmp++;
 +   if (dpm.encoding & PE_16BIT) tmp++;
 +   tmp |= (dpm.extra_param[0]<<16);
 +@@ -189,28 +235,35 @@
 +   return warnings;
 + }
 + 
 ++/* output_data comes from Luigi's linux_a.c.  This version seems to allow
 ++   for partial writes to the sound device, where as the original version
 ++   doesn't. */
 + static void output_data(int32 *buf, int32 count)
 + {
 ++  char *p;
 ++  int res, l;
 ++  
 +   if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
 +   
 +-  if (dpm.encoding & PE_16BIT)
 +-    {
 ++  if (dpm.encoding & PE_16BIT) {
 +       /* Convert data to signed 16-bit PCM */
 +       s32tos16(buf, count);
 +-      
 +-      /* Write the data out. Linux likes to give an EINTR if you suspend
 +-	 a program while waiting on a write, so we may need to retry. */
 +-      while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
 +-	;
 +-    }
 +-  else
 +-    {
 ++      res = count*2;
 ++  } else {
 +       /* Convert to 8-bit unsigned and write out. */
 +       s32tou8(buf, count);
 +-      
 +-      while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
 +-	;
 ++      res = count;
 ++  }
 ++  for (p = (char *) buf; res > 0; res -= l) {
 ++again:
 ++    l = write(dpm.fd, p, res);
 ++    if (l < 0) {
 ++	if (errno == EINTR)
 ++		goto again;
 ++	return;
 +     }
 ++    p += l;
 ++  }
 + }
 + 
 + static void close_output(void)
 
 Added: head/audio/timidity/files/patch-mix.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-mix.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,14 @@
 +--- ./mix.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./mix.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -23,7 +23,11 @@
 + 
 + #include <math.h>
 + #include <stdio.h>
 ++#ifdef __FreeBSD__
 ++#include <stdlib.h>
 ++#else
 + #include <malloc.h>
 ++#endif
 + 
 + #include "config.h"
 + #include "common.h"
 
 Added: head/audio/timidity/files/patch-playmidi.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-playmidi.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,11 @@
 +--- ./playmidi.c.orig	1996-05-20 08:09:46.000000000 -0500
 ++++ ./playmidi.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -27,7 +27,7 @@
 + #endif
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + # include <string.h>
 + #else
 + #include <strings.h>
 
 Added: head/audio/timidity/files/patch-raw_a.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-raw_a.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,10 @@
 +--- ./raw_a.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./raw_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -35,6 +35,7 @@
 + 
 + #ifdef __FreeBSD__
 + #include <stdio.h>
 ++#include <string.h>
 + #endif
 + 
 + #include "config.h"
 
 Added: head/audio/timidity/files/patch-readmidi.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-readmidi.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,11 @@
 +--- ./readmidi.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./readmidi.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -23,7 +23,7 @@
 + #include <stdlib.h>
 + #include <errno.h>
 + 
 +-#if defined(SOLARIS) | defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + # include <string.h>
 + #else
 + #include <strings.h>
 
 Added: head/audio/timidity/files/patch-resample.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-resample.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,14 @@
 +--- ./resample.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./resample.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -22,7 +22,11 @@
 + 
 + #include <math.h>
 + #include <stdio.h>
 ++#ifdef __FreeBSD__
 ++#include <stdlib.h>
 ++#else
 + #include <malloc.h>
 ++#endif
 + 
 + #include "config.h"
 + #include "common.h"
 
 Added: head/audio/timidity/files/patch-timidity.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-timidity.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,11 @@
 +--- ./timidity.c.orig	1996-05-21 14:16:20.000000000 -0500
 ++++ ./timidity.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -21,7 +21,7 @@
 + #include <stdio.h>
 + #include <stdlib.h>
 + 
 +-#if defined(SOLARIS) || defined(__WIN32__)
 ++#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 
 Added: head/audio/timidity/files/patch-timidity.cfg
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-timidity.cfg	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,31 @@
 +--- ./timidity.cfg.orig	1995-05-21 17:40:27.000000000 -0500
 ++++ ./timidity.cfg	2013-04-21 10:18:23.000000000 -0500
 +@@ -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
 
 Added: head/audio/timidity/files/patch-wav2pat.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-wav2pat.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,11 @@
 +--- ./wav2pat.c.orig	1996-05-20 08:09:47.000000000 -0500
 ++++ ./wav2pat.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -28,7 +28,7 @@
 + #include <unistd.h>
 + #include <fcntl.h>
 + 
 +-#ifdef SOLARIS
 ++#if defined(SOLARIS) || defined(__FreeBSD__)
 + #include <string.h>
 + #else
 + #include <strings.h>
 
 Added: head/audio/timidity/files/patch-wave_a.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/timidity/files/patch-wave_a.c	Sat May 10 23:40:37 2014	(r353632)
 @@ -0,0 +1,10 @@
 +--- ./wave_a.c.orig	1996-05-20 08:10:15.000000000 -0500
 ++++ ./wave_a.c	2013-04-21 10:18:23.000000000 -0500
 +@@ -35,6 +35,7 @@
 + 
 + #ifdef __FreeBSD__
 + #include <stdio.h>
 ++#include <string.h>
 + #endif
 + 
 + #include "config.h"
 
 Modified: head/audio/timidity/pkg-plist
 ==============================================================================
 --- head/audio/timidity/pkg-plist	Sat May 10 23:35:00 2014	(r353631)
 +++ head/audio/timidity/pkg-plist	Sat May 10 23:40:37 2014	(r353632)
 @@ -1,257 +1,257 @@
  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
 
 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: marino 
State-Changed-When: Sat May 10 23:53:10 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177074 
>Unformatted:
