From 67d0759552817c37ffbb3d10f3c7f1806da23c27 Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Mon, 16 Feb 2004 18:18:25 +0000
Subject: [PATCH] sync with freetds

---
 databases/p5-sybperl/Makefile                        | 4 ++--
 databases/p5-sybperl/patches/patch-CTlib_Makefile_PL | 4 ++--
 databases/sqsh/Makefile                              | 5 +++--
 databases/sqsh/patches/patch-configure               | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile
index f2a951d070c..1cef2f2a56f 100644
--- a/databases/p5-sybperl/Makefile
+++ b/databases/p5-sybperl/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.11 2004/01/17 15:58:07 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2004/02/16 18:18:43 jcs Exp $
 
 DISTNAME=	sybperl-2.16
-PKGNAME=	p5-${DISTNAME}
+PKGNAME=	p5-${DISTNAME}p0
 CATEGORIES=	databases perl5
 
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/databases/p5-sybperl/patches/patch-CTlib_Makefile_PL b/databases/p5-sybperl/patches/patch-CTlib_Makefile_PL
index 3083f035330..b162a051769 100644
--- a/databases/p5-sybperl/patches/patch-CTlib_Makefile_PL
+++ b/databases/p5-sybperl/patches/patch-CTlib_Makefile_PL
@@ -1,4 +1,4 @@
-$OpenBSD: patch-CTlib_Makefile_PL,v 1.2 2002/10/31 01:32:08 jcs Exp $
+$OpenBSD: patch-CTlib_Makefile_PL,v 1.3 2004/02/16 18:18:43 jcs Exp $
 --- CTlib/Makefile.PL.orig	Tue Oct 22 12:59:28 2002
 +++ CTlib/Makefile.PL	Wed Oct 30 09:17:13 2002
 @@ -51,7 +51,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-CTlib_Makefile_PL,v 1.2 2002/10/31 01:32:08 jcs Exp $
      $inc_string = "-I$SYBASE/include";
      $def_string = "-DCTLIBVS=$CTLIBVS -DSYBPLVER='\"\${VERSION}\"' $$sattr{EXTRA_DEFS}";
 -    $lib_string = "-L$SYBASE/lib -lct -lcs -ltcl -lcomn -lintl -lblk";
-+    $lib_string = "-L$SYBASE/lib -lct -ltds -lintl";
++    $lib_string = "-L$SYBASE/lib -lct -ltds -liconv -lintl";
  
      # Linux uses libsybtcl instead of libtcl to avoid conflicts with tcl/tk
      if(-e "$SYBASE/lib/libsybtcl$Config{lib_ext}" || 
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index bdad1c02c06..5d4878ce2b1 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.9 2003/05/12 18:02:44 sturm Exp $
+# $OpenBSD: Makefile,v 1.10 2004/02/16 18:18:25 jcs Exp $
 
 DISTNAME=	sqsh-2.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	databases shells
 
 PERMIT_PACKAGE_CDROM=	Yes
@@ -16,7 +17,7 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	Joshua Stein <jcs@rt.fm>
 
 MODULES=	gettext
-LIB_DEPENDS=	tds.0,ct.0::databases/freetds
+LIB_DEPENDS=	tds.3,ct.2::databases/freetds
 
 CONFIGURE_STYLE= gnu old
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/autoconf
diff --git a/databases/sqsh/patches/patch-configure b/databases/sqsh/patches/patch-configure
index d1395f8a998..32de1b530fd 100644
--- a/databases/sqsh/patches/patch-configure
+++ b/databases/sqsh/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.2 2001/12/23 23:27:23 jcs Exp $
+$OpenBSD: patch-configure,v 1.3 2004/02/16 18:18:25 jcs Exp $
 --- configure.orig	Sun Dec 23 16:40:32 2001
 +++ configure	Sun Dec 23 16:41:14 2001
 @@ -1209,6 +1209,8 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-configure,v 1.2 2001/12/23 23:27:23 jcs Exp $
  			aix*)
  				SYBASE_OS="-lm";;
 +			openbsd*)
-+				SYBASE_OS="-lm";;
++				SYBASE_OS="-lm -liconv";;
  			*)
  				SYBASE_OS="-lm -ldl";;
  		esac