3 files changed, 124 insertions, 31 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 5dee6011f9b7..86773ace0eef 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.7.0
-PORTREVISION=	2
+PORTVERSION=	3.8.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index 2617bbad1933..05e3f3ca78ac 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.7.0.tar.gz) = f526ffb50b86f32e210a03f1b571e234
-SHA256 (solfege-3.7.0.tar.gz) = f043b2c367c8334aba4826596138f4567a8a1b13b3b64f9836c210d25ddd3c00
-SIZE (solfege-3.7.0.tar.gz) = 2101752
+MD5 (solfege-3.8.0.tar.gz) = ff945350828bb2b8d626bfe83efe1f62
+SHA256 (solfege-3.8.0.tar.gz) = 3d718ba0597a1b85c8bad1199eaa5d72bda356b00e7136f8d9bad8a58445c6e1
+SIZE (solfege-3.8.0.tar.gz) = 2543125
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index cc6cc433f0ff..23083d16eba4 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -6,6 +6,7 @@ share/gnome/pixmaps/solfege.png
 share/gnome/solfege/debugtree.txt
 share/gnome/solfege/default.config
 share/gnome/solfege/example-lesson-files/chord-satb
+share/gnome/solfege/example-lesson-files/example-1
 share/gnome/solfege/example-lesson-files/harmonic-progression-dictation
 share/gnome/solfege/example-lesson-files/id-by-name-1
 share/gnome/solfege/example-lesson-files/id-by-name-2
@@ -15,11 +16,6 @@ share/gnome/solfege/example-lesson-files/learn-min-major-3
 share/gnome/solfege/example-lesson-files/sing-chord
 share/gnome/solfege/example-lesson-files/very-easy-scale
 share/gnome/solfege/example-lesson-files/very-easy-scale2
-share/gnome/solfege/lesson-files/rhythmtapping2-self-config-binary
-share/gnome/solfege/lesson-files/rhythmtapping2-self-config-ternary
-share/gnome/solfege/lesson-files/tapping-all
-share/gnome/solfege/lesson-files/tapping-easy
-share/gnome/solfege/lesson-files/tapping-mid
 share/gnome/solfege/feta/feta20-accidentals--1.xpm
 share/gnome/solfege/feta/feta20-accidentals--2.xpm
 share/gnome/solfege/feta/feta20-accidentals-0.xpm
@@ -137,9 +133,7 @@ share/gnome/solfege/graphics/solfege.svg
 share/gnome/solfege/graphics/solfege.xpm
 share/gnome/solfege/graphics/test-sound.png
 share/gnome/solfege/graphics/twelve-tone.png
-share/gnome/solfege/help/C/rhythmtapping-module.html
-share/gnome/solfege/help/C/rhythmtapping2-module.html
-share/gnome/solfege/help/C/rhythmtapping2.html
+share/gnome/solfege/help-menu.xml
 share/gnome/solfege/help/C/apb.html
 share/gnome/solfege/help/C/bug-reporting.html
 share/gnome/solfege/help/C/chord-module.html
@@ -168,6 +162,7 @@ share/gnome/solfege/help/C/figures/preferences-user.png
 share/gnome/solfege/help/C/figures/rhythm.png
 share/gnome/solfege/help/C/figures/singchord.png
 share/gnome/solfege/help/C/figures/singinterval.png
+share/gnome/solfege/help/C/figures/trainingset-editor.png
 share/gnome/solfege/help/C/figures/twelvetone.png
 share/gnome/solfege/help/C/gpl-2.html
 share/gnome/solfege/help/C/gpl-3.html
@@ -202,10 +197,14 @@ share/gnome/solfege/help/C/midi-instrument-names.html
 share/gnome/solfege/help/C/music-theory.html
 share/gnome/solfege/help/C/nameinterval-module.html
 share/gnome/solfege/help/C/nameinterval.html
+share/gnome/solfege/help/C/one-big-page.html
 share/gnome/solfege/help/C/online-resources.html
 share/gnome/solfege/help/C/preferences-window.html
 share/gnome/solfege/help/C/rhythm-module.html
 share/gnome/solfege/help/C/rhythm.html
+share/gnome/solfege/help/C/rhythmtapping-module.html
+share/gnome/solfege/help/C/rhythmtapping2-module.html
+share/gnome/solfege/help/C/rhythmtapping2.html
 share/gnome/solfege/help/C/scales.html
 share/gnome/solfege/help/C/singanswer-module.html
 share/gnome/solfege/help/C/singchord-module.html
