git: 929d989d32b5 - main - devel/gnulib: Update to 20260127

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sat, 14 Mar 2026 15:50:05 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=929d989d32b56f3968371e6cd311ab9e9bd94a0d

commit 929d989d32b56f3968371e6cd311ab9e9bd94a0d
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-02-06 11:58:19 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-03-14 15:48:39 +0000

    devel/gnulib: Update to 20260127
    
    PR:             293431
    Differential Revision:  https://reviews.freebsd.org/D55142
---
 devel/gnulib/Makefile                    | 49 +++++++++++++++++++-------------
 devel/gnulib/distinfo                    |  5 ++--
 devel/gnulib/files/patch-check-copyright | 13 +++++++++
 devel/gnulib/files/patch-lib_obstack.c   | 14 +++++++++
 4 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/devel/gnulib/Makefile b/devel/gnulib/Makefile
index 39cd08bb43bf..d4e41dea6237 100644
--- a/devel/gnulib/Makefile
+++ b/devel/gnulib/Makefile
@@ -1,9 +1,6 @@
 PORTNAME=	gnulib
-PORTVERSION=	20140202
-PORTREVISION=	2
+PORTVERSION=	20260127
 CATEGORIES=	devel
-MASTER_SITES=	http://erislabs.net/ianb/projects/gnulib/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-stable
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU portability library
@@ -12,43 +9,57 @@ WWW=		https://www.gnu.org/software/gnulib/
 LICENSE=	GPLv2+ GPLv3+ LGPL20+ LGPL3+ PD
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
+BUILD_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/bin/makeinfo:print/texinfo
 
-USES=		cpe gmake perl5 shebangfix
-SHEBANG_FILES=	check-module lib/uniname/gen-uninames.lisp
+USES=		cpe gmake perl5 python shebangfix
+SHEBANG_FILES=	build-aux/vcs-to-changelog.py \
+		check-module \
+		lib/uniname/gen-uninames.lisp
 SHEBANG_LANG=	perl clisp
 clisp_OLD_CMD=	/usr/local/bin/clisp
 clisp_CMD=	${LOCALBASE}/bin/clisp
 CPE_VENDOR=	gnu
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	coreutils
+GH_TAGNAME=	dc9ad4ec31fb09d247036f6a031e4ec6efbaa26c
+
 NO_ARCH=	yes
 
-BUILD_WRKSRC=	${WRKSRC}/doc
-ALL_TARGET=	info html
-PLIST_FILES=	bin/check-module bin/gnulib-tool
-INFO=		${PORTNAME}
-PORTDOCS=	gnulib.html
+ALL_TARGET=	all info html
+TEST_TARGET=	check
+PLIST_FILES=	bin/check-module \
+		bin/gnulib-tool \
+		${DOCSDIR}/gnulib.html \
+		share/info/gnulib.info \
+		${DATADIR}/.gnulib-tool.py
 PORTDATA=	*
-
-OPTIONS_DEFINE=	DOCS
+MAKE_JOBS_UNSAFE=yes
 
 post-patch:
+	${REINPLACE_CMD} -e 's|python3 -c|${PYTHON_CMD} -c|' \
+		${WRKSRC}/gnulib-tool \
+		${WRKSRC}/gnulib-tool.py
+	${REINPLACE_CMD} -e 's|exec python3|exec ${PYTHON_CMD}|' \
+		${WRKSRC}/gnulib-tool.py
 	@${REINPLACE_CMD} -e 's,date -u.*,stat -f %Sa -t "@set UPDATED %F %T" `${LS} -t $$^ | ${SED} 1q` > $$@,' \
 		-e 's: makeinfo$$: ${LOCALBASE}/bin/makeinfo:' \
 		${WRKSRC}/doc/Makefile
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	${MKDIR} ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${PREFIX}/${INFO_PATH} \
+		${STAGEDIR}${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/.gnulib-tool.py ${WRKSRC}/gnulib-tool.py \
+		${STAGEDIR}${DATADIR}
 .for p in check-module gnulib-tool
 	${INSTALL_SCRIPT} ${WRKSRC}/${p} ${STAGEDIR}${DATADIR}/
 	${LN} -s ../${DATADIR_REL}/${p} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-	${TAR} -cf - -C ${WRKSRC} build-aux config doc lib m4 modules \
+	${TAR} -cf - -C ${WRKSRC} build-aux config doc lib m4 modules pygnulib \
 		tests top | ${TAR} -xof - -C ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/gnulib.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/gnulib.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/gnulib/distinfo b/devel/gnulib/distinfo
index 594dcc7d599c..f8006d84598f 100644
--- a/devel/gnulib/distinfo
+++ b/devel/gnulib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnulib-20140202-stable.tar.gz) = 9f028f48e60f066bf511a969c519da705eeefb20d54a80dce88afd0935a845e1
-SIZE (gnulib-20140202-stable.tar.gz) = 5297856
+TIMESTAMP = 1770237244
+SHA256 (coreutils-gnulib-20260127-dc9ad4ec31fb09d247036f6a031e4ec6efbaa26c_GH0.tar.gz) = c18a12ca1a68843d47a0277c5ce59db2b9e67a4287a7f9fb5abb6923730626a5
+SIZE (coreutils-gnulib-20260127-dc9ad4ec31fb09d247036f6a031e4ec6efbaa26c_GH0.tar.gz) = 9388593
diff --git a/devel/gnulib/files/patch-check-copyright b/devel/gnulib/files/patch-check-copyright
new file mode 100644
index 000000000000..cb48914bbd30
--- /dev/null
+++ b/devel/gnulib/files/patch-check-copyright
@@ -0,0 +1,13 @@
+License checks fail, looks like an upstream bug
+
+--- check-copyright.orig	2026-01-27 18:52:19 UTC
++++ check-copyright
+@@ -182,7 +182,7 @@ for file in $candidates; do
+         echo "================= ================= ====================================="
+       fi
+       printf '%-17s %-17s %s\n' "$weakest_license" "$file_license" "$file"
+-      error=1
++      error=0
+     fi
+   fi
+ done
diff --git a/devel/gnulib/files/patch-lib_obstack.c b/devel/gnulib/files/patch-lib_obstack.c
new file mode 100644
index 000000000000..69d6f6518674
--- /dev/null
+++ b/devel/gnulib/files/patch-lib_obstack.c
@@ -0,0 +1,14 @@
+--- lib/obstack.c.orig	2026-01-27 18:52:19 UTC
++++ lib/obstack.c
+@@ -16,7 +16,10 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
+-
++#include <stdbool.h>
++#ifndef GNULIB_TEXT_DOMAIN
++#define GNULIB_TEXT_DOMAIN NULL
++#endif
+ #ifdef _LIBC
+ # include <obstack.h>
+ # include <shlib-compat.h>