From 2cee3fee3430053b0a3b4225fa2a388f55508c64 Mon Sep 17 00:00:00 2001
From: jolan <jolan@openbsd.org>
Date: Thu, 25 Jun 2009 01:22:10 +0000
Subject: [PATCH] add more conflicts with plone

---
 www/plone/3.0/Makefile  | 4 ++--
 www/plone/3.0/pkg/PLIST | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/www/plone/3.0/Makefile b/www/plone/3.0/Makefile
index b012fa0ac92..aa40f0a0ca5 100644
--- a/www/plone/3.0/Makefile
+++ b/www/plone/3.0/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $
+# $OpenBSD: Makefile,v 1.3 2009/06/25 01:22:10 jolan Exp $
 
 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/
 
diff --git a/www/plone/3.0/pkg/PLIST b/www/plone/3.0/pkg/PLIST
index 383ab11e051..e9589a61f7e 100644
--- a/www/plone/3.0/pkg/PLIST
+++ b/www/plone/3.0/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 01:22:10 jolan 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