Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Sep 2019 20:39:05 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r513413 - in head/audio/tuxguitar: . files
Message-ID:  <201909302039.x8UKd5sg083199@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Mon Sep 30 20:39:04 2019
New Revision: 513413
URL: https://svnweb.freebsd.org/changeset/ports/513413

Log:
  audio/tuxguitar:
  - Switch from x11-toolkits/swt-devel to x11-toolkits/swt, which is newer
    than -devel variant.
  
  PR:		219186
  Approved by:	maintainer (yuri)

Modified:
  head/audio/tuxguitar/Makefile
  head/audio/tuxguitar/files/patch-TuxGuitar_build.properties
  head/audio/tuxguitar/files/tuxguitar.in

Modified: head/audio/tuxguitar/Makefile
==============================================================================
--- head/audio/tuxguitar/Makefile	Mon Sep 30 20:38:30 2019	(r513412)
+++ head/audio/tuxguitar/Makefile	Mon Sep 30 20:39:04 2019	(r513413)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tuxguitar
 PORTVERSION=	1.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
 		LOCAL/gahr/:fluid \
@@ -20,7 +20,7 @@ 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}
@@ -57,7 +57,7 @@ post-extract:
 
 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 '\

Modified: head/audio/tuxguitar/files/patch-TuxGuitar_build.properties
==============================================================================
--- head/audio/tuxguitar/files/patch-TuxGuitar_build.properties	Mon Sep 30 20:38:30 2019	(r513412)
+++ head/audio/tuxguitar/files/patch-TuxGuitar_build.properties	Mon Sep 30 20:39:04 2019	(r513413)
@@ -39,7 +39,7 @@
 -#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

Modified: head/audio/tuxguitar/files/tuxguitar.in
==============================================================================
--- head/audio/tuxguitar/files/tuxguitar.in	Mon Sep 30 20:38:30 2019	(r513412)
+++ head/audio/tuxguitar/files/tuxguitar.in	Mon Sep 30 20:39:04 2019	(r513413)
@@ -8,7 +8,7 @@ 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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909302039.x8UKd5sg083199>