Merge in/out comflicts caused by Diffutils-2.7 import...

In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand.  Not nice..

1 files changed, 31 insertions, 25 deletions

diff --git a/gnu/usr.bin/diff/config.h b/gnu/usr.bin/diff/config.h
index ed8e8ef..3d7e65b 100644
--- a/gnu/usr.bin/diff/config.h
+++ b/gnu/usr.bin/diff/config.h
@@ -1,9 +1,12 @@
 /* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.hin.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if using alloca.c.  */
 /* #undef C_ALLOCA */
 
+/* Define if the closedir function returns void instead of int.  */
+/* #undef CLOSEDIR_VOID */
+
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
@@ -11,10 +14,7 @@
    This function is required for alloca.c support on those systems.  */
 /* #undef CRAY_STACKSEG_END */
 
-/* Define if you have dirent.h.  */
-#define DIRENT 1
-
-/* Define if you have alloca.h and it should be used (not Ultrix).  */
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
 /* #undef HAVE_ALLOCA_H */
 
 /* Define if you don't have vprintf but do have _doprnt.  */
@@ -23,7 +23,7 @@
 /* Define if your struct stat has st_blksize.  */
 #define HAVE_ST_BLKSIZE 1
 
-/* Define if you have vfork.h.  */
+/* Define if you have <vfork.h>.  */
 /* #undef HAVE_VFORK_H */
 
 /* Define if you have the vprintf function.  */
@@ -32,9 +32,6 @@
 /* Define if on MINIX.  */
 /* #undef _MINIX */
 
-/* Define if you don't have dirent.h, but have ndir.h.  */
-/* #undef NDIR */
-
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef pid_t */
 
@@ -63,32 +60,32 @@
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 
-/* Define if you don't have dirent.h, but have sys/dir.h.  */
-/* #undef SYSDIR */
-
-/* Define if you don't have dirent.h, but have sys/ndir.h.  */
-/* #undef SYSNDIR */
+/* Define if <sys/wait.h> is compatible with Posix applications.  */
+#define HAVE_SYS_WAIT_H 1
 
 /* Define vfork as fork if vfork does not work.  */
 /* #undef vfork */
 
-/* Define if the closedir function returns void instead of int.  */
-/* #undef VOID_CLOSEDIR */
-
-/* Define if you have dup2.  */
+/* Define if you have the dup2 function.  */
 #define HAVE_DUP2 1
 
-/* Define if you have memchr.  */
+/* Define if you have the memchr function.  */
 #define HAVE_MEMCHR 1
 
-/* Define if you have sigaction.  */
+/* Define if you have the sigaction function.  */
 #define HAVE_SIGACTION 1
 
-/* Define if you have strerror.  */
+/* Define if you have the strchr function.  */
+#define HAVE_STRCHR 1
+
+/* Define if you have the strerror function.  */
 #define HAVE_STRERROR 1
 
-/* Define if you have waitpid.  */
-#define HAVE_WAITPID 1
+/* Define if you have the tmpnam function.  */
+#define HAVE_TMPNAM 1
+
+/* Define if you have the <dirent.h> header file.  */
+#define HAVE_DIRENT_H 1
 
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
@@ -96,14 +93,23 @@
 /* Define if you have the <limits.h> header file.  */
 #define HAVE_LIMITS_H 1
 
+/* Define if you have the <ndir.h> header file.  */
+/* #undef HAVE_NDIR_H */
+
 /* Define if you have the <stdlib.h> header file.  */
 #define HAVE_STDLIB_H 1
 
 /* Define if you have the <string.h> header file.  */
 #define HAVE_STRING_H 1
 
-/* Define if you have the <sys/wait.h> header file.  */
-#define HAVE_SYS_WAIT_H 1
+/* Define if you have the <sys/dir.h> header file.  */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define if you have the <sys/file.h> header file.  */
+#define HAVE_SYS_FILE_H 1
+
+/* Define if you have the <sys/ndir.h> header file.  */
+/* #undef HAVE_SYS_NDIR_H */
 
 /* Define if you have the <time.h> header file.  */
 #define HAVE_TIME_H 1