From 45722cbf4710eda5276cf41d08008411ca59dacd Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 14 Sep 2010 13:16:04 +0000
Subject: [PATCH] update pyodbc to 2.1.8; from Ryan Boggs with plist fix from
 me ok jasper@

---
 databases/py-odbc/Makefile               | 11 ++++++++---
 databases/py-odbc/distinfo               | 10 +++++-----
 databases/py-odbc/patches/patch-setup_py | 10 +++++-----
 databases/py-odbc/pkg/PLIST              |  8 ++++++--
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index 4226b5d7d02..74c094fc3fb 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2010/08/30 20:53:57 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 2010/09/14 13:16:04 sthen Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	ODBC bindings for Python
 
-MODPY_EGG_VERSION=2.1.6
+MODPY_EGG_VERSION=2.1.8
 DISTNAME =	pyodbc-${MODPY_EGG_VERSION}
 PKGNAME =	${DISTNAME:S/py/py-/}
-REVISION =	0
 
 CATEGORIES =	databases
 
@@ -19,9 +18,12 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
+WANTLIB += m stdc++
+
 MASTER_SITES =	${HOMEPAGE}files/
 EXTRACT_SUFX =	.zip
 
+MODPY_SETUPTOOLS = Yes
 MODULES =	lang/python
 LIB_DEPENDS =	iodbc::databases/iodbc
 
@@ -29,4 +31,7 @@ CFLAGS +=	-fPIC -I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 NO_REGRESS =	Yes
 
+post-extract:
+	chmod -R og-w ${WRKSRC}
+
 .include <bsd.port.mk>
diff --git a/databases/py-odbc/distinfo b/databases/py-odbc/distinfo
index 65978e74ef0..d6eb9efcc73 100644
--- a/databases/py-odbc/distinfo
+++ b/databases/py-odbc/distinfo
@@ -1,5 +1,5 @@
-MD5 (pyodbc-2.1.6.zip) = qYO+hrYQSFiO/jB5tXDySQ==
-RMD160 (pyodbc-2.1.6.zip) = batk2YekjUINaTb4NJ6KpDYm0jQ=
-SHA1 (pyodbc-2.1.6.zip) = OKOXIgRYQMaHydvJPTojV7HZI58=
-SHA256 (pyodbc-2.1.6.zip) = Ckt463KUxSmZbtUsZdVpaCOuCQRrU5e8KSflesQ47gg=
-SIZE (pyodbc-2.1.6.zip) = 150127
+MD5 (pyodbc-2.1.8.zip) = fJz7shr9ZfsgurEn3Feckw==
+RMD160 (pyodbc-2.1.8.zip) = e8okv2A/hAwvMlOQklS8RqH9PJI=
+SHA1 (pyodbc-2.1.8.zip) = OyoGamCfkgIlmH7Rjfy+2VcEpL8=
+SHA256 (pyodbc-2.1.8.zip) = 5A9meTO8Pv4yMwScVpWmu8lyd2FbbTKAO3tzbm6KGBM=
+SIZE (pyodbc-2.1.8.zip) = 137810
diff --git a/databases/py-odbc/patches/patch-setup_py b/databases/py-odbc/patches/patch-setup_py
index 80092a3ee8e..fe5cbf413c3 100644
--- a/databases/py-odbc/patches/patch-setup_py
+++ b/databases/py-odbc/patches/patch-setup_py
@@ -1,12 +1,12 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2009/07/31 10:21:04 sthen Exp $
---- setup.py.orig	Fri Jul 17 23:37:31 2009
-+++ setup.py	Fri Jul 17 23:37:40 2009
-@@ -58,7 +58,7 @@ def main():
+$OpenBSD: patch-setup_py,v 1.2 2010/09/14 13:16:04 sthen Exp $
+--- setup.py.orig	Mon Sep  6 12:32:26 2010
++++ setup.py	Sun Sep 12 10:35:54 2010
+@@ -63,7 +63,7 @@ def main():
          extra_compile_args = ['-Wno-write-strings']
  
          # What is the proper way to detect iODBC, MyODBC, unixODBC, etc.?
 -        libraries.append('odbc')
 +        libraries.append('iodbc')
  
-     macros = [('PYODBC_%s' % name, value) for name,value in zip(['MAJOR', 'MINOR', 'MICRO', 'BUILD'], version)]
+     macros = [ ('PYODBC_VERSION', version_str) ]
  
diff --git a/databases/py-odbc/pkg/PLIST b/databases/py-odbc/pkg/PLIST
index 08ff636273f..82aae6c5810 100644
--- a/databases/py-odbc/pkg/PLIST
+++ b/databases/py-odbc/pkg/PLIST
@@ -1,3 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/07/31 10:21:04 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/pyodbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+@comment $OpenBSD: PLIST,v 1.2 2010/09/14 13:16:04 sthen Exp $
+lib/python${MODPY_VERSION}/site-packages/pyodbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/pyodbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/pyodbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/pyodbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pyodbc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pyodbc.so