This updates freetds to 0.64 - it's not especially new but
it's the latest stable version, with various small fixes and
better compatibility with newer mssql.

I've tried it with iodbctest against mssql but don't use it
enough to give it a particularly thorough test. More testing
would be appreciated.

It also enables ODBC again, which is the reason I was looking
at it - I've done this as BUILD_DEPENDS since the headers are
needed to get the software built, but not RUN_DEPENDS since
ODBC uses dlopen() to call this, rather than this pulling in
functions from ODBC; I *think* this is the best way to handle
this.

comments, reports, ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/freetds/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile    15 Sep 2007 20:34:00 -0000      1.30
+++ Makefile    26 Sep 2007 22:01:56 -0000
@@ -1,13 +1,13 @@
 # $OpenBSD: Makefile,v 1.30 2007/09/15 20:34:00 simon Exp $
 
-V=             0.63
+V=             0.64
 DISTNAME=      freetds-$V
-PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    databases
 SHARED_LIBS += tds                  4.0      # .4.0
 SHARED_LIBS += ct                   3.0      # .3.0
 SHARED_LIBS += sybdb                5.0      # .5.0
 SHARED_LIBS += tdssrv               2.0      # .2.0
+SHARED_LIBS += tdsodbc              0.0      # .0.0
 
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
@@ -16,6 +16,7 @@ PERMIT_DISTFILES_CDROM=       Yes
 PERMIT_DISTFILES_FTP=  Yes
 
 WANTLIB=       c ncurses readline
+BUILD_DEPENDS= ::databases/iodbc,-main
 
 COMMENT=       project to document and implement the TDS protocol
 HOMEPAGE=      http://www.freetds.org/
@@ -31,7 +32,7 @@ CONFIGURE_ARGS=       ${CONFIGURE_SHARED} \
                --enable-static \
                --with-libiconv-prefix="${LOCALBASE}" \
                --disable-threadsafe \
-               --disable-odbc
+               --with-iodbc
 
 .if $(FLAVOR:L:Mmsdblib)
 CONFIGURE_ARGS+=--enable-msdblib
@@ -50,5 +51,7 @@ post-install:
                ${PREFIX}/share/examples/freetds/freetds.conf-sample
        ${INSTALL_DATA} ${WRKSRC}/src/pool/pool.conf \
                ${PREFIX}/share/examples/freetds/pool.conf-sample
+       @cd ${PREFIX}/lib && ln -s libtdsodbc.so.${LIBtdsodbc_VERSION} \
+               libtdsodbc.so
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/freetds/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo    5 Apr 2007 15:37:49 -0000       1.11
+++ distinfo    26 Sep 2007 22:01:56 -0000
@@ -1,5 +1,5 @@
-MD5 (freetds-0.63.tar.gz) = oKUDjPtwgYAwizgfhIuvdQ==
-RMD160 (freetds-0.63.tar.gz) = 7hMvdX9pjPyNq8YSAS648khuZt0=
-SHA1 (freetds-0.63.tar.gz) = uV5jBSSAAVWvj6BOeLW4NBIM9I8=
-SHA256 (freetds-0.63.tar.gz) = hmGtHVgmMiBVF0XU71KSUKQSRA5k43NhL1accJsJ3NI=
-SIZE (freetds-0.63.tar.gz) = 1321466
+MD5 (freetds-0.64.tar.gz) = 7P7l1slpMhcqHyn7IVydIw==
+RMD160 (freetds-0.64.tar.gz) = NQn7hs5+37k35kBBptYzmIPP9g4=
+SHA1 (freetds-0.64.tar.gz) = xC9oAMkeUXCrRpLWlPpA85lerKQ=
+SHA256 (freetds-0.64.tar.gz) = J+7vQElZD0WRifhZ+nPa4nYE6gv08ZfjBPmTTDkxLDs=
+SIZE (freetds-0.64.tar.gz) = 1414954
cvs server: Diffing patches
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/freetds/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in   26 Dec 2005 19:15:22 -0000      1.5
+++ patches/patch-Makefile_in   26 Sep 2007 22:01:56 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.5 2005/12/26 19:15:22 sturm Exp $
---- Makefile.in.orig   Wed Mar 30 02:51:55 2005
-+++ Makefile.in        Mon Dec 26 13:16:21 2005
-@@ -576,13 +576,6 @@ uninstall-info: uninstall-info-recursive
+--- Makefile.in.orig   Sat Jul  1 16:10:41 2006
++++ Makefile.in        Sat Mar 31 15:09:20 2007
+@@ -658,13 +658,6 @@ uninstall-info: uninstall-info-recursive
  
  
  install-data-local:
