[pkgsrc/trunk]: pkgsrc/audio/solfege Update to 3.8.0. Highlights from the cha...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/109d0376e517
branches:  trunk
changeset: 528717:109d0376e517
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun May 13 13:02:42 2007 +0000

description:
Update to 3.8.0. Highlights from the changelog:

* Added the rhythmtapping modules.
* Added lessons to practise intervals from second to octave.
* Added twelve-tone and bpm exercises.
* Added ternary rhythm exercise.
* Added nameinterval exercise.
* Added descending melodic intervals exercise.
* Added LOTS of scale exercsies from Davide Bonetti.
* Removed GNOME dependencies. We now require pygtk 2.6.0 or newer.
* The user manual is now translatable using .po files.
* Many updated translations.
* Cairo version of all input widgets.
* Improved GtkTextView-based html widget if GtkHtml is not available.

diffstat:

 audio/solfege/Makefile         |   33 +-
 audio/solfege/PLIST            |  736 ++++++++++++++++++++++++++++++++--------
 audio/solfege/distinfo         |   10 +-
 audio/solfege/patches/patch-aa |   21 +-
 4 files changed, 619 insertions(+), 181 deletions(-)

diffs (truncated from 1016 to 300 lines):

diff -r a5a241955283 -r 109d0376e517 audio/solfege/Makefile
--- a/audio/solfege/Makefile    Sun May 13 12:19:05 2007 +0000
+++ b/audio/solfege/Makefile    Sun May 13 13:02:42 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/06/21 13:22:27 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/05/13 13:02:42 schmonz Exp $
 #
 
-DISTNAME=              solfege-3.0.7
-PKGREVISION=           1
+DISTNAME=              solfege-3.8.0
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=solfege/}
 
@@ -10,24 +9,46 @@
 HOMEPAGE=              http://www.solfege.org/
 COMMENT=               Practice several musical ear training exercises
 
+BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+
 USE_DIRS+=             xdg-1.2
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --disable-oss-sound
+CONFIGURE_ARGS+=       --disable-pygtk-test
+CONFIGURE_ARGS+=       --enable-docbook-stylesheet=${LOCALBASE}/share/xsl/docbook/html/chunk.xsl
 
 USE_TOOLS+=            gmake gm4 makeinfo pkg-config msgfmt
 
 PYTHON_VERSIONS_ACCEPTED=      24 23
 PYTHON_PATCH_SCRIPTS=  *.py *.py.in */*.py */*.py.in
 
+SUBST_CLASSES+=                sound
+SUBST_STAGE.sound=     do-configure
+SUBST_FILES.sound=     default.config
+SUBST_SED.sound=       -e 's|@WAVPLAYER@|${WAVPLAYER}|g'
+SUBST_SED.sound+=      -e 's|@MIDIPLAYER@|${MIDIPLAYER}|g'
+SUBST_MESSAGE.sound=   Setting default audio player.
+
 EGDIR=                 ${PREFIX}/share/examples/solfege
-CONF_FILES+=           ${EGDIR}/${PKGBASE}/solfege ${PKG_SYSCONFDIR}/solfege
+CONF_FILES+=           ${EGDIR}/solfege ${PKG_SYSCONFDIR}/solfege
 INSTALL_MAKE_FLAGS+=   ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
