dirfd is missing on HP-UX. Don't include getopt.h -- no getopt_long

here.

6 files changed, 55 insertions, 7 deletions

diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index e05a04183ea..545e8af224b 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2015/11/04 01:59:40 agc Exp $
+$NetBSD: distinfo,v 1.43 2015/12/10 02:50:19 joerg Exp $
 
 SHA1 (mdocml-1.13.3.tar.gz) = 3ccfbb492a477b84343c97de743b3dd5bd3c763b
 RMD160 (mdocml-1.13.3.tar.gz) = 47d1096708b45b15d8f198404fd6608d164bb66a
 SHA512 (mdocml-1.13.3.tar.gz) = a3b7304e313b905b3575d79eb7ac861723e0ef3f700199c136abe4d4c698929e99ee0789bfc6e591224fb0006c709afe0e4c1bb578605a767c371ec7dee26024
 Size (mdocml-1.13.3.tar.gz) = 358971 bytes
-SHA1 (patch-compat_fts.c) = bc20484964d8ff0aa2af07d581bad39a6c056a5a
+SHA1 (patch-compat_fts.c) = c60ea34887884f213d1bc461b739d3ed977536e3
 SHA1 (patch-roff.7) = 78e19d2c2d18f4dad15b0e0f3cfbf812c0edf79b
diff --git a/textproc/mdocml/patches/patch-compat_fts.c b/textproc/mdocml/patches/patch-compat_fts.c
index 102632d2bef..9804cf8fd3e 100644
--- a/textproc/mdocml/patches/patch-compat_fts.c
+++ b/textproc/mdocml/patches/patch-compat_fts.c
@@ -1,14 +1,14 @@
-$NetBSD: patch-compat_fts.c,v 1.5 2015/03/26 19:59:53 sevan Exp $
+$NetBSD: patch-compat_fts.c,v 1.6 2015/12/10 02:50:19 joerg Exp $
 
-Fix build under Solaris 10.
+Fix build under Solaris 10 and HP-UX.
 
 --- compat_fts.c.orig	2015-03-13 12:38:38.000000000 +0000
-+++ compat_fts.c	2015-03-19 08:22:11.000000000 +0000
-@@ -76,6 +76,10 @@
++++ compat_fts.c
+@@ -76,6 +76,10 @@ static int	 fts_safe_changedir(FTS *, FT
  
  #define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
  
-+#ifdef __sun__
++#if defined(__sun__) || defined(__hpux)
 +#define dirfd(fd) ((fd)->dd_fd)
 +#endif
 +
diff --git a/textproc/mdocml/patches/patch-demandoc.c b/textproc/mdocml/patches/patch-demandoc.c
new file mode 100644
index 00000000000..d34ca73ac18
--- /dev/null
+++ b/textproc/mdocml/patches/patch-demandoc.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-demandoc.c,v 1.1 2015/12/10 02:50:19 joerg Exp $
+
+--- demandoc.c.orig	2015-12-07 15:20:07.413956576 +0000
++++ demandoc.c
+@@ -20,7 +20,6 @@
+ 
+ #include <assert.h>
+ #include <ctype.h>
+-#include <getopt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/textproc/mdocml/patches/patch-mandocdb.c b/textproc/mdocml/patches/patch-mandocdb.c
new file mode 100644
index 00000000000..a0348753048
--- /dev/null
+++ b/textproc/mdocml/patches/patch-mandocdb.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-mandocdb.c,v 1.7 2015/12/10 02:50:19 joerg Exp $
+
+--- mandocdb.c.orig	2015-12-07 15:20:09.513956486 +0000
++++ mandocdb.c
+@@ -30,7 +30,6 @@
+ #else
+ #include "compat_fts.h"
+ #endif
+-#include <getopt.h>
+ #include <limits.h>
+ #include <stddef.h>
+ #include <stdio.h>
diff --git a/textproc/mdocml/patches/patch-manpage.c b/textproc/mdocml/patches/patch-manpage.c
new file mode 100644
index 00000000000..6b01f5d1132
--- /dev/null
+++ b/textproc/mdocml/patches/patch-manpage.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-manpage.c,v 1.1 2015/12/10 02:50:19 joerg Exp $
+
+--- manpage.c.orig	2015-12-07 15:20:30.565955584 +0000
++++ manpage.c
+@@ -20,7 +20,6 @@
+ #include <sys/types.h>
+ 
+ #include <assert.h>
+-#include <getopt.h>
+ #include <limits.h>
+ #include <stdint.h>
+ #include <stdio.h>
diff --git a/textproc/mdocml/patches/patch-mansearch.c b/textproc/mdocml/patches/patch-mansearch.c
new file mode 100644
index 00000000000..e08b61bd403
--- /dev/null
+++ b/textproc/mdocml/patches/patch-mansearch.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-mansearch.c,v 1.1 2015/12/10 02:50:19 joerg Exp $
+
+--- mansearch.c.orig	2015-12-07 15:20:30.565955584 +0000
++++ mansearch.c
+@@ -23,7 +23,6 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <getopt.h>
+ #include <glob.h>
+ #include <limits.h>
+ #include <regex.h>