From 4f974132378fce8bd22c476defb4b397acddb1f7 Mon Sep 17 00:00:00 2001
From: benoit <benoit@openbsd.org>
Date: Mon, 7 Jan 2013 13:07:04 +0000
Subject: [PATCH] - update py-pygresql to 4.1 - update WANTLIB and MASTER_SITES
 - add MODPY_SETUPTOOLS - update patches - regen PLIST

---
 databases/py-pygresql/Makefile               | 11 ++++---
 databases/py-pygresql/distinfo               |  7 ++--
 databases/py-pygresql/patches/patch-setup_py | 11 -------
 databases/py-pygresql/pkg/PLIST              | 34 +++++++++++---------
 4 files changed, 27 insertions(+), 36 deletions(-)
 delete mode 100644 databases/py-pygresql/patches/patch-setup_py

diff --git a/databases/py-pygresql/Makefile b/databases/py-pygresql/Makefile
index 6464a3981dd..d5c7d5fd841 100644
--- a/databases/py-pygresql/Makefile
+++ b/databases/py-pygresql/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2011/11/04 08:16:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2013/01/07 13:07:04 benoit Exp $
 
 COMMENT =	PostgreSQL module for Python
 
-MODPY_EGG_VERSION =	4.0
+MODPY_EGG_VERSION =	4.1
 DISTNAME =		PyGreSQL-${MODPY_EGG_VERSION}
 PKGNAME =		py-pygresql-${MODPY_EGG_VERSION}
 CATEGORIES =		databases
-REVISION =		3
 
 HOMEPAGE =		http://www.pygresql.org/
 
@@ -20,14 +19,16 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MODULES =	lang/python
 LIB_DEPENDS =	databases/postgresql
-WANTLIB +=	pq>=5 ${MODPY_WANTLIB}
+WANTLIB +=	pq>=5 ${MODPY_WANTLIB} pthread
 BUILD_DEPENDS =	databases/postgresql,-server
 RUN_DEPENDS =	databases/postgresql,-main
 
-MASTER_SITES =	ftp://ftp.pygresql.org/pub/distrib/
+MASTER_SITES =	${HOMEPAGE}/files/
 EXTRACT_SUFX =	.tgz
 NO_REGRESS =	Yes
 
+MODPY_SETUPTOOLS = Yes
+
 post-patch:
 	${SUBST_CMD} ${WRKSRC}/tutorial/advanced.py ${WRKSRC}/tutorial/basics.py
 
diff --git a/databases/py-pygresql/distinfo b/databases/py-pygresql/distinfo
index 3d403d0fe3d..79f11a7ee25 100644
--- a/databases/py-pygresql/distinfo
+++ b/databases/py-pygresql/distinfo
@@ -1,5 +1,2 @@
-MD5 (PyGreSQL-4.0.tgz) = GspQ5Z/0zFar6UUqmknF/w==
-RMD160 (PyGreSQL-4.0.tgz) = YzNk3aoBFm2yAXVOAFBn0hFZGGQ=
-SHA1 (PyGreSQL-4.0.tgz) = +usxtsjWK/VsrQD/j763QmYjQis=
-SHA256 (PyGreSQL-4.0.tgz) = xX6Tg13oqIHnFLryF9erASKX1vBFBFTjzeUIk3v2vJs=
-SIZE (PyGreSQL-4.0.tgz) = 89528
+SHA256 (PyGreSQL-4.1.tgz) = ULOxQrj2FtX6ObzwRLpiORLCJVb+hppUbmcDB60Z1nM=
+SIZE (PyGreSQL-4.1.tgz) = 99073
diff --git a/databases/py-pygresql/patches/patch-setup_py b/databases/py-pygresql/patches/patch-setup_py
deleted file mode 100644
index 216c0c52207..00000000000
--- a/databases/py-pygresql/patches/patch-setup_py
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2010/11/18 20:48:05 benoit Exp $
---- setup.py.orig	Thu Jan  1 14:05:02 2009
-+++ setup.py	Sun Nov 14 01:07:28 2010
-@@ -76,7 +76,6 @@
-                 '#undef USE_REPL_SNPRINTF',
-                 '#undef USE_SSL',
-                 '#undef USE_ZLIB',
--                '#undef HAVE_STDINT_H',
-                 '#undef HAVE_SYS_TIME_H',
-                 '#undef HAVE_UNISTD_H',
-                 '#define _CRT_SECURE_NO_WARNINGS 1',
diff --git a/databases/py-pygresql/pkg/PLIST b/databases/py-pygresql/pkg/PLIST
index 6b4e07fb31e..ca29ee359cc 100644
--- a/databases/py-pygresql/pkg/PLIST
+++ b/databases/py-pygresql/pkg/PLIST
@@ -1,20 +1,24 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/08 16:53:22 wcmaier Exp $
-lib/python${MODPY_VERSION}/site-packages/PyGreSQL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+@comment $OpenBSD: PLIST,v 1.2 2013/01/07 13:07:08 benoit Exp $
+lib/python${MODPY_VERSION}/site-packages/PyGreSQL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/PyGreSQL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/PyGreSQL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/PyGreSQL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/PyGreSQL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/_pg.so
 lib/python${MODPY_VERSION}/site-packages/pg.py
 lib/python${MODPY_VERSION}/site-packages/pg.pyc
 lib/python${MODPY_VERSION}/site-packages/pgdb.py
 lib/python${MODPY_VERSION}/site-packages/pgdb.pyc
-share/doc/py-pygresql/
-share/doc/py-pygresql/announce.txt
-share/doc/py-pygresql/changelog.txt
-share/doc/py-pygresql/future.txt
-share/doc/py-pygresql/install.txt
-share/doc/py-pygresql/pg.txt
-share/doc/py-pygresql/pgdb.txt
-share/doc/py-pygresql/readme.txt
-share/examples/py-pygresql/
-share/examples/py-pygresql/advanced.py
-share/examples/py-pygresql/basics.py
-share/examples/py-pygresql/func.py
-share/examples/py-pygresql/syscat.py
+share/doc/${MODPY_PY_PREFIX}pygresql/
+share/doc/${MODPY_PY_PREFIX}pygresql/announce.txt
+share/doc/${MODPY_PY_PREFIX}pygresql/changelog.txt
+share/doc/${MODPY_PY_PREFIX}pygresql/future.txt
+share/doc/${MODPY_PY_PREFIX}pygresql/install.txt
+share/doc/${MODPY_PY_PREFIX}pygresql/pg.txt
+share/doc/${MODPY_PY_PREFIX}pygresql/pgdb.txt
+share/doc/${MODPY_PY_PREFIX}pygresql/readme.txt
+share/examples/${MODPY_PY_PREFIX}pygresql/
+share/examples/${MODPY_PY_PREFIX}pygresql/advanced.py
+share/examples/${MODPY_PY_PREFIX}pygresql/basics.py
+share/examples/${MODPY_PY_PREFIX}pygresql/func.py
+share/examples/${MODPY_PY_PREFIX}pygresql/syscat.py