From owner-svn-ports-head@freebsd.org Mon Jun 1 20:02:40 2020 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 5B1BC2F09A8; Mon, 1 Jun 2020 20:02:40 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49bR0w1gq9z4bsl; Mon, 1 Jun 2020 20:02:40 +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 3478C10A79; Mon, 1 Jun 2020 20:02:40 +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 051K2ep6035975; Mon, 1 Jun 2020 20:02:40 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051K2eJb035974; Mon, 1 Jun 2020 20:02:40 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202006012002.051K2eJb035974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Mon, 1 Jun 2020 20:02:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537507 - head/math/scilab X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: head/math/scilab X-SVN-Commit-Revision: 537507 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.33 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, 01 Jun 2020 20:02:40 -0000 Author: makc Date: Mon Jun 1 20:02:39 2020 New Revision: 537507 URL: https://svnweb.freebsd.org/changeset/ports/537507 Log: math/scilab: - Chase devel/apache-commons-io update to 2.7. Although it is binary compatible with 2.6, scilab hardcodes path to the versioned jar. - Patch scilab configure script to avoid dependencies on versioned jar files. Modified: head/math/scilab/Makefile Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Mon Jun 1 20:02:06 2020 (r537506) +++ head/math/scilab/Makefile Mon Jun 1 20:02:39 2020 (r537507) @@ -3,6 +3,7 @@ PORTNAME= scilab PORTVERSION= 6.1.0 +PORTREVISION= 1 CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} @@ -145,7 +146,14 @@ post-patch-GUI-on: ${LOCALBASE}/share/java/fop/build \ ${LOCALBASE}/share/java/batik/lib \ ${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure - @${REINPLACE_CMD} 's|fop\*.jar|fop.jar|' ${WRKSRC}/configure +# Prefer non-versioned files to avoid excessive rebuilds. This also fixes detection of fop. + @${REINPLACE_CMD} 's|batik-all\*\.jar|batik-all.jar|g; \ + s|commons-io\*\.jar|commons-io.jar|g; \ + s|commons-logging\*\.jar|commons-logging.jar|g; \ + s|fop\*\.jar|fop.jar|g; \ + s|jlatexmath\*\.jar|jlatexmath.jar|g; \ + s|xmlgraphics-commons\*\.jar|xmlgraphics-commons.jar|g' \ + ${WRKSRC}/configure # Part of the jogamp-jogl-2.3 patch: @${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure