Index: head/databases/freetds/Makefile =================================================================== --- head/databases/freetds/Makefile (revision 388911) +++ head/databases/freetds/Makefile (revision 388912) @@ -1,79 +1,73 @@ # Created by: Domas Mituzas # $FreeBSD$ PORTNAME= freetds -PORTVERSION= 0.91.112.0.0 +PORTVERSION= 0.95.0 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/ MAINTAINER= bofh@FreeBSD.org COMMENT= Sybase/Microsoft TDS protocol library LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt -PORTSCOUT= skipv:0.92.48,0.92.49,0.92.51,0.92.52,0.92.53,0.92.54,0.92.55,0.92.59,0.92.63,0.92.79,0.92.405 TDS_VER?= 5.0 -USES= autoreconf iconv gmake pkgconfig libtool:keepla tar:bzip2 +USES= autoreconf iconv gmake libtool:keepla pkgconfig readline tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= -lgcrypt +LIBS+= -lgcrypt -lpthread CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \ --enable-sybase-compat --enable-msdblib USE_LDCONFIG= yes INSTALL_TARGET= install-strip PORTDOCS= * OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL GNUTLS OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= ODBC OPTIONS_RADIO_ODBC= IODBC UNIXODBC 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} .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: @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \ 's||| ; \ s|/freetds.conf|/freetds.conf.sample|g ; \ s|/locales.conf|/locales.conf.sample|g ; \ s|/pool.conf|/pool.conf.sample|g ; \ s| common.h||g' @${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 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc/doc/${PORTNAME}-${PORTVERSION} && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.endif .include Index: head/databases/freetds/distinfo =================================================================== --- head/databases/freetds/distinfo (revision 388911) +++ head/databases/freetds/distinfo (revision 388912) @@ -1,2 +1,2 @@ -SHA256 (freetds-0.91.112.0.0.tar.bz2) = 31c3ae92676c325f88306b60c073a274d91b0ec391a5d24eb8cf0039b2b010fa -SIZE (freetds-0.91.112.0.0.tar.bz2) = 1803980 +SHA256 (freetds-0.95.0.tar.bz2) = ffcf6179545dea253d6bc3b081c220d4d1ff4f1d434d159baec17c820ad5cba3 +SIZE (freetds-0.95.0.tar.bz2) = 3208585 Index: head/databases/freetds/files/patch-include_tdsodbc.h =================================================================== --- head/databases/freetds/files/patch-include_tdsodbc.h (revision 388911) +++ head/databases/freetds/files/patch-include_tdsodbc.h (nonexistent) @@ -1,13 +0,0 @@ ---- include/tdsodbc.h.orig 2015-01-29 00:40:17 UTC -+++ include/tdsodbc.h -@@ -30,8 +30,8 @@ - #include - #endif - #else /* IODBC */ --#include --#include -+#include -+#include - #ifdef HAVE_IODBCINST_H - #include - #endif /* HAVE_IODBCINST_H */ Property changes on: head/databases/freetds/files/patch-include_tdsodbc.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/freetds/files/patch-doc_Makefile.am =================================================================== --- head/databases/freetds/files/patch-doc_Makefile.am (revision 388911) +++ head/databases/freetds/files/patch-doc_Makefile.am (nonexistent) @@ -1,11 +0,0 @@ ---- doc/Makefile.am.orig 2015-01-29 00:40:17 UTC -+++ doc/Makefile.am -@@ -8,7 +8,7 @@ SHELL = /bin/sh - TXT2MAN = $(srcdir)/txt2man - DOCDIR = doc/freetds-$(VERSION) - PRODUCT = FreeTDS --TARGET_DOCDIR = $(DESTDIR)$(datadir)/$(DOCDIR) -+TARGET_DOCDIR = $(DESTDIR)$(datadir)/doc/freetds - - IMAGES = images/important.gif \ - images/note.gif \ Property changes on: head/databases/freetds/files/patch-doc_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/freetds/files/patch-include_freetds_tds.h =================================================================== --- head/databases/freetds/files/patch-include_freetds_tds.h (nonexistent) +++ head/databases/freetds/files/patch-include_freetds_tds.h (revision 388912) @@ -0,0 +1,14 @@ +--- include/freetds/tds.h.orig 2015-06-09 10:34:04 UTC ++++ include/freetds/tds.h +@@ -144,7 +144,10 @@ typedef struct + TDS_INT date; /**< date, 0 = 1900-01-01 */ + TDS_SMALLINT offset; /**< time offset */ + TDS_USMALLINT time_prec:3; +- TDS_USMALLINT _res:10; ++#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/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/files/patch-src_tds_tls.c =================================================================== --- head/databases/freetds/files/patch-src_tds_tls.c (nonexistent) +++ head/databases/freetds/files/patch-src_tds_tls.c (revision 388912) @@ -0,0 +1,13 @@ +--- src/tds/tls.c.orig 2015-06-09 10:38:40 UTC ++++ src/tds/tls.c +@@ -46,6 +46,10 @@ + #include + #endif /* HAVE_SYS_STAT_H */ + ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++#include ++#endif ++ + #include + #include + #include Property changes on: head/databases/freetds/files/patch-src_tds_tls.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/pkg-plist =================================================================== --- head/databases/freetds/pkg-plist (revision 388911) +++ head/databases/freetds/pkg-plist (revision 388912) @@ -1,48 +1,49 @@ bin/bsqldb bin/datacopy bin/defncopy bin/freebcp bin/fisql 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/odbcss.h include/sqldb.h include/sqlfront.h include/sybdb.h include/syberror.h include/sybfront.h include/tds_sysdep_public.h 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 man/man1/bsqldb.1.gz man/man1/bsqlodbc.1.gz man/man1/datacopy.1.gz man/man1/defncopy.1.gz man/man1/fisql.1.gz man/man1/freebcp.1.gz man/man1/osql.1.gz man/man1/tsql.1.gz man/man5/freetds.conf.5.gz %%ODBC%%bin/bsqlodbc %%ODBC%%lib/libtdsodbc.so %%ODBC%%lib/libtdsodbc.so.0 %%ODBC%%lib/libtdsodbc.so.0.0.0 %%ODBC%%lib/libtdsodbc.la %%ODBC%%lib/libtdsodbc.a +%%PORTDOCS%%@dir %%DOCSDIR%%/images/callouts