68 files changed, 135 insertions, 135 deletions

diff --git a/www/py-Products.CMFPlone/Makefile b/www/py-Products.CMFPlone/Makefile
index 175c891ff77a..5501290e603d 100644
--- a/www/py-Products.CMFPlone/Makefile
+++ b/www/py-Products.CMFPlone/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	Products.CMFPlone
 PORTVERSION=	4.1.3
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	The Plone Content Management System (core)
 
 LICENSE=	GPLv2
diff --git a/www/py-Products.TinyMCE/Makefile b/www/py-Products.TinyMCE/Makefile
index eb1ef23d657e..013be6ad385c 100644
--- a/www/py-Products.TinyMCE/Makefile
+++ b/www/py-Products.TinyMCE/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	Products.TinyMCE
 PORTVERSION=	1.2.9
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Adds support for TinyMCE to Plone
 
 LICENSE=	LGPL21
diff --git a/www/py-Products.kupu/Makefile b/www/py-Products.kupu/Makefile
index ee52886f2201..8ca1b7cf44ed 100644
--- a/www/py-Products.kupu/Makefile
+++ b/www/py-Products.kupu/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	Products.kupu
 PORTVERSION=	1.5.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Cross-browser WYWSIWYG editor
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:${PORTSDIR}/www/py-plone.outputfilters \
diff --git a/www/py-plone.app.blob/Makefile b/www/py-plone.app.blob/Makefile
index ee3895263a96..5b58e0c7bcfc 100644
--- a/www/py-plone.app.blob/Makefile
+++ b/www/py-plone.app.blob/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.blob
 PORTVERSION=	1.5.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	ZODB blob support for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.caching/Makefile b/www/py-plone.app.caching/Makefile
index 348ecf21e8b7..fd4460ce3fd6 100644
--- a/www/py-plone.app.caching/Makefile
+++ b/www/py-plone.app.caching/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.caching
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone UI and default rules for plone.caching/z3c.caching
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile
index 10373943563c..94312e76b35f 100644
--- a/www/py-plone.app.collection/Makefile
+++ b/www/py-plone.app.collection/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.collection
 PORTVERSION=	1.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Tools for constructing navigation and site sections
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.content/Makefile b/www/py-plone.app.content/Makefile
index 9ceda32cdabd..b6a9264d8740 100644
--- a/www/py-plone.app.content/Makefile
+++ b/www/py-plone.app.content/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.content
 PORTVERSION=	2.0.7
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Content Views for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.contentlisting/Makefile b/www/py-plone.app.contentlisting/Makefile
index d698aee3751d..468969880079 100644
--- a/www/py-plone.app.contentlisting/Makefile
+++ b/www/py-plone.app.contentlisting/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.contentlisting
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Listing of content for the Plone CMS
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.contentmenu/Makefile b/www/py-plone.app.contentmenu/Makefile
index 572b1267b462..f584ff840b32 100644
--- a/www/py-plone.app.contentmenu/Makefile
+++ b/www/py-plone.app.contentmenu/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.contentmenu
 PORTVERSION=	2.0.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone's content menu implementation
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.contentrules/Makefile b/www/py-plone.app.contentrules/Makefile
index dfaecdc15848..41fd310542dd 100644
--- a/www/py-plone.app.contentrules/Makefile
+++ b/www/py-plone.app.contentrules/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.contentrules
 PORTVERSION=	2.0.7
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone integration for plone.contentrules
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.controlpanel/Makefile b/www/py-plone.app.controlpanel/Makefile
index 0bcebc7c2a13..8c0535081816 100644
--- a/www/py-plone.app.controlpanel/Makefile
+++ b/www/py-plone.app.controlpanel/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.controlpanel
 PORTVERSION=	2.2.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Formlib-based controlpanels for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.customerize/Makefile b/www/py-plone.app.customerize/Makefile
index 1474abe9428f..8627997154e0 100644
--- a/www/py-plone.app.customerize/Makefile
+++ b/www/py-plone.app.customerize/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.customerize
 PORTVERSION=	1.2.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Integrate five.customerize into Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.discussion/Makefile b/www/py-plone.app.discussion/Makefile
index 320baa132a63..51bca17a59dc 100644
--- a/www/py-plone.app.discussion/Makefile
+++ b/www/py-plone.app.discussion/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.discussion
 PORTVERSION=	2.1.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Enhanced discussion support for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.folder/Makefile b/www/py-plone.app.folder/Makefile