@@ -13,5 +13,5 @@ $OpenBSD: patch-Makefile_in,v 1.5 2005/1
 -              $(INSTALL_DATA) $(srcdir)/locales.conf $(ETC)/locales.conf; \
 -      fi
  
- # do not uninstall configuration files (they may have been changed)
- @[EMAIL PROTECTED]:
+ clean-local:
+       find . \( -name \*.test_output -o -name \*.bb -o -name \*.bbg -o -name 
\*.da -o -name \*.gc\* \) -exec rm -f {} \;
Index: patches/patch-odbc_unittests_Makefile_in
===================================================================
RCS file: 
/cvs/ports/databases/freetds/patches/patch-odbc_unittests_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-odbc_unittests_Makefile_in
--- patches/patch-odbc_unittests_Makefile_in    26 Dec 2005 19:15:22 -0000      
1.3
+++ patches/patch-odbc_unittests_Makefile_in    26 Sep 2007 22:01:56 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-odbc_unittests_Makefile_in,v 1.3 2005/12/26 19:15:22 sturm Exp 
$
---- src/odbc/unittests/Makefile.in.orig        Wed Mar 30 02:51:58 2005
-+++ src/odbc/unittests/Makefile.in     Mon Dec 26 13:16:21 2005
-@@ -784,7 +784,7 @@ all-am: Makefile
- 
+--- src/odbc/unittests/Makefile.in.orig        Sat Jul  1 16:10:38 2006
++++ src/odbc/unittests/Makefile.in     Sat Mar 31 15:10:41 2007
+@@ -774,7 +774,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile
  installdirs:
- 
 -install: install-am
 +install:
  install-exec: install-exec-am
Index: patches/patch-src_ctlib_unittests_Makefile_in
===================================================================
RCS file: 
/cvs/ports/databases/freetds/patches/patch-src_ctlib_unittests_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_ctlib_unittests_Makefile_in
--- patches/patch-src_ctlib_unittests_Makefile_in       26 Dec 2005 19:15:22 
-0000      1.3
+++ patches/patch-src_ctlib_unittests_Makefile_in       26 Sep 2007 22:01:56 
-0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-src_ctlib_unittests_Makefile_in,v 1.3 2005/12/26 19:15:22 
sturm Exp $
---- src/ctlib/unittests/Makefile.in.orig       Wed Mar 30 02:51:57 2005
-+++ src/ctlib/unittests/Makefile.in    Mon Dec 26 13:16:21 2005
-@@ -735,7 +735,7 @@ all-am: Makefile
- 
+--- src/ctlib/unittests/Makefile.in.orig       Sat Jul  1 16:10:36 2006
++++ src/ctlib/unittests/Makefile.in    Sat Mar 31 15:11:38 2007
+@@ -696,7 +696,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile
  installdirs:
- 
 -install: install-am
 +install:
  install-exec: install-exec-am
Index: patches/patch-src_dblib_unittests_Makefile_in
===================================================================
RCS file: 
/cvs/ports/databases/freetds/patches/patch-src_dblib_unittests_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_dblib_unittests_Makefile_in
--- patches/patch-src_dblib_unittests_Makefile_in       26 Dec 2005 19:15:22 
-0000      1.3
+++ patches/patch-src_dblib_unittests_Makefile_in       26 Sep 2007 22:01:56 
-0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-src_dblib_unittests_Makefile_in,v 1.3 2005/12/26 19:15:22 
sturm Exp $
---- src/dblib/unittests/Makefile.in.orig       Wed Mar 30 02:51:57 2005
-+++ src/dblib/unittests/Makefile.in    Mon Dec 26 13:16:21 2005
-@@ -735,7 +735,7 @@ all-am: Makefile
- 
+--- src/dblib/unittests/Makefile.in.orig       Sat Jul  1 16:10:37 2006
++++ src/dblib/unittests/Makefile.in    Sat Mar 31 15:11:43 2007
+@@ -693,7 +693,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile
  installdirs:
