From nobody Tue Dec 19 00:45:13 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 4SvHzG2NHwz54MSg; Tue, 19 Dec 2023 00:45:14 +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 4SvHzG1c30z4nTj; Tue, 19 Dec 2023 00:45:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702946714; 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=c1uHoCq7Up25FgE7oDKIpMUUxUmuG3eWOlfZ4mcBmGI=; b=TmIHeOmnZMgLrDzj5sMqAeVBixqzuQknQqOcPiCMHYJp+KMv2HRaoyNF6deVu8rWTlQSv+ HxDijiavUgYcLFN6WNDe4cREu/2HWvq+TvkncACwfo2ONYVHOZE9cWWojoI67LucgS1PEw C573/3aDiigJorr92WpOnKofKN9MZ3zUNdBN65ec8MFeeNkZy9/0p6gBzFYM9kDF2lTTLZ pm/f1zQaMggfFyMPujeEvmfq1qwl5dC6j1ErGitzv+9YWHCTcvhnkOxQ/C5znJYG3vPQs2 mi4jMacW3ROrQTm9xWpox1IqzZInpxTFegX+v2Pv3Mkk0N9Pl4XbINXKp62+vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702946714; a=rsa-sha256; cv=none; b=N82AeMaCeJCBZU/iuLbJvWXLsHIytbaH84Gq7M6but3nKKMClNb6io/VPEpPP9A+EswlNc 0qRhjc/fqKEAbcMeKPv2iIaFojYR9Jj5bW/c+d69s3nvV4rmk8zsXnEmR2T3CvjHCDPujO VG2OW+ZvV2PbRg5vR3WK0CkisYJBrBDlU/TKFqRSNha4Im7/KFrsS4oumc8XYQx94D1HRz rdiylUjsoZspnD7rhjmNwlei3vE3BQalIKfSrye317fLEjSg7rRiWSE+KyEmuXRK1m6TUy vQUDO8+82YCOz1b7Y26FbaybPh9Km/C1/zANzgBdmysvNYrPUeUDt5tVgrok6g== 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=1702946714; 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=c1uHoCq7Up25FgE7oDKIpMUUxUmuG3eWOlfZ4mcBmGI=; b=DjSExIAlQU74zumIMwyz2Y4ogiUGhqRttM2JH6b+qszx8SF9TYBz0xhC9BgcT08Sm+Faae ORPF5RuNCc6bhLBIBCeZearpYmO5HlQ+erE7V35a9S5S1HTO5kdTdzjinbl/9NXO4Sjk6O 53NUzTqm1WSimAqSEwqyd3H10aGzUHsTRnQUXsB+E1nAH2WJoxwkfEnxIHCVvfz/85FFu3 KjcaCZ6Xtu/5ro6TaJL0njMldam/LdStia+swcnPs8wzUPYc8KWjV3zZ9M0DrQcW2dfkO5 /iOkJRZI/OkGvYmS43Iyy2auk6hwpQ/Q9vmPFEdZl9+yQ7846/SzD9nouLS8QQ== 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 4SvHzF6pnVzjrb; Tue, 19 Dec 2023 00:45:13 +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 3BJ0jDgt041089; Tue, 19 Dec 2023 00:45:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJ0jDWP041086; Tue, 19 Dec 2023 00:45:13 GMT (envelope-from git) Date: Tue, 19 Dec 2023 00:45:13 GMT Message-Id: <202312190045.3BJ0jDWP041086@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: f99fdc344f9b - main - x11-wm/hyprland: unbreak version string after a7817297b14b 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: f99fdc344f9b711bb1fd0d936ad856955e0388ec Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f99fdc344f9b711bb1fd0d936ad856955e0388ec commit f99fdc344f9b711bb1fd0d936ad856955e0388ec Author: Jan Beich AuthorDate: 2023-12-18 20:29:52 +0000 Commit: Jan Beich CommitDate: 2023-12-19 00:43:20 +0000 x11-wm/hyprland: unbreak version string after a7817297b14b $ hyprctl version Hyprland, built from branch at commit dirty (). Tag: ... --- 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 796ee0ecad9a..c335893bc99b 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