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

7 files changed, 4 insertions, 188 deletions

diff --git a/x11/mcookie/Makefile b/x11/mcookie/Makefile
index a467f2b56e7..e742066eedb 100644
--- a/x11/mcookie/Makefile
+++ b/x11/mcookie/Makefile
@@ -1,34 +1,17 @@
-# $NetBSD: Makefile,v 1.12 2017/11/23 20:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/12/08 08:03:35 adam Exp $
 #
 # Changelog: see
 # https://git.kernel.org/cgit/utils/util-linux/util-linux.git/log/misc-utils/mcookie.c
 # https://git.kernel.org/cgit/utils/util-linux/util-linux.git/log/misc-utils/mcookie.1
 
-DISTNAME=	util-linux-2.31
+.include "../../devel/libuuid/Makefile.common"
+
 PKGNAME=	${DISTNAME:S/util-linux/mcookie/}
 CATEGORIES=	sysutils
-MASTER_SITES=	https://www.kernel.org/pub/linux/utils/util-linux/v2.31/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	reed@reedmedia.net
-#HOMEPAGE
 COMMENT=	Tool for creating cookies for xauth(1)
 LICENSE=	public-domain
 
-BUILD_TARGET=	mcookie
-EXTRACT_USING=	bsdtar
-
-CONFIG_SHELL=		bash
-GNU_CONFIGURE=		yes
-INFO_FILES=		yes
-USE_TOOLS+=		bash bsdtar gmake
-INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
-
+CONFIGURE_ARGS+=	--enable-mcookie
 CONFIGURE_ENV.DragonFly+=	ac_cv_type_cpu_set_t=no
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mcookie ${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/misc-utils/mcookie.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/mcookie/distinfo b/x11/mcookie/distinfo
deleted file mode 100644
index 2dda8283c33..00000000000
--- a/x11/mcookie/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.11 2017/11/23 20:27:20 wiz Exp $
-
-SHA1 (util-linux-2.31.tar.xz) = 4ebb8a2c1da21a6da08b553abd0f4dd3dbc55b4e
-RMD160 (util-linux-2.31.tar.xz) = 451569f0c2dcc16cd34f5753c1028db8966ab296
-SHA512 (util-linux-2.31.tar.xz) = 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-Size (util-linux-2.31.tar.xz) = 4503892 bytes
-SHA1 (patch-configure) = 1e6e797b8a0c19f3a55c65a8a51a9fd08a35fead
-SHA1 (patch-include_setproctitle.h) = deb06015ca459886f82e22eaf6596ff79799b02a
-SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
-SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
-SHA1 (patch-lib_setproctitle.c) = 9071d5993c8569ab80215ddbb33a103b1d644246
diff --git a/x11/mcookie/patches/patch-configure b/x11/mcookie/patches/patch-configure
deleted file mode 100644
index d05ef40a4fc..00000000000
--- a/x11/mcookie/patches/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2016/11/14 14:48:46 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- configure.orig	2016-11-08 10:37:19.061772080 +0000
-+++ configure
-@@ -21196,7 +21196,7 @@ else
- fi
- 
- 
--if test "x$enable_libmount_support_mtab" == xyes; then :
-+if test "x$enable_libmount_support_mtab" = xyes; then :
- 
- 
- $as_echo "#define USE_LIBMOUNT_SUPPORT_MTAB 1" >>confdefs.h
-@@ -22096,7 +22096,7 @@ $as_echo "$as_me: WARNING: sys/signalfd.
-     esac
-   fi
- 
--if test "x$build_uuidd" = xyes || test "x$enable_libuuid_force_uuidd" == xyes ; then :
-+if test "x$build_uuidd" = xyes || test "x$enable_libuuid_force_uuidd" = xyes ; then :
- 
- 
- $as_echo "#define HAVE_UUIDD 1" >>confdefs.h
-@@ -29261,7 +29261,7 @@ else
- fi
- 
- 
--if test "x$enable_usrdir_path" == xyes; then :
-+if test "x$enable_usrdir_path" = xyes; then :
- 
- 
- $as_echo "#define USE_USRDIR_PATHS_ONLY 1" >>confdefs.h
diff --git a/x11/mcookie/patches/patch-include_setproctitle.h b/x11/mcookie/patches/patch-include_setproctitle.h
deleted file mode 100644
index de634659b39..00000000000
--- a/x11/mcookie/patches/patch-include_setproctitle.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-include_setproctitle.h,v 1.1 2016/09/20 08:00:51 wiz Exp $
-
-Remove setproctitle, conflicts with NetBSD version and not used
-in mcookie.
-
---- include/setproctitle.h.orig	2015-04-07 09:12:31.000000000 +0000
-+++ include/setproctitle.h
-@@ -1,7 +1,8 @@
- #ifndef UTIL_LINUX_SETPROCTITLE_H
- #define UTIL_LINUX_SETPROCTITLE_H
- 
-+#include <stdlib.h>
-+
- extern void initproctitle (int argc, char **argv);
--extern void setproctitle (const char *prog, const char *txt);
- 
- #endif
diff --git a/x11/mcookie/patches/patch-include_ttyutils.h b/x11/mcookie/patches/patch-include_ttyutils.h
deleted file mode 100644
index 56858b6695d..00000000000
--- a/x11/mcookie/patches/patch-include_ttyutils.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-include_ttyutils.h,v 1.2 2017/04/13 10:17:25 jperkin Exp $
-
-Define values if missing.
-
---- include/ttyutils.h.orig	2016-11-02 12:57:31.535167960 +0000
-+++ include/ttyutils.h
-@@ -60,6 +60,18 @@ extern int get_terminal_name(const char
- static inline void reset_virtual_console(struct termios *tp, int flags)
- {
- 	/* Use defaults of <sys/ttydefaults.h> for base settings */
-+#ifndef TTYDEF_IFLAG
-+#define TTYDEF_IFLAG	(BRKINT | ICRNL | IMAXBEL | IXON | IXANY)
-+#endif
-+#ifndef TTYDEF_OFLAG
-+#define TTYDEF_OFLAG	(OPOST | ONLCR /*| OXTABS*/)
-+#endif
-+#ifndef TTYDEF_LFLAG
-+#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-+#endif
-+#ifndef TTYDEF_CFLAG
-+#define TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
-+#endif
- 	tp->c_iflag |= TTYDEF_IFLAG;
- 	tp->c_oflag |= TTYDEF_OFLAG;
- 	tp->c_lflag |= TTYDEF_LFLAG;
-@@ -114,6 +126,13 @@ static inline void reset_virtual_console
- # define FFDLY 0
- #endif
- 
-+#ifndef TAB0
-+#define TAB0 0
-+#endif
-+#ifndef TABDLY
-+#define TABDLY 0
-+#endif
-+
- 	tp->c_iflag |=  (BRKINT | ICRNL | IMAXBEL);
- 	tp->c_iflag &= ~(IGNBRK | INLCR | IGNCR | IXOFF | IUCLC | IXANY | ISTRIP);
- 	tp->c_oflag |=  (OPOST | ONLCR | NL0 | CR0 | TAB0 | BS0 | VT0 | FF0);
-@@ -158,7 +177,13 @@ static inline void reset_virtual_console
- 	tp->c_cc[VSTOP]    = CSTOP;
- 	tp->c_cc[VSUSP]    = CSUSP;
- 	tp->c_cc[VEOL]     = _POSIX_VDISABLE;
-+#ifndef CREPRINT
-+#define CREPRINT	('r' & 037)
-+#endif
- 	tp->c_cc[VREPRINT] = CREPRINT;
-+#ifndef CDISCARD
-+#define CDISCARD	('o' & 037)
-+#endif
- 	tp->c_cc[VDISCARD] = CDISCARD;
- 	tp->c_cc[VWERASE]  = CWERASE;
- 	tp->c_cc[VLNEXT]   = CLNEXT;
diff --git a/x11/mcookie/patches/patch-lib_ismounted.c b/x11/mcookie/patches/patch-lib_ismounted.c
deleted file mode 100644
index a2f44263763..00000000000
--- a/x11/mcookie/patches/patch-lib_ismounted.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-lib_ismounted.c,v 1.2 2017/01/24 21:42:26 bsiegert Exp $
-
-Fix build on NetBSD.
-
---- lib/ismounted.c.orig	2016-11-02 12:57:31.000000000 +0000
-+++ lib/ismounted.c
-@@ -214,7 +214,11 @@ static int check_mntent(const char *file
- static int check_getmntinfo(const char *file, int *mount_flags,
- 				  char *mtpt, int mtlen)
- {
-+#ifdef __NetBSD__
-+	struct statvfs *mp;
-+#else
- 	struct statfs *mp;
-+#endif
-         int    len, n;
-         const  char   *s1;
- 	char	*s2;
diff --git a/x11/mcookie/patches/patch-lib_setproctitle.c b/x11/mcookie/patches/patch-lib_setproctitle.c
deleted file mode 100644
index 3391d9481f7..00000000000
--- a/x11/mcookie/patches/patch-lib_setproctitle.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-lib_setproctitle.c,v 1.2 2017/11/23 20:27:20 wiz Exp $
-
-Remove setproctitle, conflicts with NetBSD version and not used
-in mcookie.
-
---- lib/setproctitle.c.orig	2017-09-27 09:05:13.698361518 +0000
-+++ lib/setproctitle.c
-@@ -49,27 +49,3 @@ void initproctitle (int argc, char **arg
- 	if (argv_lth > 1)
- 		argv0 = argv;
- }
--
--void setproctitle (const char *prog, const char *txt)
--{
--        size_t i;
--        char buf[SPT_BUFSIZE];
--
--        if (!argv0)
--                return;
--
--	if (strlen(prog) + strlen(txt) + 5 > SPT_BUFSIZE)
--		return;
--
--	sprintf(buf, "%s -- %s", prog, txt);
--
--        i = strlen(buf);
--        if (i > argv_lth - 2) {
--                i = argv_lth - 2;
--                buf[i] = '\0';
--        }
--	memset(argv0[0], '\0', argv_lth);       /* clear the memory area */
--        strcpy(argv0[0], buf);
--
--        argv0[1] = NULL;
--}