From a34fd0964eae0aacf3ef22e0427158b8cbfd8f78 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 10 Dec 2016 23:50:50 -0800
Subject: openbsd: Add missing diff include

---
 .../patch/0007-diff-Add-missing-includes.patch     | 37 ++++++++++++++++++++++
 ...0007-diff-Add-missing-sys-cdefs.h-include.patch | 24 --------------
 core/openbsd/rev                                   |  2 +-
 3 files changed, 38 insertions(+), 25 deletions(-)
 create mode 100644 core/openbsd/patch/0007-diff-Add-missing-includes.patch
 delete mode 100644 core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch

diff --git a/core/openbsd/patch/0007-diff-Add-missing-includes.patch b/core/openbsd/patch/0007-diff-Add-missing-includes.patch
new file mode 100644
index 00000000..2560b726
--- /dev/null
+++ b/core/openbsd/patch/0007-diff-Add-missing-includes.patch
@@ -0,0 +1,37 @@
+From cd4851a8e922a6bda085b6d345df2a291004ffb8 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 4 Jun 2016 14:48:20 -0700
+Subject: [PATCH] diff: Add missing includes
+
+---
+ usr.bin/diff/diff.c    | 1 +
+ usr.bin/diff/diffreg.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
+index 2b075f12c49..80c7f842ef6 100644
+--- a/usr.bin/diff/diff.c
++++ b/usr.bin/diff/diff.c
+@@ -20,6 +20,7 @@
+  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+  */
+ 
++#include <sys/cdefs.h>
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
+diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
+index 35d61c349cb..953018cf553 100644
+--- a/usr.bin/diff/diffreg.c
++++ b/usr.bin/diff/diffreg.c
+@@ -77,6 +77,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ #include <limits.h>
+ 
+-- 
+2.11.0
+
diff --git a/core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch b/core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch
deleted file mode 100644
index 6bc4b001..00000000
--- a/core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d7eab8f491d466c891b72b724087ec14c55225ae Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sat, 4 Jun 2016 14:48:20 -0700
-Subject: [PATCH] diff: Add missing sys/cdefs.h include
-
----
- usr.bin/diff/diff.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
-index 2b075f1..80c7f84 100644
---- a/usr.bin/diff/diff.c
-+++ b/usr.bin/diff/diff.c
-@@ -20,6 +20,7 @@
-  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
-  */
- 
-+#include <sys/cdefs.h>
- #include <sys/stat.h>
- 
- #include <ctype.h>
--- 
-2.8.1
-
diff --git a/core/openbsd/rev b/core/openbsd/rev
index 7ed6ff82..1e8b3149 100644
--- a/core/openbsd/rev
+++ b/core/openbsd/rev
@@ -1 +1 @@
-5
+6
-- 
cgit v1.2.3