From 0b62d14c50a7723838a4df23c58f342dfcd3a37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
Date: Mon, 7 Jan 2019 11:16:54 +0000
Subject: textproc/2bsd-diff: fix breakage on current

On FreeBSD 13 - current, the build failed with:

cc: error: unknown argument: '-i'

PR:     234362
Submitted by:   risner@stdio.com (maintainer)
---
 textproc/2bsd-diff/files/patch-diff.h | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'textproc/2bsd-diff/files/patch-diff.h')

diff --git a/textproc/2bsd-diff/files/patch-diff.h b/textproc/2bsd-diff/files/patch-diff.h
index 31670f3f50f9..645ca36f631d 100644
--- a/textproc/2bsd-diff/files/patch-diff.h
+++ b/textproc/2bsd-diff/files/patch-diff.h
@@ -1,6 +1,6 @@
---- diff.h.orig	Thu Aug 29 06:44:35 1985
-+++ diff.h	Wed Mar 19 01:35:49 2003
-@@ -5,10 +5,11 @@
+--- diff.h.orig	1985-08-28 21:44:35 UTC
++++ diff.h
+@@ -5,11 +5,17 @@
   */
  
  #include <stdio.h>
@@ -11,9 +11,15 @@
 -#include <sys/dir.h>
 +#include <dirent.h>
  #include <signal.h>
++#include <string.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <sys/wait.h>
++#include <arpa/inet.h>
  
  /*
-@@ -61,7 +62,7 @@
+  * Output format options
+@@ -61,7 +67,7 @@ int	context;		/* lines of context to be printed */
   */
  int	status;
  int	anychange;
@@ -22,7 +28,7 @@
  
  /*
   * Variables for diffdir.
-@@ -77,9 +78,9 @@
+@@ -77,9 +83,20 @@ char	**diffargv;		/* option list to pass to recursive 
  char	*file1, *file2, *efile1, *efile2;
  struct	stat stb1, stb2;
  
@@ -35,3 +41,14 @@
 +sig_t	done();
  
  extern	char diffh[], diff[], pr[];
++
++/* declarations */
++void diffdir(char **argv);
++void diffreg();
++void noroom();
++void setfile(char **fpp, char **epp, char *file);
++int useless(register char *cp);
++int min(int, int);
++int max(int, int);
++void prune();
++int skipline(int);
-- 
cgit v1.2.3