Wed Oct 14 18:32:54 2015 UTC ()
Fix build with latest readline.


(wiz)
diff -r1.9 -r1.10 pkgsrc/databases/sqsh/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/sqsh/patches/patch-ad
cvs diff -r1.9 -r1.10 pkgsrc/databases/sqsh/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqsh/distinfo 2008/04/22 16:23:36 1.9
+++ pkgsrc/databases/sqsh/distinfo 2015/10/14 18:32:54 1.10
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.9 2008/04/22 16:23:36 jlam Exp $ 1$NetBSD: distinfo,v 1.10 2015/10/14 18:32:54 wiz Exp $
2 2
3SHA1 (sqsh-2.1-src.tar.gz) = 7bbdda5590262e465508c889b86107465f3a2b90 3SHA1 (sqsh-2.1-src.tar.gz) = 7bbdda5590262e465508c889b86107465f3a2b90
4RMD160 (sqsh-2.1-src.tar.gz) = 9a76e661a10b79fd4c0d7f58878caf6e6349e590 4RMD160 (sqsh-2.1-src.tar.gz) = 9a76e661a10b79fd4c0d7f58878caf6e6349e590
5Size (sqsh-2.1-src.tar.gz) = 358874 bytes 5Size (sqsh-2.1-src.tar.gz) = 358874 bytes
6SHA1 (patch-aa) = 998ec509579798eac267fa2b8fa8da95852bfd2d 6SHA1 (patch-aa) = 998ec509579798eac267fa2b8fa8da95852bfd2d
7SHA1 (patch-ab) = 1b2617e9b4f426780aac5989da21c2d5ddea7e56 7SHA1 (patch-ab) = 1b2617e9b4f426780aac5989da21c2d5ddea7e56
8SHA1 (patch-ac) = 8b1edf45f4513ce45f8236f6fb76088cec5a5b31 8SHA1 (patch-ac) = 8b1edf45f4513ce45f8236f6fb76088cec5a5b31
9SHA1 (patch-ad) = 0448f23965e537e62d2b2d2e4c4567472cd6f886 9SHA1 (patch-ad) = d64ad4d704fa7757866e162b7eae76a311cfb855
10SHA1 (patch-ae) = a9dfb588fd7a305327b5722d9d33cbca0ad9e2af 10SHA1 (patch-ae) = a9dfb588fd7a305327b5722d9d33cbca0ad9e2af
11SHA1 (patch-af) = 0400752950dc08a127fe599fd718be3718a5419e 11SHA1 (patch-af) = 0400752950dc08a127fe599fd718be3718a5419e
12SHA1 (patch-ag) = 2c46ef8861f8329064d016d65ef94451a3a61017 12SHA1 (patch-ag) = 2c46ef8861f8329064d016d65ef94451a3a61017
13SHA1 (patch-ah) = ffb95e88c988d00ae4dcf4797f7b5c2232c8001a 13SHA1 (patch-ah) = ffb95e88c988d00ae4dcf4797f7b5c2232c8001a
14SHA1 (patch-ai) = 9d3686429ca1c3ab42a3e8d646bd8100cd44687a 14SHA1 (patch-ai) = 9d3686429ca1c3ab42a3e8d646bd8100cd44687a
15SHA1 (patch-aj) = 6f3f85360917394a7fe549aed297e8c1d4341183 15SHA1 (patch-aj) = 6f3f85360917394a7fe549aed297e8c1d4341183
16SHA1 (patch-ak) = 74df21529a38deaedb6463c896e37eea18b2546c 16SHA1 (patch-ak) = 74df21529a38deaedb6463c896e37eea18b2546c
17SHA1 (patch-al) = a8f8dd483ab2529b8fb2e23bfdfae43af86da6e0 17SHA1 (patch-al) = a8f8dd483ab2529b8fb2e23bfdfae43af86da6e0
cvs diff -r1.2 -r1.3 pkgsrc/databases/sqsh/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/databases/sqsh/patches/patch-ad 2004/03/29 03:11:03 1.2
+++ pkgsrc/databases/sqsh/patches/patch-ad 2015/10/14 18:32:54 1.3
@@ -1,23 +1,32 @@ @@ -1,23 +1,32 @@
1$NetBSD: patch-ad,v 1.2 2004/03/29 03:11:03 grant Exp $ 1$NetBSD: patch-ad,v 1.3 2015/10/14 18:32:54 wiz Exp $
2 2
3--- src/sqsh_readline.c.orig Tue Jan 5 21:30:16 1999 3--- src/sqsh_readline.c.orig 2001-11-05 16:05:56.000000000 +0000
4+++ src/sqsh_readline.c Tue May 22 01:03:21 2001 4+++ src/sqsh_readline.c
5@@ -32,17 +32,7 @@ 5@@ -33,17 +33,7 @@
6  6
7 #if defined(USE_READLINE) 7 #if defined(USE_READLINE)
8 #include <readline/readline.h> 8 #include <readline/readline.h>
9- 9-
10-/* 10-/*
11- * Readline history functions - for some reason not all 11- * Readline history functions - for some reason not all
12- * readline installs have history.h available, so we do 12- * readline installs have history.h available, so we do
13- * this. 13- * this.
14- */ 14- */
15-extern void stifle_history(); 15-extern void stifle_history();
16-extern int read_history(); 16-extern int read_history();
17-extern int write_history(); 17-extern int write_history();
18-extern void add_history(); 18-extern void add_history();
19- 19-
20+#include <readline/history.h> 20+#include <readline/history.h>
21 #endif /* USE_READLINE */ 21 #endif /* USE_READLINE */
22  22
23 /*-- Current Version --*/ 23 /*-- Current Version --*/
 24@@ -129,7 +119,7 @@ int sqsh_readline_init()
 25
 26 rl_readline_name = "sqsh" ;
 27 rl_completion_entry_function = (rl_compentry_func_t*)sqsh_completion ;
 28- rl_attempted_completion_function = (CPPFunction*)sqsh_completion ;
 29+ rl_attempted_completion_function = sqsh_completion ;
 30 #endif /* USE_READLINE */
 31
 32 return True ;