- Update to 0.8

PR:		ports/169195
Submitted by:	Neil Darlow <neil darlow.co.uk>
Approved by:	maintainer timeout
Feature safe:	yes

www/habari/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	habari
-PORTVERSION=	0.6.6
+PORTVERSION=	0.8
 CATEGORIES=	www
 MASTER_SITES=	http://habariproject.org/dist/ \
 		http://launchpadlibrarian.net/60087200/
@@ -15,7 +15,7 @@ MAINTAINER=	ayu@commun.jp
 COMMENT=	Next-generation free software blogging platform
 
 USE_ZIP=	yes
-USE_PHP=	pdo pcre simplexml session tokenizer iconv mbstring
+USE_PHP=	ctype filter hash json mbstring pcre pdo session simplexml tokenizer zlib
 WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 
@@ -41,15 +41,20 @@ USE_PHP+=	pdo_sqlite
 IGNORE=	please choose the type of database
 .endif
 
+post-patch:
+.for f in doc/index.html system/classes/theme.php.orig user/cache/.gitignore
+	${RM} ${WRKSRC}/${f}
+.endfor
+
 do-install:
 	@${MKDIR} ${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.php ${WWWDIR}
-.for f in 3rdparty scripts system user
+.for f in system user
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${WWWDIR})
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in LICENCE NOTICE doc/MIT.txt doc/Tiddlywiki_License.txt
+.for f in LICENSE NOTICE README.md doc/MIT.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} manual ${DOCSDIR})

www/habari/distinfo

@@ -1,2 +1,2 @@
-SHA256 (habari-0.6.6.zip) = 037f74f59f617a52a04e07f3e07ecf7c47f9e059c533fe9faa349dea9a51b724
+SHA256 (habari-0.8.zip) = 33f593204d230bbe7b4c7681f3efe0ed50916ec74db3965b46a157eb5b3e7855
-SIZE (habari-0.6.6.zip) = 1296088
+SIZE (habari-0.8.zip) = 3173943

www/habari/files/patch-system__classes__theme.php

