Index: Makefile =================================================================== --- Makefile +++ 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 @@ 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_CONFIGURE_ON= --with-unixodbc=${LOCALBASE} ODBCWIDE_CONFIGURE_ON= --enable-odbc-wide +PORTDOCS= * + CONFLICTS= freetds-0.64.[0-9] .include @@ -77,7 +76,7 @@ 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 Index: distinfo =================================================================== --- distinfo +++ 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 Index: files/patch-include_freetds_tds.h =================================================================== --- files/patch-include_freetds_tds.h +++ 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; Index: files/patch-src_tds_threadsafe.c =================================================================== --- files/patch-src_tds_threadsafe.c +++ 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 + #include + ++#undef HAVE_GETPWUID_R ++ + #if HAVE_UNISTD_H + #include + #endif /* HAVE_UNISTD_H */ Index: pkg-plist =================================================================== --- pkg-plist +++ pkg-plist @@ -46,21 +46,3 @@ %%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