Index: head/databases/freetds-devel/Makefile =================================================================== --- head/databases/freetds-devel/Makefile (revision 378507) +++ head/databases/freetds-devel/Makefile (revision 378508) @@ -1,94 +1,93 @@ # Created by: Domas Mituzas # $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 DISTNAME= ${PORTNAME}-dev.${PORTVERSION} MAINTAINER= bofh@FreeBSD.org 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 GNU_GONFIGURE= yes USE_AUTOTOOLS= autoconf:env CPPFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ --enable-msdblib --enable-sybase-compat \ --docdir=${DOCSDIR} USE_LDCONFIG= yes SUB_FILES= pkg-message INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS ODBCWIDE OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= ODBC OPTIONS_RADIO_ODBC= IODBC UNIXODBC ODBCWIDE_DESC= Enable Wide ODBC Support OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ON= --with-gnutls IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE} IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc 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 .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} PLIST_SUB+= ODBC="" .else PLIST_SUB+= ODBC="@comment " .endif post-extract: @cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample @cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample @cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample post-patch: @${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|/pool.conf|/pool.conf.sample|g ; \ s| common.h||g ; \ s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \ s|%%ICONV_LIB%%|${ICONV_LIB}|' @${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \ s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \ 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 @${MKDIR} ${STAGEDIR}${DOCSDIR}/images @${FIND} ${WRKSRC}/doc/userguide \( -type f -o -type l \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/userguide ';' @${FIND} ${WRKSRC}/doc/reference \( -type f -o -type l \) \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/reference ';' @${FIND} ${WRKSRC}/doc/images -name \*.gif \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/images/ ';' .endif .include Index: head/databases/freetds-devel/distinfo =================================================================== --- head/databases/freetds-devel/distinfo (revision 378507) +++ head/databases/freetds-devel/distinfo (revision 378508) @@ -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: head/databases/freetds-devel/files/patch-include_freetds_tds.h =================================================================== --- head/databases/freetds-devel/files/patch-include_freetds_tds.h (nonexistent) +++ head/databases/freetds-devel/files/patch-include_freetds_tds.h (revision 378508) @@ -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; Property changes on: head/databases/freetds-devel/files/patch-include_freetds_tds.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/freetds-devel/files/patch-src_tds_threadsafe.c =================================================================== --- head/databases/freetds-devel/files/patch-src_tds_threadsafe.c (nonexistent) +++ head/databases/freetds-devel/files/patch-src_tds_threadsafe.c (revision 378508) @@ -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 */ Property changes on: head/databases/freetds-devel/files/patch-src_tds_threadsafe.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/freetds-devel/pkg-plist =================================================================== --- head/databases/freetds-devel/pkg-plist (revision 378507) +++ head/databases/freetds-devel/pkg-plist (revision 378508) @@ -1,66 +1,48 @@ bin/bsqldb bin/datacopy bin/defncopy bin/fisql bin/freebcp bin/osql bin/tdspool bin/tsql @sample %%ETCDIR%%/freetds.conf.sample @sample %%ETCDIR%%/interfaces.sample @sample %%ETCDIR%%/locales.conf.sample @sample %%ETCDIR%%/pool.conf.sample include/bkpublic.h include/cspublic.h include/cstypes.h include/ctpublic.h include/sqldb.h include/sqlfront.h include/sybdb.h include/syberror.h include/sybfront.h include/tds_sysdep_public.h include/odbcss.h man/man1/datacopy.1.gz man/man1/freebcp.1.gz man/man1/tsql.1.gz man/man1/bsqldb.1.gz man/man1/bsqlodbc.1.gz man/man1/defncopy.1.gz man/man1/fisql.1.gz man/man1/osql.1.gz man/man5/freetds.conf.5.gz lib/libct.a lib/libct.la lib/libct.so lib/libct.so.4 lib/libct.so.4.0.0 lib/libsybdb.a lib/libsybdb.la lib/libsybdb.so lib/libsybdb.so.5 lib/libsybdb.so.5.0.0 %%ODBC%%lib/libtdsodbc.so.0.0.0 %%ODBC%%lib/libtdsodbc.so.0 %%ODBC%%lib/libtdsodbc.so %%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