ports/180580: [maintainer-update] Update to py-odbc port

[Robert Kruus]

>Number:         180580
>Category:       ports
>Synopsis:       [maintainer-update] Update to py-odbc port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 15 18:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Robert Kruus
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
Government of Saskatchewan
>Environment:
FreeBSD wfm.gos.ca 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Wed Aug 11 16:42:44 CST 2010
+root at thunder.gos.ca:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Update to py-odbc port. Update version to 3.0.7 and use new PORT_OPTIONS format and Makefile header. Patch deletes undeeded files/patch-src_pyodbc.h
>How-To-Repeat:
NA
>Fix:
NA

Patch attached with submission follows:

--- py-odbc/Makefile	2013-07-15 12:06:07.796223280 -0600
+++ py-odbc/Makefile	2013-07-15 11:43:20.806879005 -0600
@@ -1,48 +1,30 @@
-# New ports collection makefile for:   pyodbc
-# Date created:        April 15 2009
-# Whom:                rkruus
-#
+# Created by: Robert >kruus
 # $FreeBSD: ports/databases/py-odbc/Makefile,v 1.5 2012/11/17 05:55:22 svnexp Exp $
-#
-
-# Like they say in the postgres-odbc Makefile (and I quote):
-#
-# This ODBC driver should work under either unixODBC or iODBC
-# driver manager, when compliled against one. (Important: Do not try
-# to have both installed -- they have overlapping files).
-
-# It looks like most people are using unixODBC these days, rather than
-# iODBC, so let's make unixODBC the default choice: to select iODBC,
-# set WITH_IODBC, without setting WITH_UNIXODBC.  When the latter is
-# set or when neither is set, we go with WITH_UNIXODBC.
-#
 
 PORTNAME=	pyodbc
-PORTVERSION=	3.0.6
+PORTVERSION=	3.0.7
 CATEGORIES=	databases python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=		pyodbc-${PORTVERSION}
 
 MAINTAINER=	rob.kruus at gmail.com
 COMMENT=	ODBC connections for python
 
+OPTIONS_DEFINE= UNIXODBC
+OPTIONS_DEFAULT=UNIXODBC
+
 USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 
-# again, shamelessly copied from datebase/postgres-odbc
-.if !defined(WITH_IODBC)
-WITH_UNIXODBC=	yes
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_UNIXODBC)
-# I.e. even if WITH_IODBC is defined
-LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
+.if ${PORT_OPTIONS:MUNIXODBC}
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
 BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
 .else
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
 .endif
 
 do-build:
--- py-odbc/files/patch-src_pyodbc.h	2013-07-15 12:06:07.796223280 -0600
+++ /dev/null	2013-07-15 12:08:14.000000000 -0600
@@ -1,12 +0,0 @@
---- src/pyodbc.h.orig	2012-01-13 13:10:48.000000000 -0600
-+++ src/pyodbc.h	2012-12-06 10:21:36.527165345 -0600
-@@ -76,7 +76,9 @@
- #include <stdarg.h>
- 
- #if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || (defined(__GNUC__) && !defined(__MINGW32__))
-+#ifndef __FreeBSD__
- #include <alloca.h>
-+#endif
- #define CDECL cdecl
- #define min(X,Y) ((X) < (Y) ? (X) : (Y))
- #define max(X,Y) ((X) > (Y) ? (X) : (Y))


>Release-Note:
>Audit-Trail:
>Unformatted: