Index: head/audio/tuxguitar/Makefile
===================================================================
--- head/audio/tuxguitar/Makefile	(revision 513412)
+++ head/audio/tuxguitar/Makefile	(revision 513413)
@@ -1,117 +1,117 @@
 # Created by: Pietro Cerutti (gahr@gahr.ch)
 # $FreeBSD$
 
 PORTNAME=	tuxguitar
 PORTVERSION=	1.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
 		LOCAL/gahr/:fluid \
 		http://people.freebsd.org/~gahr/distfiles/:fluid \
 		http://www.alsa-project.org/~james/sound-fonts/:fluid
 DISTNAME=	${PORTNAME}-src-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
 		8MBGMSFX.SF2:fluid
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multitrack tablature editor and player
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${JAVALIBDIR}/swt-devel.jar:x11-toolkits/swt-devel \
+BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:x11-toolkits/swt \
 		${JAVALIBDIR}/itext.jar:devel/itext \
 		${JAVALIBDIR}/gervill.jar:audio/gervill
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth \
 		libjack.so:audio/jack
 
 MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_DIR=${DOCSDIR} \
 		INSTALL_SHARE_DIR=${DATADIR}
 
 USES=		cpe desktop-file-utils gmake pkgconfig
 CPE_VENDOR=	herac
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.6+
 NOCCACHE=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/TuxGuitar
 SF2_DIR=	${LOCALBASE}/share/sounds/sf2
 
 OPTIONS_DEFINE=	DOCS
 
 PLUGINS=	ascii compat converter fluidsynth gervill gtp \
 		jsa lilypond midi musicxml oss pdf ptb tef tray tuner
 
 SUB_FILES=	pkg-message tuxguitar
 SUB_LIST=	DATADIR=${DATADIR} \
 		PREFIX=${PREFIX} \
 		JAVALIBDIR=${JAVALIBDIR} \
 		SF2_DIR=${SF2_DIR}
 
 post-extract:
 	@${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\.swt=.*|path.swt=${JAVAJARDIR}/swt.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 \
 	    -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|; \
 	    s|LDFLAGS\?=.*|LDFLAGS+=-L${LOCALBASE}/lib|; \
 	    s|CFLAGS\?=|CFLAGS+=|'
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
 	    s|%%PREFIX%%|${PREFIX}|g; \
 	    s|%%JAVAJARDIR%%|${JAVAJARDIR}|g; \
 	    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}
 	${RLN} ${STAGEDIR}${DATADIR}/8MBGMSFX.SF2 ${STAGEDIR}${SF2_DIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/TuxGuitar/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/audio/tuxguitar/files/patch-TuxGuitar_build.properties
===================================================================
--- head/audio/tuxguitar/files/patch-TuxGuitar_build.properties	(revision 513412)
+++ head/audio/tuxguitar/files/patch-TuxGuitar_build.properties	(revision 513413)
@@ -1,59 +1,59 @@
 --- 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=/usr/local/lib/
-+lib.swt.jar=/usr/local/share/java/classes/swt-devel.jar
++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.doc.path=/usr/local/share/doc/tuxguitar
  
  ########## 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}\\
Index: head/audio/tuxguitar/files/tuxguitar.in
===================================================================
--- head/audio/tuxguitar/files/tuxguitar.in	(revision 513412)
+++ head/audio/tuxguitar/files/tuxguitar.in	(revision 513413)
@@ -1,20 +1,20 @@
 #! /bin/sh
 
 PACKAGE_MAIN=org.herac.tuxguitar.gui.TGMain
 
 if [ "$1" ]; then ARGS=$1
 else ARGS=%%DATADIR%%/tuxguitar.tg; fi
 
 CLASSPATH=${CLASSPATH}
 CLASSPATH=${CLASSPATH}:%%DATADIR%%
 CLASSPATH=${CLASSPATH}:%%DATADIR%%/tuxguitar.jar
-CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/swt-devel.jar
+CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/swt.jar
 CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/gervill.jar
 CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/itext.jar
 
 JAVA_FLAGS="-Xms128m -Xmx128m -cp ${CLASSPATH}"
 
 MOZILLA_FIVE_HOME=%%PREFIX%%/lib/%%GECKO%% java ${JAVA_FLAGS} \
 						-cp ${CLASSPATH} \
 						${PACKAGE_MAIN} \
 						"${ARGS}"