From nobody Fri Jan 20 21:38:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NzCXS5ScHz313X2; Fri, 20 Jan 2023 21:38:00 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NzCXS52v4z3jxH; Fri, 20 Jan 2023 21:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674250680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=idGKERd/TKeRrDJ2hIpwbqwYKCiRjhOuNYlBOJMg1Ew=; b=lFNW/KmEdqslm/JDdjX1jI/NjldwJFfFpBxlxMS+Vl87vYFtPF77tloFpJ93R9Rn8ucHrG KPX8qdhTGs85/QmOPfcyb+GAry4EB+ZhNiS6kRqQR/SI849rxrntPHzlPVA8WFBe2sr28e jBxxGONy38l7/ZJMgV7ZQwrSWVUR4twC2kqdrFxKaHArUDeQN2LbSybQDwYdUzmPjcC+0k VItwv7y11uwTFJL9CQHPjGpo4wZICoX6ysFopJEbckeTdVBBmx39YKhptF6Vt+MUa/bAJt WuPLaDMJ7HwV1zWAf1NE+r/iQ0/d8ZRJbyuq5XfRv2A5WVZwvXYKYkWaB/Xvmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674250680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=idGKERd/TKeRrDJ2hIpwbqwYKCiRjhOuNYlBOJMg1Ew=; b=DMZecWJ66HRmbW+9hCAaYQg9wxCk3nfDSmZ1XbBpOAlLwbsqafohoF+XdaaaSTdmoHqYRn w/akcWhUxUtZQ7Vf1s0C/iZHLq2YYBZeNduLBT4q31Fpc5nUsJU9IxEB4k3Oqn9GBH4gJE uUD6Dyqz5MU3IGErxCJWkI4Pvr9f5lMjLdQ95ev3m2yRaiiCTEw72tkraTqAcKEIpj+EmZ dP3W/pBmwkJvKG1wMPN1L2XYohytayA6yuP/bndbBR9GCXdu2vXsHmZSvppgEUke/0q/5A PhmMQw02ABZcgxfiACsHdVuRJTeKyWOwKTxKO/gVQM4ID42/Qh+pqNbaLZpm2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674250680; a=rsa-sha256; cv=none; b=AZ3DpvcLm/t2LgqfmNMGvk40iLEi6bfOnELPN2QEyS6gbwe4jBjeuqI9320YW1d4zO7GhJ eLHlpdhRkS+yV9CYWPcatMq69GzjZ0LO7PASk24Miz1f0FJTpc3Cm8tA1aNOC5DOixojfv 8O+r6Nqu6cUGMTWJEs4MBqpUNVT67b13B7te62fV9WOmVWK1zqF0NZ1ZAI9FnvMnJEQe9Q uNX9U3UaBAw2D62C7F8XpryLTgm6Fn379JqEuJuVHF/EZugaxBVhU1AZHvxy45W3EKG6Yv e5qfmKtqkjCAz+zTfj8jDWTp9vTXZb+TnC9TWx3Ff3itCQm9zomxWgeBF1tMfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NzCXS48y4zlTJ; Fri, 20 Jan 2023 21:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30KLc0Y1001471; Fri, 20 Jan 2023 21:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30KLc0vK001470; Fri, 20 Jan 2023 21:38:00 GMT (envelope-from git) Date: Fri, 20 Jan 2023 21:38:00 GMT Message-Id: <202301202138.30KLc0vK001470@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: fe17c673307c - main - games/veloren: embed commit hash instead of tag name List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe17c673307c44a8944490b1c47c6d39eecfdbda Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe17c673307c44a8944490b1c47c6d39eecfdbda commit fe17c673307c44a8944490b1c47c6d39eecfdbda Author: Jan Beich AuthorDate: 2023-01-20 20:54:45 +0000 Commit: Jan Beich CommitDate: 2023-01-20 21:34:04 +0000 games/veloren: embed commit hash instead of tag name WARN veloren_client: Server is running 185dccc1[2023-01-06], you are running v0.14.0[2023-01-06], versions might be incompatible! https://gitlab.com/veloren/veloren/-/commit/b8e12811bf46 --- games/veloren/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games/veloren/Makefile b/games/veloren/Makefile index 89b679a781af..32830d81a377 100644 --- a/games/veloren/Makefile +++ b/games/veloren/Makefile @@ -48,7 +48,7 @@ post-patch: @${REINPLACE_CMD} -e 's/"git"/"${TRUE}"/' \ ${WRKSRC}/common/build.rs # Extract (snapshot) version from the port instead of empty file - @${REINPLACE_CMD} -e '/GIT_HASH/s/=.*/= "${DISTVERSIONFULL}";/' \ + @${REINPLACE_CMD} -e '/GIT_HASH/s/=.*/= "${GL_COMMIT:C/(.{8}).*/\1/}";/' \ -e "/GIT_DATE.*static/s/=.*/= \"$$(date -r $$(${AWK} '/TIMESTAMP/ { print $$3 }' \ ${DISTINFO_FILE}) +'%Y-%m-%d-%H:%M')\";/" \ ${WRKSRC}/common/src/util/mod.rs