Attachment #147379 for bug #193686

View | Details | Raw Unified | Return to bug 193686
Collapse All | Expand All




# $FreeBSD: head/databases/freetds/Makefile 365246 2014-08-17 20:46:37Z marino $

PORTNAME=	freetds
PORTVERSION=	0.91.103
PORTREVISION=	11
PORTEPOCH=	1
CATEGORIES=	databases
MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/

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 pkgconfig libtool:keepla
GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	autoconf:env
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
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_RADIO_ODBC=	IODBC UNIXODBC
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.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.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 <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (freetds-0.64.tar.gz) = 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b	1	SHA256 (freetds-0.91.103.tar.gz) = 895cdce6d2af65f79db5e7034d1eba5dd3b63369a0c6b5fbc890e606c699556b
2	SIZE (freetds-0.64.tar.gz) = 1414954	2	SIZE (freetds-0.91.103.tar.gz) = 2061912




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




--- 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 \
-	  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 >.$@




--- 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;




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
etc/locales.conf.dist
etc/pool.conf.dist
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

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 %%ETCDIR%%

Return to bug 193686

Lines 2-88 Link Here

(-)./Makefile (-48 / +39 lines)
2	# $FreeBSD: head/databases/freetds/Makefile 365246 2014-08-17 20:46:37Z marino $	2	# $FreeBSD: head/databases/freetds/Makefile 365246 2014-08-17 20:46:37Z marino $
3		3
4	PORTNAME= freetds	4	PORTNAME= freetds
5	PORTVERSION= 0.64	5	PORTVERSION= 0.91.103
6	PORTREVISION= 11
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= databases	7	CATEGORIES= databases
9	MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/${FEDORALOC}/	8	MASTER_SITES= ftp://ftp.freetds.org/pub/freetds/stable/
10		9
11	MAINTAINER?= ports@FreeBSD.org	10	MAINTAINER= 5u623l20@gmail.com
12	COMMENT= Sybase/Microsoft TDS protocol library	11	COMMENT= Sybase/Microsoft TDS protocol library
13		12
		13	LICENSE= GPLv2
		14
		15	LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt
		16
14	TDS_VER?= 5.0	17	TDS_VER?= 5.0
15		18
16	USES= iconv gmake libtool:keepla	19	USES= iconv gmake pkgconfig libtool:keepla
17	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
18	USE_AUTOTOOLS= autoconf:env	21	USE_AUTOTOOLS= autoconf:env
19	CPPFLAGS+= -I${LOCALBASE}/include	22	CPPFLAGS+= -I${LOCALBASE}/include
20	LDFLAGS+= -L${LOCALBASE}/lib	23	LDFLAGS+= -L${LOCALBASE}/lib
21	CONFIGURE_ARGS= --with-tdsver=${TDS_VER}	24	LIBS+= -lgcrypt
		25	CONFIGURE_ARGS= --with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR}
22	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
23	INSTALL_TARGET= install-strip	27	INSTALL_TARGET= install-strip
24	FEDORALOC= freetds/freetds-0.64.tar.gz/ecfee5d6c96932172a1f29fb215c9d23
25		28
26	PORTDOCS= *	29	PORTDOCS= *
27		30
28	OPTIONS_DEFINE= OPENSSL GNUTLS MSDBLIB DOCS	31	OPTIONS_DEFINE= OPENSSL GNUTLS MSDBLIB DOCS
29	OPTIONS_RADIO= ODBC	32	OPTIONS_RADIO= ODBC
30	OPTIONS_RADIO_ODBC= IODBC UNIXODBC	33	OPTIONS_RADIO_ODBC= IODBC UNIXODBC
31	MSDBLIB_DESC= MS SQL Server support (breaks databases/sybtcl)	34	MSDBLIB_DESC= MS SQL Server support (breaks databases/sybtcl)
		35	OPENSSL_USE= OPENSSL=yes
		36	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
		37	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
		38	GNUTLS_CONFIGURE_ON= --with-gnutls
		39	IODBC_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc
		40	IODBC_CONFIGURE_ON= --with-iodbc=${LOCALBASE}
		41	IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc
		42	UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC
		43	UNIXODBC_CONFIGURE_ON= --with-unixodbc=${LOCALBASE}
		44	# We cannot use msdblib-style by default, because port databases/sybtcl
		45	# relies on sybase-style dblib
		46	MSDBLIB_CONFIGURE_ON= --enable-msdblib
