[Midnightbsd-cvs] mports [19512] trunk/databases/freetds: freetds 0.95.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Jun 23 21:04:15 EDT 2015 

Revision: 19512
          http://svnweb.midnightbsd.org/mports/?rev=19512
Author:   laffer1
Date:     2015-06-23 21:04:14 -0400 (Tue, 23 Jun 2015)
Log Message:
-----------
freetds 0.95.8

Modified Paths:
--------------
    trunk/databases/freetds/Makefile
    trunk/databases/freetds/distinfo
    trunk/databases/freetds/pkg-plist

Added Paths:
-----------
    trunk/databases/freetds/files/patch-include_freetds_tds.h
    trunk/databases/freetds/files/patch-src_tds_tls.c

Removed Paths:
-------------
    trunk/databases/freetds/files/patch-doc_Makefile.in
    trunk/databases/freetds/files/patch-include_tdsodbc.h

Modified: trunk/databases/freetds/Makefile
===================================================================
--- trunk/databases/freetds/Makefile	2015-06-21 21:13:25 UTC (rev 19511)
+++ trunk/databases/freetds/Makefile	2015-06-24 01:04:14 UTC (rev 19512)
@@ -2,8 +2,8 @@
 # $FreeBSD: head/databases/freetds/Makefile 369379 2014-09-27 08:31:58Z riggs $
 
 PORTNAME=	freetds
-PORTVERSION=	0.91.103
-PORTREVISION=	1
+PORTVERSION=	0.95.8
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/stable/
@@ -17,12 +17,11 @@
 
 TDS_VER?=	5.0
 
-USES=		iconv gmake pkgconfig libtool:keepla
+USES=		autoreconf iconv gmake libtool:keepla pkgconfig readline tar:bzip2
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:env
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		-lgcrypt
+LIBS+=		-lgcrypt -lpthread
 CONFIGURE_ARGS=	--with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \
 	       	--enable-sybase-compat --enable-msdblib
 USE_LDCONFIG=	yes
@@ -30,7 +29,10 @@
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		OPENSSL GNUTLS DOCS
+OPTIONS_DEFINE=		DOCS
+OPTIONS_SINGLE=		SSL
+OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
+OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_RADIO=		ODBC
 OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
 OPENSSL_USE=		OPENSSL=yes
@@ -57,21 +59,16 @@
 	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.am" | ${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
+	@${REINPLACE_CMD} -e 's|\(\$with_iodbc/include\)|\1/libiodbc|g' \
+		${WRKSRC}/configure.ac
 
 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
+	${INSTALL_DATA} ${WRKSRC}/interfaces ${ETCDIR}/interfaces.sample
 
 .include <bsd.port.mk>

Modified: trunk/databases/freetds/distinfo
===================================================================
--- trunk/databases/freetds/distinfo	2015-06-21 21:13:25 UTC (rev 19511)
+++ trunk/databases/freetds/distinfo	2015-06-24 01:04:14 UTC (rev 19512)
@@ -1,2 +1,2 @@
-SHA256 (freetds-0.91.103.tar.gz) = 895cdce6d2af65f79db5e7034d1eba5dd3b63369a0c6b5fbc890e606c699556b
-SIZE (freetds-0.91.103.tar.gz) = 2061912
+SHA256 (freetds-0.95.8.tar.bz2) = ace9f99993235c4a1e407981eea1cb345dd304f1703a9accfb8835296786d2fb
+SIZE (freetds-0.95.8.tar.bz2) = 3204333

Deleted: trunk/databases/freetds/files/patch-doc_Makefile.in
===================================================================
--- trunk/databases/freetds/files/patch-doc_Makefile.in	2015-06-21 21:13:25 UTC (rev 19511)
+++ trunk/databases/freetds/files/patch-doc_Makefile.in	2015-06-24 01:04:14 UTC (rev 19512)
@@ -1,11 +0,0 @@
---- 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 \

Added: trunk/databases/freetds/files/patch-include_freetds_tds.h
===================================================================
--- trunk/databases/freetds/files/patch-include_freetds_tds.h	                        (rev 0)
+++ trunk/databases/freetds/files/patch-include_freetds_tds.h	2015-06-24 01:04:14 UTC (rev 19512)
@@ -0,0 +1,14 @@
+--- include/freetds/tds.h.orig	2015-06-09 10:34:04 UTC
++++ include/freetds/tds.h
+@@ -144,7 +144,10 @@ typedef struct
+ 	TDS_INT      date;	/**< date, 0 = 1900-01-01 */
+ 	TDS_SMALLINT offset;	/**< time offset */
+ 	TDS_USMALLINT time_prec:3;
+-	TDS_USMALLINT _res:10;
++#pragma push_macro("_res")
++#undef _res
++        TDS_USMALLINT _res:10;
++#pragma pop_macro("_res")
+ 	TDS_USMALLINT has_time:1;
+ 	TDS_USMALLINT has_date:1;
+ 	TDS_USMALLINT has_offset:1;


Property changes on: trunk/databases/freetds/files/patch-include_freetds_tds.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/databases/freetds/files/patch-include_tdsodbc.h
===================================================================
--- trunk/databases/freetds/files/patch-include_tdsodbc.h	2015-06-21 21:13:25 UTC (rev 19511)
+++ trunk/databases/freetds/files/patch-include_tdsodbc.h	2015-06-24 01:04:14 UTC (rev 19512)
@@ -1,13 +0,0 @@
---- include/tdsodbc.h.orig	2006-02-24 21:14:21.000000000 +0000
-+++ include/tdsodbc.h
-@@ -31,8 +31,8 @@
- #include <sql.h>
- #include <sqlext.h>
- #else /* IODBC */
--#include <isql.h>
--#include <isqlext.h>
-+#include <libiodbc/isql.h>
-+#include <libiodbc/isqlext.h>
- #ifdef HAVE_IODBCINST_H
- #include <iodbcinst.h>
- #endif /* HAVE_IODBCINST_H */

Added: trunk/databases/freetds/files/patch-src_tds_tls.c
===================================================================
--- trunk/databases/freetds/files/patch-src_tds_tls.c	                        (rev 0)
+++ trunk/databases/freetds/files/patch-src_tds_tls.c	2015-06-24 01:04:14 UTC (rev 19512)
@@ -0,0 +1,13 @@
+--- src/tds/tls.c.orig	2015-06-09 10:38:40 UTC
++++ src/tds/tls.c
+@@ -46,6 +46,10 @@
+ #include <sys/stat.h>
+ #endif /* HAVE_SYS_STAT_H */
+ 
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <sys/socket.h>
++#endif
++
+ #include <freetds/tds.h>
+ #include <freetds/string.h>
+ #include <freetds/tls.h>


Property changes on: trunk/databases/freetds/files/patch-src_tds_tls.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/freetds/pkg-plist
===================================================================
--- trunk/databases/freetds/pkg-plist	2015-06-21 21:13:25 UTC (rev 19511)
+++ trunk/databases/freetds/pkg-plist	2015-06-24 01:04:14 UTC (rev 19512)
@@ -46,3 +46,4 @@
 %%ODBC%%lib/libtdsodbc.so.0.0.0
 %%ODBC%%lib/libtdsodbc.la
 %%ODBC%%lib/libtdsodbc.a
+%%PORTDOCS%%@dir %%DOCSDIR%%/images/callouts

More information about the Midnightbsd-cvs mailing list