3 files changed, 202 insertions, 7 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index dad05c493791..8eb111cd5ade 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -8,12 +8,12 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.14.0
+PORTVERSION=	3.15.1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-nosound
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Free eartraining software
 
 BUILD_DEPENDS=	${STYLESHEET}:${PORTSDIR}/textproc/docbook-xsl \
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index 932a90e46dc7..103cd813c6bf 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.14.0.tar.gz) = ce76658c3f6843a6bb1ae6baff190a6a
-SHA256 (solfege-3.14.0.tar.gz) = c4c0653a934406ab9ff260e9c28a9241f915de4e1e952d7172a0946562e69aa3
-SIZE (solfege-3.14.0.tar.gz) = 3777866
+MD5 (solfege-3.15.1.tar.gz) = 1de54f61d2cf494dd9b8ca59a811f478
+SHA256 (solfege-3.15.1.tar.gz) = fceaeebaeaa8d3b181729b991df4613deba5b588ff1f22d6b4d8c7c74592924c
+SIZE (solfege-3.15.1.tar.gz) = 4322625
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index d646c7767dbe..f5a9f2295419 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -5,6 +5,7 @@ share/locale/cs/LC_MESSAGES/solfege.mo
 share/locale/da/LC_MESSAGES/solfege.mo
 share/locale/de/LC_MESSAGES/solfege.mo
 share/locale/es/LC_MESSAGES/solfege.mo
+share/locale/fi/LC_MESSAGES/solfege.mo
 share/locale/fr/LC_MESSAGES/solfege.mo
 share/locale/gl/LC_MESSAGES/solfege.mo
 share/locale/hu/LC_MESSAGES/solfege.mo
@@ -199,6 +200,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/C/index.html
 %%DATADIR%%/help/C/inverting-intervals.html
 %%DATADIR%%/help/C/lesson-files.html
+%%DATADIR%%/help/C/one-big-page.html
 %%DATADIR%%/help/C/ly/inverting-intervals.png
 %%DATADIR%%/help/C/ly/theory-intervals-1.png
 %%DATADIR%%/help/C/ly/theory-intervals-fifths-1.png
@@ -548,6 +550,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/fr/nameinterval-module.html
 %%DATADIR%%/help/fr/nameinterval.html
 %%DATADIR%%/help/fr/online-resources.html
+%%DATADIR%%/help/fr/one-big-page.html
 %%DATADIR%%/help/fr/preferences-window.html
 %%DATADIR%%/help/fr/rhythm-module.html
 %%DATADIR%%/help/fr/rhythm.html
@@ -599,6 +602,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/gl/music-theory.html
 %%DATADIR%%/help/gl/nameinterval-module.html
 %%DATADIR%%/help/gl/nameinterval.html
+%%DATADIR%%/help/gl/one-big-page.html
 %%DATADIR%%/help/gl/online-resources.html
 %%DATADIR%%/help/gl/preferences-window.html
 %%DATADIR%%/help/gl/rhythm-module.html
@@ -669,6 +673,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/nb/nameinterval-module.html
 %%DATADIR%%/help/nb/nameinterval.html
 %%DATADIR%%/help/nb/online-resources.html
+%%DATADIR%%/help/nb/one-big-page.html
 %%DATADIR%%/help/nb/preferences-window.html
 %%DATADIR%%/help/nb/rhythm-module.html
 %%DATADIR%%/help/nb/rhythm.html
@@ -687,6 +692,58 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/nb/trainingset-editor.html
 %%DATADIR%%/help/nb/twelvetone.html
 %%DATADIR%%/help/nb/welcome.html