32		47
33	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>
34		49
35	.if ${PORT_OPTIONS:MOPENSSL}
36	USE_OPENSSL= yes
37	CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
38	.endif
39
40	.if ${PORT_OPTIONS:MGNUTLS}
41	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
42	CONFIGURE_ARGS+=--with-gnutls
43	.endif
44
45	.if ${PORT_OPTIONS:MIODBC}
46	LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc
47	CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE}
48	.endif
49
50	.if ${PORT_OPTIONS:MUNIXODBC}
51	LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
52	CONFIGURE_ARGS+= --with-unixodbc=${LOCALBASE}
53	.endif
54
55	.if ${PORT_OPTIONS:MIODBC} \|\| ${PORT_OPTIONS:MUNIXODBC}	50	.if ${PORT_OPTIONS:MIODBC} \|\| ${PORT_OPTIONS:MUNIXODBC}
56	PLIST_SUB+= ODBC=""	51	PLIST_SUB+= ODBC=""
57	.else	52	.else
58	PLIST_SUB+= ODBC="@comment "	53	PLIST_SUB+= ODBC="@comment "
59	.endif	54	.endif
60		55
61	# We cannot use msdblib-style by default, because port databases/sybtcl
62	# relies on sybase-style dblib
63	.if ${PORT_OPTIONS:MMSDBLIB}
64	CONFIGURE_ARGS+= --enable-msdblib
65	.endif
66
67	post-extract:	56	post-extract:
68	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist	57	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample
69	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist	58	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample
70	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist	59	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
71		60
72	post-patch:	61	post-patch:
73	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	62	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
74	's\|<malloc.h>\|<stdlib.h>\| ; \	63	's\|<malloc.h>\|<stdlib.h>\| ; \
75	s\|/freetds.conf\|/freetds.conf.dist\|g ; \	64	s\|/freetds.conf\|/freetds.conf.sample\|g ; \
76	s\|/locales.conf\|/locales.conf.dist\|g ; \	65	s\|/locales.conf\|/locales.conf.sample\|g ; \
77	s\|/pool.conf\|/pool.conf.dist\|g ; \	66	s\|/pool.conf\|/pool.conf.sample\|g ; \
78	s\| common.h\|\|g'	67	s\| common.h\|\|g'
		68	@${REINPLACE_CMD} -e 's\|$$ODBC_INC/isql.h\|$$ODBC_INC/libiodbc/isql.h\|g ; \
		69	s\|$$ODBC_INC/isqlext.h\|$$ODBC_INC/libiodbc/isqlext.h\|g' ${WRKSRC}/configure