@@ -215,6 +214,7 @@ share/gnome/solfege/help/C/singinterval.html
 share/gnome/solfege/help/C/solfege-exercise-helps.html
 share/gnome/solfege/help/C/solfege-intro.html
 share/gnome/solfege/help/C/theory-intervals.html
+share/gnome/solfege/help/C/trainingset-editor.html
 share/gnome/solfege/help/C/twelvetone.html
 share/gnome/solfege/help/C/welcome.html
 share/gnome/solfege/help/fr/apb.html
@@ -264,10 +264,14 @@ share/gnome/solfege/help/fr/midi-instrument-names.html
 share/gnome/solfege/help/fr/music-theory.html
 share/gnome/solfege/help/fr/nameinterval-module.html
 share/gnome/solfege/help/fr/nameinterval.html
+share/gnome/solfege/help/fr/one-big-page.html
 share/gnome/solfege/help/fr/online-resources.html
 share/gnome/solfege/help/fr/preferences-window.html
 share/gnome/solfege/help/fr/rhythm-module.html
 share/gnome/solfege/help/fr/rhythm.html
+share/gnome/solfege/help/fr/rhythmtapping-module.html
+share/gnome/solfege/help/fr/rhythmtapping2-module.html
+share/gnome/solfege/help/fr/rhythmtapping2.html
 share/gnome/solfege/help/fr/scales.html
 share/gnome/solfege/help/fr/singanswer-module.html
 share/gnome/solfege/help/fr/singchord-module.html
@@ -277,15 +281,10 @@ share/gnome/solfege/help/fr/singinterval.html
 share/gnome/solfege/help/fr/solfege-exercise-helps.html
 share/gnome/solfege/help/fr/solfege-intro.html
 share/gnome/solfege/help/fr/theory-intervals.html
+share/gnome/solfege/help/fr/trainingset-editor.html
 share/gnome/solfege/help/fr/twelvetone.html
 share/gnome/solfege/help/fr/welcome.html
-share/gnome/solfege/help/fr/rhythmtapping2.html
-share/gnome/solfege/help/fr/rhythmtapping-module.html
-share/gnome/solfege/help/fr/rhythmtapping2-module.html
-share/gnome/solfege/help/no/rhythmtapping-module.html
-share/gnome/solfege/help/no/rhythmtapping2-module.html
 share/gnome/solfege/help/no/apb.html
-share/gnome/solfege/help/no/rhythmtapping2.html
 share/gnome/solfege/help/no/bug-reporting.html
 share/gnome/solfege/help/no/chord-module.html
 share/gnome/solfege/help/no/chord.html
@@ -332,10 +331,14 @@ share/gnome/solfege/help/no/midi-instrument-names.html
 share/gnome/solfege/help/no/music-theory.html
 share/gnome/solfege/help/no/nameinterval-module.html
 share/gnome/solfege/help/no/nameinterval.html
+share/gnome/solfege/help/no/one-big-page.html
 share/gnome/solfege/help/no/online-resources.html
 share/gnome/solfege/help/no/preferences-window.html
 share/gnome/solfege/help/no/rhythm-module.html
 share/gnome/solfege/help/no/rhythm.html
+share/gnome/solfege/help/no/rhythmtapping-module.html
+share/gnome/solfege/help/no/rhythmtapping2-module.html
+share/gnome/solfege/help/no/rhythmtapping2.html
 share/gnome/solfege/help/no/scales.html
 share/gnome/solfege/help/no/singanswer-module.html
 share/gnome/solfege/help/no/singchord-module.html
@@ -345,12 +348,75 @@ share/gnome/solfege/help/no/singinterval.html
 share/gnome/solfege/help/no/solfege-exercise-helps.html
 share/gnome/solfege/help/no/solfege-intro.html
 share/gnome/solfege/help/no/theory-intervals.html
+share/gnome/solfege/help/no/trainingset-editor.html
 share/gnome/solfege/help/no/twelvetone.html
 share/gnome/solfege/help/no/welcome.html
