Adding python2.4 and python2.5 flavours. This is needed for an upcoming
plone 3.0 port.
Testing and ok welcome.
Marc
diff -urNx CVS py-ElementTree.orig/Makefile py-ElementTree/Makefile
--- py-ElementTree.orig/Makefile Tue Mar 18 15:11:12 2008
+++ py-ElementTree/Makefile Tue Mar 18 13:56:01 2008
@@ -1,12 +1,15 @@
# $OpenBSD: Makefile,v 1.7 2007/12/10 21:07:51 martynas Exp $
-COMMENT= pure-Python implementation of the ElementTree API
+COMMENT-main= pure-Python implementation of the ElementTree API
+COMMENT-docs= pure-Python implementation of the ElementTree API docs
-DISTNAME= elementtree-1.2.6-20050316
-PKGNAME= py-ElementTree-1.2.6p2
-CATEGORIES= textproc devel
+VERSION= 1.2.6
+DISTNAME= elementtree-${VERSION}-20050316
+PKGNAME-main= py-ElementTree-${VERSION}p3
+FULLPKGNAME-docs= py-ElementTree-docs-${VERSION}
+CATEGORIES= textproc devel
-HOMEPAGE= http://effbot.org/zone/element-index.htm
+HOMEPAGE= http://effbot.org/zone/element-index.htm
# MIT
PERMIT_PACKAGE_CDROM= Yes
@@ -15,15 +18,30 @@
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= http://effbot.org/downloads/
+
MODULES= lang/python
+MODPY_VERSION= ${FLAVOR:S/python//}
+
+FLAVORS= python2.4 python2.5
+FLAVOR?= python2.5
+
RUN_DEPENDS= ${MODPY_EXPAT_DEPENDS}
REGRESS_DEPENDS=${RUN_DEPENDS}
+.if ${FLAVOR:L:Mpython2.4} && !${FLAVOR:L:Npython2.4}
+MULTI_PACKAGES= -main
+.elif ${FLAVOR:L:Mpython2.5} && !${FLAVOR:L:Npython2.5}
+MULTI_PACKAGES= -main -docs
+.else
+ERRORS+= "Fatal: You must select one version: ${FLAVORS}"
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-ElementTree
${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/py-ElementTree/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-ElementTree
${INSTALL_DATA} ${WRKSRC}/samples/*
${PREFIX}/share/examples/py-ElementTree/
+ find ${WRKINST} -name \*.egg-info -exec rm {} \;
do-regress: fake
@cd ${WRKSRC} && ${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
diff -urNx CVS py-ElementTree.orig/pkg/DESCR py-ElementTree/pkg/DESCR
--- py-ElementTree.orig/pkg/DESCR Sat Jan 22 03:33:43 2005
+++ py-ElementTree/pkg/DESCR Thu Jan 1 01:00:00 1970
@@ -1,4 +0,0 @@
-The ElementTree type is a simple but flexible container object, designed
-to store hierarchical data structures, such as simplified XML infosets,
-in memory. The element type can be described as a cross between a Python
-list and a Python dictionary.
diff -urNx CVS py-ElementTree.orig/pkg/DESCR-docs py-ElementTree/pkg/DESCR-docs
--- py-ElementTree.orig/pkg/DESCR-docs Thu Jan 1 01:00:00 1970
+++ py-ElementTree/pkg/DESCR-docs Tue Mar 18 13:55:37 2008
@@ -0,0 +1 @@
+ElementTree documentation and examples.
diff -urNx CVS py-ElementTree.orig/pkg/DESCR-main py-ElementTree/pkg/DESCR-main
--- py-ElementTree.orig/pkg/DESCR-main Thu Jan 1 01:00:00 1970
+++ py-ElementTree/pkg/DESCR-main Tue Mar 18 13:21:00 2008
@@ -0,0 +1,4 @@
+The ElementTree type is a simple but flexible container object, designed
+to store hierarchical data structures, such as simplified XML infosets,
+in memory. The element type can be described as a cross between a Python
+list and a Python dictionary.
diff -urNx CVS py-ElementTree.orig/pkg/PLIST py-ElementTree/pkg/PLIST
--- py-ElementTree.orig/pkg/PLIST Tue May 22 17:40:19 2007
+++ py-ElementTree/pkg/PLIST Thu Jan 1 01:00:00 1970
@@ -1,39 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2007/05/22 15:40:19 martynas Exp $
-lib/python${MODPY_VERSION}/site-packages/elementtree/
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementInclude.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementInclude.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementPath.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementPath.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementTree.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/ElementTree.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/HTMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/HTMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/SgmlopXMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/SgmlopXMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLWriter.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLWriter.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyHTMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyHTMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyTools.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/TidyTools.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/XMLTreeBuilder.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/XMLTreeBuilder.pyc
-lib/python${MODPY_VERSION}/site-packages/elementtree/__init__.py
-lib/python${MODPY_VERSION}/site-packages/elementtree/__init__.pyc
-share/doc/py-ElementTree/
-share/doc/py-ElementTree/effbot.css
-share/doc/py-ElementTree/index.html
-share/doc/py-ElementTree/pythondoc-elementtree.ElementInclude.html
-share/doc/py-ElementTree/pythondoc-elementtree.ElementPath.html
-share/doc/py-ElementTree/pythondoc-elementtree.ElementTree.html
-share/doc/py-ElementTree/pythondoc-elementtree.HTMLTreeBuilder.html
-share/doc/py-ElementTree/pythondoc-elementtree.SgmlopXMLTreeBuilder.html
-share/doc/py-ElementTree/pythondoc-elementtree.SimpleXMLTreeBuilder.html
-share/doc/py-ElementTree/pythondoc-elementtree.SimpleXMLWriter.html
-share/doc/py-ElementTree/pythondoc-elementtree.TidyTools.html
-share/doc/py-ElementTree/pythondoc-elementtree.XMLTreeBuilder.html
-share/examples/py-ElementTree/
-share/examples/py-ElementTree/simple-ns.xml
-share/examples/py-ElementTree/simple.xml
diff -urNx CVS py-ElementTree.orig/pkg/PLIST-docs py-ElementTree/pkg/PLIST-docs
--- py-ElementTree.orig/pkg/PLIST-docs Thu Jan 1 01:00:00 1970
+++ py-ElementTree/pkg/PLIST-docs Tue Mar 18 13:43:46 2008
@@ -0,0 +1,16 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2007/05/22 15:40:19 martynas Exp $
+share/doc/py-ElementTree/
+share/doc/py-ElementTree/effbot.css
+share/doc/py-ElementTree/index.html
+share/doc/py-ElementTree/pythondoc-elementtree.ElementInclude.html
+share/doc/py-ElementTree/pythondoc-elementtree.ElementPath.html
+share/doc/py-ElementTree/pythondoc-elementtree.ElementTree.html
+share/doc/py-ElementTree/pythondoc-elementtree.HTMLTreeBuilder.html
+share/doc/py-ElementTree/pythondoc-elementtree.SgmlopXMLTreeBuilder.html
+share/doc/py-ElementTree/pythondoc-elementtree.SimpleXMLTreeBuilder.html
+share/doc/py-ElementTree/pythondoc-elementtree.SimpleXMLWriter.html
+share/doc/py-ElementTree/pythondoc-elementtree.TidyTools.html
+share/doc/py-ElementTree/pythondoc-elementtree.XMLTreeBuilder.html
+share/examples/py-ElementTree/
+share/examples/py-ElementTree/simple-ns.xml
+share/examples/py-ElementTree/simple.xml
diff -urNx CVS py-ElementTree.orig/pkg/PLIST-main py-ElementTree/pkg/PLIST-main
--- py-ElementTree.orig/pkg/PLIST-main Thu Jan 1 01:00:00 1970
+++ py-ElementTree/pkg/PLIST-main Tue Mar 18 13:53:16 2008
@@ -0,0 +1,27 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.2 2007/05/22 15:40:19 martynas Exp $
[EMAIL PROTECTED] no-default-conflict
[EMAIL PROTECTED] py-ElementTree-*-python${MODPY_VERSION}
[EMAIL PROTECTED] textproc/py-ElementTree
+lib/python${MODPY_VERSION}/site-packages/elementtree/
+lib/python${MODPY_VERSION}/site-packages/elementtree/ElementInclude.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/ElementInclude.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/ElementPath.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/ElementPath.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/ElementTree.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/ElementTree.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/HTMLTreeBuilder.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/HTMLTreeBuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/SgmlopXMLTreeBuilder.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/SgmlopXMLTreeBuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLTreeBuilder.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLTreeBuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLWriter.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/SimpleXMLWriter.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/TidyHTMLTreeBuilder.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/TidyHTMLTreeBuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/TidyTools.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/TidyTools.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/XMLTreeBuilder.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/XMLTreeBuilder.pyc
+lib/python${MODPY_VERSION}/site-packages/elementtree/__init__.py
+lib/python${MODPY_VERSION}/site-packages/elementtree/__init__.pyc
Index: audio/sonata/Makefile
===================================================================
RCS file: /cvs/ports/audio/sonata/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- audio/sonata/Makefile 19 Feb 2008 16:14:13 -0000 1.7
+++ audio/sonata/Makefile 18 Mar 2008 14:50:52 -0000
@@ -3,6 +3,7 @@
COMMENT= elegant music player for MPD
DISTNAME= sonata-1.4.1
+PKGNAME= ${DISTNAME}p0
CATEGORIES= audio
HOMEPAGE= http://sonata.berlios.de/
@@ -23,11 +24,12 @@
MODULES= devel/gettext \
lang/python
+PY_FLAVOR= python${MODPY_VERSION}
BUILD_DEPENDS= ::x11/py-gtk2
RUN_DEPENDS= ::devel/desktop-file-utils \
::devel/py-SOAPpy \
- ::textproc/py-ElementTree \
+
:py-ElementTree-*-${PY_FLAVOR}:textproc/py-ElementTree,${PY_FLAVOR} \
::x11/py-gtk2
USE_X11= Yes
Index: textproc/py-cElementTree/Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-cElementTree/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- textproc/py-cElementTree/Makefile 10 Dec 2007 21:07:51 -0000 1.10
+++ textproc/py-cElementTree/Makefile 18 Mar 2008 14:50:52 -0000
@@ -5,7 +5,7 @@
COMMENT= C implementation of the ElementTree API
DISTNAME= cElementTree-1.0.5-20051216
-PKGNAME= py-cElementTree-1.0.5p2
+PKGNAME= py-cElementTree-1.0.5p3
CATEGORIES= textproc devel
HOMEPAGE= http://effbot.org/zone/celementtree.htm
@@ -19,7 +19,9 @@
MASTER_SITES= http://effbot.org/downloads/
MODULES= lang/python
-RUN_DEPENDS= ::textproc/py-ElementTree
+PY_FLAVOR= python${MODPY_VERSION}
+
+RUN_DEPENDS=
:py-ElementTree-*-${PY_FLAVOR}:textproc/py-ElementTree,${PY_FLAVOR}
REGRESS_DEPENDS=${RUN_DEPENDS}
post-install:
Index: www/py-formencode/Makefile
===================================================================
RCS file: /cvs/ports/www/py-formencode/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- www/py-formencode/Makefile 13 Jan 2008 17:16:49 -0000 1.6
+++ www/py-formencode/Makefile 18 Mar 2008 14:50:52 -0000
@@ -4,7 +4,7 @@
VERSION= 0.9
DISTNAME= FormEncode-${VERSION}
-PKGNAME= py-formencode-${VERSION}
+PKGNAME= py-formencode-${VERSION}p0
CATEGORIES= www
@@ -21,9 +21,11 @@
MASTER_SITES=
http://cheeseshop.python.org/packages/source/F/FormEncode/
MODULES= devel/gettext lang/python
-RUN_DEPENDS= ::textproc/py-ElementTree \
+PY_FLAVOR= python${MODPY_VERSION}
+
+RUN_DEPENDS=
:py-ElementTree-*-${PY_FLAVOR}:textproc/py-ElementTree,${PY_FLAVOR} \
::devel/py-ruledispatch
-REGRESS_DEPENDS= ::textproc/py-ElementTree \
+REGRESS_DEPENDS=
:py-ElementTree-*-${PY_FLAVOR}:textproc/py-ElementTree,${PY_FLAVOR} \
::devel/py-py \
::devel/py-ruledispatch
Index: www/py-turbogears/Makefile
===================================================================
RCS file: /cvs/ports/www/py-turbogears/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- www/py-turbogears/Makefile 1 Feb 2008 19:15:40 -0000 1.6
+++ www/py-turbogears/Makefile 18 Mar 2008 14:50:52 -0000
@@ -4,7 +4,7 @@
VERSION= 1.0.4.2
DISTNAME= TurboGears-${VERSION}
-PKGNAME= py-turbogears-${VERSION}
+PKGNAME= py-turbogears-${VERSION}p0
CATEGORIES= www
@@ -21,6 +21,8 @@
MASTER_SITES= http://files.turbogears.org/eggs/
MODULES= lang/python
+PY_FLAVOR= python${MODPY_VERSION}
+
RUN_DEPENDS= ::databases/py-sqlalchemy \
::databases/py-sqlobject \
::devel/py-cheetah \
@@ -32,7 +34,7 @@
::devel/py-turbocheetah \
::devel/py-turbojson \
::devel/py-turbokid \
- ::textproc/py-ElementTree \
+
:py-ElementTree-*-${PY_FLAVOR}:textproc/py-ElementTree,${PY_FLAVOR} \
::textproc/py-cElementTree \
::www/py-cherrypy2 \
::www/py-formencode \
