5 files changed, 222 insertions, 72 deletions

diff --git a/www/fluxcms/Makefile b/www/fluxcms/Makefile
index bb91fb7a7315..91a4354b2cfd 100644
--- a/www/fluxcms/Makefile
+++ b/www/fluxcms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fluxcms
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	http://bitflux.org/download/ \
 		http://www.chruetertee.ch/files/download/
@@ -20,17 +20,22 @@ FLUXCMSDIR=	www/fluxcms
 INSTALLDIR=	${PREFIX}/${FLUXCMSDIR}
 
 PLIST_SUB=	INSTALLDIR=${FLUXCMSDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+SUB_FILES=	pkg-deinstall pkg-message
+SUB_LIST=	INSTALLDIR=${FLUXCMSDIR}
 
 OPTIONS=	GD "Use GD support instead of ImageMagick" on \
 		TIDY "Configure with tidy support" off
 
 USE_PHP=	dom xml simplexml iconv mysql xsl session pcre
 
-BROKEN_WITH_PHP=	4
 DEFAULT_PHP_VER=	5
 
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+
 .include <bsd.port.pre.mk>
 
+BROKEN_WITH_PHP=	4
+
 .if !defined(WITHOUT_GD)
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/gd.so:${PORTSDIR}/${gd_DEPENDS}
 .else
@@ -47,6 +52,6 @@ do-install:
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INSTALLDIR}
 
 post-install:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/fluxcms/distinfo b/www/fluxcms/distinfo
index d986986db62e..6439efa7270c 100644
--- a/www/fluxcms/distinfo
+++ b/www/fluxcms/distinfo
@@ -1,3 +1,3 @@
-MD5 (fluxcms-1.3.1.tgz) = fd4fdcd8a61864c86e0e442bdc9312ae
-SHA256 (fluxcms-1.3.1.tgz) = 77026593b29c1ead174399b3b7b480c0aaa9ee346bea5ef9b3deabbcef2bdb26
-SIZE (fluxcms-1.3.1.tgz) = 2701465
+MD5 (fluxcms-1.4.0.tgz) = 530f3564c93228ffdecba01abecc3be3
+SHA256 (fluxcms-1.4.0.tgz) = 9af861ad95de16d01e035a3f062a21ef1fbe69e8fe6cb2075cbe9ffc0303d480
+SIZE (fluxcms-1.4.0.tgz) = 3065931
diff --git a/www/fluxcms/files/pkg-deinstall.in b/www/fluxcms/files/pkg-deinstall.in
new file mode 100644
index 000000000000..87897d461596
--- /dev/null
+++ b/www/fluxcms/files/pkg-deinstall.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+case $2 in
+POST-DEINSTALL)
+  echo
+  echo "The fluxcms package has been deleted."
+  if [ -d "%%INSTALLDIR%%" ]; then
+    echo "If you're *not* upgrading and won't be using"
+    echo "it any longer, you may want to remove the"
+    echo "fluxcms directory:"
+    echo
+    echo "  rm -rf %%INSTALLDIR%%"
+  fi
+  echo
+  ;;
+esac
diff --git a/www/fluxcms/pkg-message b/www/fluxcms/files/pkg-message.in
index 706645060579..50518ad9d3ed 100644
--- a/www/fluxcms/pkg-message
+++ b/www/fluxcms/files/pkg-message.in
@@ -16,3 +16,14 @@ Go through that. If everything works ok, Flux CMS is set up.
 Open your newly installed Flux CMS with http://fluxcms.yourdomain.org/
 The admin can be reached with http://fluxcms/admin/ (the trailing slash is
 important right now). You can log in with the data provided in the installer. 
