Update to version 4.2.

This is the last version before adding support for Python 3.x.  Only bug
fixes will be added to this branch.  From the changelog:

Version 4.2
-----------
- The supported Python versions are 2.4 to 2.7.
- PostgreSQL is supported in all versions from 8.3 to 9.5.
- Set a better default for the user option "escaping-funcs".
- Force build to compile with no errors.
- New methods get_parameters() and set_parameters() in the classic interface
  which can be used to get or set run-time parameters.
- New method truncate() in the classic interface that can be used to quickly
  empty a table or a set of tables.
- Fix decimal point handling.
- Add option to return boolean values as bool objects.
- Add option to return money values as string.
- get_tables() does not list information schema tables any more.
- Fix notification handler (Thanks Patrick TJ McPhee).
- Fix a small issue with large objects.
- Minor improvements in the NotificationHandler.
- Converted documentation to Sphinx and added many missing parts.
- The tutorial files have become a chapter in the documentation.
- Greatly improved unit testing, tests run with Python 2.4 to 2.7 again.

4 files changed, 10 insertions, 77 deletions

diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 1a88b8a6f9a..996e3fa4277 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.72 2015/12/05 21:25:32 adam Exp $
+# $NetBSD: Makefile,v 1.73 2016/01/21 22:17:55 darcy Exp $
 
-DISTNAME=		PyGreSQL-4.1.1
-PKGNAME=		${PYPKGPREFIX}-postgresql-4.1.1
+DISTNAME=		PyGreSQL-4.2
+PKGNAME=		${PYPKGPREFIX}-postgresql-4.2
 CATEGORIES=		databases python
 MASTER_SITES=		http://pygresql.org/files/
 EXTRACT_SUFX=		.tgz
-PKGREVISION=	1
 
 OWNER=			darcy@NetBSD.org
 HOMEPAGE=		http://www.PyGreSQL.org/
diff --git a/databases/py-postgresql/PLIST b/databases/py-postgresql/PLIST
index 4477f6456b4..ca590c7454b 100644
--- a/databases/py-postgresql/PLIST
+++ b/databases/py-postgresql/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2013/01/03 16:56:22 darcy Exp $
+@comment $NetBSD: PLIST,v 1.11 2016/01/21 22:17:55 darcy Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/_pg.so
 ${PYSITELIB}/pg.py
@@ -10,23 +11,7 @@ ${PYSITELIB}/pg.pyo
 ${PYSITELIB}/pgdb.py
 ${PYSITELIB}/pgdb.pyc
 ${PYSITELIB}/pgdb.pyo
-share/doc/${PYPKGPREFIX}-postgresql/docs/announce.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/announce.txt
-share/doc/${PYPKGPREFIX}-postgresql/docs/changelog.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/changelog.txt
-share/doc/${PYPKGPREFIX}-postgresql/docs/default.css
-share/doc/${PYPKGPREFIX}-postgresql/docs/docs.css
-share/doc/${PYPKGPREFIX}-postgresql/docs/future.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/future.txt
 share/doc/${PYPKGPREFIX}-postgresql/docs/index.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/install.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/install.txt
-share/doc/${PYPKGPREFIX}-postgresql/docs/pg.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/pg.txt
-share/doc/${PYPKGPREFIX}-postgresql/docs/pgdb.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/pgdb.txt
-share/doc/${PYPKGPREFIX}-postgresql/docs/readme.html
-share/doc/${PYPKGPREFIX}-postgresql/docs/readme.txt
 share/doc/${PYPKGPREFIX}-postgresql/tutorial/advanced.py
 share/doc/${PYPKGPREFIX}-postgresql/tutorial/basics.py
 share/doc/${PYPKGPREFIX}-postgresql/tutorial/func.py
diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo
index e3dbe20f1cf..8590ea629da 100644
--- a/databases/py-postgresql/distinfo
+++ b/databases/py-postgresql/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 01:56:28 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/01/21 22:17:55 darcy Exp $
 
-SHA1 (PyGreSQL-4.1.1.tgz) = eafd5b9ae92102bec088c7f2fe3ce3b359eb60c4
-RMD160 (PyGreSQL-4.1.1.tgz) = 5cd30aceb7cb82acb2e3a36045be30b21112dd3f
-SHA512 (PyGreSQL-4.1.1.tgz) = 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f
-Size (PyGreSQL-4.1.1.tgz) = 100883 bytes
-SHA1 (patch-setup.py) = 7b81bbd56e35b6449173480595bce4e74b2de641
+SHA1 (PyGreSQL-4.2.tgz) = be880f33af77de0e3611f19a8f2ccfc3921a02de
+RMD160 (PyGreSQL-4.2.tgz) = 298252f2abed7c380b963a2f84bde7707ac432af
+SHA512 (PyGreSQL-4.2.tgz) = faa97cf1461f3287815f595969d23b4f48b9a2cfe153615564c61ab2da05d44c47099cdabc0d8b59d8a5c08619404acd2527a99eab59130cb666c7d2cb63f7ee
+Size (PyGreSQL-4.2.tgz) = 49094 bytes
diff --git a/databases/py-postgresql/patches/patch-setup.py b/databases/py-postgresql/patches/patch-setup.py
deleted file mode 100644
index 2018cb707e1..00000000000
--- a/databases/py-postgresql/patches/patch-setup.py
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2014/03/05 11:14:00 darcy Exp $
-
-  * Fix when building against PostgreSQL < 9.0:
-    http://shell.vex.net/viewvc.cgi/pygresql?view=revision&revision=517
-    http://thread.gmane.org/gmane.comp.python.db.pygresql/1175
-
---- setup.py.orig	2013-01-08 14:47:33.000000000 +0000
-+++ setup.py
-@@ -68,6 +68,17 @@ def pg_config(s):
-     return d
- 
- 
-+def pg_version():
-+    """Return the PostgreSQL version as a tuple of integers."""
-+    parts = []
-+    for part in pg_config('version').split()[-1].split('.'):
-+        if part.isdigit():
-+            part = int(part)
-+        parts.append(part)
-+    return tuple(parts or [8])
-+
-+
-+pg_version = pg_version()
- py_modules = ['pg', 'pgdb']
- libraries = ['pq']
- # Make sure that the Python header files are searched before
-@@ -95,7 +106,7 @@ class build_pg_ext(build_ext):
-             "enable string escaping functions")]
- 
-     boolean_options = build_ext.boolean_options + [
--        'direct-access', 'large-objects', 'default-vars']
-+        'direct-access', 'large-objects', 'default-vars', 'escaping-funcs']
- 
-     def get_compiler(self):
-         """Return the C compiler used for building the extension."""
-@@ -103,10 +114,10 @@ class build_pg_ext(build_ext):
- 
-     def initialize_options(self):
-         build_ext.initialize_options(self)
--        self.direct_access = 1
--        self.large_objects = 1
--        self.default_vars = 1
--        self.escaping_funcs = 1
-+        self.direct_access = True
-+        self.large_objects = True
-+        self.default_vars = True
-+        self.escaping_funcs = pg_version[0] >= 9
- 
-     def finalize_options(self):
-         """Set final values for all build_pg options."""