UPDATE: sysutils/coreutils 8.32 => 9.0

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/coreutils/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 19 Nov 2020 00:17:49 -0000 1.22
+++ Makefile 3 Oct 2021 19:10:30 -0000
@@ -2,8 +2,7 @@

COMMENT = file, shell and text manipulation utilities

-DISTNAME = coreutils-8.32
-REVISION = 0
+DISTNAME = coreutils-9.0
CATEGORIES = sysutils

MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@@ -24,7 +23,7 @@ LIB_DEPENDS = devel/gettext,-runtime

CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --program-prefix=g \
- --without-gmp
+ --without-libgmp

# Fixes a spurrious test failure
PORTHOME = ${WRKDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/coreutils/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 8 Mar 2020 04:04:02 -0000 1.11
+++ distinfo 3 Oct 2021 19:10:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (coreutils-8.32.tar.xz) = RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo=
-SIZE (coreutils-8.32.tar.xz) = 5547836
+SHA256 (coreutils-9.0.tar.xz) = zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84=
+SIZE (coreutils-9.0.tar.xz) = 5612752
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/coreutils/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in 8 Mar 2020 04:04:02 -0000 1.10
+++ patches/patch-Makefile_in 3 Oct 2021 19:10:30 -0000
@@ -5,7 +5,7 @@ XXX: Avoid rebuilding coreutils.info; ou
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -12700,6 +12700,7 @@ doc/$(am__dirstamp):
+@@ -13254,6 +13254,7 @@ doc/$(am__dirstamp):
@: > doc/$(am__dirstamp)

$(srcdir)/doc/coreutils.info: doc/coreutils.texi $(srcdir)/doc/version.texi $(doc_coreutils_TEXINFOS)
Index: patches/patch-lib_vasnprintf_c
===================================================================
RCS file: patches/patch-lib_vasnprintf_c
diff -N patches/patch-lib_vasnprintf_c
--- patches/patch-lib_vasnprintf_c 19 Nov 2020 00:17:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-lib_vasnprintf_c,v 1.1 2020/11/19 00:17:49 jca Exp $
-
-Don't use printf %n.
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
-
-Index: lib/vasnprintf.c
---- lib/vasnprintf.c.orig
-+++ lib/vasnprintf.c
-@@ -4858,11 +4858,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-- && !defined __UCLIBC__) \
-- || (defined __APPLE__ && defined __MACH__) \
-- || defined __ANDROID__ \
-- || (defined _WIN32 && ! defined __CYGWIN__))
-+# if 0
- fbp[1] = '%';
- fbp[2] = 'n';
- fbp[3] = '\0';
Index: patches/patch-src_ls_c
===================================================================
RCS file: patches/patch-src_ls_c
diff -N patches/patch-src_ls_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ls_c 3 Oct 2021 19:10:30 -0000
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+https://github.com/coreutils/coreutils/commit/4cfd48481da0486e2bad193495bc38e7d5ead7e4
+
+Index: src/ls.c
+--- src/ls.c.orig
++++ src/ls.c
+@@ -2273,7 +2273,7 @@ decode_switches (int argc, char **argv)
+ if (linelen < 0)
+ {
+ /* Suppress bogus warning re comparing ws.ws_col to big integer. */
+-# if __GNUC_PREREQ (4, 6)
++# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+ # pragma GCC diagnostic push
+ # pragma GCC diagnostic ignored "-Wtype-limits"
+ # endif
+@@ -2282,7 +2282,7 @@ decode_switches (int argc, char **argv)
+ && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws)
+ && 0 < ws.ws_col)
+ linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 0;
+-# if __GNUC_PREREQ (4, 6)
++# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+ # pragma GCC diagnostic pop
+ # endif
+ }
Hi ports --

Attached is an update to the GNU coreutils. You can see the changes
here:
https://lists.gnu.org/archive/html/coreutils-announce/2021-09/msg00000.html

jca@'s patch was committed and goes away. There was a build issue in 9.0
that I reported upstream and I've cherrypicked their fix.

All tests pass on amd64 and armv7. A big endian test would be
appreciated.

OK?

~Brian