summaryrefslogtreecommitdiff
path: root/databases/freetds-devel/files
diff options
context:
space:
mode:
authorBeech Rintoul <beech@FreeBSD.org>2009-02-14 23:31:43 +0000
committerBeech Rintoul <beech@FreeBSD.org>2009-02-14 23:31:43 +0000
commite23a2ab06e5b84cf4fbcf8c8d6cd8c8fb89ab8b2 (patch)
treeeb803f6c5efe3adbf278d0d66f91275cd32b59ea /databases/freetds-devel/files
parent- Connect security/py-pyclamd to the build (diff)
- Update to 0.82.1
- Hook into build
Diffstat (limited to 'databases/freetds-devel/files')
-rw-r--r--databases/freetds-devel/files/noportdocs-patch-doc__Makefile.in12
-rw-r--r--databases/freetds-devel/files/patch-doc_Makefile.in103
-rw-r--r--databases/freetds-devel/files/patch-src_tds_iconv.c23
3 files changed, 103 insertions, 35 deletions
diff --git a/databases/freetds-devel/files/noportdocs-patch-doc__Makefile.in b/databases/freetds-devel/files/noportdocs-patch-doc__Makefile.in
deleted file mode 100644
index 910087cdb263..000000000000
--- a/databases/freetds-devel/files/noportdocs-patch-doc__Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./doc/Makefile.in.orig 2008-06-16 13:01:18.956170390 +0300
-+++ ./doc/Makefile.in 2008-06-16 13:10:19.492674498 +0300
-@@ -412,8 +412,7 @@
-
- info-am:
-
--install-data-am: install-data-local install-man \
-- install-nobase_dataDATA
-+install-data-am: install-man
-
- install-exec-am:
-
diff --git a/databases/freetds-devel/files/patch-doc_Makefile.in b/databases/freetds-devel/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..069ea22e72a4
--- /dev/null
+++ b/databases/freetds-devel/files/patch-doc_Makefile.in
@@ -0,0 +1,103 @@
+--- doc/Makefile.in.orig 2008-11-11 04:55:16.000000000 -0900
++++ doc/Makefile.in 2008-12-04 01:16:56.000000000 -0900
+@@ -408,25 +408,25 @@
+ echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man5dir)/$$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:
+
+@@ -508,12 +508,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 install-man5
+
+@@ -535,8 +534,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 uninstall-man5
+
+@@ -554,21 +553,21 @@
+ 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 \
+- $(TARGET_DOCDIR)/images/callouts 2>&1
++#installdirs:
++# $(mkinstalldirs) $(TARGET_DOCDIR)/userguide \
++# $(TARGET_DOCDIR)/reference \
++# $(TARGET_DOCDIR)/images \
++# $(TARGET_DOCDIR)/images/callouts 2>&1
+
+ freebcp.1: freebcp.txt
+ $(TXT2MAN) $(MANOPTS) $(srcdir)/freebcp.txt >.$@
diff --git a/databases/freetds-devel/files/patch-src_tds_iconv.c b/databases/freetds-devel/files/patch-src_tds_iconv.c
deleted file mode 100644
index 1899306538c2..000000000000
--- a/databases/freetds-devel/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;