5 files changed, 214 insertions, 15 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 1738b69d7945..7ebff9fd5269 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,23 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.61.2
+PORTVERSION=	0.62
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
 
-MAINTAINER=	kiesel@schlund.de
+MAINTAINER?=	kiesel@schlund.de
 COMMENT=	Sybase/Microsoft TDS protocol library
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-BUILD_DEPENDS=	${LOCALBASE}/bin/automake17:${PORTSDIR}/devel/automake17
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_LIBTOOL=	yes
-NO_AUTOCONF=	yes
-NO_AUTOMAKE=	yes
+WANT_AUTOCONF_VER=	253
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=5.0
@@ -45,10 +43,17 @@ PLIST_SUB+=	ODBC=""
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
+.if defined(WITH_MSDBLIB)
+CONFIGURE_ARGS+=	--enable-msdblib
+.endif
+
 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 \
@@ -57,11 +62,10 @@ post-patch:
 		 s|/locales.conf|/locales.conf.dist|g ; \
 		 s|/pool.conf|/pool.conf.dist|g ; \
 		 s| common.h||g'
-
-post-configure:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e \
-		's|automake-1..|automake17|g ; \
-		 s|aclocal-1..|aclocal17|g' Makefile
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e "s|\(install-data-am:\).*|\1 install-man|g" \
+		${WRKSRC}/doc/Makefile.in
+.endif
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/freetds
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index b78aa8cfb6a2..ac9195136df5 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.61.2.tar.gz) = 95e91d26ddfdeed255771f3fa2c28129
+MD5 (freetds-0.62.tar.gz) = 8dfeedf975362bf4fad3bba7d8936a3c
diff --git a/databases/freetds-devel/files/exp-patch-src::tds::read.c b/databases/freetds-devel/files/exp-patch-src::tds::read.c
new file mode 100644
index 000000000000..8797a6a4e3a6
--- /dev/null
+++ b/databases/freetds-devel/files/exp-patch-src::tds::read.c
@@ -0,0 +1,16 @@
+--- 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
new file mode 100644
index 000000000000..784697c53b70
--- /dev/null
+++ b/databases/freetds-devel/files/patch-doc::Makefile.in
@@ -0,0 +1,11 @@
+--- 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 ab144430ae05..94a2aa21447e 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -8,7 +8,6 @@ etc/pool.conf.dist
 include/bkpublic.h
 include/cspublic.h
 include/cstypes.h
-include/ctlib.h
 include/ctpublic.h
 include/dblib.h
 include/sqldb.h
@@ -25,17 +24,186 @@ share/nls/POSIX
 share/nls/en_US.US-ASCII
 lib/libct.a
 lib/libct.so
-lib/libct.so.1
+lib/libct.so.2
 lib/libsybdb.a
 lib/libsybdb.so
-lib/libsybdb.so.3
+lib/libsybdb.so.4
 lib/libtds.a
 lib/libtds.so
-lib/libtds.so.2
+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
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-11.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/about.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/what.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/tdshistory.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdshistory.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/projects.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/build.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/packages.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/config.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/osissues.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/install.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/choosingtdsprotocol.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/freetdsconf.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/locales.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/envvar.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/configurations.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/confirminstall.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/prepodbc.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcconnattr.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/php.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/dsnless.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcinionly.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcombo.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/odbcdiagnose.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/configs.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/nonwestern.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/domains.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/appendmode.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/tdspool.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/stunnel.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/software.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/perl.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/sybsql.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/python.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/troubleshooting.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/serverthere.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/logging.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/pagenodata.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/seemtooslow.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/help.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/mailinglist.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/askingforhelp.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/contrib.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/advocacy.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/programming.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/apireference.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/dblib.api.summary.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/ctlib.api.summary.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/odbc.api.summary.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/samplecode.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/acknowledgments.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/contributors.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesfile.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/interfaceslocation.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacespurpose.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/interfacesformat.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/aboutunicode.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/iso8859.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/unicode.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodegoodbad.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodeutf.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/unicodefreetds.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-1.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-2.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-3.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-4.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-5.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-6.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-7.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-8.htm
+%%PORTDOCS%%%%DOCSDIR%%/userguide/gfdl-9.htm
+%%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/a00065.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00066.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00070.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00126.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00129.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00160.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00163.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00164.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00177.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/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/a00312.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
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00322.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00323.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00324.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00325.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00326.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00327.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00328.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00329.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00330.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00331.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00332.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00333.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00334.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/a00335.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/a00345.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%%/images/important.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/reference
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/freetds