Update to 0.61, based on 21395 by MLH, but with the PKG_SYSCONFDIR

patches intact.
Changes since 0.60:
* Jan 2003
- Version 0.61
- Dynamic SQL
- Output parameters
- Compute rows
- Varbinary support
- dsn-less ODBC connections
- RPC support (db-lib)
- Compatibility with DBD::Sybase 0.95
- 68 new functions!  (see doc/api_status.txt)
- Error/message handling rewritten, uses real error numbers
- new sample programs
- much cleaner code, warning-free compiles
- namespace cleanup
- public domain versions of functions for OSs that lack them
- autoconf portability improvements
- builds in HP-UX, Win32, and cygwin
- No dependency on OpenSSL

7 files changed, 47 insertions, 66 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index b3a013186ba..f471537d59c 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:10 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/06/11 13:24:09 wiz Exp $
 
-DISTNAME=	freetds-0.60
+DISTNAME=	freetds-0.61
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.metalab.unc.edu/pub/Linux/ALPHA/freetds/
+MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
@@ -25,11 +25,13 @@ 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
+CONF_FILES+=	${EGDIR}/pool.conf ${PKG_SYSCONFDIR}/pool.conf
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/freetds.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/locales.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/pool/pool.conf ${EGDIR}
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index 41aa4037644..2369d6596e0 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,49 +1,48 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/26 18:45:29 grant Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/06/11 13:24:09 wiz Exp $
 freetds/bin/freebcp
+freetds/bin/tdspool
 freetds/bin/tsql
 freetds/include/bkpublic.h
-freetds/include/common.h
 freetds/include/cspublic.h
 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
 freetds/include/syberror.h
 freetds/include/sybfront.h
 freetds/include/tds.h
-freetds/include/tds_configs.h
+freetds/include/tds_sysdep_public.h
 freetds/include/tdsconvert.h
-freetds/include/tdsodbc.h
-freetds/include/tdsutil.h
+freetds/include/tdssrv.h
 freetds/include/tdsver.h
 freetds/lib/libct.a
 freetds/lib/libct.la
 freetds/lib/libct.so
-freetds/lib/libct.so.0
-freetds/lib/libct.so.0.0
+freetds/lib/libct.so.1
+freetds/lib/libct.so.1.0
 freetds/lib/libsybdb.a
 freetds/lib/libsybdb.la
 freetds/lib/libsybdb.so
-freetds/lib/libsybdb.so.1
-freetds/lib/libsybdb.so.1.0
+freetds/lib/libsybdb.so.3
+freetds/lib/libsybdb.so.3.0
 freetds/lib/libtds.a
 freetds/lib/libtds.la
 freetds/lib/libtds.so
-freetds/lib/libtds.so.0
-freetds/lib/libtds.so.0.0
+freetds/lib/libtds.so.2
+freetds/lib/libtds.so.2.0
 freetds/lib/libtdssrv.a
 freetds/lib/libtdssrv.la
 freetds/lib/libtdssrv.so
-freetds/lib/libtdssrv.so.0
-freetds/lib/libtdssrv.so.0.0
+freetds/lib/libtdssrv.so.1
+freetds/lib/libtdssrv.so.1.0
 freetds/man/man1/freebcp.1
 freetds/man/man1/tsql.1
 share/examples/freetds/freetds.conf
 share/examples/freetds/locales.conf
+share/examples/freetds/pool.conf
 @dirrm share/examples/freetds
 @dirrm freetds/man/man1
 @dirrm freetds/man
diff --git a/databases/freetds/buildlink2.mk b/databases/freetds/buildlink2.mk
index 2fcb8970c13..514bee198bf 100644
--- a/databases/freetds/buildlink2.mk
+++ b/databases/freetds/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/03/14 19:37:33 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/06/11 13:24:09 wiz Exp $
 
 .if !defined(FREETDS_BUILDLINK2_MK)
 FREETDS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		freetds
