Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9415 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 26 insertions, 13 deletions

diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 863408879..6dc9da329 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -4,15 +4,14 @@
 # Whom:				ijliao
 #
 # $FreeBSD$
-#   $MCom: ports/audio/solfege/Makefile,v 1.4 2007/06/29 22:55:02 mezz Exp $
+#   $MCom: ports/audio/solfege/Makefile,v 1.5 2007/07/23 16:29:56 mezz Exp $
 #
 
 PORTNAME=	solfege
-PORTVERSION=	3.8.1
+PORTVERSION=	3.9.0
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 PKGNAMESUFFIX=	-nosound
 
 MAINTAINER=	ports@FreeBSD.org
@@ -54,6 +53,10 @@ post-patch:
 	@${RM} ${WRKSRC}/lesson-files/bin/csound-play-harmonic-interval.sh.orig
 	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/bin/python|${SETENV} python|g'
+.for file in lessonfile_editor.py.in run-solfege.py.in
+	@${REINPLACE_CMD} -e 's|share", "solfege|share", "gnome", "solfege|g' \
+		${WRKSRC}/${file}
+.endfor
 	@${REINPLACE_CMD} -e 's|type=sequencer-device|type=fake-synth|g ; \
 		 s|/usr/bin|${LOCALBASE}/bin|g' ${WRKSRC}/default.config
 	@${REINPLACE_CMD} -e 's|(datadir)/locale|(prefix)/share/locale|g' \
diff --git a/audio/solfege/distinfo b/audio/solfege/distinfo
index c5029a4f4..778cff924 100644
--- a/audio/solfege/distinfo
+++ b/audio/solfege/distinfo
@@ -1,3 +1,3 @@
-MD5 (solfege-3.8.1.tar.gz) = 885e23715073f652a6a96a5b7ea2d36e
-SHA256 (solfege-3.8.1.tar.gz) = ab8f35ddae577696b415ea450cbaa26b94aab9d73867192ad5cc82a836b889f6
-SIZE (solfege-3.8.1.tar.gz) = 2395107
+MD5 (solfege-3.9.0.tar.gz) = bff86e7f7adce3bf6c42235ecc3efe81
+SHA256 (solfege-3.9.0.tar.gz) = 19bb0b2b107d2d6e3008d3067241ad0f2ce4b7d797b4b7c0744669c47bb7951a
+SIZE (solfege-3.9.0.tar.gz) = 2428917
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index 1d4dfd5d1..6ce4a9732 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -141,6 +141,7 @@ 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/ear-training-test-printout-editor.html
 share/solfege/help/C/elembuilder-module.html
 share/solfege/help/C/elembuilder.html
 share/solfege/help/C/extending-solfege.html
@@ -191,8 +192,8 @@ 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-module.html
 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
@@ -223,6 +224,7 @@ 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/ear-training-test-printout-editor.html
 share/solfege/help/fr/elembuilder-module.html
 share/solfege/help/fr/elembuilder.html
 share/solfege/help/fr/extending-solfege.html
@@ -257,8 +259,8 @@ 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-module.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
@@ -289,6 +291,7 @@ 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/ear-training-test-printout-editor.html
 share/solfege/help/no/elembuilder-module.html
 share/solfege/help/no/elembuilder.html
 share/solfege/help/no/extending-solfege.html
@@ -323,8 +326,8 @@ share/solfege/help/no/idtone.html
 share/solfege/help/no/index.html
 share/solfege/help/no/inverting-intervals.html
 share/solfege/help/no/lesson-files.html
+share/solfege/help/no/melodicinterval-module.html
 share/solfege/help/no/melodicinterval.html
-share/solfege/help/no/melodicintervals-module.html
 share/solfege/help/no/midi-instrument-names.html
 share/solfege/help/no/music-theory.html
 share/solfege/help/no/nameinterval-module.html
@@ -355,6 +358,7 @@ share/solfege/help/pt_BR/chord.html
 share/solfege/help/pt_BR/compareintervals-module.html
 share/solfege/help/pt_BR/dictation-module.html
 share/solfege/help/pt_BR/dictation.html
