From owner-svn-ports-head@freebsd.org  Mon Jul 18 21:06:54 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3D02B9BD03;
 Mon, 18 Jul 2016 21:06:54 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 766D81E7C;
 Mon, 18 Jul 2016 21:06:54 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6IL6rTf028061;
 Mon, 18 Jul 2016 21:06:53 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6IL6rlj028057;
 Mon, 18 Jul 2016 21:06:53 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201607182106.u6IL6rlj028057@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 18 Jul 2016 21:06:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r418751 - in head/databases/py-pymssql: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jul 2016 21:06:54 -0000

Author: amdmi3
Date: Mon Jul 18 21:06:53 2016
New Revision: 418751
URL: https://svnweb.freebsd.org/changeset/ports/418751

Log:
  - Fix build after FreeTDS update by porting upstream commit ec46fea
  
  PR:		210363
  Reported by:	ports@thelanman.net (maintainer), pkg-fallout
  Approved by:	portmgr blanket

Added:
  head/databases/py-pymssql/files/patch-__mssql.pyx   (contents, props changed)
  head/databases/py-pymssql/files/patch-sqlfront.pxd   (contents, props changed)
Modified:
  head/databases/py-pymssql/Makefile

Modified: head/databases/py-pymssql/Makefile
==============================================================================
--- head/databases/py-pymssql/Makefile	Mon Jul 18 21:01:10 2016	(r418750)
+++ head/databases/py-pymssql/Makefile	Mon Jul 18 21:06:53 2016	(r418751)
@@ -19,8 +19,11 @@ LIB_DEPENDS=	libsybdb.so:databases/freet
 USES=		python
 USE_PYTHON=	autoplist distutils
 
+post-extract:
+	@${RM} -f ${WRKSRC}/_mssql.c
+
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mssql.so \
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mssql.so \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pymssql.so
 
 .include <bsd.port.mk>

Added: head/databases/py-pymssql/files/patch-__mssql.pyx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/py-pymssql/files/patch-__mssql.pyx	Mon Jul 18 21:06:53 2016	(r418751)
@@ -0,0 +1,16 @@
+--- _mssql.pyx.orig	2014-10-24 22:03:00 UTC
++++ _mssql.pyx
+@@ -1677,12 +1677,10 @@ cdef int _tds_ver_str_to_constant(verstr
+         return DBVERSION_42
+     if verstr == u'7.0':
+         return DBVERSION_70
+-    if verstr == u'7.1':
++    if verstr in (u'7.1', u'8.0'):
+         return DBVERSION_71
+     if verstr == u'7.2':
+         return DBVERSION_72
+-    if verstr == u'8.0':
+-        return DBVERSION_80
+     raise MSSQLException('unrecognized tds version: %s' % verstr)
+ 
+ #######################

Added: head/databases/py-pymssql/files/patch-sqlfront.pxd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/py-pymssql/files/patch-sqlfront.pxd	Mon Jul 18 21:06:53 2016	(r418751)
@@ -0,0 +1,10 @@
+--- sqlfront.pxd.orig	2014-08-29 22:32:11 UTC
++++ sqlfront.pxd
+@@ -106,7 +106,6 @@ cdef extern from "sqlfront.h":
+     int DBVERSION_70
+     int DBVERSION_71
+     int DBVERSION_72
+-    int DBVERSION_80
+ 
+     ## Type Constants ##
+     cdef enum: