git: 4d37ad5f5011 - main - textproc/gnugrep: the port had been updated to version 3.12

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Sun, 11 May 2025 14:18:21 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d37ad5f501122a6606f40cef347e4c7b5c7bdbe

commit 4d37ad5f501122a6606f40cef347e4c7b5c7bdbe
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2025-05-11 14:16:52 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2025-05-11 14:16:52 +0000

    textproc/gnugrep: the port had been updated to version 3.12
    
    - Drop GNU_CONFIGURE_MANPREFIX and CONFLICTS with `bsd-grep'
      which had been moved from the ports into the base
    - Disable COMPAT option by default (see commit 18bf1a7d6beb
      and PR discussion for rationale behind this)
    
    PR:             277784
    Reported by:    portscout
---
 textproc/gnugrep/Makefile | 11 ++++-------
 textproc/gnugrep/distinfo |  6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 12e11853bf45..82fa50d26440 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	grep
-PORTVERSION=	3.11
+PORTVERSION=	3.12
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu
@@ -10,11 +10,8 @@ WWW=		https://www.gnu.org/software/grep/
 
 LICENSE=	GPLv3+
 
-CONFLICTS=	bsd-grep
-
 USES=		charsetfix cpe tar:xz
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--program-prefix=g
 TEST_TARGET=	check
 
@@ -22,7 +19,7 @@ INFO=		grep
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=		COMPAT ICONV LIBSIGSEGV NLS PCRE
-OPTIONS_DEFAULT=	COMPAT ICONV PCRE
+OPTIONS_DEFAULT=	ICONV PCRE
 COMPAT_DESC=		Create g-prefixless compatibility symlinks
 LIBSIGSEGV_DESC=	Use alternative page fault handler (GNU libsigsegv)
 OPTIONS_SUB=		yes
@@ -45,8 +42,8 @@ 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' \
+# Don't use extension register to avoid run-time dependency on `textproc/groff'
+	@${REINPLACE_CMD} 's,do nr mH .* groff extension register,nr mH 0,' \
 		${WRKSRC}/doc/grep.in.1
 
 post-patch-NLS-off:
diff --git a/textproc/gnugrep/distinfo b/textproc/gnugrep/distinfo
index fe758ac20332..ae1b2096918c 100644
--- a/textproc/gnugrep/distinfo
+++ b/textproc/gnugrep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683967158
-SHA256 (grep-3.11.tar.xz) = 1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab
-SIZE (grep-3.11.tar.xz) = 1703776
+TIMESTAMP = 1744301167
+SHA256 (grep-3.12.tar.xz) = 2649b27c0e90e632eadcd757be06c6e9a4f48d941de51e7c0f83ff76408a07b9
+SIZE (grep-3.12.tar.xz) = 1918448