6 files changed, 476 insertions, 452 deletions

diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 44922d58c65d..e1a5e1b46afa 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tuxguitar
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	audio java
 MASTER_SITES=	SF:src \
 		http://www.alsa-project.org/~james/sound-fonts/:fluid
@@ -21,16 +20,19 @@ COMMENT=	A Multitrack tablature editor and player
 
 BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \
 		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \
+		${JAVALIBDIR}/gervill.jar:${PORTSDIR}/audio/gervill \
 		ant:${PORTSDIR}/devel/apache-ant \
 		gcj42:${PORTSDIR}/lang/gcc42-withgcjawt
 RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \
-		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext
+		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \
+		${JAVALIBDIR}/gervill.jar:${PORTSDIR}/audio/gervill
 LIB_DEPENDS=	fluidsynth.2:${PORTSDIR}/audio/fluidsynth
 
 MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
 
 USE_JAVA=	yes
+USE_GECKO=	xulrunner firefox mozilla
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.4+
@@ -43,13 +45,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 MAN1=		tuxguitar.1
 .endif
 
-USE_GECKO=	mozilla firefox seamonkey
-
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.gecko.mk"
-
-PLUGINS=	ascii compat converter gtp jsa lilypond midi musicxml \
-		oss pdf ptb tef tray fluidsynth
+PLUGINS=	ascii browser-ftp compat converter fluidsynth gervill gtp \
+		jsa lilypond midi musicxml oss pdf ptb tef tray tuner
 
 SUB_FILES=	tuxguitar
 SUB_LIST=	DATADIR=${DATADIR} \
@@ -62,7 +60,7 @@ post-extract:
 
 post-patch:
 	${REINPLACE_CMD} -e 's|linux|freebsd|;s|JAVA_VERS|JAVA_PORT_VERSION|g; \
-		/TuxGuitar-alsa/d; s|/usr/lib/jvm/java-6-sun/|${JAVA_HOME}|' \
+		/TuxGuitar-alsa/d; s|/usr/lib/jvm/java-6-sun/|${JAVA_HOME}|;' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g; \
@@ -72,19 +70,17 @@ post-patch:
 		 s|%%DISTVERSION%%|${DISTVERSION}|g; \
 		 s|%%DOCSDIR%%|${DOCSDIR}|g' \
 		${WRKSRC}/TuxGuitar/build.properties
-	${REINPLACE_CMD} -e 's|$${path.swt}|${JAVALIBDIR}/swt.jar|g' \
-		${WRKSRC}/TuxGuitar-fluidsynth/build.xml \
-		${WRKSRC}/TuxGuitar-lilypond/build.xml \
-		${WRKSRC}/TuxGuitar-midi/build.xml \
-		${WRKSRC}/TuxGuitar-pdf/build.xml \
-		${WRKSRC}/TuxGuitar-tray/build.xml \
-		${WRKSRC}/TuxGuitar-converter/build.xml \
-		${WRKSRC}/TuxGuitar-jsa/build.xml \
-		${WRKSRC}/TuxGuitar-oss/build.xml
+.for p in ${PLUGINS}
+	${REINPLACE_CMD} -e \
+	    's|$${path.swt}|${JAVALIBDIR}/swt.jar|; \
+	     s|$${path.itext}|${JAVALIBDIR}/itext.jar|' \
+		${WRKSRC}/TuxGuitar-${p}/build.xml
+.endfor
 	${REINPLACE_CMD} -e 's|$${lib.swt.jar}|${JAVALIBDIR}/swt.jar|g' \
 		${WRKSRC}/TuxGuitar/build.xml
-	${REINPLACE_CMD} -e 's|$${path.itext}|${JAVALIBDIR}/itext.jar|g' \
-		${WRKSRC}/TuxGuitar-pdf/build.xml
+	${REINPLACE_CMD} -e 's|$${path.gervill}|${JAVALIBDIR}/gervill.jar|g' \
+		${WRKSRC}/TuxGuitar-gervill/build.xml
+
 	${REINPLACE_CMD} -e 's|CFLAGS?|CFLAGS+|g;\
 	    s|gcj|${LOCALBASE}/bin/gcj42|;\
 	    s|-I|-I${JAVA_HOME}/include -I${LOCALBASE}/include -I|;\
@@ -136,4 +132,5 @@ post-install:
 	@${ECHO} "enable them."
 	@${ECHO}
 
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 .include <bsd.port.post.mk>
diff --git a/audio/tuxguitar/distinfo b/audio/tuxguitar/distinfo
index d51170329c90..4355ab791e60 100644
--- a/audio/tuxguitar/distinfo
+++ b/audio/tuxguitar/distinfo
@@ -1,6 +1,6 @@
-MD5 (tuxguitar-src-1.0.tar.gz) = a9873adad0df58202d889648eb484879
-SHA256 (tuxguitar-src-1.0.tar.gz) = 422336d69994c5041331ac95fc899e91e929b4a224910f75b4acd7cfd6f85c8a
-SIZE (tuxguitar-src-1.0.tar.gz) = 2335631
+MD5 (tuxguitar-src-1.1.tar.gz) = fbb664eca06e564bf1f2384930df2a7e
+SHA256 (tuxguitar-src-1.1.tar.gz) = c3ad3abbc98fe21f525fbbdd38391ee876533ef29f16ea8826dd283853237073
+SIZE (tuxguitar-src-1.1.tar.gz) = 2478621
 MD5 (8MBGMSFX.SF2) = 568ddfaa56db2bb45fc96e28dcc711ad
 SHA256 (8MBGMSFX.SF2) = 6c2ff6e9219989e0a2d39e633cbdc7d8f8a575903985160495aeab5d01cc48e6
 SIZE (8MBGMSFX.SF2) = 7557598
diff --git a/audio/tuxguitar/files/patch-Makefile b/audio/tuxguitar/files/patch-Makefile
new file mode 100644
index 000000000000..fa8c24adfab5
--- /dev/null
+++ b/audio/tuxguitar/files/patch-Makefile
@@ -0,0 +1,12 @@
+--- Makefile.orig	2009-03-31 18:30:44.000000000 +0200
++++ Makefile		2009-04-06 21:59:45.000000000 +0200
+@@ -84,6 +84,9 @@
+  ./TuxGuitar-alsa/tuxguitar-alsa.jar \
+  ./TuxGuitar-alsa/jni/libtuxguitar-alsa-jni.so \
+  ./TuxGuitar-oss/tuxguitar-oss.jar \
++ ./TuxGuitar-tuner/tuxguitar-tuner.jar \
++ ./TuxGuitar-browser-ftp/tuxguitar-browser-ftp.jar \
++ ./TuxGuitar-gervill/tuxguitar-gervill.jar \
+  ./TuxGuitar-oss/jni/libtuxguitar-oss-jni.so \
+  ./TuxGuitar-fluidsynth/tuxguitar-fluidsynth.jar \
+  ./TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so \
diff --git a/audio/tuxguitar/files/patch-TuxGuitar_build.properties b/audio/tuxguitar/files/patch-TuxGuitar_build.properties
index a5ccd3236b86..2c0f28ac9380 100644
--- a/audio/tuxguitar/files/patch-TuxGuitar_build.properties
+++ b/audio/tuxguitar/files/patch-TuxGuitar_build.properties
@@ -1,5 +1,5 @@
---- TuxGuitar/build.properties.orig	2008-06-26 21:19:11.000000000 +0200
-+++ TuxGuitar/build.properties	2008-06-26 21:20:50.000000000 +0200
+--- TuxGuitar/build.properties.orig	2009-04-04 12:11:23.000000000 +0200
++++ TuxGuitar/build.properties	2009-04-04 12:12:48.000000000 +0200
 @@ -5,15 +5,15 @@
  ant.build.javac.target=1.4
  
@@ -8,11 +8,11 @@
 -lib.swt.jar=lib/swt.jar
 -lib.itext.jar=lib/itext.jar
 -dist.file=xml/build-linux.xml
-+lib.swt.jni=%%LOCALBASE%%lib/
++lib.swt.jni=%%LOCALBASE%%/lib/
 +lib.swt.jar=%%JAVAJARDIR%%/swt.jar
 +lib.itext.jar=%%JAVAJARDIR%%/itext.jar
 +dist.file=xml/build-freebsd.xml
- dist.version=1.0
+ dist.version=1.1
 -dist.jar.path=./
 -dist.bin.path=./
 -dist.share.path=share/
diff --git a/audio/tuxguitar/files/tuxguitar.in b/audio/tuxguitar/files/tuxguitar.in
index cdf16e454575..1541355725ec 100644
--- a/audio/tuxguitar/files/tuxguitar.in
+++ b/audio/tuxguitar/files/tuxguitar.in
@@ -9,6 +9,7 @@ CLASSPATH=${CLASSPATH}
 CLASSPATH=${CLASSPATH}:%%DATADIR%%
 CLASSPATH=${CLASSPATH}:%%DATADIR%%/tuxguitar.jar
 CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/swt.jar
+CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/gervill.jar
 CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/itext.jar
 
 JAVA_FLAGS="-Xms128m -Xmx128m -cp ${CLASSPATH}"
diff --git a/audio/tuxguitar/pkg-plist b/audio/tuxguitar/pkg-plist
index 9e5e914ea285..7dd06c13a9bc 100644
--- a/audio/tuxguitar/pkg-plist
+++ b/audio/tuxguitar/pkg-plist
@@ -1,13 +1,65 @@
 bin/tuxguitar
-lib/libtuxguitar-oss-jni.so
 lib/libtuxguitar-fluidsynth-jni.so
-share/pixmaps/tuxguitar.xpm
-share/applications/tuxguitar.desktop
+lib/libtuxguitar-oss-jni.so
 %%DATADIR%%/8MBGMSFX.SF2
-%%DATADIR%%/tuxguitar.jar
-%%DATADIR%%/tuxguitar.tg
-%%DATADIR%%/scales/scales.xml
+%%DATADIR%%/help/about.html
+%%DATADIR%%/help/css/styles.css
+%%DATADIR%%/help/edit_chord.html
+%%DATADIR%%/help/edit_effects.html
+%%DATADIR%%/help/edit_matrix.html
+%%DATADIR%%/help/editing_song.html
+%%DATADIR%%/help/editing_track.html
+%%DATADIR%%/help/file_formats.html
+%%DATADIR%%/help/images/edit/chord_dialog.png
+%%DATADIR%%/help/images/edit/chord_settings_dialog.png
+%%DATADIR%%/help/images/edit/ed_lyrics.png
+%%DATADIR%%/help/images/edit/effects_bend.png
+%%DATADIR%%/help/images/edit/effects_grace.png
+%%DATADIR%%/help/images/edit/effects_tremolobar.png
+%%DATADIR%%/help/images/edit/insert_named_chord.png
+%%DATADIR%%/help/images/edit/matrix_editor.png
+%%DATADIR%%/help/images/edit/repeats.png
+%%DATADIR%%/help/images/edit/sed_mixer_dialog.png
+%%DATADIR%%/help/images/edit/typing.png
+%%DATADIR%%/help/images/start/fs_new_file.png
+%%DATADIR%%/help/images/start/fs_song_table.png
+%%DATADIR%%/help/images/start/fs_track_properties.png
+%%DATADIR%%/help/images/start/p_mode.png
+%%DATADIR%%/help/images/start/tb_add_track.png
+%%DATADIR%%/help/images/start/tb_composition.png
+%%DATADIR%%/help/images/start/tb_duration.png
+%%DATADIR%%/help/images/start/tb_dynamics.png
+%%DATADIR%%/help/images/start/tb_edit_menu.png
+%%DATADIR%%/help/images/start/tb_edit_mode.png
+%%DATADIR%%/help/images/start/tb_effects.png
+%%DATADIR%%/help/images/start/tb_file_menu.png
+%%DATADIR%%/help/images/start/tb_layout.png
+%%DATADIR%%/help/images/start/tb_markers.png
+%%DATADIR%%/help/images/start/tb_note.png
+%%DATADIR%%/help/images/start/tb_properties.png
+%%DATADIR%%/help/images/start/tb_props_diff.png
+%%DATADIR%%/help/images/start/tb_transport.png
+%%DATADIR%%/help/images/start/tb_view.png
+%%DATADIR%%/help/images/tools/converter.png
+%%DATADIR%%/help/images/tools/keybinding_editor.png
+%%DATADIR%%/help/images/tools/plugins_dialog.png
+%%DATADIR%%/help/images/tools/settings_skin.png
+%%DATADIR%%/help/index.html
+%%DATADIR%%/help/js/jquery-1.2.6.min.js
+%%DATADIR%%/help/js/jquery.menu.js
+%%DATADIR%%/help/license.html
+%%DATADIR%%/help/start_first_steps.html
+%%DATADIR%%/help/start_playing.html
+%%DATADIR%%/help/start_toolbars.html
+%%DATADIR%%/help/tools_converter.html
+%%DATADIR%%/help/tools_keybinding.html
+%%DATADIR%%/help/tools_plugins.html
+%%DATADIR%%/help/tools_shortcuts.html
+%%DATADIR%%/help/tools_skin.html
+%%DATADIR%%/help/tools_sound.html
+%%DATADIR%%/help/whatsnew.html
 %%DATADIR%%/lang/messages.properties
+%%DATADIR%%/lang/messages_ca.properties
 %%DATADIR%%/lang/messages_cs.properties
 %%DATADIR%%/lang/messages_de.properties
 %%DATADIR%%/lang/messages_en.properties
@@ -15,6 +67,7 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/lang/messages_fr.properties
 %%DATADIR%%/lang/messages_hu.properties
 %%DATADIR%%/lang/messages_it.properties
+%%DATADIR%%/lang/messages_ja.properties
 %%DATADIR%%/lang/messages_nl.properties
 %%DATADIR%%/lang/messages_pl.properties
 %%DATADIR%%/lang/messages_pt.properties
@@ -23,495 +76,456 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/lang/messages_sv.properties
 %%DATADIR%%/lang/messages_uk.properties
 %%DATADIR%%/lang/messages_vi.properties
+%%DATADIR%%/lang/messages_zh_GB.properties
 %%DATADIR%%/lang/messages_zh_TW.properties
+%%DATADIR%%/plugins/tuxguitar-ascii.jar
+%%DATADIR%%/plugins/tuxguitar-browser-ftp.jar
 %%DATADIR%%/plugins/tuxguitar-compat.jar
 %%DATADIR%%/plugins/tuxguitar-converter.jar
-%%DATADIR%%/plugins/tuxguitar-ascii.jar
 %%DATADIR%%/plugins/tuxguitar-fluidsynth.jar
+%%DATADIR%%/plugins/tuxguitar-gervill.jar
 %%DATADIR%%/plugins/tuxguitar-gtp.jar
+%%DATADIR%%/plugins/tuxguitar-jsa.jar
+%%DATADIR%%/plugins/tuxguitar-lilypond.jar
+%%DATADIR%%/plugins/tuxguitar-midi.jar
 %%DATADIR%%/plugins/tuxguitar-musicxml.jar
+%%DATADIR%%/plugins/tuxguitar-oss.jar
+%%DATADIR%%/plugins/tuxguitar-pdf.jar
 %%DATADIR%%/plugins/tuxguitar-ptb.jar
 %%DATADIR%%/plugins/tuxguitar-tef.jar
-%%DATADIR%%/plugins/tuxguitar-pdf.jar
-%%DATADIR%%/plugins/tuxguitar-midi.jar
 %%DATADIR%%/plugins/tuxguitar-tray.jar
-%%DATADIR%%/plugins/tuxguitar-lilypond.jar
-%%DATADIR%%/plugins/tuxguitar-jsa.jar
-%%DATADIR%%/plugins/tuxguitar-oss.jar
-%%DATADIR%%/help/contents.xml
-%%DATADIR%%/help/html/start_toolbars.html
-%%DATADIR%%/help/html/edit_effects.html
-%%DATADIR%%/help/html/edit_chord.html
-%%DATADIR%%/help/html/start_playing.html
-%%DATADIR%%/help/html/whatsnew.html
-%%DATADIR%%/help/html/editing_track.html
-%%DATADIR%%/help/html/tools_skin.html
-%%DATADIR%%/help/html/start_first_steps.html
-%%DATADIR%%/help/html/styles.css
-%%DATADIR%%/help/html/edit_matrix.html
-%%DATADIR%%/help/html/about.html
-%%DATADIR%%/help/html/tools_shortcuts.html
-%%DATADIR%%/help/html/editing_song.html
-%%DATADIR%%/help/html/tools_sound.html
-%%DATADIR%%/help/html/tools_converter.html
-%%DATADIR%%/help/html/introduction.html
-%%DATADIR%%/help/html/tools_plugins.html
-%%DATADIR%%/help/html/license.html
-%%DATADIR%%/help/html/tools_keybinding.html
-%%DATADIR%%/help/html/file_formats.html
-%%DATADIR%%/help/images/edit/effects_grace.png
-%%DATADIR%%/help/images/edit/effects_tremolobar.png
-%%DATADIR%%/help/images/edit/sed_mixer_dialog.png
-%%DATADIR%%/help/images/edit/repeats.png
-%%DATADIR%%/help/images/edit/typing.png
-%%DATADIR%%/help/images/edit/effects_bend.png
-%%DATADIR%%/help/images/edit/chord_settings_dialog.png
-%%DATADIR%%/help/images/edit/matrix_editor.png
-%%DATADIR%%/help/images/edit/chord_dialog.png
-%%DATADIR%%/help/images/edit/ed_lyrics.png
-%%DATADIR%%/help/images/edit/insert_named_chord.png
-%%DATADIR%%/help/images/start/fs_song_table.png
-%%DATADIR%%/help/images/start/tb_transport.png
-%%DATADIR%%/help/images/start/tb_layout.png
-%%DATADIR%%/help/images/start/tb_effects.png
-%%DATADIR%%/help/images/start/tb_properties.png
-%%DATADIR%%/help/images/start/tb_note.png
-%%DATADIR%%/help/images/start/tb_view.png
-%%DATADIR%%/help/images/start/tb_file_menu.png
-%%DATADIR%%/help/images/start/tb_composition.png
-%%DATADIR%%/help/images/start/tb_duration.png
-%%DATADIR%%/help/images/start/tb_props_diff.png
-%%DATADIR%%/help/images/start/tb_dynamics.png
-%%DATADIR%%/help/images/start/tb_edit_mode.png
-%%DATADIR%%/help/images/start/fs_new_file.png
-%%DATADIR%%/help/images/start/tb_edit_menu.png
-%%DATADIR%%/help/images/start/tb_markers.png
-%%DATADIR%%/help/images/start/fs_track_properties.png
-%%DATADIR%%/help/images/start/tb_add_track.png
-%%DATADIR%%/help/images/start/p_mode.png
-%%DATADIR%%/help/images/introduction/header.png
-%%DATADIR%%/help/images/tools/plugins_dialog.png
-%%DATADIR%%/help/images/tools/keybinding_editor.png
-%%DATADIR%%/help/images/tools/settings_skin.png
-%%DATADIR%%/help/images/tools/converter.png
-%%DATADIR%%/skins/Lavender/transport_first_2.png
-%%DATADIR%%/skins/Lavender/song_properties.png
+%%DATADIR%%/plugins/tuxguitar-tuner.jar
+%%DATADIR%%/scales/scales.xml
+%%DATADIR%%/skins/Lavender/1.png
+%%DATADIR%%/skins/Lavender/16.png
+%%DATADIR%%/skins/Lavender/2.png
+%%DATADIR%%/skins/Lavender/32.png
+%%DATADIR%%/skins/Lavender/4.png
+%%DATADIR%%/skins/Lavender/64.png
+%%DATADIR%%/skins/Lavender/8.png
+%%DATADIR%%/skins/Lavender/about_authors.png
 %%DATADIR%%/skins/Lavender/about_description.png
