On Sun, Sep 12, 2010 at 2:49 AM, Stuart Henderson <s...@spacehopper.org> wrote:
> On 2010/09/11 18:20, Ryan Boggs wrote:
>> Attached is the diff to bring py-odbc to 2.1.8 for testing and
>> committing. It's been working for me on i386.
>
> I couldn't get this one to package; egg.info changed to being a
> directory and the file modes in the tar.gz are too lenient. Attached
> diff fixes these (and regenerates patches) but I haven't tested
> operation yet.
>
Odd, my patch worked fine for me. Oh well, I tested your patch below
and it works fine. If you commit this, please use your diff. Thanks
for your help on this. :)
Thanks,
Ryan
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/py-odbc/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 30 Aug 2010 20:53:57 -0000 1.2
> +++ Makefile 12 Sep 2010 09:47:50 -0000
> @@ -4,10 +4,9 @@ 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,14 +18,20 @@ 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
>
> CFLAGS += -fPIC -I${LOCALBASE}/include -L${LOCALBASE}/lib
>
> NO_REGRESS = Yes
> +
> +post-extract:
> + chmod -R og-w ${WRKSRC}
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/databases/py-odbc/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 31 Jul 2009 10:21:04 -0000 1.1.1.1
> +++ distinfo 12 Sep 2010 09:47:50 -0000
> @@ -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
> Index: patches/patch-setup_py
> ===================================================================
> RCS file: /cvs/ports/databases/py-odbc/patches/patch-setup_py,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-setup_py
> --- patches/patch-setup_py 31 Jul 2009 10:21:04 -0000 1.1.1.1
> +++ patches/patch-setup_py 12 Sep 2010 09:47:50 -0000
> @@ -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():
> +--- 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) ]
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/databases/py-odbc/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 31 Jul 2009 10:21:04 -0000 1.1.1.1
> +++ pkg/PLIST 12 Sep 2010 09:47:50 -0000
> @@ -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
> +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
>
>
