Date: Sat, 8 Dec 2018 18:28:47 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486972 - in head/audio/tuxguitar: . files Message-ID: <201812081828.wB8ISlBF081180@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sat Dec 8 18:28:47 2018 New Revision: 486972 URL: https://svnweb.freebsd.org/changeset/ports/486972 Log: audio/tuxguitar: Several changes Port changes: * Remove unnecesary -Dos.name={os-name} passed to Java VM * Remove Gecko * Remove the browser-ftp plugin * Share the soundfont with FluidSynth, update pkg-message accordingly PR: 196036 Submitted by: Reuben Kebreau <kyamashita@openmailbox.org> (-Dos.name= removal) Submitted by: w.schwarzenfeld@utanet.at (Gecko/browser-ftp removal) Modified: head/audio/tuxguitar/Makefile head/audio/tuxguitar/files/pkg-message.in head/audio/tuxguitar/files/tuxguitar.in head/audio/tuxguitar/pkg-plist Modified: head/audio/tuxguitar/Makefile ============================================================================== --- head/audio/tuxguitar/Makefile Sat Dec 8 18:27:51 2018 (r486971) +++ head/audio/tuxguitar/Makefile Sat Dec 8 18:28:47 2018 (r486972) @@ -3,7 +3,7 @@ PORTNAME= tuxguitar PORTVERSION= 1.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= audio java MASTER_SITES= SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \ LOCAL/gahr/:fluid \ @@ -34,23 +34,23 @@ USES= cpe desktop-file-utils gmake pkgconfig CPE_VENDOR= herac USE_JAVA= yes USE_ANT= yes -WITH_GECKO= libxul USE_LDCONFIG= yes JAVA_VERSION= 1.6+ NOCCACHE= yes WRKSRC_SUBDIR= TuxGuitar +SF2_DIR= ${LOCALBASE}/share/sounds/sf2 OPTIONS_DEFINE= DOCS -PLUGINS= ascii browser-ftp compat converter fluidsynth gervill gtp \ +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} \ - GECKO=${GECKO:S/19//} + SF2_DIR=${SF2_DIR} post-extract: @${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR} @@ -105,6 +105,10 @@ do-install: ${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} Modified: head/audio/tuxguitar/files/pkg-message.in ============================================================================== --- head/audio/tuxguitar/files/pkg-message.in Sat Dec 8 18:27:51 2018 (r486971) +++ head/audio/tuxguitar/files/pkg-message.in Sat Dec 8 18:28:47 2018 (r486972) @@ -1,7 +1,10 @@ +====================================================================== +You installed TuxGuitar: The multitrack tablature editor and player. -SoundFonts for the FluidSynth plugin are available at: +SoundFonts pack 8MBGMSFX.SF2 for the TuxGuitar's FluidSynth plugin +has been shared with FluidSynth. The 8MBGMSFX.SF2 file has been +installed at: - %%DATADIR%%/8MBGMSFX.SF2 +%%SF2_DIR%%/8MBGMSFX.SF2 -Add this path in the FluidSynth plugin configuration to enable them. - +====================================================================== Modified: head/audio/tuxguitar/files/tuxguitar.in ============================================================================== --- head/audio/tuxguitar/files/tuxguitar.in Sat Dec 8 18:27:51 2018 (r486971) +++ head/audio/tuxguitar/files/tuxguitar.in Sat Dec 8 18:28:47 2018 (r486972) @@ -14,11 +14,7 @@ CLASSPATH=${CLASSPATH}:%%JAVALIBDIR%%/itext.jar JAVA_FLAGS="-Xms128m -Xmx128m -cp ${CLASSPATH}" -# We need this because FreeBSD's SWT lacks browser support -SWT_HACK="-Dos.name=linux" - -MOZILLA_FIVE_HOME=%%PREFIX%%/lib/%%GECKO%% java ${SWT_HACK} \ - ${JAVA_FLAGS} \ +MOZILLA_FIVE_HOME=%%PREFIX%%/lib/%%GECKO%% java ${JAVA_FLAGS} \ -cp ${CLASSPATH} \ ${PACKAGE_MAIN} \ "${ARGS}" Modified: head/audio/tuxguitar/pkg-plist ============================================================================== --- head/audio/tuxguitar/pkg-plist Sat Dec 8 18:27:51 2018 (r486971) +++ head/audio/tuxguitar/pkg-plist Sat Dec 8 18:28:47 2018 (r486972) @@ -1,7 +1,14 @@ bin/tuxguitar -man/man1/tuxguitar.1.gz lib/libtuxguitar-fluidsynth-jni.so lib/libtuxguitar-oss-jni.so +man/man1/tuxguitar.1.gz +share/applications/tuxguitar.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/README +share/pixmaps/tuxguitar.xpm +share/sounds/sf2/8MBGMSFX.SF2 %%DATADIR%%/8MBGMSFX.SF2 %%DATADIR%%/help/about.html %%DATADIR%%/help/css/styles.css @@ -81,7 +88,6 @@ lib/libtuxguitar-oss-jni.so %%DATADIR%%/lang/messages_zh_GB.properties %%DATADIR%%/lang/messages_zh_TW.properties %%DATADIR%%/plugins/tuxguitar-ascii.jar -%%DATADIR%%/plugins/tuxguitar-browser-ftp.jar %%DATADIR%%/plugins/tuxguitar-compat.jar %%DATADIR%%/plugins/tuxguitar-converter.jar %%DATADIR%%/plugins/tuxguitar-fluidsynth.jar @@ -510,9 +516,3 @@ lib/libtuxguitar-oss-jni.so %%DATADIR%%/skins/ersplus/transport_stop_2.png %%DATADIR%%/tuxguitar.jar %%DATADIR%%/tuxguitar.tg -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/README -share/applications/tuxguitar.desktop -share/pixmaps/tuxguitar.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812081828.wB8ISlBF081180>