Use editline readline emulation when available. Also install the man page

for sqsh.

8 files changed, 92 insertions, 37 deletions

diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 66ad6ada584..e01fa196feb 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/04/04 14:04:36 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/22 05:28:23 jlam Exp $
 
 DISTNAME=	sqsh-1.7-src
 PKGNAME=	sqsh-1.7
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	databases
 MASTER_SITES=	http://www.voicenet.com/~gray/
 
@@ -10,16 +11,23 @@ HOMEPAGE=	http://www.voicenet.com/~gray/sqsh.html
 COMMENT=	Sybase SQL shell
 
 DEPENDS+=       freetds>=0.50:../../databases/freetds
-DEPENDS+=       readline>=4.0:../../devel/readline
 
 ALL_TARGET=	sqsh
+INSTALL_TARGET=	install install.man
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ENV+=		INCDIRS="${PREFIX}/include" \
-			LIBDIRS="${PREFIX}/lib" \
-			SYBASE="${PREFIX}/freetds"
+CONFIGURE_ENV+=		SYBASE="${SYBASE}"
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+SYBASE=			${PREFIX}/freetds
+LDFLAGS+=		-Wl,-R${SYBASE}/lib
+
+.include "../../devel/readline/Makefile.readline"
+
+LDFLAGS+=		-L${WRKLIBDIR}
+CONFIGURE_ENV+=		INCDIRS="${WRKINCDIR}"
+CONFIGURE_ENV+=		LIBDIRS="${WRKLIBDIR}"
+
+pre-configure: link-readline-headers link-readline-libs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo
index 4178dc83fb9..2037b3323e7 100644
--- a/databases/sqsh/distinfo
+++ b/databases/sqsh/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:05 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/22 05:28:23 jlam Exp $
 
 SHA1 (sqsh-1.7-src.tar.gz) = 8526cced3350024ef262a0a572d2822c6059159c
 Size (sqsh-1.7-src.tar.gz) = 296618 bytes
-SHA1 (patch-aa) = 7e77466ff759f95676375b844dc850a08ee7de61
+SHA1 (patch-aa) = d17732cee36c9af5cdced2d6da6ff362deeb7bbb
+SHA1 (patch-ab) = 15a11b0063dc8dec57028cf4da9e51a3ea9b28bd
+SHA1 (patch-ac) = d86ad97113bc8521764ed5b6898ab524a0079285
+SHA1 (patch-ad) = 435a1abadf38e63bf97c9c872e6664fee1729368
+SHA1 (patch-ae) = 6d4e9374336059026dea53d81e8f7898202cb9dd
diff --git a/databases/sqsh/patches/patch-aa b/databases/sqsh/patches/patch-aa
index aa42fb18766..30c12668d69 100644
--- a/databases/sqsh/patches/patch-aa
+++ b/databases/sqsh/patches/patch-aa
@@ -1,16 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/16 01:07:05 tsarna Exp $
-
 --- configure.orig	Tue Jan  5 21:33:39 1999
-+++ configure	Fri May 12 22:48:38 2000
-@@ -1088,14 +1088,14 @@
- 	then
- 		SYBASE_LIBDIR='-L$(SYBASE)/devlib'
- 	else
--		SYBASE_LIBDIR='-L$(SYBASE)/lib'
-+		SYBASE_LIBDIR='-L$(SYBASE)/lib -R$(SYBASE)/lib'
- 	fi
- 
- 	#
++++ configure	Tue May 22 00:50:38 2001
+@@ -1095,7 +1095,7 @@
  	# The basic client libraries that are always needed
  	# on all platforms.
  	#
@@ -28,21 +18,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/05/16 01:07:05 tsarna Exp $
  		*)
  			SYBASE_OS="-lm -ldl";;
  	esac
-@@ -1298,7 +1300,7 @@
+@@ -1301,7 +1303,7 @@
+ 			CPPFLAGS="${CPPFLAGS} -L${READLINE_LIBDIR}"
  		fi
  