index 17a4bb6db525..0d47f1d25725 100644
--- a/www/py-plone.app.folder/Makefile
+++ b/www/py-plone.app.folder/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.folder
 PORTVERSION=	1.0.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Integration package for plone.folder into Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.form/Makefile b/www/py-plone.app.form/Makefile
index cd553b07c389..cb20bacbdf57 100644
--- a/www/py-plone.app.form/Makefile
+++ b/www/py-plone.app.form/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.form
 PORTVERSION=	2.0.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	zope.formlib integration for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.i18n/Makefile b/www/py-plone.app.i18n/Makefile
index c1f8a7845cad..84dc2bdd4f20 100644
--- a/www/py-plone.app.i18n/Makefile
+++ b/www/py-plone.app.i18n/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.i18n
 PORTVERSION=	2.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone specific i18n extensions
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.imaging/Makefile b/www/py-plone.app.imaging/Makefile
index d7abcaec51b3..2e0caaca0255 100644
--- a/www/py-plone.app.imaging/Makefile
+++ b/www/py-plone.app.imaging/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.imaging
 PORTVERSION=	1.0.5
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	User-configurable, blob-aware image scaling for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.iterate/Makefile b/www/py-plone.app.iterate/Makefile
index 4413de5d7f4a..8ac21d5be7ae 100644
--- a/www/py-plone.app.iterate/Makefile
+++ b/www/py-plone.app.iterate/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.iterate
 PORTVERSION=	2.1.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Check-out and check-in staging for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.jquerytools/Makefile b/www/py-plone.app.jquerytools/Makefile
index 4f4a28041384..8faaa6e75073 100644
--- a/www/py-plone.app.jquerytools/Makefile
+++ b/www/py-plone.app.jquerytools/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.jquerytools
 PORTVERSION=	1.3.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	jQuery Tools integration for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.kss/Makefile b/www/py-plone.app.kss/Makefile
index 6bdadb20b550..92031aefe70c 100644
--- a/www/py-plone.app.kss/Makefile
+++ b/www/py-plone.app.kss/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.kss
 PORTVERSION=	1.7.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	KSS (Kinetic Style Sheets) for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.layout/Makefile b/www/py-plone.app.layout/Makefile
index 59694ef56162..108869d71260 100644
--- a/www/py-plone.app.layout/Makefile
+++ b/www/py-plone.app.layout/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.layout
 PORTVERSION=	2.2.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Layout mechanisms for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.linkintegrity/Makefile b/www/py-plone.app.linkintegrity/Makefile
index b205d7daafd1..e74d60109b4a 100644
--- a/www/py-plone.app.linkintegrity/Makefile
+++ b/www/py-plone.app.linkintegrity/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.linkintegrity
 PORTVERSION=	1.4.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Manage link integrity in Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.locales/Makefile b/www/py-plone.app.locales/Makefile
index ebda8074ced5..7d1fd07d10b9 100644
--- a/www/py-plone.app.locales/Makefile
+++ b/www/py-plone.app.locales/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.locales
 PORTVERSION=	4.0.10
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Translation files for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.portlets/Makefile b/www/py-plone.app.portlets/Makefile
index fc14d2b2eabf..46c51af18040 100644
--- a/www/py-plone.app.portlets/Makefile
+++ b/www/py-plone.app.portlets/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.portlets
 PORTVERSION=	2.2.3
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone integration for the basic plone.portlets package
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.querystring/Makefile b/www/py-plone.app.querystring/Makefile
index 824fcc15b9d9..5d9b2bafc7ac 100644
--- a/www/py-plone.app.querystring/Makefile
+++ b/www/py-plone.app.querystring/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.querystring
 PORTVERSION=	1.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Tools to parse stored queries to actual results
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.redirector/Makefile b/www/py-plone.app.redirector/Makefile
index 838bedc4fed8..45417c594959 100644
--- a/www/py-plone.app.redirector/Makefile
+++ b/www/py-plone.app.redirector/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.redirector
 PORTVERSION=	1.1.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Redirection tool
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.registry/Makefile b/www/py-plone.app.registry/Makefile
index cc28706e18d5..26ceddcbb90c 100644
--- a/www/py-plone.app.registry/Makefile
+++ b/www/py-plone.app.registry/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.registry
 PORTVERSION=	1.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope 2 and Plone integration for plone.registry
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.search/Makefile b/www/py-plone.app.search/Makefile
index 2742aff2ec05..a86650ddf219 100644
--- a/www/py-plone.app.search/Makefile
+++ b/www/py-plone.app.search/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.search
 PORTVERSION=	1.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Search user interface for Plone CMS
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.testing/Makefile b/www/py-plone.app.testing/Makefile
index 4fd4ac0dc9ed..af56d4bf079d 100644
--- a/www/py-plone.app.testing/Makefile
+++ b/www/py-plone.app.testing/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.testing
 PORTVERSION=	4.0.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Testing tools for Plone-the-application, based on plone.testing
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.theming/Makefile b/www/py-plone.app.theming/Makefile
index cdd34d6eb5f3..7f2538c7e8b1 100644
--- a/www/py-plone.app.theming/Makefile
+++ b/www/py-plone.app.theming/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.theming
 PORTVERSION=	1.0b9
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Integrates the Diazo theming engine with Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.upgrade/Makefile b/www/py-plone.app.upgrade/Makefile
index e898828e10ea..2aecf34e42fe 100644
--- a/www/py-plone.app.upgrade/Makefile
+++ b/www/py-plone.app.upgrade/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.upgrade
 PORTVERSION=	1.1.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Upgrade machinery for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.users/Makefile b/www/py-plone.app.users/Makefile
