Update to freetds-0.60.

Changes since 0.53 include:

*  Much improved support for Microsoft servers, including SQL Server 2000
   datatypes and domain logins.

*  Support and convertibility of all major datatypes.

*  Much expanded coverage of the ODBC API.

*  An all-new BCP implementation, including host variable support.

*  Character set conversions, via the iconv library.

*  Threadsafe operation.

6 files changed, 41 insertions, 30 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 141aaae186c..e1ee0fe76e9 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/10/12 09:40:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/26 18:45:28 grant Exp $
 
-DISTNAME=	freetds-0.53
+DISTNAME=	freetds-0.60
 CATEGORIES=	databases
-PKGREVISION=	2
 MASTER_SITES=	ftp://ftp.metalab.unc.edu/pub/Linux/ALPHA/freetds/
 EXTRACT_SUFX=	.tgz
 
@@ -24,10 +23,12 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 EGDIR=		${PREFIX}/share/examples/freetds
 CONF_FILES=	${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf
+CONF_FILES+=	${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/locales.conf ${EGDIR}
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index d97fce1c96c..41aa4037644 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/10/26 18:45:29 grant Exp $
+freetds/bin/freebcp
+freetds/bin/tsql
 freetds/include/bkpublic.h
 freetds/include/common.h
 freetds/include/cspublic.h
@@ -6,6 +8,7 @@ freetds/include/cstypes.h
 freetds/include/ctlib.h
 freetds/include/ctpublic.h
 freetds/include/dblib.h
+freetds/include/freebcp.h
 freetds/include/sqldb.h
 freetds/include/sqlfront.h
 freetds/include/sybdb.h
@@ -37,8 +40,14 @@ freetds/lib/libtdssrv.la
 freetds/lib/libtdssrv.so
 freetds/lib/libtdssrv.so.0
 freetds/lib/libtdssrv.so.0.0
+freetds/man/man1/freebcp.1
+freetds/man/man1/tsql.1
 share/examples/freetds/freetds.conf
+share/examples/freetds/locales.conf
 @dirrm share/examples/freetds
+@dirrm freetds/man/man1
+@dirrm freetds/man
 @dirrm freetds/lib
 @dirrm freetds/include
+@dirrm freetds/bin
 @dirrm freetds
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index f7fb7edc17f..bf49574d1e6 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/10/12 09:40:00 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/10/26 18:45:29 grant Exp $
 
-SHA1 (freetds-0.53.tgz) = 7ae8e843ad91c357e9fa91e28176775737584af3
-Size (freetds-0.53.tgz) = 312692 bytes
-SHA1 (patch-aa) = 4eb859650620c4d9edadc2c684154745143ad003
-SHA1 (patch-ab) = 3a38adc60fe73fe6070b59ddafc75b5199879b28
-SHA1 (patch-ac) = ff176b465e5d6b41e2ad7c90547d0229c151a0c8
+SHA1 (freetds-0.60.tgz) = f03aa17139ef58648331fe538845a9ee2c162172
+Size (freetds-0.60.tgz) = 594441 bytes
+SHA1 (patch-aa) = 628505d50bc90bb832619cc553222314956415d4
+SHA1 (patch-ab) = e973eb81fd88e1638a8ed23840a89dad2926a745
+SHA1 (patch-ac) = 41eadee6f5f29ca1840c9d0dd84437de1db46c7c
diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa
index 2cdc96dd329..09be38b2107 100644
--- a/databases/freetds/patches/patch-aa
+++ b/databases/freetds/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 19:22:06 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/10/26 18:45:29 grant Exp $
 
---- Makefile.in.orig	Sun Dec 16 10:40:25 2001
+--- Makefile.in.orig	Thu Sep 12 02:35:50 2002
 +++ Makefile.in
-@@ -369,12 +369,7 @@
+@@ -349,17 +349,7 @@ maintainer-clean-generic clean mostlycle
  
  
  install-data-local:
@@ -10,7 +10,12 @@ $NetBSD: patch-aa,v 1.2 2002/08/25 19:22:06 jlam 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
 +	$(mkinstalldirs) $(DEFDIR)
  
diff --git a/databases/freetds/patches/patch-ab b/databases/freetds/patches/patch-ab
index 0b20808635f..f2c7ada70d9 100644
--- a/databases/freetds/patches/patch-ab
+++ b/databases/freetds/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2002/10/12 09:40:01 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/26 18:45:29 grant Exp $
 
---- src/ctlib/Makefile.am.orig	Sat Oct 12 10:55:48 2002
+--- src/ctlib/Makefile.am.orig	Sun Aug 18 00:34:31 2002
 +++ src/ctlib/Makefile.am
-@@ -7,3 +7,4 @@ libct_la_SOURCES=	ct.c cs.c blk.c ctutil
- libct_la_LIBADD	=	$(patsubst %, $(TDSDIR)/%, \
- 				$(patsubst %.c, %.lo, $(TDSSOURCES)))
+@@ -6,3 +6,4 @@ lib_LTLIBRARIES	=	libct.la
+ libct_la_SOURCES=	ct.c cs.c blk.c ctutil.c
+ libct_la_LIBADD	=	$(TDSOBJECTS) $(NETWORK_LIBS) $(LIBICONV)
  INCLUDES	=	-I$(top_srcdir)/include
 +LIBS		=	@LIBICONV@
diff --git a/databases/freetds/patches/patch-ac b/databases/freetds/patches/patch-ac
index 837b6f37694..78b2e9e4f26 100644
--- a/databases/freetds/patches/patch-ac
+++ b/databases/freetds/patches/patch-ac
@@ -1,24 +1,20 @@
-$NetBSD: patch-ac,v 1.1 2002/10/12 09:40:01 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2002/10/26 18:45:29 grant Exp $
 
---- src/ctlib/Makefile.in.orig	Sat Oct 12 10:29:55 2002
+--- src/ctlib/Makefile.in.orig	Thu Sep 12 02:35:51 2002
 +++ src/ctlib/Makefile.in
-@@ -89,10 +89,11 @@ TDSDIR = ../tds
- TDSSOURCES = mem.c token.c util.c login.c read.c write.c convert.c numeric.c config.c query.c iconv.c
- lib_LTLIBRARIES = libct.la
+@@ -96,6 +96,7 @@ lib_LTLIBRARIES = libct.la
  libct_la_SOURCES = ct.c cs.c blk.c ctutil.c
- libct_la_LIBADD = $(patsubst %, $(TDSDIR)/%, \
- 				$(patsubst %.c, %.lo, $(TDSSOURCES)))
- 
+ libct_la_LIBADD = $(TDSOBJECTS) $(NETWORK_LIBS) $(LIBICONV)
  INCLUDES = -I$(top_srcdir)/include
 +LIBS = @LIBICONV@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../include/config.h
  CONFIG_CLEAN_FILES = 
-@@ -102,7 +102,6 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
+@@ -105,7 +106,6 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
  DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
  libct_la_LDFLAGS = 
- libct_la_DEPENDENCIES =  $(patsubst %, $(TDSDIR)/%, $(patsubst %.c, \
- %.lo, $(TDSSOURCES)))
+ libct_la_DEPENDENCIES =  $(TDSDIR)/mem.lo $(TDSDIR)/token.lo \
+ $(TDSDIR)/util.lo $(TDSDIR)/login.lo $(TDSDIR)/read.lo \