-BUILDLINK_DEPENDS.freetds?=	freetds>=0.53nb2
+BUILDLINK_DEPENDS.freetds?=		freetds>=0.61
 BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.freetds=freetds
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index bf49574d1e6..9b2a8b08e9f 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2002/10/26 18:45:29 grant Exp $
+$NetBSD: distinfo,v 1.8 2003/06/11 13:24:09 wiz Exp $
 
-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
+SHA1 (freetds-0.61.tgz) = 3b86f6cf08775ec1f36b2ead289638bcbb273f70
+Size (freetds-0.61.tgz) = 746519 bytes
+SHA1 (patch-aa) = e0f358dec17b9735686bc7859312497de2908624
+SHA1 (patch-ab) = 6634d7358481d8a89cdf1112c7e1173b4206d448
diff --git a/databases/freetds/patches/patch-aa b/databases/freetds/patches/patch-aa
index 09be38b2107..8f3944b6a99 100644
--- a/databases/freetds/patches/patch-aa
+++ b/databases/freetds/patches/patch-aa
@@ -1,23 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2002/10/26 18:45:29 grant Exp $
+$NetBSD: patch-aa,v 1.4 2003/06/11 13:24:09 wiz Exp $
 
---- Makefile.in.orig	Thu Sep 12 02:35:50 2002
+--- Makefile.in.orig	Wed Jun 11 14:41:58 2003
 +++ Makefile.in
-@@ -349,17 +349,7 @@ maintainer-clean-generic clean mostlycle
+@@ -538,13 +538,6 @@ uninstall-info: uninstall-info-recursive
  
  
  install-data-local:
--	$(mkinstalldirs) $(DEFDIR) $(ETC)
--	if [ -f $(ETC)/freetds.conf ]; \
--	then :; \
--	else \
+-	$(mkinstalldirs) $(ETC)
+-	if test ! -f $(ETC)/freetds.conf; then \
 -		$(INSTALL_DATA) $(srcdir)/freetds.conf $(ETC)/freetds.conf; \
 -	fi
--	if [ -f $(ETC)/locales.conf ]; \
--	then :; \
--	else \
+-	if test ! -f $(ETC)/locales.conf; then \
 -		$(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
 -	fi
-+	$(mkinstalldirs) $(DEFDIR)
  
- test:
- 	@echo "The 'make test' option has been replaced with 'make check'";
+ # for default we do not uninstall configuration (they can be changed)
+ @DISTCHECK_BUILD_TRUE@uninstall-local:
diff --git a/databases/freetds/patches/patch-ab b/databases/freetds/patches/patch-ab
index f2c7ada70d9..18577131fd5 100644
--- a/databases/freetds/patches/patch-ab
+++ b/databases/freetds/patches/patch-ab
@@ -1,9 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2002/10/26 18:45:29 grant Exp $
+$NetBSD: patch-ab,v 1.3 2003/06/11 13:24:09 wiz Exp $
 
---- src/ctlib/Makefile.am.orig	Sun Aug 18 00:34:31 2002
-+++ src/ctlib/Makefile.am
-@@ -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@
+--- src/pool/Makefile.in.orig	Wed Jun 11 14:41:58 2003
++++ src/pool/Makefile.in
+@@ -450,10 +450,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(ETC)
+-	if test ! -f $(ETC)/pool.conf; then \
+-		$(INSTALL_DATA) $(srcdir)/pool.conf $(ETC)/pool.conf; \
+-	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/databases/freetds/patches/patch-ac b/databases/freetds/patches/patch-ac
deleted file mode 100644
index 78b2e9e4f26..00000000000
--- a/databases/freetds/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/10/26 18:45:29 grant Exp $
-
---- src/ctlib/Makefile.in.orig	Thu Sep 12 02:35:51 2002
-+++ src/ctlib/Makefile.in
-@@ -96,6 +96,7 @@ 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@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/config.h
- CONFIG_CLEAN_FILES = 
-@@ -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 =  $(TDSDIR)/mem.lo $(TDSDIR)/token.lo \
- $(TDSDIR)/util.lo $(TDSDIR)/login.lo $(TDSDIR)/read.lo \