-%%DATADIR%%/skins/Lavender/transport_icon_last_2.png
-%%DATADIR%%/skins/Lavender/layout_page.png
-%%DATADIR%%/skins/Lavender/dynamic_mf.png
-%%DATADIR%%/skins/Lavender/effect_grace.png
-%%DATADIR%%/skins/Lavender/transport_play_2.png
-%%DATADIR%%/skins/Lavender/save.png
-%%DATADIR%%/skins/Lavender/transport_next_1.png
-%%DATADIR%%/skins/Lavender/effect_fade_in.png
-%%DATADIR%%/skins/Lavender/effect_tapping.png
-%%DATADIR%%/skins/Lavender/effect_heavy_accentuated.png
-%%DATADIR%%/skins/Lavender/effect_trill.png
-%%DATADIR%%/skins/Lavender/dynamic_f.png
-%%DATADIR%%/skins/Lavender/skin.properties
-%%DATADIR%%/skins/Lavender/layout_compact.png
-%%DATADIR%%/skins/Lavender/transport_stop_1.png
-%%DATADIR%%/skins/Lavender/option_language.png
-%%DATADIR%%/skins/Lavender/fret.png
+%%DATADIR%%/skins/Lavender/about_license.png
+%%DATADIR%%/skins/Lavender/browser_back.png
+%%DATADIR%%/skins/Lavender/browser_file.png
 %%DATADIR%%/skins/Lavender/browser_folder.png
-%%DATADIR%%/skins/Lavender/marker_remove.png
-%%DATADIR%%/skins/Lavender/1.png
-%%DATADIR%%/skins/Lavender/transport_icon_first_2.png
-%%DATADIR%%/skins/Lavender/closerepeat.png
-%%DATADIR%%/skins/Lavender/effect_tremolo_bar.png
-%%DATADIR%%/skins/Lavender/effect_dead.png
-%%DATADIR%%/skins/Lavender/dynamic_pp.png
 %%DATADIR%%/skins/Lavender/browser_new.png
-%%DATADIR%%/skins/Lavender/edit_mode_selection.png
-%%DATADIR%%/skins/Lavender/transport_last_1.png
-%%DATADIR%%/skins/Lavender/dynamic_p.png
-%%DATADIR%%/skins/Lavender/icon-96x96.png
-%%DATADIR%%/skins/Lavender/effect_tremolo_picking.png
-%%DATADIR%%/skins/Lavender/about_authors.png
-%%DATADIR%%/skins/Lavender/logo.png
+%%DATADIR%%/skins/Lavender/browser_refresh.png
+%%DATADIR%%/skins/Lavender/browser_root.png
+%%DATADIR%%/skins/Lavender/chord.png
+%%DATADIR%%/skins/Lavender/closerepeat.png
+%%DATADIR%%/skins/Lavender/dotted.png
+%%DATADIR%%/skins/Lavender/doubledotted.png
+%%DATADIR%%/skins/Lavender/dynamic_f.png
 %%DATADIR%%/skins/Lavender/dynamic_ff.png
-%%DATADIR%%/skins/Lavender/marker_first.png
-%%DATADIR%%/skins/Lavender/skin-preview.png
-%%DATADIR%%/skins/Lavender/timesignature.png
-%%DATADIR%%/skins/Lavender/icon.png
-%%DATADIR%%/skins/Lavender/edit_mode_edition_no_natural.png
+%%DATADIR%%/skins/Lavender/dynamic_fff.png
+%%DATADIR%%/skins/Lavender/dynamic_mf.png
 %%DATADIR%%/skins/Lavender/dynamic_mp.png
-%%DATADIR%%/skins/Lavender/repeat_alternative.png
+%%DATADIR%%/skins/Lavender/dynamic_p.png
+%%DATADIR%%/skins/Lavender/dynamic_pp.png
+%%DATADIR%%/skins/Lavender/dynamic_ppp.png
 %%DATADIR%%/skins/Lavender/edit_mode_edition.png
-%%DATADIR%%/skins/Lavender/transport_metronome.png
-%%DATADIR%%/skins/Lavender/transport_icon_play_2.png
-%%DATADIR%%/skins/Lavender/icon-16x16.png
-%%DATADIR%%/skins/Lavender/transport_icon_pause.png
-%%DATADIR%%/skins/Lavender/transport_pause.png
-%%DATADIR%%/skins/Lavender/grace.png
-%%DATADIR%%/skins/Lavender/transport_previous_2.png
-%%DATADIR%%/skins/Lavender/tempoicon.png
-%%DATADIR%%/skins/Lavender/4.png
+%%DATADIR%%/skins/Lavender/edit_mode_edition_no_natural.png
+%%DATADIR%%/skins/Lavender/edit_mode_selection.png
+%%DATADIR%%/skins/Lavender/edit_redo.png
+%%DATADIR%%/skins/Lavender/edit_undo.png
+%%DATADIR%%/skins/Lavender/edit_voice_1.png
+%%DATADIR%%/skins/Lavender/edit_voice_2.png
+%%DATADIR%%/skins/Lavender/effect_accentuated.png
+%%DATADIR%%/skins/Lavender/effect_bend.png
+%%DATADIR%%/skins/Lavender/effect_dead.png
+%%DATADIR%%/skins/Lavender/effect_fade_in.png
+%%DATADIR%%/skins/Lavender/effect_ghost.png
+%%DATADIR%%/skins/Lavender/effect_grace.png
+%%DATADIR%%/skins/Lavender/effect_hammer.png
+%%DATADIR%%/skins/Lavender/effect_harmonic.png
+%%DATADIR%%/skins/Lavender/effect_heavy_accentuated.png
 %%DATADIR%%/skins/Lavender/effect_palm_mute.png
-%%DATADIR%%/skins/Lavender/track_remove.png
 %%DATADIR%%/skins/Lavender/effect_popping.png
-%%DATADIR%%/skins/Lavender/option_skin.png
-%%DATADIR%%/skins/Lavender/effect_vibrato.png
-%%DATADIR%%/skins/Lavender/transport_first_1.png
-%%DATADIR%%/skins/Lavender/edit_undo.png
+%%DATADIR%%/skins/Lavender/effect_slapping.png
 %%DATADIR%%/skins/Lavender/effect_slide.png
-%%DATADIR%%/skins/Lavender/icon-24x24.png
-%%DATADIR%%/skins/Lavender/2.png
-%%DATADIR%%/skins/Lavender/settings.png
-%%DATADIR%%/skins/Lavender/transport_last_2.png
+%%DATADIR%%/skins/Lavender/effect_staccato.png
+%%DATADIR%%/skins/Lavender/effect_tapping.png
+%%DATADIR%%/skins/Lavender/effect_tremolo_bar.png
+%%DATADIR%%/skins/Lavender/effect_tremolo_picking.png
+%%DATADIR%%/skins/Lavender/effect_trill.png
+%%DATADIR%%/skins/Lavender/effect_vibrato.png
+%%DATADIR%%/skins/Lavender/firstfret.png
+%%DATADIR%%/skins/Lavender/fret.png
 %%DATADIR%%/skins/Lavender/fretboard.png
