summaryrefslogtreecommitdiff
path: root/comms/plptools/patches
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2002-06-28 19:05:22 +0000
committeragc <agc@pkgsrc.org>2002-06-28 19:05:22 +0000
commitf3dacf833f3aa41cd49a7a0d97aca8de87c69b20 (patch)
tree4aa2817f9b3e0a1ddce34de1d2990213a488927c /comms/plptools/patches
parent6ac62a929236d49efc0c69a4efc335d0750238c0 (diff)
downloadpkgsrc-f3dacf833f3aa41cd49a7a0d97aca8de87c69b20.tar.gz
Make this package compile on 1.6 and above (thanks, Johnny)
Diffstat (limited to 'comms/plptools/patches')
-rw-r--r--comms/plptools/patches/patch-ac41
1 files changed, 38 insertions, 3 deletions
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