6 files changed, 67 insertions, 209 deletions

diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 76f3089cb90b..4655a92207e1 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -2,87 +2,78 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.64
-PORTREVISION=	11
+PORTVERSION=	0.91.103
 PORTEPOCH=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/${FEDORALOC}/
+MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Sybase/Microsoft TDS protocol library
 
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
 TDS_VER?=	5.0
 
-USES=		iconv gmake libtool:keepla
+USES=		iconv gmake pkgconfig libtool:keepla
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
+LIBS+=		-lgcrypt
+CONFIGURE_ARGS=	--with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR}
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-FEDORALOC=	freetds/freetds-0.64.tar.gz/ecfee5d6c96932172a1f29fb215c9d23
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	OPENSSL GNUTLS MSDBLIB DOCS
-OPTIONS_RADIO=	ODBC
+OPTIONS_DEFINE=		OPENSSL GNUTLS MSDBLIB DOCS
+OPTIONS_RADIO=		ODBC
 OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
-MSDBLIB_DESC=	MS SQL Server support (breaks databases/sybtcl)
+MSDBLIB_DESC=		MS SQL Server support (breaks databases/sybtcl)
+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}
+# We cannot use msdblib-style by default, because port databases/sybtcl
+# relies on sybase-style dblib
+MSDBLIB_CONFIGURE_ON=	--enable-msdblib
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-.endif
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=--with-gnutls
-.endif
-
-.if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+=	--with-iodbc=${LOCALBASE}
-.endif
-
-.if ${PORT_OPTIONS:MUNIXODBC}
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
-.endif
-
 .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
-# We cannot use msdblib-style by default, because port databases/sybtcl
-# relies on sybase-style dblib
-.if ${PORT_OPTIONS:MMSDBLIB}
-CONFIGURE_ARGS+=	--enable-msdblib
-.endif
-
 post-extract:
-	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
-	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
-	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist
+	@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.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>| ; \
-		 s|/freetds.conf|/freetds.conf.dist|g ; \
-		 s|/locales.conf|/locales.conf.dist|g ; \
-		 s|/pool.conf|/pool.conf.dist|g ; \
+		 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:
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/freetds
-	@${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${PREFIX}/etc/freetds/interfaces.dist
-	@${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"
-	@${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"
+	@${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 <bsd.port.mk>
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index 540c70cfb3c3..de9c65669b41 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freetds-0.64.tar.gz) = 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b
-SIZE (freetds-0.64.tar.gz) = 1414954
+SHA256 (freetds-0.91.103.tar.gz) = 895cdce6d2af65f79db5e7034d1eba5dd3b63369a0c6b5fbc890e606c699556b
+SIZE (freetds-0.91.103.tar.gz) = 2061912
diff --git a/databases/freetds/files/patch-configure b/databases/freetds/files/patch-configure
deleted file mode 100644
index 186d35f59da8..000000000000
--- a/databases/freetds/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rub work/freetds-0.64/configure /tmp/freetds-0.64/configure
---- configure	2006-07-01 08:10:31.000000000 -0700
-+++ configure	2009-08-31 22:42:17.000000000 -0700
-@@ -20088,8 +20088,8 @@
- #define HAVE_GNUTLS 1
- _ACEOF
- 
--	CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
--	NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
-+	CPPFLAGS="$CPPFLAGS `pkg-config --cflags gnutls`"
-+	NETWORK_LIBS="$NETWORK_LIBS `pkg-config --libs gnutls`"
- else
- 	echo "$as_me:$LINENO: checking if openssl is wanted" >&5
- echo $ECHO_N "checking if openssl is wanted... $ECHO_C" >&6
diff --git a/databases/freetds/files/patch-doc_Makefile.in b/databases/freetds/files/patch-doc_Makefile.in
index 47d480885ce2..427d9eb212e6 100644
--- a/databases/freetds/files/patch-doc_Makefile.in
+++ b/databases/freetds/files/patch-doc_Makefile.in
@@ -1,101 +1,11 @@
---- doc/Makefile.in.orig	2006-07-01 07:10:33.000000000 -0800
-+++ doc/Makefile.in	2009-03-02 20:16:21.000000000 -0900
-@@ -312,25 +312,25 @@
- 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
- 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--install-nobase_dataDATA: $(nobase_data_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
--	@$(am__vpath_adj_setup) \
--	list='$(nobase_data_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  $(am__vpath_adj) \
--	  echo " $(nobase_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
--	  $(nobase_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
--	done
--
--uninstall-nobase_dataDATA:
--	@$(NORMAL_UNINSTALL)
--	@$(am__vpath_adj_setup) \
--	list='$(nobase_data_DATA)'; for p in $$list; do \
--	  $(am__vpath_adj) \
--	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
--	done
-+#install-nobase_dataDATA: $(nobase_data_DATA)
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-+#	@$(am__vpath_adj_setup) \
-+#	list='$(nobase_data_DATA)'; for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  $(am__vpath_adj) \
-+#	  echo " $(nobase_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-+#	  $(nobase_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
-+#	done
-+
-+#uninstall-nobase_dataDATA:
-+#	@$(NORMAL_UNINSTALL)
-+#	@$(am__vpath_adj_setup) \
-+#	list='$(nobase_data_DATA)'; for p in $$list; do \
-+#	  $(am__vpath_adj) \
-+#	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-+#	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
-+#	done
- tags: TAGS
- TAGS:
- 
-@@ -412,12 +412,11 @@
- 
- info-am:
- 
--install-data-am: install-data-local install-man \
--	install-nobase_dataDATA
-+install-data-am: install-man
- 
- install-exec-am:
- 
--install-info: install-info-am
-+#install-info: install-info-am
- 
- install-man: install-man1
- 
-@@ -439,8 +438,8 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-local uninstall-man \
--	uninstall-nobase_dataDATA
-+#uninstall-am: uninstall-info-am uninstall-local uninstall-man \
-+
- 
- uninstall-man: uninstall-man1
- 
-@@ -457,20 +456,20 @@
- 	uninstall-nobase_dataDATA
- 
- 
--$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
-+#$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
- 
--$(DOCDIR)/reference: $(DOCDIR)/reference/index.html
-+#$(DOCDIR)/reference: $(DOCDIR)/reference/index.html
- 
--doc:  $(DOCDIR)/userguide $(DOCDIR)/reference
-+#doc:  $(DOCDIR)/userguide $(DOCDIR)/reference
- 
- dist:	man
- 
- man:	$(man_MANS)
- 
--installdirs: 
--	$(mkinstalldirs)	$(TARGET_DOCDIR)/userguide    \
--				$(TARGET_DOCDIR)/reference    \
--				$(TARGET_DOCDIR)/images 2>&1
-+#installdirs: 
-+#	$(mkinstalldirs)	$(TARGET_DOCDIR)/userguide    \
-+#				$(TARGET_DOCDIR)/reference    \
-+#				$(TARGET_DOCDIR)/images 2>&1
- 
- freebcp.1: freebcp.txt
- 	$(TXT2MAN) $(MANOPTS) $(srcdir)/freebcp.txt >.$@
+--- doc/Makefile.in.orig	2014-09-16 20:53:09.681073696 +0600
++++ doc/Makefile.in	2014-09-16 20:53:24.383067403 +0600
+@@ -254,7 +254,7 @@
+ 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 \
+ 		images/tip.gif \
diff --git a/databases/freetds/files/patch-src_tds_iconv.c b/databases/freetds/files/patch-src_tds_iconv.c
deleted file mode 100644
index 1899306538c2..000000000000
--- a/databases/freetds/files/patch-src_tds_iconv.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/tds/iconv.c.orig	Sat Jan 13 16:27:13 2007
-+++ src/tds/iconv.c	Sat Jan 13 16:29:24 2007
-@@ -973,13 +973,18 @@ tds_srv_charset_changed(TDSSOCKET * tds,
- #if HAVE_ICONV_ALWAYS
- 	TDSICONV *char_conv = tds->char_convs[client2server_chardata];
- 
--	const char *canonic_charset = tds_canonical_charset_name(charset);
-+	int canonic_charset_num = tds_canonical_charset(charset);
-+	const char *canonic_charset;
-+
-+	if (tds->major_version >= 7 && canonic_charset_num == TDS_CHARSET_ISO_8859_1)
-+		canonic_charset_num = TDS_CHARSET_CP1252;
- 
- 	/* ignore request to change to unknown charset */
--	if (!canonic_charset) {
-+	if (canonic_charset_num < 0) {
- 		tdsdump_log(TDS_DBG_FUNC, "tds_srv_charset_changed: what is charset \"%s\"?\n", charset);
- 		return;
- 	}
-+	canonic_charset = canonic_charsets[canonic_charset_num].name;
- 
- 	if (strcmp(canonic_charset, char_conv->server_charset.name) == 0)
- 		return;
diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist
index 4546caa37d08..2ff9e2eb8cf9 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -1,27 +1,26 @@
+bin/bsqldb
 bin/datacopy
+bin/defncopy
 bin/freebcp
+bin/fisql
+bin/osql
 bin/tdspool
 bin/tsql
-bin/bsqldb
-bin/defncopy
-etc/freetds.conf.dist
-etc/freetds/interfaces.dist
-etc/locales.conf.dist
-etc/pool.conf.dist
+@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.h
 include/tds_sysdep_public.h
-include/tdsconvert.h
-include/tdssrv.h
-include/tdsver.h
 lib/libct.a
 lib/libct.la
 lib/libct.so
@@ -32,24 +31,19 @@ lib/libsybdb.la
 lib/libsybdb.so
 lib/libsybdb.so.5
 lib/libsybdb.so.5.0.0
-lib/libtds.a
-lib/libtds.la
-lib/libtds.so
-lib/libtds.so.5
-lib/libtds.so.5.0.0
-lib/libtdssrv.a
-lib/libtdssrv.la
-lib/libtdssrv.so
-lib/libtdssrv.so.2
-lib/libtdssrv.so.2.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
-@dirrm etc/freetds
+@dirrm %%ETCDIR%%