From ce7d3c16f2b9f8b0656681d5fcfdb4949eacd2f1 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Fri, 28 Jun 2002 19:05:22 +0000
Subject: Make this package compile on 1.6 and above (thanks, Johnny)

---
 comms/plptools/distinfo         |  4 ++--
 comms/plptools/patches/patch-ac | 41 ++++++++++++++++++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 5 deletions(-)

(limited to 'comms/plptools')

diff --git a/comms/plptools/distinfo b/comms/plptools/distinfo
index 69042be0b95..27242ea778b 100644
--- a/comms/plptools/distinfo
+++ b/comms/plptools/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2001/11/06 22:23:49 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/06/28 19:05:22 agc Exp $
 
 SHA1 (plptools-0.6.tar.gz) = 99280368116018a10469ea7e1b86985cf551eae5
 Size (plptools-0.6.tar.gz) = 197770 bytes
 SHA1 (patch-aa) = cfb95f4970b6e7c8d17bc79250f4500ee0da3963
 SHA1 (patch-ab) = 00fee9bb2eebf357b171ac640163a943485f482f
-SHA1 (patch-ac) = abfbc62ffa4fe17fbab470f0bd5cb10211f91a77
+SHA1 (patch-ac) = f547dc3ec8fad2fbd1ef7fb40c59c14e22bcb832
 SHA1 (patch-ad) = de550f23304b6205f0d4a6b40cc32307c41a509f
 SHA1 (patch-ae) = 46b1d9714397c7b9d6b3fb5d053cda44fc5f10fd
 SHA1 (patch-af) = 41f937ef89ba41d79b531ffc57fd77dee0608a93
diff --git a/comms/plptools/patches/patch-ac b/comms/plptools/patches/patch-ac
index 5c4d049fba6..1051accac2b 100644
--- a/comms/plptools/patches/patch-ac
+++ b/comms/plptools/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2001/11/06 22:23:50 jlam Exp $
+$NetBSD: patch-ac,v 1.7 2002/06/28 19:05:23 agc Exp $
 
 --- plpftp/ftp.cc.orig	Mon Jan 17 06:49:41 2000
 +++ plpftp/ftp.cc
@@ -40,15 +40,50 @@ $NetBSD: patch-ac,v 1.6 2001/11/06 22:23:50 jlam Exp $
                                  	strftime(dateBuff, 100, "%c", t);
                                  	cout << a.opAttr(attr);
                                  	cout << " " << dec << setw(10) << setfill(' ') << size;
-@@ -911,7 +915,7 @@
+@@ -849,7 +853,7 @@
+ static long maskAttr;
+ 
+ static char*
+-filename_generator(char *text, int state)
++filename_generator(const char *text, int state)
+ {
+ 	static int len;
+ 
+@@ -884,7 +888,7 @@
+ }
+ 
+ static char *
+-command_generator(char *text, int state)
++command_generator(const char *text, int state)
+ {
+ 	static int idx, len;
+ 	char *name;
+@@ -907,13 +911,13 @@
+ }
+ 
+ static char **
+-do_completion(char *text, int start, int end)
++do_completion(const char *text, int start, int end)
  {
  	char **matches = NULL;
  
 -	rl_completion_entry_function = (Function *)null_completion;
 +	rl_completion_entry_function = (CPFunction *)null_completion;
  	if (start == 0)
- 		matches = completion_matches(text, command_generator);
+-		matches = completion_matches(text, command_generator);
++		matches = rl_completion_matches(text, command_generator);
  	else {
+ 		int idx = 0;
+ 		char *name;
+@@ -934,7 +938,7 @@
+ 				maskAttr = 0x0010;
+ 		}
+ 		
+-		matches = completion_matches(text, filename_generator);
++		matches = rl_completion_matches(text, filename_generator);
+ 	}
+ 	return matches;
+ }
 @@ -945,7 +949,7 @@
  {
  #if HAVE_LIBREADLINE
-- 
cgit v1.2.3