diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2017-01-24 21:42:26 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2017-01-24 21:42:26 +0000 |
| commit | 57e5ec39d7b79019de3859d9bc99333b027b922a (patch) | |
| tree | 69b9c92e41f07b9db28bf8b7c22e600a29b989ce /x11 | |
| parent | a90f99f21187a61555c9587a8c73cc319cadb72f (diff) | |
| download | pkgsrc-57e5ec39d7b79019de3859d9bc99333b027b922a.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/mcookie/Makefile | 3 | ||||
| -rw-r--r-- | x11/mcookie/distinfo | 4 | ||||
| -rw-r--r-- | x11/mcookie/patches/patch-lib_ismounted.c | 11 |
3 files changed, 11 insertions, 7 deletions
diff --git a/x11/mcookie/Makefile b/x11/mcookie/Makefile index 3a95fdddb65..9ab7eddd664 100644 --- a/x11/mcookie/Makefile +++ b/x11/mcookie/Makefile @@ -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}/ diff --git a/x11/mcookie/distinfo b/x11/mcookie/distinfo index c581ff8c8f8..32753842218 100644 --- a/x11/mcookie/distinfo +++ b/x11/mcookie/distinfo @@ -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 bytes 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 diff --git a/x11/mcookie/patches/patch-lib_ismounted.c b/x11/mcookie/patches/patch-lib_ismounted.c index ac6b5789973..a2f44263763 100644 --- a/x11/mcookie/patches/patch-lib_ismounted.c +++ b/x11/mcookie/patches/patch-lib_ismounted.c @@ -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; |