@@ -0,0 +1,11 @@
+--- system/classes/theme.php.orig	2011-12-13 05:22:28.000000000 +0000
++++ system/classes/theme.php	2012-06-18 10:24:39.000000000 +0100
+@@ -90,7 +90,7 @@
+ 	public function info()
+ 	{
+ 
+-		$xml_file = $this->theme_dir . '/theme.xml';
++		$xml_file = end( $this->theme_dir ) . '/theme.xml';
+ 		if(!file_exists($xml_file)) {
+ 			return new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?>
+ <pluggable type="theme">

www/habari/pkg-plist

@@ -1,52 +1,32 @@
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE
-%%PORTDOCS%%%%DOCSDIR%%/MIT.txt
-%%PORTDOCS%%%%DOCSDIR%%/NOTICE
-%%PORTDOCS%%%%DOCSDIR%%/Tiddlywiki_License.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/create_entry.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/create_new_ticket.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/dashboard_with_modules.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/group.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
-%%PORTDOCS%%%%DOCSDIR%%/manual/manage_comments.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manage_plugins.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manage_posts.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manage_tags.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/manage_themes.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/notagsposts.PNG
-%%PORTDOCS%%%%DOCSDIR%%/manual/options.jpg
-%%PORTDOCS%%%%DOCSDIR%%/manual/timeline.jpg
-%%WWWDIR%%/3rdparty/blueprint/ie.css
-%%WWWDIR%%/3rdparty/blueprint/plugins/fancy-type/readme.txt
-%%WWWDIR%%/3rdparty/blueprint/plugins/fancy-type/screen.css
-%%WWWDIR%%/3rdparty/blueprint/print.css
-%%WWWDIR%%/3rdparty/blueprint/screen.css
-%%WWWDIR%%/3rdparty/blueprint/src/forms.css
-%%WWWDIR%%/3rdparty/blueprint/src/grid.css
-%%WWWDIR%%/3rdparty/blueprint/src/grid.png
-%%WWWDIR%%/3rdparty/blueprint/src/ie.css
-%%WWWDIR%%/3rdparty/blueprint/src/print.css
-%%WWWDIR%%/3rdparty/blueprint/src/reset.css
-%%WWWDIR%%/3rdparty/blueprint/src/typography.css
-%%WWWDIR%%/3rdparty/hotkeys/jquery.hotkeys.js
-%%WWWDIR%%/3rdparty/humanmsg/humanmsg.css
-%%WWWDIR%%/3rdparty/humanmsg/humanmsg.js
 %%WWWDIR%%/index.php
-%%WWWDIR%%/scripts/crc32.js
+%%WWWDIR%%/system/README.md
-%%WWWDIR%%/scripts/index.html
-%%WWWDIR%%/scripts/jquery.color.js
-%%WWWDIR%%/scripts/jquery.js
-%%WWWDIR%%/scripts/ui.core.js
-%%WWWDIR%%/scripts/ui.resizable.js
-%%WWWDIR%%/scripts/ui.slider.js
-%%WWWDIR%%/scripts/ui.sortable.js
-%%WWWDIR%%/scripts/ui.tabs.js
 %%WWWDIR%%/system/admin/blank.php
+%%WWWDIR%%/system/admin/block_areas.php
+%%WWWDIR%%/system/admin/block_configure.php
+%%WWWDIR%%/system/admin/block_instances.php
 %%WWWDIR%%/system/admin/comment.overview.php
 %%WWWDIR%%/system/admin/comment.php
 %%WWWDIR%%/system/admin/comments.php
 %%WWWDIR%%/system/admin/comments_items.php
 %%WWWDIR%%/system/admin/css/admin.css
 %%WWWDIR%%/system/admin/css/ie.css
+%%WWWDIR%%/system/admin/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_flat_75_ffffff_40x100.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_glass_65_ffffff_1x400.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_glass_75_dadada_1x400.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_glass_75_ffffff_1x400.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_glass_95_fef1ec_1x400.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%WWWDIR%%/system/admin/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
+%%WWWDIR%%/system/admin/css/images/ui-icons_222222_256x240.png
+%%WWWDIR%%/system/admin/css/images/ui-icons_2e83ff_256x240.png
+%%WWWDIR%%/system/admin/css/images/ui-icons_454545_256x240.png
+%%WWWDIR%%/system/admin/css/images/ui-icons_888888_256x240.png
+%%WWWDIR%%/system/admin/css/images/ui-icons_cd0a0a_256x240.png
+%%WWWDIR%%/system/admin/css/jqueryui.css
+%%WWWDIR%%/system/admin/css/token-input.css
 %%WWWDIR%%/system/admin/dash_additem.php
 %%WWWDIR%%/system/admin/dash_status.php
 %%WWWDIR%%/system/admin/dashboard.php
@@ -57,9 +37,11 @@
 %%WWWDIR%%/system/admin/formcontrols/admincontrol_submit.php
 %%WWWDIR%%/system/admin/formcontrols/admincontrol_text.php
 %%WWWDIR%%/system/admin/formcontrols/admincontrol_textarea.php
+%%WWWDIR%%/system/admin/formcontrols/formcontrol_button.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_checkbox.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_checkboxes.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_fieldset.php
+%%WWWDIR%%/system/admin/formcontrols/formcontrol_file.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_form.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_password.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_radio.php
@@ -70,11 +52,14 @@
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_text.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_textarea.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_textmulti.php
+%%WWWDIR%%/system/admin/formcontrols/formcontrol_tree.php
 %%WWWDIR%%/system/admin/formcontrols/formcontrol_wrapper.php
 %%WWWDIR%%/system/admin/formcontrols/optionscontrol_checkbox.php
+%%WWWDIR%%/system/admin/formcontrols/optionscontrol_password.php
 %%WWWDIR%%/system/admin/formcontrols/optionscontrol_select.php
 %%WWWDIR%%/system/admin/formcontrols/optionscontrol_submit.php
 %%WWWDIR%%/system/admin/formcontrols/optionscontrol_text.php
+%%WWWDIR%%/system/admin/formcontrols/optionscontrol_textarea.php
 %%WWWDIR%%/system/admin/formcontrols/tabcontrol_checkbox.php
 %%WWWDIR%%/system/admin/formcontrols/tabcontrol_select.php
 %%WWWDIR%%/system/admin/formcontrols/tabcontrol_tag.php
@@ -84,6 +69,7 @@
 %%WWWDIR%%/system/admin/groups.php
 %%WWWDIR%%/system/admin/groups_item.php
 %%WWWDIR%%/system/admin/header.php
+%%WWWDIR%%/system/admin/images/4way.png
 %%WWWDIR%%/system/admin/images/arrowdown.png
 %%WWWDIR%%/system/admin/images/arrowright.png
 %%WWWDIR%%/system/admin/images/button_background.png
@@ -95,6 +81,7 @@
 %%WWWDIR%%/system/admin/images/habari-logo.png
 %%WWWDIR%%/system/admin/images/help_icon.png
 %%WWWDIR%%/system/admin/images/help_icon_over.png
+%%WWWDIR%%/system/admin/images/index.php
 %%WWWDIR%%/system/admin/images/loginbg.png
 %%WWWDIR%%/system/admin/images/loupebg.png
 %%WWWDIR%%/system/admin/images/loupehandle.png
@@ -110,6 +97,9 @@
 %%WWWDIR%%/system/admin/images/silo-mediabg.png
 %%WWWDIR%%/system/admin/images/spin.gif
 %%WWWDIR%%/system/admin/images/tabsbg.png
+%%WWWDIR%%/system/admin/images/trash.png
+%%WWWDIR%%/system/admin/images/treehandle.png
+%%WWWDIR%%/system/admin/images/warning.png
 %%WWWDIR%%/system/admin/import.php
 %%WWWDIR%%/system/admin/index.php
 %%WWWDIR%%/system/admin/js/admin.js
@@ -117,7 +107,9 @@
 %%WWWDIR%%/system/admin/login.php
 %%WWWDIR%%/system/admin/logs.php
 %%WWWDIR%%/system/admin/logs_items.php
+%%WWWDIR%%/system/admin/navigator.php
 %%WWWDIR%%/system/admin/options.php
+%%WWWDIR%%/system/admin/plugin.php
 %%WWWDIR%%/system/admin/plugins.php
 %%WWWDIR%%/system/admin/posts.php
 %%WWWDIR%%/system/admin/posts_items.php
@@ -125,18 +117,18 @@
 %%WWWDIR%%/system/admin/sysinfo.php
 %%WWWDIR%%/system/admin/tag_collection.php
 %%WWWDIR%%/system/admin/tags.php
+%%WWWDIR%%/system/admin/theme.xml
 %%WWWDIR%%/system/admin/themes.php
 %%WWWDIR%%/system/admin/timeline_items.php
 %%WWWDIR%%/system/admin/user.php
 %%WWWDIR%%/system/admin/users.php
 %%WWWDIR%%/system/admin/users_items.php
+%%WWWDIR%%/system/autoload.php
 %%WWWDIR%%/system/classes/acl.php
-%%WWWDIR%%/system/classes/actionhandler.php
+%%WWWDIR%%/system/classes/ajaxresponse.php
-%%WWWDIR%%/system/classes/adminhandler.php
-%%WWWDIR%%/system/classes/ajaxhandler.php
 %%WWWDIR%%/system/classes/apccache.php
-%%WWWDIR%%/system/classes/atomhandler.php
 %%WWWDIR%%/system/classes/bitmask.php
+%%WWWDIR%%/system/classes/block.php
 %%WWWDIR%%/system/classes/cache.php
 %%WWWDIR%%/system/classes/colorutils.php
 %%WWWDIR%%/system/classes/comment.php
@@ -151,9 +143,9 @@
 %%WWWDIR%%/system/classes/db.php
 %%WWWDIR%%/system/classes/error.php
 %%WWWDIR%%/system/classes/eventlog.php
-%%WWWDIR%%/system/classes/feedbackhandler.php
 %%WWWDIR%%/system/classes/filecache.php
 %%WWWDIR%%/system/classes/format.php
+%%WWWDIR%%/system/classes/formstorage.php
 %%WWWDIR%%/system/classes/formui.php
 %%WWWDIR%%/system/classes/habaridatetime.php
 %%WWWDIR%%/system/classes/habarilocale.php
@@ -165,7 +157,6 @@
 %%WWWDIR%%/system/classes/infoobject.php
 %%WWWDIR%%/system/classes/inforecords.php
 %%WWWDIR%%/system/classes/inputfilter.php
-%%WWWDIR%%/system/classes/installhandler.php
 %%WWWDIR%%/system/classes/iscontent.php
 %%WWWDIR%%/system/classes/logentry.php
 %%WWWDIR%%/system/classes/media.php
@@ -176,7 +167,6 @@
 %%WWWDIR%%/system/classes/options.php
 %%WWWDIR%%/system/classes/pluggable.php
 %%WWWDIR%%/system/classes/plugin.php
-%%WWWDIR%%/system/classes/pluginhandler.php
 %%WWWDIR%%/system/classes/plugins.php
 %%WWWDIR%%/system/classes/post.php
 %%WWWDIR%%/system/classes/postinfo.php
@@ -191,13 +181,15 @@
 %%WWWDIR%%/system/classes/session.php
 %%WWWDIR%%/system/classes/singleton.php
 %%WWWDIR%%/system/classes/site.php
-%%WWWDIR%%/system/classes/smartyengine.php
 %%WWWDIR%%/system/classes/socketrequestprocessor.php
 %%WWWDIR%%/system/classes/stack.php
 %%WWWDIR%%/system/classes/superglobal.php
 %%WWWDIR%%/system/classes/tag.php
 %%WWWDIR%%/system/classes/tags.php
 %%WWWDIR%%/system/classes/templateengine.php
+%%WWWDIR%%/system/classes/term.php
+%%WWWDIR%%/system/classes/terminfo.php
+%%WWWDIR%%/system/classes/terms.php
 %%WWWDIR%%/system/classes/theme.php
 %%WWWDIR%%/system/classes/themes.php
 %%WWWDIR%%/system/classes/update.php
@@ -206,13 +198,12 @@
 %%WWWDIR%%/system/classes/user.php
 %%WWWDIR%%/system/classes/usergroup.php
 %%WWWDIR%%/system/classes/usergroups.php
-%%WWWDIR%%/system/classes/userhandler.php
 %%WWWDIR%%/system/classes/userinfo.php
 %%WWWDIR%%/system/classes/users.php
-%%WWWDIR%%/system/classes/userthemehandler.php
 %%WWWDIR%%/system/classes/utils.php
 %%WWWDIR%%/system/classes/uuid.php
 %%WWWDIR%%/system/classes/version.php
+%%WWWDIR%%/system/classes/vocabulary.php
 %%WWWDIR%%/system/classes/xmlrpcbinary.php
 %%WWWDIR%%/system/classes/xmlrpcclient.php
 %%WWWDIR%%/system/classes/xmlrpcdate.php
@@ -220,7 +211,27 @@
 %%WWWDIR%%/system/classes/xmlrpcserver.php
 %%WWWDIR%%/system/classes/xmlrpcstruct.php
 %%WWWDIR%%/system/classes/xmlrpcutils.php
-%%WWWDIR%%/system/index.html
+%%WWWDIR%%/system/handlers/actionhandler.php
+%%WWWDIR%%/system/handlers/admincommentshandler.php
+%%WWWDIR%%/system/handlers/admindashboardhandler.php
+%%WWWDIR%%/system/handlers/admingroupshandler.php
+%%WWWDIR%%/system/handlers/adminhandler.php
+%%WWWDIR%%/system/handlers/adminimporthandler.php
+%%WWWDIR%%/system/handlers/adminlogshandler.php
+%%WWWDIR%%/system/handlers/adminoptionshandler.php
+%%WWWDIR%%/system/handlers/adminpluginshandler.php
+%%WWWDIR%%/system/handlers/adminpostshandler.php
+%%WWWDIR%%/system/handlers/admintagshandler.php
+%%WWWDIR%%/system/handlers/adminthemeshandler.php
+%%WWWDIR%%/system/handlers/adminusershandler.php
+%%WWWDIR%%/system/handlers/ajaxhandler.php
+%%WWWDIR%%/system/handlers/atomhandler.php
+%%WWWDIR%%/system/handlers/feedbackhandler.php
+%%WWWDIR%%/system/handlers/installhandler.php
+%%WWWDIR%%/system/handlers/pluginhandler.php
+%%WWWDIR%%/system/handlers/userhandler.php
+%%WWWDIR%%/system/handlers/userthemehandler.php
+%%WWWDIR%%/system/index.php
 %%WWWDIR%%/system/installer/config.php
 %%WWWDIR%%/system/installer/db_setup.php
 %%WWWDIR%%/system/installer/footer.php
@@ -230,12 +241,11 @@
 %%WWWDIR%%/system/installer/images/boxmiddle.png
 %%WWWDIR%%/system/installer/images/boxtop.png
 %%WWWDIR%%/system/installer/images/fail.png
+%%WWWDIR%%/system/installer/images/index.php
 %%WWWDIR%%/system/installer/images/install-step.png
 %%WWWDIR%%/system/installer/images/install-step_done.png
 %%WWWDIR%%/system/installer/images/install-step_h2.png
 %%WWWDIR%%/system/installer/images/install-step_h2_done.png
-%%WWWDIR%%/system/installer/images/install-step_h2_help-me.png
-%%WWWDIR%%/system/installer/images/install-step_h2_help-me_over.png
 %%WWWDIR%%/system/installer/images/next-section.png
 %%WWWDIR%%/system/installer/images/ok.png
 %%WWWDIR%%/system/installer/images/options.png
@@ -251,32 +261,55 @@
 %%WWWDIR%%/system/installer/sqlite.php
 %%WWWDIR%%/system/installer/style.css
 %%WWWDIR%%/system/installer/theme.php
-%%WWWDIR%%/system/locale/ca/LC_MESSAGES/habari.mo
+%%WWWDIR%%/system/installer/theme.xml
 %%WWWDIR%%/system/locale/da/LC_MESSAGES/habari.mo
 %%WWWDIR%%/system/locale/de/LC_MESSAGES/habari.mo
-%%WWWDIR%%/system/locale/en-gb/LC_MESSAGES/habari.mo
 %%WWWDIR%%/system/locale/en-us/LC_MESSAGES/habari.mo
+%%WWWDIR%%/system/locale/en-us/LC_MESSAGES/habari.po
 %%WWWDIR%%/system/locale/es/LC_MESSAGES/habari.mo
 %%WWWDIR%%/system/locale/fr/LC_MESSAGES/habari.mo
 %%WWWDIR%%/system/locale/habari.pot
 %%WWWDIR%%/system/locale/index.html
 %%WWWDIR%%/system/locale/it/LC_MESSAGES/habari.mo
 %%WWWDIR%%/system/locale/ja/LC_MESSAGES/habari.mo
-%%WWWDIR%%/system/locale/pl/LC_MESSAGES/habari.mo
+%%WWWDIR%%/system/locale/ru/LC_MESSAGES/habari.mo
-%%WWWDIR%%/system/locale/pt/LC_MESSAGES/habari.mo
-%%WWWDIR%%/system/locale/zh-cn/LC_MESSAGES/habari.mo
 %%WWWDIR%%/system/locale/zh-tw/LC_MESSAGES/habari.mo
+%%WWWDIR%%/system/plugins/autop/autop.plugin.php
+%%WWWDIR%%/system/plugins/autop/autop.plugin.xml
+%%WWWDIR%%/system/plugins/coreblocks/block.dropdown.monthly_archives.php
+%%WWWDIR%%/system/plugins/coreblocks/block.dropdown.tag_archives.php
+%%WWWDIR%%/system/plugins/coreblocks/block.meta_links.php
+%%WWWDIR%%/system/plugins/coreblocks/block.monthly_archives.php
+%%WWWDIR%%/system/plugins/coreblocks/block.recent_comments.php
+%%WWWDIR%%/system/plugins/coreblocks/block.recent_posts.php
+%%WWWDIR%%/system/plugins/coreblocks/block.search_form.php
+%%WWWDIR%%/system/plugins/coreblocks/block.tag_archives.php
+%%WWWDIR%%/system/plugins/coreblocks/block.text.php
+%%WWWDIR%%/system/plugins/coreblocks/coreblocks.plugin.php
+%%WWWDIR%%/system/plugins/coreblocks/coreblocks.plugin.xml
+%%WWWDIR%%/system/plugins/coredashmodules/coredashmodules.css
 %%WWWDIR%%/system/plugins/coredashmodules/coredashmodules.plugin.php
 %%WWWDIR%%/system/plugins/coredashmodules/coredashmodules.plugin.xml
 %%WWWDIR%%/system/plugins/coredashmodules/dash_latestcomments.php
 %%WWWDIR%%/system/plugins/coredashmodules/dash_latestentries.php
 %%WWWDIR%%/system/plugins/coredashmodules/dash_logs.php
+%%WWWDIR%%/system/plugins/coredashmodules/dash_posttypes.php
 %%WWWDIR%%/system/plugins/flickrsilo/flickrsilo.plugin.php
 %%WWWDIR%%/system/plugins/flickrsilo/flickrsilo.plugin.xml
 %%WWWDIR%%/system/plugins/flickrsilo/icon.png
 %%WWWDIR%%/system/plugins/habarisilo/habarisilo.plugin.php
 %%WWWDIR%%/system/plugins/habarisilo/habarisilo.plugin.xml
 %%WWWDIR%%/system/plugins/habarisilo/icon.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/application.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/application_x_gzip.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/application_x_zip.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/application_zip.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/audio.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/default.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/image.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/text.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/text_html.png
+%%WWWDIR%%/system/plugins/habarisilo/icons/video.png
 %%WWWDIR%%/system/plugins/index.html
 %%WWWDIR%%/system/plugins/pingback/pingback.plugin.php
 %%WWWDIR%%/system/plugins/pingback/pingback.plugin.xml
@@ -284,8 +317,6 @@
 %%WWWDIR%%/system/plugins/simple_private_posts/simple_private_posts.plugin.xml
 %%WWWDIR%%/system/plugins/spamchecker/spamchecker.plugin.php
 %%WWWDIR%%/system/plugins/spamchecker/spamchecker.plugin.xml
-%%WWWDIR%%/system/plugins/themehelper/themehelper.plugin.php
-%%WWWDIR%%/system/plugins/themehelper/themehelper.plugin.xml
 %%WWWDIR%%/system/plugins/undelete/undelete.css
 %%WWWDIR%%/system/plugins/undelete/undelete.plugin.php
 %%WWWDIR%%/system/plugins/undelete/undelete.plugin.xml
@@ -302,6 +333,7 @@
 %%WWWDIR%%/system/schema/mysql/upgrades/post/1377.sql
 %%WWWDIR%%/system/schema/mysql/upgrades/post/2951.sql
 %%WWWDIR%%/system/schema/mysql/upgrades/post/3249.sql
+%%WWWDIR%%/system/schema/mysql/upgrades/post/4785.sql
 %%WWWDIR%%/system/schema/mysql/upgrades/pre/2264.sql
 %%WWWDIR%%/system/schema/pgsql/config.php
 %%WWWDIR%%/system/schema/pgsql/connection.php
@@ -312,10 +344,12 @@
 %%WWWDIR%%/system/schema/sqlite/schema.sql
 %%WWWDIR%%/system/schema/sqlite/upgrades/pre/2264.sql
 %%WWWDIR%%/system/themes/charcoal/404.php
+%%WWWDIR%%/system/themes/charcoal/block.charcoal_menu.php
 %%WWWDIR%%/system/themes/charcoal/commentform.php
 %%WWWDIR%%/system/themes/charcoal/comments.php
 %%WWWDIR%%/system/themes/charcoal/entry.single.php
 %%WWWDIR%%/system/themes/charcoal/footer.php
+%%WWWDIR%%/system/themes/charcoal/formcontrol_text.php
 %%WWWDIR%%/system/themes/charcoal/header.php
 %%WWWDIR%%/system/themes/charcoal/home.php
 %%WWWDIR%%/system/themes/charcoal/ie.css
@@ -352,59 +386,13 @@
 %%WWWDIR%%/system/themes/charcoal/scripts/jquery.pngfix.js
 %%WWWDIR%%/system/themes/charcoal/search.php
 %%WWWDIR%%/system/themes/charcoal/searchform.php
+%%WWWDIR%%/system/themes/charcoal/sidebar.blockwrapper.php
 %%WWWDIR%%/system/themes/charcoal/sidebar.php
 %%WWWDIR%%/system/themes/charcoal/style.css
 %%WWWDIR%%/system/themes/charcoal/tag.php
 %%WWWDIR%%/system/themes/charcoal/taglist.php
 %%WWWDIR%%/system/themes/charcoal/theme.php
 %%WWWDIR%%/system/themes/charcoal/theme.xml
-%%WWWDIR%%/system/themes/k2/404.php
-%%WWWDIR%%/system/themes/k2/commentform.php
-%%WWWDIR%%/system/themes/k2/comments.php
-%%WWWDIR%%/system/themes/k2/db_profiling.php
-%%WWWDIR%%/system/themes/k2/entry.multiple.php
-%%WWWDIR%%/system/themes/k2/entry.single.php
-%%WWWDIR%%/system/themes/k2/footer.php
-%%WWWDIR%%/system/themes/k2/header.php
-%%WWWDIR%%/system/themes/k2/home.php
-%%WWWDIR%%/system/themes/k2/images/arrow_refresh.png
-%%WWWDIR%%/system/themes/k2/images/book_next.png
-%%WWWDIR%%/system/themes/k2/images/book_previous.png
-%%WWWDIR%%/system/themes/k2/images/bug.png
-%%WWWDIR%%/system/themes/k2/images/calendar.png
-%%WWWDIR%%/system/themes/k2/images/comment.png
-%%WWWDIR%%/system/themes/k2/images/comment_edit.png
-%%WWWDIR%%/system/themes/k2/images/defaultgravatar.jpg
-%%WWWDIR%%/system/themes/k2/images/elaindicator.png
-%%WWWDIR%%/system/themes/k2/images/exclamation.png
-%%WWWDIR%%/system/themes/k2/images/favorite.gif
-%%WWWDIR%%/system/themes/k2/images/feed.png
-%%WWWDIR%%/system/themes/k2/images/feedicon.gif
-%%WWWDIR%%/system/themes/k2/images/feedicon16px.png
-%%WWWDIR%%/system/themes/k2/images/heart.png
-%%WWWDIR%%/system/themes/k2/images/house.png
-%%WWWDIR%%/system/themes/k2/images/navarrow.gif
-%%WWWDIR%%/system/themes/k2/images/pencil.png
-%%WWWDIR%%/system/themes/k2/images/quote.png
-%%WWWDIR%%/system/themes/k2/images/reset-fff.png
-%%WWWDIR%%/system/themes/k2/images/sliderbgleft.png
-%%WWWDIR%%/system/themes/k2/images/sliderbgright.png
-%%WWWDIR%%/system/themes/k2/images/sliderhandle.png
-%%WWWDIR%%/system/themes/k2/images/spinner.gif
-%%WWWDIR%%/system/themes/k2/images/tag_blue.png
-%%WWWDIR%%/system/themes/k2/images/time.png
-%%WWWDIR%%/system/themes/k2/images/transparent.gif
-%%WWWDIR%%/system/themes/k2/login-disabled.php
-%%WWWDIR%%/system/themes/k2/loginform.php
-%%WWWDIR%%/system/themes/k2/page.single.php
-%%WWWDIR%%/system/themes/k2/screenshot.png
-%%WWWDIR%%/system/themes/k2/search.php
-%%WWWDIR%%/system/themes/k2/searchform.php
-%%WWWDIR%%/system/themes/k2/sidebar.php
-%%WWWDIR%%/system/themes/k2/style.css
-%%WWWDIR%%/system/themes/k2/tag.php
-%%WWWDIR%%/system/themes/k2/theme.php
-%%WWWDIR%%/system/themes/k2/theme.xml
 %%WWWDIR%%/system/themes/mzingi/404.php
 %%WWWDIR%%/system/themes/mzingi/commentform.php
 %%WWWDIR%%/system/themes/mzingi/entry.multiple.php
@@ -420,99 +408,162 @@
 %%WWWDIR%%/system/themes/mzingi/screenshot.png
 %%WWWDIR%%/system/themes/mzingi/search.php
 %%WWWDIR%%/system/themes/mzingi/searchform.php
+%%WWWDIR%%/system/themes/mzingi/sidebar.blockwrapper.php
 %%WWWDIR%%/system/themes/mzingi/sidebar.php
 %%WWWDIR%%/system/themes/mzingi/style.css
 %%WWWDIR%%/system/themes/mzingi/tag.php
 %%WWWDIR%%/system/themes/mzingi/theme.php
 %%WWWDIR%%/system/themes/mzingi/theme.xml
+%%WWWDIR%%/system/vendor/blueprint/ie.css
+%%WWWDIR%%/system/vendor/blueprint/plugins/buttons/icons/cross.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/buttons/icons/key.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/buttons/icons/tick.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/buttons/readme.txt
+%%WWWDIR%%/system/vendor/blueprint/plugins/buttons/screen.css
+%%WWWDIR%%/system/vendor/blueprint/plugins/fancy-type/readme.txt
+%%WWWDIR%%/system/vendor/blueprint/plugins/fancy-type/screen.css
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/doc.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/email.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/external.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/feed.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/im.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/pdf.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/visited.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons/xls.png
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/readme.txt
+%%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/screen.css
+%%WWWDIR%%/system/vendor/blueprint/plugins/rtl/readme.txt
+%%WWWDIR%%/system/vendor/blueprint/plugins/rtl/screen.css
+%%WWWDIR%%/system/vendor/blueprint/print.css
+%%WWWDIR%%/system/vendor/blueprint/screen.css
+%%WWWDIR%%/system/vendor/blueprint/src/forms.css
+%%WWWDIR%%/system/vendor/blueprint/src/grid.css
+%%WWWDIR%%/system/vendor/blueprint/src/grid.png
+%%WWWDIR%%/system/vendor/blueprint/src/ie.css
+%%WWWDIR%%/system/vendor/blueprint/src/print.css
+%%WWWDIR%%/system/vendor/blueprint/src/reset.css
+%%WWWDIR%%/system/vendor/blueprint/src/typography.css
+%%WWWDIR%%/system/vendor/crc32.js
+%%WWWDIR%%/system/vendor/humanmsg/humanmsg.css
+%%WWWDIR%%/system/vendor/humanmsg/humanmsg.js
+%%WWWDIR%%/system/vendor/index.html
+%%WWWDIR%%/system/vendor/jquery-ui.min.js
+%%WWWDIR%%/system/vendor/jquery.color.js
+%%WWWDIR%%/system/vendor/jquery.hotkeys.js
+%%WWWDIR%%/system/vendor/jquery.js
+%%WWWDIR%%/system/vendor/jquery.tokeninput.js
+%%WWWDIR%%/system/vendor/jquery.ui.nestedSortable.js
+%%WWWDIR%%/system/vendor/multicomplete.js
 %%WWWDIR%%/user/cache/.htaccess
+%%WWWDIR%%/user/cache/index.html
 %%WWWDIR%%/user/classes/index.html
 %%WWWDIR%%/user/index.html
 %%WWWDIR%%/user/locale/index.html
 %%WWWDIR%%/user/plugins/index.html
 %%WWWDIR%%/user/themes/index.html
-@dirrm %%WWWDIR%%/user/themes
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-@dirrm %%WWWDIR%%/user/plugins
+%%PORTDOCS%%%%DOCSDIR%%/MIT.txt
-@dirrm %%WWWDIR%%/user/locale
+%%PORTDOCS%%%%DOCSDIR%%/NOTICE
-@dirrm %%WWWDIR%%/user/classes
+%%PORTDOCS%%%%DOCSDIR%%/README.md
-@dirrm %%WWWDIR%%/user/cache
+%%PORTDOCS%%%%DOCSDIR%%/manual/administration.html
-@dirrm %%WWWDIR%%/user
+%%PORTDOCS%%%%DOCSDIR%%/manual/create_entry.jpg
-@dirrm %%WWWDIR%%/system/themes/mzingi
+%%PORTDOCS%%%%DOCSDIR%%/manual/create_new_issue.jpg
-@dirrm %%WWWDIR%%/system/themes/k2/images/headers
+%%PORTDOCS%%%%DOCSDIR%%/manual/dashboard_with_modules.jpg
-@dirrm %%WWWDIR%%/system/themes/k2/images
+%%PORTDOCS%%%%DOCSDIR%%/manual/developer.html
-@dirrm %%WWWDIR%%/system/themes/k2
+%%PORTDOCS%%%%DOCSDIR%%/manual/group.jpg
-@dirrm %%WWWDIR%%/system/themes/charcoal/scripts
+%%PORTDOCS%%%%DOCSDIR%%/manual/habari.html
-@dirrm %%WWWDIR%%/system/themes/charcoal/images
+%%PORTDOCS%%%%DOCSDIR%%/manual/help.html
-@dirrm %%WWWDIR%%/system/themes/charcoal
+%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
-@dirrm %%WWWDIR%%/system/themes
+%%PORTDOCS%%%%DOCSDIR%%/manual/installation.html
-@dirrm %%WWWDIR%%/system/schema/sqlite/upgrades/pre
+%%PORTDOCS%%%%DOCSDIR%%/manual/manage_comments.jpg
-@dirrm %%WWWDIR%%/system/schema/sqlite/upgrades/post
+%%PORTDOCS%%%%DOCSDIR%%/manual/manage_plugins.jpg
-@dirrm %%WWWDIR%%/system/schema/sqlite/upgrades
+%%PORTDOCS%%%%DOCSDIR%%/manual/manage_posts.jpg
-@dirrm %%WWWDIR%%/system/schema/sqlite
+%%PORTDOCS%%%%DOCSDIR%%/manual/manage_tags.jpg
-@dirrm %%WWWDIR%%/system/schema/pgsql/upgrades/pre
+%%PORTDOCS%%%%DOCSDIR%%/manual/manage_themes.jpg
+%%PORTDOCS%%%%DOCSDIR%%/manual/new.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/notagsposts.PNG
+%%PORTDOCS%%%%DOCSDIR%%/manual/options.jpg
+%%PORTDOCS%%%%DOCSDIR%%/manual/style.css
+%%PORTDOCS%%%%DOCSDIR%%/manual/terms.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/timeline.jpg
+%%PORTDOCS%%%%DOCSDIR%%/manual/upgrading.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/using.html
+@dirrm %%WWWDIR%%/system/admin/css/images
+@dirrm %%WWWDIR%%/system/admin/css
+@dirrm %%WWWDIR%%/system/admin/formcontrols
+@dirrm %%WWWDIR%%/system/admin/images
+@dirrm %%WWWDIR%%/system/admin/js
+@dirrm %%WWWDIR%%/system/admin
+@dirrm %%WWWDIR%%/system/classes
+@dirrm %%WWWDIR%%/system/handlers
+@dirrm %%WWWDIR%%/system/installer/images
+@dirrm %%WWWDIR%%/system/installer
+@dirrm %%WWWDIR%%/system/locale/da/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/da
+@dirrm %%WWWDIR%%/system/locale/de/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/de
+@dirrm %%WWWDIR%%/system/locale/en-us/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/en-us
+@dirrm %%WWWDIR%%/system/locale/es/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/es
+@dirrm %%WWWDIR%%/system/locale/fr/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/fr
+@dirrm %%WWWDIR%%/system/locale/it/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/it
+@dirrm %%WWWDIR%%/system/locale/ja/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/ja
+@dirrm %%WWWDIR%%/system/locale/ru/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/ru
+@dirrm %%WWWDIR%%/system/locale/zh-tw/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/locale/zh-tw
+@dirrm %%WWWDIR%%/system/locale
+@dirrm %%WWWDIR%%/system/plugins/autop
+@dirrm %%WWWDIR%%/system/plugins/coreblocks
+@dirrm %%WWWDIR%%/system/plugins/coredashmodules
+@dirrm %%WWWDIR%%/system/plugins/flickrsilo
+@dirrm %%WWWDIR%%/system/plugins/habarisilo/icons
+@dirrm %%WWWDIR%%/system/plugins/habarisilo
+@dirrm %%WWWDIR%%/system/plugins/pingback
+@dirrm %%WWWDIR%%/system/plugins/simple_private_posts
+@dirrm %%WWWDIR%%/system/plugins/spamchecker
+@dirrm %%WWWDIR%%/system/plugins/undelete
+@dirrm %%WWWDIR%%/system/plugins/viddlersilo
+@dirrm %%WWWDIR%%/system/plugins/wpimport
+@dirrm %%WWWDIR%%/system/plugins
+@dirrm %%WWWDIR%%/system/schema/mysql/upgrades/post
+@dirrm %%WWWDIR%%/system/schema/mysql/upgrades/pre
+@dirrm %%WWWDIR%%/system/schema/mysql/upgrades
+@dirrm %%WWWDIR%%/system/schema/mysql
 @dirrm %%WWWDIR%%/system/schema/pgsql/upgrades/post
 @dirrm %%WWWDIR%%/system/schema/pgsql/upgrades
 @dirrm %%WWWDIR%%/system/schema/pgsql
-@dirrm %%WWWDIR%%/system/schema/mysql/upgrades/pre
+@dirrm %%WWWDIR%%/system/schema/sqlite/upgrades/pre
-@dirrm %%WWWDIR%%/system/schema/mysql/upgrades/post
+@dirrm %%WWWDIR%%/system/schema/sqlite/upgrades
-@dirrm %%WWWDIR%%/system/schema/mysql/upgrades
+@dirrm %%WWWDIR%%/system/schema/sqlite
-@dirrm %%WWWDIR%%/system/schema/mysql
 @dirrm %%WWWDIR%%/system/schema
-@dirrm %%WWWDIR%%/system/plugins/wpimport
+@dirrm %%WWWDIR%%/system/themes/charcoal/images
-@dirrm %%WWWDIR%%/system/plugins/viddlersilo
+@dirrm %%WWWDIR%%/system/themes/charcoal/scripts
-@dirrm %%WWWDIR%%/system/plugins/undelete
+@dirrm %%WWWDIR%%/system/themes/charcoal
-@dirrm %%WWWDIR%%/system/plugins/themehelper
+@dirrm %%WWWDIR%%/system/themes/mzingi
-@dirrm %%WWWDIR%%/system/plugins/spamchecker
+@dirrm %%WWWDIR%%/system/themes
-@dirrm %%WWWDIR%%/system/plugins/simple_private_posts
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins/buttons/icons
-@dirrm %%WWWDIR%%/system/plugins/pingback
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins/buttons
-@dirrm %%WWWDIR%%/system/plugins/habarisilo
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins/fancy-type
-@dirrm %%WWWDIR%%/system/plugins/flickrsilo
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins/link-icons/icons
-@dirrm %%WWWDIR%%/system/plugins/coredashmodules
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins/link-icons
-@dirrm %%WWWDIR%%/system/plugins
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins/rtl
-@dirrm %%WWWDIR%%/system/locale/zh-tw/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/vendor/blueprint/plugins
-@dirrm %%WWWDIR%%/system/locale/zh-tw
+@dirrm %%WWWDIR%%/system/vendor/blueprint/src
-@dirrm %%WWWDIR%%/system/locale/zh-cn/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/vendor/blueprint
-@dirrm %%WWWDIR%%/system/locale/zh-cn
+@dirrm %%WWWDIR%%/system/vendor/humanmsg
-@dirrm %%WWWDIR%%/system/locale/pt/LC_MESSAGES
+@dirrm %%WWWDIR%%/system/vendor
-@dirrm %%WWWDIR%%/system/locale/pt
-@dirrm %%WWWDIR%%/system/locale/pl/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/pl
-@dirrm %%WWWDIR%%/system/locale/ja/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/ja
-@dirrm %%WWWDIR%%/system/locale/it/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/it
-@dirrm %%WWWDIR%%/system/locale/fr/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/fr
-@dirrm %%WWWDIR%%/system/locale/es/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/es
-@dirrm %%WWWDIR%%/system/locale/en-us/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/en-us
-@dirrm %%WWWDIR%%/system/locale/en-gb/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/en-gb
-@dirrm %%WWWDIR%%/system/locale/de/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/de
-@dirrm %%WWWDIR%%/system/locale/da/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/da
-@dirrm %%WWWDIR%%/system/locale/ca/LC_MESSAGES
-@dirrm %%WWWDIR%%/system/locale/ca
-@dirrm %%WWWDIR%%/system/locale
-@dirrm %%WWWDIR%%/system/installer/images
-@dirrm %%WWWDIR%%/system/installer
-@dirrm %%WWWDIR%%/system/classes
-@dirrm %%WWWDIR%%/system/admin/js
-@dirrm %%WWWDIR%%/system/admin/images
-@dirrm %%WWWDIR%%/system/admin/formcontrols
-@dirrm %%WWWDIR%%/system/admin/css
-@dirrm %%WWWDIR%%/system/admin
 @dirrm %%WWWDIR%%/system
-@dirrm %%WWWDIR%%/scripts
+@dirrmtry %%WWWDIR%%/user/cache
-@dirrm %%WWWDIR%%/3rdparty/humanmsg
+@dirrmtry %%WWWDIR%%/user/classes
-@dirrm %%WWWDIR%%/3rdparty/hotkeys
+@dirrmtry %%WWWDIR%%/user/locale
-@dirrm %%WWWDIR%%/3rdparty/blueprint/src
+@dirrmtry %%WWWDIR%%/user/plugins
-@dirrm %%WWWDIR%%/3rdparty/blueprint/plugins/fancy-type
+@dirrmtry %%WWWDIR%%/user/themes
-@dirrm %%WWWDIR%%/3rdparty/blueprint/plugins
+@dirrmtry %%WWWDIR%%/user
-@dirrm %%WWWDIR%%/3rdparty/blueprint
+@dirrmtry %%WWWDIR%%
-@dirrm %%WWWDIR%%/3rdparty
-@dirrm %%WWWDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%