From nobody Tue Jul 25 07:12:35 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 4R97X36XLLz4pKy9; Tue, 25 Jul 2023 07:12:35 +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 4R97X362trz3Km2; Tue, 25 Jul 2023 07:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690269155; 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=mHjP99nN/bElMJfQF8Q+rbR2t2KjseQXhoZDAIx+VoU=; b=WbfzV4+iTvuUZpS7oaW6QDn2Gn5Z8evMJlyMiCNIAnJ6gOmGmg3waY9Lp07uyW3XxPCVYC RlbSAOPBI72IfJDMjUKeB6iWQXrC5lolxRRFdbgSuPEwuXg+IX+V/zow/jWGDrShdmOafW hFRN16olVkkkASQbIK34QSnjD3Mh6LupOUTGTiB3qFtIQ0B5ti0hvnILySV57BicD9XKaI goxiZRD2SbTTPc36C5mBZThx3J1BB7ccclyMHgA1DmW/ofnVCujeY94gGeoaGzYjvl3ryX Un3qZ5xgKTRzKOMfMjC/GgoZ7psNlGFeXf3HDB8TWcWTuDOJzPPn2YoYkEK26g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690269155; 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=mHjP99nN/bElMJfQF8Q+rbR2t2KjseQXhoZDAIx+VoU=; b=P5/ViAlivEXiNZmwQqUqWvkDhH6e3t3p4aJS1mGJQ4N4LwvAyAJfHEWGZm63W9o4k793V9 In468jei4H6jty62eJgA1T8yhPruL9y9Udx2cfxIhSgslaoJ6xDJScA7VY7LO064nhtMyS t0c/RxaiDpMBWITL1MY6cARaAJTDoxyjK3yn5gBYUUe1zhaYNciyLpr5HCXVE2fB2VEFEG UHMlzHEo/Jyhb2tk3bUsuOHcC7voVWAgOO1Bxe9K0PYgipgzxpYyh50jq2xJ1NeE5MDTJn GS1G8RwiHXbuhMWE9BMaf3fNF4PDgZQNWfEV44VLVU/4/DSF+edvc/VPPaGB9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690269155; a=rsa-sha256; cv=none; b=czrkRCoBiQiaPBOVxMSExA2htoPz0Hzh4vIuUp/NNYFcTdVHBXsTIPUDZqBMajESDl404x KzkSkiEdF3U7g2FSaerKbTKRzf7d+NVg4HhQAHvO9WvC9IZI+TijvuJjeEtXgB84oIQ7oZ tprESitdmCG7UnSuTxgCtPyce3Js7SdWye/+MxRYhfW/1qXuT+0Hp8AJGr4w1+jJ4/J4OZ MOP5INZvdurSzgsA33fWRSmSicTQ5ycfjOUTBHQG034MbRX74UrL9yrVTY+bD+jFwygaFT wXgRMBWjARqR3UB74M/bywy2kDfml3g9P9XTK1NFIg4+5OcAYCA8P0sOKLVubw== 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 4R97X358FFzrNB; Tue, 25 Jul 2023 07:12:35 +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 36P7CZPk021200; Tue, 25 Jul 2023 07:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36P7CZ58021199; Tue, 25 Jul 2023 07:12:35 GMT (envelope-from git) Date: Tue, 25 Jul 2023 07:12:35 GMT Message-Id: <202307250712.36P7CZ58021199@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 22952612f3df - main - devel/gum: Add fish completion and port improvements 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22952612f3df2a7f1b2dd983b88544365a5e06fc Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=22952612f3df2a7f1b2dd983b88544365a5e06fc commit 22952612f3df2a7f1b2dd983b88544365a5e06fc Author: Nuno Teixeira AuthorDate: 2023-07-25 06:59:56 +0000 Commit: Nuno Teixeira CommitDate: 2023-07-25 07:12:25 +0000 devel/gum: Add fish completion and port improvements - gum binary is installed by default, so no need to use INSTALL_PROGRAM (or wrongly INSTALL_SCRIPT) - add fish completion - do generation of man and completions in post-build - use correct go variable to execute cmd on post-build - install stuff on post-install - move man page to a valid location (${PREFIX}/man being considered as deprecated.) PR: 272668 --- devel/gum/Makefile | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/devel/gum/Makefile b/devel/gum/Makefile index 24df8c10d37d..a79ec711e177 100644 --- a/devel/gum/Makefile +++ b/devel/gum/Makefile @@ -1,6 +1,7 @@ PORTNAME= gum DISTVERSIONPREFIX= v DISTVERSION= 0.11.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= dave@bitboss.ca @@ -14,20 +15,27 @@ USES= go:modules GO_MODULE= github.com/charmbracelet/gum PLIST_FILES= bin/gum \ - etc/bash_completion.d/gum \ - man/man1/gum.1.gz \ + etc/bash_completion.d/gum.bash \ + share/fish/completions/gum.fish \ + share/man/man1/gum.1.gz \ share/zsh/site-functions/_gum post-build: - ${MKDIR} ${WRKDIR}/manpages - ${WRKDIR}/bin/gum man > ${WRKDIR}/manpages/gum.1 + ${GO_WRKDIR_BIN}/${PORTNAME} man > ${WRKSRC}/${PORTNAME}.1 +.for SHELL in bash fish zsh + ${GO_WRKDIR_BIN}/${PORTNAME} completion ${SHELL} > ${WRKSRC}/${SHELL} +.endfor -do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/bin/gum ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKDIR}/manpages/gum.1 ${STAGEDIR}${PREFIX}/man/man1/ - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - ${WRKDIR}/bin/gum completion bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/gum - ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${WRKDIR}/bin/gum completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_gum +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d + ${INSTALL_DATA} ${WRKSRC}/bash \ + ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}.bash + @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions + ${INSTALL_DATA} ${WRKSRC}/fish \ + ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions + ${INSTALL_DATA} ${WRKSRC}/zsh \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include