4 files changed, 59 insertions, 40 deletions

diff --git a/www/zope-zwiki/Makefile b/www/zope-zwiki/Makefile
index ad4dff56bb62..ae7a8d747923 100644
--- a/www/zope-zwiki/Makefile
+++ b/www/zope-zwiki/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zwiki
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.8
 CATEGORIES=	www zope
 MASTER_SITES=	http://www.zope.org/Members/simon/ZWiki/ \
 		http://zwiki.org/zwikidir/releases/
@@ -39,11 +39,9 @@ do-build:
 do-install:
 	@ ${CHMOD} -R og+rX ${WRKSRC}/
 	@ ${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ ${MKDIR} ${ZOPEBASEDIR}/import
 	@ cd ${WRKSRC} && find * \! -name \*.zexp \
 	  | ${CPIO} ${BINOWN}:${BINGRP} \
 	  ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
-	@ ${INSTALL_DATA} ${WRKSRC}/ZWikiWebs.zexp ${ZOPEBASEDIR}/import
 
 post-install:
 .if !defined(BATCH)
diff --git a/www/zope-zwiki/distinfo b/www/zope-zwiki/distinfo
index 8e60fa4b8f86..ad75a46c35ae 100644
--- a/www/zope-zwiki/distinfo
+++ b/www/zope-zwiki/distinfo
@@ -1 +1 @@
-MD5 (zope/ZWiki-0.9.4.tgz) = bb32a45d4be0f5a1ee44bbdd44d85ef6
+MD5 (zope/ZWiki-0.9.8.tgz) = 39358cd890e2b7da4b5e2ad592925de9
diff --git a/www/zope-zwiki/pkg-message b/www/zope-zwiki/pkg-message
index c23d06c78f84..98c9f4cbcd97 100644
--- a/www/zope-zwiki/pkg-message
+++ b/www/zope-zwiki/pkg-message
@@ -1,19 +1,6 @@
 ===> ZWiki post-port installation instructions:
-  To complete the installation of this port, you need to perform two further
-  steps:
-
-  1. Restart Zope.  This may be done from the Zope Control Panel in the Zope
-     management interface.
-
-  2. Import the example ZWikiWebs into Control_Panel/Products.  These 
-     have been placed in your Zope import directory as the following file:
-
-       ZWikiWebs.zexp
-
-     You cannot add these examples as the Zope superuser; add it as a Zope
-     user with Manager privileges instead.  From the Control_Panel/Products
-     folder, click the Import/Export button, and type the name given a above
-     as the Import file name.
+  To complete the installation of this port, you need to restart Zope. This
+  may be done from the Zope Control Panel in the Zope management interface.
 
   You will now be able to create a "ZWiki Web" object.
 
diff --git a/www/zope-zwiki/pkg-plist b/www/zope-zwiki/pkg-plist
index ef98109ed9fa..27acc5a48970 100644
--- a/www/zope-zwiki/pkg-plist
+++ b/www/zope-zwiki/pkg-plist
@@ -1,32 +1,35 @@
-%%ZOPEBASEDIR%%/import/ZWikiWebs.zexp
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/CatalogAwareness.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/CatalogAwareness.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Changelog
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Defaults.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Defaults.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Diff.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Diff.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Extensions/zwiki_mailin.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Extensions/zwiki_mailin.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/GPL.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/LICENSE.txt
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Parents.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Parents.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Permissions.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Permissions.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiAdd.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiAdd.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiDefaults.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiDefaults.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiDiff.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiDiff.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Regexps.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Regexps.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/SubscriberList.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/SubscriberList.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/TextFormatter.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/TextFormatter.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiPage.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiPage.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiPage_icon.gif
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiParents.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiParents.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiPermissions.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiPermissions.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiRegexes.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiRegexes.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiWeb.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/ZWikiWeb.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/dtml/zwikiPageAdd.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/dtml/zwikiWebAdd.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/images/ZWikiPage_icon.gif
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/refresh.txt
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/DocTests.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/DocTests.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/ZWikiPageTests.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/ZWikiPageTests.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/ZWikiWebsTests.py
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/ZWikiWebsTests.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/doctest.py
@@ -34,9 +37,40 @@
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/refresh.txt
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/simpletestrunner.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/simpletestrunner.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/testDoctests.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/testDoctests.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/testZWikiPage.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/testZWikiPage.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/testZWikiWeb.py
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests/testZWikiWeb.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/version.txt
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/DEFAULTS/standard_wiki_page
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/AnnoyingQuote
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/FrontPage
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/HelpPage
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/JumpSearch
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/RecentChanges
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/RemoteWikiLinks
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/RemoteWikiURL
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/SearchPage
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/StructuredTextRules
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/TextFormattingRules
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/UserOptions
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/WikiName
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/ZWiki
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/backlinks
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/editform
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/index_html
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/standard_wiki_footer
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/standard_wiki_header
+%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg/standard_wiki_page
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wwml.py
 %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wwml.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/ZWiki/zwikipageAdd.dtml
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/zwikidotorg
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis/DEFAULTS
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/wikis
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/tests
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/images
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/dtml
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki/Extensions
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/ZWiki