From owner-svn-ports-head@freebsd.org Mon Sep 30 20:39:06 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 470EE131950; Mon, 30 Sep 2019 20:39:06 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hvQ20n8lz4PSr; Mon, 30 Sep 2019 20:39:06 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D86B883D7; Mon, 30 Sep 2019 20:39:05 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8UKd52H083202; Mon, 30 Sep 2019 20:39:05 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8UKd5sg083199; Mon, 30 Sep 2019 20:39:05 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201909302039.x8UKd5sg083199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Mon, 30 Sep 2019 20:39:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513413 - in head/audio/tuxguitar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/audio/tuxguitar: . files X-SVN-Commit-Revision: 513413 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 20:39:06 -0000 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