From nobody Tue Dec 19 10:24:39 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 4SvXqr04fJz550yL; Tue, 19 Dec 2023 10:24:40 +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 4SvXqq4d0Sz4XCg; Tue, 19 Dec 2023 10:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702981479; 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=sWckwfAhM1hs1neuBgAT212XX5RA9JH8m6n/0H//wVs=; b=rZc3RVBIWRceaRyTRgDQsJKtzvkTAJuEVkEMbcqTg65l55wlTZrW6lqUUCoBb5/KqdGWTA J7QiYIafK9iJokOzKPU+JCmGBIKNjXH/16OiK7OF43UCh0wX8W8kxMp5aJTNwnwvqTDWUG t9rpbWs4k5n8ILKXu+Q7NEwuivt5BC97CAb/6Du9UuKfmvErQGtC/VdfKtfvaueSdf0Jkd NeymDXJBPtolfTWSwpSKPTJ6oiBSun3lEx3DCg6dhESWdEGoLFEeWljB71mNqIpb1cS8h5 pS3Cdx5I/bIxMb6YQghTEf/zp23Y81Vce/sU4csZWAIEkfV06oqUXk+eb7cQ2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702981479; a=rsa-sha256; cv=none; b=qCOrtbUxPSXRqpCH0BLKOoJuQ/Sb4vk3qiJO/HISOV5+8AK/IeI0Cnfr1EviPYZOiMnexI o5mfowbjxAfn6Guar4LtuKt/SXmeZePHN8qshvWAgBd0KiiZy86m7o0uG76BGbnNpQ/RNr hFWua6r67Tt7TRK79TRIkCbhmddTOrnwS6MJdeqAY0/N0V+IQHTRlaftlH3Z3oxqGosC3q lttIcVf8R6cAEltXXeyXsghrRT+O9zfXvQ3ZQDb9JoIY1DTU6N4UJINFwONK9GHatgeEIH KvU4qsuPIlDnNzC9bR5mgVseejavzRQo0BAZCDyk6m3UCHBQ5JeKpRVIyOb8Uw== 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=1702981479; 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=sWckwfAhM1hs1neuBgAT212XX5RA9JH8m6n/0H//wVs=; b=A4bwyz737duCcH8D9KcSIhlj8dSRVG3UcHG0nE3FHo82in55kjT7fTf+TnQWeNC8+KjbzV QWNIuCVTccsAnxofnwI28Di1i78PeWyuiqDHWE0S4Hc10cn3mwZ8/cpIon3TzzV9jtIctk 9C+o52+YFky+2C7EMrktYTJsLo8FzgZ6cJBD9hML3jnAd4VbiVIlxP6sl0W1V4JodOw/zJ fRzxOx6CvsqnWBVlDgAGhSRiujb5ct6K1cgoYxldrrnrlYVHIPQe7AciLvYvjhsbPnMk8D BCDeI4EHCKv94E8J8tu2jypFYM2ZQb9RNHGm/fNnmIpiRKId+8ly/LNuVbNc8Q== 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 4SvXqq3kf6z11Pl; Tue, 19 Dec 2023 10:24:39 +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 3BJAOdoB013465; Tue, 19 Dec 2023 10:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJAOdVW013462; Tue, 19 Dec 2023 10:24:39 GMT (envelope-from git) Date: Tue, 19 Dec 2023 10:24:39 GMT Message-Id: <202312191024.3BJAOdVW013462@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 82761978f2d3 - main - textproc/ugrep: Update to 4.4.0 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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82761978f2d36c7e1e7aa9326432b558edc9af67 Auto-Submitted: auto-generated The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=82761978f2d36c7e1e7aa9326432b558edc9af67 commit 82761978f2d36c7e1e7aa9326432b558edc9af67 Author: Ashish SHUKLA AuthorDate: 2023-12-19 10:15:58 +0000 Commit: Ashish SHUKLA CommitDate: 2023-12-19 10:23:56 +0000 textproc/ugrep: Update to 4.4.0 - Install bash/fish/zsh autocompletions - Add a patch (submitted upstream) to fix installation of autocompletions --- textproc/ugrep/Makefile | 7 +++++-- textproc/ugrep/distinfo | 6 +++--- textproc/ugrep/files/patch-Makefile.in | 25 +++++++++++++++++++++++++ textproc/ugrep/pkg-plist | 12 ++++++++++++ 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/textproc/ugrep/Makefile b/textproc/ugrep/Makefile index a74a49cc3274..0b9d3d7c25d7 100644 --- a/textproc/ugrep/Makefile +++ b/textproc/ugrep/Makefile @@ -1,6 +1,6 @@ PORTNAME= ugrep DISTVERSIONPREFIX= v -DISTVERSION= 4.3.6 +DISTVERSION= 4.4.0 CATEGORIES= textproc MAINTAINER= ashish@FreeBSD.org @@ -22,7 +22,10 @@ OPTIONS_DEFAULT_aarch64= NEON OPTIONS_DEFAULT_amd64= AVX SSE2 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-boost-regex +CONFIGURE_ARGS= --with-boost-regex \ + --with-bash-completion-dir=${PREFIX}/etc/bash_completion.d \ + --with-fish-completion-dir=${PREFIX}/share/fish/completions \ + --with-zsh-completion-dir=${PREFIX}/share/zsh/site-functions SHEBANG_FILES= bin/ug+ bin/ugrep+ bash_CMD= ${SH} diff --git a/textproc/ugrep/distinfo b/textproc/ugrep/distinfo index 103a7b4d6dc1..34adfb33593a 100644 --- a/textproc/ugrep/distinfo +++ b/textproc/ugrep/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702006751 -SHA256 (Genivia-ugrep-v4.3.6_GH0.tar.gz) = 39f3205a2b8b79eeb6d2eaf1727c68262010e06ba5a7c42d5164c7ed6b6822f2 -SIZE (Genivia-ugrep-v4.3.6_GH0.tar.gz) = 4445771 +TIMESTAMP = 1702979343 +SHA256 (Genivia-ugrep-v4.4.0_GH0.tar.gz) = 5b8a08743bbf5c8b9d4719211961b8fb427988ffcada6d8c57dfaed9b6d12f7e +SIZE (Genivia-ugrep-v4.4.0_GH0.tar.gz) = 4472594 diff --git a/textproc/ugrep/files/patch-Makefile.in b/textproc/ugrep/files/patch-Makefile.in new file mode 100644 index 000000000000..bcbf445e5d7b --- /dev/null +++ b/textproc/ugrep/files/patch-Makefile.in @@ -0,0 +1,25 @@ +--- Makefile.in.orig 2023-12-18 21:41:11 UTC ++++ Makefile.in +@@ -1024,19 +1024,19 @@ install-data-hook: + rm -f ug.1 && \ + $(LN_S) ugrep.1 ug.1 + @if [ "x$(bashcompletiondir)" != "x" ]; then \ +- cd $(bashcompletiondir) && \ ++ cd $(DESTDIR)$(bashcompletiondir) && \ + $(LN_S) -f ug ug+ && \ + $(LN_S) -f ug ugrep && \ + $(LN_S) -f ug ugrep+; \ + fi + @if [ "x$(fishcompletiondir)" != "x" ]; then \ +- cd $(fishcompletiondir) && \ ++ cd $(DESTDIR)$(fishcompletiondir) && \ + sed -e 's/-c ug /-c ug+ /' ug.fish > ug+.fish && \ + sed -e 's/-c ug /-c ugrep /' ug.fish > ugrep.fish && \ + sed -e 's/-c ug /-c ugrep+ /' ug.fish > ugrep+.fish; \ + fi + @if [ "x$(zshcompletiondir)" != "x" ]; then \ +- cd $(zshcompletiondir) && \ ++ cd $(DESTDIR)$(zshcompletiondir) && \ + sed -e 's/^#compdef ug/#compdef ug+/' _ug > _ug+ && \ + sed -e 's/^#compdef ug/#compdef ugrep/' _ug > _ugrep && \ + sed -e 's/^#compdef ug/#compdef ugrep+/' _ug > _ugrep+; \ diff --git a/textproc/ugrep/pkg-plist b/textproc/ugrep/pkg-plist index c34a11c6c8e7..91c39bec9ada 100644 --- a/textproc/ugrep/pkg-plist +++ b/textproc/ugrep/pkg-plist @@ -191,3 +191,15 @@ man/man1/ugrep.1.gz %%DATADIR%%/patterns/xml/zap_comments %%DATADIR%%/patterns/xml/zap_pis %%DATADIR%%/patterns/xml/zap_strings +etc/bash_completion.d/ug +etc/bash_completion.d/ug+ +etc/bash_completion.d/ugrep +etc/bash_completion.d/ugrep+ +share/fish/completions/ug+.fish +share/fish/completions/ug.fish +share/fish/completions/ugrep+.fish +share/fish/completions/ugrep.fish +share/zsh/site-functions/_ug +share/zsh/site-functions/_ug+ +share/zsh/site-functions/_ugrep +share/zsh/site-functions/_ugrep+