Update to 3.0.1

PR:		86673
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 126 insertions, 59 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 8eeea45e8d11..9ecc6e85bc11 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -7,17 +7,17 @@
 #
 
 PORTNAME=	solfege
-PORTVERSION=	2.4.0
+PORTVERSION=	3.0.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-nosound
-DISTNAME=	${PORTNAME}-easybuild-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free eartraining software
 
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		swig:${PORTSDIR}/devel/swig13
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomeextras
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index d162559b7ddb..cc51ef18910b 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,2 +1,2 @@
-MD5 (solfege-easybuild-2.4.0.tar.gz) = 0ba23ec6471a5589f0db2f40310584ee
-SIZE (solfege-easybuild-2.4.0.tar.gz) = 786406
+MD5 (solfege-3.0.1.tar.gz) = 8e4b8b4d8ce653cd9cb214a1c49f8ff9
+SIZE (solfege-3.0.1.tar.gz) = 784141
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 7b3da11a23e4..2b44be2215a0 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -8,7 +8,12 @@ share/gnome/solfege/example-lesson-files/chord-satb
 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
+share/gnome/solfege/example-lesson-files/learn-min-major-1
+share/gnome/solfege/example-lesson-files/learn-min-major-2
+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/feta/feta20-accidentals--1.xpm
 share/gnome/solfege/feta/feta20-accidentals--2.xpm
 share/gnome/solfege/feta/feta20-accidentals-0.xpm
@@ -116,12 +121,13 @@ share/gnome/solfege/graphics/solfege.png
 share/gnome/solfege/graphics/solfege.xpm
 share/gnome/solfege/graphics/test-sound.png
 share/gnome/solfege/graphics/twelve-tone.png
+share/gnome/solfege/learningtree.txt
 share/gnome/solfege/lesson-files/altered-1
 share/gnome/solfege/lesson-files/altered-2
-share/gnome/solfege/lesson-files/atonal-1
 share/gnome/solfege/lesson-files/barnesanger
 share/gnome/solfege/lesson-files/besifring
 share/gnome/solfege/lesson-files/bin/csound-play-harmonic-interval.sh
+share/gnome/solfege/lesson-files/bpm
 share/gnome/solfege/lesson-files/chord-7b9-maj79
 share/gnome/solfege/lesson-files/chord-all
 share/gnome/solfege/lesson-files/chord-all-inv
@@ -139,6 +145,8 @@ share/gnome/solfege/lesson-files/chord-min-major-7
 share/gnome/solfege/lesson-files/chord-min-major-close-open
 share/gnome/solfege/lesson-files/chord-min-major-inv
 share/gnome/solfege/lesson-files/chord-min-major-inv-not
+share/gnome/solfege/lesson-files/chord-voicing-test
+share/gnome/solfege/lesson-files/compare-intervals
 share/gnome/solfege/lesson-files/csound-fifth-0.97
 share/gnome/solfege/lesson-files/csound-fifth-0.98
 share/gnome/solfege/lesson-files/csound-fifth-0.99
@@ -151,12 +159,57 @@ share/gnome/solfege/lesson-files/diatonic-2
 share/gnome/solfege/lesson-files/durmoll
 share/gnome/solfege/lesson-files/fifth-small-pure-0.99
 share/gnome/solfege/lesson-files/harmonic-intervals
+share/gnome/solfege/lesson-files/harmonic-intervals-10
+share/gnome/solfege/lesson-files/harmonic-intervals-2
+share/gnome/solfege/lesson-files/harmonic-intervals-2-3
+share/gnome/solfege/lesson-files/harmonic-intervals-3
+share/gnome/solfege/lesson-files/harmonic-intervals-4-5
+share/gnome/solfege/lesson-files/harmonic-intervals-4-5-8
+share/gnome/solfege/lesson-files/harmonic-intervals-6
+share/gnome/solfege/lesson-files/harmonic-intervals-6-7
+share/gnome/solfege/lesson-files/harmonic-intervals-7
+share/gnome/solfege/lesson-files/harmonic-intervals-7-9
+share/gnome/solfege/lesson-files/harmonic-intervals-9
+share/gnome/solfege/lesson-files/harmonic-intervals-self-config
+share/gnome/solfege/lesson-files/harmonic-intervals-tritonus-7
+share/gnome/solfege/lesson-files/id-tone
+share/gnome/solfege/lesson-files/id-tone-cde-10
+share/gnome/solfege/lesson-files/id-tone-cde-11
+share/gnome/solfege/lesson-files/id-tone-cde-12
+share/gnome/solfege/lesson-files/id-tone-cde-3
+share/gnome/solfege/lesson-files/id-tone-cde-4
+share/gnome/solfege/lesson-files/id-tone-cde-5
+share/gnome/solfege/lesson-files/id-tone-cde-6
+share/gnome/solfege/lesson-files/id-tone-cde-7
+share/gnome/solfege/lesson-files/id-tone-cde-8
+share/gnome/solfege/lesson-files/id-tone-cde-9
 share/gnome/solfege/lesson-files/jsb-inventions
