databases/freetds-devel: Update version 0.92.812=>0.92.870

- UnBREAK [1]
- Correct SIGBUS on tdsdbopen() [1]

PR:			197196 [1]
Differential Revision:	https://reviews.freebsd.org/D1773
Submitted by:		dg@fastmail.co.uk [1]
Approved by:		marino(mentor)

5 files changed, 30 insertions, 25 deletions

diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index e265d500d638..b098f846dc7f 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.92.812
-PORTEPOCH=	1
+PORTVERSION=	0.92.870
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/current/
 PKGNAMESUFFIX=	-devel
@@ -14,8 +13,6 @@ COMMENT=	Sybase/Microsoft TDS protocol library
 
 LICENSE=	LGPL20
 
-BROKEN=		Fails to build
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-dev.${PORTVERSION}
 TDS_VER?=	7.2
 USES=		gmake iconv libtool:keepla pkgconfig tar:bzip2
@@ -49,6 +46,8 @@ UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
 ODBCWIDE_CONFIGURE_ON=	--enable-odbc-wide
 
+PORTDOCS=	*
+
 CONFLICTS=	freetds-0.64.[0-9]
 
 .include <bsd.port.options.mk>
@@ -77,7 +76,7 @@ post-patch:
 		s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
+	${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/reference
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 6f53a736edcd..2536080eee39 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freetds-dev.0.92.812.tar.bz2) = 6ac35250b24214de3635e2b8647e1b903f8482b72f5ff7b92cdde6280811c074
-SIZE (freetds-dev.0.92.812.tar.bz2) = 1149663
+SHA256 (freetds-dev.0.92.870.tar.bz2) = ed6dcd1b77a0ca5c2c3a7b72f48eecb733c3fc68368f473a331e925060d9334c
+SIZE (freetds-dev.0.92.870.tar.bz2) = 3166209
diff --git a/databases/freetds-devel/files/patch-include_freetds_tds.h b/databases/freetds-devel/files/patch-include_freetds_tds.h
new file mode 100644
index 000000000000..bd287f97c56f
--- /dev/null
+++ b/databases/freetds-devel/files/patch-include_freetds_tds.h
@@ -0,0 +1,13 @@
+--- include/freetds/tds.h.orig	2015-02-02 17:40:31.253513320 +0600
++++ include/freetds/tds.h	2015-02-02 17:41:42.603514745 +0600
+@@ -144,7 +144,10 @@
+ 	TDS_INT      date;	/**< date, 0 = 1900-01-01 */
+ 	TDS_SMALLINT offset;	/**< time offset */
+ 	TDS_USMALLINT time_prec:3;
++#pragma push_macro("_res")
++#undef _res
+ 	TDS_USMALLINT _res:10;
++#pragma pop_macro("_res")
+ 	TDS_USMALLINT has_time:1;
+ 	TDS_USMALLINT has_date:1;
+ 	TDS_USMALLINT has_offset:1;
diff --git a/databases/freetds-devel/files/patch-src_tds_threadsafe.c b/databases/freetds-devel/files/patch-src_tds_threadsafe.c
new file mode 100644
index 000000000000..b29fdd74fd88
--- /dev/null
+++ b/databases/freetds-devel/files/patch-src_tds_threadsafe.c
@@ -0,0 +1,11 @@
+--- src/tds/threadsafe.c.orig	2015-02-03 16:39:23.431814538 +0600
++++ src/tds/threadsafe.c	2015-02-03 16:39:40.516813065 +0600
+@@ -23,6 +23,8 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
++#undef HAVE_GETPWUID_R
++
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index 16a560378da8..e46c8d5fdb0d 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -46,21 +46,3 @@ lib/libsybdb.so.5.0.0
 %%ODBC%%lib/libtdsodbc.la
 %%ODBC%%lib/libtdsodbc.a
 %%ODBC%%bin/bsqlodbc
-%%PORTDOCS%%%%DOCSDIR%%/images/1.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/10.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/2.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/3.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/4.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/5.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/6.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/7.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/8.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/9.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/caution.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/important.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
-%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html