-INSTALLATION_DIRS=     ${EGDIR}
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${EGDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+WAVPLAYER=     /usr/bin/audioplay
+MIDIPLAYER=    /usr/bin/midiplay
+.elif ${OPSYS} == "Darwin"
+WAVPLAYER=     ${LOCALBASE}/bin/qtplay
+MIDIPLAYER=    ${LOCALBASE}/bin/qtplay
+DEPENDS+=      qtplay-[0-9]*:../../audio/qtplay
+.endif
 
 .include "../../lang/python/application.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a5a241955283 -r 109d0376e517 audio/solfege/PLIST
--- a/audio/solfege/PLIST       Sun May 13 12:19:05 2007 +0000
+++ b/audio/solfege/PLIST       Sun May 13 13:02:42 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/05/13 13:02:42 schmonz Exp $
 bin/lessonfile_editor
 bin/solfege
 man/man1/lessonfile_editor.1
@@ -15,12 +15,15 @@
 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
 share/pixmaps/solfege.png
+share/solfege/debugtree.txt
 share/solfege/default.config
 share/solfege/example-lesson-files/chord-satb
+share/solfege/example-lesson-files/example-1
 share/solfege/example-lesson-files/harmonic-progression-dictation
 share/solfege/example-lesson-files/id-by-name-1
 share/solfege/example-lesson-files/id-by-name-2
@@ -73,10 +76,6 @@
 share/solfege/feta/feta20-rests-5.xpm
 share/solfege/feta/feta20-rests-6.xpm
 share/solfege/feta/feta20-rests-7.xpm
-share/solfege/gnomeemu/gnome/__init__.py
-share/solfege/gnomeemu/gnome/canvas.py
-share/solfege/gnomeemu/gnome/ui.py
-share/solfege/gnomeemu/gnome/uiconsts.py
 share/solfege/graphics/chord-voicing.png
 share/solfege/graphics/chord.png
 share/solfege/graphics/compare-intervals.png
@@ -108,13 +107,26 @@
 share/solfege/graphics/rhythm-c12c12r12.png
 share/solfege/graphics/rhythm-c12r12c12.png
 share/solfege/graphics/rhythm-c16c16c16c16.png
+share/solfege/graphics/rhythm-c16c16c16c16c16c16.png
+share/solfege/graphics/rhythm-c16c16c16c16c8.png
+share/solfege/graphics/rhythm-c16c16c4.png
 share/solfege/graphics/rhythm-c16c16c8.png
+share/solfege/graphics/rhythm-c16c16c8c16c16.png
+share/solfege/graphics/rhythm-c16c16c8c8.png
 share/solfege/graphics/rhythm-c16c8..png
 share/solfege/graphics/rhythm-c16c8c16.png
+share/solfege/graphics/rhythm-c4..png
 share/solfege/graphics/rhythm-c4.png
+share/solfege/graphics/rhythm-c4c16c16.png
+share/solfege/graphics/rhythm-c4c8.png
 share/solfege/graphics/rhythm-c8.c16.png
 share/solfege/graphics/rhythm-c8c16c16.png
+share/solfege/graphics/rhythm-c8c16c16c16c16.png
+share/solfege/graphics/rhythm-c8c16c16c8.png
+share/solfege/graphics/rhythm-c8c4.png
 share/solfege/graphics/rhythm-c8c8.png
+share/solfege/graphics/rhythm-c8c8c16c16.png
+share/solfege/graphics/rhythm-c8c8c8.png
 share/solfege/graphics/rhythm-r12c12c12.png
 share/solfege/graphics/rhythm-r12c12r12.png
 share/solfege/graphics/rhythm-r12r12c12.png
@@ -134,9 +146,361 @@
 share/solfege/graphics/sing-chord.png
 share/solfege/graphics/sing-interval.png
 share/solfege/graphics/solfege.png
+share/solfege/graphics/solfege.svg
 share/solfege/graphics/solfege.xpm
 share/solfege/graphics/test-sound.png
 share/solfege/graphics/twelve-tone.png
+share/solfege/help-menu.xml
+share/solfege/help/C/apb.html
+share/solfege/help/C/bug-reporting.html
+share/solfege/help/C/chord-module.html
+share/solfege/help/C/chord.html
+share/solfege/help/C/compareintervals-module.html
+share/solfege/help/C/dictation-module.html
+share/solfege/help/C/dictation.html
+share/solfege/help/C/elembuilder-module.html
+share/solfege/help/C/elembuilder.html
+share/solfege/help/C/extending-solfege.html
+share/solfege/help/C/figures/chord.png
+share/solfege/help/C/figures/dictation.png
+share/solfege/help/C/figures/elembuilder-harmonic-progressions.png
+share/solfege/help/C/figures/id-interval-buttons-thirds.png
+share/solfege/help/C/figures/id-interval-piano.png
+share/solfege/help/C/figures/idbyname-chords.png
+share/solfege/help/C/figures/idbyname-intonation.png
+share/solfege/help/C/figures/identifybpm.png
+share/solfege/help/C/figures/idtone.png
+share/solfege/help/C/figures/nameinterval.png
+share/solfege/help/C/figures/preferences-gui.png
+share/solfege/help/C/figures/preferences-midi.png
+share/solfege/help/C/figures/preferences-practise.png
+share/solfege/help/C/figures/preferences-sound-setup.png
+share/solfege/help/C/figures/preferences-user.png
+share/solfege/help/C/figures/rhythm.png
+share/solfege/help/C/figures/singchord.png
+share/solfege/help/C/figures/singinterval.png
+share/solfege/help/C/figures/trainingset-editor.png
+share/solfege/help/C/figures/twelvetone.png
+share/solfege/help/C/gpl-2.html
+share/solfege/help/C/gpl-3.html
+share/solfege/help/C/gpl.html
+share/solfege/help/C/harmonicinterval-module.html
+share/solfege/help/C/harmonicinterval.html
+share/solfege/help/C/idbyname-chords.html
+share/solfege/help/C/idbyname-intonation.html
+share/solfege/help/C/idbyname-module.html
+share/solfege/help/C/identifybpm.html
+share/solfege/help/C/idtone-module.html
+share/solfege/help/C/idtone.html
+share/solfege/help/C/index.html
+share/solfege/help/C/inverting-intervals.html
+share/solfege/help/C/lesson-files.html
+share/solfege/help/C/ly/inverting-intervals.png
+share/solfege/help/C/ly/theory-intervals-1.png
+share/solfege/help/C/ly/theory-intervals-fifths-1.png
+share/solfege/help/C/ly/theory-intervals-fifths-2.png
+share/solfege/help/C/ly/theory-intervals-fifths.png
+share/solfege/help/C/ly/theory-intervals-fourths.png
+share/solfege/help/C/ly/theory-intervals-seconds-1.png
+share/solfege/help/C/ly/theory-intervals-seconds-2.png
+share/solfege/help/C/ly/theory-intervals-seconds-3.png
+share/solfege/help/C/ly/theory-intervals-seconds.png
+share/solfege/help/C/ly/theory-intervals-sevenths.png
+share/solfege/help/C/ly/theory-intervals-sixths.png
+share/solfege/help/C/ly/theory-intervals-thirds.png
+share/solfege/help/C/melodicinterval.html
+share/solfege/help/C/melodicintervals-module.html
+share/solfege/help/C/midi-instrument-names.html
+share/solfege/help/C/music-theory.html
+share/solfege/help/C/nameinterval-module.html
+share/solfege/help/C/nameinterval.html
+share/solfege/help/C/one-big-page.html
+share/solfege/help/C/online-resources.html
+share/solfege/help/C/preferences-window.html
+share/solfege/help/C/rhythm-module.html
+share/solfege/help/C/rhythm.html
+share/solfege/help/C/rhythmtapping-module.html
+share/solfege/help/C/rhythmtapping2-module.html
+share/solfege/help/C/rhythmtapping2.html
+share/solfege/help/C/scales.html
+share/solfege/help/C/singanswer-module.html
+share/solfege/help/C/singchord-module.html
+share/solfege/help/C/singchord.html
+share/solfege/help/C/singinterval-module.html
+share/solfege/help/C/singinterval.html
+share/solfege/help/C/solfege-exercise-helps.html
+share/solfege/help/C/solfege-intro.html
+share/solfege/help/C/theory-intervals.html
+share/solfege/help/C/trainingset-editor.html
+share/solfege/help/C/twelvetone.html
+share/solfege/help/C/welcome.html
+share/solfege/help/fr/apb.html
+share/solfege/help/fr/bug-reporting.html
+share/solfege/help/fr/chord-module.html
+share/solfege/help/fr/chord.html
+share/solfege/help/fr/compareintervals-module.html
+share/solfege/help/fr/dictation-module.html
+share/solfege/help/fr/dictation.html
+share/solfege/help/fr/elembuilder-module.html
+share/solfege/help/fr/elembuilder.html
+share/solfege/help/fr/extending-solfege.html
+share/solfege/help/fr/figures/chord.png
+share/solfege/help/fr/figures/dictation.png
+share/solfege/help/fr/figures/id-interval-buttons-thirds.png
+share/solfege/help/fr/figures/id-interval-piano.png
+share/solfege/help/fr/figures/idbyname-chords.png
+share/solfege/help/fr/figures/idbyname-intonation.png
+share/solfege/help/fr/figures/identifybpm.png
+share/solfege/help/fr/figures/idtone.png
+share/solfege/help/fr/figures/preferences-gui.png
+share/solfege/help/fr/figures/preferences-midi.png
+share/solfege/help/fr/figures/preferences-practise.png
+share/solfege/help/fr/figures/preferences-sound-setup.png
+share/solfege/help/fr/figures/preferences-user.png
+share/solfege/help/fr/figures/rhythm.png
+share/solfege/help/fr/figures/singchord.png
+share/solfege/help/fr/figures/singinterval.png
+share/solfege/help/fr/figures/twelvetone.png
+share/solfege/help/fr/gpl-2.html
+share/solfege/help/fr/gpl-3.html
+share/solfege/help/fr/gpl.html
+share/solfege/help/fr/harmonicinterval-module.html
+share/solfege/help/fr/harmonicinterval.html
+share/solfege/help/fr/idbyname-chords.html
+share/solfege/help/fr/idbyname-intonation.html
+share/solfege/help/fr/idbyname-module.html
+share/solfege/help/fr/identifybpm.html
+share/solfege/help/fr/idtone-module.html
+share/solfege/help/fr/idtone.html
+share/solfege/help/fr/index.html
+share/solfege/help/fr/inverting-intervals.html
+share/solfege/help/fr/lesson-files.html
+share/solfege/help/fr/melodicinterval.html
+share/solfege/help/fr/melodicintervals-module.html
+share/solfege/help/fr/midi-instrument-names.html
+share/solfege/help/fr/music-theory.html
+share/solfege/help/fr/nameinterval-module.html
+share/solfege/help/fr/nameinterval.html
+share/solfege/help/fr/one-big-page.html
+share/solfege/help/fr/online-resources.html
+share/solfege/help/fr/preferences-window.html
+share/solfege/help/fr/rhythm-module.html
+share/solfege/help/fr/rhythm.html
+share/solfege/help/fr/rhythmtapping-module.html
+share/solfege/help/fr/rhythmtapping2-module.html
+share/solfege/help/fr/rhythmtapping2.html
+share/solfege/help/fr/scales.html
+share/solfege/help/fr/singanswer-module.html
+share/solfege/help/fr/singchord-module.html
+share/solfege/help/fr/singchord.html
+share/solfege/help/fr/singinterval-module.html
+share/solfege/help/fr/singinterval.html
+share/solfege/help/fr/solfege-exercise-helps.html
+share/solfege/help/fr/solfege-intro.html
+share/solfege/help/fr/theory-intervals.html
+share/solfege/help/fr/trainingset-editor.html
+share/solfege/help/fr/twelvetone.html
+share/solfege/help/fr/welcome.html
+share/solfege/help/no/apb.html
+share/solfege/help/no/bug-reporting.html
+share/solfege/help/no/chord-module.html
+share/solfege/help/no/chord.html
+share/solfege/help/no/compareintervals-module.html
+share/solfege/help/no/dictation-module.html
+share/solfege/help/no/dictation.html
+share/solfege/help/no/elembuilder-module.html
+share/solfege/help/no/elembuilder.html
+share/solfege/help/no/extending-solfege.html
+share/solfege/help/no/figures/chord.png
+share/solfege/help/no/figures/dictation.png
+share/solfege/help/no/figures/id-interval-buttons-thirds.png
+share/solfege/help/no/figures/id-interval-piano.png