+share/gnome/solfege/lesson-files/melodic-intervals
+share/gnome/solfege/lesson-files/melodic-intervals-10
+share/gnome/solfege/lesson-files/melodic-intervals-2
+share/gnome/solfege/lesson-files/melodic-intervals-2-3
+share/gnome/solfege/lesson-files/melodic-intervals-2int-2-3
+share/gnome/solfege/lesson-files/melodic-intervals-3
+share/gnome/solfege/lesson-files/melodic-intervals-4-5
+share/gnome/solfege/lesson-files/melodic-intervals-4-5-8
+share/gnome/solfege/lesson-files/melodic-intervals-6
+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-self-config
+share/gnome/solfege/lesson-files/melodic-intervals-tritonus-7
 share/gnome/solfege/lesson-files/progression-1
 share/gnome/solfege/lesson-files/progression-2
 share/gnome/solfege/lesson-files/progression-atte
 share/gnome/solfege/lesson-files/progression-x
+share/gnome/solfege/lesson-files/rhythm-all
+share/gnome/solfege/lesson-files/rhythm-easy
+share/gnome/solfege/lesson-files/rhythm-mid
+share/gnome/solfege/lesson-files/rhythm-self-config
 share/gnome/solfege/lesson-files/scales
+share/gnome/solfege/lesson-files/scales-all
+share/gnome/solfege/lesson-files/scales-bebop
 share/gnome/solfege/lesson-files/scales-thirds
 share/gnome/solfege/lesson-files/share/fanfare.midi
 share/gnome/solfege/lesson-files/share/fifth-pure-220.00.wav
@@ -168,6 +221,20 @@ share/gnome/solfege/lesson-files/share/fifth-small-293.33.wav
 share/gnome/solfege/lesson-files/share/fil1.orc
 share/gnome/solfege/lesson-files/share/fil1.sco
 share/gnome/solfege/lesson-files/sing-chord-tone
+share/gnome/solfege/lesson-files/sing-intervals
+share/gnome/solfege/lesson-files/sing-intervals-10
+share/gnome/solfege/lesson-files/sing-intervals-2
+share/gnome/solfege/lesson-files/sing-intervals-2-3
+share/gnome/solfege/lesson-files/sing-intervals-3
+share/gnome/solfege/lesson-files/sing-intervals-4-5
+share/gnome/solfege/lesson-files/sing-intervals-4-5-8
+share/gnome/solfege/lesson-files/sing-intervals-6
+share/gnome/solfege/lesson-files/sing-intervals-6-7
+share/gnome/solfege/lesson-files/sing-intervals-7
+share/gnome/solfege/lesson-files/sing-intervals-7-9
+share/gnome/solfege/lesson-files/sing-intervals-9
+share/gnome/solfege/lesson-files/sing-intervals-self-config
+share/gnome/solfege/lesson-files/sing-intervals-tritonus-7
 share/gnome/solfege/lesson-files/sing-the-fifth
 share/gnome/solfege/lesson-files/sing-the-root
 share/gnome/solfege/lesson-files/sing-the-seventh
@@ -180,6 +247,7 @@ 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/three-prog-root
+share/gnome/solfege/lesson-files/twelvetone
 share/gnome/solfege/lesson-files/two-prog-root
 share/gnome/solfege/lesson-files/volkslieder1
 share/gnome/solfege/lesson-files/volkslieder2
@@ -194,37 +262,36 @@ share/gnome/solfege/mpd/musicalpitch.py
 share/gnome/solfege/mpd/musicdisplayer.py
 share/gnome/solfege/mpd/parser.py
 share/gnome/solfege/mpd/requests.py
-share/gnome/solfege/online-docs/C/AUTHORS.html
+share/gnome/solfege/mpd/testsetup.py
 share/gnome/solfege/online-docs/C/bug-reporting.html
 share/gnome/solfege/online-docs/C/chord-help.html
 share/gnome/solfege/online-docs/C/chord-names.html
