3 files changed, 11 insertions, 138 deletions
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;