From 2a77a332fe9ec8cd4c1b7fbba2875da4f71a63f9 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 4 Jul 2013 13:01:36 +0000
Subject: [PATCH] Update to 2.5.1:

What's new in psycopg 2.5.1
---------------------------

- Fixed build on Solaris 10 and 11 where the round() function is already
  declared (:ticket:`#146`).
- Fixed comparison of `Range` with non-range objects (:ticket:`#164`).
  Thanks to Chris Withers for the patch.
- Fixed double-free on connection dealloc (:ticket:`#166`). Thanks to
  Gangadharan S.A. for the report and fix suggestion.
---
 databases/py-psycopg2/Makefile                     |  4 ++--
 databases/py-psycopg2/distinfo                     |  9 ++++-----
 .../py-psycopg2/patches/patch-psycopg_config.h     | 14 --------------
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 databases/py-psycopg2/patches/patch-psycopg_config.h

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 2a2e7fe874c89..6b99eaf2fd9f7 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2013/05/04 23:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/07/04 13:01:36 wiz Exp $
 
-DISTNAME=	psycopg2-2.5
+DISTNAME=	psycopg2-2.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-5/
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index a8ff71c0ac922..0364352a02bb2 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2013/05/04 23:52:45 wiz Exp $
+$NetBSD: distinfo,v 1.16 2013/07/04 13:01:36 wiz Exp $
 
-SHA1 (psycopg2-2.5.tar.gz) = 12fa804b4982da3f2a388654c7827dfa80f01d0a
-RMD160 (psycopg2-2.5.tar.gz) = 9f58dad71642da369caf4e7b009a4025082fc695
-Size (psycopg2-2.5.tar.gz) = 703558 bytes
-SHA1 (patch-psycopg_config.h) = 4678e0c807a07f350317f414b3a47c99e4c38b91
+SHA1 (psycopg2-2.5.1.tar.gz) = 92d18a9e33f86e83c0e2787598f183759159d79a
+RMD160 (psycopg2-2.5.1.tar.gz) = 0eaf7c6718c83d3de91da1787d4762b4e50caf4e
+Size (psycopg2-2.5.1.tar.gz) = 684504 bytes
diff --git a/databases/py-psycopg2/patches/patch-psycopg_config.h b/databases/py-psycopg2/patches/patch-psycopg_config.h
deleted file mode 100644
index 3e9e28b0a35ca..0000000000000
--- a/databases/py-psycopg2/patches/patch-psycopg_config.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-psycopg_config.h,v 1.1 2012/03/12 11:52:28 fhajny Exp $
-
-double defined on SunOS with GCC.
---- psycopg/config.h.orig	2011-06-08 07:42:46.000000000 +0000
-+++ psycopg/config.h
-@@ -141,7 +141,7 @@ static int pthread_mutex_init(pthread_mu
- #endif
- #endif
- 
--#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
-+#if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || ((defined(__sun__) || defined(sun)) && !defined(__GNUC__))
- /* what's this, we have no round function either? */
- static double round(double num)
- {