CVS commit: pkgsrc/x11/mcookie

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Jan 24 21:42:26 UTC 2017

Modified Files:
        pkgsrc/x11/mcookie: Makefile distinfo
        pkgsrc/x11/mcookie/patches: patch-lib_ismounted.c

Log Message:
Fix build under macOS (and maybe others).

The patch below replaces struct statfs with struct statvfs to fix the build
under NetBSD. Protect it with an #ifdef.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/mcookie/Makefile \
    pkgsrc/x11/mcookie/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c

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

Modified files:

Index: pkgsrc/x11/mcookie/Makefile
diff -u pkgsrc/x11/mcookie/Makefile:1.3 pkgsrc/x11/mcookie/Makefile:1.4
--- pkgsrc/x11/mcookie/Makefile:1.3     Mon Nov 14 14:48:46 2016
+++ pkgsrc/x11/mcookie/Makefile Tue Jan 24 21:42:26 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2016/11/14 14:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/01/24 21:42:26 bsiegert Exp $
 
 DISTNAME=      util-linux-2.29
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/util-linux/mcookie/}
 CATEGORIES=    sysutils
 MASTER_SITES=  https://www.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION_NOREV}/
Index: pkgsrc/x11/mcookie/distinfo
diff -u pkgsrc/x11/mcookie/distinfo:1.3 pkgsrc/x11/mcookie/distinfo:1.4
--- pkgsrc/x11/mcookie/distinfo:1.3     Mon Nov 14 14:48:46 2016
+++ pkgsrc/x11/mcookie/distinfo Tue Jan 24 21:42:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2016/11/14 14:48:46 wiz Exp $
+$NetBSD: distinfo,v 1.4 2017/01/24 21:42:26 bsiegert Exp $
 
 SHA1 (util-linux-2.29.tar.xz) = ed267cb80af92d327c53a45360addf1a19a1a0b6
 RMD160 (util-linux-2.29.tar.xz) = 19596ea48943f8ac0433e56104d93473579b9697
@@ -7,5 +7,5 @@ Size (util-linux-2.29.tar.xz) = 4249020 
 SHA1 (patch-configure) = 1e6e797b8a0c19f3a55c65a8a51a9fd08a35fead
 SHA1 (patch-include_setproctitle.h) = deb06015ca459886f82e22eaf6596ff79799b02a
 SHA1 (patch-include_ttyutils.h) = 304b7e09b601685c35c6033a95622e50979586ea
-SHA1 (patch-lib_ismounted.c) = f880372aca259fdba0b30ecf38e5d9bb79e6c5d8
+SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
 SHA1 (patch-lib_setproctitle.c) = 2b6415d9fa484ba1969aa36610b695ba04d0a603

Index: pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c
diff -u pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c:1.1 pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c:1.2
--- pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c:1.1        Tue Sep 20 08:00:51 2016
+++ pkgsrc/x11/mcookie/patches/patch-lib_ismounted.c    Tue Jan 24 21:42:26 2017
@@ -1,15 +1,18 @@
-$NetBSD: patch-lib_ismounted.c,v 1.1 2016/09/20 08:00:51 wiz Exp $
+$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-03-08 13:26:33.000000000 +0000
+--- lib/ismounted.c.orig       2016-11-02 12:57:31.000000000 +0000
 +++ lib/ismounted.c
-@@ -214,7 +214,7 @@ static int check_mntent(const char *file
+@@ -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)
  {
--      struct statfs *mp;
++#ifdef __NetBSD__
 +      struct statvfs *mp;
++#else
+       struct statfs *mp;
++#endif
          int    len, n;
          const  char   *s1;
        char    *s2;