6 files changed, 38 insertions, 34 deletions
diff --git a/academic/solfege/Makefile.in_fix_solfege3.14.7.patch b/academic/solfege/Makefile.in_fix_solfege3.14.7.patch
deleted file mode 100644
index 8fa785fc1f6f..000000000000
--- a/academic/solfege/Makefile.in_fix_solfege3.14.7.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch generated 20090609 by Phillip Warner <pc_warner@yahoo.com>
-Permission granted to use this patch as you see fit.
-
---- solfege-3.14.4.orig/Makefile.in	2009-06-09 05:48:10.000000000 -0500
-+++ solfege-3.14.4/Makefile.in	2009-06-09 23:55:48.000000000 -0500
-@@ -102,13 +102,6 @@
- -include debian-dir/Makefile
- -include debian/Makefile
- 
--%.1: %.1.txt
--	txt2man -r "GNU Solfege @VERSION@" -t Solfege -s 1 $< > $@
--
--# We need src/_version.py because solfege imports it at runtime.
--solfege.1: solfege.1.txt src/_version.py
--	LANGUAGE=C $(PYTHON) -c "import tools.buildutil; tools.buildutil.create_manpage()" | txt2man -t Solfege -s 1 > $@
--
- # Unfortunately we still have to manually convert from html to pdf
- # using openoffice and "Save as PDF"
- prepare-rsync-manual: $(foreach lang,$(USER_MANUAL_LANGUAGES),help/$(lang)/one-big-page.html) help/C/one-big-page.html
diff --git a/academic/solfege/Makefile.in_fix_solfege3.22.0.patch b/academic/solfege/Makefile.in_fix_solfege3.22.0.patch
new file mode 100644
index 000000000000..4989d14f61e0
--- /dev/null
+++ b/academic/solfege/Makefile.in_fix_solfege3.22.0.patch
@@ -0,0 +1,17 @@
+diff -Naur solfege-3.22.0-orig/Makefile.in solfege-3.22.0/Makefile.in
+--- solfege-3.22.0-orig/Makefile.in	2013-05-25 18:07:56.000000000 -0400
++++ solfege-3.22.0/Makefile.in	2013-09-07 10:12:15.833153860 -0400
+@@ -106,13 +106,6 @@
+ -include debian-dir/Makefile
+ -include debian/Makefile
+ 
+-%.1: %.1.txt
+-	txt2man -r "GNU Solfege @VERSION@" -t Solfege -s 1 $< > $@
+-
+-# We need solfege/_version.py because solfege imports it at runtime.
+-solfege.1: solfege.1.txt solfege/_version.py
+-	LANGUAGE=C $(PYTHON) -c "import tools.buildutil; tools.buildutil.create_manpage()" | txt2man -t Solfege -s 1 > $@
+-
+ rsync-manual: $(foreach lang,$(USER_MANUAL_LANGUAGES),help/$(lang)/one-big-page.html) help/C/one-big-page.html
+ 	rm -rf tmp-build
+ 	make prefix=`pwd`/tmp-build
diff --git a/academic/solfege/README b/academic/solfege/README
index 6ddcf3e93020..de9342734467 100644
--- a/academic/solfege/README
+++ b/academic/solfege/README
@@ -9,6 +9,9 @@ Features
     * Sing the intervals the computer asks for
     * Identify chords
     * Sing chords
+    * Sing tone from chords: root, third, fifth, etc
     * Scales
     * Dictation
     * Remembering rhythmic patterns 
+    * Theory: name intervals and scales
+    * Cadences
diff --git a/academic/solfege/solfege.1 b/academic/solfege/solfege.1
index f7008ea80557..8fd837df52e2 100644
--- a/academic/solfege/solfege.1
+++ b/academic/solfege/solfege.1
@@ -1,5 +1,5 @@
-." Text automatically generated by txt2man
-.TH Solfege 1 "06 June 2009" "" ""
+.\"Text automatically generated by txt2man
+.TH Solfege 1 "May 27, 2013" "GNU Solfege 22.0" ""
 .SH NAME
 \fBsolfege \fP- GPL'ed ear training software
 .SH SYNOPSIS
@@ -47,6 +47,9 @@ porting.
 \fB--debug\fP
 Include features used by the Solfege developers to
 debug the program.
+\fB--debug-level\fP=DEBUG_LEVEL
+Valid debug values are: debug, info, warning, error,
+critical
 .TP
 .B
 \fB--disable-exception-handler\fP
@@ -59,19 +62,19 @@ For debugging only: Select questions from lesson files
 in sequential order.
 .TP
 .B
-\fB--enable-gtkhtml\fP
-Run using gtkhtml2 instead of the built in HTML
-viewer.
+\fB--show-gtk-warnings\fP
+Show GtkWarnings and PangoWarnings in the traceback
+window.
 .TP
 .B
-\fB--no-cairo-widgets\fP
-Do not use the cairo version of input widgets, even if
-we run gtk+ 2.8.0 or newer.
+\fB-P\fP PROFILE
+Start with <profile>. Create the profile if it does
+not exist.
 .TP
 .B
-\fB--show-gtk-warnings\fP
-Show GtkWarnings and PangoWarnings in the traceback
-window.
+\fB--make-screenshots\fP
+Create or update the screenshots for the user manual.
+Intended for developers of this program.
 .RE
 .PP
 
diff --git a/academic/solfege/solfege.SlackBuild b/academic/solfege/solfege.SlackBuild
index f8ff86c755da..947bd35b43f6 100644
--- a/academic/solfege/solfege.SlackBuild
+++ b/academic/solfege/solfege.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=solfege
-VERSION=${VERSION:-3.14.7}
+VERSION=${VERSION:-3.22.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/solfege/solfege.info b/academic/solfege/solfege.info
index 73b0ba7a28f5..6006a035a430 100644
--- a/academic/solfege/solfege.info
+++ b/academic/solfege/solfege.info
@@ -1,8 +1,8 @@
 PRGNAM="solfege"
-VERSION="3.14.7"
+VERSION="3.22.0"
 HOMEPAGE="http://www.solfege.org/"
-DOWNLOAD="http://downloads.sourceforge.net/solfege/solfege-3.14.7.tar.gz"
-MD5SUM="404dff8fddb0b8325f02e922620222a3"
+DOWNLOAD="http://downloads.sourceforge.net/solfege/solfege-3.22.0.tar.gz"
+MD5SUM="8a5275d6db3ff181068441d7e32ad7f3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="TiMidity++ freepats"