libuuid, libblkid, mcookie: updated to 2.31

util-linux v2.31:
blkid: improve man page wording
blkid: more info about ambivalent results to the man page
blkid: cleanup man page info about lsblk

pkgsrc:
unified libuuid, libblkid, and mcookie
libuuid: also installs uuidgen

11 files changed, 9 insertions, 244 deletions

diff --git a/devel/libblkid/Makefile b/devel/libblkid/Makefile
index 66ffe254522..2cc421a39ae 100644
--- a/devel/libblkid/Makefile
+++ b/devel/libblkid/Makefile
@@ -1,37 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2017/08/16 20:45:35 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2017/12/08 08:03:35 adam Exp $
 
-DISTNAME=	util-linux-ng-2.18
-PKGNAME=	libblkid-2.18
-CATEGORIES=	devel
-MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.18/
-EXTRACT_SUFX=	.tar.bz2
+.include "../../devel/libuuid/Makefile.common"
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-#HOMEPAGE=	http://kernel.org/~kzak/util-linux-ng/
+PKGNAME=	${DISTNAME:S/util-linux/libblkid/}
+CATEGORIES=	devel
 COMMENT=	Library to handle device identification and token extraction
 LICENSE=	gnu-lgpl-v2.1
 
-USE_TOOLS+=	pkg-config
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-PKGCONFIG_OVERRIDE+=	shlibs/blkid/blkid.pc.in
-
-CONFIGURE_ARGS+=	--without-ncurses
-CONFIGURE_ARGS+=	--disable-mount
-CONFIGURE_ARGS+=	--disable-fsck
-CONFIGURE_ARGS+=	--disable-libuuid
-CONFIGURE_ARGS+=	--disable-uuidd
-CONFIGURE_ARGS+=	--disable-libmount
-CONFIGURE_ARGS+=	--disable-agetty
-CONFIGURE_ARGS+=	--disable-cramfs
-CONFIGURE_ARGS+=	--disable-switch_root
-CONFIGURE_ARGS+=	--disable-pivot_root
-CONFIGURE_ARGS+=	--disable-fallocate
-CONFIGURE_ARGS+=	--disable-unshare
-CONFIGURE_ARGS+=	--disable-rename
-CONFIGURE_ARGS+=	--disable-schedutils
-CONFIGURE_ARGS+=	--disable-wall
+CONFIGURE_ARGS+=	--enable-libblkid
+PKGCONFIG_OVERRIDE+=	libblkid/blkid.pc.in
 
-.include "../../devel/libuuid/buildlink3.mk"
+#.include "../../devel/libuuid/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libblkid/buildlink3.mk b/devel/libblkid/buildlink3.mk
index 8f5a3d15151..bde3f962bae 100644
--- a/devel/libblkid/buildlink3.mk
+++ b/devel/libblkid/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/08 20:43:38 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/12/08 08:03:35 adam Exp $
 
 BUILDLINK_TREE+=	libblkid
 
@@ -6,9 +6,8 @@ BUILDLINK_TREE+=	libblkid
 LIBBLKID_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libblkid+=	libblkid>=2.18
-BUILDLINK_PKGSRCDIR.libblkid?=	../../devel/libblkid
+BUILDLINK_PKGSRCDIR.libblkid?=		../../devel/libblkid
 
-.include "../../devel/libuuid/buildlink3.mk"
 .endif	# LIBBLKID_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libblkid