-%%DATADIR%%/skins/Lavender/effect_ghost.png
-%%DATADIR%%/skins/Lavender/8.png
-%%DATADIR%%/skins/Lavender/transport_icon_stop_2.png
-%%DATADIR%%/skins/Lavender/transport_icon_last_1.png
-%%DATADIR%%/skins/Lavender/doubledotted.png
-%%DATADIR%%/skins/Lavender/marker_list.png
-%%DATADIR%%/skins/Lavender/edit_redo.png
-%%DATADIR%%/skins/Lavender/openrepeat.png
-%%DATADIR%%/skins/Lavender/effect_hammer.png
+%%DATADIR%%/skins/Lavender/grace.png
+%%DATADIR%%/skins/Lavender/icon-16x16.png
+%%DATADIR%%/skins/Lavender/icon-24x24.png
+%%DATADIR%%/skins/Lavender/icon-32x32.png
+%%DATADIR%%/skins/Lavender/icon-48x48.png
+%%DATADIR%%/skins/Lavender/icon-64x64.png
+%%DATADIR%%/skins/Lavender/icon-96x96.png
+%%DATADIR%%/skins/Lavender/icon.icns
+%%DATADIR%%/skins/Lavender/icon.ico
+%%DATADIR%%/skins/Lavender/icon.png
+%%DATADIR%%/skins/Lavender/layout_compact.png
+%%DATADIR%%/skins/Lavender/layout_linear.png
 %%DATADIR%%/skins/Lavender/layout_multitrack.png
-%%DATADIR%%/skins/Lavender/effect_slapping.png
-%%DATADIR%%/skins/Lavender/transport_mode.png
-%%DATADIR%%/skins/Lavender/transport_icon_next_1.png
-%%DATADIR%%/skins/Lavender/transport_icon_first_1.png
-%%DATADIR%%/skins/Lavender/mixer.png
-%%DATADIR%%/skins/Lavender/transport_icon_next_2.png
-%%DATADIR%%/skins/Lavender/16.png
-%%DATADIR%%/skins/Lavender/dotted.png
+%%DATADIR%%/skins/Lavender/layout_page.png
 %%DATADIR%%/skins/Lavender/layout_score.png
-%%DATADIR%%/skins/Lavender/print-preview.png
-%%DATADIR%%/skins/Lavender/browser_refresh.png
+%%DATADIR%%/skins/Lavender/logo.png
+%%DATADIR%%/skins/Lavender/marker_add.png
+%%DATADIR%%/skins/Lavender/marker_first.png
+%%DATADIR%%/skins/Lavender/marker_last.png
+%%DATADIR%%/skins/Lavender/marker_list.png
+%%DATADIR%%/skins/Lavender/marker_next.png
+%%DATADIR%%/skins/Lavender/marker_previous.png
+%%DATADIR%%/skins/Lavender/marker_remove.png
+%%DATADIR%%/skins/Lavender/mixer.png
+%%DATADIR%%/skins/Lavender/new.png
+%%DATADIR%%/skins/Lavender/open.png
+%%DATADIR%%/skins/Lavender/openrepeat.png
+%%DATADIR%%/skins/Lavender/option_language.png
+%%DATADIR%%/skins/Lavender/option_skin.png
 %%DATADIR%%/skins/Lavender/option_sound.png
-%%DATADIR%%/skins/Lavender/chord.png
+%%DATADIR%%/skins/Lavender/option_style.png
+%%DATADIR%%/skins/Lavender/option_toolbars.png
+%%DATADIR%%/skins/Lavender/option_view.png
+%%DATADIR%%/skins/Lavender/print-preview.png
+%%DATADIR%%/skins/Lavender/print.png
+%%DATADIR%%/skins/Lavender/repeat_alternative.png
 %%DATADIR%%/skins/Lavender/save-as.png
+%%DATADIR%%/skins/Lavender/save.png
+%%DATADIR%%/skins/Lavender/settings.png
+%%DATADIR%%/skins/Lavender/skin-preview.png
+%%DATADIR%%/skins/Lavender/skin.properties
+%%DATADIR%%/skins/Lavender/song_properties.png
 %%DATADIR%%/skins/Lavender/splash.png
-%%DATADIR%%/skins/Lavender/new.png
-%%DATADIR%%/skins/Lavender/dynamic_fff.png
-%%DATADIR%%/skins/Lavender/marker_last.png
+%%DATADIR%%/skins/Lavender/tempo.png
+%%DATADIR%%/skins/Lavender/tempoicon.png
+%%DATADIR%%/skins/Lavender/tgdoc.icns
 %%DATADIR%%/skins/Lavender/tiednote.png
-%%DATADIR%%/skins/Lavender/effect_bend.png
-%%DATADIR%%/skins/Lavender/transport_icon_stop_1.png
-%%DATADIR%%/skins/Lavender/firstfret.png
-%%DATADIR%%/skins/Lavender/option_view.png
-%%DATADIR%%/skins/Lavender/icon-32x32.png
-%%DATADIR%%/skins/Lavender/effect_harmonic.png
-%%DATADIR%%/skins/Lavender/print.png
-%%DATADIR%%/skins/Lavender/transport_icon_previous_1.png
-%%DATADIR%%/skins/Lavender/tupleto.png
-%%DATADIR%%/skins/Lavender/effect_accentuated.png
-%%DATADIR%%/skins/Lavender/transport_play_1.png
+%%DATADIR%%/skins/Lavender/timesignature.png
 %%DATADIR%%/skins/Lavender/track_add.png
-%%DATADIR%%/skins/Lavender/marker_next.png
-%%DATADIR%%/skins/Lavender/icon-48x48.png
-%%DATADIR%%/skins/Lavender/browser_root.png
-%%DATADIR%%/skins/Lavender/layout_linear.png
-%%DATADIR%%/skins/Lavender/icon-64x64.png
+%%DATADIR%%/skins/Lavender/track_remove.png
+%%DATADIR%%/skins/Lavender/transport.png
+%%DATADIR%%/skins/Lavender/transport_first_1.png
+%%DATADIR%%/skins/Lavender/transport_first_2.png
+%%DATADIR%%/skins/Lavender/transport_icon_first_1.png
+%%DATADIR%%/skins/Lavender/transport_icon_first_2.png
+%%DATADIR%%/skins/Lavender/transport_icon_last_1.png
+%%DATADIR%%/skins/Lavender/transport_icon_last_2.png
+%%DATADIR%%/skins/Lavender/transport_icon_next_1.png
+%%DATADIR%%/skins/Lavender/transport_icon_next_2.png
+%%DATADIR%%/skins/Lavender/transport_icon_pause.png
+%%DATADIR%%/skins/Lavender/transport_icon_play_1.png
+%%DATADIR%%/skins/Lavender/transport_icon_play_2.png
+%%DATADIR%%/skins/Lavender/transport_icon_previous_1.png
 %%DATADIR%%/skins/Lavender/transport_icon_previous_2.png
-%%DATADIR%%/skins/Lavender/dynamic_ppp.png
+%%DATADIR%%/skins/Lavender/transport_icon_stop_1.png
+%%DATADIR%%/skins/Lavender/transport_icon_stop_2.png
+%%DATADIR%%/skins/Lavender/transport_last_1.png
+%%DATADIR%%/skins/Lavender/transport_last_2.png
+%%DATADIR%%/skins/Lavender/transport_metronome.png
+%%DATADIR%%/skins/Lavender/transport_mode.png
+%%DATADIR%%/skins/Lavender/transport_next_1.png
 %%DATADIR%%/skins/Lavender/transport_next_2.png
-%%DATADIR%%/skins/Lavender/browser_back.png
-%%DATADIR%%/skins/Lavender/transport_icon_play_1.png
-%%DATADIR%%/skins/Lavender/about_license.png
-%%DATADIR%%/skins/Lavender/tempo.png
-%%DATADIR%%/skins/Lavender/transport_stop_2.png
-%%DATADIR%%/skins/Lavender/option_style.png
-%%DATADIR%%/skins/Lavender/icon.icns
-%%DATADIR%%/skins/Lavender/marker_add.png
-%%DATADIR%%/skins/Lavender/effect_staccato.png
+%%DATADIR%%/skins/Lavender/transport_pause.png
+%%DATADIR%%/skins/Lavender/transport_play_1.png
+%%DATADIR%%/skins/Lavender/transport_play_2.png
 %%DATADIR%%/skins/Lavender/transport_previous_1.png
