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

(-)./Makefile (-56 / +50 lines)
Lines 2-98 Link Here
2
# $FreeBSD: head/databases/freetds-devel/Makefile 362645 2014-07-23 09:54:02Z tijl $
2
# $FreeBSD: head/databases/freetds-devel/Makefile 362645 2014-07-23 09:54:02Z tijl $
3
3
4
PORTNAME=	freetds
4
PORTNAME=	freetds
5
PORTVERSION=	0.92.79
5
PORTVERSION=	0.92.812
6
PORTREVISION=	2
7
PORTEPOCH=	1
6
PORTEPOCH=	1
8
CATEGORIES=	databases
7
CATEGORIES=	databases
9
MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/
8
MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/current/
10
PKGNAMESUFFIX=	-devel
9
PKGNAMESUFFIX=	-devel
10
DISTNAME=	${PORTNAME}-dev.${PORTVERSION}
11
11
12
MAINTAINER=	pi@FreeBSD.org
12
MAINTAINER=	pi@FreeBSD.org
13
COMMENT=	Sybase/Microsoft TDS protocol library
13
COMMENT=	Sybase/Microsoft TDS protocol library
14
14
15
LICENSE=	LGPL20
15
LICENSE=	LGPL20
16
16
17
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
17
WRKSRC=		${WRKDIR}/${PORTNAME}-dev.${PORTVERSION}
18
TDS_VER?=	5.0
18
TDS_VER?=	7.2
19
USES=		gmake iconv libtool:keepla pkgconfig
19
USES=		gmake iconv libtool:keepla pkgconfig tar:bzip2
20
GNU_GONFIGURE=	yes
20
GNU_GONFIGURE=	yes
21
USE_AUTOTOOLS=	autoconf:env
21
USE_AUTOTOOLS=	autoconf:env
22
CPPFLAGS+=	"-I${LOCALBASE}/include"
22
CPPFLAGS+=	"-I${LOCALBASE}/include"
23
LDFLAGS+=	-L${LOCALBASE}/lib
23
LDFLAGS+=	-L${LOCALBASE}/lib
24
GNU_CONFIGURE=	yes
24
GNU_CONFIGURE=	yes
25
CONFIGURE_ARGS=	--with-tdsver=${TDS_VER}
25
CONFIGURE_ARGS=	--with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \
26
		--enable-msdblib --enable-sybase-compat \
27
		--docdir=${DOCSDIR}
26
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
27
SUB_FILES=	pkg-message
29
SUB_FILES=	pkg-message
28
INSTALL_TARGET=	install-strip
30
INSTALL_TARGET=	install-strip
29
31
30
PORTDOCS=	*
32
OPTIONS_DEFINE=		DOCS ODBCWIDE
31
33
OPTIONS_SINGLE=		SSL
32
# OPTIONS_DEFINE=	OPENSSL GNUTLS IODBC UNIXODBC MSDBLIB
33
OPTIONS_DEFINE=	MSDBLIB ODBCWIDE ODBC
34
35
OPTIONS_SINGLE=	SSL
36
OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
34
OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
37
38
OPTIONS_DEFAULT=	OPENSSL
35
OPTIONS_DEFAULT=	OPENSSL
39
36
OPTIONS_RADIO=		ODBC
40
OPENSSL_DESC=	Use OpenSSL
37
OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
41
GNUTLS_DESC=	Use GnuTLS
38
ODBCWIDE_DESC=		Enable Wide ODBC Support
42
MSDBLIB_DESC=	MS SQL Server compatibility (breaks databases/sybtcl)
39
OPENSSL_USE=		OPENSSL=yes
43
ODBCWIDE_DESC=	Enable Wide ODBC Support
40
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
44
ODBC_DESC=	ODBC driver
41
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
42
GNUTLS_CONFIGURE_ON=	--with-gnutls
43
IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
44
IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
45
IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
46
UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
47
UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
48
ODBCWIDE_CONFIGURE_ON=	--enable-odbc-wide
45
49
46
CONFLICTS=	freetds-0.64.[0-9]
50
CONFLICTS=	freetds-0.64.[0-9]
47
51
48
.include <bsd.port.options.mk>
52
.include <bsd.port.options.mk>
49
53
.if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
50
.if ${PORT_OPTIONS:MOPENSSL}
54
PLIST_SUB+=	ODBC=""
51
USE_OPENSSL=	yes
55
.else
52
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
56
PLIST_SUB+=	ODBC="@comment "
53
.endif
54
55
.if ${PORT_OPTIONS:MODBCWIDE}
56
CONFIGURE_ARGS+=	--enable-odbc-wide
57
.endif
58
59
.if ${PORT_OPTIONS:MGNUTLS}
60
LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
61
CONFIGURE_ARGS+=	--with-gnutls
62
.endif
63
64
LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
65
CONFIGURE_ARGS+=	--with-unixodbc=${LOCALBASE}
66
67
# We cannot use msdblib-style by default, because port databases/sybtcl
68
# relies on sybase-style dblib
69
.if ${PORT_OPTIONS:MMSDBLIB}
70
CONFIGURE_ARGS+=	--enable-msdblib
71
TDS_VER=	7.2
72
.endif
57
.endif
73
58
74
post-extract:
59
post-extract:
75
	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.dist
