diff options
author | grant <grant> | 2004-03-29 03:11:03 +0000 |
---|---|---|
committer | grant <grant> | 2004-03-29 03:11:03 +0000 |
commit | e5f7b030208b8ce44bded4190c09611320c9d0f1 (patch) | |
tree | 87570d0207c306cd6b32f97255d1cd870b4b1e0b /databases/sqsh/patches | |
parent | 8a14cbeecab31366159852eebeee2f2ac7107e82 (diff) | |
download | pkgsrc-e5f7b030208b8ce44bded4190c09611320c9d0f1.tar.gz |
Updated sqsh to 2.1.
pkg related changes: honour PKG_SYSCONFDIR for sqshrc.
Major changes since 1.7:
* New build system/directory structure. Should build against ASE
12.0 and FreeTDS now.
* Added support for varchar2() and varbinary2() for ASE 12.5 (I
don't have a 12.5 instance to test against yet though).
* Added \if command to perform conditional execution. Please read
the manual carefully on how expressions work.
* Added \while command to perform basic looping conditional
expressions.
* Added \break command to break out of current loop
* Added \for command to perform basic iteration.
* Added \do command to allow the exection of a sqsh script block
once per row returned from statement. Also new #[0-9] variables
may be used to refer to column names in result set. Also note
that \do allows flags -U, -S, -P for execution of statements on
other server or as other users.
* Added \func command to create a sqsh function for later
execution. Also, now ${[0-9]} now refer to the parameters to
this function when it is called. Note that by passing -x to
\func, the function will be exported as a full sqsh command, and
can be called directly without calling \call.
* Added \return to return from current function.
* Obviously, added \call to call sqsh function.
* New variable $? contains: - Return status of command executed on
pipe '|' - Return status of expression evaluated for \while or
\if. - Last server error number of severity > 10 (@@error). This
is useful for flow-of-control using the new conditional
statements.
* Added a directory of handy filter scripts.
* Fixed \rpc command with @variable names.
* \exit now exits sqsh, no matter how many \loop nesting levels
you are in.
* The user will now be re-prompted to enter a password if a "Login
failed." message is received from the server. This may be
disabled using the new $password_retry variable.
* Got rid of error message about ct_exit() not being called.
* Created new 'make distrib' option to build a self-contained sqsh
binary distribution.
* $rcfile and $SQSHRC may now be colon delimited lists of sqshrc
files. This allows for system-wide rc files to be loaded first
before local files. Also, the default $SQSHRC setting is now
"/usr/local/etc/sqshrc:$HOME/.sqshrc" (the /usr/local will be
automatically replaced by the contents of --prefix when passed
to configure).
* Fixed -C.
* $SQSHRC no longer needs to be writable.
* sqsh no longer pays attention to quotes inside of comments
during variable expansion.
* Fixed bcp'ing of results from stored procedures.
* libsybtcl will now be chosen if available.
* 'exact' mode keyword expansion should now work better (thanks to
Sean Woolcock.
* Added $bcp_colsep and $bcp_rowsep configuration variables to
control the separators used during "go -m bcp".
* Added $bcp_trim to configure whether or not trailing spaces are
trimmed in the bcp output.
* Fixed segfault in "pretty" display mode.
Diffstat (limited to 'databases/sqsh/patches')
-rw-r--r-- | databases/sqsh/patches/patch-aa | 42 | ||||
-rw-r--r-- | databases/sqsh/patches/patch-ab | 17 | ||||
-rw-r--r-- | databases/sqsh/patches/patch-ac | 6 | ||||
-rw-r--r-- | databases/sqsh/patches/patch-ad | 6 | ||||
-rw-r--r-- | databases/sqsh/patches/patch-ae | 6 |
5 files changed, 52 insertions, 25 deletions
diff --git a/databases/sqsh/patches/patch-aa b/databases/sqsh/patches/patch-aa index 5afc14eb8e5..d5aae7d2d20 100644 --- a/databases/sqsh/patches/patch-aa +++ b/databases/sqsh/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.4 2004/03/29 01:50:39 grant Exp $ +$NetBSD: patch-aa,v 1.5 2004/03/29 03:11:03 grant Exp $ ---- configure.orig 1999-01-06 13:33:39.000000000 +1100 +--- configure.orig 2001-11-10 00:58:04.000000000 +1100 +++ configure -@@ -1146,6 +1146,8 @@ echo "configure:1127: checking Open Clie - SYBASE_OS="-lm -ldl -ldgc";; - aix*) - SYBASE_OS="-lm";; -+ netbsd*) -+ SYBASE_OS="-lm";; - *) - SYBASE_OS="-lm -ldl";; - esac -@@ -1301,7 +1303,7 @@ else +@@ -1209,6 +1209,8 @@ echo "configure:1191: checking Open Clie + SYBASE_OS="-lm -ldl -ldgc";; + aix*) + SYBASE_OS="-lm";; ++ netbsd*) ++ SYBASE_OS="-lm";; + *) + SYBASE_OS="-lm -ldl";; + esac +@@ -1373,7 +1375,7 @@ else CPPFLAGS="${CPPFLAGS} -L${READLINE_LIBDIR}" fi @@ -20,3 +20,21 @@ $NetBSD: patch-aa,v 1.4 2004/03/29 01:50:39 grant Exp $ "-ltermcap -lucb" do LIBS="${ORIG_LIBS} -lreadline ${lib}" +@@ -1459,7 +1461,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lreadline "${READLINE_LIBS}" $LIBS" ++LIBS="-lreadline ${READLINE_LIBS} $LIBS" + cat > conftest.$ac_ext <<EOF + #line 1465 "configure" + #include "confdefs.h" +@@ -1493,7 +1495,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + #define $ac_tr_lib 1 + EOF + +- LIBS="-lreadline $LIBS" ++ LIBS="-lreadline ${READLINE_LIBS} $LIBS" + + else + echo "$ac_t""no" 1>&6 diff --git a/databases/sqsh/patches/patch-ab b/databases/sqsh/patches/patch-ab index 33b5c46f662..a6b77d39fb3 100644 --- a/databases/sqsh/patches/patch-ab +++ b/databases/sqsh/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2001/06/09 15:01:58 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2004/03/29 03:11:03 grant Exp $ ---- Makefile.in.orig Tue Jan 5 21:38:41 1999 -+++ Makefile.in Tue May 22 00:58:22 2001 -@@ -157,7 +157,7 @@ +--- src/Makefile.in.orig 2001-10-24 06:31:06.000000000 +1000 ++++ src/Makefile.in +@@ -7,7 +7,7 @@ + # common directory. If you don't want a global sqshrc just comment + # out SQSHRC_GLOBAL, below. + +-SQSHRC_GLOBAL = @prefix@/etc/sqshrc ++SQSHRC_GLOBAL = $(PKG_SYSCONFDIR)/sqshrc + SQSHRC_PATH = "$(SQSHRC_GLOBAL):$${HOME}/.sqshrc" + + # The following variables are configurable by the user. Typically +@@ -165,7 +165,7 @@ INCLUDE_DIRS = $(X_INCDIR) $(MOTIF_INC LIB_DIRS = $(X_LIBDIR) $(MOTIF_INCDIR) $(SYBASE_LIBDIR) $(READLINE_LIBDIR) CFLAGS = @CFLAGS@ $(DEBUG) $(DEFINES) $(INCLUDE_DIRS) CPPFLAGS = @CPPFLAGS@ diff --git a/databases/sqsh/patches/patch-ac b/databases/sqsh/patches/patch-ac index 204f681e086..1c0fb23bc53 100644 --- a/databases/sqsh/patches/patch-ac +++ b/databases/sqsh/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2001/05/22 05:28:24 jlam Exp $ +$NetBSD: patch-ac,v 1.2 2004/03/29 03:11:03 grant Exp $ ---- sqsh_buf.c.orig Tue Jan 5 21:25:26 1999 -+++ sqsh_buf.c Tue May 22 01:04:48 2001 +--- src/sqsh_buf.c.orig Tue Jan 5 21:25:26 1999 ++++ src/sqsh_buf.c Tue May 22 01:04:48 2001 @@ -37,7 +37,7 @@ #if defined(USE_READLINE) diff --git a/databases/sqsh/patches/patch-ad b/databases/sqsh/patches/patch-ad index 1a2808cb181..73d192edf14 100644 --- a/databases/sqsh/patches/patch-ad +++ b/databases/sqsh/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 2001/05/22 05:28:24 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2004/03/29 03:11:03 grant Exp $ ---- sqsh_readline.c.orig Tue Jan 5 21:30:16 1999 -+++ sqsh_readline.c Tue May 22 01:03:21 2001 +--- src/sqsh_readline.c.orig Tue Jan 5 21:30:16 1999 ++++ src/sqsh_readline.c Tue May 22 01:03:21 2001 @@ -32,17 +32,7 @@ #if defined(USE_READLINE) diff --git a/databases/sqsh/patches/patch-ae b/databases/sqsh/patches/patch-ae index 2d160d8d2af..0182056450e 100644 --- a/databases/sqsh/patches/patch-ae +++ b/databases/sqsh/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.1 2001/05/22 05:28:24 jlam Exp $ +$NetBSD: patch-ae,v 1.2 2004/03/29 03:11:03 grant Exp $ ---- var_readline.c.orig Tue Jan 5 21:32:33 1999 -+++ var_readline.c Tue May 22 01:06:13 2001 +--- src/var_readline.c.orig Tue Jan 5 21:32:33 1999 ++++ src/var_readline.c Tue May 22 01:06:13 2001 @@ -31,8 +31,7 @@ #if defined(USE_READLINE) |