+%%DATADIR%%/help/nl/appendix-not-documentation.html
+%%DATADIR%%/help/nl/bug-reporting.html
+%%DATADIR%%/help/nl/chord-module.html
+%%DATADIR%%/help/nl/chord.html
+%%DATADIR%%/help/nl/compareintervals-module.html
+%%DATADIR%%/help/nl/dictation-module.html
+%%DATADIR%%/help/nl/dictation.html
+%%DATADIR%%/help/nl/ear-training-test-printout-editor.html
+%%DATADIR%%/help/nl/elembuilder-module.html
+%%DATADIR%%/help/nl/elembuilder.html
+%%DATADIR%%/help/nl/extending-solfege.html
+%%DATADIR%%/help/nl/gpl.html
+%%DATADIR%%/help/nl/harmonicinterval-module.html
+%%DATADIR%%/help/nl/harmonicinterval.html
+%%DATADIR%%/help/nl/idbyname-cadences.html
+%%DATADIR%%/help/nl/idbyname-chords.html
+%%DATADIR%%/help/nl/idbyname-intonation.html
+%%DATADIR%%/help/nl/idbyname-module.html
+%%DATADIR%%/help/nl/identifybpm.html
+%%DATADIR%%/help/nl/idproperty-module.html
+%%DATADIR%%/help/nl/idproperty.html
+%%DATADIR%%/help/nl/idtone-module.html
+%%DATADIR%%/help/nl/idtone.html
+%%DATADIR%%/help/nl/index.html
+%%DATADIR%%/help/nl/inverting-intervals.html
+%%DATADIR%%/help/nl/lesson-files.html
+%%DATADIR%%/help/nl/melodicinterval-module.html
+%%DATADIR%%/help/nl/melodicinterval.html
+%%DATADIR%%/help/nl/midi-instrument-names.html
+%%DATADIR%%/help/nl/mpd-module.html
+%%DATADIR%%/help/nl/music-theory.html
+%%DATADIR%%/help/nl/nameinterval-module.html
+%%DATADIR%%/help/nl/nameinterval.html
+%%DATADIR%%/help/nl/online-resources.html
+%%DATADIR%%/help/nl/preferences-window.html
+%%DATADIR%%/help/nl/rhythm-module.html
+%%DATADIR%%/help/nl/rhythm.html
+%%DATADIR%%/help/nl/rhythmtapping-module.html
+%%DATADIR%%/help/nl/rhythmtapping2-module.html
+%%DATADIR%%/help/nl/rhythmtapping2.html
+%%DATADIR%%/help/nl/scales.html
+%%DATADIR%%/help/nl/singanswer-module.html
+%%DATADIR%%/help/nl/singchord-module.html
+%%DATADIR%%/help/nl/singchord.html
+%%DATADIR%%/help/nl/singinterval-module.html
+%%DATADIR%%/help/nl/singinterval.html
+%%DATADIR%%/help/nl/solfege-exercise-helps.html
+%%DATADIR%%/help/nl/solfege-intro.html
+%%DATADIR%%/help/nl/theory-intervals.html
+%%DATADIR%%/help/nl/trainingset-editor.html
+%%DATADIR%%/help/nl/twelvetone.html
+%%DATADIR%%/help/nl/welcome.html
 %%DATADIR%%/help/pt_BR/appendix-not-documentation.html
 %%DATADIR%%/help/pt_BR/bug-reporting.html
 %%DATADIR%%/help/pt_BR/chord-module.html
@@ -737,6 +794,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/pt_BR/nameinterval-module.html
 %%DATADIR%%/help/pt_BR/nameinterval.html
 %%DATADIR%%/help/pt_BR/online-resources.html
+%%DATADIR%%/help/pt_BR/one-big-page.html
 %%DATADIR%%/help/pt_BR/preferences-window.html
 %%DATADIR%%/help/pt_BR/rhythm-module.html
 %%DATADIR%%/help/pt_BR/rhythm.html
@@ -789,6 +847,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/ru/nameinterval-module.html
 %%DATADIR%%/help/ru/nameinterval.html
 %%DATADIR%%/help/ru/online-resources.html
+%%DATADIR%%/help/ru/one-big-page.html
 %%DATADIR%%/help/ru/preferences-window.html
 %%DATADIR%%/help/ru/rhythm-module.html
 %%DATADIR%%/help/ru/rhythm.html
@@ -859,6 +918,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/help/tr/nameinterval-module.html
 %%DATADIR%%/help/tr/nameinterval.html
 %%DATADIR%%/help/tr/online-resources.html
+%%DATADIR%%/help/tr/one-big-page.html
 %%DATADIR%%/help/tr/preferences-window.html
 %%DATADIR%%/help/tr/rhythm-module.html
 %%DATADIR%%/help/tr/rhythm.html
