Index: Makefile =================================================================== RCS file: /home/pcvs/ports/audio/tuxguitar/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 5 Feb 2010 11:34:30 -0000 1.26 +++ Makefile 27 Feb 2010 12:52:39 -0000 @@ -7,8 +7,7 @@ # PORTNAME= tuxguitar -PORTVERSION= 1.1 -PORTREVISION= 4 +PORTVERSION= 1.2 CATEGORIES= audio java MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \ ${MASTER_SITE_LOCAL}/gahr/:fluid \ @@ -23,8 +22,7 @@ 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 + ${JAVALIBDIR}/gervill.jar:${PORTSDIR}/audio/gervill RUN_DEPENDS= ${JAVALIBDIR}/swt.jar:${PORTSDIR}/x11-toolkits/swt \ ${JAVALIBDIR}/itext.jar:${PORTSDIR}/devel/itext \ ${JAVALIBDIR}/gervill.jar:${PORTSDIR}/audio/gervill @@ -34,6 +32,7 @@ INSTALL_SHARE_DIR=${DATADIR} USE_JAVA= yes +USE_ANT= yes USE_GECKO= libxul USE_GMAKE= yes USE_LDCONFIG= yes @@ -41,7 +40,7 @@ JAVA_VENDOR= freebsd bsdjava sun blackdown NOCCACHE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/TuxGuitar .if !defined(WITHOUT_MAN) MAN1= tuxguitar.1 @@ -61,70 +60,67 @@ ${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR} 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}|;' \ - ${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 + ${FIND} ${WRKSRC}/.. -name build.properties | ${XARGS} ${REINPLACE_CMD} -e '\ + 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|LDFLAGS\?=.*|LDFLAGS?=-L${LOCALBASE}/lib|' + ${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}/build.properties + +post-build: .for p in ${PLUGINS} - ${REINPLACE_CMD} -e \ - 's|$${path.swt}|${JAVALIBDIR}/swt.jar|; \ - s|$${path.itext}|${JAVALIBDIR}/itext.jar|' \ - ${WRKSRC}/TuxGuitar-${p}/build.xml + (cd ${WRKSRC}/../TuxGuitar-${p}; \ + ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${ALL_TARGET}) .endfor - ${REINPLACE_CMD} -e 's|$${lib.swt.jar}|${JAVALIBDIR}/swt.jar|g' \ - ${WRKSRC}/TuxGuitar/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|$$(shell gcj -print-file-name=include/)|${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include|;\ - s|/usr/lib|${LOCALBASE}/lib|' \ - ${WRKSRC}/TuxGuitar-oss/jni/GNUmakefile \ - ${WRKSRC}/TuxGuitar-fluidsynth/jni/GNUmakefile + cd ${WRKSRC}/../TuxGuitar-oss/jni && ${GMAKE} + cd ${WRKSRC}/../TuxGuitar-fluidsynth/jni && ${GMAKE} + cd ${WRKSRC}/../TuxGuitar-jack/jni && ${GMAKE} do-install: ${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} + ${INSTALL_DATA} ${WRKSRC}/tuxguitar.jar ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/../misc/*.tg ${DATADIR} ${INSTALL_DATA} ${WRKDIR}/8MBGMSFX.SF2 ${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 + ${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 + ${INSTALL_DATA} ${WRKSRC}/../TuxGuitar-${p}/tuxguitar-${p}.jar ${DATADIR}/plugins .endfor # Inline documentation - cd ${WRKSRC}/TuxGuitar/share/help && ${COPYTREE_SHARE} \* ${DATADIR}/help - cd ${WRKSRC}/TuxGuitar/share/lang && ${COPYTREE_SHARE} \* ${DATADIR}/lang - cd ${WRKSRC}/TuxGuitar/share/scales && ${COPYTREE_SHARE} \* ${DATADIR}/scales - cd ${WRKSRC}/TuxGuitar/share/skins && ${COPYTREE_SHARE} \* ${DATADIR}/skins + cd ${WRKSRC}/share/help && ${COPYTREE_SHARE} \* ${DATADIR}/help + cd ${WRKSRC}/share/lang && ${COPYTREE_SHARE} \* ${DATADIR}/lang + cd ${WRKSRC}/share/scales && ${COPYTREE_SHARE} \* ${DATADIR}/scales + cd ${WRKSRC}/share/skins && ${COPYTREE_SHARE} \* ${DATADIR}/skins # XPM icon ${INSTALL} -d ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.xpm ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/../misc/tuxguitar.xpm ${PREFIX}/share/pixmaps # Desktop entry ${INSTALL} -d ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/misc/tuxguitar.desktop ${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 + ${INSTALL_MAN} ${WRKSRC}/../misc/tuxguitar.1 ${MANPREFIX}/man/man1 .endif post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/TuxGuitar/doc && ${COPYTREE_SHARE} \* ${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR} .endif @${ECHO} @${ECHO} "SoundFonts for the FluidSynth plugin are available at:" Index: distinfo =================================================================== RCS file: /home/pcvs/ports/audio/tuxguitar/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 11 Apr 2009 07:51:05 -0000 1.7 +++ distinfo 24 Feb 2010 09:03:13 -0000 @@ -1,6 +1,6 @@ -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 (tuxguitar-src-1.2.tar.gz) = f41ed20e77c6c3d8968991a29c71b912 +SHA256 (tuxguitar-src-1.2.tar.gz) = 84a4fc6ae4802442fd0cc011e19316c0e4ca5a6d684db4306cdf19d09e703ebc +SIZE (tuxguitar-src-1.2.tar.gz) = 2548224 MD5 (8MBGMSFX.SF2) = 568ddfaa56db2bb45fc96e28dcc711ad SHA256 (8MBGMSFX.SF2) = 6c2ff6e9219989e0a2d39e633cbdc7d8f8a575903985160495aeab5d01cc48e6 SIZE (8MBGMSFX.SF2) = 7557598 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/audio/tuxguitar/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 11 Apr 2009 07:51:05 -0000 1.7 +++ pkg-plist 26 Feb 2010 16:18:48 -0000 @@ -64,6 +64,7 @@ %%DATADIR%%/lang/messages_de.properties %%DATADIR%%/lang/messages_en.properties %%DATADIR%%/lang/messages_es.properties +%%DATADIR%%/lang/messages_eu.properties %%DATADIR%%/lang/messages_fr.properties %%DATADIR%%/lang/messages_hu.properties %%DATADIR%%/lang/messages_it.properties @@ -114,6 +115,7 @@ %%DATADIR%%/skins/Lavender/browser_root.png %%DATADIR%%/skins/Lavender/chord.png %%DATADIR%%/skins/Lavender/closerepeat.png +%%DATADIR%%/skins/Lavender/division-type.png %%DATADIR%%/skins/Lavender/dotted.png %%DATADIR%%/skins/Lavender/doubledotted.png %%DATADIR%%/skins/Lavender/dynamic_f.png @@ -232,7 +234,6 @@ %%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 @@ -251,6 +252,7 @@ %%DATADIR%%/skins/blue_serious/browser_root.png %%DATADIR%%/skins/blue_serious/chord.png %%DATADIR%%/skins/blue_serious/closerepeat.png +%%DATADIR%%/skins/blue_serious/division-type.png %%DATADIR%%/skins/blue_serious/dotted.png %%DATADIR%%/skins/blue_serious/doubledotted.png %%DATADIR%%/skins/blue_serious/dynamic_f.png @@ -387,6 +389,7 @@ %%DATADIR%%/skins/ersplus/browser_root.png %%DATADIR%%/skins/ersplus/chord.png %%DATADIR%%/skins/ersplus/closerepeat.png +%%DATADIR%%/skins/ersplus/division-type.png %%DATADIR%%/skins/ersplus/dotted.png %%DATADIR%%/skins/ersplus/doubledotted.png %%DATADIR%%/skins/ersplus/dynamic_f.png @@ -504,7 +507,6 @@ %%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 @@ -529,3 +531,5 @@ @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% + + Index: files/patch-Makefile =================================================================== RCS file: files/patch-Makefile diff -N files/patch-Makefile --- files/patch-Makefile 11 Apr 2009 07:51:05 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ ---- 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 \ Index: files/patch-TuxGuitar_build.properties =================================================================== RCS file: files/patch-TuxGuitar_build.properties diff -N files/patch-TuxGuitar_build.properties --- files/patch-TuxGuitar_build.properties 11 Apr 2009 07:51:05 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ ---- 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 - - ########## 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 -+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.1 --dist.jar.path=./ --dist.bin.path=./ --dist.share.path=share/ --dist.doc.path=doc/ -+dist.jar.path=%%JAVAJARDIR%% -+dist.bin.path=%%PREFIX%%/bin -+dist.share.path=%%DATADIR%% -+dist.doc.path=%%DOCSDIR%% - - ########## UBUNTU BUILD PROPERTIES ########## - #lib.swt.jni=/usr/lib/jni/ Index: files/patch-build.properties =================================================================== RCS file: files/patch-build.properties diff -N files/patch-build.properties --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-build.properties 26 Feb 2010 11:16:08 -0000 @@ -0,0 +1,59 @@ +--- build.properties.orig 2010-02-26 12:11:41.000000000 +0100 ++++ build.properties 2010-02-26 12:13:52.000000000 +0100 +@@ -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.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=${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.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\\ + ## 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}\\