- Update to version 0.62.3

PR:		ports/65444
Submitted by:	maintainer

5 files changed, 41 insertions, 72 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 6baa6014a5ae..2f946684b883 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.62
-PORTREVISION=	1
+PORTVERSION=	0.62.3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
@@ -19,12 +18,13 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_LIBTOOL_VER=	13
-WANT_AUTOCONF_VER=	253
+WANT_AUTOCONF_VER=	257
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=5.0
 INSTALLS_SHLIB=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 MAN1=		freebcp.1 tsql.1
 
 .if defined(WITH_IODBC)
@@ -51,9 +51,6 @@ post-extract:
 	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
 	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
 	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist
-.if defined(WITH_EXPERIMENTAL_PATCH)
-	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/exp-patch-src::tds::read.c
-.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 4051290e25f0..a935c13a7a20 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (freetds-0.62.tar.gz) = 8dfeedf975362bf4fad3bba7d8936a3c
-SIZE (freetds-0.62.tar.gz) = 1177690
+MD5 (freetds-0.62.3.tar.gz) = 6091902314a9317f0de2bb156151bc3a
+SIZE (freetds-0.62.3.tar.gz) = 1186704
diff --git a/databases/freetds-devel/files/exp-patch-src::tds::read.c b/databases/freetds-devel/files/exp-patch-src::tds::read.c
deleted file mode 100644
index 8797a6a4e3a6..000000000000
--- a/databases/freetds-devel/files/exp-patch-src::tds::read.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/tds/read.c.orig	Thu Jan 15 17:04:28 2004
-+++ src/tds/read.c	Thu Jan 15 17:04:35 2004
-@@ -164,6 +164,13 @@
- 			buflen -= len;
- 			got += len;
- 		} 
-+
-+		/* When we get a timeout on select(), return 0. Don't return -1, because
-+		 * that would lead to a disconnect
-+		 * OTOH, do not let this pass to prevent an infinite loop when there is
-+		 * no data on the wire */
-+		if (retcode == 0)
-+			return 0;
- 		
- 		OK_TIMEOUT:
- 		now = time(NULL);
diff --git a/databases/freetds-devel/files/patch-doc::Makefile.in b/databases/freetds-devel/files/patch-doc::Makefile.in
deleted file mode 100644
index 784697c53b70..000000000000
--- a/databases/freetds-devel/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Sun Jan 11 22:31:54 2004
-+++ doc/Makefile.in	Thu Jan 15 19:20:54 2004
-@@ -156,7 +156,7 @@
- TXT2MAN = $(srcdir)/txt2man
- DOCDIR = doc/freetds-$(VERSION)
- PRODUCT = FreeTDS
--TARGET_DOCDIR = $(DESTDIR)$(datadir)/$(DOCDIR)
-+TARGET_DOCDIR = $(DESTDIR)$(datadir)/doc/freetds
- 
- EXTRA_DIST = api_status.txt bcp.txt cap.txt getting_started.txt \
- 		policy.txt tds_layer.txt CodingStyle tds.html  \
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index 94a2aa21447e..82d0a3bd0074 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -1,6 +1,7 @@
 bin/freebcp
 bin/tdspool
 bin/tsql
+bin/bsqldb
 etc/freetds.conf.dist
 etc/freetds/interfaces.dist
 etc/locales.conf.dist
@@ -20,8 +21,6 @@ include/tds_sysdep_public.h
 include/tdsconvert.h
 include/tdssrv.h
 include/tdsver.h
-share/nls/POSIX
-share/nls/en_US.US-ASCII
 lib/libct.a
 lib/libct.so
 lib/libct.so.2
@@ -31,12 +30,12 @@ lib/libsybdb.so.4
 lib/libtds.a
 lib/libtds.so
 lib/libtds.so.3
-%%ODBC%%lib/libtdsodbc.a
-%%ODBC%%lib/libtdsodbc.so
-%%ODBC%%lib/libtdsodbc.so.0
 lib/libtdssrv.a
 lib/libtdssrv.so
 lib/libtdssrv.so.1
+%%ODBC%%lib/libtdsodbc.so.0
+%%ODBC%%lib/libtdsodbc.so
+%%ODBC%%lib/libtdsodbc.a
 %%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-11.htm
 %%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/userguide/about.htm
@@ -113,28 +112,33 @@ lib/libtdssrv.so.1
 %%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-10.htm
 %%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/todo.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00057.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00063.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00064.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/bug.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/reference/files.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/pages.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00059.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00065.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00066.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00070.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00126.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00067.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00068.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00072.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00129.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00160.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00163.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00132.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00164.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00177.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00167.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00168.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00181.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00196.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00218.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00265.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00268.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/a00185.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00200.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00223.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00270.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00273.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00297.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00298.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00299.html
@@ -149,12 +153,12 @@ lib/libtdssrv.so.1
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00308.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00309.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00310.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00311.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00312.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00313.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00314.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00315.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00316.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00317.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00318.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00319.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00320.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/a00321.html
@@ -180,25 +184,20 @@ lib/libtdssrv.so.1
 %%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/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/bug.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/reference/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/reference/files.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/modules.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/pages.html
-%%PORTDOCS%%%%DOCSDIR%%/reference/a00046.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00354.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00355.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00356.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00357.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00358.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00048.html
 %%PORTDOCS%%%%DOCSDIR%%/images/important.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/note.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/tip.gif