+
+If you are upgrading from an older version of fluxcms, please remove the 
+content of the tmp directory in your fluxcms installation:
+	
+	rm -rf %%PREFIX%%/www/fluxcms/tmp/*
+
+After that please login in your admin interface of your installation and 
+provide a database update:
+
+	http://fluxcms.yourdomain.org/admin/
+	http://fluxcms.yourdomain.org/admin/webinc/update/
diff --git a/www/fluxcms/pkg-plist b/www/fluxcms/pkg-plist
index f2f47fb216bc..eba8b3e17ad7 100644
--- a/www/fluxcms/pkg-plist
+++ b/www/fluxcms/pkg-plist
@@ -36,12 +36,16 @@
 %%INSTALLDIR%%/admin/sitemap/formedit.xml
 %%INSTALLDIR%%/admin/sitemap/image.xml
 %%INSTALLDIR%%/admin/sitemap/kupu.xml
+%%INSTALLDIR%%/admin/sitemap/linklog.xml
 %%INSTALLDIR%%/admin/sitemap/links.xml
+%%INSTALLDIR%%/admin/sitemap/newsletter.xml
 %%INSTALLDIR%%/admin/sitemap/oneform.xml
 %%INSTALLDIR%%/admin/sitemap/ooo.xml
 %%INSTALLDIR%%/admin/sitemap/versioning.xml
 %%INSTALLDIR%%/admin/webinc/approval/index.php
+%%INSTALLDIR%%/admin/webinc/deletetmp.php
 %%INSTALLDIR%%/admin/webinc/formnavi.php
+%%INSTALLDIR%%/admin/webinc/generatenewaccesshash/index.php
 %%INSTALLDIR%%/admin/webinc/img/bitfluxlogo.gif
 %%INSTALLDIR%%/admin/webinc/img/closed.gif
 %%INSTALLDIR%%/admin/webinc/img/closed_breit.gif
@@ -78,6 +82,7 @@
 %%INSTALLDIR%%/admin/webinc/img/slideset.gif
 %%INSTALLDIR%%/admin/webinc/img/space.gif
 %%INSTALLDIR%%/admin/webinc/img/up.gif
+%%INSTALLDIR%%/admin/webinc/install/linklog/index.php
 %%INSTALLDIR%%/admin/webinc/js/admin.js
 %%INSTALLDIR%%/admin/webinc/js/adminfields.js
 %%INSTALLDIR%%/admin/webinc/js/adminpopup.js
@@ -87,19 +92,8 @@
 %%INSTALLDIR%%/admin/webinc/js/overview.js
 %%INSTALLDIR%%/admin/webinc/js/showhidelayers.js
 %%INSTALLDIR%%/admin/webinc/lostpw/index.php
-%%INSTALLDIR%%/admin/webinc/openid/COPYING
-%%INSTALLDIR%%/admin/webinc/openid/ChangeLog
-%%INSTALLDIR%%/admin/webinc/openid/LICENSE
-%%INSTALLDIR%%/admin/webinc/openid/README
-%%INSTALLDIR%%/admin/webinc/openid/association.php
-%%INSTALLDIR%%/admin/webinc/openid/consumer.php
-%%INSTALLDIR%%/admin/webinc/openid/httpclient.php
 %%INSTALLDIR%%/admin/webinc/openid/index.php
-%%INSTALLDIR%%/admin/webinc/openid/interface.php
-%%INSTALLDIR%%/admin/webinc/openid/oid_parse.php
-%%INSTALLDIR%%/admin/webinc/openid/oid_util.php
-%%INSTALLDIR%%/admin/webinc/openid/server.php
-%%INSTALLDIR%%/admin/webinc/openid/trustroot.php
+%%INSTALLDIR%%/admin/webinc/openid/trust.php
 %%INSTALLDIR%%/admin/webinc/sxip-cookiehandler.php
 %%INSTALLDIR%%/admin/webinc/update/index.php
 %%INSTALLDIR%%/admin/webinc/xlt/images/I.png
@@ -121,11 +115,13 @@
 %%INSTALLDIR%%/bin/blog/b2-to-bxb-import.php
 %%INSTALLDIR%%/bin/blog/convert2loginname.sql
 %%INSTALLDIR%%/bin/blog/kwa-to-bxb-import.php
+%%INSTALLDIR%%/bin/blog/twoday-to-bxb.php
 %%INSTALLDIR%%/bin/branch-switcher.sh
 %%INSTALLDIR%%/bin/svnBuildUpdate.sh
 %%INSTALLDIR%%/bin/switch-to-1_3-branch.sh
 %%INSTALLDIR%%/bin/switch-to-1_3_0-tag.sh
-%%INSTALLDIR%%/bin/switch-to-1_3_1-tag.sh
+%%INSTALLDIR%%/bin/switch-to-1_4-branch.sh
+%%INSTALLDIR%%/bin/switch-to-1_4_0-tag.sh
 %%INSTALLDIR%%/bin/switch-to-trunk.sh
 %%INSTALLDIR%%/dbforms2/article.xml
 %%INSTALLDIR%%/dbforms2/article_description.xml
@@ -159,15 +155,18 @@
 %%INSTALLDIR%%/forms/news/config.xml
 %%INSTALLDIR%%/forms/news/index.php
 %%INSTALLDIR%%/forms/users/config.xml
+%%INSTALLDIR%%/forms/users/deletecache.php
 %%INSTALLDIR%%/forms/users/index.php
+%%INSTALLDIR%%/inc/.externals
+%%INSTALLDIR%%/inc/.externals.old
 %%INSTALLDIR%%/inc/.filemap
 %%INSTALLDIR%%/inc/.registry/archive_tar.reg
 %%INSTALLDIR%%/inc/.registry/console_getopt.reg
-%%INSTALLDIR%%/inc/.registry/log.reg
 %%INSTALLDIR%%/inc/.registry/mdb2.reg
+%%INSTALLDIR%%/inc/.registry/mdb2_driver_mysql.reg
+%%INSTALLDIR%%/inc/.registry/mdb2_driver_mysqli.reg
+%%INSTALLDIR%%/inc/.registry/mdb2_driver_sqlite.reg
 %%INSTALLDIR%%/inc/.registry/pear.reg
-%%INSTALLDIR%%/inc/.registry/text_wiki.reg
-%%INSTALLDIR%%/inc/.registry/xml_parser.reg
 %%INSTALLDIR%%/inc/.registry/xml_rpc.reg
 %%INSTALLDIR%%/inc/Archive/Tar.php
 %%INSTALLDIR%%/inc/Auth.php
@@ -176,6 +175,30 @@
 %%INSTALLDIR%%/inc/Auth/Container/MDB2.php
 %%INSTALLDIR%%/inc/Auth/Container/sxip.php
 %%INSTALLDIR%%/inc/Auth/HTTP.php
+%%INSTALLDIR%%/inc/Auth/OpenID.php
+%%INSTALLDIR%%/inc/Auth/OpenID/Association.php
+%%INSTALLDIR%%/inc/Auth/OpenID/AuthenticationRequest.php
+%%INSTALLDIR%%/inc/Auth/OpenID/BigMath.php
+%%INSTALLDIR%%/inc/Auth/OpenID/Consumer.php
+%%INSTALLDIR%%/inc/Auth/OpenID/CryptUtil.php
+%%INSTALLDIR%%/inc/Auth/OpenID/DatabaseConnection.php
+%%INSTALLDIR%%/inc/Auth/OpenID/DiffieHellman.php
+%%INSTALLDIR%%/inc/Auth/OpenID/DumbStore.php
+%%INSTALLDIR%%/inc/Auth/OpenID/FileStore.php
+%%INSTALLDIR%%/inc/Auth/OpenID/HMACSHA1.php
+%%INSTALLDIR%%/inc/Auth/OpenID/HTTPFetcher.php
+%%INSTALLDIR%%/inc/Auth/OpenID/Interface.php
+%%INSTALLDIR%%/inc/Auth/OpenID/KVForm.php
+%%INSTALLDIR%%/inc/Auth/OpenID/MySQLStore.php
+%%INSTALLDIR%%/inc/Auth/OpenID/ParanoidHTTPFetcher.php
+%%INSTALLDIR%%/inc/Auth/OpenID/Parse.php
+%%INSTALLDIR%%/inc/Auth/OpenID/PlainHTTPFetcher.php
+%%INSTALLDIR%%/inc/Auth/OpenID/PostgreSQLStore.php
+%%INSTALLDIR%%/inc/Auth/OpenID/SQLStore.php
+%%INSTALLDIR%%/inc/Auth/OpenID/SQLiteStore.php
+%%INSTALLDIR%%/inc/Auth/OpenID/Server.php
+%%INSTALLDIR%%/inc/Auth/OpenID/ServerRequest.php
+%%INSTALLDIR%%/inc/Auth/OpenID/TrustRoot.php
 %%INSTALLDIR%%/inc/Cache.php
 %%INSTALLDIR%%/inc/Cache/Container.php
 %%INSTALLDIR%%/inc/Cache/Container/db.php
@@ -195,6 +218,7 @@
 %%INSTALLDIR%%/inc/Date/Calc.php
 %%INSTALLDIR%%/inc/Date/Human.php
 %%INSTALLDIR%%/inc/Date/Span.php
+%%INSTALLDIR%%/inc/Date/TimeZone.php
 %%INSTALLDIR%%/inc/DirectoryIterator.php
 %%INSTALLDIR%%/inc/HTTP/Client.php
 %%INSTALLDIR%%/inc/HTTP/Client/CookieManager.php
@@ -207,70 +231,75 @@
 %%INSTALLDIR%%/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
 %%INSTALLDIR%%/inc/Image/CropCanvas.php
 %%INSTALLDIR%%/inc/Image/CropInterface.php
+%%INSTALLDIR%%/inc/Image/Text.php
 %%INSTALLDIR%%/inc/ImageDirectoryIterator.php
 %%INSTALLDIR%%/inc/Log.php
 %%INSTALLDIR%%/inc/Log/composite.php
 %%INSTALLDIR%%/inc/Log/console.php
+%%INSTALLDIR%%/inc/Log/daemon.php
 %%INSTALLDIR%%/inc/Log/display.php
 %%INSTALLDIR%%/inc/Log/error_log.php
 %%INSTALLDIR%%/inc/Log/file.php
 %%INSTALLDIR%%/inc/Log/mail.php
-%%INSTALLDIR%%/inc/Log/mcal.php
+%%INSTALLDIR%%/inc/Log/mdb2.php
 %%INSTALLDIR%%/inc/Log/null.php
 %%INSTALLDIR%%/inc/Log/observer.php
 %%INSTALLDIR%%/inc/Log/sql.php
 %%INSTALLDIR%%/inc/Log/sqlite.php
 %%INSTALLDIR%%/inc/Log/syslog.php
-%%INSTALLDIR%%/inc/Log/win.php
 %%INSTALLDIR%%/inc/MDB2.php
 %%INSTALLDIR%%/inc/MDB2/Date.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Datatype/Common.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Datatype/fbsql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Datatype/ibase.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Datatype/mssql.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Datatype/mysql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Datatype/oci8.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Datatype/pgsql.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Datatype/mysqli.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Datatype/sqlite.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Function/Common.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Function/mysql.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Function/mysqli.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Function/sqlite.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Manager/Common.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Manager/fbsql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Manager/ibase.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Manager/mssql.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Manager/mysql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Manager/oci8.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Manager/pgsql.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Manager/mysqli.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Manager/sqlite.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Native/fbsql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Native/ibase.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Native/mssql.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Native/mysql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Native/oci8.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Native/pgsql.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Native/mysqli.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Native/sqlite.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Reverse/Common.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Reverse/fbsql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Reverse/ibase.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Reverse/mssql.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Reverse/mysql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Reverse/oci8.php
-%%INSTALLDIR%%/inc/MDB2/Driver/Reverse/pgsql.php
+%%INSTALLDIR%%/inc/MDB2/Driver/Reverse/mysqli.php
 %%INSTALLDIR%%/inc/MDB2/Driver/Reverse/sqlite.php
-%%INSTALLDIR%%/inc/MDB2/Driver/fbsql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/ibase.php
 %%INSTALLDIR%%/inc/MDB2/Driver/mssql.php
 %%INSTALLDIR%%/inc/MDB2/Driver/mysql.php
-%%INSTALLDIR%%/inc/MDB2/Driver/oci8.php
-%%INSTALLDIR%%/inc/MDB2/Driver/pgsql.php
+%%INSTALLDIR%%/inc/MDB2/Driver/mysqli.php
 %%INSTALLDIR%%/inc/MDB2/Driver/querysim.php
 %%INSTALLDIR%%/inc/MDB2/Driver/sqlite.php
 %%INSTALLDIR%%/inc/MDB2/Extended.php
 %%INSTALLDIR%%/inc/MDB2/Iterator.php
 %%INSTALLDIR%%/inc/MDB2/LOB.php
-%%INSTALLDIR%%/inc/MDB2/Tools/Manager.php
-%%INSTALLDIR%%/inc/MDB2/Tools/Parser.php
-%%INSTALLDIR%%/inc/MDB2/Tools/reverse_engineer_xml_schema.php
+%%INSTALLDIR%%/inc/MDB2/Schema.php
+%%INSTALLDIR%%/inc/MDB2/Schema/Parser.php
+%%INSTALLDIR%%/inc/MDB2/Schema/Writer.php
 %%INSTALLDIR%%/inc/MDB2/Wrapper/peardb.php
 %%INSTALLDIR%%/inc/MP3/Id.php
+%%INSTALLDIR%%/inc/Mail.php
+%%INSTALLDIR%%/inc/Mail/Queue.php
+%%INSTALLDIR%%/inc/Mail/Queue/Body.php
+%%INSTALLDIR%%/inc/Mail/Queue/Container.php
+%%INSTALLDIR%%/inc/Mail/Queue/Container/db.php
+%%INSTALLDIR%%/inc/Mail/Queue/Container/mdb.php
+%%INSTALLDIR%%/inc/Mail/Queue/Container/mdb2.php
+%%INSTALLDIR%%/inc/Mail/RFC822.php
+%%INSTALLDIR%%/inc/Mail/mail.php
+%%INSTALLDIR%%/inc/Mail/mime.php
+%%INSTALLDIR%%/inc/Mail/mimeDecode.php
+%%INSTALLDIR%%/inc/Mail/mimePart.php
+%%INSTALLDIR%%/inc/Mail/null.php
+%%INSTALLDIR%%/inc/Mail/sendmail.php
+%%INSTALLDIR%%/inc/Mail/smtp.php
 %%INSTALLDIR%%/inc/Net/CheckIP.php
 %%INSTALLDIR%%/inc/Net/DNSBL.php
 %%INSTALLDIR%%/inc/Net/DNSBL/SURBL.php
@@ -281,6 +310,7 @@
 %%INSTALLDIR%%/inc/OS/Guess.php
 %%INSTALLDIR%%/inc/PEAR.php
 %%INSTALLDIR%%/inc/PEAR/Autoloader.php
+%%INSTALLDIR%%/inc/PEAR/Error.php
 %%INSTALLDIR%%/inc/PEAR/ErrorStack.php
 %%INSTALLDIR%%/inc/PHPUnit2/Util/CodeCoverage/Renderer.php
 %%INSTALLDIR%%/inc/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php
@@ -301,7 +331,12 @@
 %%INSTALLDIR%%/inc/SXIP/XMLResponse.php
 %%INSTALLDIR%%/inc/Services/flickr.php
 %%INSTALLDIR%%/inc/System.php
+%%INSTALLDIR%%/inc/Text/CAPTCHA.php
+%%INSTALLDIR%%/inc/Text/CAPTCHA/Driver/Image.php
+%%INSTALLDIR%%/inc/Text/Image/Text.php
+%%INSTALLDIR%%/inc/Text/Password.php
 %%INSTALLDIR%%/inc/XML/Parser.php
+%%INSTALLDIR%%/inc/XML/Parser/Simple.php
 %%INSTALLDIR%%/inc/XML/RPC.php
 %%INSTALLDIR%%/inc/XML/RPC/Server.php
 %%INSTALLDIR%%/inc/XML/Unserializer.php
@@ -318,6 +353,7 @@
 %%INSTALLDIR%%/inc/XML/db2xml/Input/Sql_NG.php
 %%INSTALLDIR%%/inc/XML/db2xml/Input/String.php
 %%INSTALLDIR%%/inc/XML/db2xml/Input/XmlObject.php
+%%INSTALLDIR%%/inc/XML/fo2pdf.php
 %%INSTALLDIR%%/inc/XML/xml2db.php
 %%INSTALLDIR%%/inc/bx/LICENSE
 %%INSTALLDIR%%/inc/bx/autoload.php
@@ -326,6 +362,9 @@
 %%INSTALLDIR%%/inc/bx/button/fonts/LucidaSansDemiBold.ttf
 %%INSTALLDIR%%/inc/bx/button/templates/aquabutton.png
 %%INSTALLDIR%%/inc/bx/button/threeparts.php
+%%INSTALLDIR%%/inc/bx/cache.php
+%%INSTALLDIR%%/inc/bx/cache/dummy.php
+%%INSTALLDIR%%/inc/bx/cache/memcache.php
 %%INSTALLDIR%%/inc/bx/collection.php
 %%INSTALLDIR%%/inc/bx/collectionconfig.php
 %%INSTALLDIR%%/inc/bx/collections.php
@@ -335,6 +374,7 @@
 %%INSTALLDIR%%/inc/bx/config/collection/blog.xml
 %%INSTALLDIR%%/inc/bx/config/default.xml
 %%INSTALLDIR%%/inc/bx/config/generate.php
+%%INSTALLDIR%%/inc/bx/dbforms2.php
 %%INSTALLDIR%%/inc/bx/dbforms2/common.php
 %%INSTALLDIR%%/inc/bx/dbforms2/config.php
 %%INSTALLDIR%%/inc/bx/dbforms2/data.php
@@ -344,9 +384,12 @@
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/checkbox.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/color.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/date.php
+%%INSTALLDIR%%/inc/bx/dbforms2/fields/date/changed.php
+%%INSTALLDIR%%/inc/bx/dbforms2/fields/date/created.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/date/time.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/date/timeutc.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/file.php
+%%INSTALLDIR%%/inc/bx/dbforms2/fields/file/browser.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/file/image.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/fixed.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/fixed/datetime.php
@@ -362,6 +405,7 @@
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/text.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/text/area.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/text/area/small.php
+%%INSTALLDIR%%/inc/bx/dbforms2/fields/text/uri.php
 %%INSTALLDIR%%/inc/bx/dbforms2/fields/text/wysiwyg.php
 %%INSTALLDIR%%/inc/bx/dbforms2/form.php
 %%INSTALLDIR%%/inc/bx/dbforms2/group.php
@@ -420,12 +464,22 @@
 %%INSTALLDIR%%/inc/bx/doctypes/schemas/xhtml/xhtml-strict.rng
 %%INSTALLDIR%%/inc/bx/doctypes/schemas/xhtml/xhtml.rng
 %%INSTALLDIR%%/inc/bx/domdocs/overview.php
+%%INSTALLDIR%%/inc/bx/dynimage/config.php
+%%INSTALLDIR%%/inc/bx/dynimage/driver.php
+%%INSTALLDIR%%/inc/bx/dynimage/drivers/gd.php
+%%INSTALLDIR%%/inc/bx/dynimage/dynimage.php
+%%INSTALLDIR%%/inc/bx/dynimage/filter.php
+%%INSTALLDIR%%/inc/bx/dynimage/filters/gd.php
+%%INSTALLDIR%%/inc/bx/dynimage/filters/gd/brightness.php
+%%INSTALLDIR%%/inc/bx/dynimage/filters/gd/crop.php
+%%INSTALLDIR%%/inc/bx/dynimage/filters/gd/resize.php
+%%INSTALLDIR%%/inc/bx/dynimage/request.php
+%%INSTALLDIR%%/inc/bx/dynimage/validators/filemtime.php
 %%INSTALLDIR%%/inc/bx/editor.php
 %%INSTALLDIR%%/inc/bx/editors/blog.php
 %%INSTALLDIR%%/inc/bx/editors/blog/comment.xsl
 %%INSTALLDIR%%/inc/bx/editors/blog/livesearch.xsl
 %%INSTALLDIR%%/inc/bx/editors/blog/post-fck.xsl
-%%INSTALLDIR%%/inc/bx/editors/blog/post.xsl
 %%INSTALLDIR%%/inc/bx/editors/blog/start.xsl
 %%INSTALLDIR%%/inc/bx/editors/blog/sub.php
 %%INSTALLDIR%%/inc/bx/editors/blog/sub/blogroll.php
@@ -468,8 +522,15 @@
 %%INSTALLDIR%%/inc/bx/editors/image/image.xsl
 %%INSTALLDIR%%/inc/bx/editors/kupu.php
 %%INSTALLDIR%%/inc/bx/editors/kupu/kupu.xsl
+%%INSTALLDIR%%/inc/bx/editors/linklog.php
+%%INSTALLDIR%%/inc/bx/editors/linklog/linklog.xsl
 %%INSTALLDIR%%/inc/bx/editors/links.php
 %%INSTALLDIR%%/inc/bx/editors/links/links.xsl
+%%INSTALLDIR%%/inc/bx/editors/newsletter.php
+%%INSTALLDIR%%/inc/bx/editors/newsletter/newsletter.xsl
+%%INSTALLDIR%%/inc/bx/editors/newsmailer/mitlinks.php
+%%INSTALLDIR%%/inc/bx/editors/newsmailer/newsmailer.php
+%%INSTALLDIR%%/inc/bx/editors/newsmailer/scansystems.php
 %%INSTALLDIR%%/inc/bx/editors/oneform.php
 %%INSTALLDIR%%/inc/bx/editors/oneform/oneform.xsl
 %%INSTALLDIR%%/inc/bx/editors/ooo.php
@@ -506,10 +567,14 @@
 %%INSTALLDIR%%/inc/bx/filters/test.php
 %%INSTALLDIR%%/inc/bx/filters/xslt.php
 %%INSTALLDIR%%/inc/bx/global.php
+%%INSTALLDIR%%/inc/bx/helpers/captcha.php
+%%INSTALLDIR%%/inc/bx/helpers/captcha/Courier_New.ttf
+%%INSTALLDIR%%/inc/bx/helpers/color.php
 %%INSTALLDIR%%/inc/bx/helpers/config.php
 %%INSTALLDIR%%/inc/bx/helpers/date.php
 %%INSTALLDIR%%/inc/bx/helpers/db.php
 %%INSTALLDIR%%/inc/bx/helpers/db2xml.php
+%%INSTALLDIR%%/inc/bx/helpers/dbforms2.php
 %%INSTALLDIR%%/inc/bx/helpers/debug.php
 %%INSTALLDIR%%/inc/bx/helpers/file.php
 %%INSTALLDIR%%/inc/bx/helpers/globals.php
@@ -518,6 +583,7 @@
 %%INSTALLDIR%%/inc/bx/helpers/int.php
 %%INSTALLDIR%%/inc/bx/helpers/mail.php
 %%INSTALLDIR%%/inc/bx/helpers/moblog.php
+%%INSTALLDIR%%/inc/bx/helpers/openid.php
 %%INSTALLDIR%%/inc/bx/helpers/pager.php
 %%INSTALLDIR%%/inc/bx/helpers/perm.php
 %%INSTALLDIR%%/inc/bx/helpers/rss.php
@@ -539,6 +605,7 @@
 %%INSTALLDIR%%/inc/bx/metadatas/text/datetimefield.php
 %%INSTALLDIR%%/inc/bx/metadatas/text/readonly.php
 %%INSTALLDIR%%/inc/bx/metadatas/text/tags.php
+%%INSTALLDIR%%/inc/bx/metadatas/text/textarea.php
 %%INSTALLDIR%%/inc/bx/metadatas/text/textfield.php
 %%INSTALLDIR%%/inc/bx/metaindex.php
 %%INSTALLDIR%%/inc/bx/notification.php
@@ -557,7 +624,11 @@
 %%INSTALLDIR%%/inc/bx/php/UserFile.php
 %%INSTALLDIR%%/inc/bx/php/browser.php
 %%INSTALLDIR%%/inc/bx/php/dynButton.php
+%%INSTALLDIR%%/inc/bx/php/dynimage.php
 %%INSTALLDIR%%/inc/bx/php/livesearch.php
+%%INSTALLDIR%%/inc/bx/php/openid/common.php
+%%INSTALLDIR%%/inc/bx/php/openid/finish_auth.php
+%%INSTALLDIR%%/inc/bx/php/openid/start_auth.php
 %%INSTALLDIR%%/inc/bx/php/setthemecookie.php
 %%INSTALLDIR%%/inc/bx/plugin.php
 %%INSTALLDIR%%/inc/bx/plugins/address.php
@@ -578,6 +649,7 @@
 %%INSTALLDIR%%/inc/bx/plugins/admin/siteoptions.php
 %%INSTALLDIR%%/inc/bx/plugins/admin/themes.php
 %%INSTALLDIR%%/inc/bx/plugins/aggregator.php
+%%INSTALLDIR%%/inc/bx/plugins/basket.php
 %%INSTALLDIR%%/inc/bx/plugins/blog.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/authorarchive.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/categories.php
@@ -588,6 +660,7 @@
 %%INSTALLDIR%%/inc/bx/plugins/blog/flickr.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/geoloc.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/gravatar.php
+%%INSTALLDIR%%/inc/bx/plugins/blog/handlecomment.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/montharchive.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/plazes.php
 %%INSTALLDIR%%/inc/bx/plugins/blog/prevnext.php
@@ -606,7 +679,10 @@
 %%INSTALLDIR%%/inc/bx/plugins/gallery.php
 %%INSTALLDIR%%/inc/bx/plugins/gallery/config.xml
 %%INSTALLDIR%%/inc/bx/plugins/gallery/preview.php
+%%INSTALLDIR%%/inc/bx/plugins/graph.php
 %%INSTALLDIR%%/inc/bx/plugins/image.php
+%%INSTALLDIR%%/inc/bx/plugins/linklog.php
+%%INSTALLDIR%%/inc/bx/plugins/linklog/tags.php
 %%INSTALLDIR%%/inc/bx/plugins/links.php
 %%INSTALLDIR%%/inc/bx/plugins/metadata.php
 %%INSTALLDIR%%/inc/bx/plugins/metainfo.php
@@ -672,6 +748,7 @@
 %%INSTALLDIR%%/inc/bx/tests/installertest.php
 %%INSTALLDIR%%/inc/bx/tests/test/test_of_admin.php
 %%INSTALLDIR%%/inc/bx/tests/test/test_of_blog.php
+%%INSTALLDIR%%/inc/bx/tests/test/test_of_bx_helpers_sql.php
 %%INSTALLDIR%%/inc/bx/tests/test/test_of_bx_helpers_string.php
 %%INSTALLDIR%%/inc/bx/tests/test/test_of_test.php
 %%INSTALLDIR%%/inc/bx/tests/test/test_of_webpage.php
@@ -679,11 +756,20 @@
 %%INSTALLDIR%%/inc/bx/tests/testhelper/runner.php
 %%INSTALLDIR%%/inc/bx/tests/testhelper/scanner.php
 %%INSTALLDIR%%/inc/bx/tools/dbupdate/update.php
+%%INSTALLDIR%%/inc/bx/tools/fluxcli/fluxcli.php
+%%INSTALLDIR%%/inc/bx/tools/generate/builds/plugin.xml
+%%INSTALLDIR%%/inc/bx/tools/generate/db2forms.php
+%%INSTALLDIR%%/inc/bx/tools/generate/plugin.php
+%%INSTALLDIR%%/inc/bx/tools/generate/schema2forms.xsl
+%%INSTALLDIR%%/inc/bx/tools/generate/skeletons/configxml
+%%INSTALLDIR%%/inc/bx/tools/generate/skeletons/plugin.php
+%%INSTALLDIR%%/inc/bx/tools/generate/skeletons/plugin.xsl
 %%INSTALLDIR%%/inc/bx/tools/i18n/i18ngenerator.xsl
 %%INSTALLDIR%%/inc/bx/tools/mdb2forms/README
 %%INSTALLDIR%%/inc/bx/tools/mdb2forms/configsinstall.php
 %%INSTALLDIR%%/inc/bx/tools/mdb2forms/mdbschema2forms.xsl
 %%INSTALLDIR%%/inc/bx/tools/mdb2forms/reverse_engineer_xml_schema.php
+%%INSTALLDIR%%/inc/bx/tools/newsmailer/newsmailer.php
 %%INSTALLDIR%%/inc/bx/tools/svnsync
 %%INSTALLDIR%%/inc/bx/tree.php
 %%INSTALLDIR%%/inc/bx/versioning.php
@@ -712,6 +798,7 @@
 %%INSTALLDIR%%/inc/patForms/Creator/DB.php
 %%INSTALLDIR%%/inc/patForms/Creator/DB/MySQL.php
 %%INSTALLDIR%%/inc/patForms/Element.php
+%%INSTALLDIR%%/inc/patForms/Element/Bottest.php
 %%INSTALLDIR%%/inc/patForms/Element/Date.php
 %%INSTALLDIR%%/inc/patForms/Element/Date/Element.php
 %%INSTALLDIR%%/inc/patForms/Element/Date/Element/Day.php
@@ -759,6 +846,8 @@
 %%INSTALLDIR%%/inc/patForms/Rule/GermanZipCode.php
 %%INSTALLDIR%%/inc/patForms/Rule/Retype.php
 %%INSTALLDIR%%/inc/patForms/Rule/bxTest.php
+%%INSTALLDIR%%/inc/patForms/Rule/email2.php
+%%INSTALLDIR%%/inc/patForms/Rule/pw.php
 %%INSTALLDIR%%/inc/patForms/Storage.php
 %%INSTALLDIR%%/inc/patForms/Storage/CSV.php
 %%INSTALLDIR%%/inc/patForms/Storage/DB.php
@@ -1006,6 +1095,7 @@
 %%INSTALLDIR%%/inc/simpletest/web_tester.php
 %%INSTALLDIR%%/inc/simpletest/xml.php
 %%INSTALLDIR%%/index.php
+%%INSTALLDIR%%/install/.htaccess
 %%INSTALLDIR%%/install/build-shared.xml
 %%INSTALLDIR%%/install/build.xml
 %%INSTALLDIR%%/install/conf-shared/_htaccess_shared
@@ -1023,6 +1113,8 @@
 %%INSTALLDIR%%/install/dist/conf/properties/properties.xml
 %%INSTALLDIR%%/install/dist/data/.configxml
 %%INSTALLDIR%%/install/dist/data/.configxml.children
+%%INSTALLDIR%%/install/dist/data/about/index.de.xhtml
+%%INSTALLDIR%%/install/dist/data/about/index.en.xhtml
 %%INSTALLDIR%%/install/dist/data/blog/.configxml
 %%INSTALLDIR%%/install/dist/data/blog/index.de.xhtml
 %%INSTALLDIR%%/install/dist/data/contact/.configxml
@@ -1281,6 +1373,8 @@
 %%INSTALLDIR%%/structure/bloglinks.xml
 %%INSTALLDIR%%/structure/news.xml
 %%INSTALLDIR%%/structure/quicklinks.php
+%%INSTALLDIR%%/themes/.externals
+%%INSTALLDIR%%/themes/.externals.old
 %%INSTALLDIR%%/themes/2-cols/aggregator.xsl
 %%INSTALLDIR%%/themes/2-cols/blog.xsl
 %%INSTALLDIR%%/themes/2-cols/buttons/bxcms.png
@@ -1303,6 +1397,7 @@
 %%INSTALLDIR%%/themes/2-cols/gallery.xsl
 %%INSTALLDIR%%/themes/2-cols/images/bird.jpg
 %%INSTALLDIR%%/themes/2-cols/images/proto.jpg
+%%INSTALLDIR%%/themes/2-cols/linklog.xsl
 %%INSTALLDIR%%/themes/2-cols/links.xsl
 %%INSTALLDIR%%/themes/2-cols/master.xsl
 %%INSTALLDIR%%/themes/2-cols/pagenotallowed.xsl
@@ -1337,6 +1432,7 @@
 %%INSTALLDIR%%/themes/3-cols/gallery.xsl
 %%INSTALLDIR%%/themes/3-cols/images/bird.jpg
 %%INSTALLDIR%%/themes/3-cols/images/proto.jpg
+%%INSTALLDIR%%/themes/3-cols/linklog.xsl
 %%INSTALLDIR%%/themes/3-cols/links.xsl
 %%INSTALLDIR%%/themes/3-cols/master.xsl
 %%INSTALLDIR%%/themes/3-cols/pagenotallowed.xsl
@@ -1349,24 +1445,6 @@
 %%INSTALLDIR%%/themes/3-cols/template.tal
 %%INSTALLDIR%%/themes/3-cols/templates/default.xhtml
 %%INSTALLDIR%%/themes/3-cols/vote.xsl
-%%INSTALLDIR%%/themes/bxcms/blog.xsl
-%%INSTALLDIR%%/themes/bxcms/buttons/bxcms.png
-%%INSTALLDIR%%/themes/bxcms/buttons/comments.png
-%%INSTALLDIR%%/themes/bxcms/buttons/popoon.png
-%%INSTALLDIR%%/themes/bxcms/buttons/rss.png
-%%INSTALLDIR%%/themes/bxcms/buttons/xhtml10.png
-%%INSTALLDIR%%/themes/bxcms/css/bx-additions.css
-%%INSTALLDIR%%/themes/bxcms/css/bxe-additions.css
-%%INSTALLDIR%%/themes/bxcms/css/main.css
-%%INSTALLDIR%%/themes/bxcms/css/rss.css
-%%INSTALLDIR%%/themes/bxcms/gallery.xsl
-%%INSTALLDIR%%/themes/bxcms/master.xsl
-%%INSTALLDIR%%/themes/bxcms/pagenotallowed.xsl
-%%INSTALLDIR%%/themes/bxcms/pagenotfound.xsl
-%%INSTALLDIR%%/themes/bxcms/preview/main.jpg
-%%INSTALLDIR%%/themes/bxcms/static.xsl
-%%INSTALLDIR%%/themes/bxcms/template.tal
-%%INSTALLDIR%%/themes/bxcms/templates/default.xhtml
 %%INSTALLDIR%%/themes/mobile/blog.xsl
 %%INSTALLDIR%%/themes/mobile/css/main.css
 %%INSTALLDIR%%/themes/mobile/gallery.xsl
@@ -1397,6 +1475,7 @@
 %%INSTALLDIR%%/themes/standard/admin/frameset.xsl
 %%INSTALLDIR%%/themes/standard/admin/images/bitfluxlogo.gif
 %%INSTALLDIR%%/themes/standard/admin/images/dbforms2/liveselect_arrowd.gif
+%%INSTALLDIR%%/themes/standard/admin/images/dbforms2/null.gif
 %%INSTALLDIR%%/themes/standard/admin/images/overview/blog.png
 %%INSTALLDIR%%/themes/standard/admin/images/overview/collection.png
 %%INSTALLDIR%%/themes/standard/admin/images/overview/gallery.png
@@ -1429,6 +1508,7 @@
 %%INSTALLDIR%%/themes/standard/plugins/dms/dms.xsl
 %%INSTALLDIR%%/themes/standard/plugins/dms/dms2rss.xsl
 %%INSTALLDIR%%/themes/standard/plugins/gallery.xsl
+%%INSTALLDIR%%/themes/standard/plugins/linklog/linklog2rss.xsl
 %%INSTALLDIR%%/themes/standard/plugins/metainfo/podcast.xsl
 %%INSTALLDIR%%/themes/standard/plugins/metasearch/result2html.xsl
 %%INSTALLDIR%%/themes/standard/plugins/vote/vote.xsl
@@ -1586,6 +1666,7 @@
 %%INSTALLDIR%%/webinc/bxe/plugins/ClipboardPasteDialog.js
 %%INSTALLDIR%%/webinc/bxe/plugins/Drawer.js
 %%INSTALLDIR%%/webinc/bxe/plugins/Drawer/classes.js
+%%INSTALLDIR%%/webinc/bxe/plugins/FCKBrowser.js
 %%INSTALLDIR%%/webinc/bxe/plugins/XMLSnippets.js
 %%INSTALLDIR%%/webinc/bxe/relaxng/AttributeVDOM.js
 %%INSTALLDIR%%/webinc/bxe/relaxng/DocumentVAL.js
@@ -1876,15 +1957,22 @@
 %%INSTALLDIR%%/webinc/fck/fckstyles.xml
 %%INSTALLDIR%%/webinc/fck/fcktemplates.xml
 %%INSTALLDIR%%/webinc/fck/fix-init-issue.patch
+%%INSTALLDIR%%/webinc/images/openid.gif
+%%INSTALLDIR%%/webinc/images/privat.gif
 %%INSTALLDIR%%/webinc/js/CalendarPopup.js
 %%INSTALLDIR%%/webinc/js/admin.js
 %%INSTALLDIR%%/webinc/js/bx/helpers.js
 %%INSTALLDIR%%/webinc/js/bx/i18n.js
+%%INSTALLDIR%%/webinc/js/bx/scroller.js
+%%INSTALLDIR%%/webinc/js/bx/tooltip.js
 %%INSTALLDIR%%/webinc/js/colorpicker.js
 %%INSTALLDIR%%/webinc/js/dms.js
 %%INSTALLDIR%%/webinc/js/editpopup.js
 %%INSTALLDIR%%/webinc/js/formedit.js
 %%INSTALLDIR%%/webinc/js/livesearch.js
+%%INSTALLDIR%%/webinc/js/moo.ajax.js
+%%INSTALLDIR%%/webinc/js/openId.js
+%%INSTALLDIR%%/webinc/js/prototype.lite.js
 %%INSTALLDIR%%/webinc/js/sarissa.js
 %%INSTALLDIR%%/webinc/js/sarissa_dbform.js
 %%INSTALLDIR%%/webinc/js/spacer.gif
@@ -2012,6 +2100,7 @@
 %%INSTALLDIR%%/webinc/plugins/dbforms2/statusline.js
 %%INSTALLDIR%%/webinc/plugins/dbforms2/toolbar.js
 %%INSTALLDIR%%/webinc/plugins/dbforms2/transport.js
+%%INSTALLDIR%%/webinc/plugins/linklog/admin.css
 %%INSTALLDIR%%/webinc/plugins/metasearch/livesearch.js
 %%INSTALLDIR%%/webinc/tests/bx_collection.php
 %%INSTALLDIR%%/webinc/tests/index.php
@@ -2025,6 +2114,7 @@
 @dirrm %%INSTALLDIR%%/xml
 @dirrm %%INSTALLDIR%%/webinc/tests
 @dirrm %%INSTALLDIR%%/webinc/plugins/metasearch
+@dirrm %%INSTALLDIR%%/webinc/plugins/linklog
 @dirrm %%INSTALLDIR%%/webinc/plugins/dbforms2
 @dirrm %%INSTALLDIR%%/webinc/plugins/dbform/js
 @dirrm %%INSTALLDIR%%/webinc/plugins/dbform/css
@@ -2041,6 +2131,7 @@
 @dirrm %%INSTALLDIR%%/webinc/kupu
 @dirrm %%INSTALLDIR%%/webinc/js/bx
 @dirrm %%INSTALLDIR%%/webinc/js
+@dirrm %%INSTALLDIR%%/webinc/images
 @dirrm %%INSTALLDIR%%/webinc/fck/editor/skins/default/toolbar
 @dirrm %%INSTALLDIR%%/webinc/fck/editor/skins/default/images
 @dirrm %%INSTALLDIR%%/webinc/fck/editor/skins/default
@@ -2126,6 +2217,7 @@
 @dirrm %%INSTALLDIR%%/themes/standard/plugins/vote
 @dirrm %%INSTALLDIR%%/themes/standard/plugins/metasearch
 @dirrm %%INSTALLDIR%%/themes/standard/plugins/metainfo
+@dirrm %%INSTALLDIR%%/themes/standard/plugins/linklog
 @dirrm %%INSTALLDIR%%/themes/standard/plugins/dms
 @dirrm %%INSTALLDIR%%/themes/standard/plugins/blog
 @dirrm %%INSTALLDIR%%/themes/standard/plugins/aggregator
@@ -2140,11 +2232,6 @@
 @dirrm %%INSTALLDIR%%/themes/mobile/preview
 @dirrm %%INSTALLDIR%%/themes/mobile/css
 @dirrm %%INSTALLDIR%%/themes/mobile
-@dirrm %%INSTALLDIR%%/themes/bxcms/templates
-@dirrm %%INSTALLDIR%%/themes/bxcms/preview
-@dirrm %%INSTALLDIR%%/themes/bxcms/css
-@dirrm %%INSTALLDIR%%/themes/bxcms/buttons
-@dirrm %%INSTALLDIR%%/themes/bxcms
 @dirrm %%INSTALLDIR%%/themes/3-cols/templates
 @dirrm %%INSTALLDIR%%/themes/3-cols/preview
 @dirrm %%INSTALLDIR%%/themes/3-cols/images
@@ -2196,6 +2283,7 @@
 @dirrm %%INSTALLDIR%%/install/dist/data/files
 @dirrm %%INSTALLDIR%%/install/dist/data/contact
 @dirrm %%INSTALLDIR%%/install/dist/data/blog
+@dirrm %%INSTALLDIR%%/install/dist/data/about
 @dirrm %%INSTALLDIR%%/install/dist/data
 @dirrm %%INSTALLDIR%%/install/dist/conf/properties/image
 @dirrm %%INSTALLDIR%%/install/dist/conf/properties/audio
@@ -2255,8 +2343,13 @@
 @dirrm %%INSTALLDIR%%/inc/magpie
 @dirrm %%INSTALLDIR%%/inc/bx/xsl
 @dirrm %%INSTALLDIR%%/inc/bx/versioning
+@dirrm %%INSTALLDIR%%/inc/bx/tools/newsmailer
 @dirrm %%INSTALLDIR%%/inc/bx/tools/mdb2forms
 @dirrm %%INSTALLDIR%%/inc/bx/tools/i18n
+@dirrm %%INSTALLDIR%%/inc/bx/tools/generate/skeletons
+@dirrm %%INSTALLDIR%%/inc/bx/tools/generate/builds
+@dirrm %%INSTALLDIR%%/inc/bx/tools/generate
+@dirrm %%INSTALLDIR%%/inc/bx/tools/fluxcli
 @dirrm %%INSTALLDIR%%/inc/bx/tools/dbupdate
 @dirrm %%INSTALLDIR%%/inc/bx/tools
 @dirrm %%INSTALLDIR%%/inc/bx/tests/testhelper
@@ -2277,10 +2370,12 @@
 @dirrm %%INSTALLDIR%%/inc/bx/popoon/components
 @dirrm %%INSTALLDIR%%/inc/bx/popoon
 @dirrm %%INSTALLDIR%%/inc/bx/plugins/xmlrpc
+@dirrm %%INSTALLDIR%%/inc/bx/plugins/linklog
 @dirrm %%INSTALLDIR%%/inc/bx/plugins/gallery
 @dirrm %%INSTALLDIR%%/inc/bx/plugins/blog
 @dirrm %%INSTALLDIR%%/inc/bx/plugins/admin
 @dirrm %%INSTALLDIR%%/inc/bx/plugins
+@dirrm %%INSTALLDIR%%/inc/bx/php/openid
 @dirrm %%INSTALLDIR%%/inc/bx/php
 @dirrm %%INSTALLDIR%%/inc/bx/permm/perm
 @dirrm %%INSTALLDIR%%/inc/bx/permm/auth
@@ -2293,6 +2388,7 @@
 @dirrm %%INSTALLDIR%%/inc/bx/indexer/audio
 @dirrm %%INSTALLDIR%%/inc/bx/indexer
 @dirrm %%INSTALLDIR%%/inc/bx/helpers/xsl
+@dirrm %%INSTALLDIR%%/inc/bx/helpers/captcha
 @dirrm %%INSTALLDIR%%/inc/bx/helpers
 @dirrm %%INSTALLDIR%%/inc/bx/filters/patforms
 @dirrm %%INSTALLDIR%%/inc/bx/filters/formwizard/methods
@@ -2306,7 +2402,10 @@
 @dirrm %%INSTALLDIR%%/inc/bx/editors/ooo/skeleton
 @dirrm %%INSTALLDIR%%/inc/bx/editors/ooo
 @dirrm %%INSTALLDIR%%/inc/bx/editors/oneform
+@dirrm %%INSTALLDIR%%/inc/bx/editors/newsmailer
+@dirrm %%INSTALLDIR%%/inc/bx/editors/newsletter
 @dirrm %%INSTALLDIR%%/inc/bx/editors/links
+@dirrm %%INSTALLDIR%%/inc/bx/editors/linklog
 @dirrm %%INSTALLDIR%%/inc/bx/editors/kupu
 @dirrm %%INSTALLDIR%%/inc/bx/editors/image
 @dirrm %%INSTALLDIR%%/inc/bx/editors/file
@@ -2318,6 +2417,11 @@
 @dirrm %%INSTALLDIR%%/inc/bx/editors/blog/sub
 @dirrm %%INSTALLDIR%%/inc/bx/editors/blog
 @dirrm %%INSTALLDIR%%/inc/bx/editors
+@dirrm %%INSTALLDIR%%/inc/bx/dynimage/validators
+@dirrm %%INSTALLDIR%%/inc/bx/dynimage/filters/gd
+@dirrm %%INSTALLDIR%%/inc/bx/dynimage/filters
+@dirrm %%INSTALLDIR%%/inc/bx/dynimage/drivers
+@dirrm %%INSTALLDIR%%/inc/bx/dynimage
 @dirrm %%INSTALLDIR%%/inc/bx/domdocs
 @dirrm %%INSTALLDIR%%/inc/bx/doctypes/schemas/xhtml/modules
 @dirrm %%INSTALLDIR%%/inc/bx/doctypes/schemas/xhtml/exclude
@@ -2340,6 +2444,7 @@
 @dirrm %%INSTALLDIR%%/inc/bx/dbforms2
 @dirrm %%INSTALLDIR%%/inc/bx/config/collection
 @dirrm %%INSTALLDIR%%/inc/bx/config
+@dirrm %%INSTALLDIR%%/inc/bx/cache
 @dirrm %%INSTALLDIR%%/inc/bx/button/templates
 @dirrm %%INSTALLDIR%%/inc/bx/button/fonts
 @dirrm %%INSTALLDIR%%/inc/bx/button
@@ -2348,7 +2453,12 @@
 @dirrm %%INSTALLDIR%%/inc/XML/db2xml/Format
 @dirrm %%INSTALLDIR%%/inc/XML/db2xml
 @dirrm %%INSTALLDIR%%/inc/XML/RPC
+@dirrm %%INSTALLDIR%%/inc/XML/Parser
 @dirrm %%INSTALLDIR%%/inc/XML
+@dirrm %%INSTALLDIR%%/inc/Text/Image
+@dirrm %%INSTALLDIR%%/inc/Text/CAPTCHA/Driver
+@dirrm %%INSTALLDIR%%/inc/Text/CAPTCHA
+@dirrm %%INSTALLDIR%%/inc/Text
 @dirrm %%INSTALLDIR%%/inc/Services
 @dirrm %%INSTALLDIR%%/inc/SXIP/Request
 @dirrm %%INSTALLDIR%%/inc/SXIP
@@ -2361,12 +2471,16 @@
 @dirrm %%INSTALLDIR%%/inc/OS
 @dirrm %%INSTALLDIR%%/inc/Net/DNSBL
 @dirrm %%INSTALLDIR%%/inc/Net
+@dirrm %%INSTALLDIR%%/inc/Mail/Queue/Container
+@dirrm %%INSTALLDIR%%/inc/Mail/Queue
+@dirrm %%INSTALLDIR%%/inc/Mail
 @dirrm %%INSTALLDIR%%/inc/MP3
 @dirrm %%INSTALLDIR%%/inc/MDB2/Wrapper
-@dirrm %%INSTALLDIR%%/inc/MDB2/Tools
+@dirrm %%INSTALLDIR%%/inc/MDB2/Schema
 @dirrm %%INSTALLDIR%%/inc/MDB2/Driver/Reverse
 @dirrm %%INSTALLDIR%%/inc/MDB2/Driver/Native
 @dirrm %%INSTALLDIR%%/inc/MDB2/Driver/Manager
+@dirrm %%INSTALLDIR%%/inc/MDB2/Driver/Function
 @dirrm %%INSTALLDIR%%/inc/MDB2/Driver/Datatype
 @dirrm %%INSTALLDIR%%/inc/MDB2/Driver
 @dirrm %%INSTALLDIR%%/inc/MDB2
@@ -2383,6 +2497,7 @@
 @dirrm %%INSTALLDIR%%/inc/Config
 @dirrm %%INSTALLDIR%%/inc/Cache/Container
 @dirrm %%INSTALLDIR%%/inc/Cache
+@dirrm %%INSTALLDIR%%/inc/Auth/OpenID
 @dirrm %%INSTALLDIR%%/inc/Auth/Container
 @dirrm %%INSTALLDIR%%/inc/Auth
 @dirrm %%INSTALLDIR%%/inc/Archive
@@ -2407,11 +2522,14 @@
 @dirrm %%INSTALLDIR%%/admin/webinc/openid
 @dirrm %%INSTALLDIR%%/admin/webinc/lostpw
 @dirrm %%INSTALLDIR%%/admin/webinc/js
+@dirrm %%INSTALLDIR%%/admin/webinc/install/linklog
+@dirrm %%INSTALLDIR%%/admin/webinc/install
 @dirrm %%INSTALLDIR%%/admin/webinc/img/icons/text
 @dirrm %%INSTALLDIR%%/admin/webinc/img/icons/image
 @dirrm %%INSTALLDIR%%/admin/webinc/img/icons/application
 @dirrm %%INSTALLDIR%%/admin/webinc/img/icons
 @dirrm %%INSTALLDIR%%/admin/webinc/img
+@dirrm %%INSTALLDIR%%/admin/webinc/generatenewaccesshash
 @dirrm %%INSTALLDIR%%/admin/webinc/approval
 @dirrm %%INSTALLDIR%%/admin/webinc
 @dirrm %%INSTALLDIR%%/admin/sitemap