CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 8 Dec 2017 08:03:36 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec  8 08:03:35 UTC 2017

Modified Files:
        pkgsrc/devel/libblkid: Makefile buildlink3.mk
        pkgsrc/devel/libuuid: Makefile PLIST distinfo
        pkgsrc/devel/libuuid/patches: patch-Makefile.in patch-configure
            patch-lib_randutils.c
        pkgsrc/x11/mcookie: Makefile
Added Files:
        pkgsrc/devel/libuuid: Makefile.common
        pkgsrc/devel/libuuid/patches: patch-include_ttyutils.h
            patch-lib_ismounted.c patch-libuuid_src_gen__uuid.c
Removed Files:
        pkgsrc/devel/libblkid: distinfo
        pkgsrc/devel/libblkid/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-lib_blkdev.c
        pkgsrc/devel/libuuid/patches: patch-ab
        pkgsrc/x11/mcookie: distinfo
        pkgsrc/x11/mcookie/patches: patch-configure
            patch-include_setproctitle.h patch-include_ttyutils.h
            patch-lib_ismounted.c patch-lib_setproctitle.c

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libblkid/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/libblkid/buildlink3.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/libblkid/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/devel/libblkid/patches/patch-aa \
    pkgsrc/devel/libblkid/patches/patch-ac \
    pkgsrc/devel/libblkid/patches/patch-ad \
    pkgsrc/devel/libblkid/patches/patch-ae \
    pkgsrc/devel/libblkid/patches/patch-af \
    pkgsrc/devel/libblkid/patches/patch-ag
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/libblkid/patches/patch-ab
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libblkid/patches/patch-lib_blkdev.c
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/libuuid/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuuid/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libuuid/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/libuuid/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libuuid/patches/patch-Makefile.in
cvs rdiff -u -r1.7 -r0 pkgsrc/devel/libuuid/patches/patch-ab
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libuuid/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuuid/patches/patch-include_ttyutils.h \
    pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c \
    pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libuuid/patches/patch-lib_randutils.c
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/mcookie/Makefile
cvs rdiff -u -r1.11 -r0 pkgsrc/x11/mcookie/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/mcookie/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/mcookie/patches/patch-include_setproctitle.h
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/mcookie/patches/patch-include_ttyutils.h \
    pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c \
    pkgsrc/x11/mcookie/patches/patch-lib_setproctitle.c

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

Modified files:

Index: pkgsrc/devel/libblkid/Makefile
diff -u pkgsrc/devel/libblkid/Makefile:1.3 pkgsrc/devel/libblkid/Makefile:1.4
--- pkgsrc/devel/libblkid/Makefile:1.3  Wed Aug 16 20:45:35 2017
+++ pkgsrc/devel/libblkid/Makefile      Fri Dec  8 08:03:35 2017
@@ -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@localhost
-#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"

Index: pkgsrc/devel/libblkid/buildlink3.mk
diff -u pkgsrc/devel/libblkid/buildlink3.mk:1.1.1.1 pkgsrc/devel/libblkid/buildlink3.mk:1.2
--- pkgsrc/devel/libblkid/buildlink3.mk:1.1.1.1 Sat Jan  8 20:43:38 2011
+++ pkgsrc/devel/libblkid/buildlink3.mk Fri Dec  8 08:03:35 2017
@@ -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

Index: pkgsrc/devel/libuuid/Makefile
diff -u pkgsrc/devel/libuuid/Makefile:1.20 pkgsrc/devel/libuuid/Makefile:1.21
--- pkgsrc/devel/libuuid/Makefile:1.20  Mon Sep 12 07:36:55 2016
+++ pkgsrc/devel/libuuid/Makefile       Fri Dec  8 08:03:35 2017
@@ -1,38 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2016/09/12 07:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/12/08 08:03:35 adam Exp $
+
+.include "Makefile.common"
 
-DISTNAME=      util-linux-2.28.2
 PKGNAME=       ${DISTNAME:S/util-linux/libuuid/}
 CATEGORIES=    devel
-MASTER_SITES=  http://www.kernel.org/pub/linux/utils/util-linux/v2.28/
-EXTRACT_SUFX=  .tar.xz
-EXTRACT_USING= gtar
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/karelzak/util-linux
 COMMENT=       Generate unique identifiers for objects
 LICENSE=       modified-bsd
 