+share/gnome/solfege/help/pt_BR/apb.html
+share/gnome/solfege/help/pt_BR/bug-reporting.html
+share/gnome/solfege/help/pt_BR/chord-module.html
+share/gnome/solfege/help/pt_BR/chord.html
+share/gnome/solfege/help/pt_BR/compareintervals-module.html
+share/gnome/solfege/help/pt_BR/dictation-module.html
+share/gnome/solfege/help/pt_BR/dictation.html
+share/gnome/solfege/help/pt_BR/elembuilder-module.html
+share/gnome/solfege/help/pt_BR/elembuilder.html
+share/gnome/solfege/help/pt_BR/extending-solfege.html
+share/gnome/solfege/help/pt_BR/figures/chord.png
+share/gnome/solfege/help/pt_BR/figures/dictation.png
+share/gnome/solfege/help/pt_BR/figures/id-interval-buttons-thirds.png
+share/gnome/solfege/help/pt_BR/figures/id-interval-piano.png
+share/gnome/solfege/help/pt_BR/figures/idbyname-chords.png
+share/gnome/solfege/help/pt_BR/figures/identifybpm.png
+share/gnome/solfege/help/pt_BR/figures/idtone.png
+share/gnome/solfege/help/pt_BR/figures/preferences-gui.png
+share/gnome/solfege/help/pt_BR/figures/preferences-midi.png
+share/gnome/solfege/help/pt_BR/figures/preferences-practise.png
+share/gnome/solfege/help/pt_BR/figures/preferences-sound-setup.png
+share/gnome/solfege/help/pt_BR/figures/preferences-user.png
+share/gnome/solfege/help/pt_BR/figures/rhythm.png
+share/gnome/solfege/help/pt_BR/figures/singchord.png
+share/gnome/solfege/help/pt_BR/figures/singinterval.png
+share/gnome/solfege/help/pt_BR/figures/twelvetone.png
+share/gnome/solfege/help/pt_BR/gpl-2.html
+share/gnome/solfege/help/pt_BR/gpl-3.html
+share/gnome/solfege/help/pt_BR/gpl.html
+share/gnome/solfege/help/pt_BR/harmonicinterval-module.html
+share/gnome/solfege/help/pt_BR/harmonicinterval.html
+share/gnome/solfege/help/pt_BR/idbyname-chords.html
+share/gnome/solfege/help/pt_BR/idbyname-intonation.html
+share/gnome/solfege/help/pt_BR/idbyname-module.html
+share/gnome/solfege/help/pt_BR/identifybpm.html
+share/gnome/solfege/help/pt_BR/idtone-module.html
+share/gnome/solfege/help/pt_BR/idtone.html
+share/gnome/solfege/help/pt_BR/index.html
+share/gnome/solfege/help/pt_BR/inverting-intervals.html
+share/gnome/solfege/help/pt_BR/lesson-files.html
+share/gnome/solfege/help/pt_BR/melodicinterval.html
+share/gnome/solfege/help/pt_BR/melodicintervals-module.html
+share/gnome/solfege/help/pt_BR/midi-instrument-names.html
+share/gnome/solfege/help/pt_BR/music-theory.html
+share/gnome/solfege/help/pt_BR/nameinterval-module.html
+share/gnome/solfege/help/pt_BR/nameinterval.html
+share/gnome/solfege/help/pt_BR/online-resources.html
+share/gnome/solfege/help/pt_BR/preferences-window.html
+share/gnome/solfege/help/pt_BR/rhythm-module.html
+share/gnome/solfege/help/pt_BR/rhythm.html
+share/gnome/solfege/help/pt_BR/rhythmtapping-module.html
+share/gnome/solfege/help/pt_BR/rhythmtapping2-module.html
+share/gnome/solfege/help/pt_BR/rhythmtapping2.html
+share/gnome/solfege/help/pt_BR/scales.html
+share/gnome/solfege/help/pt_BR/singanswer-module.html
+share/gnome/solfege/help/pt_BR/singchord-module.html
+share/gnome/solfege/help/pt_BR/singchord.html
+share/gnome/solfege/help/pt_BR/singinterval-module.html
+share/gnome/solfege/help/pt_BR/singinterval.html
+share/gnome/solfege/help/pt_BR/solfege-exercise-helps.html
+share/gnome/solfege/help/pt_BR/solfege-intro.html
+share/gnome/solfege/help/pt_BR/theory-intervals.html
+share/gnome/solfege/help/pt_BR/trainingset-editor.html
+share/gnome/solfege/help/pt_BR/twelvetone.html
+share/gnome/solfege/help/pt_BR/welcome.html
 share/gnome/solfege/help/tr/apb.html
-share/gnome/solfege/help/tr/rhythmtapping-module.html
-share/gnome/solfege/help/tr/rhythmtapping2-module.html
-share/gnome/solfege/help/tr/rhythmtapping2.html
 share/gnome/solfege/help/tr/bug-reporting.html
 share/gnome/solfege/help/tr/chord-module.html
 share/gnome/solfege/help/tr/chord.html
