4 files changed, 12 insertions, 47 deletions

diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index fb9389569ff3..b198db0ae719 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -1,53 +1,31 @@
 # Created by: April 15 2009
 # $FreeBSD$
 
-NO_STAGE=	yes
-# 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@gmail.com
 COMMENT=	ODBC connections for python
 
 USE_ZIP=	yes
-USE_GMAKE=	yes
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
+PYDISTUTILS_AUTOPLIST=	yes
 PYEASYINSTALL_ARCHDEP=	yes
 
-# again, shamelessly copied from datebase/postgres-odbc
-.if !defined(WITH_IODBC)
-WITH_UNIXODBC=	yes
-.endif
+OPTIONS_DEFINE= UNIXODBC
+OPTIONS_DEFAULT=UNIXODBC
 
-.if defined(WITH_UNIXODBC)
-# I.e. even if WITH_IODBC is defined
-LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MUNIXODBC}
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
 BUILD_DEPENDS+=	unixODBC>=2.2.14_1:${PORTSDIR}/databases/unixODBC
 .else
-LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
+LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
 .endif
 
-do-build:
-	@(cd ${WRKSRC}; ${PYTHON_CMD} setup.py build)
-
-do-install:
-	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
-	@(cd ${WRKSRC}; ${SETENV} PYTHONPATH=${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} setup.py install --prefix=${PREFIX})
-
 .include <bsd.port.mk>
diff --git a/databases/py-odbc/distinfo b/databases/py-odbc/distinfo
index eaa059fa3bd7..cb94e356c15a 100644
--- a/databases/py-odbc/distinfo
+++ b/databases/py-odbc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyodbc-3.0.6.zip) = e5a7f12deddf4b258bed904b5a071dd43c40c78de8e24c9228f8174e69f5366d
-SIZE (pyodbc-3.0.6.zip) = 85518
+SHA256 (pyodbc-3.0.7.zip) = d8355f2d43b10386070e8564aa973119fdb6e10864e1bbd73f3224cd3baab351
+SIZE (pyodbc-3.0.7.zip) = 85722
diff --git a/databases/py-odbc/files/patch-src_pyodbc.h b/databases/py-odbc/files/patch-src_pyodbc.h
deleted file mode 100644
index 96f99b0f8027..000000000000
--- a/databases/py-odbc/files/patch-src_pyodbc.h
+++ /dev/null
@@ -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))
diff --git a/databases/py-odbc/pkg-plist b/databases/py-odbc/pkg-plist
deleted file mode 100644
index ddf68a1c022f..000000000000
--- a/databases/py-odbc/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%