-%%DATADIR%%/skins/Lavender/browser_file.png
-%%DATADIR%%/skins/Lavender/32.png
-%%DATADIR%%/skins/Lavender/marker_previous.png
-%%DATADIR%%/skins/Lavender/transport.png
-%%DATADIR%%/skins/Lavender/64.png
-%%DATADIR%%/skins/Lavender/open.png
-%%DATADIR%%/skins/Lavender/option_toolbars.png
-%%DATADIR%%/skins/blue_serious/transport_first_2.png
-%%DATADIR%%/skins/blue_serious/song_properties.png
+%%DATADIR%%/skins/Lavender/transport_previous_2.png
+%%DATADIR%%/skins/Lavender/transport_stop_1.png
+%%DATADIR%%/skins/Lavender/transport_stop_2.png
+%%DATADIR%%/skins/Lavender/tupleto.png
+%%DATADIR%%/skins/blue_serious/1.png
+%%DATADIR%%/skins/blue_serious/16.png
+%%DATADIR%%/skins/blue_serious/2.png
+%%DATADIR%%/skins/blue_serious/32.png
+%%DATADIR%%/skins/blue_serious/4.png
+%%DATADIR%%/skins/blue_serious/64.png
+%%DATADIR%%/skins/blue_serious/8.png
+%%DATADIR%%/skins/blue_serious/about_authors.png
 %%DATADIR%%/skins/blue_serious/about_description.png
-%%DATADIR%%/skins/blue_serious/transport_icon_last_2.png
-%%DATADIR%%/skins/blue_serious/layout_page.png
-%%DATADIR%%/skins/blue_serious/dynamic_mf.png
-%%DATADIR%%/skins/blue_serious/effect_grace.png
-%%DATADIR%%/skins/blue_serious/transport_play_2.png
-%%DATADIR%%/skins/blue_serious/save.png
-%%DATADIR%%/skins/blue_serious/transport_next_1.png
-%%DATADIR%%/skins/blue_serious/effect_fade_in.png
-%%DATADIR%%/skins/blue_serious/effect_tapping.png
-%%DATADIR%%/skins/blue_serious/effect_heavy_accentuated.png
-%%DATADIR%%/skins/blue_serious/effect_trill.png
-%%DATADIR%%/skins/blue_serious/dynamic_f.png
-%%DATADIR%%/skins/blue_serious/skin.properties
-%%DATADIR%%/skins/blue_serious/layout_compact.png
-%%DATADIR%%/skins/blue_serious/transport_stop_1.png
-%%DATADIR%%/skins/blue_serious/option_language.png
-%%DATADIR%%/skins/blue_serious/fret.png
+%%DATADIR%%/skins/blue_serious/about_license.png
+%%DATADIR%%/skins/blue_serious/browser_back.png
+%%DATADIR%%/skins/blue_serious/browser_file.png
 %%DATADIR%%/skins/blue_serious/browser_folder.png
-%%DATADIR%%/skins/blue_serious/marker_remove.png
-%%DATADIR%%/skins/blue_serious/1.png
-%%DATADIR%%/skins/blue_serious/transport_icon_first_2.png
-%%DATADIR%%/skins/blue_serious/closerepeat.png
-%%DATADIR%%/skins/blue_serious/effect_tremolo_bar.png
-%%DATADIR%%/skins/blue_serious/effect_dead.png
-%%DATADIR%%/skins/blue_serious/dynamic_pp.png
 %%DATADIR%%/skins/blue_serious/browser_new.png
-%%DATADIR%%/skins/blue_serious/edit_mode_selection.png
-%%DATADIR%%/skins/blue_serious/transport_last_1.png
-%%DATADIR%%/skins/blue_serious/dynamic_p.png
-%%DATADIR%%/skins/blue_serious/icon-96x96.png
-%%DATADIR%%/skins/blue_serious/effect_tremolo_picking.png
-%%DATADIR%%/skins/blue_serious/about_authors.png
-%%DATADIR%%/skins/blue_serious/logo.png
+%%DATADIR%%/skins/blue_serious/browser_refresh.png
+%%DATADIR%%/skins/blue_serious/browser_root.png
+%%DATADIR%%/skins/blue_serious/chord.png
+%%DATADIR%%/skins/blue_serious/closerepeat.png
+%%DATADIR%%/skins/blue_serious/dotted.png
+%%DATADIR%%/skins/blue_serious/doubledotted.png
+%%DATADIR%%/skins/blue_serious/dynamic_f.png
 %%DATADIR%%/skins/blue_serious/dynamic_ff.png
-%%DATADIR%%/skins/blue_serious/marker_first.png
-%%DATADIR%%/skins/blue_serious/skin-preview.png
-%%DATADIR%%/skins/blue_serious/timesignature.png
-%%DATADIR%%/skins/blue_serious/icon.png
-%%DATADIR%%/skins/blue_serious/edit_mode_edition_no_natural.png
+%%DATADIR%%/skins/blue_serious/dynamic_fff.png
+%%DATADIR%%/skins/blue_serious/dynamic_mf.png
 %%DATADIR%%/skins/blue_serious/dynamic_mp.png
-%%DATADIR%%/skins/blue_serious/repeat_alternative.png
+%%DATADIR%%/skins/blue_serious/dynamic_p.png
+%%DATADIR%%/skins/blue_serious/dynamic_pp.png
+%%DATADIR%%/skins/blue_serious/dynamic_ppp.png
 %%DATADIR%%/skins/blue_serious/edit_mode_edition.png
-%%DATADIR%%/skins/blue_serious/transport_metronome.png
-%%DATADIR%%/skins/blue_serious/transport_icon_play_2.png
-%%DATADIR%%/skins/blue_serious/icon-16x16.png
-%%DATADIR%%/skins/blue_serious/transport_icon_pause.png
-%%DATADIR%%/skins/blue_serious/transport_pause.png
-%%DATADIR%%/skins/blue_serious/grace.png
-%%DATADIR%%/skins/blue_serious/transport_previous_2.png
-%%DATADIR%%/skins/blue_serious/tempoicon.png
-%%DATADIR%%/skins/blue_serious/4.png
+%%DATADIR%%/skins/blue_serious/edit_mode_edition_no_natural.png
+%%DATADIR%%/skins/blue_serious/edit_mode_selection.png
+%%DATADIR%%/skins/blue_serious/edit_redo.png
+%%DATADIR%%/skins/blue_serious/edit_undo.png
+%%DATADIR%%/skins/blue_serious/edit_voice_1.png
+%%DATADIR%%/skins/blue_serious/edit_voice_2.png
+%%DATADIR%%/skins/blue_serious/effect_accentuated.png
+%%DATADIR%%/skins/blue_serious/effect_bend.png
+%%DATADIR%%/skins/blue_serious/effect_dead.png
+%%DATADIR%%/skins/blue_serious/effect_fade_in.png
+%%DATADIR%%/skins/blue_serious/effect_ghost.png
+%%DATADIR%%/skins/blue_serious/effect_grace.png
+%%DATADIR%%/skins/blue_serious/effect_hammer.png
+%%DATADIR%%/skins/blue_serious/effect_harmonic.png
+%%DATADIR%%/skins/blue_serious/effect_heavy_accentuated.png
 %%DATADIR%%/skins/blue_serious/effect_palm_mute.png
-%%DATADIR%%/skins/blue_serious/track_remove.png
 %%DATADIR%%/skins/blue_serious/effect_popping.png
-%%DATADIR%%/skins/blue_serious/option_skin.png
-%%DATADIR%%/skins/blue_serious/effect_vibrato.png
-%%DATADIR%%/skins/blue_serious/transport_first_1.png
-%%DATADIR%%/skins/blue_serious/edit_undo.png
+%%DATADIR%%/skins/blue_serious/effect_slapping.png
 %%DATADIR%%/skins/blue_serious/effect_slide.png
-%%DATADIR%%/skins/blue_serious/icon-24x24.png
-%%DATADIR%%/skins/blue_serious/2.png
-%%DATADIR%%/skins/blue_serious/settings.png
-%%DATADIR%%/skins/blue_serious/transport_last_2.png
+%%DATADIR%%/skins/blue_serious/effect_staccato.png
+%%DATADIR%%/skins/blue_serious/effect_tapping.png
+%%DATADIR%%/skins/blue_serious/effect_tremolo_bar.png
+%%DATADIR%%/skins/blue_serious/effect_tremolo_picking.png
+%%DATADIR%%/skins/blue_serious/effect_trill.png
+%%DATADIR%%/skins/blue_serious/effect_vibrato.png
+%%DATADIR%%/skins/blue_serious/firstfret.png
+%%DATADIR%%/skins/blue_serious/fret.png
 %%DATADIR%%/skins/blue_serious/fretboard.png