60
	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample
76
	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.dist
61
	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample
77
	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.dist
62
	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
78
63
79
post-patch:
64
post-patch:
80
	@${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \
65
	@${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \
81
		${WRKSRC}/configure
66
		${WRKSRC}/configure
82
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
67
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
83
		's|<malloc.h>|<stdlib.h>| ; \
68
		's|/pool.conf|/pool.conf.sample|g ; \
84
		 s|/freetds.conf|/freetds.conf.dist|g ; \
85
		 s|/locales.conf|/locales.conf.dist|g ; \
86
		 s|/pool.conf|/pool.conf.dist|g ; \
87
		 s| common.h||g ; \
69
		 s| common.h||g ; \
70
		 s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \
88
		 s|%%ICONV_LIB%%|${ICONV_LIB}|'
71
		 s|%%ICONV_LIB%%|${ICONV_LIB}|'
72
	@${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \
73
		 s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in
74
	@${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \
75
		s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure
89
76
90
post-install:
77
post-install:
91
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
78
	@${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
92
	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} images ${STAGEDIR}${DOCSDIR}
79
.if ${PORT_OPTIONS:MDOCS}
93
	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc/${PORTNAME}-${PORTVERSION}/reference ${STAGEDIR}${DOCSDIR}
80
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/userguide
94
	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} doc/${PORTNAME}-${PORTVERSION}/userguide ${STAGEDIR}${DOCSDIR}
81
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/reference
95
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/freetds
82
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
96
	@${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${PREFIX}/etc/freetds/interfaces.dist
83
	@${FIND} ${WRKSRC}/doc/userguide \( -type f -o -type l \) \
84
		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/userguide ';'
85
	@${FIND} ${WRKSRC}/doc/reference \( -type f -o -type l \) \
86
		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/reference ';'
87
	@${FIND} ${WRKSRC}/doc/images -name \*.gif \
88
		-exec  ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/images/ ';'
89
90
.endif
97
91
98
.include <bsd.port.mk>
92
.include <bsd.port.mk>
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (freetds-0.92.79.tar.gz) = 06b9b3fe797552d93365f1f1f84051f6c292bb0f9fca06a3475852700cf71f50
1
SHA256 (freetds-dev.0.92.812.tar.bz2) = 6ac35250b24214de3635e2b8647e1b903f8482b72f5ff7b92cdde6280811c074
2
SIZE (freetds-0.92.79.tar.gz) = 2059576
2
SIZE (freetds-dev.0.92.812.tar.bz2) = 1149663
(-)./files/patch-doc_Makefile.in (-39 / +12 lines)
Lines 1-47 Link Here
1
--- doc/Makefile.in.orig	2011-09-06 20:44:07.000000000 +0200
1
--- doc/Makefile.in.orig	2014-09-23 16:23:48.662499737 +0600
2
+++ doc/Makefile.in	2011-09-06 20:54:10.000000000 +0200
2
+++ doc/Makefile.in	2014-09-23 16:24:52.193494422 +0600
3
@@ -507,7 +507,7 @@
3
@@ -671,16 +671,7 @@
4
 
5
 info-am:
6
 
7
-install-data-am: install-data-local install-man
8
+install-data-am: install-man
9
 
10
 install-dvi: install-dvi-am
11
 
12
@@ -561,7 +561,7 @@
13
 	clean-local dist-hook distclean distclean-generic \
14
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
15
 	install install-am install-data install-data-am \
16
-	install-data-local install-dvi install-dvi-am install-exec \
17
+	install-dvi install-dvi-am install-exec \
18
 	install-exec-am install-html install-html-am install-info \
19
 	install-info-am install-man install-man1 install-man5 \
20
 	install-pdf install-pdf-am install-ps install-ps-am \
21
@@ -641,16 +641,16 @@
22
 
4
 
23
 # If we built the documentation ourselves, install that, 
5
 # If we built the documentation ourselves, install that, 
24
 # else if we have access to distributed documentation, install that.  
6
 # else if we have access to distributed documentation, install that.  
25
-install-data-local: installdirs $(noinst_DATA)
7
-install-data-local: $(INSTALLDIRS) $(noinst_DATA)
26
-	$(mkinstalldirs) $(DOCDIR) 2>&1
8
-	$(MKDIR_P) $(DOCDIR) 2>&1
27
-	if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \
9
-	if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \
28
-	find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \
10
-	find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) \
29
-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/userguide ';'
11
-		-exec $(INSTALL) {} $(TARGET_DOCDIR)/userguide ';'
30
-	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
12
-	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
31
-	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
13
-	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) \
32
-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
14
-		-exec $(INSTALL) {} $(TARGET_DOCDIR)/reference ';'
33
-	cd $(srcdir) && find images -name \*.gif -exec \
15
-	find $(srcdir)/images -name \*.gif \
34
-		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
16
-		-exec  $(INSTALL) {} $(TARGET_DOCDIR)/images/ ';'
35
+#install-data-local: installdirs $(noinst_DATA)
17
+install-data-local:
36
+#	$(mkinstalldirs) $(DOCDIR) 2>&1
37
+#	if test -r $(DOCDIR)/userguide ; then d=.; else d="$(srcdir)"; fi; \
38
+#	find $$d/$(DOCDIR)/userguide \( -type f -o -type l \) -exec \
39
+#		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/userguide ';'
40
+#	if test -r $(DOCDIR)/reference ; then d=.; else d="$(srcdir)"; fi; \
41
+#	find $$d/$(DOCDIR)/reference \( -type f -o -type l \) -exec \
42
+#		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/reference ';'
43
+#	cd $(srcdir) && find images -name \*.gif -exec \
44
+#		$(INSTALL_DATA) {} $(TARGET_DOCDIR)/{} ';'
45
 
18
 
46
 uninstall-local:
19
 uninstall-local:
47
 	rm -rf $(TARGET_DOCDIR)
20
 	rm -rf $(TARGET_DOCDIR)
(-)./files/patch-include_freetds_tds.h (+10 lines)
Line 0 Link Here
1
--- include/freetds/tds.h.orig	2014-09-23 06:16:52.725008992 +0600
2
+++ include/freetds/tds.h	2014-09-23 06:17:12.953007371 +0600
3
@@ -146,7 +146,6 @@
4
 	TDS_INT      date;	/**< date, 0 = 1900-01-01 */
5
 	TDS_SMALLINT offset;	/**< time offset */
6
 	TDS_USMALLINT time_prec:3;
7
-	TDS_USMALLINT _res:10;
8
 	TDS_USMALLINT has_time:1;
9
 	TDS_USMALLINT has_date:1;
10
 	TDS_USMALLINT has_offset:1;
(-)./pkg-plist (-11 / +30 lines)
Lines 6-15 Link Here
6
bin/osql
6
bin/osql
7
bin/tdspool
7
bin/tdspool
8
bin/tsql
8
bin/tsql
9
etc/freetds/interfaces.dist
9
@sample %%ETCDIR%%/freetds.conf.sample
10
etc/freetds.conf.dist
10
@sample %%ETCDIR%%/interfaces.sample
11
etc/locales.conf.dist
11
@sample %%ETCDIR%%/locales.conf.sample
12
etc/pool.conf.dist
12
@sample %%ETCDIR%%/pool.conf.sample
13
include/bkpublic.h
13
include/bkpublic.h
14
include/cspublic.h
14
include/cspublic.h
15
include/cstypes.h
15
include/cstypes.h
Lines 40-49 Link Here
40
lib/libsybdb.so
40
lib/libsybdb.so
41
lib/libsybdb.so.5
41
lib/libsybdb.so.5
42
lib/libsybdb.so.5.0.0
42
lib/libsybdb.so.5.0.0
43
lib/libtdsodbc.so.0.0.0
43
%%ODBC%%lib/libtdsodbc.so.0.0.0
44
lib/libtdsodbc.so.0
44
%%ODBC%%lib/libtdsodbc.so.0
45
lib/libtdsodbc.so
45
%%ODBC%%lib/libtdsodbc.so
46
lib/libtdsodbc.la
46
%%ODBC%%lib/libtdsodbc.la
47
lib/libtdsodbc.a
47
%%ODBC%%lib/libtdsodbc.a
48
bin/bsqlodbc
48
%%ODBC%%bin/bsqlodbc
49
@dirrm etc/freetds
49
%%PORTDOCS%%%%DOCSDIR%%/images/1.gif
50
%%PORTDOCS%%%%DOCSDIR%%/images/10.gif
51
%%PORTDOCS%%%%DOCSDIR%%/images/2.gif
52
%%PORTDOCS%%%%DOCSDIR%%/images/3.gif
53
%%PORTDOCS%%%%DOCSDIR%%/images/4.gif
54
%%PORTDOCS%%%%DOCSDIR%%/images/5.gif
55
%%PORTDOCS%%%%DOCSDIR%%/images/6.gif
56
%%PORTDOCS%%%%DOCSDIR%%/images/7.gif
57
%%PORTDOCS%%%%DOCSDIR%%/images/8.gif
58
%%PORTDOCS%%%%DOCSDIR%%/images/9.gif
59
%%PORTDOCS%%%%DOCSDIR%%/images/caution.gif
60
%%PORTDOCS%%%%DOCSDIR%%/images/important.gif
61
%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
62
%%PORTDOCS%%%%DOCSDIR%%/images/tip.gif
63
%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
64
%%PORTDOCS%%%%DOCSDIR%%/reference/index.html
65
%%PORTDOCS%%%%DOCSDIR%%/userguide/index.htm
66
%%PORTDOCS%%%%DOCSDIR%%/userguide/index.html
67
%%PORTDOCS%%@dirrm %%DOCSDIR%%
68
@dirrm %%ETCDIR%%

Return to bug 193866