Hi
Attached you find four patches for python products, that need to be
built for python2.4 and python2.5. It is a must that this products can
be installed for two versions in parallel to make zope working with them.
Please review and comment.
A remaining problem:
In py-psycopg we should only build -zope MULTI_PACKAGE for
MODZOPE_PYTHON_VERSION. I tried stuff like
.if ${FLAVOR:L:Mpython${MODZOPE_PYTHON_VERSION}}
or
.if ${FLAVOR:L:S,python,,} == "${MODZOPE_PYTHON_VERSION}"
But without success. Any ideas how to compare ${FLAVOR} and
${MODZOPE_PYTHON_VERSION} ?
Marc
Index: databases/py-ldap/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- databases/py-ldap/Makefile 8 Oct 2007 08:22:39 -0000 1.15
+++ databases/py-ldap/Makefile 21 Dec 2007 13:27:31 -0000
@@ -1,17 +1,20 @@
# $OpenBSD: Makefile,v 1.15 2007/10/08 08:22:39 steven Exp $
-SHARED_ONLY= Yes
+SHARED_ONLY= Yes
-COMMENT= LDAP client API for Python
+COMMENT-main= LDAP client API for Python
+COMMENT-examples= example programs for the LDAP client API for Python
-V= 2.2.0
-DISTNAME= python-ldap-${V}
-PKGNAME= py-ldap-${V}p0
-CATEGORIES= databases
+V= 2.2.0
+DISTNAME= python-ldap-${V}
+PKGNAME-main= py-ldap-${V}p2
+FULLPKGNAME-examples= py-ldap-examples-${V}
-HOMEPAGE= http://python-ldap.sourceforge.net/
+CATEGORIES= databases
-MAINTAINER= Marc Balmer <[EMAIL PROTECTED]>
+HOMEPAGE= http://python-ldap.sourceforge.net/
+
+MAINTAINER= Marc Balmer <[EMAIL PROTECTED]>
# Python
PERMIT_PACKAGE_FTP= Yes
@@ -19,16 +22,23 @@
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-WANTLIB= crypto ssl
+WANTLIB-main= crypto ssl
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+
+LIB_DEPENDS-main= ldap_r.>=7,lber.>=7::databases/openldap \
+ sasl2.>=2::security/cyrus-sasl2
+
+FLAVORS= python2.4 python2.5
+FLAVOR?= python2.5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
+MULTI_PACKAGES= -main -examples
-LIB_DEPENDS= ldap_r.>=7,lber.>=7::databases/openldap \
- sasl2.>=2::security/cyrus-sasl2
+MODPY_VERSION= ${FLAVOR:S/python//}
-MODULES= lang/python
+MODULES= lang/python
-EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
+EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
Index: databases/py-ldap/pkg/DESCR
===================================================================
RCS file: databases/py-ldap/pkg/DESCR
diff -N databases/py-ldap/pkg/DESCR
--- databases/py-ldap/pkg/DESCR 18 Dec 2004 14:28:35 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-python-ldap provides an object-oriented API to access LDAP
-directory servers from Python programs. Mainly it wraps the
-OpenLDAP 2.x libs for that purpose.
-
-Additionally the package contains modules for other LDAP-related
-stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
-
-Not included: Direct BER support
-
-Quick usage example:
- import ldap
- l = ldap.open("my_ldap_server.my_domain")
- l.simple_bind_s("","")
- l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
Index: databases/py-ldap/pkg/DESCR-examples
===================================================================
RCS file: databases/py-ldap/pkg/DESCR-examples
diff -N databases/py-ldap/pkg/DESCR-examples
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap/pkg/DESCR-examples 21 Dec 2007 13:27:31 -0000
@@ -0,0 +1,2 @@
+Example programs for the python-ldap API to access LDAP directory servers
+from Python programs.
Index: databases/py-ldap/pkg/DESCR-main
===================================================================
RCS file: databases/py-ldap/pkg/DESCR-main
diff -N databases/py-ldap/pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap/pkg/DESCR-main 21 Dec 2007 13:27:31 -0000
@@ -0,0 +1,14 @@
+python-ldap provides an object-oriented API to access LDAP
+directory servers from Python programs. Mainly it wraps the
+OpenLDAP 2.x libs for that purpose.
+
+Additionally the package contains modules for other LDAP-related
+stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
+
+Not included: Direct BER support
+
+Quick usage example:
+ import ldap
+ l = ldap.open("my_ldap_server.my_domain")
+ l.simple_bind_s("","")
+ l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
Index: databases/py-ldap/pkg/PLIST
===================================================================
RCS file: databases/py-ldap/pkg/PLIST
diff -N databases/py-ldap/pkg/PLIST
--- databases/py-ldap/pkg/PLIST 16 Nov 2006 10:09:56 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.8 2006/11/16 10:09:56 mbalmer Exp $
-lib/python${MODPY_VERSION}/site-packages/_ldap.so
-lib/python${MODPY_VERSION}/site-packages/dsml.py
-lib/python${MODPY_VERSION}/site-packages/dsml.pyc
-lib/python${MODPY_VERSION}/site-packages/dsml.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/
-lib/python${MODPY_VERSION}/site-packages/ldap/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ldap/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/__init__.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/async.py
-lib/python${MODPY_VERSION}/site-packages/ldap/async.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/async.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/cidict.py
-lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/controls.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/dn.py
-lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/filter.py
-lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/functions.py
-lib/python${MODPY_VERSION}/site-packages/ldap/functions.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/functions.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.py
-lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/modlist.py
-lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/sasl.py
-lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.pyo
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyo
-lib/python${MODPY_VERSION}/site-packages/ldapurl.py
-lib/python${MODPY_VERSION}/site-packages/ldapurl.pyc
-lib/python${MODPY_VERSION}/site-packages/ldapurl.pyo
-lib/python${MODPY_VERSION}/site-packages/ldif.py
-lib/python${MODPY_VERSION}/site-packages/ldif.pyc
-lib/python${MODPY_VERSION}/site-packages/ldif.pyo
-share/examples/py-ldap/
-share/examples/py-ldap/Demo/
-share/examples/py-ldap/Demo/Lib/
-share/examples/py-ldap/Demo/Lib/ldap/
-share/examples/py-ldap/Demo/Lib/ldap/res/
-share/examples/py-ldap/Demo/Lib/ldapurl/
-share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
-share/examples/py-ldap/Demo/Lib/ldif/
-share/examples/py-ldap/Demo/Lib/ldif/ldifcopy.py
-share/examples/py-ldap/Demo/initialize.py
-share/examples/py-ldap/Demo/ldapcontrols.py
-share/examples/py-ldap/Demo/options.py
-share/examples/py-ldap/Demo/passwd_ext_op.py
-share/examples/py-ldap/Demo/pickle_ldapobject.py
-share/examples/py-ldap/Demo/reconnect.py
-share/examples/py-ldap/Demo/rename.py
-share/examples/py-ldap/Demo/sasl_bind.py
-share/examples/py-ldap/Demo/schema.py
-share/examples/py-ldap/Demo/schema_tree.py
-share/examples/py-ldap/Demo/simple.py
-share/examples/py-ldap/Demo/simplebrowse.py
Index: databases/py-ldap/pkg/PLIST-examples
===================================================================
RCS file: databases/py-ldap/pkg/PLIST-examples
diff -N databases/py-ldap/pkg/PLIST-examples
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap/pkg/PLIST-examples 21 Dec 2007 13:27:31 -0000
@@ -0,0 +1,22 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.8 2006/11/16 10:09:56 mbalmer Exp $
+share/examples/py-ldap/
+share/examples/py-ldap/Demo/
+share/examples/py-ldap/Demo/Lib/
+share/examples/py-ldap/Demo/Lib/ldap/
+share/examples/py-ldap/Demo/Lib/ldap/res/
+share/examples/py-ldap/Demo/Lib/ldapurl/
+share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
+share/examples/py-ldap/Demo/Lib/ldif/
+share/examples/py-ldap/Demo/Lib/ldif/ldifcopy.py
+share/examples/py-ldap/Demo/initialize.py
+share/examples/py-ldap/Demo/ldapcontrols.py
+share/examples/py-ldap/Demo/options.py
+share/examples/py-ldap/Demo/passwd_ext_op.py
+share/examples/py-ldap/Demo/pickle_ldapobject.py
+share/examples/py-ldap/Demo/reconnect.py
+share/examples/py-ldap/Demo/rename.py
+share/examples/py-ldap/Demo/sasl_bind.py
+share/examples/py-ldap/Demo/schema.py
+share/examples/py-ldap/Demo/schema_tree.py
+share/examples/py-ldap/Demo/simple.py
+share/examples/py-ldap/Demo/simplebrowse.py
Index: databases/py-ldap/pkg/PLIST-main
===================================================================
RCS file: databases/py-ldap/pkg/PLIST-main
diff -N databases/py-ldap/pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-ldap/pkg/PLIST-main 21 Dec 2007 13:27:31 -0000
@@ -0,0 +1,56 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.8 2006/11/16 10:09:56 mbalmer Exp $
[EMAIL PROTECTED] no-default-conflict
+lib/python${MODPY_VERSION}/site-packages/_ldap.so
+lib/python${MODPY_VERSION}/site-packages/dsml.py
+lib/python${MODPY_VERSION}/site-packages/dsml.pyc
+lib/python${MODPY_VERSION}/site-packages/dsml.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/
+lib/python${MODPY_VERSION}/site-packages/ldap/__init__.py
+lib/python${MODPY_VERSION}/site-packages/ldap/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/async.py
+lib/python${MODPY_VERSION}/site-packages/ldap/async.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/async.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/cidict.py
+lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/controls.py
+lib/python${MODPY_VERSION}/site-packages/ldap/controls.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/dn.py
+lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/filter.py
+lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/functions.py
+lib/python${MODPY_VERSION}/site-packages/ldap/functions.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/functions.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.py
+lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/modlist.py
+lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/sasl.py
+lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.py
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.py
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.py
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.pyo
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.py
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyo
+lib/python${MODPY_VERSION}/site-packages/ldapurl.py
+lib/python${MODPY_VERSION}/site-packages/ldapurl.pyc
+lib/python${MODPY_VERSION}/site-packages/ldapurl.pyo
+lib/python${MODPY_VERSION}/site-packages/ldif.py
+lib/python${MODPY_VERSION}/site-packages/ldif.pyc
+lib/python${MODPY_VERSION}/site-packages/ldif.pyo
Index: devel/py-mxDateTime/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-mxDateTime/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- devel/py-mxDateTime/Makefile 8 Oct 2007 08:22:39 -0000 1.18
+++ devel/py-mxDateTime/Makefile 21 Dec 2007 13:28:12 -0000
@@ -6,7 +6,7 @@
VERSION= 2.0.5
DISTNAME= egenix-mx-base-${VERSION}
-PKGNAME= py-mxDateTime-${VERSION}p1
+PKGNAME= py-mxDateTime-${VERSION}p2
CATEGORIES= devel
MASTER_SITES= http://www.lemburg.com/files/python/
@@ -22,6 +22,11 @@
PERMIT_DISTFILES_CDROM= Yes
MODULES= lang/python
+
+FLAVORS= python2.4 python2.5 # Needed for Zope, e.g.
+FLAVOR?= python2.5
+
+MODPY_VERSION= ${FLAVOR:S/python//}
NO_REGRESS= Yes
Index: devel/py-mxDateTime/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-mxDateTime/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- devel/py-mxDateTime/pkg/PLIST 18 Sep 2004 10:55:04 -0000 1.6
+++ devel/py-mxDateTime/pkg/PLIST 21 Dec 2007 13:28:13 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/18 10:55:04 espie Exp $
@option no-default-conflict
[EMAIL PROTECTED] py-mxDateTime-*${FLAVOR_EXT}
lib/python${MODPY_VERSION}/site-packages/mx/
lib/python${MODPY_VERSION}/site-packages/mx/BeeBase/
lib/python${MODPY_VERSION}/site-packages/mx/BeeBase/BeeBase.py
Index: databases/py-psycopg/Makefile
===================================================================
RCS file: /cvs/ports/databases/py-psycopg/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- databases/py-psycopg/Makefile 8 Oct 2007 08:22:39 -0000 1.28
+++ databases/py-psycopg/Makefile 7 Jan 2008 15:24:39 -0000
@@ -1,43 +1,48 @@
# $OpenBSD: Makefile,v 1.28 2007/10/08 08:22:39 steven Exp $
-SHARED_ONLY= Yes
+SHARED_ONLY= Yes
-COMMENT-main= PostgreSQL database adapter for Python
-COMMENT-zope= database adapter for Zope
+COMMENT-main= PostgreSQL database adapter for Python
+COMMENT-examples= examples for PostgreSQL database adapter for Python
+COMMENT-zope= database adapter for Zope
+
+VERSION= 1.1.21
+DISTNAME= psycopg-${VERSION}
+PKGNAME= py-${DISTNAME}p4
+PKGNAME-main= py-${DISTNAME}p5
+FULLPKGNAME-examples= py-${DISTNAME}p5
+FULLPKGNAME-zope= py-psycopg-zope-${VERSION}p1
+CATEGORIES= databases
-VERSION= 1.1.21
-DISTNAME= psycopg-${VERSION}
-PKGNAME= py-${DISTNAME}p4
-PKGNAME-main= py-${DISTNAME}p4
-PKGNAME-zope= py-psycopg-zope-${VERSION}p1
-CATEGORIES= databases
+HOMEPAGE= http://initd.org/projects/psycopg1
-HOMEPAGE= http://initd.org/projects/psycopg1
-
-MAINTAINER= Aleksander Piotrowski <[EMAIL PROTECTED]>
+MAINTAINER= Aleksander Piotrowski <[EMAIL PROTECTED]>
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
-WANTLIB= crypto util pq
+WANTLIB-main= crypto util pq
MASTER_SITES= http://initd.org/pub/software/psycopg/
-MODULES= lang/python
+MODULES= lang/python www/zope
+
+BUILD_DEPENDS= :postgresql-server-*:databases/postgresql,-server
+RUN_DEPENDS= :postgresql-client-*:databases/postgresql
+
+FLAVORS= python2.4 python2.5 # Needed for Zope, e.g.
+FLAVOR?= python2.5
-BUILD_DEPENDS= :postgresql-server-*:databases/postgresql,-server \
- :py-mxDateTime->=2.0.0:devel/py-mxDateTime
-RUN_DEPENDS= :postgresql-client-*:databases/postgresql \
- :py-mxDateTime->=2.0.0:devel/py-mxDateTime
+MULTI_PACKAGES= -main -examples -zope
-MULTI_PACKAGES= -main -zope
+MODPY_VERSION= ${FLAVOR:S/python//}
+BUILD_DEPENDS+=
:py-mxDateTime->=2.0.0*-${FLAVOR}:devel/py-mxDateTime,${FLAVOR}
+RUN_DEPENDS+= :py-mxDateTime->=2.0.0*-${FLAVOR}:devel/py-mxDateTime,${FLAVOR}
-RUN_DEPENDS-zope= :zope-*:www/zope \
- :py-psycopg-${VERSION}*:${BUILD_PKGPATH} \
+RUN_DEPENDS-zope=
:py-psycopg-${VERSION}*-python${MODZOPE_PYTHON_VERSION}:${BUILD_PKGPATH} \
${MODPY_RUN_DEPENDS}
PKG_ARCH-zope= *
-WANTLIB-zope=
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS=
--with-mxdatetime-includes=${MODPY_SITEPKG}/mx/DateTime/mxDateTime
Index: databases/py-psycopg/pkg/DESCR-examples
===================================================================
RCS file: databases/py-psycopg/pkg/DESCR-examples
diff -N databases/py-psycopg/pkg/DESCR-examples
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-psycopg/pkg/DESCR-examples 7 Jan 2008 15:24:39 -0000
@@ -0,0 +1 @@
+examples for psycopg PostgreSQL database adapter
Index: databases/py-psycopg/pkg/PLIST-examples
===================================================================
RCS file: databases/py-psycopg/pkg/PLIST-examples
diff -N databases/py-psycopg/pkg/PLIST-examples
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ databases/py-psycopg/pkg/PLIST-examples 7 Jan 2008 15:24:39 -0000
@@ -0,0 +1,21 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.1 2006/11/26 10:24:36 steven Exp $
+share/examples/py-psycopg/
+share/examples/py-psycopg/binary.py
+share/examples/py-psycopg/bool.py
+share/examples/py-psycopg/bounded.py
+share/examples/py-psycopg/commit.py
+share/examples/py-psycopg/copy_from.py
+share/examples/py-psycopg/copy_from2.py
+share/examples/py-psycopg/copy_to.py
+share/examples/py-psycopg/dictfetch.py
+share/examples/py-psycopg/dt.py
+share/examples/py-psycopg/first.py
+share/examples/py-psycopg/integrity.py
+share/examples/py-psycopg/interval.py
+share/examples/py-psycopg/notify.py
+share/examples/py-psycopg/oid.py
+share/examples/py-psycopg/somehackers.jpg
+share/examples/py-psycopg/threads.py
+share/examples/py-psycopg/usercast.py
+share/examples/py-psycopg/whereareyou.jpg
+share/examples/py-psycopg/work.py
Index: databases/py-psycopg/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/py-psycopg/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -r1.1 PLIST-main
--- databases/py-psycopg/pkg/PLIST-main 26 Nov 2006 10:24:36 -0000 1.1
+++ databases/py-psycopg/pkg/PLIST-main 7 Jan 2008 15:24:39 -0000
@@ -1,24 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 10:24:36 steven Exp $
[EMAIL PROTECTED] no-default-conflict
@pkgpath databases/py-psycopg,no_zope
@pkgpath databases/py-psycopg
lib/python${MODPY_VERSION}/lib-dynload/psycopgmodule.so
-share/examples/py-psycopg/
-share/examples/py-psycopg/binary.py
-share/examples/py-psycopg/bool.py
-share/examples/py-psycopg/bounded.py
-share/examples/py-psycopg/commit.py
-share/examples/py-psycopg/copy_from.py
-share/examples/py-psycopg/copy_from2.py
-share/examples/py-psycopg/copy_to.py
-share/examples/py-psycopg/dictfetch.py
-share/examples/py-psycopg/dt.py
-share/examples/py-psycopg/first.py
-share/examples/py-psycopg/integrity.py
-share/examples/py-psycopg/interval.py
-share/examples/py-psycopg/notify.py
-share/examples/py-psycopg/oid.py
-share/examples/py-psycopg/somehackers.jpg
-share/examples/py-psycopg/threads.py
-share/examples/py-psycopg/usercast.py
-share/examples/py-psycopg/whereareyou.jpg
-share/examples/py-psycopg/work.py
Index: www/zope-ldapuserfolder/Makefile
===================================================================
RCS file: /cvs/ports/www/zope-ldapuserfolder/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/zope-ldapuserfolder/Makefile 28 Nov 2007 13:11:57 -0000 1.5
+++ www/zope-ldapuserfolder/Makefile 21 Dec 2007 13:31:43 -0000
@@ -4,7 +4,7 @@
VERSION= 2_7
DISTNAME= LDAPUserFolder-${VERSION}
-PKGNAME= zope-${DISTNAME:S/_/./:L}
+PKGNAME= zope-${DISTNAME:S/_/./:L}p0
CATEGORIES= www
HOMEPAGE= http://www.dataflake.org/software/ldapuserfolder
@@ -21,7 +21,7 @@
MODULES= www/zope
-RUN_DEPENDS= :py-ldap-*:databases/py-ldap
+RUN_DEPENDS=
:py-ldap-*-python${MODZOPE_PYTHON_VERSION}:databases/py-ldap,python${MODZOPE_PYTHON_VERSION}
WRKDIST= ${WRKDIR}/LDAPUserFolder
