- Update to 0.64

- Fix MSSQL 7 support, use CP1252 even though it states to use ISO-8859-1

PR:		ports/107874
Submitted by:	Lapo Luchini <lapo at lapo.it>

4 files changed, 135 insertions, 83 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 3dfa4b4f5a61..767bd35fe7ec 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.63
-PORTREVISION=	1
+PORTVERSION=	0.64
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
@@ -25,8 +24,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
 INSTALLS_SHLIB=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-0.63
-MAN1=		freebcp.1 tsql.1 bsqldb.1 defncopy.1
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+MAN1=		datacopy.1 freebcp.1 tsql.1 bsqldb.1 defncopy.1
 
 .if defined(WITH_IODBC)
 LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index bccccdd72a7c..e647320f5ecd 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (freetds-0.63.tar.gz) = a0a5038cfb708180308b381f848baf75
-SHA256 (freetds-0.63.tar.gz) = 8661ad1d58263220551745d4ef529250a412440e64e373612f569c709b09dcd2
-SIZE (freetds-0.63.tar.gz) = 1321466
+MD5 (freetds-0.64.tar.gz) = ecfee5d6c96932172a1f29fb215c9d23
+SHA256 (freetds-0.64.tar.gz) = 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b
+SIZE (freetds-0.64.tar.gz) = 1414954
diff --git a/databases/freetds-devel/files/patch-src_tds_iconv.c b/databases/freetds-devel/files/patch-src_tds_iconv.c
new file mode 100644
index 000000000000..1899306538c2
--- /dev/null
+++ b/databases/freetds-devel/files/patch-src_tds_iconv.c
@@ -0,0 +1,23 @@
+--- src/tds/iconv.c.orig	Sat Jan 13 16:27:13 2007
++++ src/tds/iconv.c	Sat Jan 13 16:29:24 2007
+@@ -973,13 +973,18 @@ tds_srv_charset_changed(TDSSOCKET * tds,
+ #if HAVE_ICONV_ALWAYS
+ 	TDSICONV *char_conv = tds->char_convs[client2server_chardata];
+ 
+-	const char *canonic_charset = tds_canonical_charset_name(charset);
++	int canonic_charset_num = tds_canonical_charset(charset);
++	const char *canonic_charset;
++
++	if (tds->major_version >= 7 && canonic_charset_num == TDS_CHARSET_ISO_8859_1)
++		canonic_charset_num = TDS_CHARSET_CP1252;
+ 
+ 	/* ignore request to change to unknown charset */
+-	if (!canonic_charset) {
++	if (canonic_charset_num < 0) {
+ 		tdsdump_log(TDS_DBG_FUNC, "tds_srv_charset_changed: what is charset \"%s\"?\n", charset);
+ 		return;
+ 	}
++	canonic_charset = canonic_charsets[canonic_charset_num].name;
+ 
+ 	if (strcmp(canonic_charset, char_conv->server_charset.name) == 0)
+ 		return;
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index 1b75863b49f1..ba51c6d8fd36 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/datacopy
 bin/freebcp
 bin/tdspool
 bin/tsql
@@ -24,7 +25,7 @@ include/tdsver.h
 lib/libct.a
 lib/libct.la
 lib/libct.so
-lib/libct.so.3
+lib/libct.so.4
 lib/libsybdb.a
 lib/libsybdb.la
 lib/libsybdb.so
@@ -32,7 +33,7 @@ lib/libsybdb.so.5
 lib/libtds.a
 lib/libtds.la
 lib/libtds.so
-lib/libtds.so.4
+lib/libtds.so.5
 lib/libtdssrv.a
 lib/libtdssrv.la
 lib/libtdssrv.so
@@ -115,6 +116,7 @@ lib/libtdssrv.so.2
 %%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-9.htm
 %%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-10.htm
 %%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/userguide/userguide.css
 %%PORTDOCS%%%%DOCSDIR%%/reference/todo.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/bug.html
@@ -126,84 +128,112 @@ lib/libtdssrv.so.2
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/pages.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00075.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00081.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00082.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00083.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00085.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00069.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00080.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00086.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00087.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00156.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00159.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00194.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00197.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00198.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00213.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00217.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00232.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00088.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00090.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00092.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00121.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00122.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00123.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00124.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00125.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00126.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00127.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00144.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00147.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00170.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00172.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00248.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00249.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00250.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00251.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00252.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00253.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00254.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00255.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00256.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00257.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00258.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00259.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00260.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00261.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00262.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00263.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00264.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00265.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00266.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00267.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00268.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00269.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00270.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00271.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00272.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00273.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00274.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00275.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00276.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00277.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00278.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00279.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00280.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00281.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00282.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00283.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00284.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00285.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00286.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00287.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00288.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00289.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00290.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00291.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00292.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00293.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00294.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00295.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00296.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00297.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00298.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00299.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00300.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00301.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00302.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00303.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00304.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00305.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00306.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00307.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00308.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00309.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00310.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00336.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00337.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00338.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00339.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00340.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00341.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00342.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00343.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00344.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00345.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00346.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00347.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00348.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00349.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00350.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00351.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00352.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00353.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00354.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00356.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00358.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00359.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00360.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00361.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00362.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00363.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00364.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00365.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00366.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00367.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00368.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00369.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00370.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00371.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00372.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00373.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00374.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00375.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00376.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00377.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00378.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00379.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00380.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00381.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00382.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00383.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00384.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00385.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00386.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00387.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00388.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00389.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00391.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00393.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00394.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00395.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00396.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00397.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00398.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00399.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00064.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00311.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00312.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00313.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000000.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000001.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000002.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000003.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000004.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000005.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000006.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000007.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000008.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000009.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000010.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000011.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000012.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000013.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dir_000014.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/dirs.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/globals_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/images/important.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/tip.gif