-%%DATADIR%%/skins/blue_serious/effect_ghost.png
-%%DATADIR%%/skins/blue_serious/8.png
-%%DATADIR%%/skins/blue_serious/transport_icon_stop_2.png
-%%DATADIR%%/skins/blue_serious/transport_icon_last_1.png
-%%DATADIR%%/skins/blue_serious/doubledotted.png
-%%DATADIR%%/skins/blue_serious/marker_list.png
-%%DATADIR%%/skins/blue_serious/edit_redo.png
-%%DATADIR%%/skins/blue_serious/openrepeat.png
-%%DATADIR%%/skins/blue_serious/effect_hammer.png
+%%DATADIR%%/skins/blue_serious/grace.png
+%%DATADIR%%/skins/blue_serious/icon-16x16.png
+%%DATADIR%%/skins/blue_serious/icon-24x24.png
+%%DATADIR%%/skins/blue_serious/icon-32x32.png
+%%DATADIR%%/skins/blue_serious/icon-48x48.png
+%%DATADIR%%/skins/blue_serious/icon-64x64.png
+%%DATADIR%%/skins/blue_serious/icon-96x96.png
+%%DATADIR%%/skins/blue_serious/icon.icns
+%%DATADIR%%/skins/blue_serious/icon.ico
+%%DATADIR%%/skins/blue_serious/icon.png
+%%DATADIR%%/skins/blue_serious/layout_compact.png
+%%DATADIR%%/skins/blue_serious/layout_linear.png
 %%DATADIR%%/skins/blue_serious/layout_multitrack.png
-%%DATADIR%%/skins/blue_serious/effect_slapping.png
-%%DATADIR%%/skins/blue_serious/transport_mode.png
-%%DATADIR%%/skins/blue_serious/transport_icon_next_1.png
-%%DATADIR%%/skins/blue_serious/transport_icon_first_1.png
-%%DATADIR%%/skins/blue_serious/mixer.png
-%%DATADIR%%/skins/blue_serious/transport_icon_next_2.png
-%%DATADIR%%/skins/blue_serious/16.png
-%%DATADIR%%/skins/blue_serious/dotted.png
+%%DATADIR%%/skins/blue_serious/layout_page.png
 %%DATADIR%%/skins/blue_serious/layout_score.png
-%%DATADIR%%/skins/blue_serious/print-preview.png
-%%DATADIR%%/skins/blue_serious/browser_refresh.png
+%%DATADIR%%/skins/blue_serious/logo.png
+%%DATADIR%%/skins/blue_serious/marker_add.png
+%%DATADIR%%/skins/blue_serious/marker_first.png
+%%DATADIR%%/skins/blue_serious/marker_last.png
+%%DATADIR%%/skins/blue_serious/marker_list.png
+%%DATADIR%%/skins/blue_serious/marker_next.png
+%%DATADIR%%/skins/blue_serious/marker_previous.png
+%%DATADIR%%/skins/blue_serious/marker_remove.png
+%%DATADIR%%/skins/blue_serious/mixer.png
+%%DATADIR%%/skins/blue_serious/new.png
+%%DATADIR%%/skins/blue_serious/open.png
+%%DATADIR%%/skins/blue_serious/openrepeat.png
+%%DATADIR%%/skins/blue_serious/option_language.png
+%%DATADIR%%/skins/blue_serious/option_skin.png
 %%DATADIR%%/skins/blue_serious/option_sound.png
-%%DATADIR%%/skins/blue_serious/chord.png
+%%DATADIR%%/skins/blue_serious/option_style.png
+%%DATADIR%%/skins/blue_serious/option_toolbars.png
+%%DATADIR%%/skins/blue_serious/option_view.png
+%%DATADIR%%/skins/blue_serious/print-preview.png
+%%DATADIR%%/skins/blue_serious/print.png
+%%DATADIR%%/skins/blue_serious/repeat_alternative.png
 %%DATADIR%%/skins/blue_serious/save-as.png
+%%DATADIR%%/skins/blue_serious/save.png
+%%DATADIR%%/skins/blue_serious/settings.png
+%%DATADIR%%/skins/blue_serious/skin-preview.png
+%%DATADIR%%/skins/blue_serious/skin.properties
+%%DATADIR%%/skins/blue_serious/song_properties.png
 %%DATADIR%%/skins/blue_serious/splash.png
-%%DATADIR%%/skins/blue_serious/new.png
-%%DATADIR%%/skins/blue_serious/dynamic_fff.png
-%%DATADIR%%/skins/blue_serious/marker_last.png
+%%DATADIR%%/skins/blue_serious/tempo.png
+%%DATADIR%%/skins/blue_serious/tempoicon.png
 %%DATADIR%%/skins/blue_serious/tiednote.png
-%%DATADIR%%/skins/blue_serious/effect_bend.png
-%%DATADIR%%/skins/blue_serious/transport_icon_stop_1.png
-%%DATADIR%%/skins/blue_serious/firstfret.png
-%%DATADIR%%/skins/blue_serious/option_view.png
-%%DATADIR%%/skins/blue_serious/icon-32x32.png
-%%DATADIR%%/skins/blue_serious/effect_harmonic.png
-%%DATADIR%%/skins/blue_serious/print.png
-%%DATADIR%%/skins/blue_serious/transport_icon_previous_1.png
-%%DATADIR%%/skins/blue_serious/tupleto.png
-%%DATADIR%%/skins/blue_serious/effect_accentuated.png
-%%DATADIR%%/skins/blue_serious/transport_play_1.png
+%%DATADIR%%/skins/blue_serious/timesignature.png
 %%DATADIR%%/skins/blue_serious/track_add.png
-%%DATADIR%%/skins/blue_serious/marker_next.png
-%%DATADIR%%/skins/blue_serious/icon-48x48.png
-%%DATADIR%%/skins/blue_serious/browser_root.png
-%%DATADIR%%/skins/blue_serious/layout_linear.png
-%%DATADIR%%/skins/blue_serious/icon-64x64.png
+%%DATADIR%%/skins/blue_serious/track_remove.png
+%%DATADIR%%/skins/blue_serious/transport.png
+%%DATADIR%%/skins/blue_serious/transport_first_1.png
+%%DATADIR%%/skins/blue_serious/transport_first_2.png
+%%DATADIR%%/skins/blue_serious/transport_icon_first_1.png
+%%DATADIR%%/skins/blue_serious/transport_icon_first_2.png
+%%DATADIR%%/skins/blue_serious/transport_icon_last_1.png
+%%DATADIR%%/skins/blue_serious/transport_icon_last_2.png
+%%DATADIR%%/skins/blue_serious/transport_icon_next_1.png
+%%DATADIR%%/skins/blue_serious/transport_icon_next_2.png
+%%DATADIR%%/skins/blue_serious/transport_icon_pause.png
+%%DATADIR%%/skins/blue_serious/transport_icon_play_1.png
+%%DATADIR%%/skins/blue_serious/transport_icon_play_2.png
+%%DATADIR%%/skins/blue_serious/transport_icon_previous_1.png
 %%DATADIR%%/skins/blue_serious/transport_icon_previous_2.png
-%%DATADIR%%/skins/blue_serious/dynamic_ppp.png
+%%DATADIR%%/skins/blue_serious/transport_icon_stop_1.png
+%%DATADIR%%/skins/blue_serious/transport_icon_stop_2.png
+%%DATADIR%%/skins/blue_serious/transport_last_1.png
+%%DATADIR%%/skins/blue_serious/transport_last_2.png
+%%DATADIR%%/skins/blue_serious/transport_metronome.png
+%%DATADIR%%/skins/blue_serious/transport_mode.png
+%%DATADIR%%/skins/blue_serious/transport_next_1.png
 %%DATADIR%%/skins/blue_serious/transport_next_2.png
-%%DATADIR%%/skins/blue_serious/browser_back.png
-%%DATADIR%%/skins/blue_serious/transport_icon_play_1.png
-%%DATADIR%%/skins/blue_serious/about_license.png
-%%DATADIR%%/skins/blue_serious/tempo.png
-%%DATADIR%%/skins/blue_serious/transport_stop_2.png
-%%DATADIR%%/skins/blue_serious/option_style.png
-%%DATADIR%%/skins/blue_serious/icon.icns
-%%DATADIR%%/skins/blue_serious/marker_add.png
-%%DATADIR%%/skins/blue_serious/effect_staccato.png
+%%DATADIR%%/skins/blue_serious/transport_pause.png
+%%DATADIR%%/skins/blue_serious/transport_play_1.png
+%%DATADIR%%/skins/blue_serious/transport_play_2.png
 %%DATADIR%%/skins/blue_serious/transport_previous_1.png
-%%DATADIR%%/skins/blue_serious/browser_file.png
-%%DATADIR%%/skins/blue_serious/32.png
-%%DATADIR%%/skins/blue_serious/marker_previous.png
-%%DATADIR%%/skins/blue_serious/transport.png
-%%DATADIR%%/skins/blue_serious/64.png
-%%DATADIR%%/skins/blue_serious/open.png
-%%DATADIR%%/skins/blue_serious/option_toolbars.png
-%%DATADIR%%/skins/ersplus/transport_first_2.png
-%%DATADIR%%/skins/ersplus/song_properties.png
+%%DATADIR%%/skins/blue_serious/transport_previous_2.png
+%%DATADIR%%/skins/blue_serious/transport_stop_1.png
+%%DATADIR%%/skins/blue_serious/transport_stop_2.png
+%%DATADIR%%/skins/blue_serious/tupleto.png
+%%DATADIR%%/skins/ersplus/1.png
+%%DATADIR%%/skins/ersplus/16.png
+%%DATADIR%%/skins/ersplus/2.png
+%%DATADIR%%/skins/ersplus/32.png
+%%DATADIR%%/skins/ersplus/4.png
+%%DATADIR%%/skins/ersplus/64.png
+%%DATADIR%%/skins/ersplus/8.png
+%%DATADIR%%/skins/ersplus/about_authors.png
 %%DATADIR%%/skins/ersplus/about_description.png
