From d7374e06fba3b3782a47d5dfc4c144a34f380f51 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sun, 16 Dec 2012 16:04:12 +0000
Subject: [PATCH] Update to 2.4.6. Fix python interpreter in installed files.

What's new in psycopg 2.4.6
---------------------------

  - Fixed 'cursor()' arguments propagation in connection subclasses
    and overriding of the 'cursor_factory' argument.  Thanks to
    Corry Haines for the report and the initial patch (ticket #105).
  - Dropped GIL release during string adaptation around a function call
    invoking a Python API function, which could cause interpreter crash.
    Thanks to Manu Cupcic for the report (ticket #110).
  - Close a green connection if there is an error in the callback.
    Maybe a harsh solution but it leaves the program responsive
    (ticket #113).
  - 'register_hstore()', 'register_composite()', 'tpc_recover()' work with
    RealDictConnection and Cursor (ticket #114).
  - Fixed broken pool for Zope and connections re-init across ZSQL methods
    in the same request (tickets #123, #125, #142).
  - connect() raises an exception instead of swallowing keyword arguments
    when a connection string is specified as well (ticket #131).
  - Discard any result produced by 'executemany()' (ticket #133).
  - Fixed pickling of FixedOffsetTimezone objects (ticket #135).
  - Release the GIL around PQgetResult calls after COPY (ticket #140).
  - Fixed empty strings handling in composite caster (ticket #141).
  - Fixed pickling of DictRow and RealDictRow objects.
---
 databases/py-psycopg2/Makefile | 7 ++++---
 databases/py-psycopg2/distinfo | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index f32f76b3eb6ff..af5e4a62357c2 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2012/10/02 21:25:50 asau Exp $
+# $NetBSD: Makefile,v 1.22 2012/12/16 16:04:12 wiz Exp $
 
-DISTNAME=	psycopg2-2.4.5
+DISTNAME=	psycopg2-2.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-4/
 
@@ -12,7 +11,9 @@ COMMENT=	PostgreSQL database adapter for Python
 LICENSE=	gnu-lgpl-v3
 
 PYTHON_VERSIONS_INCLUDE_3X=	yes
+REPLACE_PYTHON+=		tests/*.py
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index e1fbd69ff0903..8137ecc7743b4 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2012/04/17 15:44:22 adam Exp $
+$NetBSD: distinfo,v 1.14 2012/12/16 16:04:12 wiz Exp $
 
-SHA1 (psycopg2-2.4.5.tar.gz) = 848b2130d948376e1b962faf72f3a2c93dfb5599
-RMD160 (psycopg2-2.4.5.tar.gz) = 4de915ed108a60ccb7f52e67d7d1e3700a38cd28
-Size (psycopg2-2.4.5.tar.gz) = 719343 bytes
+SHA1 (psycopg2-2.4.6.tar.gz) = 992ac1170284d1cf94e255784f23909621796ce6
+RMD160 (psycopg2-2.4.6.tar.gz) = aed3763e0c5e0e8e3adc32331cc8767d6ab2002a
+Size (psycopg2-2.4.6.tar.gz) = 667783 bytes
 SHA1 (patch-psycopg_config.h) = 4678e0c807a07f350317f414b3a47c99e4c38b91