From 2993c89c136f7af62dba93309c1b69e10967f7b0 Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Thu, 12 Sep 2002 00:12:48 +0000
Subject: [PATCH] update to freetds-0.60

---
 databases/freetds/Makefile                  |  6 +++---
 databases/freetds/distinfo                  |  6 +++---
 databases/freetds/patches/patch-Makefile_in | 24 +++++++++------------
 databases/freetds/patches/patch-configure   | 17 +++++----------
 databases/freetds/pkg/PFRAG.shared          |  2 +-
 databases/freetds/pkg/PLIST                 |  8 ++++++-
 6 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 03bff42b917..24bc684b1b1 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2002/05/13 18:50:38 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2002/09/12 00:12:48 jcs Exp $
 
-DISTNAME=	freetds-0.53
+DISTNAME=	freetds-0.60
 CATEGORIES=	databases
-NEED_VERSION=	1.503
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index dc322db9894..4dc01dd11ba 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,3 +1,3 @@
-MD5 (freetds-0.53.tgz) = 78586f3db87f53a8097d7665a4d8f892
-RMD160 (freetds-0.53.tgz) = d3319316c6c162e99c53abc1b2d646df657075f7
-SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3
+MD5 (freetds-0.60.tgz) = bf719c9e1a5f8cd080dec6f9664e7f44
+RMD160 (freetds-0.60.tgz) = 28af14dbab995ca564dd39319489ce0139e05ac8
+SHA1 (freetds-0.60.tgz) = f03aa17139ef58648331fe538845a9ee2c162172
diff --git a/databases/freetds/patches/patch-Makefile_in b/databases/freetds/patches/patch-Makefile_in
index 8093e9bc6d8..37ae6d02744 100644
--- a/databases/freetds/patches/patch-Makefile_in
+++ b/databases/freetds/patches/patch-Makefile_in
@@ -1,16 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2001/12/27 02:56:38 jcs Exp $
---- Makefile.in.orig	Wed Dec 26 20:12:09 2001
-+++ Makefile.in	Wed Dec 26 20:13:23 2001
-@@ -85,7 +85,7 @@
- 
- SUBDIRS = include src
- 
--EXTRA_DIST = interfaces freetds.conf samples/debug.c PWD BUGS
-+EXTRA_DIST = freetds.conf samples/debug.c PWD BUGS
- 
- DEFDIR = $(prefix)
- ETC = $(sysconfdir)
-@@ -369,12 +369,6 @@
+$OpenBSD: patch-Makefile_in,v 1.3 2002/09/12 00:12:48 jcs Exp $
+--- Makefile.in.orig	Wed Sep 11 18:46:55 2002
++++ Makefile.in	Wed Sep 11 18:47:37 2002
+@@ -349,17 +349,6 @@
  
  
  install-data-local:
@@ -18,7 +9,12 @@ $OpenBSD: patch-Makefile_in,v 1.2 2001/12/27 02:56:38 jcs Exp $
 -	if [ -f $(ETC)/freetds.conf ]; \
 -	then :; \
 -	else \
--		$(INSTALL_DATA) freetds.conf $(ETC)/freetds.conf; \
+-		$(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
+-	fi
+-	if [ -f $(ETC)/locales.conf ]; \
+-	then :; \
+-	else \
+-		$(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
 -	fi
  
  test:
diff --git a/databases/freetds/patches/patch-configure b/databases/freetds/patches/patch-configure
index 2cc5db86c1f..37d7c8ca472 100644
--- a/databases/freetds/patches/patch-configure
+++ b/databases/freetds/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1 2001/12/27 02:56:38 jcs Exp $
---- configure.orig	Wed Dec 26 20:36:39 2001
-+++ configure	Wed Dec 26 20:37:43 2001
-@@ -5934,11 +5934,13 @@
+$OpenBSD: patch-configure,v 1.2 2002/09/12 00:12:48 jcs Exp $
+--- configure.orig	Wed Sep 11 18:47:55 2002
++++ configure	Wed Sep 11 18:48:19 2002
+@@ -3520,6 +3520,8 @@
  	CFLAGS="$CFLAGS -DIODBC";
  	ODBC_INC=$with_iodbc/include;
  	odbc=true
@@ -9,11 +9,4 @@ $OpenBSD: patch-configure,v 1.1 2001/12/27 02:56:38 jcs Exp $
 +	odbc=false
  fi
  
- # Check whether --with-iodbc or --without-iodbc was given.
--if test "${with_iodbc+set}" = set; then
--  withval="$with_iodbc"
-+if test "${with_unixodbc+set}" = set; then
-+  withval="$with_unixodbc"
-   :
- fi
- 
+ # Check whether --with-unixodbc or --without-unixodbc was given.
diff --git a/databases/freetds/pkg/PFRAG.shared b/databases/freetds/pkg/PFRAG.shared
index 145e12a1494..cb1f44f971d 100644
--- a/databases/freetds/pkg/PFRAG.shared
+++ b/databases/freetds/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/12/27 02:56:38 jcs Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2002/09/12 00:12:48 jcs Exp $
 lib/libct.so.0.0
 lib/libsybdb.so.1.0
 lib/libtds.so.0.0
diff --git a/databases/freetds/pkg/PLIST b/databases/freetds/pkg/PLIST
index f4791114d84..b36c992e0da 100644
--- a/databases/freetds/pkg/PLIST
+++ b/databases/freetds/pkg/PLIST
@@ -1,10 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/12/27 02:56:38 jcs Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/09/12 00:12:48 jcs Exp $
+bin/freebcp
+bin/tsql
 include/bkpublic.h
+include/common.h
 include/cspublic.h
 include/cstypes.h
 include/ctlib.h
 include/ctpublic.h
 include/dblib.h
+include/freebcp.h
 include/sqldb.h
 include/sqlfront.h
 include/sybdb.h
@@ -24,6 +28,8 @@ lib/libtds.a
 lib/libtds.la
 lib/libtdssrv.a
 lib/libtdssrv.la
+man/man1/freebcp.1
+man/man1/tsql.1
 share/examples/freetds/freetds.conf-sample
 %%SHARED%%
 @dirrm share/examples/freetds