- 
 -install: install-am
 +install:
  install-exec: install-exec-am
Index: patches/patch-src_pool_Makefile_in
===================================================================
RCS file: /cvs/ports/databases/freetds/patches/patch-src_pool_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_pool_Makefile_in
--- patches/patch-src_pool_Makefile_in  26 Dec 2005 19:15:22 -0000      1.2
+++ patches/patch-src_pool_Makefile_in  26 Sep 2007 22:01:56 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_pool_Makefile_in,v 1.2 2005/12/26 19:15:22 sturm Exp $
---- src/pool/Makefile.in.orig  Wed Mar 30 02:51:58 2005
-+++ src/pool/Makefile.in       Mon Dec 26 13:16:21 2005
-@@ -488,10 +488,7 @@ uninstall-am: uninstall-binPROGRAMS unin
+--- src/pool/Makefile.in.orig  Sat Jul  1 16:10:38 2006
++++ src/pool/Makefile.in       Sat Mar 31 15:09:20 2007
+@@ -499,10 +499,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
  
  install-data-local:
Index: patches/patch-src_tds_unittests_Makefile_in
===================================================================
RCS file: 
/cvs/ports/databases/freetds/patches/patch-src_tds_unittests_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_tds_unittests_Makefile_in
--- patches/patch-src_tds_unittests_Makefile_in 26 Dec 2005 19:15:22 -0000      
1.3
+++ patches/patch-src_tds_unittests_Makefile_in 26 Sep 2007 22:01:56 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-src_tds_unittests_Makefile_in,v 1.3 2005/12/26 19:15:22 sturm 
Exp $
---- src/tds/unittests/Makefile.in.orig Wed Mar 30 02:51:59 2005
-+++ src/tds/unittests/Makefile.in      Mon Dec 26 13:16:21 2005
-@@ -588,7 +588,7 @@ all-am: Makefile
- 
+--- src/tds/unittests/Makefile.in.orig Sat Jul  1 16:10:40 2006
++++ src/tds/unittests/Makefile.in      Sat Mar 31 15:11:32 2007
+@@ -584,7 +584,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile
  installdirs:
- 
 -install: install-am
 +install:
  install-exec: install-exec-am
cvs server: Diffing pkg
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/databases/freetds/pkg/PFRAG.shared,v
retrieving revision 1.8
diff -u -p -r1.8 PFRAG.shared
--- pkg/PFRAG.shared    26 Dec 2005 19:15:22 -0000      1.8
+++ pkg/PFRAG.shared    26 Sep 2007 22:01:56 -0000
@@ -2,4 +2,6 @@
 @lib lib/libct.so.${LIBct_VERSION}
 @lib lib/libsybdb.so.${LIBsybdb_VERSION}
 @lib lib/libtds.so.${LIBtds_VERSION}
