- Update to 0.8.10

PR:		140480
Submitted by:	Ports Fury

4 files changed, 64 insertions, 23 deletions

diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index fa3097e5a225..25069a7c8c42 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	denemo
-PORTVERSION=	0.8.8
+PORTVERSION=	0.8.10
 CATEGORIES=	audio
 MASTER_SITES=	SAVANNAH
 
@@ -16,16 +16,15 @@ COMMENT=	Graphical score editor
 BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	aubio.3:${PORTSDIR}/audio/aubio \
 		jack.0:${PORTSDIR}/audio/jack \
-		lash.2:${PORTSDIR}/audio/lash \
 		guile.20:${PORTSDIR}/lang/guile \
 		fftw3.5:${PORTSDIR}/math/fftw3
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GNOME=	gtk20 librsvg2 libxml2
+USE_GNOME=	gtk20 gtksourceview2 librsvg2 libxml2
 USE_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-jack --enable-lash \
+CONFIGURE_ARGS=	--enable-jack \
 		--sysconfdir=${PREFIX}/etc
 
 PORTDOCS=	*
@@ -37,7 +36,6 @@ LDFLAGS=	-L${LOCALBASE}/lib
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|m4 doc actions|m4 actions| ; \
 		 s|fonts examples templates|fonts templates|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/src/lyparser.y
