Fix errno. Prefer NAME_MAX. Add DragonFly.

5 files changed, 64 insertions, 18 deletions

diff --git a/net/freewais-sf/distinfo b/net/freewais-sf/distinfo
index 1cd10d08a1d..b2199504620 100644
--- a/net/freewais-sf/distinfo
+++ b/net/freewais-sf/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/12/05 20:50:45 rillig Exp $
+$NetBSD: distinfo,v 1.7 2005/12/27 14:00:53 joerg Exp $
 
 SHA1 (freeWAIS-sf-2.2.12.tar.gz) = a18ec82b773e0114c3c2b15aa3fbeadc21b2cd47
 RMD160 (freeWAIS-sf-2.2.12.tar.gz) = 3b25c10f0cb62d69ce7001affe53c18bfaf9cede
 Size (freeWAIS-sf-2.2.12.tar.gz) = 1002974 bytes
-SHA1 (patch-aa) = a67c64d03f81d653faa43139670926fb3b84928d
+SHA1 (patch-aa) = 1f80d5c7462069ebd1797d83ad53f7385702957f
 SHA1 (patch-ab) = e1e59cf668abe1ff7ec4c951ac50e38ceffaa0dd
 SHA1 (patch-ac) = 65736e07c191638cab4975f3cea398850e5158e9
 SHA1 (patch-ad) = 6302c42f5c0a0119e694fd0594dd5b24c77c2bc4
@@ -28,5 +28,6 @@ SHA1 (patch-av) = 4466d5c1c6394a03dc953e8f138b749113664b65
 SHA1 (patch-aw) = 00f267dd288dfcce627dbbb631cd388eae1a81af
 SHA1 (patch-ax) = 9934346f7d22c23d0682c316079bb4cdf01d77d7
 SHA1 (patch-ay) = b699615b0a152136fc6be02c899a2a0d4ea6ced1
-SHA1 (patch-az) = 8b608484a353c73e6e532bb4cb9f32a4270f1385
-SHA1 (patch-ba) = fc98fc590a86720f39fc77d650bfc985508b064b
+SHA1 (patch-az) = 7c642dae813030f45cf40da0bd2b4c95d216c161
+SHA1 (patch-ba) = 9e6143958f35eb2921206e612c749376fb62c3e8
+SHA1 (patch-bb) = 6b4803f2f6726598e7d008ed474f0feb7b8f59a6
diff --git a/net/freewais-sf/patches/patch-aa b/net/freewais-sf/patches/patch-aa
index 9056db4a3f8..7fa87818531 100644
--- a/net/freewais-sf/patches/patch-aa
+++ b/net/freewais-sf/patches/patch-aa
@@ -1,8 +1,27 @@
-$NetBSD: patch-aa,v 1.2 2005/06/23 22:12:44 kristerw Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/27 14:00:53 joerg Exp $
 
---- Configure.orig	1999-04-16 11:59:11.000000000 +0200
-+++ Configure	2005-06-24 00:07:51.000000000 +0200
-@@ -2407,7 +2407,7 @@
+--- Configure.orig	1999-04-16 09:59:11.000000000 +0000
++++ Configure
+@@ -1659,6 +1659,9 @@ EOM
+ 			;;
+ 		freebsd) osname=freebsd 
+ 			osvers="$3" ;;
++		dragonfly)
++			osname=dragonfly
++			osvers="$3" ;;
+ 		genix) osname=genix ;;
+ 		hp*) osname=hpux 
+ 			case "$3" in
+@@ -1730,7 +1733,7 @@ EOM
+ 			;;
+ 		$2) case "$osname" in
+ 			*isc*) ;;
+-			*freebsd*) ;;
++			*freebsd* | dragonfly*) ;;
+ 			svr*)
+ 				: svr4.x or possibly later
+ 				case "svr$3" in	
+@@ -2407,7 +2410,7 @@ case "$mansrc" in
  esac
  
  : determine where private executables go
@@ -11,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/23 22:12:44 kristerw Exp $
  eval $prefixit
  $cat <<EOM
  
-@@ -4673,7 +4673,7 @@
+@@ -4673,7 +4676,7 @@ main()
  }
  EOCP
  if $cc $ccflags try.c -o try >/dev/null 2>&1; then