@@ -397,10 +463,14 @@ share/gnome/solfege/help/tr/midi-instrument-names.html
 share/gnome/solfege/help/tr/music-theory.html
 share/gnome/solfege/help/tr/nameinterval-module.html
 share/gnome/solfege/help/tr/nameinterval.html
+share/gnome/solfege/help/tr/one-big-page.html
 share/gnome/solfege/help/tr/online-resources.html
 share/gnome/solfege/help/tr/preferences-window.html
 share/gnome/solfege/help/tr/rhythm-module.html
 share/gnome/solfege/help/tr/rhythm.html
+share/gnome/solfege/help/tr/rhythmtapping-module.html
+share/gnome/solfege/help/tr/rhythmtapping2-module.html
+share/gnome/solfege/help/tr/rhythmtapping2.html
 share/gnome/solfege/help/tr/scales.html
 share/gnome/solfege/help/tr/singanswer-module.html
 share/gnome/solfege/help/tr/singchord-module.html
@@ -410,9 +480,9 @@ share/gnome/solfege/help/tr/singinterval.html
 share/gnome/solfege/help/tr/solfege-exercise-helps.html
 share/gnome/solfege/help/tr/solfege-intro.html
 share/gnome/solfege/help/tr/theory-intervals.html
+share/gnome/solfege/help/tr/trainingset-editor.html
 share/gnome/solfege/help/tr/twelvetone.html
 share/gnome/solfege/help/tr/welcome.html
-share/gnome/solfege/help-menu.xml
 share/gnome/solfege/helpbrowser.xml
 share/gnome/solfege/learningtree.txt
 share/gnome/solfege/lesson-files/altered-1
@@ -524,6 +594,20 @@ share/gnome/solfege/lesson-files/melodic-intervals-down-9
 share/gnome/solfege/lesson-files/melodic-intervals-down-tritonus-7
 share/gnome/solfege/lesson-files/melodic-intervals-self-config
 share/gnome/solfege/lesson-files/melodic-intervals-tritonus-7
+share/gnome/solfege/lesson-files/melodic-intervals-up
+share/gnome/solfege/lesson-files/melodic-intervals-up-10
+share/gnome/solfege/lesson-files/melodic-intervals-up-2
+share/gnome/solfege/lesson-files/melodic-intervals-up-2-3
+share/gnome/solfege/lesson-files/melodic-intervals-up-2-to-8
+share/gnome/solfege/lesson-files/melodic-intervals-up-3
+share/gnome/solfege/lesson-files/melodic-intervals-up-4-5
+share/gnome/solfege/lesson-files/melodic-intervals-up-4-5-8
+share/gnome/solfege/lesson-files/melodic-intervals-up-6
+share/gnome/solfege/lesson-files/melodic-intervals-up-6-7
+share/gnome/solfege/lesson-files/melodic-intervals-up-7
+share/gnome/solfege/lesson-files/melodic-intervals-up-7-9
+share/gnome/solfege/lesson-files/melodic-intervals-up-9
+share/gnome/solfege/lesson-files/melodic-intervals-up-tritonus-7
 share/gnome/solfege/lesson-files/nameinterval-1
 share/gnome/solfege/lesson-files/nameinterval-2
 share/gnome/solfege/lesson-files/nameinterval-fifths
@@ -544,6 +628,8 @@ share/gnome/solfege/lesson-files/rhythm-mid
 share/gnome/solfege/lesson-files/rhythm-self-config-binary
 share/gnome/solfege/lesson-files/rhythm-self-config-ternary
 share/gnome/solfege/lesson-files/rhythm-ternary
+share/gnome/solfege/lesson-files/rhythmtapping2-self-config-binary
+share/gnome/solfege/lesson-files/rhythmtapping2-self-config-ternary
 share/gnome/solfege/lesson-files/sc-6tones
 share/gnome/solfege/lesson-files/sc-8tones
 share/gnome/solfege/lesson-files/sc-beb
@@ -699,6 +785,9 @@ share/gnome/solfege/lesson-files/singchord-4
 share/gnome/solfege/lesson-files/singchord-5
 share/gnome/solfege/lesson-files/singchord-6
 share/gnome/solfege/lesson-files/singchord-all
+share/gnome/solfege/lesson-files/tapping-all
+share/gnome/solfege/lesson-files/tapping-easy
+share/gnome/solfege/lesson-files/tapping-mid
 share/gnome/solfege/lesson-files/three-prog-root
 share/gnome/solfege/lesson-files/twelvetone
 share/gnome/solfege/lesson-files/two-prog-root