index 2ae70777b5bf..a51b3c6f3cb7 100644
--- a/www/py-plone.app.users/Makefile
+++ b/www/py-plone.app.users/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.users
 PORTVERSION=	1.1.3
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Users and groups related things
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.uuid/Makefile b/www/py-plone.app.uuid/Makefile
index e1ec6f75420c..562ba0627bd0 100644
--- a/www/py-plone.app.uuid/Makefile
+++ b/www/py-plone.app.uuid/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.uuid
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone integration for the basic plone.uuid package
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.viewletmanager/Makefile b/www/py-plone.app.viewletmanager/Makefile
index b94e39053fb6..4cd5174d55bf 100644
--- a/www/py-plone.app.viewletmanager/Makefile
+++ b/www/py-plone.app.viewletmanager/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.viewletmanager
 PORTVERSION=	2.0.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Configurable viewlet manager
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.vocabularies/Makefile b/www/py-plone.app.vocabularies/Makefile
index addb54b9dce8..c3834b701032 100644
--- a/www/py-plone.app.vocabularies/Makefile
+++ b/www/py-plone.app.vocabularies/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.vocabularies
 PORTVERSION=	2.1.5
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	A collection of generally useful vocabularies
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.workflow/Makefile b/www/py-plone.app.workflow/Makefile
index 9e1eafe9977c..ecf20596ffbe 100644
--- a/www/py-plone.app.workflow/Makefile
+++ b/www/py-plone.app.workflow/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.workflow
 PORTVERSION=	2.0.6
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Workflow and security settings for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.app.z3cform/Makefile b/www/py-plone.app.z3cform/Makefile
index 75b350466f7a..c9c73ce9e6e0 100644
--- a/www/py-plone.app.z3cform/Makefile
+++ b/www/py-plone.app.z3cform/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.app.z3cform
 PORTVERSION=	0.5.7
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Collection of widgets, templates for use with z3c.form and Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.autoform/Makefile b/www/py-plone.autoform/Makefile
index 93fa279de67b..03f2fd0c2b33 100644
--- a/www/py-plone.autoform/Makefile
+++ b/www/py-plone.autoform/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.autoform
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Tools to construct z3c.form forms
 
 LICENSE=	LGPL20
