Needs -lcompat on NetBSD, but also include the right header.

3 files changed, 23 insertions, 13 deletions

diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index c2fd2222f44..e8b4661097f 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/05/15 08:38:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2017/07/14 12:56:41 joerg Exp $
 
 DISTNAME=	fep
 PKGNAME=	fep-1.0
@@ -24,6 +24,8 @@ INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
 CFLAGS+=	-Wno-error=return-type
 .endif
 
+LDFLAGS.NetBSD+=	-lcompat
+
 pre-build:
 	cd ${WRKSRC} && \
 		for i in *.[ch]; do ${SED} "s,#endif lint,#endif /* lint */,g" $${i} > $${i}.new && \
diff --git a/misc/fep/distinfo b/misc/fep/distinfo
index aee0f4f9975..ee425b4f650 100644
--- a/misc/fep/distinfo
+++ b/misc/fep/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/05/15 08:38:34 jperkin Exp $
+$NetBSD: distinfo,v 1.22 2017/07/14 12:56:41 joerg Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
@@ -12,7 +12,7 @@ SHA1 (patch-ae) = df788c39a2f315aac6167c17640dcf70991ce699
 SHA1 (patch-af) = b4571fb0752fefd2c2f80bea02675643abc15f63
 SHA1 (patch-ag) = f2c92afc1de9d91577673e961d8124be233b4b9f
 SHA1 (patch-ah) = 5fd76d412877dc5db166dad274a765b68182c875
-SHA1 (patch-ai) = eda04c0d295a425e6929ade003314cc5ea340368
+SHA1 (patch-ai) = 87b71b2cadea29914019b929e63f69817b9586db
 SHA1 (patch-aj) = 226f529fed4928ec5d2e5e89d6d390cf342ba268
 SHA1 (patch-ak) = 97f14ed899fc2afc4f27a3730084355ec42649af
 SHA1 (patch-al) = 1833c49451e1f75bc6b063e1c276195f588c3945
diff --git a/misc/fep/patches/patch-ai b/misc/fep/patches/patch-ai
index c6ba941782e..d3ceba6b848 100644
--- a/misc/fep/patches/patch-ai
+++ b/misc/fep/patches/patch-ai
@@ -1,18 +1,20 @@
-$NetBSD: patch-ai,v 1.6 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-ai,v 1.7 2017/07/14 12:56:41 joerg Exp $
 
 --- fep_hist.c.orig	1988-11-25 06:45:42.000000000 -0500
 +++ fep_hist.c	2005-12-10 16:59:27.000000000 -0500
 @@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
-@@ -7,4 +7,6 @@
+@@ -7,5 +7,8 @@
  
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
  #include <ctype.h>
++#include <re_comp.h>
  #include "fep_defs.h"
-@@ -255,7 +257,7 @@
+ #include "fep_glob.h"
+@@ -255,7 +258,7 @@
  
  	default:
  	    {
@@ -21,23 +23,29 @@ $NetBSD: patch-ai,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  
  		strcpy (buf, "^");
  		strncat (buf, string, 64);
-@@ -267,6 +269,7 @@
+@@ -267,9 +270,9 @@
  
  char *
  search_reverse_history (string)
 +    char *string;
  {
      register int i;
-     char *re_comp();
-@@ -291,6 +294,7 @@
+-    char *re_comp();
+ 
+     if (string != NULL) {
+ 	set_var ("search-string", string);
+@@ -291,9 +294,9 @@
  
  char *
  search_forward_history (string)
 +    char *string;
  {
      register int i;
-     char *re_comp();
-@@ -412,7 +416,7 @@
+-    char *re_comp();
+ 
+     if (string != NULL) {
+ 	if (re_comp(string) != (char *)0)
+@@ -412,7 +415,7 @@
  mk_home_relative (cp)
      char *cp;
  {
@@ -46,7 +54,7 @@ $NetBSD: patch-ai,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  
      /*
       * If variable "history-file" is not absolute path name,
-@@ -540,7 +544,7 @@
+@@ -540,7 +543,7 @@
      char *file;
  {
      FILE *fp;
@@ -55,7 +63,7 @@ $NetBSD: patch-ai,v 1.6 2006/01/17 21:23:01 kristerw Exp $
      register int i;
  
      if ((fp = fopen (file, "r")) == NULL) {
-@@ -550,7 +554,7 @@
+@@ -550,7 +553,7 @@
  	return;
      }