util-linux: fix building, install still borked

[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 15:23:18 2024 +0100
Changeset:	aef50aa32e32319fc9fa88163fd1ac995f9aef0a

Modified Files:
	util-linux/Makefile
	util-linux/distinfo
Removed Files:
	util-linux/PLIST

Log Message:
util-linux: fix building, install still borked

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

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

diffstat:
 util-linux/Makefile |  23 +++++++--
 util-linux/PLIST    | 144 ----------------------------------------------------
 util-linux/distinfo |   1 +
 3 files changed, 19 insertions(+), 149 deletions(-)

diffs:
diff --git a/util-linux/Makefile b/util-linux/Makefile
index b5afd5e625..86bdf251b7 100644
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -15,8 +15,20 @@ CONFLICTS=	ddate-[0-9]*
 ONLY_FOR_PLATFORM=	Linux-*-* # Uses Linux kernel headers
 CHECK_PORTABILITY_SKIP=	tools/config-gen
 
-#USE_TOOLS+=		gmake
-#GNU_CONFIGURE=		YES
+MESON_ARGS+=		-Dbuild-liblastlog2=disabled
+MESON_ARGS+=		-Dbuild-login=disabled
+MESON_ARGS+=		-Dbuild-chfn-chsh=disabled
+MESON_ARGS+=		-Dbuild-su=disabled
+MESON_ARGS+=		-Dbuild-runuser=disabled
+MESON_ARGS+=		-Dbuild-pg=disabled
+MESON_ARGS+=		-Dbuild-more=disabled
+MESON_ARGS+=		-Dbuild-ul=disabled
+MESON_ARGS+=		-Dbuild-irqtop=disabled
+MESON_ARGS+=		-Dbuild-agetty=disabled
+MESON_ARGS+=		-Dbuild-fdisks=disabled
+MESON_ARGS+=		-Dbuild-sulogin=disabled
+MESON_ARGS+=		-Dbuild-setterm=disabled
+
 MAKE_ENV+=		DESTDIR=${PREFIX}
 MAKE_ENV+=		ETCDIR=${PREFIX}/share/examples/util-linux
 MAKE_ENV+=		FDPRMFILE=${PKG_SYSCONFDIR}/fdprm
@@ -25,11 +37,11 @@ MAKE_ENV+=		MAN_DIR=/${PKGMANDIR}
 
 INFO_FILES=		# PLIST
 
-CONF_FILES=	${PREFIX}/share/examples/util-linux/fdprm ${PKG_SYSCONFDIR}/fdprm
+#CONF_FILES=	${PREFIX}/share/examples/util-linux/fdprm ${PKG_SYSCONFDIR}/fdprm
 
-PLIST_SRC=		${PKGDIR}/PLIST
+#PLIST_SRC=		${PKGDIR}/PLIST
 # XXX let maintainer know of your architecture if this breaks
-PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH}
+#PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH}
 
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
@@ -38,4 +50,5 @@ PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH}
 # zlib used for cramfs
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../security/openpam/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/util-linux/PLIST b/util-linux/PLIST
deleted file mode 100644
index 5f39cdf8c4..0000000000
--- a/util-linux/PLIST
+++ /dev/null
@@ -1,144 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2009/10/11 10:45:23 thomasklausner Exp $
-bin/arch
-bin/cal
-bin/chkdupexe
-bin/col
-bin/colcrt
-bin/colrm
-bin/column
-bin/cytune
-bin/ddate
-bin/dmesg
-bin/fdformat
-bin/flock
-bin/getopt
-bin/hexdump
-bin/ipcrm
-bin/ipcs
-bin/isosize
-bin/kill
-bin/line
-bin/logger
-bin/look
-bin/mcookie
-bin/more
-bin/mount
-bin/namei
-bin/pg
-bin/raw
-bin/rename
-bin/renice
-bin/rev
-bin/script
-bin/setfdprm
-bin/setsid
-bin/setterm
-bin/tailf
-bin/ul
-bin/umount
-bin/whereis
-bin/write
-info/ipc.info
-man/man1/arch.1
-man/man1/cal.1
-man/man1/chkdupexe.1
-man/man1/col.1
-man/man1/colcrt.1
-man/man1/colrm.1
-man/man1/column.1
-man/man1/ddate.1
-man/man1/flock.1
-man/man1/getopt.1
-man/man1/hexdump.1
-man/man1/kill.1
-man/man1/line.1
-man/man1/logger.1
-man/man1/look.1
-man/man1/mcookie.1
-man/man1/more.1
-man/man1/namei.1
-man/man1/pg.1
-man/man1/readprofile.1
-man/man1/rename.1
-man/man1/rev.1
-man/man1/script.1
-man/man1/setterm.1
-man/man1/tailf.1
-man/man1/ul.1
-man/man1/whereis.1
-man/man1/write.1
-man/man5/fstab.5
-man/man5/nfs.5
-man/man8/agetty.8
-man/man8/blockdev.8
-man/man8/cfdisk.8
-man/man8/ctrlaltdel.8
-man/man8/cytune.8
-man/man8/dmesg.8
-man/man8/elvtune.8
-man/man8/fdformat.8
-man/man8/fdisk.8
-man/man8/fsck.minix.8
-man/man8/hwclock.8
-man/man8/ipcrm.8
-man/man8/ipcs.8
-man/man8/isosize.8
-man/man8/losetup.8
-man/man8/mkfs.8
-man/man8/mkfs.bfs.8
-man/man8/mkfs.minix.8
-man/man8/mkswap.8
-man/man8/mount.8
-man/man8/pivot_root.8
-man/man8/raw.8
-man/man8/renice.8
-man/man8/setfdprm.8
-man/man8/setsid.8
-man/man8/sfdisk.8
-man/man8/sln.8
-man/man8/swapoff.8
-man/man8/swapon.8
-man/man8/tunelp.8
-man/man8/umount.8
-sbin/agetty
-sbin/blockdev
-sbin/cfdisk
-sbin/ctrlaltdel
-sbin/elvtune
-sbin/fdisk
-sbin/fsck.cramfs
-sbin/fsck.minix
-sbin/hwclock
-sbin/losetup
-sbin/mkfs
-sbin/mkfs.bfs
-sbin/mkfs.cramfs
-sbin/mkfs.minix
-sbin/mkswap
-sbin/pivot_root
-sbin/readprofile
-sbin/sfdisk
-sbin/swapoff
-sbin/swapon
-sbin/tunelp
-share/examples/util-linux/fdprm
-share/locale/ca/LC_MESSAGES/util-linux.mo
-share/locale/cs/LC_MESSAGES/util-linux.mo
-share/locale/da/LC_MESSAGES/util-linux.mo
-share/locale/de/LC_MESSAGES/util-linux.mo
-share/locale/es/LC_MESSAGES/util-linux.mo
-share/locale/et/LC_MESSAGES/util-linux.mo
-share/locale/fi/LC_MESSAGES/util-linux.mo
-share/locale/fr/LC_MESSAGES/util-linux.mo
-share/locale/it/LC_MESSAGES/util-linux.mo
-share/locale/ja/LC_MESSAGES/util-linux.mo
-share/locale/nl/LC_MESSAGES/util-linux.mo
-share/locale/pt_BR/LC_MESSAGES/util-linux.mo
-share/locale/sl/LC_MESSAGES/util-linux.mo
-share/locale/sv/LC_MESSAGES/util-linux.mo
-share/locale/tr/LC_MESSAGES/util-linux.mo
-share/locale/uk/LC_MESSAGES/util-linux.mo
-share/misc/getopt/getopt-parse.bash
-share/misc/getopt/getopt-parse.tcsh
-share/misc/getopt/getopt-test.bash
-share/misc/getopt/getopt-test.tcsh
diff --git a/util-linux/distinfo b/util-linux/distinfo
index fc4f97cb45..0e32a85b95 100644
--- a/util-linux/distinfo
+++ b/util-linux/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.4 2005/12/19 19:13:10 jeremy-c-reed Exp $
 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
+SHA1 (patch-meson.build) = 75aae43d84b46307b15ff3c33974717874daf902