- 		if test "${READLINE_LIBDIR}" != ""; then
--			CPPFLAGS="${CPPFLAGS} -L${READLINE_LIBDIR}"
-+			CPPFLAGS="${CPPFLAGS} -L${READLINE_LIBDIR} -R${READLINE_LIBDIR}"
- 		fi
- 
- 		for lib in "-lHcurses" "-lcurses" "-lncurses" "-ltermcap" \
-@@ -1373,7 +1375,7 @@
- 		then
- 			READLINE_LIBDIR="# -L${READLINE_LIBDIR}"
- 		else
--			READLINE_LIBDIR="-L${READLINE_LIBDIR}"
-+			READLINE_LIBDIR="-L${READLINE_LIBDIR} -R${READLINE_LIBDIR}"
- 		fi
- 	fi
- fi
+-		for lib in "-lHcurses" "-lcurses" "-lncurses" "-ltermcap" \
++		for lib in "-ltermcap" "-lHcurses" "-lcurses" "-lncurses" \
+ 			"-ltermcap -lucb"
+ 		do
+ 			LIBS="${ORIG_LIBS} -lreadline ${lib}"
diff --git a/databases/sqsh/patches/patch-ab b/databases/sqsh/patches/patch-ab
new file mode 100644
index 00000000000..a99f7d82139
--- /dev/null
+++ b/databases/sqsh/patches/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Jan  5 21:38:41 1999
++++ Makefile.in	Tue May 22 00:58:22 2001
+@@ -157,7 +157,7 @@
+ LIB_DIRS       = $(X_LIBDIR) $(MOTIF_INCDIR) $(SYBASE_LIBDIR) $(READLINE_LIBDIR)
+ CFLAGS         = @CFLAGS@ $(DEBUG) $(DEFINES) $(INCLUDE_DIRS)
+ CPPFLAGS       = @CPPFLAGS@
+-LDFLAGS        = $(DEBUG) $(LIB_DIRS)
++LDFLAGS        = @LDFLAGS@ $(DEBUG) $(LIB_DIRS)
+ LIBS           = $(SYBASE_LIBS) $(X_LIBS) $(READLINE_LIBS) @LIBS@
+ 
+ # The follow define information about the components that make up
diff --git a/databases/sqsh/patches/patch-ac b/databases/sqsh/patches/patch-ac
new file mode 100644
index 00000000000..204f681e086
--- /dev/null
+++ b/databases/sqsh/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/05/22 05:28:24 jlam Exp $
+
+--- sqsh_buf.c.orig	Tue Jan  5 21:25:26 1999
++++ sqsh_buf.c	Tue May 22 01:04:48 2001
+@@ -37,7 +37,7 @@
+ 
+ #if defined(USE_READLINE)
+ #include <readline/readline.h>
+-extern void add_history();
++#include <readline/history.h>
+ #endif /* USE_READLINE */
+ 
+ /*
diff --git a/databases/sqsh/patches/patch-ad b/databases/sqsh/patches/patch-ad
new file mode 100644
index 00000000000..1a2808cb181
--- /dev/null
+++ b/databases/sqsh/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2001/05/22 05:28:24 jlam Exp $
+
+--- sqsh_readline.c.orig	Tue Jan  5 21:30:16 1999
++++ sqsh_readline.c	Tue May 22 01:03:21 2001
+@@ -32,17 +32,7 @@
+ 
+ #if defined(USE_READLINE)
+ #include <readline/readline.h>
+-
+-/*
+- * Readline history functions - for some reason not all
+- * readline installs have history.h available, so we do
+- * this.
+- */
+-extern void stifle_history();
+-extern int read_history();
+-extern int write_history();
+-extern void add_history();
+-
++#include <readline/history.h>
+ #endif /* USE_READLINE */
+ 
+ /*-- Current Version --*/
diff --git a/databases/sqsh/patches/patch-ae b/databases/sqsh/patches/patch-ae
new file mode 100644
index 00000000000..2d160d8d2af
--- /dev/null
+++ b/databases/sqsh/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2001/05/22 05:28:24 jlam Exp $
+
+--- var_readline.c.orig	Tue Jan  5 21:32:33 1999
++++ var_readline.c	Tue May 22 01:06:13 2001
+@@ -31,8 +31,7 @@
+ 
+ #if defined(USE_READLINE)
+ #include <readline/readline.h>
+-extern void stifle_history();
+-extern void unstifle_history();
++#include <readline/history.h>
+ #endif
+ 
+ /*-- Current Version --*/
diff --git a/databases/sqsh/pkg/PLIST b/databases/sqsh/pkg/PLIST
index f1bdb2813f5..7ee7d013668 100644
--- a/databases/sqsh/pkg/PLIST
+++ b/databases/sqsh/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/16 01:07:05 tsarna Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/22 05:28:24 jlam Exp $
 bin/sqsh
+man/man1/sqsh.1