From a023bdc22fb2879360386279b58d96365b2d0858 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@gmail.com>
Date: Wed, 7 Dec 2016 19:34:57 -0500
Subject: [PATCH] freepats: clean template and file layout

---
 srcpkgs/freepats/files/timidity-freepats.cfg |  4 ++--
 srcpkgs/freepats/template                    | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/freepats/files/timidity-freepats.cfg b/srcpkgs/freepats/files/timidity-freepats.cfg
index 81833fe52a..550e807a39 100644
--- a/srcpkgs/freepats/files/timidity-freepats.cfg
+++ b/srcpkgs/freepats/files/timidity-freepats.cfg
@@ -1,6 +1,6 @@
-
+## Load the patchset from freepats
 dir /usr/share/timidity/freepats
-source /usr/share/timidity/freepats/freepats.cfg
+source /etc/freepats/freepats.cfg
 
 ## If you have a slow CPU, uncomment these:
 #opt EFresamp=d		#disable resampling
diff --git a/srcpkgs/freepats/template b/srcpkgs/freepats/template
index 54007040e5..392df2a8d2 100644
--- a/srcpkgs/freepats/template
+++ b/srcpkgs/freepats/template
@@ -1,7 +1,7 @@
 # Template file for 'freepats'
 pkgname="freepats"
-version="20060219"
-revision=1
+version=20060219
+revision=2
 wrksrc="${pkgname}"
 short_desc="Free patch set for MIDI audio synthesis"
 maintainer="David <kalichakra@zoho.com>"
@@ -10,11 +10,11 @@ homepage="http://freepats.zenvoid.org"
 distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
 checksum="0261ea1057b232183fa472432d5cedb0dca33698a5319328cdf193d4b2193c8a"
 
-conf_files="/usr/share/timidity/freepats/freepats.cfg"
+conf_files="/etc/freepats/freepats.cfg"
 
 do_install() {
+	vmkdir etc/freepats
 	vmkdir usr/share/examples/freepats
-	vmkdir usr/share/timidity/freepats
 	vmkdir usr/share/timidity/freepats/Drum_000
 	vmkdir usr/share/timidity/freepats/Tone_000
 
@@ -23,8 +23,11 @@ do_install() {
 	vcopy "${wrksrc}/Tone_000/*" \
 		usr/share/timidity/freepats/Tone_000
 
-	vinstall ${wrksrc}/crude.cfg 644 \
-		usr/share/timidity/freepats freepats.cfg
-	vinstall ${FILESDIR}/timidity-freepats.cfg 644 \
-		usr/share/examples/freepats
+	vinstall ${wrksrc}/crude.cfg 644 etc/freepats freepats.cfg
+	vsconf ${FILESDIR}/timidity-freepats.cfg
 }
+
+# REMARKS:
+# Timidity expects to find sound fonts under usr/share/timidity/<patchset>
+# Thus, they are put there in this case. If this needs generalization, then
+# it should work with timidity.