update to 1.1.11

changes:
-bugfixes
-support for PostgreSQL 7.4
-support for PostgreSQL geometrical types
-more feature additions...

6 files changed, 18 insertions, 40 deletions

diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 9bbba7f6907..ae79d4f4379 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/16 17:21:34 drochner Exp $
 #
 
-DISTNAME=	psycopg-1.0.14
-PKGNAME=	${PYPKGPREFIX}-psycopg-1.0.14
-PKGREVISION=	2
+DISTNAME=	psycopg-1.1.11
+PKGNAME=	${PYPKGPREFIX}-psycopg-1.1.11
 CATEGORIES=	databases
 MASTER_SITES=	http://initd.org/pub/software/psycopg/
 
@@ -27,5 +26,5 @@ PY_PATCHPLIST=	yes
 .include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../lang/python/extension.mk"
 .include "../../time/py-mxDateTime/buildlink2.mk"
-.include "../../devel/pth/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-psycopg/distinfo b/databases/py-psycopg/distinfo
index cbd1b08f637..f589e81eda7 100644
--- a/databases/py-psycopg/distinfo
+++ b/databases/py-psycopg/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/01/21 19:38:22 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/04/16 17:21:34 drochner Exp $
 
-SHA1 (psycopg-1.0.14.tar.gz) = 4e08eef3bbe22f82b36dc01a76364dc3f5491ae5
-Size (psycopg-1.0.14.tar.gz) = 179153 bytes
-SHA1 (patch-aa) = 1387802888548f23e93e3f14b4dabf0f51e967ae
-SHA1 (patch-ab) = 9c77a52068f0265d3a2d439d1facb705fb63f30e
+SHA1 (psycopg-1.1.11.tar.gz) = 63d249053206ded75f9052f2b049fced08232f40
+Size (psycopg-1.1.11.tar.gz) = 248966 bytes
+SHA1 (patch-aa) = 6423305271831d3d493dc3e47b42b5641f9149a0
diff --git a/databases/py-psycopg/patches/patch-aa b/databases/py-psycopg/patches/patch-aa
index e93628c06b4..8a2dd97d427 100644
--- a/databases/py-psycopg/patches/patch-aa
+++ b/databases/py-psycopg/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/25 14:17:24 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/16 17:21:34 drochner Exp $
 
---- Makefile.pre.in.orig	Fri Oct 25 14:58:03 2002
-+++ Makefile.pre.in	Fri Oct 25 14:58:29 2002
+--- Makefile.pre.in.orig	2003-08-01 12:12:38.000000000 +0200
++++ Makefile.pre.in	2003-08-01 18:33:45.000000000 +0200
 @@ -119,7 +119,7 @@
  RANLIB=		@RANLIB@
  MACHDEP=	@MACHDEP@
  SO=		@SO@
 -LDSHARED=	@LDSHARED@
 +LDSHARED=	@LDSHARED@ @LDFLAGS@
+ BLDSHARED=      @LDSHARED@
  CCSHARED=	@CCSHARED@
  LINKFORSHARED=	@LINKFORSHARED@
- @SET_CCC@
diff --git a/databases/py-psycopg/patches/patch-ab b/databases/py-psycopg/patches/patch-ab
deleted file mode 100644
index 26f786ad920..00000000000
--- a/databases/py-psycopg/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/25 14:17:24 drochner Exp $
-
---- module.h.orig	Fri Oct 25 15:47:23 2002
-+++ module.h	Fri Oct 25 15:55:15 2002
-@@ -31,7 +31,12 @@
- #include <libpq-fe.h>
- #include <time.h>
- #ifndef _WIN32
--#include <pthread.h>
-+#include <pth.h>
-+#define pthread_mutex_t pth_mutex_t
-+#define pthread_mutex_init(m, a) pth_mutex_init(m)
-+#define pthread_mutex_lock(m) pth_mutex_acquire(m, FALSE, NULL)
-+#define pthread_mutex_unlock(m) pth_mutex_release(m)
-+#define pthread_mutex_destroy(m) /* nothing */
- #else
- #include <windows.h>
- #define pthread_mutex_t HANDLE
diff --git a/www/zope25-ZPsycopgDA/Makefile b/www/zope25-ZPsycopgDA/Makefile
index 7335a12ddfb..fe6a5282699 100644
--- a/www/zope25-ZPsycopgDA/Makefile
+++ b/www/zope25-ZPsycopgDA/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/04/16 17:21:34 drochner Exp $
 #
 
-DISTNAME=	psycopg-1.0.14
-PKGNAME=	zope25-ZPsycopgDA-1.0.14
-PKGREVISION=	2
+DISTNAME=	psycopg-1.1.11
+PKGNAME=	zope25-ZPsycopgDA-1.1.11
 CATEGORIES=	www
 MASTER_SITES=	http://initd.org/pub/software/psycopg/
 
@@ -13,7 +12,6 @@ COMMENT=	PostgreSQL database adapter for Zope
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_BUILDLINK2=	yes
-ZOPE_COPYPRODUCT=	zope-std-copyproduct-short
 
 .include "../../www/zope25/product.mk"
 .include "../../databases/py-psycopg/buildlink2.mk"
diff --git a/www/zope25-ZPsycopgDA/distinfo b/www/zope25-ZPsycopgDA/distinfo
index 71177e3a43b..a00dad25bdd 100644
--- a/www/zope25-ZPsycopgDA/distinfo
+++ b/www/zope25-ZPsycopgDA/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/01/21 19:38:23 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/04/16 17:21:34 drochner Exp $
 
-SHA1 (zope/psycopg-1.0.14.tar.gz) = 4e08eef3bbe22f82b36dc01a76364dc3f5491ae5
-Size (zope/psycopg-1.0.14.tar.gz) = 179153 bytes
+SHA1 (zope/psycopg-1.1.11.tar.gz) = 63d249053206ded75f9052f2b049fced08232f40
+Size (zope/psycopg-1.1.11.tar.gz) = 248966 bytes