From nobody Tue Dec 19 00:49:01 2023 X-Original-To: dev-commits-ports-all@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 4SvJ3f6CJKz54MYk; Tue, 19 Dec 2023 00:49:02 +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 4SvJ3f3Xrfz4sM0; Tue, 19 Dec 2023 00:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702946942; 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=6Y/2DsgIDZiXp7sKrFscdwO7U3aaxrwAIk0MikJAmyY=; b=MfAeEyw6qUXbcgP3GXfTdk7vMfaTShzErDjA/toyJ8m3J5G1hvHhe4wl0tnz0PJ207rzKv 0sQdJYaJQuA/Zd1cJ3bfQL3zK4UXY407MVG/uUMnCJY2uSxq7CQdrqJ4J9IJyrVgxGCds+ HCppT9C6bjDQMcWrv6DvW0RTnXYT+Zc5oBcQX8aqhhUKLYcxwgiKkNvq1bpcZt73tMbXRO aKP6W1Toa4HQPcSKyIrILQzKw/okBdmUjmVcR6FQvMRYBzxuKHDxh6Xhns3fodNMsEDv8x kqYJutuFwg/AeniIj+eWM8MCzRxF4/Vgl83twZGxxuqDrJokyTgQMSBCkvv9PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702946942; a=rsa-sha256; cv=none; b=qi3h3XfZkPBJFXiZMyG4f/Scpk+HlRsNvwQsuPEpxpk+2U7ct2+s++FrJH9XFmkkdQQJ/6 Qc2z88pBoNxRGnQILAW8KrI8qz5EJ0yL6hobX08rU3lBfFvxEHU8OBlvwVOgxmEmPGn8lh iSwQ1ZVAAgtXd0tm4bG7rIq17yxA5YhL32y6jpWzelxz+AGvsObUO1xOwNfYkNKN9W+NAA nVeMT3MnTR8Am5uI4fQEJGwjgZ84vEQYpckBFJ+EzMBcnF+/2KiWynakpPG8eJI5+inwnr 1D/bMReOBS23EB071xau9NCYpw+tz5GdTcLM8zS39co17QFc31mOa3BcpeaJ0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702946942; 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=6Y/2DsgIDZiXp7sKrFscdwO7U3aaxrwAIk0MikJAmyY=; b=nfjiKTLTbERW9FGtKgh71KyhfXGkeRvIj4xqkza8X/VuDZ8V+Z1R1wi/S/uM5JE4GiHIo1 AEFlYqbLkqzrhUHqEbD10DTEu+eEPeOLoMIYBoDasy+JWzz1Qh3n7UZrktG744iO341ARn BhJP8c5tp9aZAdHlQTkIDROepjeEpKZvcYEjK1lZ0cv4R7jMBXa40U3rfftDCH4lmEGqRG sawHrC6e+44ykPZytdrZMJJcwilv+2bKeBU4Kjxk5dCv6hqrbZBMRd5FwF80vflQ1UAHzh 4JWfiB4zAIEWzgfxBwtn4s786e+AIcRBP58zwj9LscI+bSFDuKKtdbrr6D1Qog== 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 4SvJ3d3S7lzk0S; Tue, 19 Dec 2023 00:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BJ0n1rK042235; Tue, 19 Dec 2023 00:49:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJ0n1tK042232; Tue, 19 Dec 2023 00:49:01 GMT (envelope-from git) Date: Tue, 19 Dec 2023 00:49:01 GMT Message-Id: <202312190049.3BJ0n1tK042232@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 217af776bfe1 - 2023Q4 - x11-wm/hyprland: unbreak version string after a7817297b14b List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 217af776bfe18bf15ecdd692aeeb0d07d1077981 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=217af776bfe18bf15ecdd692aeeb0d07d1077981 commit 217af776bfe18bf15ecdd692aeeb0d07d1077981 Author: Jan Beich AuthorDate: 2023-12-18 20:29:52 +0000 Commit: Jan Beich CommitDate: 2023-12-19 00:45:50 +0000 x11-wm/hyprland: unbreak version string after a7817297b14b $ hyprctl version Hyprland, built from branch at commit dirty (). Tag: ... (cherry picked from commit f99fdc344f9b711bb1fd0d936ad856955e0388ec) --- x11-wm/hyprland/Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 26410638c56d..3cb2ac664602 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,6 +1,7 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v DISTVERSION= 0.33.1 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -46,12 +47,19 @@ X11_MESON_ENABLED= xwayland post-patch: # Extract (snapshot) version from the port instead of meson.build - @${REINPLACE_CMD} -i .nogit -e "/GIT_BRANCH/s/run_command.*/'main'/" \ - -e "/GIT_COMMIT_HASH/s/run_command.*/'${DISTVERSIONFULL}'/" \ - -e "/GIT_COMMIT_MESSAGE/d" \ - -e "/GIT_DIRTY/s/run_command.*/'portbld'/" \ + @${REINPLACE_CMD} -i .nogit \ -e "/version.*jq/s/run_command.*/'${DISTVERSIONFULL}',/" \ ${WRKSRC}/meson.build + @${REINPLACE_CMD} -i .nogit \ + -e '/^HASH/s/=.*/=${DISTVERSIONFULL:C/.*-g//}/' \ + -e '/^BRANCH/s/=.*/=main/' \ + -e '/^MESSAGE/s/=.*/="?"/' \ + -e "/^DATE/s/=.*/=\"$$(date -ur $$(${AWK} \ + '/TIMESTAMP/ { print $$3 }' ${DISTINFO_FILE}))\"/" \ + -e '/^DIRTY/s/=.*/=portbld/' \ + -e '/^TAG/s/=.*/=${DISTVERSIONFULL}/' \ + ${WRKSRC}/scripts/generateVersion.sh + # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \ ${WRKSRC}/src/render/OpenGL.cpp