-%%DATADIR%%/skins/ersplus/transport_icon_last_2.png
-%%DATADIR%%/skins/ersplus/layout_page.png
-%%DATADIR%%/skins/ersplus/dynamic_mf.png
-%%DATADIR%%/skins/ersplus/effect_grace.png
-%%DATADIR%%/skins/ersplus/transport_play_2.png
-%%DATADIR%%/skins/ersplus/save.png
-%%DATADIR%%/skins/ersplus/transport_next_1.png
-%%DATADIR%%/skins/ersplus/effect_fade_in.png
-%%DATADIR%%/skins/ersplus/effect_tapping.png
-%%DATADIR%%/skins/ersplus/effect_heavy_accentuated.png
-%%DATADIR%%/skins/ersplus/effect_trill.png
-%%DATADIR%%/skins/ersplus/dynamic_f.png
-%%DATADIR%%/skins/ersplus/skin.properties
-%%DATADIR%%/skins/ersplus/layout_compact.png
-%%DATADIR%%/skins/ersplus/transport_stop_1.png
-%%DATADIR%%/skins/ersplus/option_language.png
-%%DATADIR%%/skins/ersplus/fret.png
+%%DATADIR%%/skins/ersplus/about_license.png
+%%DATADIR%%/skins/ersplus/browser_back.png
+%%DATADIR%%/skins/ersplus/browser_file.png
 %%DATADIR%%/skins/ersplus/browser_folder.png
-%%DATADIR%%/skins/ersplus/marker_remove.png
-%%DATADIR%%/skins/ersplus/1.png
-%%DATADIR%%/skins/ersplus/transport_icon_first_2.png
-%%DATADIR%%/skins/ersplus/closerepeat.png
-%%DATADIR%%/skins/ersplus/effect_tremolo_bar.png
-%%DATADIR%%/skins/ersplus/effect_dead.png
-%%DATADIR%%/skins/ersplus/dynamic_pp.png
 %%DATADIR%%/skins/ersplus/browser_new.png
-%%DATADIR%%/skins/ersplus/edit_mode_selection.png
-%%DATADIR%%/skins/ersplus/transport_last_1.png
-%%DATADIR%%/skins/ersplus/dynamic_p.png
-%%DATADIR%%/skins/ersplus/icon-96x96.png
-%%DATADIR%%/skins/ersplus/effect_tremolo_picking.png
-%%DATADIR%%/skins/ersplus/about_authors.png
-%%DATADIR%%/skins/ersplus/logo.png
+%%DATADIR%%/skins/ersplus/browser_refresh.png
+%%DATADIR%%/skins/ersplus/browser_root.png
+%%DATADIR%%/skins/ersplus/chord.png
+%%DATADIR%%/skins/ersplus/closerepeat.png
+%%DATADIR%%/skins/ersplus/dotted.png
+%%DATADIR%%/skins/ersplus/doubledotted.png
+%%DATADIR%%/skins/ersplus/dynamic_f.png
 %%DATADIR%%/skins/ersplus/dynamic_ff.png
-%%DATADIR%%/skins/ersplus/marker_first.png
-%%DATADIR%%/skins/ersplus/skin-preview.png
-%%DATADIR%%/skins/ersplus/timesignature.png
-%%DATADIR%%/skins/ersplus/icon.png
-%%DATADIR%%/skins/ersplus/edit_mode_edition_no_natural.png
+%%DATADIR%%/skins/ersplus/dynamic_fff.png
+%%DATADIR%%/skins/ersplus/dynamic_mf.png
 %%DATADIR%%/skins/ersplus/dynamic_mp.png
-%%DATADIR%%/skins/ersplus/repeat_alternative.png
+%%DATADIR%%/skins/ersplus/dynamic_p.png
+%%DATADIR%%/skins/ersplus/dynamic_pp.png
+%%DATADIR%%/skins/ersplus/dynamic_ppp.png
 %%DATADIR%%/skins/ersplus/edit_mode_edition.png
-%%DATADIR%%/skins/ersplus/transport_metronome.png
-%%DATADIR%%/skins/ersplus/transport_icon_play_2.png
-%%DATADIR%%/skins/ersplus/icon-16x16.png
-%%DATADIR%%/skins/ersplus/transport_icon_pause.png
-%%DATADIR%%/skins/ersplus/transport_pause.png
-%%DATADIR%%/skins/ersplus/grace.png
-%%DATADIR%%/skins/ersplus/transport_previous_2.png
-%%DATADIR%%/skins/ersplus/tempoicon.png
-%%DATADIR%%/skins/ersplus/4.png
+%%DATADIR%%/skins/ersplus/edit_mode_edition_no_natural.png
+%%DATADIR%%/skins/ersplus/edit_mode_selection.png
+%%DATADIR%%/skins/ersplus/edit_redo.png
+%%DATADIR%%/skins/ersplus/edit_undo.png
+%%DATADIR%%/skins/ersplus/edit_voice_1.png
+%%DATADIR%%/skins/ersplus/edit_voice_2.png
+%%DATADIR%%/skins/ersplus/effect_accentuated.png
+%%DATADIR%%/skins/ersplus/effect_bend.png
+%%DATADIR%%/skins/ersplus/effect_dead.png
+%%DATADIR%%/skins/ersplus/effect_fade_in.png
+%%DATADIR%%/skins/ersplus/effect_ghost.png
+%%DATADIR%%/skins/ersplus/effect_grace.png
+%%DATADIR%%/skins/ersplus/effect_hammer.png
+%%DATADIR%%/skins/ersplus/effect_harmonic.png
+%%DATADIR%%/skins/ersplus/effect_heavy_accentuated.png
 %%DATADIR%%/skins/ersplus/effect_palm_mute.png
-%%DATADIR%%/skins/ersplus/track_remove.png
 %%DATADIR%%/skins/ersplus/effect_popping.png
-%%DATADIR%%/skins/ersplus/option_skin.png
-%%DATADIR%%/skins/ersplus/effect_vibrato.png
-%%DATADIR%%/skins/ersplus/transport_first_1.png
-%%DATADIR%%/skins/ersplus/edit_undo.png
+%%DATADIR%%/skins/ersplus/effect_slapping.png
 %%DATADIR%%/skins/ersplus/effect_slide.png
-%%DATADIR%%/skins/ersplus/icon-24x24.png
-%%DATADIR%%/skins/ersplus/2.png
-%%DATADIR%%/skins/ersplus/settings.png
-%%DATADIR%%/skins/ersplus/transport_last_2.png
+%%DATADIR%%/skins/ersplus/effect_staccato.png
+%%DATADIR%%/skins/ersplus/effect_tapping.png
+%%DATADIR%%/skins/ersplus/effect_tremolo_bar.png
+%%DATADIR%%/skins/ersplus/effect_tremolo_picking.png
+%%DATADIR%%/skins/ersplus/effect_trill.png
+%%DATADIR%%/skins/ersplus/effect_vibrato.png
+%%DATADIR%%/skins/ersplus/firstfret.png
+%%DATADIR%%/skins/ersplus/fret.png
 %%DATADIR%%/skins/ersplus/fretboard.png
-%%DATADIR%%/skins/ersplus/effect_ghost.png
-%%DATADIR%%/skins/ersplus/8.png
-%%DATADIR%%/skins/ersplus/transport_icon_stop_2.png
-%%DATADIR%%/skins/ersplus/transport_icon_last_1.png
-%%DATADIR%%/skins/ersplus/doubledotted.png
-%%DATADIR%%/skins/ersplus/marker_list.png
-%%DATADIR%%/skins/ersplus/edit_redo.png
-%%DATADIR%%/skins/ersplus/openrepeat.png
-%%DATADIR%%/skins/ersplus/effect_hammer.png
+%%DATADIR%%/skins/ersplus/grace.png
+%%DATADIR%%/skins/ersplus/icon-16x16.png
+%%DATADIR%%/skins/ersplus/icon-24x24.png
+%%DATADIR%%/skins/ersplus/icon-32x32.png
+%%DATADIR%%/skins/ersplus/icon-48x48.png
+%%DATADIR%%/skins/ersplus/icon-64x64.png
+%%DATADIR%%/skins/ersplus/icon-96x96.png
+%%DATADIR%%/skins/ersplus/icon.icns
+%%DATADIR%%/skins/ersplus/icon.ico
+%%DATADIR%%/skins/ersplus/icon.png
+%%DATADIR%%/skins/ersplus/layout_compact.png
+%%DATADIR%%/skins/ersplus/layout_linear.png
 %%DATADIR%%/skins/ersplus/layout_multitrack.png