-USE_GCC_RUNTIME=       yes
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --without-ncurses
-
+CONFIGURE_ARGS+=       --enable-libuuid
+CONFIGURE_ARGS+=       --enable-uuidgen
 PKGCONFIG_OVERRIDE+=   libuuid/uuid.pc.in
 
-BUILD_TARGET=          libuuid.la libuuid/uuid.pc
-INSTALLATION_DIRS+=    include/uuid lib/pkgconfig ${PKGMANDIR}/man3
-CONFIG_SHELL=          bash
-USE_TOOLS+=            bash:build
-
-do-install:
-       ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libuuid.la \
-               ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/libuuid/src/uuid.h \
-               ${DESTDIR}${PREFIX}/include/uuid/uuid.h
-       ${INSTALL_DATA} ${WRKSRC}/libuuid/uuid.pc \
-               ${DESTDIR}${PREFIX}/lib/pkgconfig/uuid.pc
-       set -e; for f in ${WRKSRC}/libuuid/man/*.3; do \
-               ${INSTALL_MAN} $${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/; \
-       done
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libuuid/PLIST
diff -u pkgsrc/devel/libuuid/PLIST:1.2 pkgsrc/devel/libuuid/PLIST:1.3
--- pkgsrc/devel/libuuid/PLIST:1.2      Mon May  5 20:14:55 2014
+++ pkgsrc/devel/libuuid/PLIST  Fri Dec  8 08:03:35 2017
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2014/05/05 20:14:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/12/08 08:03:35 adam Exp $
+bin/uuidgen
 include/uuid/uuid.h
 lib/libuuid.la
 lib/pkgconfig/uuid.pc
+man/man1/uuidgen.1
 man/man3/uuid.3
 man/man3/uuid_clear.3
 man/man3/uuid_compare.3

Index: pkgsrc/devel/libuuid/distinfo
diff -u pkgsrc/devel/libuuid/distinfo:1.17 pkgsrc/devel/libuuid/distinfo:1.18
--- pkgsrc/devel/libuuid/distinfo:1.17  Mon Sep 12 07:36:55 2016
+++ pkgsrc/devel/libuuid/distinfo       Fri Dec  8 08:03:35 2017
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.17 2016/09/12 07:36:55 wiz Exp $
+$NetBSD: distinfo,v 1.18 2017/12/08 08:03:35 adam Exp $
 
-SHA1 (util-linux-2.28.2.tar.xz) = 76053b05a6c8bf3f6fcbef8679cfaa01135bf67f
-RMD160 (util-linux-2.28.2.tar.xz) = fd01f53ed01326bbf2edbf380e7838879662e4b9
-SHA512 (util-linux-2.28.2.tar.xz) = ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
-Size (util-linux-2.28.2.tar.xz) = 4149700 bytes
-SHA1 (patch-Makefile.in) = 299635cbf4e7073cbacadf37f406c9e48d8c3f34
-SHA1 (patch-ab) = cf2f412cc4d30aa9a4b984c854c46e903abe0f41
-SHA1 (patch-configure) = 17d79296b7bb56ade316572ea37c6ca481d2adc7
-SHA1 (patch-lib_randutils.c) = cd1ec3d80c4624094e91bf54f87963b03d7c0b25
+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-Makefile.in) = fc6e29fb5843c1d125299a9dc6d8d3d19eecf4f7
+SHA1 (patch-configure) = bb32feced09b9131f7baa547f6f732d849d58a35
+SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
+SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
+SHA1 (patch-lib_randutils.c) = 422e94d9bdaf6a77894b79d67285fd8a0cb1d05a
+SHA1 (patch-libuuid_src_gen__uuid.c) = d15aa418ab497e2e3634c62633d2f3212f1b42be

Index: pkgsrc/devel/libuuid/patches/patch-Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.1 pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.2
--- pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.1  Fri Apr 22 12:30:13 2016
+++ pkgsrc/devel/libuuid/patches/patch-Makefile.in      Fri Dec  8 08:03:35 2017
@@ -1,15 +1,55 @@
-$NetBSD: patch-Makefile.in,v 1.1 2016/04/22 12:30:13 jperkin Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2017/12/08 08:03:35 adam Exp $
 
 Linker script depends on non-portable constructs.
+Do not compile setproctitle; it conflicts with NetBSD and is not needed.
+Do not build common libraries.
+Do not install terminal-colors.d.5.
 
---- Makefile.in.orig   2016-04-12 10:34:03.276790608 +0000
+--- Makefile.in.orig   2017-10-19 11:10:03.000000000 +0000
 +++ Makefile.in
-@@ -173,7 +173,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
+@@ -185,7 +185,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
  
- @BUILD_LIBUUID_TRUE@am__append_9 = test_uuid_parser
- @BUILD_LIBUUID_TRUE@am__append_10 = libuuid.la
--@BUILD_LIBUUID_TRUE@@HAVE_VSCRIPT_TRUE@am__append_11 = libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym
-+@BUILD_LIBUUID_TRUE@@HAVE_VSCRIPT_COMPLEX_TRUE@am__append_11 = libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym
- @BUILD_LIBUUID_TRUE@am__append_12 = libuuid/src/libuuid.sym \
+ @BUILD_LIBUUID_TRUE@am__append_15 = test_uuid_parser
+ @BUILD_LIBUUID_TRUE@am__append_16 = libuuid.la
+-@BUILD_LIBUUID_TRUE@@HAVE_VSCRIPT_TRUE@am__append_17 = libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym
++@BUILD_LIBUUID_TRUE@@HAVE_VSCRIPT_COMPLEX_TRUE@am__append_17 = libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym
+ @BUILD_LIBUUID_TRUE@am__append_18 = libuuid/src/libuuid.sym \
  @BUILD_LIBUUID_TRUE@  libuuid/COPYING
- @BUILD_LIBUUID_TRUE@am__append_13 = install-exec-hook-libuuid
+ @BUILD_LIBUUID_TRUE@am__append_19 = install-exec-hook-libuuid
+@@ -204,7 +204,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
+ @BUILD_LIBBLKID_TRUE@@BUILD_LIBUUID_TRUE@am__append_25 = libuuid.la
+ @BUILD_LIBBLKID_TRUE@@BUILD_LIBUUID_TRUE@am__append_26 = libuuid.la
+ @BUILD_LIBBLKID_TRUE@@BUILD_LIBUUID_TRUE@am__append_27 = -I$(ul_libuuid_incdir)
+-@BUILD_LIBBLKID_TRUE@@HAVE_VSCRIPT_TRUE@am__append_28 = $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym
++@BUILD_LIBBLKID_TRUE@@HAVE_VSCRIPT_COMPLEX_TRUE@am__append_28 = $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym
+ @BUILD_LIBBLKID_TRUE@am__append_29 = libblkid/src/libblkid.sym \
+ @BUILD_LIBBLKID_TRUE@ libblkid/src/blkid.h.in \
+ @BUILD_LIBBLKID_TRUE@ libblkid/libblkid.3 libblkid/COPYING
+@@ -1054,7 +1054,7 @@ am_libcommon_la_OBJECTS = lib/libcommon_
+       lib/libcommon_la-mbsedit.lo lib/libcommon_la-md5.lo \
+       lib/libcommon_la-pager.lo lib/libcommon_la-parse-date.lo \
+       lib/libcommon_la-path.lo lib/libcommon_la-pwdutils.lo \
+-      lib/libcommon_la-randutils.lo lib/libcommon_la-setproctitle.lo \
++      lib/libcommon_la-randutils.lo \
+       lib/libcommon_la-strutils.lo lib/libcommon_la-timeutils.lo \
+       lib/libcommon_la-ttyutils.lo lib/libcommon_la-exec_shell.lo \
+       lib/libcommon_la-strv.lo lib/libcommon_la-sha1.lo \
+@@ -3815,8 +3815,7 @@ dist_noinst_HEADERS = include/all-io.h i
+       include/swapprober.h include/sysfs.h include/timer.h \
+       include/timeutils.h include/ttyutils.h include/widechar.h \
+       include/xalloc.h
+-noinst_LTLIBRARIES = libcommon.la libtcolors.la
+-dist_man_MANS = lib/terminal-colors.d.5 $(am__append_14) \
++dist_man_MANS = $(am__append_14) \
+       $(am__append_39) $(am__append_80) $(am__append_82) \
+       $(am__append_84) $(am__append_86) $(am__append_88) \
+       $(am__append_90) $(am__append_92) $(am__append_94) \
+@@ -3927,7 +3926,7 @@ libcommon_la_SOURCES = lib/blkdev.c lib/
+       lib/env.c lib/idcache.c lib/fileutils.c lib/ismounted.c \
+       lib/color-names.c lib/mangle.c lib/match.c lib/mbsalign.c \
+       lib/mbsedit.c lib/md5.c lib/pager.c lib/parse-date.y \
+-      lib/path.c lib/pwdutils.c lib/randutils.c lib/setproctitle.c \
++      lib/path.c lib/pwdutils.c lib/randutils.c \
+       lib/strutils.c lib/timeutils.c lib/ttyutils.c lib/exec_shell.c \
+       lib/strv.c lib/sha1.c $(am__append_1) $(am__append_2) \
+       $(am__append_3) $(am__append_4) $(am__append_5)

Index: pkgsrc/devel/libuuid/patches/patch-configure
diff -u pkgsrc/devel/libuuid/patches/patch-configure:1.6 pkgsrc/devel/libuuid/patches/patch-configure:1.7
--- pkgsrc/devel/libuuid/patches/patch-configure:1.6    Fri Aug 19 15:56:48 2016
+++ pkgsrc/devel/libuuid/patches/patch-configure        Fri Dec  8 08:03:35 2017
@@ -1,20 +1,52 @@
-$NetBSD: patch-configure,v 1.6 2016/08/19 15:56:48 wiz Exp $
+$NetBSD: patch-configure,v 1.7 2017/12/08 08:03:35 adam Exp $
 
+Add --disable-uuidgen and --disable-mcookie.
 Shell portability.
-Disable flock.
 
---- configure.orig     2016-08-11 09:29:39.053534157 +0000
+--- configure.orig     2017-10-19 11:10:01.000000000 +0000
 +++ configure
-@@ -21297,7 +21297,7 @@ else
+@@ -1250,6 +1250,7 @@ enable_zramctl
+ enable_fsck
+ enable_partx
+ enable_uuidd
++enable_uuidgen
+ enable_mountpoint
+ enable_fallocate
+ enable_unshare
+@@ -1269,6 +1270,7 @@ enable_lslogins
+ enable_wdctl
+ enable_cal
+ enable_logger
++enable_mcookie
+ enable_switch_root
+ enable_pivot_root
+ enable_lsmem
+@@ -2024,6 +2026,7 @@ Optional Features:
+   --disable-fsck          do not build fsck
+   --disable-partx         do not build addpart, delpart, partx
+   --disable-uuidd         do not build the uuid daemon
++  --disable-uuidgen       do not build uuidgen
+   --disable-mountpoint    do not build mountpoint
+   --disable-fallocate     do not build fallocate
+   --disable-unshare       do not build unshare
+@@ -2043,6 +2046,7 @@ Optional Features:
+   --disable-wdctl         do not build wdctl
+   --disable-cal           do not build cal
+   --disable-logger        do not build logger
++  --disable-mcookie       do not build mcookie
+   --disable-switch_root   do not build switch_root
+   --disable-pivot_root    do not build pivot_root
+   --disable-lsmem         do not build lsmem
+@@ -22393,7 +22397,7 @@ else
  fi
  
  
--if test "x$enable_libmount_force_mountinfo" == xyes; then :
-+if test "x$enable_libmount_force_mountinfo" = xyes; then :
+-if test "x$enable_libmount_support_mtab" == xyes; then :
++if test "x$enable_libmount_support_mtab" = xyes; then :
  
  
- $as_echo "#define USE_LIBMOUNT_FORCE_MOUNTINFO 1" >>confdefs.h
-@@ -22193,7 +22193,7 @@ $as_echo "$as_me: WARNING: sys/signalfd.
+ $as_echo "#define USE_LIBMOUNT_SUPPORT_MTAB 1" >>confdefs.h
+@@ -23293,7 +23297,7 @@ $as_echo "$as_me: WARNING: sys/signalfd.
      esac
    fi
  
@@ -23,16 +55,64 @@ Disable flock.
  
  
  $as_echo "#define HAVE_UUIDD 1" >>confdefs.h
-@@ -25133,7 +25133,7 @@ fi
+@@ -23311,17 +23315,22 @@ fi
+ 
+ 
+ 
++# Check whether --enable-uuidgen was given.
++if test "${enable_uuidgen+set}" = set; then :
++  enableval=$enable_uuidgen;
++else
+ 
+   if test "x$ul_default_estate" != x; then
+   enable_uuidgen=$ul_default_estate
+-  build_uuidgen=yes
+-  if test "x$ul_default_estate" = xno; then
+-    build_uuidgen=no
++  else
++  enable_uuidgen=check
+   fi
+-else
++fi
+ 
++if test "x$enable_uuidgen" = xno; then
++  build_uuidgen=no
++else
+   build_uuidgen=yes
+-  enable_uuidgen=check
+ fi
+ 
+ 
+@@ -25956,17 +25965,23 @@ fi
+ 
+ 
+ 
++# Check whether --enable-mcookie was given.
++if test "${enable_mcookie+set}" = set; then :
++  enableval=$enable_mcookie;
++else
  
    if test "x$ul_default_estate" != x; then
-   enable_flock=$ul_default_estate
--  build_flock=yes
-+  build_flock=no
-   if test "x$ul_default_estate" = xno; then
-     build_flock=no
+   enable_mcookie=$ul_default_estate
+-  build_mcookie=yes
+-  if test "x$ul_default_estate" = xno; then
+-    build_mcookie=no
++  else
++    enable_mcookie=check
    fi
-@@ -29181,7 +29181,7 @@ else
+-else
+ 
++fi
++
++if test "x$enable_mcookie" = xno; then
++  build_mcookie=no
++else
+   build_mcookie=yes
+-  enable_mcookie=yes
+ fi
+ 
+  if test "x$build_mcookie" = xyes; then
+@@ -31063,7 +31078,7 @@ else
  fi
  
  

Index: pkgsrc/devel/libuuid/patches/patch-lib_randutils.c
diff -u pkgsrc/devel/libuuid/patches/patch-lib_randutils.c:1.4 pkgsrc/devel/libuuid/patches/patch-lib_randutils.c:1.5
--- pkgsrc/devel/libuuid/patches/patch-lib_randutils.c:1.4      Fri Nov 27 14:57:36 2015
+++ pkgsrc/devel/libuuid/patches/patch-lib_randutils.c  Fri Dec  8 08:03:35 2017
@@ -1,13 +1,13 @@
-$NetBSD: patch-lib_randutils.c,v 1.4 2015/11/27 14:57:36 jperkin Exp $
+$NetBSD: patch-lib_randutils.c,v 1.5 2017/12/08 08:03:35 adam Exp $
 
 O_CLOEXEC is not available on every platform (e.g. MacOS X < 10.7). It
 was introduced in POSIX 2008.
 
---- lib/randutils.c.orig       2015-10-05 14:18:43.000000000 +0000
+--- lib/randutils.c.orig       2017-10-02 09:30:08.000000000 +0000
 +++ lib/randutils.c
-@@ -30,6 +30,10 @@
- THREAD_LOCAL unsigned short ul_jrand_seed[3];
- #endif
+@@ -72,6 +72,10 @@ static void crank_random(void)
+               rand();
+ }
  
 +#if !defined(O_CLOEXEC)
 +#define O_CLOEXEC 0

Index: pkgsrc/x11/mcookie/Makefile
diff -u pkgsrc/x11/mcookie/Makefile:1.12 pkgsrc/x11/mcookie/Makefile:1.13
--- pkgsrc/x11/mcookie/Makefile:1.12    Thu Nov 23 20:27:20 2017
+++ pkgsrc/x11/mcookie/Makefile Fri Dec  8 08:03:35 2017
@@ -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@localhost
-#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"

Added files:

Index: pkgsrc/devel/libuuid/Makefile.common
diff -u /dev/null pkgsrc/devel/libuuid/Makefile.common:1.1
--- /dev/null   Fri Dec  8 08:03:36 2017
+++ pkgsrc/devel/libuuid/Makefile.common        Fri Dec  8 08:03:35 2017
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.common,v 1.1 2017/12/08 08:03:35 adam Exp $
+# used by devel/libblkid/Makefile
+# used by devel/libuuid/Makefile
+# used by x11/mcookie/Makefile
+
+DISTNAME=      util-linux-2.31
+MASTER_SITES=  https://www.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION_NOREV}/
+EXTRACT_SUFX=  .tar.xz
+EXTRACT_USING= bsdtar
+
+MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/karelzak/util-linux
+
+DISTINFO_FILE= ${.CURDIR}/../../devel/libuuid/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/libuuid/patches
+
+USE_GCC_RUNTIME=       yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --disable-all-programs
+CONFIGURE_ARGS+=       --disable-bash-completion
+CONFIGURE_ARGS+=       --without-ncurses
+CONFIGURE_ARGS+=       --without-ncursesw
+
+TEST_TARGET=           check

Index: pkgsrc/devel/libuuid/patches/patch-include_ttyutils.h
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-include_ttyutils.h:1.1
--- /dev/null   Fri Dec  8 08:03:36 2017
+++ pkgsrc/devel/libuuid/patches/patch-include_ttyutils.h       Fri Dec  8 08:03:35 2017
@@ -0,0 +1,53 @@
+$NetBSD: patch-include_ttyutils.h,v 1.1 2017/12/08 08:03:35 adam 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;
Index: pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c:1.1
--- /dev/null   Fri Dec  8 08:03:36 2017
+++ pkgsrc/devel/libuuid/patches/patch-lib_ismounted.c  Fri Dec  8 08:03:35 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-lib_ismounted.c,v 1.1 2017/12/08 08:03:35 adam 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;
Index: pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c:1.1
--- /dev/null   Fri Dec  8 08:03:36 2017
+++ pkgsrc/devel/libuuid/patches/patch-libuuid_src_gen__uuid.c  Fri Dec  8 08:03:35 2017
@@ -0,0 +1,54 @@
+$NetBSD: patch-libuuid_src_gen__uuid.c,v 1.1 2017/12/08 08:03:35 adam Exp $
+
+fcntl is portable, flock is not.
+Solaris does not have ifr.ifr_hwaddr.
+
+--- libuuid/src/gen_uuid.c.orig        2017-09-27 09:05:13.000000000 +0000
++++ libuuid/src/gen_uuid.c
+@@ -172,7 +172,7 @@ static int get_node_id(unsigned char *no
+       for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
+               ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+               strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+-#ifdef SIOCGIFHWADDR
++#if defined(SIOCGIFHWADDR) && !defined(__sun)
+               if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+                       continue;
+               a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
+@@ -227,12 +227,17 @@ static int get_clock(uint32_t *clock_hig
+       THREAD_LOCAL int                state_fd = -2;
+       THREAD_LOCAL FILE               *state_f;
+       THREAD_LOCAL uint16_t           clock_seq;
++      struct flock                    lock;
+       struct timeval                  tv;
+       uint64_t                        clock_reg;
+       mode_t                          save_umask;
+       int                             len;
+       int                             ret = 0;
+ 
++      lock.l_whence = SEEK_SET;
++      lock.l_start = 0;
++      lock.l_len = 0;
++
+       if (state_fd == -1)
+               ret = -1;
+ 
+@@ -253,7 +258,8 @@ static int get_clock(uint32_t *clock_hig
+       }
+       if (state_fd >= 0) {
+               rewind(state_f);
+-              while (flock(state_fd, LOCK_EX) < 0) {
++              lock.l_type = F_WRLCK;
++              while (fcntl(state_fd, F_SETLKW, &lock) < 0) {
+                       if ((errno == EAGAIN) || (errno == EINTR))
+                               continue;
+                       fclose(state_f);
+@@ -325,7 +331,8 @@ try_again:
+                       fflush(state_f);
+               }
+               rewind(state_f);
+-              flock(state_fd, LOCK_UN);
++              lock.l_type = F_UNLCK;
++              fcntl(state_fd, F_SETLK, &lock);
+       }
+ 
+       *clock_high = clock_reg >> 32;

Prev by Date: CVS commit: pkgsrc/print
Next by Date: CVS commit: pkgsrc/sysutils/e2fsprogs
Previous by Thread: CVS commit: pkgsrc/print
Next by Thread: CVS commit: pkgsrc/sysutils/e2fsprogs
Indexes:

Home | Main Index | Thread Index | Old Index