util-linux: Update wip/util-linux to v2.40.1

[Dan Cîrnaț (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Fri Dec 13 14:40:58 2024 +0100
Changeset:	167182f631a4a9f8957be1f90cdcd3459b1ebe81

Modified Files:
	util-linux/Makefile
	util-linux/distinfo
Removed Files:
	util-linux/patches/patch-aa
	util-linux/patches/patch-ab

Log Message:
util-linux: Update wip/util-linux to v2.40.1

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=167182f631a4a9f8957be1f90cdcd3459b1ebe81

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 util-linux/Makefile         | 16 +++++++------
 util-linux/distinfo         |  8 +++----
 util-linux/patches/patch-aa | 55 ---------------------------------------------
 util-linux/patches/patch-ab | 14 ------------
 4 files changed, 12 insertions(+), 81 deletions(-)

diffs:
diff --git a/util-linux/Makefile b/util-linux/Makefile
index 2869270fe7..b5afd5e625 100644
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.13 2012/10/07 17:41:40 asau Exp $
 
-DISTNAME=	util-linux-2.12r
-PKGREVISION=	1
+DISTNAME=	util-linux-2.40.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=system/misc/} \
-		http://www.kernel.org/pub/linux/utils/util-linux/
-#EXTRACT_SUFX=	.tar.bz2
+		http://www.kernel.org/pub/linux/utils/util-linux/v2.40/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	reed%reedmedia.net@localhost
 #HOMEPAGE
@@ -14,10 +13,10 @@ COMMENT=	Miscellaneous essential utilities for Linux systems
 CONFLICTS=	ddate-[0-9]*
 
 ONLY_FOR_PLATFORM=	Linux-*-* # Uses Linux kernel headers
+CHECK_PORTABILITY_SKIP=	tools/config-gen
 
-
-USE_TOOLS+=		gmake
-GNU_CONFIGURE=		YES
+#USE_TOOLS+=		gmake
+#GNU_CONFIGURE=		YES
 MAKE_ENV+=		DESTDIR=${PREFIX}
 MAKE_ENV+=		ETCDIR=${PREFIX}/share/examples/util-linux
 MAKE_ENV+=		FDPRMFILE=${PKG_SYSCONFDIR}/fdprm
@@ -32,8 +31,11 @@ PLIST_SRC=		${PKGDIR}/PLIST
 # XXX let maintainer know of your architecture if this breaks
 PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH}
 
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/application.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 # zlib used for cramfs
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/util-linux/distinfo b/util-linux/distinfo
index c4779cd2bb..fc4f97cb45 100644
--- a/util-linux/distinfo
+++ b/util-linux/distinfo
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.4 2005/12/19 19:13:10 jeremy-c-reed Exp $
 
-RMD160 (util-linux-2.12r.tar.gz) = 700e25d825886f85c13e9a5102645d286f31e23b
-SHA512 (util-linux-2.12r.tar.gz) = c98a01387cf75481d95ea26ce820d8c2940f5b7118f31aed8eea4949f2b2cf0304c8afc7e23eea624545f9eb2af6f38c8113157e61192b49d13dbac0f0323b77
-Size (util-linux-2.12r.tar.gz) = 1992725 bytes
-SHA1 (patch-aa) = 0ab4228166c1b01c9b1f7d332f57bde1aea06fd2
-SHA1 (patch-ab) = 058439aaa2db18e5bcbebf3522315086d2c4060e
+BLAKE2s (util-linux-2.40.1.tar.xz) = a5f9d04c8a26567b901634c94afeb16317d4b12ca13253a8f543fdbbe29c4ca2
+SHA512 (util-linux-2.40.1.tar.xz) = 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc
+Size (util-linux-2.40.1.tar.xz) = 8823784 bytes
diff --git a/util-linux/patches/patch-aa b/util-linux/patches/patch-aa
deleted file mode 100644
index f6b9e324fa..0000000000
--- a/util-linux/patches/patch-aa
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/12/19 19:13:10 jeremy-c-reed Exp $
-
---- MCONFIG.orig	2004-12-12 15:15:48.000000000 -0800
-+++ MCONFIG	2005-12-19 10:06:28.521518024 -0800
-@@ -102,7 +102,7 @@
- # If HAVE_SLN is set to "yes", then sln won't be installed
- # (but the man page sln.8 will be installed anyway).
- # sln also comes with libc and glibc.
--HAVE_SLN=no
-+HAVE_SLN=yes
- 
- # If HAVE_FDUTILS is set to "yes", then setfdprm won't be installed.
- HAVE_FDUTILS=no
-@@ -168,23 +168,24 @@
- DEV_DIR=	/dev
- ETC_DIR=	/etc
- SBIN_DIR=	/sbin
--USRSBIN_DIR=	/usr/sbin
--USRLIB_DIR=	/usr/lib
--USRBIN_DIR=	/usr/bin
--USRGAMES_DIR=	/usr/games
--USRSHAREMISC_DIR=/usr/share/misc
--LOCALE_DIR=	/usr/share/locale
-+USRSBIN_DIR=	/sbin
-+USRLIB_DIR=	/lib
-+USRBIN_DIR=	/bin
-+USRGAMES_DIR=	/games
-+USRSHAREMISC_DIR=/share/misc
-+LOCALE_DIR=	/share/locale
- BIN_DIR=        /bin
- VAR_PATH=	/var
- LOG_DIR=	/var/log
--MAN_DIR=	/usr/share/man
--INFO_DIR=	/usr/share/info
-+#MAN_DIR=	/usr/share/man
-+#INFO_DIR=	/usr/share/info
-+
- 
- #
- # Paths used for install
- #
- DEVDIR=		$(DESTDIR)$(DEV_DIR)
--ETCDIR=		$(DESTDIR)$(ETC_DIR)
-+#ETCDIR=		$(DESTDIR)$(ETC_DIR)
- SBINDIR=	$(DESTDIR)$(SBIN_DIR)
- USRSBINDIR=	$(DESTDIR)$(USRSBIN_DIR)
- USRLIBDIR=      $(DESTDIR)$(USRLIB_DIR)
-@@ -234,6 +235,7 @@
- 			-DLOGDIR=\"$(LOG_DIR)\" \
- 			-DVARPATH=\"$(VAR_PATH)\" \
- 			-DLOCALEDIR=\"$(LOCALE_DIR)\" \
-+			-DFDPRMFILE=\"$(FDPRMFILE)\" \
- 			$(CFLAGS)
- 
- 
diff --git a/util-linux/patches/patch-ab b/util-linux/patches/patch-ab
deleted file mode 100644
index 495b355847..0000000000
--- a/util-linux/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/10/01 22:53:38 jeremy-c-reed Exp $
-
---- disk-utils/setfdprm.c.orig	2003-04-19 15:08:34.000000000 -0700
-+++ disk-utils/setfdprm.c	2003-04-19 15:10:28.000000000 -0700
-@@ -16,7 +16,9 @@
- #include <linux/fd.h>
- #include "nls.h"
- 
-+#ifndef FDPRMFILE
- #define FDPRMFILE "/etc/fdprm"
-+#endif
- #define MAXLINE   200
- 
-