From 8f3b5b9384c0d0e6d6607f5e03bd2186e8c66104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Feb 2017 22:13:05 +0100
Subject: [PATCH] libnfs: fix build

Since kernel-libc-headers was updated to 4.9.8 the macros `makedev`, `major`
and `minor` are defined in the include file `sys/sysmacros.h`. The definitions
in `sys/types.h` are obsoleted and will be removed soon.

This fix moves the `#include <sys/sysmacros.h>` after the `#include <sys/types.h>`.

Closes #5704
---
 .../libnfs/patches/sysmacros_makedev.patch    | 25 +++++++++++++++++++
 srcpkgs/libnfs/template                       |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libnfs/patches/sysmacros_makedev.patch

diff --git a/srcpkgs/libnfs/patches/sysmacros_makedev.patch b/srcpkgs/libnfs/patches/sysmacros_makedev.patch
new file mode 100644
index 00000000000..1e48d2f953e
--- /dev/null
+++ b/srcpkgs/libnfs/patches/sysmacros_makedev.patch
@@ -0,0 +1,25 @@
+--- lib/libnfs.c	2016-10-09 20:23:11.000000000 +0200
++++ lib/libnfs.c	2017-02-09 22:11:03.882598292 +0100
+@@ -64,14 +64,6 @@
+ #include <strings.h>
+ #endif
+ 
+-#ifdef MAJOR_IN_MKDEV
+-#include <sys/mkdev.h>
+-#endif
+-
+-#ifdef MAJOR_IN_SYSMACROS
+-#include <sys/sysmacros.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+@@ -82,6 +74,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <sys/sysmacros.h>
+ #include "libnfs-zdr.h"
+ #include "slist.h"
+ #include "libnfs.h"
diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template
index 7bddcc45318..5d5ed8d32da 100644
--- a/srcpkgs/libnfs/template
+++ b/srcpkgs/libnfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libnfs'
 pkgname=libnfs
 version=1.11.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="libtool pkg-config automake"