Attachment #201671 for bug #233502

View | Details | Raw Unified | Return to bug 233502
Collapse All | Expand All





PORTNAME=	tuxguitar
PORTVERSION=	1.2
PORTREVISION=	13
CATEGORIES=	audio java
MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
		LOCAL/gahr/:fluid \

COMMENT=	Multitrack tablature editor and player

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel \
		${JAVALIBDIR}/itext.jar:devel/itext \

JAVA_VERSION=	1.6+
NOCCACHE=	yes

BUILD_WRKSRC=	${WRKSRC}/TuxGuitar
SF2_DIR=	${LOCALBASE}/share/sounds/sf2

OPTIONS_DEFINE=	DOCS

	@${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR}

post-patch:
	@${FIND} ${WRKSRC} -name build.properties | ${XARGS} ${REINPLACE_CMD} -e '\
	    s|path\.swt=.*|path.swt=${JAVAJARDIR}/swt-devel.jar|; \
	    s|path\.itext=.*|path.itext=${JAVAJARDIR}/itext.jar|; \
	    s|path\.gervill=.*|path.gervill=${JAVAJARDIR}/gervill.jar|'
	@${FIND} ${WRKSRC} -name GNUmakefile | ${XARGS} ${REINPLACE_CMD} -e '\
	    s|-I$$(shell gcj -print-file-name=include/)|-I${JAVA_HOME}/include \
	    -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \
	    s|-I $$(shell $$(GCJ) -print-file-name=include/)|-I${JAVA_HOME}/include \

	    s|%%JAVASHAREDIR%%|${JAVASHAREDIR}|g; \
	    s|%%DATADIR%%|${DATADIR}|g; \
	    s|%%DOCSDIR%%|${DOCSDIR}|g' \
	    ${WRKSRC}/TuxGuitar/build.properties

post-build:
.for p in ${PLUGINS}
	(cd ${WRKSRC}/TuxGuitar-${p}; \
	    ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
.endfor
	cd ${WRKSRC}/TuxGuitar-oss/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
	cd ${WRKSRC}/TuxGuitar-fluidsynth/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
	cd ${WRKSRC}/TuxGuitar-jack/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}

