svn commit: r535761 - head/games/veloren

[Jan Beich]

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 at 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