diff --git a/devel/libblkid/distinfo b/devel/libblkid/distinfo
deleted file mode 100644
index 1a86a3e2c1b..00000000000
--- a/devel/libblkid/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:38 agc Exp $
-
-SHA1 (util-linux-ng-2.18.tar.bz2) = 154db0512caae0b6e90eee4b7312d4caf3d6b978
-RMD160 (util-linux-ng-2.18.tar.bz2) = 4781871a8f86195b886e81d364d41a57d67869e3
-SHA512 (util-linux-ng-2.18.tar.bz2) = 8406fe29ff7ad85a0d0b92ef660ec8b70519a28d59ee81cd25fddb51007a01e5eb57a505fc5b2407eb8185cd77ef355239ff7e581247ffdd20609945744a0ed5
-Size (util-linux-ng-2.18.tar.bz2) = 7669676 bytes
-SHA1 (patch-aa) = 83f8038278928899def6db0f28e3f13b78effbc4
-SHA1 (patch-ab) = 3cdd8d9c40b0b25fce088f0537f2d2443bcfb311
-SHA1 (patch-ac) = 48483270d348c466da6f7bcf822e461377830474
-SHA1 (patch-ad) = 36def63e59aff1c045d1821380b3d0191628d897
-SHA1 (patch-ae) = df77e8c6da425609309505fd447b66ade05426a3
-SHA1 (patch-af) = ba6e34b5635437e755192064bfc5865bfa9c913a
-SHA1 (patch-ag) = 1898774d311562938281f825b50a0e9aa44a447d
-SHA1 (patch-lib_blkdev.c) = 5045de9949316baabc2a573cecdef067fbc099fc
diff --git a/devel/libblkid/patches/patch-aa b/devel/libblkid/patches/patch-aa
deleted file mode 100644
index 0449e5cd356..00000000000
--- a/devel/libblkid/patches/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
-
-sh doesn't like the empty case
-
---- configure.orig	2010-06-30 12:53:01.000000000 +0000
-+++ configure
-@@ -18952,11 +18952,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- 	  syscall=no
--	  if test "x$linux_os" = xyes; then
--	    case $host_cpu in
--
--	    esac
--	  fi
- 
- fi
- 
-@@ -19082,11 +19077,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- 	  syscall=no
--	  if test "x$linux_os" = xyes; then
--	    case $host_cpu in
--
--	    esac
--	  fi
- 
- fi
- 
-@@ -19489,11 +19479,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- 	  syscall=no
--	  if test "x$linux_os" = xyes; then
--	    case $host_cpu in
--
--	    esac
--	  fi
- 
- fi
- 
-@@ -19701,11 +19686,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- 	  syscall=no
--	  if test "x$linux_os" = xyes; then
--	    case $host_cpu in
--
--	    esac
--	  fi
- 
- fi
- 
diff --git a/devel/libblkid/patches/patch-ab b/devel/libblkid/patches/patch-ab
deleted file mode 100644
index 9835fb91257..00000000000
--- a/devel/libblkid/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/01/08 22:30:39 dsainty Exp $
-
-Don't try to build things we don't care about, including hwclock - pulled in
-unconditionally if building on Linux via am__append_1.
-
---- Makefile.in.orig	2010-06-30 12:53:07.000000000 +0000
-+++ Makefile.in
-@@ -311,9 +311,7 @@ ul_libmount_la = $(top_builddir)/shlibs/
- 
- # mount.h is generated by ./configure script and stored in build directory
- ul_libmount_incdir = $(ul_libmount_builddir)
--SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
--	misc-utils po schedutils sys-utils text-utils tests \
--	$(am__append_1) $(am__append_2) $(am__append_3)
-+SUBDIRS = include shlibs
- RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
- 		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
- 
diff --git a/devel/libblkid/patches/patch-ac b/devel/libblkid/patches/patch-ac
deleted file mode 100644
index ea10561d664..00000000000
--- a/devel/libblkid/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
-
-Byte order defines for other than linux
-
---- include/bitops.h.orig	2010-02-04 11:53:56.000000000 +0000
-+++ include/bitops.h
-@@ -2,7 +2,20 @@
- #define BITOPS_H
- 
- #include <stdint.h>
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+#define __BYTE_ORDER		_BYTE_ORDER
-+#define __LITTLE_ENDIAN		_LITTLE_ENDIAN
-+#define __BIG_ENDIAN		_BIG_ENDIAN
-+#elif defined(__APPLE__)
-+#include <machine/endian.h>
-+#include <libkern/OSByteOrder.h>
-+#define __BYTE_ORDER		BYTE_ORDER
-+#define __LITTLE_ENDIAN		LITTLE_ENDIAN
-+#define __BIG_ENDIAN		BIG_ENDIAN
-+#else
- #include <endian.h>
-+#endif
- 
- /*
-  * Bit map related macros. Usually provided by libc.
diff --git a/devel/libblkid/patches/patch-ad b/devel/libblkid/patches/patch-ad
deleted file mode 100644
index ee26e302d8c..00000000000
--- a/devel/libblkid/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
-
-No loff_t in NetBSD
-
---- shlibs/blkid/src/superblocks/zfs.c.orig	2010-05-19 21:36:25.000000000 +0000
-+++ shlibs/blkid/src/superblocks/zfs.c
-@@ -66,7 +66,7 @@ struct nvlist {
- #define nvdebug(fmt, ...)	do { } while(0)
- /*#define nvdebug(fmt, a...)	printf(fmt, ##a)*/
- 
--static void zfs_extract_guid_name(blkid_probe pr, loff_t offset)
-+static void zfs_extract_guid_name(blkid_probe pr, blkid_loff_t offset)
- {
- 	struct nvlist *nvl;
- 	struct nvpair *nvp;
-@@ -164,7 +164,7 @@ static int probe_zfs(blkid_probe pr, con
- 	uint64_t swab_magic = swab64(UBERBLOCK_MAGIC);
- 	struct zfs_uberblock *ub;
- 	int swab_endian;
--	loff_t offset;
-+	blkid_loff_t offset;
- 	int tried;
- 	int found;
- 
diff --git a/devel/libblkid/patches/patch-ae b/devel/libblkid/patches/patch-ae
deleted file mode 100644
index b06dca6ee4c..00000000000
--- a/devel/libblkid/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
-
-Byte order defines for other than linux
-
---- lib/md5.c.orig	2010-03-18 22:11:23.000000000 +0000
-+++ lib/md5.c
-@@ -14,7 +14,20 @@
-  * needed on buffers full of bytes, and then call MD5Final, which
-  * will fill a supplied 16-byte array with the digest.
-  */
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+#define __BYTE_ORDER		_BYTE_ORDER
-+#define __LITTLE_ENDIAN		_LITTLE_ENDIAN
-+#define __BIG_ENDIAN		_BIG_ENDIAN
-+#elif defined(__APPLE__)
-+#include <machine/endian.h>
-+#include <libkern/OSByteOrder.h>
-+#define __BYTE_ORDER		BYTE_ORDER
-+#define __LITTLE_ENDIAN		LITTLE_ENDIAN
-+#define __BIG_ENDIAN		BIG_ENDIAN
-+#else
- #include <endian.h>
-+#endif
- #include <string.h>		/* for memcpy() */
- 
- #include "md5.h"
diff --git a/devel/libblkid/patches/patch-af b/devel/libblkid/patches/patch-af
deleted file mode 100644
index 584ab4b737b..00000000000
--- a/devel/libblkid/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
-
-Dont add installed libuuid to dependecies but link it in
-
---- shlibs/blkid/src/Makefile.in.orig	2010-06-30 12:53:06.000000000 +0000
-+++ shlibs/blkid/src/Makefile.in
-@@ -382,7 +382,11 @@ libblkid_la_LIBADD = superblocks/libblki
- 		     partitions/libblkid_partitions.la \
- 		     $(common_ldadd)
- 
--libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym blkid.h.in
-+libblkid_la_LIBADDx = superblocks/libblkid_superblocks.la \
-+		     topology/libblkid_topology.la \
-+		     partitions/libblkid_partitions.la
-+
-+libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADDx) blkid.sym blkid.h.in
- libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \
-                       -version-info $(LIBBLKID_VERSION_INFO)
- 
diff --git a/devel/libblkid/patches/patch-ag b/devel/libblkid/patches/patch-ag
deleted file mode 100644
index 1fa39ba68de..00000000000
--- a/devel/libblkid/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2011/01/08 20:43:39 markd Exp $
-
-samples are linux specific and not installed anyway so dont build
-
---- shlibs/blkid/Makefile.in.orig	2010-06-30 12:53:05.000000000 +0000
-+++ shlibs/blkid/Makefile.in
-@@ -313,7 +313,7 @@ ul_libmount_la = $(top_builddir)/shlibs/
- 
- # mount.h is generated by ./configure script and stored in build directory
- ul_libmount_incdir = $(ul_libmount_builddir)
--SUBDIRS = src samples $(am__append_1)
-+SUBDIRS = src $(am__append_1)
- 
- # pkg-config stuff
- pkgconfigdir = $(usrlib_execdir)/pkgconfig
diff --git a/devel/libblkid/patches/patch-lib_blkdev.c b/devel/libblkid/patches/patch-lib_blkdev.c
deleted file mode 100644
index e4c4c83d154..00000000000
--- a/devel/libblkid/patches/patch-lib_blkdev.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_blkdev.c,v 1.1 2015/01/09 14:27:46 joerg Exp $
-
---- lib/blkdev.c.orig	2010-05-19 21:36:23.000000000 +0000
-+++ lib/blkdev.c
-@@ -104,7 +104,7 @@ blkdev_get_size(int fd, unsigned long lo
- #ifdef DIOCGMEDIASIZE
- 	/* FreeBSD */
- 	if (ioctl(fd, DIOCGMEDIASIZE, bytes) >= 0)
--		return 0
-+		return 0;
- #endif
- 
- #ifdef FDGETPRM