Import of pkgsrc-2014Q1

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.26 2014/01/27 19:45:45 wiz Exp $
 
-DISTNAME=	psycopg2-2.5
+DISTNAME=	psycopg2-2.5.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	databases python
 MASTER_SITES=	http://initd.org/psycopg/tarballs/PSYCOPG-2-5/
@@ -10,7 +10,6 @@ HOMEPAGE=	http://initd.org/psycopg/
 COMMENT=	PostgreSQL database adapter for Python
 LICENSE=	gnu-lgpl-v3
 
-PYTHON_VERSIONS_INCLUDE_3X=	yes
 REPLACE_PYTHON+=		tests/*.py
 
 .include "../../lang/python/application.mk"

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.17 2014/01/27 19:45:45 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.2.tar.gz) = 96d071f8e4faa07810976640078742b0a944cd13
+RMD160 (psycopg2-2.5.2.tar.gz) = f804790b37d0e57d4d3a48ca7674f26aab550ca3
+Size (psycopg2-2.5.2.tar.gz) = 685762 bytes

databases/py-psycopg2/patches/patch-psycopg_config.h

@@ -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)
- {