-%%DATADIR%%/skins/ersplus/effect_slapping.png
-%%DATADIR%%/skins/ersplus/transport_mode.png
-%%DATADIR%%/skins/ersplus/transport_icon_next_1.png
-%%DATADIR%%/skins/ersplus/transport_icon_first_1.png
-%%DATADIR%%/skins/ersplus/mixer.png
-%%DATADIR%%/skins/ersplus/transport_icon_next_2.png
-%%DATADIR%%/skins/ersplus/16.png
-%%DATADIR%%/skins/ersplus/dotted.png
+%%DATADIR%%/skins/ersplus/layout_page.png
 %%DATADIR%%/skins/ersplus/layout_score.png
-%%DATADIR%%/skins/ersplus/print-preview.png
-%%DATADIR%%/skins/ersplus/browser_refresh.png
+%%DATADIR%%/skins/ersplus/logo.png
+%%DATADIR%%/skins/ersplus/marker_add.png
+%%DATADIR%%/skins/ersplus/marker_first.png
+%%DATADIR%%/skins/ersplus/marker_last.png
+%%DATADIR%%/skins/ersplus/marker_list.png
+%%DATADIR%%/skins/ersplus/marker_next.png
+%%DATADIR%%/skins/ersplus/marker_previous.png
+%%DATADIR%%/skins/ersplus/marker_remove.png
+%%DATADIR%%/skins/ersplus/mixer.png
+%%DATADIR%%/skins/ersplus/new.png
+%%DATADIR%%/skins/ersplus/open.png
+%%DATADIR%%/skins/ersplus/openrepeat.png
+%%DATADIR%%/skins/ersplus/option_language.png
+%%DATADIR%%/skins/ersplus/option_skin.png
 %%DATADIR%%/skins/ersplus/option_sound.png
-%%DATADIR%%/skins/ersplus/chord.png
+%%DATADIR%%/skins/ersplus/option_style.png
+%%DATADIR%%/skins/ersplus/option_toolbars.png
+%%DATADIR%%/skins/ersplus/option_view.png
+%%DATADIR%%/skins/ersplus/print-preview.png
+%%DATADIR%%/skins/ersplus/print.png
+%%DATADIR%%/skins/ersplus/repeat_alternative.png
 %%DATADIR%%/skins/ersplus/save-as.png
+%%DATADIR%%/skins/ersplus/save.png
+%%DATADIR%%/skins/ersplus/settings.png
+%%DATADIR%%/skins/ersplus/skin-preview.png
+%%DATADIR%%/skins/ersplus/skin.properties
+%%DATADIR%%/skins/ersplus/song_properties.png
 %%DATADIR%%/skins/ersplus/splash.png
-%%DATADIR%%/skins/ersplus/new.png
-%%DATADIR%%/skins/ersplus/dynamic_fff.png
-%%DATADIR%%/skins/ersplus/marker_last.png
+%%DATADIR%%/skins/ersplus/tempo.png
+%%DATADIR%%/skins/ersplus/tempoicon.png
 %%DATADIR%%/skins/ersplus/tiednote.png
-%%DATADIR%%/skins/ersplus/effect_bend.png
-%%DATADIR%%/skins/ersplus/transport_icon_stop_1.png
-%%DATADIR%%/skins/ersplus/firstfret.png
-%%DATADIR%%/skins/ersplus/option_view.png
-%%DATADIR%%/skins/ersplus/icon-32x32.png
-%%DATADIR%%/skins/ersplus/effect_harmonic.png
-%%DATADIR%%/skins/ersplus/print.png
-%%DATADIR%%/skins/ersplus/transport_icon_previous_1.png
-%%DATADIR%%/skins/ersplus/tupleto.png
-%%DATADIR%%/skins/ersplus/effect_accentuated.png
-%%DATADIR%%/skins/ersplus/transport_play_1.png
+%%DATADIR%%/skins/ersplus/timesignature.png
 %%DATADIR%%/skins/ersplus/track_add.png
-%%DATADIR%%/skins/ersplus/marker_next.png
-%%DATADIR%%/skins/ersplus/icon-48x48.png
-%%DATADIR%%/skins/ersplus/browser_root.png
-%%DATADIR%%/skins/ersplus/layout_linear.png
-%%DATADIR%%/skins/ersplus/icon-64x64.png
+%%DATADIR%%/skins/ersplus/track_remove.png
+%%DATADIR%%/skins/ersplus/transport.png
+%%DATADIR%%/skins/ersplus/transport_first_1.png
+%%DATADIR%%/skins/ersplus/transport_first_2.png
+%%DATADIR%%/skins/ersplus/transport_icon_first_1.png
+%%DATADIR%%/skins/ersplus/transport_icon_first_2.png
+%%DATADIR%%/skins/ersplus/transport_icon_last_1.png
+%%DATADIR%%/skins/ersplus/transport_icon_last_2.png
+%%DATADIR%%/skins/ersplus/transport_icon_next_1.png
+%%DATADIR%%/skins/ersplus/transport_icon_next_2.png
+%%DATADIR%%/skins/ersplus/transport_icon_pause.png
+%%DATADIR%%/skins/ersplus/transport_icon_play_1.png
+%%DATADIR%%/skins/ersplus/transport_icon_play_2.png
+%%DATADIR%%/skins/ersplus/transport_icon_previous_1.png
 %%DATADIR%%/skins/ersplus/transport_icon_previous_2.png
-%%DATADIR%%/skins/ersplus/dynamic_ppp.png
+%%DATADIR%%/skins/ersplus/transport_icon_stop_1.png
+%%DATADIR%%/skins/ersplus/transport_icon_stop_2.png
+%%DATADIR%%/skins/ersplus/transport_last_1.png
+%%DATADIR%%/skins/ersplus/transport_last_2.png
+%%DATADIR%%/skins/ersplus/transport_metronome.png
+%%DATADIR%%/skins/ersplus/transport_mode.png
+%%DATADIR%%/skins/ersplus/transport_next_1.png
 %%DATADIR%%/skins/ersplus/transport_next_2.png
-%%DATADIR%%/skins/ersplus/browser_back.png
-%%DATADIR%%/skins/ersplus/transport_icon_play_1.png
-%%DATADIR%%/skins/ersplus/about_license.png
-%%DATADIR%%/skins/ersplus/tempo.png
-%%DATADIR%%/skins/ersplus/transport_stop_2.png
-%%DATADIR%%/skins/ersplus/option_style.png
-%%DATADIR%%/skins/ersplus/icon.icns
-%%DATADIR%%/skins/ersplus/marker_add.png
-%%DATADIR%%/skins/ersplus/effect_staccato.png
+%%DATADIR%%/skins/ersplus/transport_pause.png
+%%DATADIR%%/skins/ersplus/transport_play_1.png
+%%DATADIR%%/skins/ersplus/transport_play_2.png
 %%DATADIR%%/skins/ersplus/transport_previous_1.png
-%%DATADIR%%/skins/ersplus/browser_file.png
-%%DATADIR%%/skins/ersplus/32.png
-%%DATADIR%%/skins/ersplus/marker_previous.png
-%%DATADIR%%/skins/ersplus/transport.png
-%%DATADIR%%/skins/ersplus/64.png
-%%DATADIR%%/skins/ersplus/open.png
-%%DATADIR%%/skins/ersplus/option_toolbars.png
-@dirrm %%DATADIR%%/help/images/edit
-@dirrm %%DATADIR%%/help/images/introduction
-@dirrm %%DATADIR%%/help/images/start
-@dirrm %%DATADIR%%/help/images/tools
-@dirrm %%DATADIR%%/help/images
-@dirrm %%DATADIR%%/help/html
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/scales
-@dirrm %%DATADIR%%/skins/Lavender
-@dirrm %%DATADIR%%/skins/blue_serious
-@dirrm %%DATADIR%%/skins/ersplus
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%
-@dirrmtry share/pixmaps
-@dirrmtry share/applications
+%%DATADIR%%/skins/ersplus/transport_previous_2.png
+%%DATADIR%%/skins/ersplus/transport_stop_1.png
+%%DATADIR%%/skins/ersplus/transport_stop_2.png
+%%DATADIR%%/skins/ersplus/tupleto.png
+%%DATADIR%%/tuxguitar.jar
+%%DATADIR%%/tuxguitar.tg
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
+share/applications/tuxguitar.desktop
+share/pixmaps/tuxguitar.xpm
+@dirrm %%DATADIR%%/skins/ersplus
+@dirrm %%DATADIR%%/skins/blue_serious
+@dirrm %%DATADIR%%/skins/Lavender
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%/scales
+@dirrm %%DATADIR%%/plugins
+@dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/help/js
+@dirrm %%DATADIR%%/help/images/tools
+@dirrm %%DATADIR%%/help/images/start
+@dirrm %%DATADIR%%/help/images/edit
+@dirrm %%DATADIR%%/help/images
+@dirrm %%DATADIR%%/help/css
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%