4 files changed, 39 insertions, 53 deletions

diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index b42d201cda36..6b69c5a1ae3a 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tuxguitar
-DISTVERSION=	1.0-rc4
-PORTREVISION=	3
+DISTVERSION=	1.0
 CATEGORIES=	audio java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-src-${DISTVERSION}
@@ -22,8 +21,9 @@ BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \
 		gcj42:${PORTSDIR}/lang/gcc42-withgcjawt
 RUN_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \
 		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext
+LIB_DEPENDS=	fluidsynth.2:${PORTSDIR}/audio/fluidsynth
 
-MAKE_ENV=	"PREFIX=${PREFIX}" "INSTALL_DOC_DIR=${DOCSDIR}" \
+MAKE_ENV+=	"PREFIX=${PREFIX}" "INSTALL_DOC_DIR=${DOCSDIR}" \
 		"INSTALL_SHARE_DIR=${DATADIR}"
 
 USE_JAVA=	yes
@@ -31,6 +31,7 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.4+
 JAVA_VENDOR=	bsdjava sun blackdown
+NOCCACHE=	yes
 
 .if !defined(WITHOUT_MAN)
 MAN1=		tuxguitar.1
@@ -42,7 +43,7 @@ USE_GECKO=	mozilla firefox seamonkey
 .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
 PLUGINS=	ascii compat converter gtp jsa lilypond midi musicxml \
-		oss pdf ptb tef tray
+		oss pdf ptb tef tray fluidsynth
 
 SUB_FILES=	tuxguitar
 SUB_LIST=	DATADIR=${DATADIR} \
@@ -52,7 +53,7 @@ SUB_LIST=	DATADIR=${DATADIR} \
 
 post-patch:
 	${REINPLACE_CMD} -e 's|linux|freebsd|;s|JAVA_VERS|JAVA_PORT_VERSION|g; \
-		/TuxGuitar-alsa/d' \
+		/TuxGuitar-alsa/d; s|/usr/lib/jvm/java-6-sun/|${JAVA_HOME}|' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e \
 		's|%%LOCALBASE%%|${LOCALBASE}|g; \
@@ -63,6 +64,7 @@ post-patch:
 		 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 \
@@ -74,8 +76,12 @@ post-patch:
 		${WRKSRC}/TuxGuitar/build.xml
 	${REINPLACE_CMD} -e 's|$${path.itext}|${JAVALIBDIR}/itext.jar|g' \
 		${WRKSRC}/TuxGuitar-pdf/build.xml
-	${REINPLACE_CMD} -e 's|gcj|${LOCALBASE}/bin/gcj42|g' \
-	    ${WRKSRC}/TuxGuitar-oss/jni/GNUmakefile
+	${REINPLACE_CMD} -e 's|CFLAGS?|CFLAGS+|g;\
+	    s|gcj|${LOCALBASE}/bin/gcj42|;\
+	    s|-I|-I${JAVA_HOME}/include -I${LOCALBASE}/include -I|;\
+	    s|/usr/lib|${LOCALBASE}/lib|' \
+	    ${WRKSRC}/TuxGuitar-oss/jni/GNUmakefile \
+	    ${WRKSRC}/TuxGuitar-fluidsynth/jni/GNUmakefile
 
 do-install:
 	${INSTALL} -d ${DATADIR}