@@ -710,28 +799,25 @@ share/gnome/solfege/mpd/const.py
 share/gnome/solfege/mpd/duration.py
 share/gnome/solfege/mpd/engravers.py
 share/gnome/solfege/mpd/interval.py
+share/gnome/solfege/mpd/mfutils.py
 share/gnome/solfege/mpd/mpdutils.py
 share/gnome/solfege/mpd/musicalpitch.py
 share/gnome/solfege/mpd/musicdisplayer.py
 share/gnome/solfege/mpd/parser.py
+share/gnome/solfege/mpd/rat.py
 share/gnome/solfege/mpd/requests.py
-share/gnome/solfege/mpd/testsetup.py
+share/gnome/solfege/mpd/track.py
 share/gnome/solfege/solfege.gtkrc
 share/gnome/solfege/soundcard/__init__.py
 share/gnome/solfege/soundcard/fakesynth.py
-share/gnome/solfege/soundcard/mfutils.py
 share/gnome/solfege/soundcard/midifilesynth.py
 share/gnome/solfege/soundcard/oss_common.py
 share/gnome/solfege/soundcard/oss_sequencer.py
 share/gnome/solfege/soundcard/oss_sequencer2.py
-share/gnome/solfege/soundcard/rat.py
 share/gnome/solfege/soundcard/solfege_c_midi.py
 share/gnome/solfege/soundcard/soundcardexceptions.py
-share/gnome/solfege/soundcard/track.py
+share/gnome/solfege/soundcard/synth_common.py
 share/gnome/solfege/soundcard/winsynth.py
-share/gnome/solfege/soundcard/testsetup.py
-share/gnome/solfege/src/rhythmtapping.py
-share/gnome/solfege/src/rhythmtapping2.py
 share/gnome/solfege/src/__init__.py
 share/gnome/solfege/src/abstract.py
 share/gnome/solfege/src/app.py
@@ -746,6 +832,8 @@ share/gnome/solfege/src/dataparser.py
 share/gnome/solfege/src/dictation.py
 share/gnome/solfege/src/docviewer.py
 share/gnome/solfege/src/elembuilder.py
+share/gnome/solfege/src/example.py
+share/gnome/solfege/src/exceptiondialog.py
 share/gnome/solfege/src/gethomedir.py
 share/gnome/solfege/src/gpath.py
 share/gnome/solfege/src/gu.py
@@ -773,7 +861,10 @@ share/gnome/solfege/src/notenamespinbutton.py
 share/gnome/solfege/src/osutils.py
 share/gnome/solfege/src/pmwiki.py
 share/gnome/solfege/src/reportbug.py
+share/gnome/solfege/src/reportlib.py
 share/gnome/solfege/src/rhythm.py
+share/gnome/solfege/src/rhythmtapping.py
+share/gnome/solfege/src/rhythmtapping2.py
 share/gnome/solfege/src/runtime.py
 share/gnome/solfege/src/singanswer.py
 share/gnome/solfege/src/singchord.py
@@ -782,8 +873,8 @@ share/gnome/solfege/src/specialwidgets.py
 share/gnome/solfege/src/statistics.py
 share/gnome/solfege/src/statisticsviewer.py
 share/gnome/solfege/src/stock.py
-share/gnome/solfege/src/testsetup.py
 share/gnome/solfege/src/tracebackwindow.py
+share/gnome/solfege/src/trainingsetdlg.py
 share/gnome/solfege/src/tree.py
 share/gnome/solfege/src/tuner.py
 share/gnome/solfege/src/twelvetone.py
@@ -812,6 +903,7 @@ share/locale/hu/LC_MESSAGES/solfege.mo
 share/locale/it/LC_MESSAGES/solfege.mo
 share/locale/nl/LC_MESSAGES/solfege.mo
 share/locale/no/LC_MESSAGES/solfege.mo
+share/locale/pt_BR/LC_MESSAGES/solfege.mo
 share/locale/ru/LC_MESSAGES/solfege.mo
 share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
@@ -826,6 +918,8 @@ share/locale/tr/LC_MESSAGES/solfege.mo
 @dirrm share/gnome/solfege/lesson-files
 @dirrm share/gnome/solfege/help/tr/figures
 @dirrm share/gnome/solfege/help/tr
+@dirrm share/gnome/solfege/help/pt_BR/figures
+@dirrm share/gnome/solfege/help/pt_BR
 @dirrm share/gnome/solfege/help/no/figures
 @dirrm share/gnome/solfege/help/no
 @dirrm share/gnome/solfege/help/fr/figures