diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index bd183cd24146..2a4bfddf0088 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	grep
-PORTVERSION=	3.7
-PORTREVISION=	1
+PORTVERSION=	3.8
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU version of popular pattern matching utility
 WWW=		https://www.gnu.org/software/grep/
 
 LICENSE=	GPLv3+
 
 CONFLICTS=	bsd-grep
 
-RUN_DEPENDS=	groff:textproc/groff
-
 USES=		charsetfix cpe tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
 TEST_TARGET=	check
 
 INFO=		grep
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=		ICONV LIBSIGSEGV NLS PCRE
 OPTIONS_DEFAULT=	ICONV PCRE
 LIBSIGSEGV_DESC=	Use alternative page fault handler (GNU libsigsegv)
 OPTIONS_SUB=		yes
 
 ICONV_CONFIGURE_USES=	iconv
 ICONV_CONFIGURE_WITH=	libiconv-prefix=${LOCALBASE}
 
 LIBSIGSEGV_LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
 LIBSIGSEGV_CONFIGURE_WITH=	libsigsegv-prefix=${LOCALBASE}
 
 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
 
 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//' \
 		${WRKSRC}/lib/Makefile.in
 
 post-install:
 .for p in grep egrep fgrep
 	${LN} -sf g${p} ${STAGEDIR}${PREFIX}/bin/${p}
 .endfor
 
 .include <bsd.port.mk>
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
@@ -1,20 +1,11 @@
 --- configure.orig	2021-08-14 19:53:52 UTC
 +++ configure
 @@ -35665,7 +35665,7 @@ else $as_nop
        elxsi | \
        fr30 | \
        h8300 | \
 -      i?86 | x86_64 | \
 +      i?86 | x86_64 | amd64 | \
        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
@@ -1,52 +1,52 @@
 bin/egrep
 bin/fgrep
 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
 %%NLS%%share/locale/bg/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/da/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/de/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/el/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/es/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/et/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/he/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/grep.mo
 %%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
 %%NLS%%share/locale/nb/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/grep.mo
 %%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
 %%NLS%%share/locale/vi/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/grep.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/grep.mo