git: 82761978f2d3 - main - textproc/ugrep: Update to 4.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Dec 2023 10:24:39 UTC
The branch main has been updated by ashish:
URL: https://cgit.FreeBSD.org/ports/commit/?id=82761978f2d36c7e1e7aa9326432b558edc9af67
commit 82761978f2d36c7e1e7aa9326432b558edc9af67
Author: Ashish SHUKLA <ashish@FreeBSD.org>
AuthorDate: 2023-12-19 10:15:58 +0000
Commit: Ashish SHUKLA <ashish@FreeBSD.org>
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+