This registers the missing conflicts between plone >=2.5 and
three zope modules.
ok?
Index: plone/2.5/Makefile
===================================================================
RCS file: /cvs/ports/www/plone/2.5/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- plone/2.5/Makefile 2 Jan 2009 13:07:37 -0000 1.2
+++ plone/2.5/Makefile 19 Jun 2009 20:40:01 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $
DISTNAME= Plone-2.5.3-final
-PKGNAME= ${DISTNAME:S/-final//:L}p1
+PKGNAME= ${DISTNAME:S/-final//:L}p2
do-install:
${INSTALL_PROGRAM_DIR} ${MODZOPE_PRODUCTSDIR}
Index: plone/2.5/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/plone/2.5/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- plone/2.5/pkg/PLIST 20 Mar 2008 11:42:35 -0000 1.1
+++ plone/2.5/pkg/PLIST 19 Jun 2009 20:40:11 -0000
@@ -3,8 +3,11 @@
@conflict zope-cmf-*
@conflict zope-cmfquickinstaller-*
@conflict zope-externaleditor-*
+...@conflict zope-genericsetup-*
@conflict zope-groupuserfolder-*
@conflict zope-placelesstranslationservice-*
+...@conflict zope-pluggableauthservice-*
+...@conflict zope-pluginregistry-*
lib/zope/lib/python/Products/ATContentTypes/
lib/zope/lib/python/Products/ATContentTypes/AUTHORS.txt
lib/zope/lib/python/Products/ATContentTypes/CHANGELOG.txt
Index: plone/3.0/Makefile
===================================================================
RCS file: /cvs/ports/www/plone/3.0/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- plone/3.0/Makefile 2 Jan 2009 13:07:37 -0000 1.2
+++ plone/3.0/Makefile 19 Jun 2009 20:40:11 -0000
@@ -3,7 +3,7 @@
COMMENT= content management system built on top of Zope
DISTNAME= Plone-3.0.6
-PKGNAME= ${DISTNAME:L}p0
+PKGNAME= ${DISTNAME:L}p1
MASTER_SITES= https://launchpad.net/plone/3.0/3.0.6/+download/
Index: plone/3.0/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/plone/3.0/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- plone/3.0/pkg/PLIST 20 Mar 2008 11:42:35 -0000 1.1
+++ plone/3.0/pkg/PLIST 19 Jun 2009 20:40:22 -0000
@@ -3,8 +3,11 @@
@conflict zope-cmf-*
@conflict zope-cmfquickinstaller-*
@conflict zope-externaleditor-*
+...@conflict zope-genericsetup-*
@conflict zope-groupuserfolder-*
@conflict zope-placelesstranslationservice-*
+...@conflict zope-pluggableauthservice-*
+...@conflict zope-pluginregistry-*
lib/zope/lib/python/Products/ATContentTypes/
lib/zope/lib/python/Products/ATContentTypes/AUTHORS.txt
lib/zope/lib/python/Products/ATContentTypes/CHANGELOG.txt
Index: zope-genericsetup/Makefile
===================================================================
RCS file: /cvs/ports/www/zope-genericsetup/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- zope-genericsetup/Makefile 1 Nov 2008 19:21:40 -0000 1.1.1.1
+++ zope-genericsetup/Makefile 19 Jun 2009 20:40:22 -0000
@@ -3,7 +3,7 @@
COMMENT= framework for expressing the configured state of a Zope Site
DISTNAME= GenericSetup-1.2
-PKGNAME= zope-${DISTNAME:L}
+PKGNAME= zope-${DISTNAME:L}p0
CATEGORIES= www
HOMEPAGE= http://www.zope.org/Products/GenericSetup/
Index: zope-genericsetup/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/zope-genericsetup/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- zope-genericsetup/pkg/PLIST 1 Nov 2008 19:21:40 -0000 1.1.1.1
+++ zope-genericsetup/pkg/PLIST 19 Jun 2009 20:40:22 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/11/01 19:21:40 mbalmer Exp $
+...@conflict plone->=2.5
lib/zope/lib/python/Products/GenericSetup/
lib/zope/lib/python/Products/GenericSetup/CHANGES.txt
lib/zope/lib/python/Products/GenericSetup/CREDITS.txt
Index: zope-pluggableauthservice/Makefile
===================================================================
RCS file: /cvs/ports/www/zope-pluggableauthservice/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- zope-pluggableauthservice/Makefile 30 Oct 2008 11:55:23 -0000 1.1.1.1
+++ zope-pluggableauthservice/Makefile 19 Jun 2009 20:40:22 -0000
@@ -3,7 +3,7 @@
COMMENT= PluggableAuthService for Plone
DISTNAME= PluggableAuthService-1.4.2
-PKGNAME= zope-${DISTNAME:L}
+PKGNAME= zope-${DISTNAME:L}p0
CATEGORIES= www
HOMEPAGE= http://www.zope.org/Products/PluggableAuthService/
Index: zope-pluggableauthservice/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/zope-pluggableauthservice/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- zope-pluggableauthservice/pkg/PLIST 30 Oct 2008 11:55:23 -0000 1.1.1.1
+++ zope-pluggableauthservice/pkg/PLIST 19 Jun 2009 20:40:22 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/30 11:55:23 mbalmer Exp $
+...@conflict plone->=2.5
lib/zope/lib/python/Products/PluggableAuthService/
lib/zope/lib/python/Products/PluggableAuthService/COPYRIGHT.txt
lib/zope/lib/python/Products/PluggableAuthService/Extensions/
Index: zope-pluginregistry/Makefile
===================================================================
RCS file: /cvs/ports/www/zope-pluginregistry/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- zope-pluginregistry/Makefile 1 Nov 2008 10:19:16 -0000 1.1.1.1
+++ zope-pluginregistry/Makefile 19 Jun 2009 20:40:22 -0000
@@ -3,7 +3,7 @@
COMMENT= pluggable architecture for Zope
DISTNAME= PluginRegistry-1.1.2
-PKGNAME= zope-${DISTNAME:L}
+PKGNAME= zope-${DISTNAME:L}p0
CATEGORIES= www
HOMEPAGE= http://www.zope.org/Products/PluginRegistry/
Index: zope-pluginregistry/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/zope-pluginregistry/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- zope-pluginregistry/pkg/PLIST 1 Nov 2008 10:19:16 -0000 1.1.1.1
+++ zope-pluginregistry/pkg/PLIST 19 Jun 2009 20:40:22 -0000
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/11/01 10:19:16 mbalmer Exp $
+...@conflict plone->=2.5
lib/zope/lib/python/Products/PluginRegistry/
lib/zope/lib/python/Products/PluginRegistry/CHANGES.txt
lib/zope/lib/python/Products/PluginRegistry/COPYRIGHT.txt
--
Christian "naddy" Weisgerber [email protected]