-share/gnome/solfege/online-docs/C/chord-voicing-help.html
-share/gnome/solfege/online-docs/C/compare-intervals-help.html
+share/gnome/solfege/online-docs/C/chordvoicing-help.html
+share/gnome/solfege/online-docs/C/compareintervals-help.html
 share/gnome/solfege/online-docs/C/copyright.html
 share/gnome/solfege/online-docs/C/dictation-help.html
 share/gnome/solfege/online-docs/C/fdl.html
 share/gnome/solfege/online-docs/C/gpl.html
-share/gnome/solfege/online-docs/C/harmonic-interval-help.html
-share/gnome/solfege/online-docs/C/harmonic-progression-dictation-help.html
+share/gnome/solfege/online-docs/C/harmonicinterval-help.html
+share/gnome/solfege/online-docs/C/harmonicprogressiondictation-help.html
 share/gnome/solfege/online-docs/C/helpfile-format.html
-share/gnome/solfege/online-docs/C/id-by-name-help.html
-share/gnome/solfege/online-docs/C/id-tone-help.html
-share/gnome/solfege/online-docs/C/identify-bpm-help.html
-share/gnome/solfege/online-docs/C/identify-scale-help.html
+share/gnome/solfege/online-docs/C/idbyname-help.html
+share/gnome/solfege/online-docs/C/identifybpm-help.html
+share/gnome/solfege/online-docs/C/idtone-help.html
 share/gnome/solfege/online-docs/C/lessonfiles.html
-share/gnome/solfege/online-docs/C/melodic-interval-help.html
+share/gnome/solfege/online-docs/C/melodicinterval-help.html
 share/gnome/solfege/online-docs/C/missing-helpfile.html
 share/gnome/solfege/online-docs/C/music-format.html
 share/gnome/solfege/online-docs/C/online-resources.html
 share/gnome/solfege/online-docs/C/preferences-window.html
 share/gnome/solfege/online-docs/C/rhythm-help.html
-share/gnome/solfege/online-docs/C/sing-chord-help.html
-share/gnome/solfege/online-docs/C/sing-interval-help.html
 share/gnome/solfege/online-docs/C/singanswer-help.html
+share/gnome/solfege/online-docs/C/singchord-help.html
+share/gnome/solfege/online-docs/C/singinterval-help.html
 share/gnome/solfege/online-docs/C/theory-intervals.html
 share/gnome/solfege/online-docs/C/toc.html
 share/gnome/solfege/online-docs/C/translating-solfege.html
-share/gnome/solfege/online-docs/C/twelve-tone-help.html
+share/gnome/solfege/online-docs/C/twelvetone-help.html
 share/gnome/solfege/online-docs/C/ui.html
 share/gnome/solfege/online-docs/C/welcome.html
 share/gnome/solfege/online-docs/es_MX/toc.html
@@ -232,30 +299,29 @@ share/gnome/solfege/online-docs/es_MX/welcome.html
 share/gnome/solfege/online-docs/fr/bug-reporting.html
 share/gnome/solfege/online-docs/fr/chord-help.html
 share/gnome/solfege/online-docs/fr/chord-names.html
-share/gnome/solfege/online-docs/fr/chord-voicing-help.html
-share/gnome/solfege/online-docs/fr/compare-intervals-help.html
+share/gnome/solfege/online-docs/fr/chordvoicing-help.html
+share/gnome/solfege/online-docs/fr/compareintervals-help.html
 share/gnome/solfege/online-docs/fr/dictation-help.html
-share/gnome/solfege/online-docs/fr/harmonic-interval-help.html
-share/gnome/solfege/online-docs/fr/harmonic-progression-dictation-help.html
+share/gnome/solfege/online-docs/fr/harmonicinterval-help.html
+share/gnome/solfege/online-docs/fr/harmonicprogressiondictation-help.html
 share/gnome/solfege/online-docs/fr/helpfile-format.html
-share/gnome/solfege/online-docs/fr/id-by-name-help.html
-share/gnome/solfege/online-docs/fr/id-tone-help.html
-share/gnome/solfege/online-docs/fr/identify-bpm-help.html
-share/gnome/solfege/online-docs/fr/identify-scale-help.html
+share/gnome/solfege/online-docs/fr/idbyname-help.html
+share/gnome/solfege/online-docs/fr/identifybpm-help.html
+share/gnome/solfege/online-docs/fr/idtone-help.html
 share/gnome/solfege/online-docs/fr/lessonfiles.html
