From owner-svn-ports-all@freebsd.org Mon May 18 17:36:47 2020 Return-Path: Delivered-To: svn-ports-all@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 3957F2D8951; Mon, 18 May 2020 17:36:47 +0000 (UTC) (envelope-from jbeich@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 49QmR30nVfz450S; Mon, 18 May 2020 17:36:47 +0000 (UTC) (envelope-from jbeich@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 163A225246; Mon, 18 May 2020 17:36:47 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04IHakLG067165; Mon, 18 May 2020 17:36:46 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04IHakHG067161; Mon, 18 May 2020 17:36:46 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005181736.04IHakHG067161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 18 May 2020 17:36:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535761 - head/games/veloren X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/games/veloren X-SVN-Commit-Revision: 535761 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2020 17:36:47 -0000 Author: jbeich Date: Mon May 18 17:36:46 2020 New Revision: 535761 URL: https://svnweb.freebsd.org/changeset/ports/535761 Log: games/veloren: switch to upstream fix for assets Modified: head/games/veloren/Makefile (contents, props changed) head/games/veloren/distinfo (contents, props changed) Modified: head/games/veloren/Makefile ============================================================================== --- head/games/veloren/Makefile Mon May 18 17:35:33 2020 (r535760) +++ head/games/veloren/Makefile Mon May 18 17:36:46 2020 (r535761) @@ -10,6 +10,9 @@ DISTFILES= android-icon-192x192.png:icon \ ${PORTNAME}-assets-${DISTVERSIONFULL}.tar.xz:assets EXTRACT_ONLY= ${DISTFILES:N*\:icon:C/:.*//} +PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/ +PATCHFILES+= 886cad910372.diff:-p1 # https://gitlab.com/veloren/veloren/merge_requests/1003 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Multiplayer voxel RPG written in Rust @@ -587,8 +590,8 @@ post-patch: -e "/GIT_DATE/s/=.*/= \"$$(date -r $$(${AWK} '/TIMESTAMP/ { print $$3 }' \ ${DISTINFO_FILE}) +'%Y-%m-%d-%H:%M')\";/" \ ${WRKSRC}/common/src/util/mod.rs -# Enable system assets - @${REINPLACE_CMD} -e '/linux/d; s,/usr/share,${DATADIR:H},' \ +# Respect PREFIX != /usr/local for system assets + @${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/common/src/assets/mod.rs # lang/python3 cannot be used as a dependency @${REINPLACE_CMD} -e 's/"python3"/"${PYTHON_CMD:T}"/' \ Modified: head/games/veloren/distinfo ============================================================================== --- head/games/veloren/distinfo Mon May 18 17:35:33 2020 (r535760) +++ head/games/veloren/distinfo Mon May 18 17:36:46 2020 (r535761) @@ -1051,3 +1051,5 @@ SHA256 (veloren-specs-idvs-111548cf44e9bb4c43feb12aa3f SIZE (veloren-specs-idvs-111548cf44e9bb4c43feb12aa3fc253953ac6e4a_GL0.tar.gz) = 2455 SHA256 (yusdacra-treeculler-6c0fdf1c1cbf00be22e37410985d6a3973cd9bed_GL0.tar.gz) = a3cbbee898e79ed4c88f6c1b99ff03e1840c528e4c7ec615349bd0ddd5c3271f SIZE (yusdacra-treeculler-6c0fdf1c1cbf00be22e37410985d6a3973cd9bed_GL0.tar.gz) = 3999 +SHA256 (886cad910372.diff) = 2ff31c1d9b218ec8b462b5bf6d49ba847a9aed336672c29c6e792f616f89247a +SIZE (886cad910372.diff) = 589