3 files changed, 65 insertions, 5 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index ef4e33baf17a..51fbc565a41f 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.2.1
+PORTVERSION=	3.4.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -31,7 +31,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
-CONFIGURE_ARGS=	--disable-oss-sound \
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
+		--disable-oss-sound \
 		--enable-docbook-stylesheet=${STYLESHEET}
 MAKE_ARGS=	skipmanual=YES
 
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index 8a268aef899f..dc18bcfa6558 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.2.1.tar.gz) = c0cd383696c0a0a7504bd65e54225c32
-SHA256 (solfege-3.2.1.tar.gz) = 84769132e7429f9fa928f75709a1f290639ecdfd3b02d83da94afc70a580c4c6
-SIZE (solfege-3.2.1.tar.gz) = 5144248
+MD5 (solfege-3.4.0.tar.gz) = 3ad55716c6914c0d702feef3ab830a85
+SHA256 (solfege-3.4.0.tar.gz) = d7a1e6f41be18da10289d725832f8270c36a6218977e7840b87cbdc5699aa159
+SIZE (solfege-3.4.0.tar.gz) = 1546772
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 77b29c53d785..04cd48831aec 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -137,6 +137,9 @@ share/gnome/solfege/graphics/test-sound.png
 share/gnome/solfege/graphics/twelve-tone.png
 share/gnome/solfege/help/C/apb.html
 share/gnome/solfege/help/C/bug-reporting.html
+share/gnome/solfege/help/C/ch03s02.html
+share/gnome/solfege/help/C/ch03s03.html
+share/gnome/solfege/help/C/ch03s04.html
 share/gnome/solfege/help/C/chord-module.html
 share/gnome/solfege/help/C/chord.html
 share/gnome/solfege/help/C/compareintervals-module.html
@@ -151,6 +154,7 @@ share/gnome/solfege/help/C/figures/idbyname-chords.png
 share/gnome/solfege/help/C/figures/idbyname-intonation.png
 share/gnome/solfege/help/C/figures/identifybpm.png
 share/gnome/solfege/help/C/figures/idtone.png
+share/gnome/solfege/help/C/figures/nameinterval.png
 share/gnome/solfege/help/C/figures/preferences-gui.png
 share/gnome/solfege/help/C/figures/preferences-midi.png
 share/gnome/solfege/help/C/figures/preferences-practise.png
@@ -172,6 +176,8 @@ share/gnome/solfege/help/C/identifybpm.html
 share/gnome/solfege/help/C/idtone-module.html
 share/gnome/solfege/help/C/idtone.html
 share/gnome/solfege/help/C/index.html
+share/gnome/solfege/help/C/inverting-intervals.html
+share/gnome/solfege/help/C/ly/inverting-intervals.png
 share/gnome/solfege/help/C/ly/scale-aeolian.png
 share/gnome/solfege/help/C/ly/scale-dorian-bebop.png
 share/gnome/solfege/help/C/ly/scale-dorian.png
@@ -188,10 +194,27 @@ share/gnome/solfege/help/C/ly/theory-intervals-1.png
 share/gnome/solfege/help/C/ly/theory-intervals-2.png
 share/gnome/solfege/help/C/ly/theory-intervals-3.png
 share/gnome/solfege/help/C/ly/theory-intervals-4.png
+share/gnome/solfege/help/C/ly/theory-intervals-5.png
+share/gnome/solfege/help/C/ly/theory-intervals-6.png
+share/gnome/solfege/help/C/ly/theory-intervals-fifths-1.png
+share/gnome/solfege/help/C/ly/theory-intervals-fifths-2.png
+share/gnome/solfege/help/C/ly/theory-intervals-fifths.png
+share/gnome/solfege/help/C/ly/theory-intervals-fourths.png
+share/gnome/solfege/help/C/ly/theory-intervals-seconds-1.png
+share/gnome/solfege/help/C/ly/theory-intervals-seconds-2.png
+share/gnome/solfege/help/C/ly/theory-intervals-seconds-3.png
+share/gnome/solfege/help/C/ly/theory-intervals-seconds.png
+share/gnome/solfege/help/C/ly/theory-intervals-sevenths.png
+share/gnome/solfege/help/C/ly/theory-intervals-sixths.png
+share/gnome/solfege/help/C/ly/theory-intervals-thirds-1.png
+share/gnome/solfege/help/C/ly/theory-intervals-thirds-2.png
+share/gnome/solfege/help/C/ly/theory-intervals-thirds.png
 share/gnome/solfege/help/C/melodicinterval.html
 share/gnome/solfege/help/C/melodicintervals-module.html
 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/online-resources.html
 share/gnome/solfege/help/C/preferences-window.html
 share/gnome/solfege/help/C/rhythm-module.html
@@ -204,6 +227,7 @@ share/gnome/solfege/help/C/singinterval-module.html
 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/twelvetone.html
 share/gnome/solfege/help/C/welcome.html
 share/gnome/solfege/help/fr/apb.html
@@ -243,10 +267,13 @@ share/gnome/solfege/help/fr/identifybpm.html
 share/gnome/solfege/help/fr/idtone-module.html
 share/gnome/solfege/help/fr/idtone.html
 share/gnome/solfege/help/fr/index.html
+share/gnome/solfege/help/fr/inverting-intervals.html
 share/gnome/solfege/help/fr/melodicinterval.html
 share/gnome/solfege/help/fr/melodicintervals-module.html
 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/online-resources.html
 share/gnome/solfege/help/fr/preferences-window.html
 share/gnome/solfege/help/fr/rhythm-module.html
@@ -298,10 +325,13 @@ share/gnome/solfege/help/no/identifybpm.html
 share/gnome/solfege/help/no/idtone-module.html
 share/gnome/solfege/help/no/idtone.html
 share/gnome/solfege/help/no/index.html
+share/gnome/solfege/help/no/inverting-intervals.html
 share/gnome/solfege/help/no/melodicinterval.html
 share/gnome/solfege/help/no/melodicintervals-module.html
 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/online-resources.html
 share/gnome/solfege/help/no/preferences-window.html
 share/gnome/solfege/help/no/rhythm-module.html
@@ -353,10 +383,13 @@ share/gnome/solfege/help/tr/identifybpm.html
 share/gnome/solfege/help/tr/idtone-module.html
 share/gnome/solfege/help/tr/idtone.html
 share/gnome/solfege/help/tr/index.html
+share/gnome/solfege/help/tr/inverting-intervals.html
 share/gnome/solfege/help/tr/melodicinterval.html
 share/gnome/solfege/help/tr/melodicintervals-module.html
 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/online-resources.html
 share/gnome/solfege/help/tr/preferences-window.html
 share/gnome/solfege/help/tr/rhythm-module.html
@@ -371,6 +404,7 @@ share/gnome/solfege/help/tr/solfege-exercise-helps.html
 share/gnome/solfege/help/tr/solfege-intro.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
@@ -461,8 +495,31 @@ share/gnome/solfege/lesson-files/melodic-intervals-6-7
 share/gnome/solfege/lesson-files/melodic-intervals-7
 share/gnome/solfege/lesson-files/melodic-intervals-7-9
 share/gnome/solfege/lesson-files/melodic-intervals-9
+share/gnome/solfege/lesson-files/melodic-intervals-down
+share/gnome/solfege/lesson-files/melodic-intervals-down-10
+share/gnome/solfege/lesson-files/melodic-intervals-down-2
+share/gnome/solfege/lesson-files/melodic-intervals-down-2-3
+share/gnome/solfege/lesson-files/melodic-intervals-down-3
+share/gnome/solfege/lesson-files/melodic-intervals-down-4-5
+share/gnome/solfege/lesson-files/melodic-intervals-down-4-5-8
+share/gnome/solfege/lesson-files/melodic-intervals-down-6
+share/gnome/solfege/lesson-files/melodic-intervals-down-6-7
+share/gnome/solfege/lesson-files/melodic-intervals-down-7
+share/gnome/solfege/lesson-files/melodic-intervals-down-7-9
+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/nameinterval-1
+share/gnome/solfege/lesson-files/nameinterval-2
+share/gnome/solfege/lesson-files/nameinterval-fifths
+share/gnome/solfege/lesson-files/nameinterval-fourths
+share/gnome/solfege/lesson-files/nameinterval-octave
+share/gnome/solfege/lesson-files/nameinterval-seconds
+share/gnome/solfege/lesson-files/nameinterval-sevenths
+share/gnome/solfege/lesson-files/nameinterval-sixths
+share/gnome/solfege/lesson-files/nameinterval-thirds
+share/gnome/solfege/lesson-files/nameinterval-unison
 share/gnome/solfege/lesson-files/progression-1
 share/gnome/solfege/lesson-files/progression-2
 share/gnome/solfege/lesson-files/progression-atte
@@ -557,6 +614,7 @@ share/gnome/solfege/src/dictation.py
 share/gnome/solfege/src/docviewer.py
 share/gnome/solfege/src/example.py
 share/gnome/solfege/src/gethomedir.py
+share/gnome/solfege/src/gpath.py
 share/gnome/solfege/src/gu.py
 share/gnome/solfege/src/harmonicinterval.py
 share/gnome/solfege/src/harmonicprogressiondictation.py
@@ -577,6 +635,7 @@ share/gnome/solfege/src/lessonfilegui.py
 share/gnome/solfege/src/mainwin.py
 share/gnome/solfege/src/melodicinterval.py
 share/gnome/solfege/src/multipleintervalconfigwidget.py
+share/gnome/solfege/src/nameinterval.py
 share/gnome/solfege/src/notenamespinbutton.py
 share/gnome/solfege/src/osutils.py
 share/gnome/solfege/src/pmwiki.py