-share/gnome/solfege/online-docs/fr/melodic-interval-help.html
+share/gnome/solfege/online-docs/fr/melodicinterval-help.html
 share/gnome/solfege/online-docs/fr/missing-helpfile.html
 share/gnome/solfege/online-docs/fr/music-format.html
 share/gnome/solfege/online-docs/fr/online-resources.html
 share/gnome/solfege/online-docs/fr/preferences-window.html
 share/gnome/solfege/online-docs/fr/rhythm-help.html
-share/gnome/solfege/online-docs/fr/sing-chord-help.html
-share/gnome/solfege/online-docs/fr/sing-interval-help.html
 share/gnome/solfege/online-docs/fr/singanswer-help.html
+share/gnome/solfege/online-docs/fr/singchord-help.html
+share/gnome/solfege/online-docs/fr/singinterval-help.html
 share/gnome/solfege/online-docs/fr/theory-intervals.html
 share/gnome/solfege/online-docs/fr/toc.html
 share/gnome/solfege/online-docs/fr/translating-solfege.html
-share/gnome/solfege/online-docs/fr/twelve-tone-help.html
+share/gnome/solfege/online-docs/fr/twelvetone-help.html
 share/gnome/solfege/online-docs/fr/ui.html
 share/gnome/solfege/online-docs/fr/welcome.html
 share/gnome/solfege/online-docs/midi/Theory-intervals-1.midi
@@ -265,44 +331,42 @@ share/gnome/solfege/online-docs/midi/Theory-intervals-4.midi
 share/gnome/solfege/online-docs/nl/bug-reporting.html
 share/gnome/solfege/online-docs/nl/chord-help.html
 share/gnome/solfege/online-docs/nl/chord-names.html
-share/gnome/solfege/online-docs/nl/chord-voicing-help.html
-share/gnome/solfege/online-docs/nl/compare-intervals-help.html
+share/gnome/solfege/online-docs/nl/chordvoicing-help.html
+share/gnome/solfege/online-docs/nl/compareintervals-help.html
 share/gnome/solfege/online-docs/nl/dictation-help.html
-share/gnome/solfege/online-docs/nl/harmonic-interval-help.html
-share/gnome/solfege/online-docs/nl/id-by-name-help.html
-share/gnome/solfege/online-docs/nl/id-tone-help.html
-share/gnome/solfege/online-docs/nl/identify-bpm-help.html
-share/gnome/solfege/online-docs/nl/identify-scale-help.html
-share/gnome/solfege/online-docs/nl/melodic-interval-help.html
+share/gnome/solfege/online-docs/nl/harmonicinterval-help.html
+share/gnome/solfege/online-docs/nl/idbyname-help.html
+share/gnome/solfege/online-docs/nl/identifybpm-help.html
+share/gnome/solfege/online-docs/nl/idtone-help.html
+share/gnome/solfege/online-docs/nl/melodicinterval-help.html
 share/gnome/solfege/online-docs/nl/missing-helpfile.html
 share/gnome/solfege/online-docs/nl/online-resources.html
 share/gnome/solfege/online-docs/nl/preferences-window.html
 share/gnome/solfege/online-docs/nl/rhythm-help.html
-share/gnome/solfege/online-docs/nl/sing-chord-help.html
-share/gnome/solfege/online-docs/nl/sing-interval-help.html
 share/gnome/solfege/online-docs/nl/singanswer-help.html
+share/gnome/solfege/online-docs/nl/singchord-help.html
+share/gnome/solfege/online-docs/nl/singinterval-help.html
 share/gnome/solfege/online-docs/nl/theory-intervals.html
 share/gnome/solfege/online-docs/nl/toc.html
-share/gnome/solfege/online-docs/nl/twelve-tone-help.html
+share/gnome/solfege/online-docs/nl/twelvetone-help.html
 share/gnome/solfege/online-docs/nl/ui.html
 share/gnome/solfege/online-docs/nl/welcome.html
 share/gnome/solfege/online-docs/no/chord-help.html
-share/gnome/solfege/online-docs/no/chord-voicing-help.html
-share/gnome/solfege/online-docs/no/compare-intervals-help.html
+share/gnome/solfege/online-docs/no/chordvoicing-help.html
+share/gnome/solfege/online-docs/no/compareintervals-help.html
 share/gnome/solfege/online-docs/no/dictation-help.html