@@ -20,7 +39,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/23 22:12:44 kristerw Exp $
      cont=x
      case "$d_myregexp" in
          $define) d_myregexp='n';;
-@@ -4695,7 +4695,7 @@
+@@ -4695,7 +4698,7 @@ if $cc $ccflags try.c -o try >/dev/null 
      done
  
  else
@@ -29,7 +48,7 @@ $NetBSD: patch-aa,v 1.2 2005/06/23 22:12:44 kristerw Exp $
      d_myregexp='n';
  fi
  
-@@ -7088,7 +7088,7 @@
+@@ -7088,7 +7091,7 @@ osvers='$osvers'
  package='$package'
  passcat='$passcat'
  patchlevel='$patchlevel'
diff --git a/net/freewais-sf/patches/patch-az b/net/freewais-sf/patches/patch-az
index 211580d5e91..ba3d0ba2206 100644
--- a/net/freewais-sf/patches/patch-az
+++ b/net/freewais-sf/patches/patch-az
@@ -1,11 +1,12 @@
-$NetBSD: patch-az,v 1.1 2004/03/09 11:24:04 seb Exp $
+$NetBSD: patch-az,v 1.2 2005/12/27 14:00:53 joerg Exp $
 
 --- lib/ir/sockets.c.orig	1999-04-16 09:59:35.000000000 +0000
 +++ lib/ir/sockets.c
-@@ -71,8 +71,10 @@ close_connection_to_server (file)
+@@ -70,9 +70,10 @@ close_connection_to_server (file)
+ #include "panic.h"
  
  #ifdef HAS_SYS_ERRLIST
- extern int      errno;
+-extern int      errno;
 +#if !(defined(BSD) && BSD >= 199306)
  extern int      sys_nerr;
  #endif
diff --git a/net/freewais-sf/patches/patch-ba b/net/freewais-sf/patches/patch-ba
index 03aa8f68fd6..1aaeda390b5 100644
--- a/net/freewais-sf/patches/patch-ba
+++ b/net/freewais-sf/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2005/12/05 20:50:45 rillig Exp $
+$NetBSD: patch-ba,v 1.3 2005/12/27 14:00:53 joerg Exp $
 
 --- server/waisserver.c.orig	1999-04-16 09:59:45.000000000 +0000
 +++ server/waisserver.c
-@@ -44,6 +44,9 @@
+@@ -44,6 +44,9 @@ static char *PRCSid = "$Id: waisserver.c
  #ifdef I_SYS_SELECT
  #include <sys/select.h>
  #endif
@@ -12,10 +12,11 @@ $NetBSD: patch-ba,v 1.2 2005/12/05 20:50:45 rillig Exp $
  #include "cdialect.h"
  #include "panic.h"
  #include "ustubs.h"
-@@ -314,8 +317,10 @@ srcfiles(e)
+@@ -313,9 +316,10 @@ srcfiles(e)
+ /*---------------------------------------------------------------------------*/
  
  #ifdef HAS_SYS_ERRLIST
- extern int      errno;
+-extern int      errno;
 +#if !(defined(BSD) && BSD >= 199306)
  extern int      sys_nerr;
  #endif
diff --git a/net/freewais-sf/patches/patch-bb b/net/freewais-sf/patches/patch-bb
new file mode 100644
index 00000000000..7839862879b
--- /dev/null
+++ b/net/freewais-sf/patches/patch-bb
@@ -0,0 +1,24 @@
+$NetBSD: patch-bb,v 1.1 2005/12/27 14:00:53 joerg Exp $
+
+--- lib/ftw/ftw.c.orig	2005-12-18 22:14:06.000000000 +0000
++++ lib/ftw/ftw.c
+@@ -19,6 +19,7 @@
+  *  recycle file descriptors.
+  */
+ 
++#include <limits.h>
+ #include <stdio.h>
+ #include "cdialect.h"
+ #include <sys/stat.h>
+@@ -71,7 +72,11 @@ ftw(directory, funcptr, depth)
+ 
+     /* Get ready to hold the full paths. */
+     i = strlen(directory);
++#ifdef NAME_MAX
++    fullpath = (char *)malloc(i + 1 + NAME_MAX + 1);
++#else
+     fullpath = (char *)malloc(i + 1 + MAXNAMLEN + 1);
++#endif
+     if (fullpath == NULL) {
+ 	closedir(dirp);
+ 	return -1;