@@ -85,6 +91,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/TuxGuitar/tuxguitar.jar ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/misc/*.tg ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${PREFIX}/lib
 .for p in ${PLUGINS}
 	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-${p}/tuxguitar-${p}.jar ${DATADIR}/plugins
 .endfor
diff --git a/audio/tuxguitar/distinfo b/audio/tuxguitar/distinfo
index 8159a3bdb819..55c66015978b 100644
--- a/audio/tuxguitar/distinfo
+++ b/audio/tuxguitar/distinfo
@@ -1,3 +1,3 @@
-MD5 (tuxguitar-src-1.0-rc4.tar.gz) = 9ede8ff109b9a8cb9681db72d3483b7e
-SHA256 (tuxguitar-src-1.0-rc4.tar.gz) = 4259e1a2c8f85722e31ed8d83d159649c93fcad9e867b6548d16569120086b8f
-SIZE (tuxguitar-src-1.0-rc4.tar.gz) = 2316849
+MD5 (tuxguitar-src-1.0.tar.gz) = a9873adad0df58202d889648eb484879
+SHA256 (tuxguitar-src-1.0.tar.gz) = 422336d69994c5041331ac95fc899e91e929b4a224910f75b4acd7cfd6f85c8a
+SIZE (tuxguitar-src-1.0.tar.gz) = 2335631
diff --git a/audio/tuxguitar/files/patch-TuxGuitar_build.properties b/audio/tuxguitar/files/patch-TuxGuitar_build.properties
index 016e4c18c97b..a5ccd3236b86 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-02 15:52:45.000000000 +0200
-+++ TuxGuitar/build.properties	2008-06-02 15:55:04.000000000 +0200
+--- TuxGuitar/build.properties.orig	2008-06-26 21:19:11.000000000 +0200
++++ TuxGuitar/build.properties	2008-06-26 21:20:50.000000000 +0200
 @@ -5,15 +5,15 @@
  ant.build.javac.target=1.4
  
@@ -8,45 +8,19 @@
 -lib.swt.jar=lib/swt.jar
 -lib.itext.jar=lib/itext.jar
 -dist.file=xml/build-linux.xml
--dist.version=1.0-rc4
++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.jar.path=./
 -dist.bin.path=./
 -dist.share.path=share/
 -dist.doc.path=doc/
-+#lib.swt.jni=lib/
-+#lib.swt.jar=lib/swt.jar
-+#lib.itext.jar=lib/itext.jar
-+#dist.file=xml/build-linux.xml
-+#dist.version=1.0-rc4
-+#dist.jar.path=./
-+#dist.bin.path=./
-+#dist.share.path=share/
-+#dist.doc.path=doc/
- 
- ########## UBUNTU BUILD PROPERTIES ##########
- #lib.swt.jni=/usr/lib/jni/
-@@ -29,15 +29,15 @@
- #dist.doc.path=${dist.prefix}/share/doc/tuxguitar/
- 
- ########## FREEBSD BUILD PROPERTIES ##########
--#lib.swt.jni=/usr/local/lib/
--#lib.swt.jar=/usr/local/share/java/classes/swt.jar
--#lib.itext.jar=/usr/local/share/java/classes/itext.jar
--#dist.file=xml/build-freebsd.xml
--#dist.version=1.0-rc4
--#dist.jar.path=/usr/local/share/java/TuxGuitar-${dist.version}/
--#dist.bin.path=/usr/local/bin/
--#dist.share.path=/usr/local/share/TuxGuitar-${dist.version}/
--#dist.doc.path=/usr/local/share/doc/TuxGuitar-${dist.version}/
-+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=%%DISTVERSION%%
-+dist.jar.path=%%JAVAJARDIR%%/TuxGuitar-${dist.version}/
++dist.jar.path=%%JAVAJARDIR%%
 +dist.bin.path=%%PREFIX%%/bin
-+dist.share.path=%%DATADIR%%/
++dist.share.path=%%DATADIR%%
 +dist.doc.path=%%DOCSDIR%%
  
- ########## DEFAULT MAC BUILD PROPERTIES ##########
- #lib.swt.jni=lib/
+ ########## UBUNTU BUILD PROPERTIES ##########
+ #lib.swt.jni=/usr/lib/jni/
diff --git a/audio/tuxguitar/pkg-plist b/audio/tuxguitar/pkg-plist
index d44d79bc850f..1d761dec3fe0 100644
--- a/audio/tuxguitar/pkg-plist
+++ b/audio/tuxguitar/pkg-plist
@@ -1,5 +1,6 @@
 bin/tuxguitar
 lib/libtuxguitar-oss-jni.so
+lib/libtuxguitar-fluidsynth-jni.so
 share/pixmaps/tuxguitar.xpm
 share/applications/tuxguitar.desktop
 %%DATADIR%%/tuxguitar.jar
@@ -20,10 +21,12 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/lang/messages_sr.properties
 %%DATADIR%%/lang/messages_sv.properties
 %%DATADIR%%/lang/messages_uk.properties
+%%DATADIR%%/lang/messages_vi.properties
 %%DATADIR%%/lang/messages_zh_TW.properties
 %%DATADIR%%/plugins/tuxguitar-compat.jar
 %%DATADIR%%/plugins/tuxguitar-converter.jar
 %%DATADIR%%/plugins/tuxguitar-ascii.jar
+%%DATADIR%%/plugins/tuxguitar-fluidsynth.jar
 %%DATADIR%%/plugins/tuxguitar-gtp.jar
 %%DATADIR%%/plugins/tuxguitar-musicxml.jar
 %%DATADIR%%/plugins/tuxguitar-ptb.jar
@@ -49,6 +52,7 @@ share/applications/tuxguitar.desktop
 %%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
@@ -88,6 +92,7 @@ share/applications/tuxguitar.desktop
 %%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%%/skins/Lavender/about_description.png
@@ -148,7 +153,7 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/skins/Lavender/option_skin.png
 %%DATADIR%%/skins/Lavender/effect_vibrato.png
 %%DATADIR%%/skins/Lavender/transport_first_1.png
-%%DATADIR%%/skins/Lavender/undo.png
+%%DATADIR%%/skins/Lavender/edit_undo.png
 %%DATADIR%%/skins/Lavender/effect_slide.png
 %%DATADIR%%/skins/Lavender/icon-24x24.png
 %%DATADIR%%/skins/Lavender/2.png
@@ -161,7 +166,7 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/skins/Lavender/transport_icon_last_1.png
 %%DATADIR%%/skins/Lavender/doubledotted.png
 %%DATADIR%%/skins/Lavender/marker_list.png
-%%DATADIR%%/skins/Lavender/redo.png
+%%DATADIR%%/skins/Lavender/edit_redo.png
 %%DATADIR%%/skins/Lavender/openrepeat.png
 %%DATADIR%%/skins/Lavender/effect_hammer.png
 %%DATADIR%%/skins/Lavender/layout_multitrack.png
@@ -281,7 +286,7 @@ share/applications/tuxguitar.desktop
 %%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/undo.png
+%%DATADIR%%/skins/blue_serious/edit_undo.png
 %%DATADIR%%/skins/blue_serious/effect_slide.png
 %%DATADIR%%/skins/blue_serious/icon-24x24.png
 %%DATADIR%%/skins/blue_serious/2.png
@@ -294,7 +299,7 @@ share/applications/tuxguitar.desktop
 %%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/redo.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/layout_multitrack.png
@@ -414,7 +419,7 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/skins/ersplus/option_skin.png
 %%DATADIR%%/skins/ersplus/effect_vibrato.png
 %%DATADIR%%/skins/ersplus/transport_first_1.png
-%%DATADIR%%/skins/ersplus/undo.png
+%%DATADIR%%/skins/ersplus/edit_undo.png
 %%DATADIR%%/skins/ersplus/effect_slide.png
 %%DATADIR%%/skins/ersplus/icon-24x24.png
 %%DATADIR%%/skins/ersplus/2.png
@@ -427,7 +432,7 @@ share/applications/tuxguitar.desktop
 %%DATADIR%%/skins/ersplus/transport_icon_last_1.png
 %%DATADIR%%/skins/ersplus/doubledotted.png
 %%DATADIR%%/skins/ersplus/marker_list.png
-%%DATADIR%%/skins/ersplus/redo.png
+%%DATADIR%%/skins/ersplus/edit_redo.png
 %%DATADIR%%/skins/ersplus/openrepeat.png
 %%DATADIR%%/skins/ersplus/effect_hammer.png
 %%DATADIR%%/skins/ersplus/layout_multitrack.png