-share/gnome/solfege/online-docs/no/harmonic-interval-help.html
-share/gnome/solfege/online-docs/no/harmonic-progression-dictation-help.html
-share/gnome/solfege/online-docs/no/id-by-name-help.html
-share/gnome/solfege/online-docs/no/id-tone-help.html
-share/gnome/solfege/online-docs/no/identify-bpm-help.html
-share/gnome/solfege/online-docs/no/identify-scale-help.html
-share/gnome/solfege/online-docs/no/melodic-interval-help.html
+share/gnome/solfege/online-docs/no/harmonicinterval-help.html
+share/gnome/solfege/online-docs/no/harmonicprogressiondictation-help.html
+share/gnome/solfege/online-docs/no/idbyname-help.html
+share/gnome/solfege/online-docs/no/identifybpm-help.html
+share/gnome/solfege/online-docs/no/idtone-help.html
+share/gnome/solfege/online-docs/no/melodicinterval-help.html
 share/gnome/solfege/online-docs/no/online-resources.html
 share/gnome/solfege/online-docs/no/rhythm-help.html
-share/gnome/solfege/online-docs/no/sing-chord-help.html
-share/gnome/solfege/online-docs/no/sing-interval-help.html
+share/gnome/solfege/online-docs/no/singchord-help.html
+share/gnome/solfege/online-docs/no/singinterval-help.html
 share/gnome/solfege/online-docs/no/toc.html
-share/gnome/solfege/online-docs/no/twelve-tone-help.html
+share/gnome/solfege/online-docs/no/twelvetone-help.html
 share/gnome/solfege/online-docs/no/welcome.html
 share/gnome/solfege/online-docs/png/Theory-intervals-1-fr.png
 share/gnome/solfege/online-docs/png/Theory-intervals-1-nl.png
@@ -328,6 +392,7 @@ share/gnome/solfege/online-docs/png/skip.png
 share/gnome/solfege/online-docs/png/test.png
 share/gnome/solfege/online-docs/png/tie.png
 share/gnome/solfege/online-docs/png/tuple.png
+share/gnome/solfege/online-docs/ru/bug-reporting.html
 share/gnome/solfege/online-docs/ru/toc.html
 share/gnome/solfege/online-docs/ru/welcome.html
 share/gnome/solfege/solfege.gtkrc
@@ -356,7 +421,6 @@ share/gnome/solfege/src/const.py
 share/gnome/solfege/src/dataparser.py
 share/gnome/solfege/src/dictation.py
 share/gnome/solfege/src/example.py
-share/gnome/solfege/src/exercise_setup.py
 share/gnome/solfege/src/gethomedir.py
 share/gnome/solfege/src/gu.py
 share/gnome/solfege/src/harmonicinterval.py
@@ -369,17 +433,18 @@ share/gnome/solfege/src/identifybpm.py
 share/gnome/solfege/src/idtone.py
 share/gnome/solfege/src/inputwidgets.py
 share/gnome/solfege/src/instrumentselector.py
-share/gnome/solfege/src/intervaltest.py
+share/gnome/solfege/src/learning_tree_editor.py
 share/gnome/solfege/src/lessonfile.py
 share/gnome/solfege/src/lessonfile_editor_main.py
 share/gnome/solfege/src/mainwin.py
 share/gnome/solfege/src/melodicinterval.py
 share/gnome/solfege/src/multipleintervalconfigwidget.py
 share/gnome/solfege/src/notenamespinbutton.py
-share/gnome/solfege/src/pyscript.py
+share/gnome/solfege/src/osutils.py
+share/gnome/solfege/src/pmwiki.py
+share/gnome/solfege/src/reportbug.py
 share/gnome/solfege/src/rhythm.py
 share/gnome/solfege/src/runtime.py
-share/gnome/solfege/src/selectlessonfilewidget.py
 share/gnome/solfege/src/singanswer.py
 share/gnome/solfege/src/singchord.py
 share/gnome/solfege/src/singinterval.py
@@ -387,11 +452,13 @@ 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/tuner.py
 share/gnome/solfege/src/twelvetone.py
 share/gnome/solfege/src/utils.py
-share/gnome/solfege/src/widgets.py
+share/gnome/solfege/src/uuid.py
+share/gnome/solfege/src/xrandom.py
 share/gnome/solfege/themes/svg/chord-voicing.svg
 share/gnome/solfege/themes/svg/chord.svg
 share/gnome/solfege/themes/svg/happyface.svg