Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 297B47A295 for ; Tue, 24 Jan 2017 21:42:28 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D14D985623; Tue, 24 Jan 2017 21:42:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 61BAA8561D for ; Tue, 24 Jan 2017 21:42:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id SgfMGTlKdcin for ; Tue, 24 Jan 2017 21:42:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7B5A185571 for ; Tue, 24 Jan 2017 21:42:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 76BBDFBA6; Tue, 24 Jan 2017 21:42:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148529414675060" MIME-Version: 1.0 Date: Tue, 24 Jan 2017 21:42:26 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/x11/mcookie To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20170124214226.76BBDFBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148529414675060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_148529414675060 Content-Disposition: inline Content-Length: 2644 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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; --_----------=_148529414675060--