Index: head/databases/freetds/Makefile =================================================================== --- head/databases/freetds/Makefile (revision 387017) +++ head/databases/freetds/Makefile (revision 387018) @@ -1,78 +1,79 @@ # Created by: Domas Mituzas # $FreeBSD$ PORTNAME= freetds PORTVERSION= 0.91.112.0.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.405 TDS_VER?= 5.0 USES= autoreconf iconv gmake pkgconfig libtool:keepla tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LIBS+= -lgcrypt 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/files/patch-doc_Makefile.am =================================================================== --- head/databases/freetds/files/patch-doc_Makefile.am (revision 387017) +++ head/databases/freetds/files/patch-doc_Makefile.am (revision 387018) @@ -1,11 +1,11 @@ ---- doc/Makefile.am.orig 2015-05-10 18:47:04.571197742 +0600 -+++ doc/Makefile.am 2015-05-10 18:47:22.212197672 +0600 -@@ -8,7 +8,7 @@ +--- 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 \ Index: head/databases/freetds/files/patch-include_tdsodbc.h =================================================================== --- head/databases/freetds/files/patch-include_tdsodbc.h (revision 387017) +++ head/databases/freetds/files/patch-include_tdsodbc.h (revision 387018) @@ -1,13 +1,13 @@ ---- include/tdsodbc.h.orig 2006-02-24 21:14:21.000000000 +0000 +--- include/tdsodbc.h.orig 2015-01-29 00:40:17 UTC +++ include/tdsodbc.h -@@ -31,8 +31,8 @@ - #include - #include +@@ -30,8 +30,8 @@ + #include + #endif #else /* IODBC */ -#include -#include +#include +#include #ifdef HAVE_IODBCINST_H #include #endif /* HAVE_IODBCINST_H */