+share/solfege/help/pt_BR/ear-training-test-printout-editor.html
 share/solfege/help/pt_BR/elembuilder-module.html
 share/solfege/help/pt_BR/elembuilder.html
 share/solfege/help/pt_BR/extending-solfege.html
@@ -388,8 +392,8 @@ share/solfege/help/pt_BR/idtone.html
 share/solfege/help/pt_BR/index.html
 share/solfege/help/pt_BR/inverting-intervals.html
 share/solfege/help/pt_BR/lesson-files.html
+share/solfege/help/pt_BR/melodicinterval-module.html
 share/solfege/help/pt_BR/melodicinterval.html
-share/solfege/help/pt_BR/melodicintervals-module.html
 share/solfege/help/pt_BR/midi-instrument-names.html
 share/solfege/help/pt_BR/music-theory.html
 share/solfege/help/pt_BR/nameinterval-module.html
@@ -420,6 +424,7 @@ share/solfege/help/tr/chord.html
 share/solfege/help/tr/compareintervals-module.html
 share/solfege/help/tr/dictation-module.html
 share/solfege/help/tr/dictation.html
+share/solfege/help/tr/ear-training-test-printout-editor.html
 share/solfege/help/tr/elembuilder-module.html
 share/solfege/help/tr/elembuilder.html
 share/solfege/help/tr/extending-solfege.html
@@ -454,8 +459,8 @@ share/solfege/help/tr/idtone.html
 share/solfege/help/tr/index.html
 share/solfege/help/tr/inverting-intervals.html
 share/solfege/help/tr/lesson-files.html
+share/solfege/help/tr/melodicinterval-module.html
 share/solfege/help/tr/melodicinterval.html
-share/solfege/help/tr/melodicintervals-module.html
 share/solfege/help/tr/midi-instrument-names.html
 share/solfege/help/tr/music-theory.html
 share/solfege/help/tr/nameinterval-module.html
@@ -805,6 +810,7 @@ share/solfege/mpd/requests.py
 share/solfege/mpd/track.py
 share/solfege/solfege.gtkrc
 share/solfege/soundcard/__init__.py
+share/solfege/soundcard/exporter.py
 share/solfege/soundcard/fakesynth.py
 share/solfege/soundcard/midifilesynth.py
 share/solfege/soundcard/oss_common.py
@@ -814,6 +820,7 @@ share/solfege/soundcard/solfege_c_midi.py
 share/solfege/soundcard/soundcardexceptions.py
 share/solfege/soundcard/synth_common.py
 share/solfege/soundcard/winsynth.py
+share/solfege/src/ElementTree.py
 share/solfege/src/__init__.py
 share/solfege/src/abstract.py
 share/solfege/src/app.py
@@ -830,7 +837,7 @@ share/solfege/src/docviewer.py
 share/solfege/src/elembuilder.py
 share/solfege/src/example.py
 share/solfege/src/exceptiondialog.py
-share/solfege/src/gethomedir.py
+share/solfege/src/filesystem.py
 share/solfege/src/gpath.py
 share/solfege/src/gu.py
 share/solfege/src/harmonicinterval.py
@@ -856,6 +863,7 @@ share/solfege/src/nameinterval.py
 share/solfege/src/notenamespinbutton.py
 share/solfege/src/osutils.py
 share/solfege/src/pmwiki.py
+share/solfege/src/practisesheetdlg.py
 share/solfege/src/reportbug.py
 share/solfege/src/reportlib.py
 share/solfege/src/rhythm.py
@@ -869,6 +877,7 @@ share/solfege/src/specialwidgets.py
 share/solfege/src/statistics.py
 share/solfege/src/statisticsviewer.py
 share/solfege/src/stock.py
+share/solfege/src/testlib.py
 share/solfege/src/tracebackwindow.py
 share/solfege/src/trainingsetdlg.py
 share/solfege/src/tree.py
@@ -876,6 +885,7 @@ share/solfege/src/tuner.py
 share/solfege/src/twelvetone.py
 share/solfege/src/utils.py
 share/solfege/src/uuid.py
+share/solfege/src/winreg.py
 share/solfege/src/xrandom.py
 share/solfege/themes/svg/chord-voicing.svg
 share/solfege/themes/svg/chord.svg