diff --git a/www/py-plone.browserlayer/Makefile b/www/py-plone.browserlayer/Makefile
index b7da76fd680b..fa660e36a1a8 100644
--- a/www/py-plone.browserlayer/Makefile
+++ b/www/py-plone.browserlayer/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.browserlayer
 PORTVERSION=	2.1.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Browser layer management for Zope 2 applications
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.cachepurging/Makefile b/www/py-plone.cachepurging/Makefile
index e85684fa4570..655d177fdacc 100644
--- a/www/py-plone.cachepurging/Makefile
+++ b/www/py-plone.cachepurging/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.cachepurging
 PORTVERSION=	1.0.3
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Cache purging support for Zope 2 applications
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.caching/Makefile b/www/py-plone.caching/Makefile
index 5ab054aff4a8..946b43175bf7 100644
--- a/www/py-plone.caching/Makefile
+++ b/www/py-plone.caching/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.caching
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Zope 2 integration for z3c.caching
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.contentrules/Makefile b/www/py-plone.contentrules/Makefile
index 4908b5fc1f99..99f53641e5fe 100644
--- a/www/py-plone.contentrules/Makefile
+++ b/www/py-plone.contentrules/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.contentrules
 PORTVERSION=	2.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Plone ContentRules Engine
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.fieldsets/Makefile b/www/py-plone.fieldsets/Makefile
index 155d30ba1330..196329b923f9 100644
--- a/www/py-plone.fieldsets/Makefile
+++ b/www/py-plone.fieldsets/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.fieldsets
 PORTVERSION=	2.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Allows to group fields into different fieldsets
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.folder/Makefile b/www/py-plone.folder/Makefile
index 3eead77bc7d7..58961a8c2b7f 100644
--- a/www/py-plone.folder/Makefile
+++ b/www/py-plone.folder/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.folder
 PORTVERSION=	1.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	BTree-based folder implementation with order support
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.i18n/Makefile b/www/py-plone.i18n/Makefile
index 4c8771e0d361..f90813b6443d 100644
--- a/www/py-plone.i18n/Makefile
+++ b/www/py-plone.i18n/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.i18n
 PORTVERSION=	1.0.10
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Advanced i18n/l10n features
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.indexer/Makefile b/www/py-plone.indexer/Makefile
index f787e7ef5f2d..d2253ecb2264 100644
--- a/www/py-plone.indexer/Makefile
+++ b/www/py-plone.indexer/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.indexer
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Hooks to facilitate managing custom index values
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.intelligenttext/Makefile b/www/py-plone.intelligenttext/Makefile
index d38c281ed567..5e575abacbba 100644
--- a/www/py-plone.intelligenttext/Makefile
+++ b/www/py-plone.intelligenttext/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.intelligenttext
 PORTVERSION=	2.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Transforms from text/x-web-intelligent to text/html
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.locking/Makefile b/www/py-plone.locking/Makefile
index 248ea4d1dcb5..8108ffac8162 100644
--- a/www/py-plone.locking/Makefile
+++ b/www/py-plone.locking/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.locking
 PORTVERSION=	2.0.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	WebDAV locking support
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.memoize/Makefile b/www/py-plone.memoize/Makefile
index 33a9283bf3a4..47cdaac1fa8d 100644
--- a/www/py-plone.memoize/Makefile
+++ b/www/py-plone.memoize/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.memoize
 PORTVERSION=	1.1.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Decorators for caching the values of functions and methods
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.outputfilters/Makefile b/www/py-plone.outputfilters/Makefile
index 48fe64d26aa9..a39110564982 100644
--- a/www/py-plone.outputfilters/Makefile
+++ b/www/py-plone.outputfilters/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.outputfilters
 PORTVERSION=	1.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Transformations applied to HTML in Plone text fields
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.portlet.collection/Makefile b/www/py-plone.portlet.collection/Makefile
index bbc1759ee8db..77978c6c08b9 100644
--- a/www/py-plone.portlet.collection/Makefile
+++ b/www/py-plone.portlet.collection/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.portlet.collection
 PORTVERSION=	2.0.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	A portlet that fetches results from a collection
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.portlet.static/Makefile b/www/py-plone.portlet.static/Makefile
index 8f44d8bd8177..a36714776eb4 100644
--- a/www/py-plone.portlet.static/Makefile
+++ b/www/py-plone.portlet.static/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.portlet.static
 PORTVERSION=	2.0.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	A simple static HTML portlet for Plone
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.portlets/Makefile b/www/py-plone.portlets/Makefile
index b568d65c2ead..dae640e608f7 100644
--- a/www/py-plone.portlets/Makefile
+++ b/www/py-plone.portlets/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.portlets
 PORTVERSION=	2.0.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	An extension of zope.viewlet to support dynamic portlets
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.registry/Makefile b/www/py-plone.registry/Makefile
index a80dfba25086..f6f9e0652c6c 100644
--- a/www/py-plone.registry/Makefile
+++ b/www/py-plone.registry/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.registry
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Registry for storing application settings
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.resource/Makefile b/www/py-plone.resource/Makefile
index 39d2545569d4..aef2e3b93e32 100644
--- a/www/py-plone.resource/Makefile
+++ b/www/py-plone.resource/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.resource
 PORTVERSION=	1.0b6
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Publishes directories of static files via the ZPublisher
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.scale/Makefile b/www/py-plone.scale/Makefile
index 848880aa0e8f..f0d1880c8303 100644
--- a/www/py-plone.scale/Makefile
+++ b/www/py-plone.scale/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.scale
 PORTVERSION=	1.2.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Image scaling
 
 LICENSE=	BSD
