11 files changed, 377 insertions, 66 deletions

diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 785a9cdffa9d..fa3097e5a225 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -6,51 +6,61 @@
 #
 
 PORTNAME=	denemo
-PORTVERSION=	0.7.6
-PORTREVISION=	3
+PORTVERSION=	0.8.8
 CATEGORIES=	audio
-MASTER_SITES=	SF
+MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Graphical score editor
 
-USE_GNOME=	gnometarget gtk20 libxml2
+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_BISON=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--enable-jack --enable-lash \
+		--sysconfdir=${PREFIX}/etc
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-CPPFLAGS=	${CFLAGS} -I${LOCALBASE}/include
+CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
-
 post-patch:
-	@${GREP} -lR "<malloc.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|<malloc\.h>|<stdlib.h>|g'
-	@${REINPLACE_CMD} -e \
-		's|CXXFLAGS="$$CFLAGS|CXXFLAGS="$$DENEMO_CFLAGS|g ; \
-		 s|-Wall -O2|-Wall $$CXXFLAGS|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's|/icons|/pixmaps|g' ${WRKSRC}/pixmaps/Makefile.in
-.ifdef NOPORTDOCS
-	@${REINPLACE_CMD} -e \
-		's|install-data-am:.*|install-data-am:|' ${WRKSRC}/doc/Makefile.in
-.endif
+	@${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
 
 post-install:
+	@${LN} -sf ${DOCSDIR}/manual ${DATADIR}/manual
+	@${LN} -sf ${EXAMPLESDIR} ${DATADIR}/examples
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in AUTHORS ChangeLog DESIGN GOALS NEWS README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for i in AUTHORS ChangeLog NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.for i in DESIGN DESIGN.lilypond GOALS TODO
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
+	@${MKDIR} ${DOCSDIR}/manual
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/manual
+	@${MKDIR} ${DOCSDIR}/manual/images
+	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/manual/images
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.denemo ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/audio/denemo/distinfo b/audio/denemo/distinfo
index 52cd431a391e..f9cd561acadb 100644
--- a/audio/denemo/distinfo
+++ b/audio/denemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (denemo-0.7.6.tar.gz) = 1a3ed2c46d955295b52d09ae0cb642c0
-SHA256 (denemo-0.7.6.tar.gz) = b37aaa6b88235e705a8e3e9005bbceee002f156949fc76e6b71fe52c726f3e07
-SIZE (denemo-0.7.6.tar.gz) = 1947693
+MD5 (denemo-0.8.8.tar.gz) = d405eff6f83ffbc95146e271f89cf489
+SHA256 (denemo-0.8.8.tar.gz) = 2ad90e95545aef7312bccbee3ba68980cd99dee4f76f4e7897c548c73b585ce1
+SIZE (denemo-0.8.8.tar.gz) = 2140070
diff --git a/audio/denemo/files/patch-configure b/audio/denemo/files/patch-configure
deleted file mode 100644
index b25ce26b806c..000000000000
--- a/audio/denemo/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	Thu Mar 16 17:32:54 2006
-+++ ./configure	Thu May  4 14:45:01 2006
-@@ -1708,7 +1708,7 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+if mkdir -p -- --version >/dev/null 2>&1 && test -d ./--version; then
-   # We used to keeping the `.' as first argument, in order to
-   # allow $(mkdir_p) to be used without argument.  As in
-   #   $(mkdir_p) $(somedir)
diff --git a/audio/denemo/files/patch-src__jackmidi.c b/audio/denemo/files/patch-src__jackmidi.c
new file mode 100644
index 000000000000..d4fe40e26eba
--- /dev/null
+++ b/audio/denemo/files/patch-src__jackmidi.c
@@ -0,0 +1,10 @@
+--- src/jackmidi.c.orig	2009-08-24 03:03:26.000000000 +0900
++++ src/jackmidi.c	2009-09-28 15:42:09.000000000 +0900
+@@ -8,6 +8,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include <assert.h>
++#include <sys/time.h>
+ #include "exportmidi.h"
+ #include "pitchentry.h"
+ #include "smf.h"
diff --git a/audio/denemo/files/patch-src__lolydirectives.c b/audio/denemo/files/patch-src__lolydirectives.c
new file mode 100644
index 000000000000..58e166854eb8
--- /dev/null
+++ b/audio/denemo/files/patch-src__lolydirectives.c
@@ -0,0 +1,11 @@
+--- src/lilydirectives.c.orig	2009-08-24 03:03:26.000000000 +0900
++++ src/lilydirectives.c	2009-09-28 17:25:00.000000000 +0900
+@@ -1966,7 +1966,7 @@
+     return ret;
+   }
+   GError *error = (GError*)execute_script_file(filename);
+-  if(error) g_warning(error->message);
++  if(error) g_warning("%s", error->message);
+   g_free(filename);
+   return ret;
+ }
diff --git a/audio/denemo/files/patch-src__main.c b/audio/denemo/files/patch-src__main.c
new file mode 100644
index 000000000000..f22b63c6112d
--- /dev/null
+++ b/audio/denemo/files/patch-src__main.c
@@ -0,0 +1,27 @@
+--- src/main.c.orig	2009-08-24 03:03:26.000000000 +0900
++++ src/main.c	2009-09-28 17:25:00.000000000 +0900
+@@ -549,7 +549,7 @@
+ 	  g_print("opt %c has %s\n", opts, argv[optind]);
+       if (opts == 'h')
+         {
+-          g_print (helptext);
++          g_print ("%s", helptext);
+           exit (0);
+         }
+       else if (opts == 's')
+@@ -573,13 +573,13 @@
+         {
+           g_print (_("\nGNU Denemo version "));
+           g_print (VERSION ".\n\n");
+-          g_print (copytext);
++          g_print ("%s", copytext);
+           exit (0);
+         }
+     }
+ 
+   g_print (_("\nGNU Denemo, a gtk+ frontend for GNU Lilypond\n"));
+-  g_print (copytext);
++  g_print ("%s", copytext);
+ 
+   g_free (helptext);
+ 
diff --git a/audio/denemo/files/patch-src__midi.c b/audio/denemo/files/patch-src__midi.c
new file mode 100644
index 000000000000..591666dc6344
--- /dev/null
+++ b/audio/denemo/files/patch-src__midi.c
@@ -0,0 +1,11 @@
+--- src/midi.c.orig	2009-08-24 03:03:26.000000000 +0900
++++ src/midi.c	2009-09-28 17:25:00.000000000 +0900
+@@ -384,7 +384,7 @@
+   if(channel)
+     g_io_channel_shutdown(channel, FALSE, &error);
+   if(error)
+-    g_warning(error->message);
++    g_warning("%s", error->message);
+   else
+     channel = NULL;
+ #endif
diff --git a/audio/denemo/files/patch-src__mousing.c b/audio/denemo/files/patch-src__mousing.c
new file mode 100644
index 000000000000..a158217b2c33
--- /dev/null
+++ b/audio/denemo/files/patch-src__mousing.c
@@ -0,0 +1,16 @@
+--- src/mousing.c.orig	2009-08-24 03:03:26.000000000 +0900
++++ src/mousing.c	2009-09-28 18:48:47.000000000 +0900
+@@ -177,8 +177,11 @@
+ 		     && pi->measure_number >= si->rightmeasurenum);
+     
+   pi->the_staff = g_list_nth (si->thescore, pi->staff_number - 1);
+-  pi->the_measure
+-    = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
++  if (pi->the_staff != NULL)
++    pi->the_measure
++      = nth_measure_node_in_staff (pi->the_staff, pi->measure_number - 1);
++  else
++    pi->the_measure = NULL;
+   if (pi->the_measure != NULL){ /*check to make sure user did not click on empty space*/
+ 	  obj_iterator = (objnode *) pi->the_measure->data;
+ 	  pi->cursor_x = 0;
diff --git a/audio/denemo/files/patch-src__view.c b/audio/denemo/files/patch-src__view.c
new file mode 100644
index 000000000000..a19383b7f97d
--- /dev/null
+++ b/audio/denemo/files/patch-src__view.c
@@ -0,0 +1,11 @@
+--- 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-descr b/audio/denemo/pkg-descr
index f79857786164..0252d5a0f761 100644
--- a/audio/denemo/pkg-descr
+++ b/audio/denemo/pkg-descr
@@ -3,7 +3,6 @@ from the README:
 GNU Denemo is a graphical music notation program.  It is intended
 to be used in conjunction with GNU Lilypond.
 
-WWW:  http://www.gnu.org/software/denemo/denemo.html
-      http://denemo.sourceforge.net/
+WWW:  http://www.denemo.org/
 
 Trevor Johnson
diff --git a/audio/denemo/pkg-plist b/audio/denemo/pkg-plist
index 025dfe4100fc..877a608db702 100644
--- a/audio/denemo/pkg-plist
+++ b/audio/denemo/pkg-plist
@@ -1,18 +1,183 @@
 bin/denemo
-include/denemo/denemo.h
-include/denemo/denemo_api.h
-include/denemo/denemo_objects.h
-include/denemo/denemo_types.h
-include/denemo/denemo_version.h
+bin/smfsh
+%%ETCDIR%%/denemo.conf
+include/smf.h
 share/applications/denemo.desktop
-%%DATADIR%%/denemo.conf
-%%DATADIR%%/denemo.keymaprc
-%%DATADIR%%/denemorc.xml
+%%DATADIR%%/actions/Default.cmdset
+%%DATADIR%%/actions/Empty.cmdset
+%%DATADIR%%/actions/Makefile
+%%DATADIR%%/actions/Makefile.am
+%%DATADIR%%/actions/Makefile.in
+%%DATADIR%%/actions/NumericKeypad.cmdset
+%%DATADIR%%/actions/bitmaps/Anacrusis.png
+%%DATADIR%%/actions/bitmaps/Barline.png
+%%DATADIR%%/actions/bitmaps/CheckMark.png
+%%DATADIR%%/actions/bitmaps/ClosingBarline.png
+%%DATADIR%%/actions/bitmaps/CrossSign.png
+%%DATADIR%%/actions/bitmaps/DoubleBarline.png
+%%DATADIR%%/actions/bitmaps/DrumClef.png
+%%DATADIR%%/actions/bitmaps/EncircleChar
+%%DATADIR%%/actions/bitmaps/EndBeam.png
+%%DATADIR%%/actions/bitmaps/Fortissimo.png
+%%DATADIR%%/actions/bitmaps/Glissando.png
+%%DATADIR%%/actions/bitmaps/LargeEight.png
+%%DATADIR%%/actions/bitmaps/LargeFive.png
+%%DATADIR%%/actions/bitmaps/LargeFour.png
+%%DATADIR%%/actions/bitmaps/LargeNine.png
+%%DATADIR%%/actions/bitmaps/LargeOne.png
+%%DATADIR%%/actions/bitmaps/LargeSeven.png
+%%DATADIR%%/actions/bitmaps/LargeSix.png
+%%DATADIR%%/actions/bitmaps/LargeThree.png
+%%DATADIR%%/actions/bitmaps/LargeTwo.png
+%%DATADIR%%/actions/bitmaps/LargeZero.png
+%%DATADIR%%/actions/bitmaps/MezzoForte.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/StartBeam.png
+%%DATADIR%%/actions/bitmaps/StartDownStems.png
+%%DATADIR%%/actions/bitmaps/StartTupletNumbering.png
+%%DATADIR%%/actions/bitmaps/StartUpStems.png
+%%DATADIR%%/actions/bitmaps/StopTupletNumbering.png
+%%DATADIR%%/actions/denemo.scm
+%%DATADIR%%/actions/editscripts/D.C.AlFine.scm
+%%DATADIR%%/actions/editscripts/LHFinger.scm
+%%DATADIR%%/actions/editscripts/RehearsalMark.scm
+%%DATADIR%%/actions/editscripts/StaffSize.scm
+%%DATADIR%%/actions/editscripts/StringNum.scm
+%%DATADIR%%/actions/editscripts/Tempo.scm
+%%DATADIR%%/actions/editscripts/UnknownScoreTag.scm
+%%DATADIR%%/actions/init.denemo
+%%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/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/CountSteps
+%%DATADIR%%/actions/menus/MainMenu/Educational/DiatonicInterval
+%%DATADIR%%/actions/menus/MainMenu/Educational/LineOrSpace
+%%DATADIR%%/actions/menus/MainMenu/Educational/MIDI/CheckPitches
+%%DATADIR%%/actions/menus/MainMenu/Educational/MIDI/Conductor
+%%DATADIR%%/actions/menus/MainMenu/Educational/NoteNameSpeedTest
+%%DATADIR%%/actions/menus/MainMenu/Educational/ReadingNoteNames
+%%DATADIR%%/actions/menus/MainMenu/Educational/StepSkipOrSame
+%%DATADIR%%/actions/menus/MainMenu/Educational/UpDownOrSame
+%%DATADIR%%/actions/menus/MainMenu/Educational/init.scm
+%%DATADIR%%/actions/menus/MainMenu/HelpMenu/IRC
+%%DATADIR%%/actions/menus/MainMenu/ModeMenu/MIDI/AngryDelete
+%%DATADIR%%/actions/menus/MainMenu/ModeMenu/MIDI/CheckPitches
+%%DATADIR%%/actions/menus/MainMenu/ModeMenu/MIDI/FiguredBassFilterOn
+%%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/ChordMenu/ParenthesizeChord
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger0
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger1
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger2
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger3
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/Fingerings/Finger4
+%%DATADIR%%/actions/menus/ObjectMenu/Instruments/Guitar/LHFinger
+%%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/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/Ornaments/Trill+Above
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/Ornaments/Trill+Below
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/RehearsalMarks/RehearsalMark
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/Slurs/BeginPhrasingSlur
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/Slurs/EndPhrasingSlur
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/Slurs/SlurThree
+%%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/Fortissimo
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/MezzoForte
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings/init.scm
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Glissando
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/ParenthesizeChord
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/ParenthesizeNote
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Tempo Indications/Allegro
+%%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Tempo Indications/AllegroAssai
+%%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/ClosingBarline
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/DeleteBarline
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/DoubleBarline
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ForceBarline
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/ForceNewMeasure
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/LineBreak
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/PageBreak
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/RepeatEnd
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/RepeatEndStart
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/RepeatStart
+%%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu/SplitMeasure
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/HideMovement
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/MovementPageBreak
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Print Layout/Indent
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementPiece
+%%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc/MovementTitle
+%%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/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/RestEntry/EnterRest
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/StartDownStems
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl/StartUpStems
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/TiedNotes/InsertTiedNoteDuration
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/CloseLilyBlock
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/DiatonicShift/Third
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/OpenOctaveUp
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/SetTransposeIntervalFromSelection
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/TransposeNote
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/TransposeSelection
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/init.scm
+%%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Tremolo
+%%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/Other/DeleteLilyPondOnChord
+%%DATADIR%%/actions/menus/ObjectMenu/Other/DeleteLilyPondOnNote
+%%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/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/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/musicgames/ReadingNoteNames.denemo
 %%DATADIR%%/denemoui.xml
-%%DATADIR%%/english.keymaprc
-%%DATADIR%%/french.keymaprc
+%%DATADIR%%/examples
 %%DATADIR%%/instruments.xml
-%%DATADIR%%/italian.keymaprc
+%%DATADIR%%/manual
 %%DATADIR%%/pixmaps/accent.svg
 %%DATADIR%%/pixmaps/downbow.svg
 %%DATADIR%%/pixmaps/fermata.svg
@@ -146,20 +311,82 @@ share/applications/denemo.desktop
 %%DATADIR%%/pixmaps/trill.svg
 %%DATADIR%%/pixmaps/turn.svg
 %%DATADIR%%/pixmaps/upbow.svg
-%%DATADIR%%/speedy.keymaprc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/DESIGN
-%%PORTDOCS%%%%DOCSDIR%%/GOALS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%NLS%%share/locale/es/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/denemo.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/denemo.mo
+%%DATADIR%%/templates/band/BrassBand.denemo
+%%DATADIR%%/templates/band/BrassTrio.denemo
+%%DATADIR%%/templates/chamber/StringQuartet.denemo
+%%DATADIR%%/templates/choral/SATB-Piano.denemo
+%%DATADIR%%/templates/choral/SATB.denemo
+%%DATADIR%%/templates/jazz/JazzCombo.denemo
+share/fonts/truetype/denemo/Denemo.ttf
+share/fonts/truetype/denemo/LICENSE_OFL.txt
+share/locale/de/LC_MESSAGES/denemo.mo
+share/locale/es/LC_MESSAGES/denemo.mo
+share/locale/fr/LC_MESSAGES/denemo.mo
+share/locale/it/LC_MESSAGES/denemo.mo
+share/locale/sv/LC_MESSAGES/denemo.mo
 share/pixmaps/denemo.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/fonts/truetype/denemo
+@dirrmtry share/fonts/truetype
+@dirrmtry share/fonts
+@dirrm %%DATADIR%%/templates/jazz
+@dirrm %%DATADIR%%/templates/choral
+@dirrm %%DATADIR%%/templates/chamber
+@dirrm %%DATADIR%%/templates/band
+@dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/actions/musicgames
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu/PrintEffects
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/StaffMenu
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Titles Etc
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score/Print Layout
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Score
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Other
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Tuplets
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose/DiatonicShift
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Transpose
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/TiedNotes
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/StemControl
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/RestEntry
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/NoteheadSizes
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditModeNote/EditNote
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/EditModeNote
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests/Beaming
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/NotesRests
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Titles Etc
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu/Print Layout
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MovementMenu
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/MeasureMenu
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Tempo Indications
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks/Dynamic Markings
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Markings/TextMarks
+@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
+@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/ChordMenu
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu/Bookmarks
+@dirrm %%DATADIR%%/actions/menus/ObjectMenu
+@dirrm %%DATADIR%%/actions/menus/MainMenu/PlaybackMenu
+@dirrm %%DATADIR%%/actions/menus/MainMenu/ModeMenu/MIDI
+@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
+@dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu/Transpose
+@dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu/Select
+@dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu/KeyBindings
+@dirrm %%DATADIR%%/actions/menus/MainMenu/EditMenu
+@dirrm %%DATADIR%%/actions/menus/MainMenu
+@dirrm %%DATADIR%%/actions/menus
+@dirrm %%DATADIR%%/actions/editscripts
+@dirrm %%DATADIR%%/actions/bitmaps
+@dirrm %%DATADIR%%/actions
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrm include/denemo
+@dirrm %%ETCDIR%%