summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/sqsh/Makefile60
-rw-r--r--databases/sqsh/Makefile.common59
-rw-r--r--databases/sqsh/distinfo16
-rw-r--r--databases/sqsh/patches/patch-aa42
-rw-r--r--databases/sqsh/patches/patch-ab17
-rw-r--r--databases/sqsh/patches/patch-ac6
-rw-r--r--databases/sqsh/patches/patch-ad6
-rw-r--r--databases/sqsh/patches/patch-ae6
-rw-r--r--doc/CHANGES3
9 files changed, 125 insertions, 90 deletions
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 83bab46afaa..bdda868a854 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,59 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/03/29 02:44:30 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/29 03:11:03 grant Exp $
-DISTNAME= sqsh-1.7-src
-PKGNAME= sqsh-1.7
-PKGREVISION= 3
-CATEGORIES= databases
-MASTER_SITES= ${HOMEPAGE}
+PKGNAME= sqsh-2.1
-MAINTAINER= tsarna@NetBSD.org
-HOMEPAGE= http://www.sqsh.org/
-COMMENT= Sybase SQL shell
+CONFLICTS+= sqsh-x11-[0-9]*
-ALL_TARGET= sqsh
-INSTALL_TARGET= install install.man
-
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-readline
-
-# support for the native Sybase Open Client
-BUILD_DEFS+= USE_SYBASE_OPENCLIENT
-BUILD_DEFS+= SYBASE
-.if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo])
-. if defined(SYBASE) && exists(${SYBASE}/lib/libct.so)
-BUILDLINK_PASSTHRU_DIRS=${SYBASE}
-_SYBASE= ${SYBASE}
-. else
-PKG_FAIL_REASON+= "You must define SYBASE to the base directory of Open Client."
-. endif
-.else
-_SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
-MAKE_FLAGS+= SYBASE_LIBS=-lct
-.endif
-
-LDFLAGS+= -Wl,${RPATH_FLAG}${_SYBASE}/lib
-
-CONFIGURE_ENV+= SYBASE="${_SYBASE}"
-CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include"
-CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sqsh ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/man/man1/sqsh.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sqsh
- ${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc ${PREFIX}/share/examples/sqsh
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-. include "../../devel/dlcompat/buildlink2.mk"
-.endif
-
-.if !defined(USE_SYBASE_OPENCLIENT)
-. include "../../databases/freetds/buildlink2.mk"
-.endif
-
-.include "../../devel/readline/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
+.include "Makefile.common"
diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
new file mode 100644
index 00000000000..25a2c2b3689
--- /dev/null
+++ b/databases/sqsh/Makefile.common
@@ -0,0 +1,59 @@
+# $NetBSD: Makefile.common,v 1.1 2004/03/29 03:11:03 grant Exp $
+
+DISTNAME= sqsh-2.1-src
+CATEGORIES= databases
+MASTER_SITES= ${HOMEPAGE}
+
+MAINTAINER= tsarna@NetBSD.org
+HOMEPAGE= http://www.sqsh.org/
+COMMENT= Sybase SQL shell
+
+ALL_TARGET= build
+
+WRKSRC= ${WRKDIR}/${DISTNAME:C|-src||}
+USE_BUILDLINK2= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-readline
+
+CONF_FILES+= ${PREFIX}/share/examples/sqsh/sample.sqshrc ${PKG_SYSCONFDIR}/sqshrc
+
+# support for the native Sybase Open Client
+BUILD_DEFS+= USE_SYBASE_OPENCLIENT
+BUILD_DEFS+= SYBASE
+.if defined(USE_SYBASE_OPENCLIENT) && empty(USE_SYBASE_OPENCLIENT:M[Nn][Oo])
+. if defined(SYBASE) && exists(${SYBASE}/lib/libct.so)
+BUILDLINK_PASSTHRU_DIRS=${SYBASE}
+_SYBASE= ${SYBASE}
+. else
+PKG_FAIL_REASON+= "You must define SYBASE to the base directory of Open Client."
+. endif
+.else
+_SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds
+CONFIGURE_ENV+= SYBASE_LIBS=-lct
+MAKE_FLAGS+= SYBASE_LIBS=-lct
+.endif
+
+LDFLAGS+= -Wl,${RPATH_FLAG}${_SYBASE}/lib
+CONFIGURE_ENV+= SYBASE="${_SYBASE}"
+CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include"
+CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib"
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${PREFIX}/man/man1/sqsh.1
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sqsh
+ ${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc ${PREFIX}/share/examples/sqsh
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+. include "../../devel/dlcompat/buildlink2.mk"
+.endif
+
+.if !defined(USE_SYBASE_OPENCLIENT)
+. include "../../databases/freetds/buildlink2.mk"
+.endif
+
+.include "../../devel/readline/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo
index 3f6bc188719..68a274529b0 100644
--- a/databases/sqsh/distinfo
+++ b/databases/sqsh/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/03/29 01:50:39 grant Exp $
+$NetBSD: distinfo,v 1.6 2004/03/29 03:11:03 grant Exp $
-SHA1 (sqsh-1.7-src.tar.gz) = 8526cced3350024ef262a0a572d2822c6059159c
-Size (sqsh-1.7-src.tar.gz) = 296618 bytes
-SHA1 (patch-aa) = e9f0669a15db33327364ba5bef818222954bb0da
-SHA1 (patch-ab) = b46405fbe1b97dcd8d019cd5f89922552e12b175
-SHA1 (patch-ac) = d86ad97113bc8521764ed5b6898ab524a0079285
-SHA1 (patch-ad) = 435a1abadf38e63bf97c9c872e6664fee1729368
-SHA1 (patch-ae) = 6d4e9374336059026dea53d81e8f7898202cb9dd
+SHA1 (sqsh-2.1-src.tar.gz) = 7bbdda5590262e465508c889b86107465f3a2b90
+Size (sqsh-2.1-src.tar.gz) = 358874 bytes
+SHA1 (patch-aa) = 9d7dae1b650839229ec007ba68fad0a2824d2e1e
+SHA1 (patch-ab) = 1b2617e9b4f426780aac5989da21c2d5ddea7e56
+SHA1 (patch-ac) = 8b1edf45f4513ce45f8236f6fb76088cec5a5b31
+SHA1 (patch-ad) = 0448f23965e537e62d2b2d2e4c4567472cd6f886
+SHA1 (patch-ae) = a9dfb588fd7a305327b5722d9d33cbca0ad9e2af
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)
diff --git a/doc/CHANGES b/doc/CHANGES
index cee3c47268d..407590295ce 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5338 2004/03/29 02:48:39 perry Exp $
+$NetBSD: CHANGES,v 1.5339 2004/03/29 03:17:53 grant Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1566,3 +1566,4 @@ Changes to the packages collection and infrastructure in 2004:
Updated sqsh to 1.7nb3 [grant 2004-03-29]
Updated metamail to 2.7nb4 [snj 2004-03-29]
Updated clisp to 2.33 [perry 2004-03-29]
+ Updated sqsh to 2.1 [grant 2004-03-29]
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 09:35:26 +0000