4 files changed, 82 insertions, 80 deletions

diff --git a/www/zope-zwiki/Makefile b/www/zope-zwiki/Makefile
index 67f5f12d1f02..0e6488d773ca 100644
--- a/www/zope-zwiki/Makefile
+++ b/www/zope-zwiki/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	zwiki
-PORTVERSION=	0.27.1
+PORTVERSION=	0.29.0
 CATEGORIES=	www zope
-MASTER_SITES=	http://www.zope.org/Members/simon/ZWiki/ \
-		http://zwiki.org/releases/
+MASTER_SITES=	http://zwiki.org/releases/
 PKGNAMEPREFIX=	zope-
 DISTNAME=	ZWiki-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
@@ -22,20 +21,16 @@ USE_PYTHON=	yes
 DIST_SUBDIR=	zope
 
 ZOPEPRODUCTNAME=	ZWiki
-ZOPEPRODUCTDIR=		lib/python/Products
 
 WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
-CPIO=		cpio --quiet -pdum -R
 
 do-build:
-	@ ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	@ ${CHMOD} -R og+rX ${WRKSRC}/
-	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ cd ${WRKSRC} && ${FIND} * \! -name \*.zexp \
-	  | ${CPIO} ${BINOWN}:${BINGRP} \
-	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
+	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
+	@${CHMOD} -R og+rX ${WRKSRC}/
+	@${CP} -R ${WRKSRC} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
 
 post-install:
 .if !defined(BATCH)
diff --git a/www/zope-zwiki/distinfo b/www/zope-zwiki/distinfo
index 5dcdb2a419f7..1cdd123e3a45 100644
--- a/www/zope-zwiki/distinfo
+++ b/www/zope-zwiki/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/ZWiki-0.27.1.tgz) = 4a255182c6dd4ebcb2163cf64c33746e
-SIZE (zope/ZWiki-0.27.1.tgz) = 221150
+MD5 (zope/ZWiki-0.29.0.tgz) = 48e1ac580c19d74112e0deb89682d5e9
+SIZE (zope/ZWiki-0.29.0.tgz) = 229255
diff --git a/www/zope-zwiki/pkg-message b/www/zope-zwiki/pkg-message
index 98c9f4cbcd97..4ee4ef3ff0a4 100644
--- a/www/zope-zwiki/pkg-message
+++ b/www/zope-zwiki/pkg-message
@@ -3,9 +3,3 @@
   may be done from the Zope Control Panel in the Zope management interface.
 
   You will now be able to create a "ZWiki Web" object.
-
-  Note:  The page header image in a ZWiki Web will be broken if your Zope
-  server interfaces with Apache via PCGI (as the FreeBSD Zope port does by
-  default).  To work around this, place a ZWikiPage_icon.gif in your ZWiki
-  Web's Zope folder, and edit the standard_wiki_header DTML Method to point
-  to this image instead.
diff --git a/www/zope-zwiki/pkg-plist b/www/zope-zwiki/pkg-plist
index 0e12eb0b3011..bdcd187e38c2 100644
--- a/www/zope-zwiki/pkg-plist
+++ b/www/zope-zwiki/pkg-plist
@@ -1,69 +1,46 @@
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/.cvsignore
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/README
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.py
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/.cvsignore
 %%ZOPEPRODUCTDIR%%/ZWiki/Admin.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Admin.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/CHANGES.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/CMF.py
-%%ZOPEPRODUCTDIR%%/ZWiki/CMF.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/CMFInit.py
-%%ZOPEPRODUCTDIR%%/ZWiki/CMFInit.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/CatalogAwareness.py
-%%ZOPEPRODUCTDIR%%/ZWiki/CatalogAwareness.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Defaults.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Defaults.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Diff.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Diff.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Editing.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Editing.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/Install.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/README
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/__init__.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/fixprops.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Extensions/mailin.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Fit.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Fit.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/GPL.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/LICENSE.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/LocalizerSupport.py
-%%ZOPEPRODUCTDIR%%/ZWiki/LocalizerSupport.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Mail.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Mail.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Messages.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Messages.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Outline.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Outline.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/OutlineSupport.py
-%%ZOPEPRODUCTDIR%%/ZWiki/OutlineSupport.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/PageTypes.py
-%%ZOPEPRODUCTDIR%%/ZWiki/PageTypes.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Permissions.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Permissions.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/PurpleNumbers.py
-%%ZOPEPRODUCTDIR%%/ZWiki/PurpleNumbers.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/README.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/Regexps.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Regexps.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Regulations.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Regulations.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/TextFormatter.py
-%%ZOPEPRODUCTDIR%%/ZWiki/TextFormatter.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Tracker.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Tracker.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/UI.py
-%%ZOPEPRODUCTDIR%%/ZWiki/UI.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/Utils.py
-%%ZOPEPRODUCTDIR%%/ZWiki/Utils.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/WWML.py
-%%ZOPEPRODUCTDIR%%/ZWiki/WWML.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/ZWikiPage.py
-%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiPage.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/ZWikiWeb.py
-%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiWeb.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/__init__.py
-%%ZOPEPRODUCTDIR%%/ZWiki/__init__.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/content/basic/AnnoyingQuote.stx
+%%ZOPEPRODUCTDIR%%/ZWiki/refresh.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/version.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/content/basic/FrontPage.stx
 %%ZOPEPRODUCTDIR%%/ZWiki/content/basic/HelpPage.stx
 %%ZOPEPRODUCTDIR%%/ZWiki/content/basic/WikiWikiWeb.stx