diff --git a/www/py-plone.stringinterp/Makefile b/www/py-plone.stringinterp/Makefile
index 1277b4806e94..5e5e2809602c 100644
--- a/www/py-plone.stringinterp/Makefile
+++ b/www/py-plone.stringinterp/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.stringinterp
 PORTVERSION=	1.0.4
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Adaptable string interpolation
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.subrequest/Makefile b/www/py-plone.subrequest/Makefile
index 1bc5df88b260..603351e49dbd 100644
--- a/www/py-plone.subrequest/Makefile
+++ b/www/py-plone.subrequest/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.subrequest
 PORTVERSION=	1.6.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Subrequests for Zope2
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.supermodel/Makefile b/www/py-plone.supermodel/Makefile
index 8dd544c0b785..009995e91aad 100644
--- a/www/py-plone.supermodel/Makefile
+++ b/www/py-plone.supermodel/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.supermodel
 PORTVERSION=	1.0.3
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Serialize Zope schema definitions to and from XML
 
 LICENSE=	BSD
diff --git a/www/py-plone.testing/Makefile b/www/py-plone.testing/Makefile
index 967955aba1a8..2be4c977f8f2 100644
--- a/www/py-plone.testing/Makefile
+++ b/www/py-plone.testing/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.testing
 PORTVERSION=	4.0.3
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Testing infrastructure for Zope and Plone projects
 
 LICENSE=	BSD
diff --git a/www/py-plone.theme/Makefile b/www/py-plone.theme/Makefile
index 8382fd133794..5979e7dbd420 100644
--- a/www/py-plone.theme/Makefile
+++ b/www/py-plone.theme/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.theme
 PORTVERSION=	2.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Tools for managing themes in CMF and Plone sites
 
 LICENSE=	GPLv2
diff --git a/www/py-plone.transformchain/Makefile b/www/py-plone.transformchain/Makefile
index aa0b5de88ca7..6b0e9364242a 100644
--- a/www/py-plone.transformchain/Makefile
+++ b/www/py-plone.transformchain/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.transformchain
 PORTVERSION=	1.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Hook into repoze.zope2 for third party packages
 
 LICENSE=	BSD
diff --git a/www/py-plone.uuid/Makefile b/www/py-plone.uuid/Makefile
index 36d8e355966e..5cbda56b4111 100644
--- a/www/py-plone.uuid/Makefile
+++ b/www/py-plone.uuid/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.uuid
 PORTVERSION=	1.0.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	UUIDs for content items
 
 LICENSE=	BSD
diff --git a/www/py-plone.z3cform/Makefile b/www/py-plone.z3cform/Makefile
index 3ff76a9e4c9c..e14d54215c34 100644
--- a/www/py-plone.z3cform/Makefile
+++ b/www/py-plone.z3cform/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plone.z3cform
 PORTVERSION=	0.7.8
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	Library that allows use of z3c.form with Zope 2 and the CMF
 
 LICENSE=	ZPL21
diff --git a/www/py-plonetheme.classic/Makefile b/www/py-plonetheme.classic/Makefile
index 98f5739f629e..7769c45c78d8 100644
--- a/www/py-plonetheme.classic/Makefile
+++ b/www/py-plonetheme.classic/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plonetheme.classic
 PORTVERSION=	1.0.2
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	The classic Plone 3 default theme
 
 LICENSE=	GPLv2
diff --git a/www/py-plonetheme.sunburst/Makefile b/www/py-plonetheme.sunburst/Makefile
index 29af72cf88a2..2abfbf10d998 100644
--- a/www/py-plonetheme.sunburst/Makefile
+++ b/www/py-plonetheme.sunburst/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	plonetheme.sunburst
 PORTVERSION=	1.2.1
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	The default theme for Plone 4
 
 LICENSE=	GPLv2
diff --git a/www/py-zope.app.wsgi/Makefile b/www/py-zope.app.wsgi/Makefile
index f992e9e38792..09732264218d 100644
--- a/www/py-zope.app.wsgi/Makefile
+++ b/www/py-zope.app.wsgi/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	zope.app.wsgi
 PORTVERSION=	3.13.0
-CATEGORIES=	www python
+CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	WSGI application for the zope.publisher
 
 LICENSE=	ZPL21
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 25b8a2164581..33499dd45c3c 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	CHEESESHOP
 DISTNAME=	Zope2-${PORTVERSION}
 DIST_SUBDIR=	zope
 
-MAINTAINER=	rm@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	An object-based web application platform Version 2.13
 
 LICENSE=	ZPL21