git: be916aaa8655 - main - textproc/gnugrep: update GNU grep to version 3.8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 14 Sep 2022 09:49:02 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=be916aaa865593853fa8dcf1c7fe4e632963acc2
commit be916aaa865593853fa8dcf1c7fe4e632963acc2
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-09-14 09:47:30 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-09-14 09:47:30 +0000
textproc/gnugrep: update GNU grep to version 3.8
- PCRE option is now backed by `devel/pcre2' port
- Remove seemingly useless macro from the manpage
in order to drop dependency on `textproc/groff'
as suggested by Dan Allen
Reported by: portscout
---
textproc/gnugrep/Makefile | 10 +++++-----
textproc/gnugrep/distinfo | 6 +++---
textproc/gnugrep/files/patch-configure | 9 ---------
textproc/gnugrep/pkg-plist | 4 ++--
4 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index bd183cd24146..2a4bfddf0088 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -1,6 +1,5 @@
PORTNAME= grep
-PORTVERSION= 3.7
-PORTREVISION= 1
+PORTVERSION= 3.8
CATEGORIES= textproc
MASTER_SITES= GNU
PKGNAMEPREFIX= gnu
@@ -13,8 +12,6 @@ LICENSE= GPLv3+
CONFLICTS= bsd-grep
-RUN_DEPENDS= groff:textproc/groff
-
USES= charsetfix cpe tar:xz
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
@@ -38,7 +35,7 @@ NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
NLS_CONFIGURE_WITH= libintl-prefix=${LOCALBASE}
-PCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+PCRE_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
PCRE_USES= pkgconfig
PCRE_CONFIGURE_ENABLE= perl-regexp
@@ -46,6 +43,9 @@ post-patch:
@${REINPLACE_CMD} 's:@grep@:${PREFIX}/bin/&:' ${WRKSRC}/src/egrep.sh
@${REINPLACE_CMD} 's|mkinstalldirs = .*|mkinstalldirs = ${MKDIR}|g' \
${WRKSRC}/po/Makefile.in.in
+# Remove useless(?) macro to avoid run-time dependency on `textproc/groff'
+ @${REINPLACE_CMD} '/Map mono-width fonts to standard fonts/,+6d' \
+ ${WRKSRC}/doc/grep.in.1
post-patch-NLS-off:
@${REINPLACE_CMD} '/install-exec-local:/s/install-exec-localcharset//' \
diff --git a/textproc/gnugrep/distinfo b/textproc/gnugrep/distinfo
index 7933d95b9929..0fbaa75b3323 100644
--- a/textproc/gnugrep/distinfo
+++ b/textproc/gnugrep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628970999
-SHA256 (grep-3.7.tar.xz) = 5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
-SIZE (grep-3.7.tar.xz) = 1641196
+TIMESTAMP = 1662189808
+SHA256 (grep-3.8.tar.xz) = 498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382
+SIZE (grep-3.8.tar.xz) = 1709536
diff --git a/textproc/gnugrep/files/patch-configure b/textproc/gnugrep/files/patch-configure
index 03c89bad1907..3c6ea52a8372 100644
--- a/textproc/gnugrep/files/patch-configure
+++ b/textproc/gnugrep/files/patch-configure
@@ -9,12 +9,3 @@
i860 | \
ia64 | \
m32r | \
-@@ -35714,7 +35714,7 @@ find_stack_direction (int *addr, int depth)
- return dir + dummy;
- }
- int
--main (int argc, char *argv)
-+main (int argc, char *argv[])
- {
- printf ("%d\n", find_stack_direction (NULL, argc + 20));
- return 0;
diff --git a/textproc/gnugrep/pkg-plist b/textproc/gnugrep/pkg-plist
index 499828b03cb5..a52a7740695d 100644
--- a/textproc/gnugrep/pkg-plist
+++ b/textproc/gnugrep/pkg-plist
@@ -4,8 +4,6 @@ bin/gegrep
bin/gfgrep
bin/ggrep
bin/grep
-man/man1/gegrep.1.gz
-man/man1/gfgrep.1.gz
man/man1/ggrep.1.gz
%%NLS%%share/locale/af/LC_MESSAGES/grep.mo
%%NLS%%share/locale/be/LC_MESSAGES/grep.mo
@@ -29,6 +27,7 @@ man/man1/ggrep.1.gz
%%NLS%%share/locale/id/LC_MESSAGES/grep.mo
%%NLS%%share/locale/it/LC_MESSAGES/grep.mo
%%NLS%%share/locale/ja/LC_MESSAGES/grep.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/grep.mo
%%NLS%%share/locale/ko/LC_MESSAGES/grep.mo
%%NLS%%share/locale/ky/LC_MESSAGES/grep.mo
%%NLS%%share/locale/lt/LC_MESSAGES/grep.mo
@@ -44,6 +43,7 @@ man/man1/ggrep.1.gz
%%NLS%%share/locale/sl/LC_MESSAGES/grep.mo
%%NLS%%share/locale/sr/LC_MESSAGES/grep.mo
%%NLS%%share/locale/sv/LC_MESSAGES/grep.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/grep.mo
%%NLS%%share/locale/th/LC_MESSAGES/grep.mo
%%NLS%%share/locale/tr/LC_MESSAGES/grep.mo
%%NLS%%share/locale/uk/LC_MESSAGES/grep.mo