do-install:
	${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${STAGEDIR}${PREFIX}/bin
	${INSTALL_LIB} ${WRKSRC}/TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
	${INSTALL_LIB} ${WRKSRC}/TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib

	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins
	${INSTALL_DATA} ${WRKSRC}/TuxGuitar/tuxguitar.jar ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/misc/*.tg ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR}
.for p in ${PLUGINS}
	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins
.endfor
	# Inline documentation
	cd ${WRKSRC}/TuxGuitar/share/help &&   ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/help
	cd ${WRKSRC}/TuxGuitar/share/lang &&   ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lang
	cd ${WRKSRC}/TuxGuitar/share/scales && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scales
	cd ${WRKSRC}/TuxGuitar/share/skins &&  ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/skins

	${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
	${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.desktop ${STAGEDIR}${PREFIX}/share/applications
	${INSTALL_MAN} ${WRKSRC}/misc/tuxguitar.1 ${STAGEDIR}${MANPREFIX}/man/man1

	# Share soundfont with FluidSynth
	@${MKDIR} ${STAGEDIR}${SF2_DIR}


do-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC}/TuxGuitar/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}

.include <bsd.port.mk>




--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c.orig	2009-10-31 14:34:13 UTC
+++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
@@ -16,7 +16,7 @@ typedef struct{
 	jobject options;
 }fluid_settings_foreach_option_data;
 
-void fluid_settings_foreach_option_callback(void *data, char *name, char *option)
+void fluid_settings_foreach_option_callback(void *data, const char *name, const char *option)
 {
 	fluid_settings_foreach_option_data* handle = (fluid_settings_foreach_option_data *)data;
 	
@@ -255,8 +255,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
 			jstring jvalue = NULL;
 			char *value = NULL;
 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
-			
+
+#if FLUIDSYNTH_VERSION_MAJOR < 2
 			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
+#else
+			fluid_settings_dupstr(handle->settings,(char *)jkey, &value );
+#endif
 			jvalue = (*env)->NewStringUTF(env, value);
 			
 			(*env)->ReleaseStringUTFChars(env, key, jkey);
@@ -274,7 +278,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
 		if (mid != 0){
 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+#if FLUIDSYNTH_VERSION_MAJOR < 2
 			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+#else
+			double value = 0.0;
+			fluid_settings_getnum_default(handle->settings, (char*)jkey, &value);
+#endif
 			
 			(*env)->ReleaseStringUTFChars(env, key, jkey);
 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
@@ -291,7 +300,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
 		if (mid != 0){
 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+#if FLUIDSYNTH_VERSION_MAJOR < 2
 			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+#else
+			int value = 0;
+			fluid_settings_getint_default(handle->settings,(char *)jkey, &value);
+#endif
 			
 			(*env)->ReleaseStringUTFChars(env, key, jkey);
 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
@@ -308,7 +322,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
 		if (mid != 0){
 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+#if FLUIDSYNTH_VERSION_MAJOR < 2
 			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
+#else
+			char *value = NULL;
+			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
+#endif
 			jstring jvalue = (*env)->NewStringUTF(env, value);
 			
 			(*env)->ReleaseStringUTFChars(env, key, jkey);




--- TuxGuitar/build.properties.orig	2009-10-31 14:32:52 UTC
+++ TuxGuitar/build.properties
@@ -5,15 +5,15 @@ ant.build.javac.source=1.4
 ant.build.javac.target=1.4
 
 ########## DEFAULT LINUX BUILD PROPERTIES ##########
-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.2
-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.2
+#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=doc/
 #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.2
-#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-devel.jar
+lib.itext.jar=%%JAVAJARDIR%%/itext.jar
+dist.file=xml/build-freebsd.xml
+dist.version=1.2
+dist.jar.path=%%JAVASHAREDIR%%/TuxGuitar-${dist.version}/
+dist.bin.path=%%PREFIX%%/bin
+dist.share.path=%%DATADIR%%
+dist.doc.path=%%DOCSDIR%%
 
 ########## DEFAULT MAC BUILD PROPERTIES ##########
 #lib.swt.jni=lib/
@@ -62,4 +62,4 @@ dist.doc.path=doc/
 #dist.doc.path=doc\\
 ## get JanelWindows.exe from http://sourceforge.net/projects/janel/
 #janel.exe=utilities\\tuxguitar.exe
-#janel.lap.prefix=${FOUND_EXE_FOLDER}\\
\ No newline at end of file
+#janel.lap.prefix=${FOUND_EXE_FOLDER}\\




--- build.properties.orig	2009-10-31 14:32:52 UTC
+++ build.properties
@@ -5,15 +5,15 @@ ant.build.javac.source=1.4
 ant.build.javac.target=1.4
 
 ########## DEFAULT LINUX BUILD PROPERTIES ##########
-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.2
-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.2
+#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=doc/
 #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.2
-#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-devel.jar
+lib.itext.jar=%%JAVAJARDIR%%/itext.jar
+dist.file=xml/build-freebsd.xml
+dist.version=1.2
+dist.jar.path=%%JAVASHAREDIR%%/TuxGuitar-${dist.version}/
+dist.bin.path=%%PREFIX%%/bin
+dist.share.path=%%DATADIR%%
+dist.doc.path=%%DOCSDIR%%
 
 ########## DEFAULT MAC BUILD PROPERTIES ##########
 #lib.swt.jni=lib/
@@ -62,4 +62,4 @@ dist.doc.path=doc/
 #dist.doc.path=doc\\
 ## get JanelWindows.exe from http://sourceforge.net/projects/janel/
 #janel.exe=utilities\\tuxguitar.exe
-#janel.lap.prefix=${FOUND_EXE_FOLDER}\\
\ No newline at end of file
+#janel.lap.prefix=${FOUND_EXE_FOLDER}\\

Return to bug 233502

Lines 3-9 Link Here

(-)audio/tuxguitar/Makefile (-23 / +23 lines)
3		3
4	PORTNAME= tuxguitar	4	PORTNAME= tuxguitar
5	PORTVERSION= 1.2	5	PORTVERSION= 1.2
6	PORTREVISION= 12	6	PORTREVISION= 13
7	CATEGORIES= audio java	7	CATEGORIES= audio java
8	MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \	8	MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
9	LOCAL/gahr/:fluid \	9	LOCAL/gahr/:fluid \
Lines 18-24 Link Here
18	COMMENT= Multitrack tablature editor and player	18	COMMENT= Multitrack tablature editor and player
19		19
20	LICENSE= LGPL21	20	LICENSE= LGPL21
21	LICENSE_FILE= ${WRKSRC}/../LICENSE	21	LICENSE_FILE= ${WRKSRC}/LICENSE
22		22
23	BUILD_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel \	23	BUILD_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel \
24	${JAVALIBDIR}/itext.jar:devel/itext \	24	${JAVALIBDIR}/itext.jar:devel/itext \
Lines 38-44 Link Here
38	JAVA_VERSION= 1.6+	38	JAVA_VERSION= 1.6+
39	NOCCACHE= yes	39	NOCCACHE= yes
40		40
41	WRKSRC_SUBDIR= TuxGuitar	41	BUILD_WRKSRC= ${WRKSRC}/TuxGuitar
42	SF2_DIR= ${LOCALBASE}/share/sounds/sf2	42	SF2_DIR= ${LOCALBASE}/share/sounds/sf2
43		43
44	OPTIONS_DEFINE= DOCS	44	OPTIONS_DEFINE= DOCS
Lines 56-66 Link Here
56	@${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR}	56	@${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR}
57		57
58	post-patch:	58	post-patch:
59	@${FIND} ${WRKSRC}/.. -name build.properties \| ${XARGS} ${REINPLACE_CMD} -e '\	59	@${FIND} ${WRKSRC} -name build.properties \| ${XARGS} ${REINPLACE_CMD} -e '\
60	s\|path\.swt=.*\|path.swt=${JAVAJARDIR}/swt-devel.jar\|; \	60	s\|path\.swt=.*\|path.swt=${JAVAJARDIR}/swt-devel.jar\|; \
61	s\|path\.itext=.*\|path.itext=${JAVAJARDIR}/itext.jar\|; \	61	s\|path\.itext=.*\|path.itext=${JAVAJARDIR}/itext.jar\|; \
62	s\|path\.gervill=.*\|path.gervill=${JAVAJARDIR}/gervill.jar\|'	62	s\|path\.gervill=.*\|path.gervill=${JAVAJARDIR}/gervill.jar\|'
63	@${FIND} ${WRKSRC}/.. -name GNUmakefile \| ${XARGS} ${REINPLACE_CMD} -e '\	63	@${FIND} ${WRKSRC} -name GNUmakefile \| ${XARGS} ${REINPLACE_CMD} -e '\
64	s\|-I$$(shell gcj -print-file-name=include/)\|-I${JAVA_HOME}/include \	64	s\|-I$$(shell gcj -print-file-name=include/)\|-I${JAVA_HOME}/include \
65	-I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include\|; \	65	-I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include\|; \
66	s\|-I $$(shell $$(GCJ) -print-file-name=include/)\|-I${JAVA_HOME}/include \	66	s\|-I $$(shell $$(GCJ) -print-file-name=include/)\|-I${JAVA_HOME}/include \
Lines 73-110 Link Here
73	s\|%%JAVASHAREDIR%%\|${JAVASHAREDIR}\|g; \	73	s\|%%JAVASHAREDIR%%\|${JAVASHAREDIR}\|g; \
74	s\|%%DATADIR%%\|${DATADIR}\|g; \	74	s\|%%DATADIR%%\|${DATADIR}\|g; \
75	s\|%%DOCSDIR%%\|${DOCSDIR}\|g' \	75	s\|%%DOCSDIR%%\|${DOCSDIR}\|g' \
76	${WRKSRC}/build.properties	76	${WRKSRC}/TuxGuitar/build.properties
77		77
78	post-build:	78	post-build:
79	.for p in ${PLUGINS}	79	.for p in ${PLUGINS}
80	(cd ${WRKSRC}/../TuxGuitar-${p}; \	80	(cd ${WRKSRC}/TuxGuitar-${p}; \
81	${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})	81	${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET})
82	.endfor	82	.endfor
83	cd ${WRKSRC}/../TuxGuitar-oss/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}	83	cd ${WRKSRC}/TuxGuitar-oss/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
84	cd ${WRKSRC}/../TuxGuitar-fluidsynth/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}	84	cd ${WRKSRC}/TuxGuitar-fluidsynth/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
85	cd ${WRKSRC}/../TuxGuitar-jack/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}	85	cd ${WRKSRC}/TuxGuitar-jack/jni && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
86		86
87	do-install:	87	do-install:
88	${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${STAGEDIR}${PREFIX}/bin	88	${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${STAGEDIR}${PREFIX}/bin
89	${INSTALL_LIB} ${WRKSRC}/../TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib	89	${INSTALL_LIB} ${WRKSRC}/TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${STAGEDIR}${PREFIX}/lib
90	${INSTALL_LIB} ${WRKSRC}/../TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib	90	${INSTALL_LIB} ${WRKSRC}/TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so ${STAGEDIR}${PREFIX}/lib
91		91
92	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins	92	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins
93	${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${STAGEDIR}${DATADIR}	93	${INSTALL_DATA} ${WRKSRC}/TuxGuitar/tuxguitar.jar ${STAGEDIR}${DATADIR}
94	${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${STAGEDIR}${DATADIR}	94	${INSTALL_DATA} ${WRKSRC}/misc/*.tg ${STAGEDIR}${DATADIR}
95	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR}	95	${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${STAGEDIR}${DATADIR}
96	.for p in ${PLUGINS}	96	.for p in ${PLUGINS}
97	${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins	97	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-${p}/tuxguitar-${p}.jar ${STAGEDIR}${DATADIR}/plugins
98	.endfor	98	.endfor
99	# Inline documentation	99	# Inline documentation
100	cd ${WRKSRC}/share/help && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/help	100	cd ${WRKSRC}/TuxGuitar/share/help && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/help
101	cd ${WRKSRC}/share/lang && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lang	101	cd ${WRKSRC}/TuxGuitar/share/lang && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/lang
102	cd ${WRKSRC}/share/scales && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scales	102	cd ${WRKSRC}/TuxGuitar/share/scales && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/scales
103	cd ${WRKSRC}/share/skins && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/skins	103	cd ${WRKSRC}/TuxGuitar/share/skins && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/skins
104		104
105	${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps	105	${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
106	${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.desktop ${STAGEDIR}${PREFIX}/share/applications	106	${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.desktop ${STAGEDIR}${PREFIX}/share/applications
107	${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${STAGEDIR}${MANPREFIX}/man/man1	107	${INSTALL_MAN} ${WRKSRC}/misc/tuxguitar.1 ${STAGEDIR}${MANPREFIX}/man/man1
108		108
109	# Share soundfont with FluidSynth	109	# Share soundfont with FluidSynth
110	@${MKDIR} ${STAGEDIR}${SF2_DIR}	110	@${MKDIR} ${STAGEDIR}${SF2_DIR}
Lines 112-117 Link Here
112		112
113	do-install-DOCS-on:	113	do-install-DOCS-on:
114	@${MKDIR} ${STAGEDIR}${DOCSDIR}	114	@${MKDIR} ${STAGEDIR}${DOCSDIR}
115	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}	115	cd ${WRKSRC}/TuxGuitar/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
116		116
117	.include <bsd.port.mk>	117	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/tuxguitar/files/patch-TuxGuitar-fluidsynth_jni_org__herac__tuxguitar__player__impl__midiport__fluidsynth__MidiSynth.c (+64 lines)
	1	--- TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c.orig 2009-10-31 14:34:13 UTC
	2	+++ TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
	3	@@ -16,7 +16,7 @@ typedef struct{
	4	jobject options;
	5	}fluid_settings_foreach_option_data;
	6
	7	-void fluid_settings_foreach_option_callback(void data, char name, char *option)
	8	+void fluid_settings_foreach_option_callback(void data, const char name, const char *option)
	9	{
	10	fluid_settings_foreach_option_data* handle = (fluid_settings_foreach_option_data *)data;
	11
	12	@@ -255,8 +255,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
	13	jstring jvalue = NULL;
	14	char *value = NULL;
	15	const jbyte jkey = (env)->GetStringUTFChars(env, key, NULL);
	16	-
	17	+
	18	+#if FLUIDSYNTH_VERSION_MAJOR < 2
	19	fluid_settings_getstr(handle->settings,(char *)jkey, &value );
	20	+#else
	21	+ fluid_settings_dupstr(handle->settings,(char *)jkey, &value );
	22	+#endif
	23	jvalue = (*env)->NewStringUTF(env, value);
	24
	25	(*env)->ReleaseStringUTFChars(env, key, jkey);
	26	@@ -274,7 +278,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
	27	jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
	28	if (mid != 0){
	29	const jbyte jkey = (env)->GetStringUTFChars(env, key, NULL);
	30	+#if FLUIDSYNTH_VERSION_MAJOR < 2
	31	double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
	32	+#else
	33	+ double value = 0.0;
	34	+ fluid_settings_getnum_default(handle->settings, (char*)jkey, &value);
	35	+#endif
	36
	37	(*env)->ReleaseStringUTFChars(env, key, jkey);
	38	(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
	39	@@ -291,7 +300,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
	40	jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
	41	if (mid != 0){
	42	const jbyte jkey = (env)->GetStringUTFChars(env, key, NULL);
	43	+#if FLUIDSYNTH_VERSION_MAJOR < 2
	44	int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
	45	+#else
	46	+ int value = 0;
	47	+ fluid_settings_getint_default(handle->settings,(char *)jkey, &value);
	48	+#endif
	49
	50	(*env)->ReleaseStringUTFChars(env, key, jkey);
	51	(*env)->CallVoidMethod( env, ref , mid , (jint)value );
	52	@@ -308,7 +322,12 @@ JNIEXPORT void JNICALL Java_org_herac_tuxguitar_player
	53	jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
	54	if (mid != 0){
	55	const jbyte jkey = (env)->GetStringUTFChars(env, key, NULL);
	56	+#if FLUIDSYNTH_VERSION_MAJOR < 2
	57	char value = fluid_settings_getstr_default(handle->settings,(char )jkey);
	58	+#else
	59	+ char *value = NULL;
	60	+ fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
	61	+#endif
	62	jstring jvalue = (*env)->NewStringUTF(env, value);
	63
	64	(*env)->ReleaseStringUTFChars(env, key, jkey);

Line 0 Link Here

(-)audio/tuxguitar/files/patch-TuxGuitar_build.properties (+59 lines)
	1	--- TuxGuitar/build.properties.orig 2009-10-31 14:32:52 UTC
	2	+++ TuxGuitar/build.properties
	3	@@ -5,15 +5,15 @@ ant.build.javac.source=1.4
	4	ant.build.javac.target=1.4
	5
	6	########## DEFAULT LINUX BUILD PROPERTIES ##########
	7	-lib.swt.jni=lib/
	8	-lib.swt.jar=lib/swt.jar
	9	-lib.itext.jar=lib/itext.jar
	10	-dist.file=xml/build-linux.xml
	11	-dist.version=1.2
	12	-dist.jar.path=./
	13	-dist.bin.path=./
	14	-dist.share.path=share/
	15	-dist.doc.path=doc/
	16	+#lib.swt.jni=lib/
	17	+#lib.swt.jar=lib/swt.jar
	18	+#lib.itext.jar=lib/itext.jar
	19	+#dist.file=xml/build-linux.xml
	20	+#dist.version=1.2
	21	+#dist.jar.path=./
	22	+#dist.bin.path=./
	23	+#dist.share.path=share/
	24	+#dist.doc.path=doc/
	25
	26	########## UBUNTU BUILD PROPERTIES ##########
	27	#lib.swt.jni=/usr/lib/jni/
	28	@@ -29,15 +29,15 @@ dist.doc.path=doc/
	29	#dist.doc.path=${dist.prefix}/share/doc/tuxguitar/
	30
	31	########## FREEBSD BUILD PROPERTIES ##########
	32	-#lib.swt.jni=/usr/local/lib/
	33	-#lib.swt.jar=/usr/local/share/java/classes/swt.jar
	34	-#lib.itext.jar=/usr/local/share/java/classes/itext.jar
	35	-#dist.file=xml/build-freebsd.xml
	36	-#dist.version=1.2
	37	-#dist.jar.path=/usr/local/share/java/TuxGuitar-${dist.version}/
	38	-#dist.bin.path=/usr/local/bin/
	39	-#dist.share.path=/usr/local/share/TuxGuitar-${dist.version}/
	40	-#dist.doc.path=/usr/local/share/doc/TuxGuitar-${dist.version}/
	41	+lib.swt.jni=%%LOCALBASE%%/lib/
	42	+lib.swt.jar=%%JAVAJARDIR%%/swt-devel.jar
	43	+lib.itext.jar=%%JAVAJARDIR%%/itext.jar
	44	+dist.file=xml/build-freebsd.xml
	45	+dist.version=1.2
	46	+dist.jar.path=%%JAVASHAREDIR%%/TuxGuitar-${dist.version}/
	47	+dist.bin.path=%%PREFIX%%/bin
	48	+dist.share.path=%%DATADIR%%
	49	+dist.doc.path=%%DOCSDIR%%
	50
	51	########## DEFAULT MAC BUILD PROPERTIES ##########
	52	#lib.swt.jni=lib/
	53	@@ -62,4 +62,4 @@ dist.doc.path=doc/
	54	#dist.doc.path=doc\\
	55	## get JanelWindows.exe from http://sourceforge.net/projects/janel/
	56	#janel.exe=utilities\\tuxguitar.exe
	57	-#janel.lap.prefix=${FOUND_EXE_FOLDER}\\
	58	\ No newline at end of file
	59	+#janel.lap.prefix=${FOUND_EXE_FOLDER}\\

Lines 1-59 Link Here

(-)audio/tuxguitar/files/patch-build.properties (-59 lines)
1	--- build.properties.orig 2009-10-31 14:32:52 UTC
2	+++ build.properties
3	@@ -5,15 +5,15 @@ ant.build.javac.source=1.4
4	ant.build.javac.target=1.4
5
6	########## DEFAULT LINUX BUILD PROPERTIES ##########
7	-lib.swt.jni=lib/
8	-lib.swt.jar=lib/swt.jar
9	-lib.itext.jar=lib/itext.jar
10	-dist.file=xml/build-linux.xml
11	-dist.version=1.2
12	-dist.jar.path=./
13	-dist.bin.path=./
14	-dist.share.path=share/
15	-dist.doc.path=doc/
16	+#lib.swt.jni=lib/
17	+#lib.swt.jar=lib/swt.jar
18	+#lib.itext.jar=lib/itext.jar
19	+#dist.file=xml/build-linux.xml
20	+#dist.version=1.2
21	+#dist.jar.path=./
22	+#dist.bin.path=./
23	+#dist.share.path=share/
24	+#dist.doc.path=doc/
25
26	########## UBUNTU BUILD PROPERTIES ##########
27	#lib.swt.jni=/usr/lib/jni/
28	@@ -29,15 +29,15 @@ dist.doc.path=doc/
29	#dist.doc.path=${dist.prefix}/share/doc/tuxguitar/
30
31	########## FREEBSD BUILD PROPERTIES ##########
32	-#lib.swt.jni=/usr/local/lib/
33	-#lib.swt.jar=/usr/local/share/java/classes/swt.jar
34	-#lib.itext.jar=/usr/local/share/java/classes/itext.jar
35	-#dist.file=xml/build-freebsd.xml
36	-#dist.version=1.2
37	-#dist.jar.path=/usr/local/share/java/TuxGuitar-${dist.version}/
38	-#dist.bin.path=/usr/local/bin/
39	-#dist.share.path=/usr/local/share/TuxGuitar-${dist.version}/
40	-#dist.doc.path=/usr/local/share/doc/TuxGuitar-${dist.version}/
41	+lib.swt.jni=%%LOCALBASE%%/lib/
42	+lib.swt.jar=%%JAVAJARDIR%%/swt-devel.jar
43	+lib.itext.jar=%%JAVAJARDIR%%/itext.jar
44	+dist.file=xml/build-freebsd.xml
45	+dist.version=1.2
46	+dist.jar.path=%%JAVASHAREDIR%%/TuxGuitar-${dist.version}/
47	+dist.bin.path=%%PREFIX%%/bin
48	+dist.share.path=%%DATADIR%%
49	+dist.doc.path=%%DOCSDIR%%
50
51	########## DEFAULT MAC BUILD PROPERTIES ##########
52	#lib.swt.jni=lib/
53	@@ -62,4 +62,4 @@ dist.doc.path=doc/
54	#dist.doc.path=doc\\
55	## get JanelWindows.exe from http://sourceforge.net/projects/janel/
56	#janel.exe=utilities\\tuxguitar.exe
57	-#janel.lap.prefix=${FOUND_EXE_FOLDER}\\
58	\ No newline at end of file
59	+#janel.lap.prefix=${FOUND_EXE_FOLDER}\\