@@ -73,19 +50,24 @@
 %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml/RecentChanges.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml/SearchPage.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml/UserOptions.stxdtml
+%%ZOPEPRODUCTDIR%%/ZWiki/content/misc/print.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/content/misc/README
+%%ZOPEPRODUCTDIR%%/ZWiki/content/misc/toc.py
+%%ZOPEPRODUCTDIR%%/ZWiki/content/misc/view_source.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/tracker/FilterIssues.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/content/tracker/IssueTracker.stxdtml
 %%ZOPEPRODUCTDIR%%/ZWiki/dtml/zwikiPageAdd.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/dtml/zwikiWebAdd.dtml
+%%ZOPEPRODUCTDIR%%/ZWiki/functionaltests/.cvsignore
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/fr-CA.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/en.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/es.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/zwiki.pot
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/fr.po
+%%ZOPEPRODUCTDIR%%/ZWiki/i18n/ga.po
 %%ZOPEPRODUCTDIR%%/ZWiki/images/ZWikiPage_icon.gif
-%%ZOPEPRODUCTDIR%%/ZWiki/locale/en.po
-%%ZOPEPRODUCTDIR%%/ZWiki/locale/es.po
-%%ZOPEPRODUCTDIR%%/ZWiki/locale/fr-CA.po
-%%ZOPEPRODUCTDIR%%/ZWiki/locale/fr.po
-%%ZOPEPRODUCTDIR%%/ZWiki/locale/ga.po
-%%ZOPEPRODUCTDIR%%/ZWiki/locale/locale.pot
-%%ZOPEPRODUCTDIR%%/ZWiki/refresh.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/default/backlinks.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/default/README
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/default/contentspage.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/default/diffform.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/default/editform.pt
@@ -104,6 +86,7 @@
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/default/wikipage.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/default/wikipage_macros.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/backlinks.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/README
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/contentspage.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/diffform.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/editform.pt
@@ -121,55 +104,85 @@
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/useroptionsdtml.dtml
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wiki_icon.gif
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit.py
-%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit_form.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikinav_portlet.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_footer.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_header.pt
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_icon.gif
 %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikipage_view.pt
+%%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone/wikifolder_edit.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/.cvsignore
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/README.txt
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/__init__.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/__init__.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/framework.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/framework.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/support.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/support.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testAdmin.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testAdmin.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testCMFPlone.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCMFPlone.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testCatalogAwareness.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCatalogAwareness.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testDiff.py
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testEditing.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testEditing.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testMail.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMail.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testMessages.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMessages.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testOutline.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testOutline.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testPageTypes.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPageTypes.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testParents.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testParents.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testPurpleNumbers.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPurpleNumbers.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiPage.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiPage.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiWeb.py
-%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiWeb.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testmailin.py
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/__init__.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/framework.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/support.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testAdmin.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCMFPlone.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testCatalogAwareness.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testDiff.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testEditing.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMail.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testMessages.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testOutline.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPageTypes.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testParents.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testPurpleNumbers.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiPage.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/tests/testZWikiWeb.pyc
 %%ZOPEPRODUCTDIR%%/ZWiki/tests/testmailin.pyc
-%%ZOPEPRODUCTDIR%%/ZWiki/version.txt
+%%ZOPEPRODUCTDIR%%/ZWiki/Admin.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/CMF.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/CMFInit.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/CatalogAwareness.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Defaults.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Diff.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Editing.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Fit.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/LocalizerSupport.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Mail.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Messages.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Outline.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/OutlineSupport.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/PageTypes.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Permissions.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/PurpleNumbers.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Regexps.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Regulations.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/TextFormatter.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Tracker.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/UI.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/Utils.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/WWML.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiPage.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/ZWikiWeb.pyc
+%%ZOPEPRODUCTDIR%%/ZWiki/__init__.pyc
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/Extensions
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/basic
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/dtml
+@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/misc
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content/tracker
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/content
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/dtml
+@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/functionaltests
+@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/i18n
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/images
-@dirrm %%ZOPEPRODUCTDIR%%/ZWiki/locale
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins/default
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins/zwiki_plone
 @dirrm %%ZOPEPRODUCTDIR%%/ZWiki/skins