diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index 624bd3a646a..bc09123808c 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/08/21 23:00:38 shell Exp $ +# $OpenBSD: Makefile,v 1.2 2001/09/19 01:05:17 shell Exp $ COMMENT= "PostgreSQL database adapter for Python" -VERSION= 0.99.5 +VERSION= 0.99.6 DISTNAME= psycopg-${VERSION} PKGNAME= py-psycopg-${VERSION} CATEGORIES= databases -NEED_VERSION= 1.441 +NEED_VERSION= 1.457 MASTER_SITES= http://initd.org/software/psycopg/ HOMEPAGE= http://initd.org/Software/psycopg/ @@ -18,13 +18,20 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes +FLAVORS= zope +FLAVOR?= + PYTHON_VER= 2.1 DATETIME_PATH= ${LOCALBASE}/lib/python${PYTHON_VER}/site-packages/mx/DateTime -LIB_DEPENDS= pq.2::databases/postgresql -RUN_DEPENDS= python${PYTHON_VER}::lang/python \ +LIB_DEPENDS+= pq.2::databases/postgresql +RUN_DEPENDS+= python${PYTHON_VER}::lang/python \ ${DATETIME_PATH}::devel/py-mxDateTime -BUILD_DEPENDS= ${RUN_DEPENDS} +BUILD_DEPENDS+= ${RUN_DEPENDS} + +.if ${FLAVOR:L:Mzope} +RUN_DEPENDS+= zope-instance::www/zope +.endif CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-python=python${PYTHON_VER} \ @@ -33,4 +40,8 @@ CONFIGURE_ARGS= --with-python=python${PYTHON_VER} \ SUBST_VARS= PYTHON_VER +pre-install: + mkdir -p ${PREFIX}/lib/zope/lib/python/Products/ + cp -r ${WRKSRC}/ZPsycopgDA/ ${PREFIX}/lib/zope/lib/python/Products/ + .include diff --git a/databases/py-psycopg/files/md5 b/databases/py-psycopg/files/md5 index 7ec1565a54f..932be980674 100644 --- a/databases/py-psycopg/files/md5 +++ b/databases/py-psycopg/files/md5 @@ -1,3 +1,3 @@ -MD5 (psycopg-0.99.5.tar.gz) = 6d1f0ffbaa4671ae5bd5021a8a3acf1f -RMD160 (psycopg-0.99.5.tar.gz) = 4bb3647daab93efc3c20586b02cb93846e75a3c8 -SHA1 (psycopg-0.99.5.tar.gz) = 66425862bc8ba977c83be8e0ce0f2dd1e7470543 +MD5 (psycopg-0.99.6.tar.gz) = 709fc86219954091d71b7f12d6046c48 +RMD160 (psycopg-0.99.6.tar.gz) = 0f06899eef129635aedef0248ff155e4a06013d4 +SHA1 (psycopg-0.99.6.tar.gz) = 864150e79f423c4f6adc91938ac97349e8cadf57 diff --git a/databases/py-psycopg/patches/patch-Makefile_pre_in b/databases/py-psycopg/patches/patch-Makefile_pre_in index 253c7441a21..7be0ceaf2f7 100644 --- a/databases/py-psycopg/patches/patch-Makefile_pre_in +++ b/databases/py-psycopg/patches/patch-Makefile_pre_in @@ -1,3 +1,4 @@ +$OpenBSD: patch-Makefile_pre_in,v 1.2 2001/09/19 01:05:18 shell Exp $ --- Makefile.pre.in.orig Tue Apr 3 09:23:30 2001 +++ Makefile.pre.in Mon Jun 18 22:14:19 2001 @@ -130,7 +130,7 @@ diff --git a/databases/py-psycopg/patches/patch-config_h_in b/databases/py-psycopg/patches/patch-config_h_in index 891952f8161..99039ae181e 100644 --- a/databases/py-psycopg/patches/patch-config_h_in +++ b/databases/py-psycopg/patches/patch-config_h_in @@ -1,3 +1,4 @@ +$OpenBSD: patch-config_h_in,v 1.2 2001/09/19 01:05:18 shell Exp $ --- config.h.in.orig Mon Jun 18 23:53:16 2001 +++ config.h.in Mon Jun 18 23:53:27 2001 @@ -1,7 +1,7 @@ diff --git a/databases/py-psycopg/pkg/PLIST b/databases/py-psycopg/pkg/PLIST index 22abfd1851a..638f848f1d6 100644 --- a/databases/py-psycopg/pkg/PLIST +++ b/databases/py-psycopg/pkg/PLIST @@ -1,2 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2001/08/21 23:00:38 shell Exp $ +@comment $OpenBSD: PLIST,v 1.2 2001/09/19 01:05:18 shell Exp $ lib/python${PYTHON_VER}/lib-dynload/psycopgmodule.so +%%zope%%