From b9efef34aea1fe738a8707fb0f7a776cd3dd2f7b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Fri, 5 May 2017 15:51:15 +0200
Subject: [PATCH] nmon: update to 16g.

---
 srcpkgs/nmon/patches/endmntent.patch         | 19 -------------
 srcpkgs/nmon/patches/musl-fixes.patch        | 30 ++++++++++++++++++++
 srcpkgs/nmon/patches/musl-string-macro.patch | 13 ---------
 srcpkgs/nmon/template                        |  4 +--
 4 files changed, 32 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/nmon/patches/endmntent.patch
 create mode 100644 srcpkgs/nmon/patches/musl-fixes.patch
 delete mode 100644 srcpkgs/nmon/patches/musl-string-macro.patch

diff --git a/srcpkgs/nmon/patches/endmntent.patch b/srcpkgs/nmon/patches/endmntent.patch
deleted file mode 100644
index 67a9db1e4ad..00000000000
--- a/srcpkgs/nmon/patches/endmntent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lmon16f.c.orig	2016-05-14 18:38:40.459977271 +0200
-+++ lmon16f.c	2016-05-14 18:38:58.012263072 +0200
-@@ -706,7 +706,6 @@
- int isroot = 0;
- 
- #include <mntent.h>
--#include <fstab.h>
- #include <sys/stat.h>
- #include <sys/statfs.h>
- #include <net/if.h>
-@@ -3456,7 +3455,7 @@
- 		mp->mnt_dir[JFSNAMELEN - 1] = 0;
- 		mp->mnt_type[JFSTYPELEN - 1] = 0;
- 	    }
--	    endfsent();
-+	    endmntent(mfp);
- 	    jfs_loaded = 1;
- 	    jfses = i;
- 	}
diff --git a/srcpkgs/nmon/patches/musl-fixes.patch b/srcpkgs/nmon/patches/musl-fixes.patch
new file mode 100644
index 00000000000..9dc92e2d55e
--- /dev/null
+++ b/srcpkgs/nmon/patches/musl-fixes.patch
@@ -0,0 +1,30 @@
+--- lmon16g.c.orig
++++ lmon16g.c
+@@ -63,7 +63,7 @@
+ #include <fcntl.h>
+ #include <math.h>
+ #include <time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+@@ -72,6 +72,10 @@
+ #include <sys/socket.h>
+ #include <sys/wait.h>
+ 
++#ifndef __STRING
++#define __STRING(x) #x
++#endif
++
+ /* Windows moved here so they can be cleared when the screen mode changes */
+ WINDOW *padwelcome = NULL;
+ WINDOW *padtop = NULL;
+@@ -576,7 +580,6 @@
+ int isroot = 0;
+ 
+ #include <mntent.h>
+-#include <fstab.h>
+ #include <sys/stat.h>
+ #include <sys/statfs.h>
+ #include <net/if.h>
diff --git a/srcpkgs/nmon/patches/musl-string-macro.patch b/srcpkgs/nmon/patches/musl-string-macro.patch
deleted file mode 100644
index aaa8820e20b..00000000000
--- a/srcpkgs/nmon/patches/musl-string-macro.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lmon16f.c.orig	2016-03-04 18:41:57.788556435 +0100
-+++ lmon16f.c	2016-03-04 22:23:27.977248021 +0100
-@@ -58,6 +58,10 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
- 
-+#ifndef __STRING
-+#define __STRING(x) #x
-+#endif
-+
- /* Windows moved here so they can be cleared when the screen mode changes */
- WINDOW *padwelcome = NULL;
- WINDOW *padtop = NULL;
diff --git a/srcpkgs/nmon/template b/srcpkgs/nmon/template
index 4ca107eb0de..f6665972d3e 100644
--- a/srcpkgs/nmon/template
+++ b/srcpkgs/nmon/template
@@ -1,6 +1,6 @@
 # Template file for 'nmon'
 pkgname=nmon
-version=16f
+version=16g
 revision=1
 build_style=fetch
 maintainer="Orphaned <orphan@voidlinux.eu>"
@@ -10,7 +10,7 @@ license="GPL-3"
 homepage="http://nmon.sourceforge.net/pmwiki.php?n=Main.HomePage"
 short_desc="Nigel's performance Monitor for Linux"
 distfiles="${SOURCEFORGE_SITE}/nmon/files/lmon${version}.c"
-checksum=280a371e17488f8a2c5e0c64273155789be6fa5b937ab5c465488e591bdc5cd9
+checksum=da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688
 
 do_build() {
 	$CC ${CFLAGS} ${LDFLAGS} -D JFS -D GETUSER -D LARGEMEM -D X86 \