From 26c59a87d0c0a2ff9352fe95022b727e321e2855 Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Tue, 15 Oct 2002 13:18:00 +0000
Subject: Reset maintainership to ports, due to the original author's timeout
 (the previous timeout also noted in the cvs-log -- 2 years ago). Upgrade to
 the latest sqsh-2.1. Build with readline and motif, unless WITHOUT_X11 is set
 (plain --with-x results in a rather hard to use X support, author recommend
 Motif too).

Remove the bogus dependency on gettext introduced in Makefile
version 1.2 -- the (unpatched) software will, indeed, link with
libintl, if present -- mistaking it for Sybase OpenClient's
libintl.

Install the system-wide sqshrc as ${PREFIX}/etc/sqshrc.default,
and allow for another system-wide ${PREFIX}/etc/sqshrc to
overwrite some or all of the default settings.

PR:	ports/40374	(readline and X/Motif)
---
 databases/sqsh/files/patch-ab | 59 +++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

(limited to 'databases/sqsh/files/patch-ab')

diff --git a/databases/sqsh/files/patch-ab b/databases/sqsh/files/patch-ab
index 22a94a72dc91..5fd2c7716bae 100644
--- a/databases/sqsh/files/patch-ab
+++ b/databases/sqsh/files/patch-ab
@@ -1,32 +1,35 @@
---- configure.orig	Fri Jan 14 14:09:13 2000
-+++ configure	Fri Jan 14 14:13:12 2000
-@@ -1047,7 +1047,10 @@
+--- configure	Fri Nov  9 14:58:04 2001
++++ configure	Tue Oct 15 13:51:29 2002
+@@ -1106,4 +1106,8 @@
+ 		SYBASE_LIBS=
  
- #
- #  Is $SYBASE defined?
--#
-+#  -- it should have some defaults...
-+
-+SYBASE=%%LOCALBASE%%/
-+
- echo $ac_n "checking Open Client installation""... $ac_c" 1>&6
- echo "configure:1053: checking Open Client installation" >&5
++		if test "$SYBASE_VERSION" = "FreeTDS"
++		then
++			SYBASE_LIBS="-lct -ltds"
++		else
+ 		#
+ 		# Check for -lblk
+@@ -1152,9 +1156,4 @@
+ 		fi
  
-@@ -1095,7 +1098,7 @@
- 	# The basic client libraries that are always needed
- 	# on all platforms.
- 	#
--	SYBASE_LIBS="-lblk -lcs -lct -lcomn -ltcl -lintl"
-+	SYBASE_LIBS="-lct -liconv -lintl"
+-		#
+-		# Check for -ltds (FreeTDS project)
+-		#
+-		if test -f $SYBASE_LIBDIR/libtds.a; then
+-			SYBASE_LIBS="$SYBASE_LIBS -ltds"
+ 		fi
  
- 	MAJOR_VERSION=`echo $SYBASE_VERSION | cut -d '.' -f 1`
+@@ -1196,5 +1195,5 @@
+ 			ncr*)
+ 				SYBASE_OS="-ldl -lm";;
+-			sunos*)
++			sunos*|*bsd*)
+ 				SYBASE_OS="-lm";;
+ 			solaris*)
+@@ -2691,5 +2690,5 @@
+ cat >> $CONFIG_STATUS <<EOF
  
-@@ -1128,6 +1131,8 @@
- 	case "${host_os}" in
- 		linux*)
- 			SYBASE_OS="-ldl -lm";;
-+		freebsd*)
-+			SYBASE_OS="-lm";;
- 		irix*)
- 			SYBASE_OS="-lnsl -lm";;
- 		ncr*)
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile scripts/install.sh scripts/make_wrapper.sh"}
++CONFIG_FILES=\${CONFIG_FILES-"Makefile src/Makefile scripts/install.sh scripts/make_wrapper.sh doc/global.sqshrc"}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
-- 
cgit v1.2.3