update to 0.4.20

5 files changed, 28 insertions, 31 deletions

diff --git a/net/gnut/Makefile b/net/gnut/Makefile
index 7461f66c499..870160a44f1 100644
--- a/net/gnut/Makefile
+++ b/net/gnut/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 18:18:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/24 23:48:57 christos Exp $
 #
 
-DISTNAME=	gnut-0.4.12
+DISTNAME=	gnut-0.4.20
 CATEGORIES=	net
-MASTER_SITES=	http://www.mrob.com/gnut/tars/
+MASTER_SITES=	http://www.gnutelladev.com/source/gnut/
 
 MAINTAINER=	deberg@netbsd.org
 HOMEPAGE=	http://www.mrob.com/gnut/
diff --git a/net/gnut/files/md5 b/net/gnut/files/md5
index a7111c16fa4..bdf48c61443 100644
--- a/net/gnut/files/md5
+++ b/net/gnut/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/08/12 15:12:41 deberg Exp $
+$NetBSD: md5,v 1.4 2001/02/24 23:48:58 christos Exp $
 
-MD5 (gnut-0.4.12.tar.gz) = 328f407fa1a4b066f7c68577e359ff98
+MD5 (gnut-0.4.20.tar.gz) = e4f74abd2c958c96a50def716a05f986
diff --git a/net/gnut/files/patch-sum b/net/gnut/files/patch-sum
index 1ac9239ab2c..4b04f1b02d0 100644
--- a/net/gnut/files/patch-sum
+++ b/net/gnut/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 2000/08/12 15:12:41 deberg Exp $
+$NetBSD: patch-sum,v 1.3 2001/02/24 23:48:58 christos Exp $
 
 MD5 (patch-aa) = 8827072f034e0ce33e990354d2afe802
-MD5 (patch-ab) = 771a937cf7caaf4c9e4fc1591c8a79e8
+MD5 (patch-ab) = 372736a0b4af8ff691808883346adf18
 MD5 (patch-ac) = e549a24bba21f3c558bd4a91d88f4620
-MD5 (patch-ad) = 93792303c73a1e95b07deebc2de612ed
+MD5 (patch-ad) = a20e9d723f1fcafe6a789e3e4c7b2ff4
diff --git a/net/gnut/patches/patch-ab b/net/gnut/patches/patch-ab
index 86d104039f2..058a6b75566 100644
--- a/net/gnut/patches/patch-ab
+++ b/net/gnut/patches/patch-ab
@@ -1,11 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2000/08/12 15:12:41 deberg Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/24 23:48:58 christos Exp $
 
---- src/cli_input.c.orig	Thu Aug  3 03:43:22 2000
-+++ src/cli_input.c	Fri Aug 11 16:05:53 2000
-@@ -17,4 +17,9 @@
+--- src/cli_input.c.orig	Wed Jan 31 14:37:00 2001
++++ src/cli_input.c	Sat Feb 24 18:32:11 2001
+@@ -18,8 +18,13 @@
+ #include <pthread.h>
+ 
  #ifdef HAVE_READLINE
--  #include <readline/readline.h>
--  #include <readline/history.h>
+-# include <readline/readline.h>
+-# include <readline/history.h>
 +# ifdef HAVE_LIBEDIT
 +#  include <readline.h>
 +#  include <history.h>
@@ -14,3 +16,5 @@ $NetBSD: patch-ab,v 1.2 2000/08/12 15:12:41 deberg Exp $
 +#  include <readline/history.h>
 +# endif
  #endif
+ 
+ #ifdef HAVE_REGEX_H
diff --git a/net/gnut/patches/patch-ad b/net/gnut/patches/patch-ad
index a7e1bf03aa2..4d226d702d1 100644
--- a/net/gnut/patches/patch-ad
+++ b/net/gnut/patches/patch-ad
@@ -1,33 +1,26 @@
-$NetBSD: patch-ad,v 1.1 2000/08/12 15:12:41 deberg Exp $
+$NetBSD: patch-ad,v 1.2 2001/02/24 23:48:58 christos Exp $
 
---- configure.orig	Sun Aug  6 20:29:43 2000
-+++ configure	Sat Aug 12 10:23:24 2000
-@@ -1208,20 +1208,20 @@
+--- configure.orig	Wed Feb  7 14:33:52 2001
++++ configure	Sat Feb 24 18:36:14 2001
+@@ -1282,14 +1282,14 @@
  fi
  
  
 -echo $ac_n "checking for readline in readline.h""... $ac_c" 1>&6
--echo "configure:1213: checking for readline in readline.h" >&5
+-echo "configure:1287: checking for readline in readline.h" >&5
 +echo $ac_n "checking for readline in readline.h with libedit""... $ac_c" 1>&6
-+echo "configure:1213: checking for readline in readline.h with libedit" >&5
- if eval "test \"`echo '$''{'g_cv_readline'+set}'`\" = set"; then
++echo "configure:1287: checking for readline in readline.h with libedit" >&5
+ if eval "test \"\${g_cv_readline+set}\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
  	save_LIBS="$LIBS"
 -	LIBS="-lreadline $LIBS"
-+	LIBS="-ledit -ltermcap $LIBS"
++	LIBS="-ledit $LIBS"
  	cat > conftest.$ac_ext <<EOF
- #line 1221 "configure"
+ #line 1295 "configure"
  #include "confdefs.h"
- 
- 		#include <stdio.h>
--		#include <readline/readline.h>
-+		#include <readline.h>
- 		
- int main() {
- readline(NULL);
-@@ -1244,10 +1244,60 @@
+@@ -1318,10 +1318,60 @@
  echo "$ac_t""$g_cv_readline" 1>&6
  	
  if test $g_cv_readline = yes ; then