79		70
80	post-install:	71	post-install:
81	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}	72	@${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
82	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}	73	.if ${PORT_OPTIONS:MDOCS}
83	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/freetds	74	@${MKDIR} ${STAGEDIR}${DOCSDIR}
84	@${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${PREFIX}/etc/freetds/interfaces.dist	75	@(cd ${WRKSRC}/doc/doc/${PORTNAME}-${PORTVERSION} && \
85	@${ECHO_CMD} "Sample configuration files have been installed in ${PREFIX}/etc"	76	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
86	@${ECHO_CMD} "You should edit them and remove the .dist-suffix from their names"	77	.endif
87		78
88	.include <bsd.port.mk>	79	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)./files/patch-configure (-14 lines)
1	diff -rub work/freetds-0.64/configure /tmp/freetds-0.64/configure
2	--- configure 2006-07-01 08:10:31.000000000 -0700
3	+++ configure 2009-08-31 22:42:17.000000000 -0700
4	@@ -20088,8 +20088,8 @@
5	#define HAVE_GNUTLS 1
6	_ACEOF
7
8	- CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
9	- NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
10	+ CPPFLAGS="$CPPFLAGS `pkg-config --cflags gnutls`"
11	+ NETWORK_LIBS="$NETWORK_LIBS `pkg-config --libs gnutls`"
12	else
13	echo "$as_me:$LINENO: checking if openssl is wanted" >&5
14	echo $ECHO_N "checking if openssl is wanted... $ECHO_C" >&6

Lines 1-101 Link Here

(-)./files/patch-doc_Makefile.in (-101 / +11 lines)
1	--- doc/Makefile.in.orig 2006-07-01 07:10:33.000000000 -0800	1	--- doc/Makefile.in.orig 2014-09-16 20:53:09.681073696 +0600
2	+++ doc/Makefile.in 2009-03-02 20:16:21.000000000 -0900	2	+++ doc/Makefile.in 2014-09-16 20:53:24.383067403 +0600
3	@@ -312,25 +312,25 @@	3	@@ -254,7 +254,7 @@
4	echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \	4	TXT2MAN = $(srcdir)/txt2man
5	rm -f "$(DESTDIR)$(man1dir)/$$inst"; \	5	DOCDIR = doc/freetds-$(VERSION)
6	done	6	PRODUCT = FreeTDS
7	-install-nobase_dataDATA: $(nobase_data_DATA)	7	-TARGET_DOCDIR = $(DESTDIR)$(datadir)/$(DOCDIR)
8	- @$(NORMAL_INSTALL)	8	+TARGET_DOCDIR = $(DESTDIR)$(datadir)/doc/freetds
9	- test -z "$(datadir)" \|\| $(mkdir_p) "$(DESTDIR)$(datadir)"	9	IMAGES = images/important.gif \
10	- @$(am__vpath_adj_setup) \	10	images/note.gif \
11	- list='$(nobase_data_DATA)'; for p in $$list; do \	11	images/tip.gif \
12	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
13	- $(am__vpath_adj) \
14	- echo " $(nobase_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
15	- $(nobase_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
16	- done
17	-
18	-uninstall-nobase_dataDATA:
19	- @$(NORMAL_UNINSTALL)
20	- @$(am__vpath_adj_setup) \
21	- list='$(nobase_data_DATA)'; for p in $$list; do \
22	- $(am__vpath_adj) \
23	- echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
24	- rm -f "$(DESTDIR)$(datadir)/$$f"; \
25	- done
26	+#install-nobase_dataDATA: $(nobase_data_DATA)
27	+# @$(NORMAL_INSTALL)
28	+# test -z "$(datadir)" \|\| $(mkdir_p) "$(DESTDIR)$(datadir)"
29	+# @$(am__vpath_adj_setup) \
30	+# list='$(nobase_data_DATA)'; for p in $$list; do \
31	+# if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
32	+# $(am__vpath_adj) \
33	+# echo " $(nobase_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
34	+# $(nobase_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
35	+# done
36	+
37	+#uninstall-nobase_dataDATA:
38	+# @$(NORMAL_UNINSTALL)
39	+# @$(am__vpath_adj_setup) \
40	+# list='$(nobase_data_DATA)'; for p in $$list; do \
41	+# $(am__vpath_adj) \
42	+# echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
43	+# rm -f "$(DESTDIR)$(datadir)/$$f"; \
44	+# done
45	tags: TAGS
46	TAGS:
47
48	@@ -412,12 +412,11 @@
49
50	info-am:
51
52	-install-data-am: install-data-local install-man \
53	- install-nobase_dataDATA
54	+install-data-am: install-man
55
56	install-exec-am:
57
58	-install-info: install-info-am
59	+#install-info: install-info-am
60
61	install-man: install-man1
62
63	@@ -439,8 +438,8 @@
64
65	ps-am:
66
67	-uninstall-am: uninstall-info-am uninstall-local uninstall-man \
68	- uninstall-nobase_dataDATA
69	+#uninstall-am: uninstall-info-am uninstall-local uninstall-man \
70	+
71
72	uninstall-man: uninstall-man1
73
74	@@ -457,20 +456,20 @@
75	uninstall-nobase_dataDATA
76
77
78	-$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
79	+#$(DOCDIR)/userguide: $(DOCDIR)/userguide/index.htm
80
81	-$(DOCDIR)/reference: $(DOCDIR)/reference/index.html
82	+#$(DOCDIR)/reference: $(DOCDIR)/reference/index.html
83
84	-doc: $(DOCDIR)/userguide $(DOCDIR)/reference
85	+#doc: $(DOCDIR)/userguide $(DOCDIR)/reference
86
87	dist: man
88
89	man: $(man_MANS)
90
91	-installdirs:
92	- $(mkinstalldirs) $(TARGET_DOCDIR)/userguide \
93	- $(TARGET_DOCDIR)/reference \
94	- $(TARGET_DOCDIR)/images 2>&1
95	+#installdirs:
96	+# $(mkinstalldirs) $(TARGET_DOCDIR)/userguide \
97	+# $(TARGET_DOCDIR)/reference \
98	+# $(TARGET_DOCDIR)/images 2>&1
99
100	freebcp.1: freebcp.txt
101	$(TXT2MAN) $(MANOPTS) $(srcdir)/freebcp.txt >.$@

Lines 1-23 Link Here

(-)./files/patch-src_tds_iconv.c (-23 lines)
1	--- src/tds/iconv.c.orig Sat Jan 13 16:27:13 2007
2	+++ src/tds/iconv.c Sat Jan 13 16:29:24 2007
3	@@ -973,13 +973,18 @@ tds_srv_charset_changed(TDSSOCKET * tds,
4	#if HAVE_ICONV_ALWAYS
5	TDSICONV *char_conv = tds->char_convs[client2server_chardata];
6
7	- const char *canonic_charset = tds_canonical_charset_name(charset);
8	+ int canonic_charset_num = tds_canonical_charset(charset);
9	+ const char *canonic_charset;
10	+
11	+ if (tds->major_version >= 7 && canonic_charset_num == TDS_CHARSET_ISO_8859_1)
12	+ canonic_charset_num = TDS_CHARSET_CP1252;
13
14	/* ignore request to change to unknown charset */
15	- if (!canonic_charset) {
16	+ if (canonic_charset_num < 0) {
17	tdsdump_log(TDS_DBG_FUNC, "tds_srv_charset_changed: what is charset \"%s\"?\n", charset);
18	return;
19	}
20	+ canonic_charset = canonic_charsets[canonic_charset_num].name;
21
22	if (strcmp(canonic_charset, char_conv->server_charset.name) == 0)
23	return;

Lines 1-27 Link Here

(-)./pkg-plist (-21 / +15 lines)
		1	bin/bsqldb
1	bin/datacopy	2	bin/datacopy
		3	bin/defncopy
2	bin/freebcp	4	bin/freebcp
		5	bin/fisql
		6	bin/osql
3	bin/tdspool	7	bin/tdspool
4	bin/tsql	8	bin/tsql
5	bin/bsqldb	9	@sample %%ETCDIR%%/freetds.conf.sample
6	bin/defncopy	10	@sample %%ETCDIR%%/interfaces.sample
7	etc/freetds.conf.dist	11	@sample %%ETCDIR%%/locales.conf.sample
8	etc/freetds/interfaces.dist	12	@sample %%ETCDIR%%/pool.conf.sample
9	etc/locales.conf.dist
10	etc/pool.conf.dist
11	include/bkpublic.h	13	include/bkpublic.h
12	include/cspublic.h	14	include/cspublic.h
13	include/cstypes.h	15	include/cstypes.h
14	include/ctpublic.h	16	include/ctpublic.h
		17	include/odbcss.h
15	include/sqldb.h	18	include/sqldb.h
16	include/sqlfront.h	19	include/sqlfront.h
17	include/sybdb.h	20	include/sybdb.h
18	include/syberror.h	21	include/syberror.h
19	include/sybfront.h	22	include/sybfront.h
20	include/tds.h
21	include/tds_sysdep_public.h	23	include/tds_sysdep_public.h
22	include/tdsconvert.h
23	include/tdssrv.h
24	include/tdsver.h
25	lib/libct.a	24	lib/libct.a
26	lib/libct.la	25	lib/libct.la
27	lib/libct.so	26	lib/libct.so
Lines 32-55 Link Here
32	lib/libsybdb.so	31	lib/libsybdb.so
33	lib/libsybdb.so.5	32	lib/libsybdb.so.5
34	lib/libsybdb.so.5.0.0	33	lib/libsybdb.so.5.0.0
35	lib/libtds.a
36	lib/libtds.la
37	lib/libtds.so
38	lib/libtds.so.5
39	lib/libtds.so.5.0.0
40	lib/libtdssrv.a
41	lib/libtdssrv.la
42	lib/libtdssrv.so
43	lib/libtdssrv.so.2
44	lib/libtdssrv.so.2.0.0
45	man/man1/bsqldb.1.gz	34	man/man1/bsqldb.1.gz
		35	man/man1/bsqlodbc.1.gz
46	man/man1/datacopy.1.gz	36	man/man1/datacopy.1.gz
47	man/man1/defncopy.1.gz	37	man/man1/defncopy.1.gz
		38	man/man1/fisql.1.gz
48	man/man1/freebcp.1.gz	39	man/man1/freebcp.1.gz
		40	man/man1/osql.1.gz
49	man/man1/tsql.1.gz	41	man/man1/tsql.1.gz
		42	man/man5/freetds.conf.5.gz
		43	%%ODBC%%bin/bsqlodbc
50	%%ODBC%%lib/libtdsodbc.so	44	%%ODBC%%lib/libtdsodbc.so
51	%%ODBC%%lib/libtdsodbc.so.0	45	%%ODBC%%lib/libtdsodbc.so.0
52	%%ODBC%%lib/libtdsodbc.so.0.0.0	46	%%ODBC%%lib/libtdsodbc.so.0.0.0
53	%%ODBC%%lib/libtdsodbc.la	47	%%ODBC%%lib/libtdsodbc.la
54	%%ODBC%%lib/libtdsodbc.a	48	%%ODBC%%lib/libtdsodbc.a
55	@dirrm etc/freetds	49	@dirrm %%ETCDIR%%