+lib/libtdsodbc.so
[EMAIL PROTECTED] lib/libtdsodbc.so.${LIBtdsodbc_VERSION}
 @lib lib/libtdssrv.so.${LIBtdssrv_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/freetds/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST   30 Mar 2005 03:39:01 -0000      1.13
+++ pkg/PLIST   26 Sep 2007 22:01:56 -0000
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.13 2005/03/30 03:39:01 jcs Exp $
 bin/bsqldb
+bin/datacopy
 bin/defncopy
 bin/freebcp
 bin/tdspool
@@ -24,9 +25,12 @@ lib/libsybdb.a
 lib/libsybdb.la
 lib/libtds.a
 lib/libtds.la
+lib/libtdsodbc.a
+lib/libtdsodbc.la
 lib/libtdssrv.a
 lib/libtdssrv.la
 @man man/man1/bsqldb.1
[EMAIL PROTECTED] man/man1/datacopy.1
 @man man/man1/defncopy.1
 @man man/man1/freebcp.1
 @man man/man1/tsql.1
@@ -36,91 +40,119 @@ ${DOC}/images/important.gif
 ${DOC}/images/note.gif
 ${DOC}/images/tip.gif
 ${DOC}/reference/
-${DOC}/reference/a00064.html
-${DOC}/reference/a00075.html
-${DOC}/reference/a00081.html
-${DOC}/reference/a00082.html
-${DOC}/reference/a00083.html
-${DOC}/reference/a00085.html
+${DOC}/reference/a00069.html
+${DOC}/reference/a00080.html
+${DOC}/reference/a00086.html
 ${DOC}/reference/a00087.html
-${DOC}/reference/a00156.html
-${DOC}/reference/a00159.html
-${DOC}/reference/a00194.html
-${DOC}/reference/a00197.html
-${DOC}/reference/a00198.html
-${DOC}/reference/a00213.html
-${DOC}/reference/a00217.html
-${DOC}/reference/a00232.html
+${DOC}/reference/a00088.html
+${DOC}/reference/a00090.html
+${DOC}/reference/a00092.html
+${DOC}/reference/a00121.html
+${DOC}/reference/a00122.html
+${DOC}/reference/a00123.html
+${DOC}/reference/a00124.html
+${DOC}/reference/a00125.html
+${DOC}/reference/a00126.html
+${DOC}/reference/a00127.html
+${DOC}/reference/a00144.html
+${DOC}/reference/a00147.html
+${DOC}/reference/a00170.html
+${DOC}/reference/a00172.html
+${DOC}/reference/a00248.html
+${DOC}/reference/a00249.html
+${DOC}/reference/a00250.html
+${DOC}/reference/a00251.html
+${DOC}/reference/a00252.html
+${DOC}/reference/a00253.html
+${DOC}/reference/a00254.html
 ${DOC}/reference/a00255.html
+${DOC}/reference/a00256.html
+${DOC}/reference/a00257.html
+${DOC}/reference/a00258.html
+${DOC}/reference/a00259.html
+${DOC}/reference/a00260.html
+${DOC}/reference/a00261.html
+${DOC}/reference/a00262.html
+${DOC}/reference/a00263.html
+${DOC}/reference/a00264.html
+${DOC}/reference/a00265.html
+${DOC}/reference/a00266.html
+${DOC}/reference/a00267.html
+${DOC}/reference/a00268.html
+${DOC}/reference/a00269.html
+${DOC}/reference/a00270.html
+${DOC}/reference/a00271.html
+${DOC}/reference/a00272.html
+${DOC}/reference/a00273.html
+${DOC}/reference/a00274.html
+${DOC}/reference/a00275.html
+${DOC}/reference/a00276.html
+${DOC}/reference/a00277.html
+${DOC}/reference/a00278.html
+${DOC}/reference/a00279.html
+${DOC}/reference/a00280.html
+${DOC}/reference/a00281.html
+${DOC}/reference/a00282.html
+${DOC}/reference/a00283.html
+${DOC}/reference/a00284.html
+${DOC}/reference/a00285.html
+${DOC}/reference/a00286.html
+${DOC}/reference/a00287.html
+${DOC}/reference/a00288.html
+${DOC}/reference/a00289.html
+${DOC}/reference/a00290.html
+${DOC}/reference/a00291.html
+${DOC}/reference/a00292.html
+${DOC}/reference/a00293.html
+${DOC}/reference/a00294.html
+${DOC}/reference/a00295.html
+${DOC}/reference/a00296.html
+${DOC}/reference/a00297.html
+${DOC}/reference/a00298.html
+${DOC}/reference/a00299.html
+${DOC}/reference/a00300.html
+${DOC}/reference/a00301.html
+${DOC}/reference/a00302.html
+${DOC}/reference/a00303.html
+${DOC}/reference/a00304.html
+${DOC}/reference/a00305.html
+${DOC}/reference/a00306.html
 ${DOC}/reference/a00307.html
+${DOC}/reference/a00308.html
+${DOC}/reference/a00309.html
 ${DOC}/reference/a00310.html
-${DOC}/reference/a00336.html
-${DOC}/reference/a00337.html
-${DOC}/reference/a00338.html
-${DOC}/reference/a00339.html
-${DOC}/reference/a00340.html
-${DOC}/reference/a00341.html
-${DOC}/reference/a00342.html
-${DOC}/reference/a00343.html
-${DOC}/reference/a00344.html
-${DOC}/reference/a00345.html
-${DOC}/reference/a00346.html
-${DOC}/reference/a00347.html
-${DOC}/reference/a00348.html
-${DOC}/reference/a00349.html
-${DOC}/reference/a00350.html
-${DOC}/reference/a00351.html
-${DOC}/reference/a00352.html
-${DOC}/reference/a00353.html
-${DOC}/reference/a00354.html
-${DOC}/reference/a00356.html
-${DOC}/reference/a00358.html
-${DOC}/reference/a00359.html
-${DOC}/reference/a00360.html
-${DOC}/reference/a00361.html
-${DOC}/reference/a00362.html
-${DOC}/reference/a00363.html
-${DOC}/reference/a00364.html
-${DOC}/reference/a00365.html
-${DOC}/reference/a00366.html
-${DOC}/reference/a00367.html
-${DOC}/reference/a00368.html
-${DOC}/reference/a00369.html
-${DOC}/reference/a00370.html
-${DOC}/reference/a00371.html
-${DOC}/reference/a00372.html
-${DOC}/reference/a00373.html
-${DOC}/reference/a00374.html
-${DOC}/reference/a00375.html
-${DOC}/reference/a00376.html
-${DOC}/reference/a00377.html
-${DOC}/reference/a00378.html
-${DOC}/reference/a00379.html
-${DOC}/reference/a00380.html
-${DOC}/reference/a00381.html
-${DOC}/reference/a00382.html
-${DOC}/reference/a00383.html
-${DOC}/reference/a00384.html
-${DOC}/reference/a00385.html
-${DOC}/reference/a00386.html
-${DOC}/reference/a00387.html
-${DOC}/reference/a00388.html
-${DOC}/reference/a00389.html
-${DOC}/reference/a00391.html
-${DOC}/reference/a00393.html
-${DOC}/reference/a00394.html
-${DOC}/reference/a00395.html
-${DOC}/reference/a00396.html
-${DOC}/reference/a00397.html
-${DOC}/reference/a00398.html
-${DOC}/reference/a00399.html
+${DOC}/reference/a00311.html
+${DOC}/reference/a00312.html
+${DOC}/reference/a00313.html
 ${DOC}/reference/annotated.html
 ${DOC}/reference/bug.html
+${DOC}/reference/dir_000000.html
+${DOC}/reference/dir_000001.html
+${DOC}/reference/dir_000002.html
+${DOC}/reference/dir_000003.html
+${DOC}/reference/dir_000004.html
+${DOC}/reference/dir_000005.html
+${DOC}/reference/dir_000006.html
+${DOC}/reference/dir_000007.html
+${DOC}/reference/dir_000008.html
+${DOC}/reference/dir_000009.html
+${DOC}/reference/dir_000010.html
+${DOC}/reference/dir_000011.html
+${DOC}/reference/dir_000012.html
+${DOC}/reference/dir_000013.html
+${DOC}/reference/dir_000014.html
+${DOC}/reference/dirs.html
 ${DOC}/reference/doxygen.css
 ${DOC}/reference/doxygen.png
 ${DOC}/reference/files.html
 ${DOC}/reference/functions.html
+${DOC}/reference/functions_vars.html
 ${DOC}/reference/globals.html
+${DOC}/reference/globals_defs.html
+${DOC}/reference/globals_enum.html
+${DOC}/reference/globals_func.html
+${DOC}/reference/globals_type.html
+${DOC}/reference/globals_vars.html
 ${DOC}/reference/index.html
 ${DOC}/reference/modules.html
 ${DOC}/reference/pages.html
@@ -200,6 +232,7 @@ ${DOC}/userguide/unicode.htm
 ${DOC}/userguide/unicodefreetds.htm
 ${DOC}/userguide/unicodegoodbad.htm
 ${DOC}/userguide/unicodeutf.htm
+${DOC}/userguide/userguide.css
 ${DOC}/userguide/what.htm
 share/examples/freetds/
 share/examples/freetds/freetds.conf-sample

Reply via email to