Update py-postgresql to 3.2. Changes from version 3.1 include few bugfixes,

adds a few minor features and makes a few speedups in the code, plus:

  - Fix some DB-API quoting problems (niall.smart@ebeon.com)
  - Moved development into PostgreSQL development tree.

5 files changed, 49 insertions, 58 deletions

diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index ef9245cb809..1db5cc746f3 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,44 +1,55 @@
-# $NetBSD: Makefile,v 1.13 2001/02/16 14:17:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/05/14 14:53:28 jlam Exp $
 
-DISTNAME=	PyGreSQL-3.1
-PKGNAME=	py-postgresql-3.1
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.druid.net/pub/distrib/
-EXTRACT_SUFX=	.tgz
+.include "../../databases/postgresql/Makefile.common"
+.include "../../databases/postgresql/Makefile.ssl"
 
-MAINTAINER=	darcy@NetBSD.org
-HOMEPAGE=	http://www.druid.net/pygresql/
-COMMENT=	PostgreSQL interface for Python
+PKGNAME=		py-postgresql-3.2
+COMMENT=		Python interface to PostgreSQL
 
-DEPENDS+=	python-2.*:../../lang/python
-DEPENDS+=	postgresql-7.*:../../databases/postgresql
-DEPENDS+=	py-mxDateTime-*:../../time/py-mxDateTime
+MAINTAINER=		darcy@netbsd.org
 
-ALL_TARGET=	default
+DEPENDS+=		postgresql-lib>=${PG_BASE_VERS}:../../databases/postgresql-lib
+DEPENDS+=		python>=2.0:../../lang/python
+DEPENDS+=		py-mxDateTime-[0-9]*:../../time/py-mxDateTime
 
-PYTHON=		${LOCALBASE}/bin/python
-PYTHON_LIBDIR=	${LOCALBASE}/lib/python2.0
-PLIST_SUBST+=	PYTHON_LIBDIR=lib/python2.0
+PYTHON=			${LOCALBASE}/bin/python
 
-DOCDIR=		${PREFIX}/share/doc/py-postgresql
+.if exists(${PYTHON})
+.if !defined(PYTHON_VERSION)
+PYTHON_VERSION!=	${PYTHON} -c "import sys; print sys.version[:3]"
+MAKEFLAGS+=		PYTHON_VERSION="${PYTHON_VERSION}"
+.endif
+.endif
 
-do-configure:
-	${SED}	-e "s,@LOCALBASE@,${LOCALBASE},g" \
-		${FILESDIR}/Setup.in > ${WRKSRC}/Setup.in
-	${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
-	cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot
+PYTHON_LIBDIR=		lib/python${PYTHON_VERSION}
+PLIST_SUBST+=		PYTHON_LIBDIR=${PYTHON_LIBDIR}
 
-post-build:
-	cd ${WRKSRC}; ${PYTHON} ${PYTHON_LIBDIR}/compileall.py .
-	cd ${WRKSRC}; ${PYTHON} -O ${PYTHON_LIBDIR}/compileall.py .
+MAKE_ENV+=		INSTALLED_LIBPQ=1
+
+CONFIGURE_ARGS+=	--with-python
+CONFIGURE_ARGS+=	--with-python-compile
+CONFIGURE_ENV+=		PYTHON="${PYTHON}"
+
+DIRS_TO_BUILD=		src/interfaces/python
+DOCDIR=			${PREFIX}/share/doc/py-postgresql
+
+do-build:
+.for DIR in ${DIRS_TO_BUILD}
+	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
+.endfor
+
+do-install:
+.for DIR in ${DIRS_TO_BUILD}
+	cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
+.endfor
 
 post-install:
-	cd ${WRKSRC}; ${INSTALL_SCRIPT} pg*.py pg*.py[co] \
-		${PYTHON_LIBDIR}/site-packages
 	${INSTALL_DATA_DIR} ${DOCDIR}/tutorial
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	for file in ${WRKSRC}/tutorial/*.py; do \
-		${INSTALL_DATA} $${file} ${DOCDIR}/tutorial; \
+	for file in ${WRKSRC}/src/interfaces/python/tutorial/*.py; do	\
+		${INSTALL_DATA} $${file} ${DOCDIR}/tutorial;		\
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo
deleted file mode 100644
index 967d9bb6992..00000000000
--- a/databases/py-postgresql/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:04 agc Exp $
-
-SHA1 (PyGreSQL-3.1.tgz) = 3057c7496ff409d0510e9382b800caca8e819e8a
-Size (PyGreSQL-3.1.tgz) = 44673 bytes
diff --git a/databases/py-postgresql/files/Setup.in b/databases/py-postgresql/files/Setup.in
deleted file mode 100644
index e81b6bf8199..00000000000
--- a/databases/py-postgresql/files/Setup.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: Setup.in,v 1.5 2000/04/09 03:55:36 jlam Exp $
-#
-*shared*
-_pg pgmodule.c -I@LOCALBASE@/include/pgsql -R@LOCALBASE@/lib -L@LOCALBASE@/lib -lpq -lcrypt -DNO_DIRECT
diff --git a/databases/py-postgresql/pkg/DESCR b/databases/py-postgresql/pkg/DESCR
index 521ee7a7337..4a9c558b4ab 100644
--- a/databases/py-postgresql/pkg/DESCR
+++ b/databases/py-postgresql/pkg/DESCR
@@ -1,16 +1,4 @@
-PyGreSQL - v3.0: PostgreSQL module for Python
- 
-  PyGreSQL, version 3.1
-  A Python interface for PostgreSQL database.
-  Written by D'Arcy J.M. Cain, darcy@druid.net
-  Based heavily on code written by Pascal Andre, andre@chimay.via.ecp.fr.
-  Copyright (c) 1995, Pascal ANDRE (andre@via.ecp.fr)
-  Copyright (c) 1997, 1998, 1999, 2000
- 
 PyGreSQL is a python module that interfaces to a PostgreSQL database. It
 embeds the PostgreSQL query library to allow easy use of the powerful
-PostgreSQL features from a Python script.
-
-This version includes support for the Python DB-API.
-
-See README for more information and credits.
+PostgreSQL features from a Python script.  This also includes support for
+the Python DB-API.
diff --git a/databases/py-postgresql/pkg/PLIST b/databases/py-postgresql/pkg/PLIST
index d07125a2152..73111e0929b 100644
--- a/databases/py-postgresql/pkg/PLIST
+++ b/databases/py-postgresql/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2000/12/22 18:41:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/05/14 14:53:28 jlam Exp $
 ${PYTHON_LIBDIR}/site-packages/_pgmodule.so
-${PYTHON_LIBDIR}/site-packages/pg.py
-${PYTHON_LIBDIR}/site-packages/pg.pyc
-${PYTHON_LIBDIR}/site-packages/pg.pyo
-${PYTHON_LIBDIR}/site-packages/pgdb.py
-${PYTHON_LIBDIR}/site-packages/pgdb.pyc
-${PYTHON_LIBDIR}/site-packages/pgdb.pyo
+${PYTHON_LIBDIR}/pg.py
+${PYTHON_LIBDIR}/pg.pyc
+${PYTHON_LIBDIR}/pg.pyo
+${PYTHON_LIBDIR}/pgdb.py
+${PYTHON_LIBDIR}/pgdb.pyc
+${PYTHON_LIBDIR}/pgdb.pyo
 share/doc/py-postgresql/README
 share/doc/py-postgresql/tutorial/advanced.py
 share/doc/py-postgresql/tutorial/basics.py