From a8c7e94c243b73994a57bdc012f082cfcd41151e Mon Sep 17 00:00:00 2001 From: naddy Date: Thu, 25 Jun 2009 15:40:43 +0000 Subject: [PATCH] plone 2.5 also conflicts with zope-genericsetup, -pluggableauthservice, and -pluginregistry, but plone 2.1 doesn't --- www/plone/2.5/Makefile | 4 ++-- www/plone/2.5/pkg/PLIST | 5 ++++- www/zope-genericsetup/Makefile | 4 ++-- www/zope-genericsetup/pkg/PLIST | 4 ++-- www/zope-pluggableauthservice/Makefile | 4 ++-- www/zope-pluggableauthservice/pkg/PLIST | 4 ++-- www/zope-pluginregistry/Makefile | 4 ++-- www/zope-pluginregistry/pkg/PLIST | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/www/plone/2.5/Makefile b/www/plone/2.5/Makefile index 6701bf215ad..0119d5de9ef 100644 --- a/www/plone/2.5/Makefile +++ b/www/plone/2.5/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $ +# $OpenBSD: Makefile,v 1.3 2009/06/25 15:40:43 naddy 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} diff --git a/www/plone/2.5/pkg/PLIST b/www/plone/2.5/pkg/PLIST index 181530130fd..197fe0b6cb6 100644 --- a/www/plone/2.5/pkg/PLIST +++ b/www/plone/2.5/pkg/PLIST @@ -1,10 +1,13 @@ -@comment $OpenBSD: PLIST,v 1.1 2008/03/20 11:42:35 winiger Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/06/25 15:40:43 naddy Exp $ @conflict zope-btreefolder2-* @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 diff --git a/www/zope-genericsetup/Makefile b/www/zope-genericsetup/Makefile index e9b95e9091e..d6ad8eca64f 100644 --- a/www/zope-genericsetup/Makefile +++ b/www/zope-genericsetup/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2009/06/25 01:23:07 jolan Exp $ +# $OpenBSD: Makefile,v 1.3 2009/06/25 15:40:43 naddy Exp $ COMMENT= framework for expressing the configured state of a Zope Site DISTNAME= GenericSetup-1.2 -PKGNAME= zope-${DISTNAME:L}p0 +PKGNAME= zope-${DISTNAME:L}p1 CATEGORIES= www HOMEPAGE= http://www.zope.org/Products/GenericSetup/ diff --git a/www/zope-genericsetup/pkg/PLIST b/www/zope-genericsetup/pkg/PLIST index bf9af6522b8..bf63f08bb2b 100644 --- a/www/zope-genericsetup/pkg/PLIST +++ b/www/zope-genericsetup/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/06/25 01:23:07 jolan Exp $ -@conflict plone-* +@comment $OpenBSD: PLIST,v 1.3 2009/06/25 15:40:43 naddy 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 diff --git a/www/zope-pluggableauthservice/Makefile b/www/zope-pluggableauthservice/Makefile index 0de64d71cd8..3707683067b 100644 --- a/www/zope-pluggableauthservice/Makefile +++ b/www/zope-pluggableauthservice/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2009/06/25 01:23:07 jolan Exp $ +# $OpenBSD: Makefile,v 1.3 2009/06/25 15:40:43 naddy Exp $ COMMENT= PluggableAuthService for Plone DISTNAME= PluggableAuthService-1.4.2 -PKGNAME= zope-${DISTNAME:L}p0 +PKGNAME= zope-${DISTNAME:L}p1 CATEGORIES= www HOMEPAGE= http://www.zope.org/Products/PluggableAuthService/ diff --git a/www/zope-pluggableauthservice/pkg/PLIST b/www/zope-pluggableauthservice/pkg/PLIST index 410dfb840e6..7aa497bc963 100644 --- a/www/zope-pluggableauthservice/pkg/PLIST +++ b/www/zope-pluggableauthservice/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/06/25 01:23:07 jolan Exp $ -@conflict plone-* +@comment $OpenBSD: PLIST,v 1.3 2009/06/25 15:40:43 naddy 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/ diff --git a/www/zope-pluginregistry/Makefile b/www/zope-pluginregistry/Makefile index 21ef170805d..9e4fd8f3489 100644 --- a/www/zope-pluginregistry/Makefile +++ b/www/zope-pluginregistry/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2009/06/25 01:23:07 jolan Exp $ +# $OpenBSD: Makefile,v 1.3 2009/06/25 15:40:43 naddy Exp $ COMMENT= pluggable architecture for Zope DISTNAME= PluginRegistry-1.1.2 -PKGNAME= zope-${DISTNAME:L}p0 +PKGNAME= zope-${DISTNAME:L}p1 CATEGORIES= www HOMEPAGE= http://www.zope.org/Products/PluginRegistry/ diff --git a/www/zope-pluginregistry/pkg/PLIST b/www/zope-pluginregistry/pkg/PLIST index 1d2db0255a6..e84dd14c2e1 100644 --- a/www/zope-pluginregistry/pkg/PLIST +++ b/www/zope-pluginregistry/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/06/25 01:23:07 jolan Exp $ -@conflict plone-* +@comment $OpenBSD: PLIST,v 1.3 2009/06/25 15:40:43 naddy 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