@@ -1085,6 +1145,134 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/csound-intonation-p5-5cent
 %%DATADIR%%/lesson-files/csound-intonation-p5-6cent
 %%DATADIR%%/lesson-files/csound-intonation-p5-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-M7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-M7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-harmonic-m7-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m2-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m3-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m6-8cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-10cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-15cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-20cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-30cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-40cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-5cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-6cent
+%%DATADIR%%/lesson-files/csound-intonation-m7-8cent
 %%DATADIR%%/lesson-files/diatonic-1
 %%DATADIR%%/lesson-files/diatonic-2
 %%DATADIR%%/lesson-files/fifth-small-pure-0.99
@@ -1359,6 +1547,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/lesson-files/solfa-17-C
 %%DATADIR%%/lesson-files/solfa-7
 %%DATADIR%%/lesson-files/solfa-7-C
+%%DATADIR%%/lesson-files/solfa-interval-1
 %%DATADIR%%/lesson-files/tapping-all
 %%DATADIR%%/lesson-files/tapping-easy
 %%DATADIR%%/lesson-files/tapping-mid
@@ -1419,6 +1608,7 @@ share/pixmaps/solfege.png
 %%DATADIR%%/regression-lesson-files/idbyname-mediafiles
 %%DATADIR%%/regression-lesson-files/idbyname-missing-.wav-file
 %%DATADIR%%/regression-lesson-files/idbyname-noquestionsinfile
+%%DATADIR%%/regression-lesson-files/idbyname-progressionlabel
 %%DATADIR%%/regression-lesson-files/idbyname-syntax-error-1
 %%DATADIR%%/regression-lesson-files/idbyname-syntax-error-2
 %%DATADIR%%/regression-lesson-files/idbyname-unsupported-named-block
@@ -1496,14 +1686,14 @@ share/pixmaps/solfege.png
 %%DATADIR%%/src/compareintervals.pyc
 %%DATADIR%%/src/configwindow.py
 %%DATADIR%%/src/configwindow.pyc
+%%DATADIR%%/src/const.py
+%%DATADIR%%/src/const.pyc
 %%DATADIR%%/src/dataparser.py
 %%DATADIR%%/src/dataparser.pyc
 %%DATADIR%%/src/dictation.py
 %%DATADIR%%/src/dictation.pyc
 %%DATADIR%%/src/elembuilder.py
 %%DATADIR%%/src/elembuilder.pyc
-%%DATADIR%%/src/example.py
-%%DATADIR%%/src/example.pyc
 %%DATADIR%%/src/exceptiondialog.py
 %%DATADIR%%/src/exceptiondialog.pyc
 %%DATADIR%%/src/filesystem.py
@@ -1538,6 +1728,8 @@ share/pixmaps/solfege.png
 %%DATADIR%%/src/instrumentselector.pyc
 %%DATADIR%%/src/languages.py
 %%DATADIR%%/src/languages.pyc
+%%DATADIR%%/src/learningtree.py
+%%DATADIR%%/src/learningtree.pyc
 %%DATADIR%%/src/learning_tree_editor.py
 %%DATADIR%%/src/learning_tree_editor.pyc
 %%DATADIR%%/src/lessonfile.py
@@ -1556,6 +1748,8 @@ share/pixmaps/solfege.png
 %%DATADIR%%/src/nameinterval.pyc
 %%DATADIR%%/src/notenamespinbutton.py
 %%DATADIR%%/src/notenamespinbutton.pyc
+%%DATADIR%%/src/optionparser.py
+%%DATADIR%%/src/optionparser.pyc
 %%DATADIR%%/src/osutils.py
 %%DATADIR%%/src/osutils.pyc
 %%DATADIR%%/src/pmwiki.py
@@ -1640,6 +1834,7 @@ share/pixmaps/solfege.png
 @dirrm %%DATADIR%%/help/pt_BR
 @dirrm %%DATADIR%%/help/nb/figures
 @dirrm %%DATADIR%%/help/nb
+@dirrm %%DATADIR%%/help/nl
 @dirrm %%DATADIR%%/help/gl
 @dirrm %%DATADIR%%/help/fr/figures
 @dirrm %%DATADIR%%/help/fr