- Update to 1.0-RC4

6 files changed, 104 insertions, 71 deletions

diff --git a/audio/tuxguitar/Makefile b/audio/tuxguitar/Makefile
index 59e5af352c13..d3ee34ced944 100644
--- a/audio/tuxguitar/Makefile
+++ b/audio/tuxguitar/Makefile
@@ -1,3 +1,4 @@
+# ex: ts=8
 # New ports collection makefile for:   tuxguitar
 # Date created:        26 April 2007
 # Whom:                Pietro Cerutti (gahr@gahr.ch)
@@ -6,7 +7,7 @@
 #
 
 PORTNAME=	tuxguitar
-DISTVERSION=	1.0-rc3
+DISTVERSION=	1.0-rc4
 CATEGORIES=	audio java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-src-${DISTVERSION}
@@ -16,11 +17,13 @@ COMMENT=	A Multitrack tablature editor and player
 
 BUILD_DEPENDS=	${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \
 		${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \
-		ant:${PORTSDIR}/devel/apache-ant
+		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
 
-MAKE_ENV=	"JAVALIBDIR=${JAVALIBDIR}" "PREFIX=${PREFIX}"
+MAKE_ENV=	"PREFIX=${PREFIX}" "INSTALL_DOC_DIR=${DOCSDIR}" \
+		"INSTALL_SHARE_DIR=${DATADIR}"
 
 USE_JAVA=	yes
 USE_GMAKE=	yes
@@ -36,10 +39,8 @@ USE_GECKO=	mozilla firefox seamonkey
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
-PLUGINS=	TuxGuitar TuxGuitar-compat TuxGuitar-ascii TuxGuitar-gtp \
-		TuxGuitar-musicxml TuxGuitar-ptb TuxGuitar-tef TuxGuitar-pdf \
-		TuxGuitar-midi TuxGuitar-tray TuxGuitar-lilypond TuxGuitar-jsa \
-		TuxGuitar-oss
+PLUGINS=	ascii compat converter gtp jsa lilypond midi musicxml \
+		oss pdf ptb tef tray
 
 SUB_FILES=	tuxguitar
 SUB_LIST=	DATADIR=${DATADIR} \
@@ -48,20 +49,42 @@ SUB_LIST=	DATADIR=${DATADIR} \
 		GECKO=${GECKO}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|executable="make"|executable="${GMAKE}"|g' \
-	    ${WRKSRC}/TuxGuitar-oss/build.xml \
-	    ${WRKSRC}/TuxGuitar-CoreAudio/build.xml
+	${REINPLACE_CMD} -e 's|linux|freebsd|;s|JAVA_VERS|JAVA_PORT_VERSION|g; \
+		/TuxGuitar-alsa/d' \
+		${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|g; \
+		 s|%%JAVAJARDIR%%|${JAVAJARDIR}|g; \
+		 s|%%PREFIX%%|${PREFIX}|g; \
+		 s|%%DATADIR%%|${DATADIR}|g; \
+		 s|%%DISTVERSION%%|${DISTVERSION}|g; \
+		 s|%%DOCSDIR%%|${DOCSDIR}|g' \
+		${WRKSRC}/TuxGuitar/build.properties
+	${REINPLACE_CMD} -e 's|$${path.swt}|${JAVALIBDIR}/swt.jar|g' \
+		${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
+	${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|gcj|${LOCALBASE}/bin/gcj42|g' \
+	    ${WRKSRC}/TuxGuitar-oss/jni/GNUmakefile
 
 do-install:
-	${MKDIR} ${DATADIR}
+	${INSTALL} -d ${DATADIR}
+	${INSTALL} -d ${DATADIR}/plugins
 	# Main program and plugins
 	${INSTALL_SCRIPT} ${WRKDIR}/tuxguitar ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/TuxGuitar/tuxguitar.jar ${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/misc/*.tg ${DATADIR}
-	${MKDIR} ${DATADIR}/plugins
-	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-oss/libtuxguitar-oss-jni.so ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-oss/jni/libtuxguitar-oss-jni.so ${PREFIX}/lib
 .for p in ${PLUGINS}
-	${INSTALL_DATA} ${WRKSRC}/${p}/*.jar ${DATADIR}/plugins
+	${INSTALL_DATA} ${WRKSRC}/TuxGuitar-${p}/tuxguitar-${p}.jar ${DATADIR}/plugins
 .endfor
 	# Inline documentation
 	cd ${WRKSRC}/TuxGuitar/share/help &&   ${COPYTREE_SHARE} \* ${DATADIR}/help
@@ -70,10 +93,15 @@ do-install:
 	cd ${WRKSRC}/TuxGuitar/share/skins &&  ${COPYTREE_SHARE} \* ${DATADIR}/skins
 
 	# XPM icon
+	${INSTALL} -d ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.xpm ${PREFIX}/share/pixmaps
 
-	# MAN page
+	# Desktop entry
+	${INSTALL} -d ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.desktop ${PREFIX}/share/applications
+
 .if !defined(WITHOUT_MAN)
+	# MAN page
 	${INSTALL_MAN} ${WRKSRC}/misc/tuxguitar.1 ${MANPREFIX}/man/man1
 .endif
 
diff --git a/audio/tuxguitar/distinfo b/audio/tuxguitar/distinfo
index edfe23831020..8159a3bdb819 100644
--- a/audio/tuxguitar/distinfo
+++ b/audio/tuxguitar/distinfo
@@ -1,3 +1,3 @@
-MD5 (tuxguitar-src-1.0-rc3.tar.gz) = f35cecfc2646cd2aad462deaad7b04bb
-SHA256 (tuxguitar-src-1.0-rc3.tar.gz) = c8046703c13772f75c2ed4e5ac7c8aa28425ee715eb7300c80b75e6cd3428109
-SIZE (tuxguitar-src-1.0-rc3.tar.gz) = 2318932
+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
diff --git a/audio/tuxguitar/files/patch-Makefile b/audio/tuxguitar/files/patch-Makefile
deleted file mode 100644
index 4839d357aed4..000000000000
--- a/audio/tuxguitar/files/patch-Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.orig	2008-03-11 22:09:54.000000000 +0100
-+++ Makefile	2008-03-12 21:23:14.000000000 +0100
-@@ -8,16 +8,16 @@
- 
- PACKAGE?=tuxguitar
- 
--JNI_OS?=linux
-+JNI_OS?=freebsd
- JAVA_HOME?=/usr/lib/jvm/java-6-sun/
- JAVA_VERS?=1.4
- 
--ITEXT_JAR?=/usr/share/java/itext.jar
-+ITEXT_JAR?=$(JAVALIBDIR)/itext.jar
- 
- # debian/3.3
- #SWT_PATH?=/usr/share/java/swt.jar
- # ubuntu/3.2
--SWT_JAR?=/usr/lib/java/swt.jar
-+SWT_JAR?=$(JAVALIBDIR)/swt.jar
- SWT_PATH?=${SWT_JAR}
- 
- PACKAGE_JAR?=${CURDIR}/TuxGuitar/${PACKAGE}.jar
-@@ -75,6 +75,10 @@
-  ./TuxGuitar-oss/tuxguitar-oss.jar \
-  #}jars_linux
- 
-+jars_freebsd?=\
-+ ./TuxGuitar-oss/tuxguitar-oss.jar \
-+ #}jars_freebsd
-+
- jars_windows?=TuxGuitar-winmm/tuxguitar-winmm.jar
- 
- jars_macos?=TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar
-@@ -124,6 +128,8 @@
- 
- all_linux: ${all_linux}
- 
-+all_freebsd: ${all_freebsd}
-+
- all_sun: ${all_sun}
- 
- %.jar:
diff --git a/audio/tuxguitar/files/patch-TuxGuitar-oss-jni_GNUmakefile b/audio/tuxguitar/files/patch-TuxGuitar-oss-jni_GNUmakefile
deleted file mode 100644
index 076ca75799ec..000000000000
--- a/audio/tuxguitar/files/patch-TuxGuitar-oss-jni_GNUmakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- TuxGuitar-oss/jni/GNUmakefile.orig	2008-03-12 21:27:15.000000000 +0100
-+++ TuxGuitar-oss/jni/GNUmakefile	2008-03-12 21:27:23.000000000 +0100
-@@ -1,6 +1,6 @@
- CXX = gcc
- 
--INCLUDES = -I $(JAVA_HOME)/include/ -I $(JAVA_HOME)/include/linux/
-+INCLUDES = -I $(JAVA_HOME)/include/ -I $(JAVA_HOME)/include/freebsd
- 
- LIBRARY = $(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
- 
diff --git a/audio/tuxguitar/files/patch-TuxGuitar_build.properties b/audio/tuxguitar/files/patch-TuxGuitar_build.properties
new file mode 100644
index 000000000000..016e4c18c97b
--- /dev/null
+++ b/audio/tuxguitar/files/patch-TuxGuitar_build.properties
@@ -0,0 +1,52 @@
+--- TuxGuitar/build.properties.orig	2008-06-02 15:52:45.000000000 +0200
++++ TuxGuitar/build.properties	2008-06-02 15:55:04.000000000 +0200
+@@ -5,15 +5,15 @@
+ 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.0-rc4
+-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.bin.path=%%PREFIX%%/bin
++dist.share.path=%%DATADIR%%/
++dist.doc.path=%%DOCSDIR%%
+ 
+ ########## DEFAULT MAC BUILD PROPERTIES ##########
+ #lib.swt.jni=lib/
diff --git a/audio/tuxguitar/pkg-plist b/audio/tuxguitar/pkg-plist
index d3edd01e6d5d..d44d79bc850f 100644
--- a/audio/tuxguitar/pkg-plist
+++ b/audio/tuxguitar/pkg-plist
@@ -1,6 +1,7 @@
 bin/tuxguitar
 lib/libtuxguitar-oss-jni.so
 share/pixmaps/tuxguitar.xpm
+share/applications/tuxguitar.desktop
 %%DATADIR%%/tuxguitar.jar
 %%DATADIR%%/tuxguitar.tg
 %%DATADIR%%/scales/scales.xml
@@ -12,13 +13,16 @@ share/pixmaps/tuxguitar.xpm
 %%DATADIR%%/lang/messages_fr.properties
 %%DATADIR%%/lang/messages_hu.properties
 %%DATADIR%%/lang/messages_it.properties
+%%DATADIR%%/lang/messages_nl.properties
 %%DATADIR%%/lang/messages_pl.properties
 %%DATADIR%%/lang/messages_pt.properties
+%%DATADIR%%/lang/messages_ru.properties
 %%DATADIR%%/lang/messages_sr.properties
 %%DATADIR%%/lang/messages_sv.properties
+%%DATADIR%%/lang/messages_uk.properties
 %%DATADIR%%/lang/messages_zh_TW.properties
-%%DATADIR%%/plugins/tuxguitar.jar
 %%DATADIR%%/plugins/tuxguitar-compat.jar
+%%DATADIR%%/plugins/tuxguitar-converter.jar
 %%DATADIR%%/plugins/tuxguitar-ascii.jar
 %%DATADIR%%/plugins/tuxguitar-gtp.jar
 %%DATADIR%%/plugins/tuxguitar-musicxml.jar
@@ -499,6 +503,7 @@ share/pixmaps/tuxguitar.xpm
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%
 @dirrmtry share/pixmaps
+@dirrmtry share/applications
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE