pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
util-linux: remove getopt and uuid because it conflicts with existing packages
Module Name: pkgsrc-wip
Committed By: Dan Cîrnaț <dan%alt.md@localhost>
Pushed By: cirnatdan
Date: Fri Dec 13 18:55:18 2024 +0100
Changeset: ba24e0ae71e45fab9faef79c8c1d21899b02d7d9
Modified Files:
util-linux/Makefile
util-linux/PLIST
Log Message:
util-linux: remove getopt and uuid because it conflicts with existing
packages
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ba24e0ae71e45fab9faef79c8c1d21899b02d7d9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
util-linux/Makefile | 7 ++++++
util-linux/PLIST | 69 -----------------------------------------------------
2 files changed, 7 insertions(+), 69 deletions(-)
diffs:
diff --git a/util-linux/Makefile b/util-linux/Makefile
index 830aae5d84..53609af29e 100644
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -28,9 +28,16 @@ MESON_ARGS+= -Dbuild-agetty=disabled
MESON_ARGS+= -Dbuild-fdisks=disabled
MESON_ARGS+= -Dbuild-sulogin=disabled
MESON_ARGS+= -Dbuild-setterm=disabled
+MESON_ARGS+= -Dbuild-python=disabled
+MESON_ARGS+= -Dbuild-libmount=disabled
+MESON_ARGS+= -Dbuild-libuuid=disabled
PLIST_SRC= PLIST
+post-install:
+ ${RM} ${DESTDIR}${PREFIX}/bin/getopt
+ ${RM} ${DESTDIR}${PREFIX}/man/man1/getopt.1
+
.include "../../devel/meson/build.mk"
.include "../../lang/python/extension.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/util-linux/PLIST b/util-linux/PLIST
index a1b996a7fe..afd921a6fd 100644
--- a/util-linux/PLIST
+++ b/util-linux/PLIST
@@ -8,15 +8,12 @@ bin/colcrt
bin/colrm
bin/column
bin/dmesg
-bin/eject
bin/enosys
bin/exch
bin/fadvise
bin/fallocate
bin/fincore
-bin/findmnt
bin/flock
-bin/getopt
bin/hardlink
bin/hexdump
bin/i386
@@ -33,20 +30,15 @@ bin/linux32
bin/linux64
bin/logger
bin/look
-bin/lsblk
bin/lsclocks
bin/lscpu
bin/lsfd
bin/lsipc
bin/lsirq
-bin/lslocks
bin/lslogins
bin/lsmem
-bin/lsns
bin/mcookie
bin/mesg
-bin/mount
-bin/mountpoint
bin/namei
bin/newgrp
bin/nsenter
@@ -63,12 +55,8 @@ bin/setpgid
bin/setsid
bin/taskset
bin/uclampset
-bin/umount
bin/uname26
-bin/unshare
bin/utmpdump
-bin/uuidgen
-bin/uuidparse
bin/vigr
bin/vipw
bin/waitpid
@@ -79,35 +67,17 @@ bin/write
bin/x86_64
include/blkid/blkid.h
include/libfdisk/libfdisk.h
-include/libmount/libmount.h
include/libsmartcols/libsmartcols.h
-include/uuid/uuid.h
lib/libblkid.a
lib/libblkid.so
lib/libblkid.so.1
lib/libblkid.so.1.1.0
-lib/libfdisk.so
-lib/libfdisk.so.1
-lib/libfdisk.so.1.1.0
-lib/libmount.so
-lib/libmount.so.1
-lib/libmount.so.1.1.0
lib/libsmartcols.a
lib/libsmartcols.so
lib/libsmartcols.so.1
lib/libsmartcols.so.1.1.0
-lib/libuuid.a
-lib/libuuid.so
-lib/libuuid.so.1
-lib/libuuid.so.1.3.0
lib/pkgconfig/blkid.pc
-lib/pkgconfig/fdisk.pc
-lib/pkgconfig/mount.pc
lib/pkgconfig/smartcols.pc
-lib/pkgconfig/uuid.pc
-${PYSITELIB}/libmount/__init__.py
-${PYSITELIB}/libmount/__pycache__/__init__.cpython-312.pyc
-${PYSITELIB}/libmount/pylibmount.so
man/man1/cal.1
man/man1/choom.1
man/man1/chrt.1
@@ -116,14 +86,12 @@ man/man1/colcrt.1
man/man1/colrm.1
man/man1/column.1
man/man1/dmesg.1
-man/man1/eject.1
man/man1/enosys.1
man/man1/exch.1
man/man1/fadvise.1
man/man1/fallocate.1
man/man1/fincore.1
man/man1/flock.1
-man/man1/getopt.1
man/man1/hardlink.1
man/man1/hexdump.1
man/man1/ionice.1
@@ -146,7 +114,6 @@ man/man1/lslogins.1
man/man1/lsmem.1
man/man1/mcookie.1
man/man1/mesg.1
-man/man1/mountpoint.1
man/man1/namei.1
man/man1/newgrp.1
man/man1/nsenter.1
@@ -162,29 +129,13 @@ man/man1/setpgid.1
man/man1/setsid.1
man/man1/taskset.1
man/man1/uclampset.1
-man/man1/unshare.1
man/man1/utmpdump.1
-man/man1/uuidgen.1
-man/man1/uuidparse.1
man/man1/waitpid.1
man/man1/wall.1
man/man1/whereis.1
man/man1/write.1
man/man3/libblkid.3
-man/man3/uuid.3
-man/man3/uuid_clear.3
-man/man3/uuid_compare.3
-man/man3/uuid_copy.3
-man/man3/uuid_generate.3
-man/man3/uuid_generate_random.3
-man/man3/uuid_generate_time.3
-man/man3/uuid_generate_time_safe.3
-man/man3/uuid_is_null.3
-man/man3/uuid_parse.3
-man/man3/uuid_time.3
-man/man3/uuid_unparse.3
man/man5/adjtime_config.5
-man/man5/fstab.5
man/man5/scols-filter.5
man/man5/terminal-colors.d.5
man/man8/addpart.8
@@ -198,12 +149,9 @@ man/man8/chmem.8
man/man8/ctrlaltdel.8
man/man8/delpart.8
man/man8/findfs.8
-man/man8/findmnt.8
-man/man8/fsck.8
man/man8/fsck.cramfs.8
man/man8/fsck.minix.8
man/man8/fsfreeze.8
-man/man8/fstrim.8
man/man8/hwclock.8
man/man8/i386.8
man/man8/isosize.8
@@ -211,15 +159,10 @@ man/man8/ldattach.8
man/man8/linux32.8
man/man8/linux64.8
man/man8/losetup.8
-man/man8/lsblk.8
-man/man8/lslocks.8
-man/man8/lsns.8
man/man8/mkfs.8
man/man8/mkfs.bfs.8
man/man8/mkfs.cramfs.8
man/man8/mkfs.minix.8
-man/man8/mkswap.8
-man/man8/mount.8
man/man8/nologin.8
man/man8/partx.8
man/man8/pivot_root.8
@@ -229,14 +172,9 @@ man/man8/rfkill.8
man/man8/rtcwake.8
man/man8/setarch.8
man/man8/sulogin.8
-man/man8/swaplabel.8
-man/man8/swapoff.8
-man/man8/swapon.8
man/man8/switch_root.8
man/man8/tunelp.8
-man/man8/umount.8
man/man8/uname26.8
-man/man8/uuidd.8
man/man8/vigr.8
man/man8/vipw.8
man/man8/wdctl.8
@@ -253,11 +191,9 @@ sbin/chcpu
sbin/ctrlaltdel
sbin/delpart
sbin/findfs
-sbin/fsck
sbin/fsck.cramfs
sbin/fsck.minix
sbin/fsfreeze
-sbin/fstrim
sbin/hwclock
sbin/ldattach
sbin/losetup
@@ -265,7 +201,6 @@ sbin/mkfs
sbin/mkfs.bfs
sbin/mkfs.cramfs
sbin/mkfs.minix
-sbin/mkswap
sbin/nologin
sbin/partx
sbin/pivot_root
@@ -273,12 +208,8 @@ sbin/readprofile
sbin/resizepart
sbin/rfkill
sbin/rtcwake
-sbin/swaplabel
-sbin/swapoff
-sbin/swapon
sbin/switch_root
sbin/tunelp
-sbin/uuidd
sbin/wipefs
sbin/zramctl
share/doc/util-linux/getopt-example.bash
Home |
Main Index |
Thread Index |
Old Index