From 7503810ca2fa97914cecd90d8ce6142cdd0ef9bc Mon Sep 17 00:00:00 2001 From: jolan Date: Thu, 25 Jun 2009 01:23:07 +0000 Subject: [PATCH] mark conflict with plone --- www/zope-genericsetup/Makefile | 4 ++-- www/zope-genericsetup/pkg/PLIST | 3 ++- www/zope-pluggableauthservice/Makefile | 4 ++-- www/zope-pluggableauthservice/pkg/PLIST | 3 ++- www/zope-pluginregistry/Makefile | 4 ++-- www/zope-pluginregistry/pkg/PLIST | 3 ++- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/www/zope-genericsetup/Makefile b/www/zope-genericsetup/Makefile index b8c211a37df..e9b95e9091e 100644 --- a/www/zope-genericsetup/Makefile +++ b/www/zope-genericsetup/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/11/01 19:21:40 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.2 2009/06/25 01:23:07 jolan Exp $ 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/ diff --git a/www/zope-genericsetup/pkg/PLIST b/www/zope-genericsetup/pkg/PLIST index 3a3c902c67b..bf9af6522b8 100644 --- a/www/zope-genericsetup/pkg/PLIST +++ b/www/zope-genericsetup/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/11/01 19:21:40 mbalmer Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/06/25 01:23:07 jolan Exp $ +@conflict plone-* 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 ea489369815..0de64d71cd8 100644 --- a/www/zope-pluggableauthservice/Makefile +++ b/www/zope-pluggableauthservice/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/10/30 11:55:23 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.2 2009/06/25 01:23:07 jolan Exp $ 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/ diff --git a/www/zope-pluggableauthservice/pkg/PLIST b/www/zope-pluggableauthservice/pkg/PLIST index 34910db0a0a..410dfb840e6 100644 --- a/www/zope-pluggableauthservice/pkg/PLIST +++ b/www/zope-pluggableauthservice/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/30 11:55:23 mbalmer Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/06/25 01:23:07 jolan Exp $ +@conflict plone-* 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 b22cd3493b2..21ef170805d 100644 --- a/www/zope-pluginregistry/Makefile +++ b/www/zope-pluginregistry/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/11/01 10:19:16 mbalmer Exp $ +# $OpenBSD: Makefile,v 1.2 2009/06/25 01:23:07 jolan Exp $ 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/ diff --git a/www/zope-pluginregistry/pkg/PLIST b/www/zope-pluginregistry/pkg/PLIST index b754f9cbed4..1d2db0255a6 100644 --- a/www/zope-pluginregistry/pkg/PLIST +++ b/www/zope-pluginregistry/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/11/01 10:19:16 mbalmer Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/06/25 01:23:07 jolan Exp $ +@conflict plone-* lib/zope/lib/python/Products/PluginRegistry/ lib/zope/lib/python/Products/PluginRegistry/CHANGES.txt lib/zope/lib/python/Products/PluginRegistry/COPYRIGHT.txt