diff --git a/audio/denemo/distinfo b/audio/denemo/distinfo
index f9cd561acadb..bced53710689 100644
--- a/audio/denemo/distinfo
+++ b/audio/denemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (denemo-0.8.8.tar.gz) = d405eff6f83ffbc95146e271f89cf489
-SHA256 (denemo-0.8.8.tar.gz) = 2ad90e95545aef7312bccbee3ba68980cd99dee4f76f4e7897c548c73b585ce1
-SIZE (denemo-0.8.8.tar.gz) = 2140070
+MD5 (denemo-0.8.10.tar.gz) = 3b87158576d9c3fc44f80bd39f39c386
+SHA256 (denemo-0.8.10.tar.gz) = f2c20a199241ee1baa89a80201452153b33f5de4fec83b67272f42a2a3028e81
+SIZE (denemo-0.8.10.tar.gz) = 2159653
diff --git a/audio/denemo/files/patch-src__view.c b/audio/denemo/files/patch-src__view.c
deleted file mode 100644
index a19383b7f97d..000000000000
--- a/audio/denemo/files/patch-src__view.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/view.c.orig	2009-08-25 05:03:53.000000000 +0900
-+++ src/view.c	2009-09-28 17:09:59.000000000 +0900
-@@ -5198,7 +5198,7 @@
- #ifdef G_OS_WIN32
-   data_dir = g_build_filename (get_data_dir (), "icons","denemo.png", NULL);
- #else
--  data_dir = g_strconcat (get_data_dir (), "/../icons/denemo.png", NULL);//FIXME installed in wrong place
-+  data_dir = g_strconcat (get_data_dir (), "../pixmaps/denemo.png", NULL);
- #endif
-   gtk_window_set_default_icon_from_file (data_dir, NULL);
-   gtk_signal_connect (GTK_OBJECT (Denemo.window), "delete_event",
diff --git a/audio/denemo/pkg-plist b/audio/denemo/pkg-plist
index 877a608db702..dee35b56bc31 100644
--- a/audio/denemo/pkg-plist
+++ b/audio/denemo/pkg-plist
@@ -18,6 +18,9 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/bitmaps/DrumClef.png
 %%DATADIR%%/actions/bitmaps/EncircleChar
 %%DATADIR%%/actions/bitmaps/EndBeam.png
+%%DATADIR%%/actions/bitmaps/EndSecondTimeBar.png
+%%DATADIR%%/actions/bitmaps/FirstTimeBar.png
+%%DATADIR%%/actions/bitmaps/Forte.png
 %%DATADIR%%/actions/bitmaps/Fortissimo.png
 %%DATADIR%%/actions/bitmaps/Glissando.png
 %%DATADIR%%/actions/bitmaps/LargeEight.png
@@ -31,17 +34,22 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/bitmaps/LargeTwo.png
 %%DATADIR%%/actions/bitmaps/LargeZero.png
 %%DATADIR%%/actions/bitmaps/MezzoForte.png
+%%DATADIR%%/actions/bitmaps/MezzoPiano.png
 %%DATADIR%%/actions/bitmaps/NoBeam.png
 %%DATADIR%%/actions/bitmaps/RehearsalMark
 %%DATADIR%%/actions/bitmaps/RehearsalMark.png
 %%DATADIR%%/actions/bitmaps/RepeatEnd.png
 %%DATADIR%%/actions/bitmaps/RepeatEndStart.png
 %%DATADIR%%/actions/bitmaps/RepeatStart.png
+%%DATADIR%%/actions/bitmaps/SecondTimeBar.png
 %%DATADIR%%/actions/bitmaps/StartBeam.png
 %%DATADIR%%/actions/bitmaps/StartDownStems.png
 %%DATADIR%%/actions/bitmaps/StartTupletNumbering.png
 %%DATADIR%%/actions/bitmaps/StartUpStems.png
 %%DATADIR%%/actions/bitmaps/StopTupletNumbering.png
+%%DATADIR%%/actions/bitmaps/WholeMeasureRest.png
+%%DATADIR%%/actions/bitmaps/WholeMeasureRestLH.png
+%%DATADIR%%/actions/bitmaps/WholeMeasureRestRH.png
 %%DATADIR%%/actions/denemo.scm
 %%DATADIR%%/actions/editscripts/D.C.AlFine.scm
 %%DATADIR%%/actions/editscripts/LHFinger.scm
@@ -54,11 +62,21 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/KeyBindings/StartEmacs2KeyShortcut
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Select/ApplyToChordsInSelection
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Select/ApplyToSelection
+%%DATADIR%%/actions/menus/MainMenu/EditMenu/SetImmediatePlayback
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose/SetTransposeIntervalFromNote
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose/SetTransposeIntervalFromSelection
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose/TransposeNote
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose/TransposeSelection
 %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose/init.scm
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/DiminishedOrAugmented
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/DiminishedOrMinor
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/HalfDiminished7OrDiminshed7
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/Major7Minor7OrDominant7
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/MajorMinorAugmentedOrDiminished
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/MajorOrAugmented
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/MajorOrMinor
+%%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training/init.scm
+%%DATADIR%%/actions/menus/MainMenu/Educational/BassClefNoteNameSpeedTest
 %%DATADIR%%/actions/menus/MainMenu/Educational/CountSteps
 %%DATADIR%%/actions/menus/MainMenu/Educational/DiatonicInterval
 %%DATADIR%%/actions/menus/MainMenu/Educational/LineOrSpace
@@ -66,6 +84,7 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/MainMenu/Educational/MIDI/Conductor
 %%DATADIR%%/actions/menus/MainMenu/Educational/NoteNameSpeedTest
 %%DATADIR%%/actions/menus/MainMenu/Educational/ReadingNoteNames
+%%DATADIR%%/actions/menus/MainMenu/Educational/ReadingNoteNamesSolfege
 %%DATADIR%%/actions/menus/MainMenu/Educational/StepSkipOrSame
 %%DATADIR%%/actions/menus/MainMenu/Educational/UpDownOrSame
 %%DATADIR%%/actions/menus/MainMenu/Educational/init.scm
@@ -76,8 +95,16 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/MainMenu/ModeMenu/MIDI/MidiAdvanceOnEdit
 %%DATADIR%%/actions/menus/MainMenu/ModeMenu/MIDI/MidiFilterOff
 %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu/RecreateTimebase
-%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/NamedBookmarkInsert
+%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/BookmarkR
+%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/BookmarkRNamed
+%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/BookmarkRNonPrinting
+%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/NextBookmarkR
+%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/PrevBookmarkR
+%%DATADIR%%/actions/menus/ObjectMenu/Bookmarks/SearchBookmarkR
+%%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/HideLilyPond
 %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu/ParenthesizeChord
+%%DATADIR%%/actions/menus/ObjectMenu/ClefMenu/ClefChooser
+%%DATADIR%%/actions/menus/ObjectMenu/Cursor/GoToEmptyMeasure
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger0
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger1
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger2
@@ -87,13 +114,14 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/StringNum
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Orchestral/RehearsalMark
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/BassDrum
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/DrumGM2Custom
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/HiHat
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/HiHatFoot
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/HiTom
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/Ride
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/RideBell
 %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion/TimbalesStyle
-%%DATADIR%%/actions/menus/ObjectMenu/Markings/Metronome-Markings/MetronomeMarking
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/Metronome Markings/MetronomeMarking
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/Ornaments/Trill+Above
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/Ornaments/Trill+Below
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/RehearsalMarks/RehearsalMark
@@ -103,8 +131,11 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/Slurs/SlurTwo
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/D.C.AlFine
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/DeleteDynamic
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/Forte
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/Fortissimo
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/Largo
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/MezzoForte
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/MezzoPiano
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/init.scm
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Glissando
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/ParenthesizeChord
@@ -114,32 +145,46 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Tempo Indications/Andante
 %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Tempo Indications/Presto
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/Anacrusis
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/CloseRepeat
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ClosingBarline
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/DeleteBarline
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/DoubleBarline
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/EndSecondTimeBar
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/FirstTimeBar
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ForceBarline
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ForceNewMeasure
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/LineBreak
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/OpenRepeat
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/PageBreak
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ReBar
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/RepeatEnd
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/RepeatEndStart
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/RepeatStart
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/SecondTimeBar
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ShortMeasure
 %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/SplitMeasure
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/HideMovement
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/MovementPageBreak
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/MvntComment
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Print Layout/Indent
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementPiece
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementSubtitle
 %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementTitle
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Augment
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/Beam1234
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/EndBeam
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming/StartBeam
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/ChordComment
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Diminish
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditModeNote/EditNote/CautionaryAccidental
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditModeNote/EditNote/MoveNoteToCursor
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditModeNote/EditNote/ReminderAccidental
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes/NormalSizeNotehead
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes/SmallNotehead
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes/TinyNotehead
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/ParenthesizeNote
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry/EnterRest
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry/WholeMeasureRest
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/StartDownStems
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/StartUpStems
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/TiedNotes/InsertTiedNoteDuration
@@ -154,25 +199,31 @@ share/applications/denemo.desktop
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Tuplets/NoTupletNumbers
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Tuplets/ToggleTripleting
 %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Tuplets/ToggleTupletNumbering
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/init.scm
 %%DATADIR%%/actions/menus/ObjectMenu/Other/DeleteLilyPondOnChord
 %%DATADIR%%/actions/menus/ObjectMenu/Other/DeleteLilyPondOnNote
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Ambitus
 %%DATADIR%%/actions/menus/ObjectMenu/Score/EditProlog
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/HideEmptyStaffs
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout/ScoreIndent
+%%DATADIR%%/actions/menus/ObjectMenu/Score/ScoreComment
 %%DATADIR%%/actions/menus/ObjectMenu/Score/SetFontSize
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreComposer
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreCopyright
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreTagline
 %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/ScoreTitle
+%%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc/TitlePage
 %%DATADIR%%/actions/menus/ObjectMenu/Score/TransposeOctaveUp
 %%DATADIR%%/actions/menus/ObjectMenu/Score/TransposeScorePrint
-%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/Ambitus
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/InstrumentName
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/NonPrintingStaff
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/PrintEffects/ClearStaffProlog
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/PrintEffects/TransposeStaffOutput
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/ShortInstrumentName
 %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/SmallerStaff
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffComment
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/StaffOctaveUp
+%%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/TransposeStaffPrint
 %%DATADIR%%/actions/musicgames/ReadingNoteNames.denemo
 %%DATADIR%%/denemoui.xml
 %%DATADIR%%/examples
@@ -362,13 +413,15 @@ share/pixmaps/denemo.png
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/Slurs
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/RehearsalMarks
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/Ornaments
-@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/Metronome-Markings
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/Metronome Markings
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Percussion
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Orchestral
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Instruments
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Cursor
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/ClefMenu
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/ChordMenu
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu/Bookmarks
 @dirrm %%DATADIR%%/actions/menus/ObjectMenu
@@ -377,6 +430,7 @@ share/pixmaps/denemo.png
 @dirrm %%DATADIR%%/actions/menus/MainMenu/ModeMenu
 @dirrm %%DATADIR%%/actions/menus/MainMenu/HelpMenu
 @dirrm %%DATADIR%%/actions/menus/MainMenu/Educational/MIDI
+@dirrm %%DATADIR%%/actions/menus/MainMenu/Educational/Aural Training
 @dirrm %%DATADIR%%/actions/menus/MainMenu/Educational
 @dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose
 @dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu/Select