- Update to 1.1.15.5144

- Use WWWDIR

PR:		114138
Submitted by:	Greg Larkin <glarkin@sourcehosting.net> (maintainer)

48 files changed, 1836 insertions, 1614 deletions

diff --git a/www/cakephp-devel/Makefile b/www/cakephp-devel/Makefile
index 4b2b59fe556f..978fe8b474eb 100644
--- a/www/cakephp-devel/Makefile
+++ b/www/cakephp-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.13.4450
-PORTREVISION=	1
+PORTVERSION=	1.1.15.5144
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/326/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/410/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
@@ -63,7 +62,7 @@ PROD=		development
 EXTRA_PATCHES=	${FILESDIR}/development-app-config-core.php.patch
 .endif
 
-CONF=		cakephp-${PROD}${CGI_EXT}.conf 
+CONF=		cakephp-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
@@ -109,15 +108,15 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${WWWDIR}
 	${CP} -R ${WRKSRC}/.htaccess \
 			${WRKSRC}/app \
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
-			${WRKSRC}/vendors ${DATADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+			${WRKSRC}/vendors ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${FIND} ${WWWDIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
+	${FIND} ${WWWDIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
 
 post-install:
 	@if [ -d "${CONFDIR}" ]; then \
diff --git a/www/cakephp-devel/distinfo b/www/cakephp-devel/distinfo
index eb02e8b50cdc..4bdc7fc946af 100644
--- a/www/cakephp-devel/distinfo
+++ b/www/cakephp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.13.4450.tar.bz2) = 9b39849608a8d9881adb8d65f75a14d8
-SHA256 (cake_1.1.13.4450.tar.bz2) = 614a63e501490d4735b955ccca1194fc330c8b65cb64441ad3de2ea8ebd301c1
-SIZE (cake_1.1.13.4450.tar.bz2) = 148538
+MD5 (cake_1.1.15.5144.tar.bz2) = f163a298eaaa4361c62175a19bf3f763
+SHA256 (cake_1.1.15.5144.tar.bz2) = 44eb104fd33dc95ea28ed2cdfbeea6649412a401efc77b9b57c2345dc322ad7e
+SIZE (cake_1.1.15.5144.tar.bz2) = 158658
diff --git a/www/cakephp-devel/files/cakephp-development-cgi.conf.in b/www/cakephp-devel/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp-devel/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp-devel/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp-devel/files/cakephp-development.conf.in b/www/cakephp-devel/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp-devel/files/cakephp-development.conf.in
+++ b/www/cakephp-devel/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp-devel/files/cakephp-production-cgi.conf.in b/www/cakephp-devel/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp-devel/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp-devel/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp-devel/files/cakephp-production.conf.in b/www/cakephp-devel/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp-devel/files/cakephp-production.conf.in
+++ b/www/cakephp-devel/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp-devel/files/pkg-message.in b/www/cakephp-devel/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp-devel/files/pkg-message.in
+++ b/www/cakephp-devel/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.
diff --git a/www/cakephp-devel/pkg-plist b/www/cakephp-devel/pkg-plist
index 0db1a81580a8..c2f539b2c2f9 100644
--- a/www/cakephp-devel/pkg-plist
+++ b/www/cakephp-devel/pkg-plist
@@ -1,258 +1,296 @@
-%%DATADIR%%/app/.htaccess
-%%DATADIR%%/app/config/acl.ini.php
-%%DATADIR%%/app/config/bootstrap.php
-%%DATADIR%%/app/config/core.php
-@unexec rm -f %D/%%DATADIR%%/app/config/core.php.orig
-%%DATADIR%%/app/config/database.php.default
-%%DATADIR%%/app/config/inflections.php
-%%DATADIR%%/app/config/routes.php
-%%DATADIR%%/app/config/sql/db_acl.sql
-%%DATADIR%%/app/config/sql/sessions.sql
-%%DATADIR%%/app/index.php
-%%DATADIR%%/app/webroot/.htaccess
-%%DATADIR%%/app/webroot/css.php
-%%DATADIR%%/app/webroot/css/cake.generic.css
-%%DATADIR%%/app/webroot/favicon.ico
-%%DATADIR%%/app/webroot/img/cake.power.png
-%%DATADIR%%/app/webroot/img/w3c_css.png
-%%DATADIR%%/app/webroot/img/w3c_xhtml10.png
-%%DATADIR%%/app/webroot/index.php
-%%DATADIR%%/app/webroot/js/vendors.php
-%%DATADIR%%/cake/LICENSE.txt
-%%DATADIR%%/cake/VERSION.txt
-%%DATADIR%%/cake/app_controller.php
-%%DATADIR%%/cake/app_model.php
-%%DATADIR%%/cake/basics.php
-%%DATADIR%%/cake/bootstrap.php
-%%DATADIR%%/cake/config/config.php
-%%DATADIR%%/cake/config/paths.php
-%%DATADIR%%/cake/dispatcher.php
-%%DATADIR%%/cake/libs/cache.php
-%%DATADIR%%/cake/libs/cake_log.php
-%%DATADIR%%/cake/libs/class_registry.php
-%%DATADIR%%/cake/libs/configure.php
-%%DATADIR%%/cake/libs/controller/component.php
-%%DATADIR%%/cake/libs/controller/components/acl.php
-%%DATADIR%%/cake/libs/controller/components/acl_base.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/db_acl.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aco.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aro.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
-%%DATADIR%%/cake/libs/controller/components/iniacl/ini_acl.php
-%%DATADIR%%/cake/libs/controller/components/request_handler.php
-%%DATADIR%%/cake/libs/controller/components/security.php
-%%DATADIR%%/cake/libs/controller/components/session.php
-%%DATADIR%%/cake/libs/controller/controller.php
-%%DATADIR%%/cake/libs/controller/pages_controller.php
-%%DATADIR%%/cake/libs/controller/scaffold.php
-%%DATADIR%%/cake/libs/error.php
-%%DATADIR%%/cake/libs/file.php
-%%DATADIR%%/cake/libs/flay.php
-%%DATADIR%%/cake/libs/folder.php
-%%DATADIR%%/cake/libs/inflector.php
-%%DATADIR%%/cake/libs/legacy.php
-%%DATADIR%%/cake/libs/model/connection_manager.php
-%%DATADIR%%/cake/libs/model/datasources/datasource.php
-%%DATADIR%%/cake/libs/model/datasources/dbo_source.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_adodb.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mssql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysqli.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_odbc.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_pear.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_postgres.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_sqlite.php
-%%DATADIR%%/cake/libs/model/model.php
-%%DATADIR%%/cake/libs/model/model_php4.php
-%%DATADIR%%/cake/libs/model/model_php5.php
-%%DATADIR%%/cake/libs/neat_array.php
-%%DATADIR%%/cake/libs/neat_string.php
-%%DATADIR%%/cake/libs/object.php
-%%DATADIR%%/cake/libs/router.php
-%%DATADIR%%/cake/libs/sanitize.php
-%%DATADIR%%/cake/libs/security.php
-%%DATADIR%%/cake/libs/session.php
-%%DATADIR%%/cake/libs/validators.php
-%%DATADIR%%/cake/libs/view/helper.php
-%%DATADIR%%/cake/libs/view/helpers/ajax.php
-%%DATADIR%%/cake/libs/view/helpers/cache.php
-%%DATADIR%%/cake/libs/view/helpers/form.php
-%%DATADIR%%/cake/libs/view/helpers/html.php
-%%DATADIR%%/cake/libs/view/helpers/javascript.php
-%%DATADIR%%/cake/libs/view/helpers/number.php
-%%DATADIR%%/cake/libs/view/helpers/session.php
-%%DATADIR%%/cake/libs/view/helpers/text.php
-%%DATADIR%%/cake/libs/view/helpers/time.php
-%%DATADIR%%/cake/libs/view/templates/elements/dump.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/error404.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_connection.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_controller.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_layout.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_model.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_table.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_view.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/private_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/ajax.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/default.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/flash.thtml
-%%DATADIR%%/cake/libs/view/templates/pages/home.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/add.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/edit.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/index.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/view.thtml
-%%DATADIR%%/cake/libs/view/view.php
-%%DATADIR%%/cake/scripts/acl.php
-%%DATADIR%%/cake/scripts/bake.php
-%%DATADIR%%/cake/scripts/templates/skel/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/app_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/app_model.php
-%%DATADIR%%/cake/scripts/templates/skel/config/acl.ini.php
-%%DATADIR%%/cake/scripts/templates/skel/config/bootstrap.php
-%%DATADIR%%/cake/scripts/templates/skel/config/core.php
-%%DATADIR%%/cake/scripts/templates/skel/config/database.php.default
-%%DATADIR%%/cake/scripts/templates/skel/config/inflections.php
-%%DATADIR%%/cake/scripts/templates/skel/config/routes.php
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
-%%DATADIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/index.php
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
-%%DATADIR%%/cake/scripts/templates/skel/webroot/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
-%%DATADIR%%/cake/scripts/templates/skel/webroot/favicon.ico
-%%DATADIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
-%%DATADIR%%/cake/scripts/templates/skel/webroot/index.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
-%%DATADIR%%/cake/scripts/templates/views/home.thtml
+%%WWWDIR%%/app/.htaccess
+%%WWWDIR%%/app/config/acl.ini.php
+%%WWWDIR%%/app/config/bootstrap.php
+%%WWWDIR%%/app/config/core.php
+@unexec rm -f %D/%%WWWDIR%%/app/config/core.php.orig
+%%WWWDIR%%/app/config/database.php.default
+%%WWWDIR%%/app/config/inflections.php
+%%WWWDIR%%/app/config/routes.php
+%%WWWDIR%%/app/config/sql/db_acl.sql
+%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/controllers/components/empty
+%%WWWDIR%%/app/index.php
+%%WWWDIR%%/app/models/empty
+%%WWWDIR%%/app/plugins/empty
+%%WWWDIR%%/app/tmp/cache/empty
+%%WWWDIR%%/app/tmp/cache/models/empty
+%%WWWDIR%%/app/tmp/cache/persistent/empty
+%%WWWDIR%%/app/tmp/cache/views/empty
+%%WWWDIR%%/app/tmp/empty
+%%WWWDIR%%/app/tmp/logs/empty
+%%WWWDIR%%/app/tmp/sessions/empty
+%%WWWDIR%%/app/tmp/tests/empty
+%%WWWDIR%%/app/vendors/empty
+%%WWWDIR%%/app/views/elements/empty
+%%WWWDIR%%/app/views/errors/empty
+%%WWWDIR%%/app/views/helpers/empty
+%%WWWDIR%%/app/views/layouts/empty
+%%WWWDIR%%/app/views/pages/empty
+%%WWWDIR%%/app/webroot/.htaccess
+%%WWWDIR%%/app/webroot/css.php
+%%WWWDIR%%/app/webroot/css/cake.generic.css
+%%WWWDIR%%/app/webroot/favicon.ico
+%%WWWDIR%%/app/webroot/img/cake.power.png
+%%WWWDIR%%/app/webroot/img/w3c_css.png
+%%WWWDIR%%/app/webroot/img/w3c_xhtml10.png
+%%WWWDIR%%/app/webroot/index.php
+%%WWWDIR%%/app/webroot/js/vendors.php
+%%WWWDIR%%/cake/LICENSE.txt
+%%WWWDIR%%/cake/VERSION.txt
+%%WWWDIR%%/cake/app_controller.php
+%%WWWDIR%%/cake/app_model.php
+%%WWWDIR%%/cake/basics.php
+%%WWWDIR%%/cake/bootstrap.php
+%%WWWDIR%%/cake/config/config.php
+%%WWWDIR%%/cake/config/paths.php
+%%WWWDIR%%/cake/dispatcher.php
+%%WWWDIR%%/cake/libs/cache.php
+%%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/class_registry.php
+%%WWWDIR%%/cake/libs/configure.php
+%%WWWDIR%%/cake/libs/controller/component.php
+%%WWWDIR%%/cake/libs/controller/components/acl.php
+%%WWWDIR%%/cake/libs/controller/components/acl_base.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/db_acl.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aco.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aro.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
+%%WWWDIR%%/cake/libs/controller/components/iniacl/ini_acl.php
+%%WWWDIR%%/cake/libs/controller/components/request_handler.php
+%%WWWDIR%%/cake/libs/controller/components/security.php
+%%WWWDIR%%/cake/libs/controller/components/session.php
+%%WWWDIR%%/cake/libs/controller/controller.php
+%%WWWDIR%%/cake/libs/controller/pages_controller.php
+%%WWWDIR%%/cake/libs/controller/scaffold.php
+%%WWWDIR%%/cake/libs/error.php
+%%WWWDIR%%/cake/libs/file.php
+%%WWWDIR%%/cake/libs/flay.php
+%%WWWDIR%%/cake/libs/folder.php
+%%WWWDIR%%/cake/libs/inflector.php
+%%WWWDIR%%/cake/libs/legacy.php
+%%WWWDIR%%/cake/libs/model/connection_manager.php
+%%WWWDIR%%/cake/libs/model/datasources/datasource.php
+%%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_adodb.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mssql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysqli.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_odbc.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_pear.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_postgres.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_sqlite.php
+%%WWWDIR%%/cake/libs/model/model.php
+%%WWWDIR%%/cake/libs/model/model_php4.php
+%%WWWDIR%%/cake/libs/model/model_php5.php
+%%WWWDIR%%/cake/libs/neat_array.php
+%%WWWDIR%%/cake/libs/neat_string.php
+%%WWWDIR%%/cake/libs/object.php
+%%WWWDIR%%/cake/libs/router.php
+%%WWWDIR%%/cake/libs/sanitize.php
+%%WWWDIR%%/cake/libs/security.php
+%%WWWDIR%%/cake/libs/session.php
+%%WWWDIR%%/cake/libs/set.php
+%%WWWDIR%%/cake/libs/validators.php
+%%WWWDIR%%/cake/libs/view/helper.php
+%%WWWDIR%%/cake/libs/view/helpers/ajax.php
+%%WWWDIR%%/cake/libs/view/helpers/cache.php
+%%WWWDIR%%/cake/libs/view/helpers/form.php
+%%WWWDIR%%/cake/libs/view/helpers/html.php
+%%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/number.php
+%%WWWDIR%%/cake/libs/view/helpers/session.php
+%%WWWDIR%%/cake/libs/view/helpers/text.php
+%%WWWDIR%%/cake/libs/view/helpers/time.php
+%%WWWDIR%%/cake/libs/view/templates/elements/dump.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/error404.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_connection.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_controller.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_layout.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_model.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_table.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_view.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/private_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/ajax.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/default.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/flash.thtml
+%%WWWDIR%%/cake/libs/view/templates/pages/home.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/add.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/edit.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/index.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/view.thtml
+%%WWWDIR%%/cake/libs/view/view.php
+%%WWWDIR%%/cake/scripts/acl.php
+%%WWWDIR%%/cake/scripts/bake.php
+%%WWWDIR%%/cake/scripts/templates/skel/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/app_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/app_model.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/core.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/scripts/templates/skel/config/inflections.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/routes.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
+%%WWWDIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
+%%WWWDIR%%/cake/scripts/templates/views/home.thtml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/index.php
-%%DATADIR%%/.htaccess
+%%WWWDIR%%/index.php
+%%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
-@exec mkdir -p %D/%%DATADIR%%/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/pages
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/errors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/elements
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/plugins
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@exec mkdir -p %D/%%DATADIR%%/app/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/app/views/pages
-@exec mkdir -p %D/%%DATADIR%%/app/views/layouts
-@exec mkdir -p %D/%%DATADIR%%/app/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/app/views/errors
-@exec mkdir -p %D/%%DATADIR%%/app/views/elements
-@exec mkdir -p %D/%%DATADIR%%/app/vendors
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/app/plugins
-@exec mkdir -p %D/%%DATADIR%%/app/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/js
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/img
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/css
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/pages
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/layouts
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/errors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/elements
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/plugins
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config/sql
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config
-@dirrm %%DATADIR%%/cake/scripts/templates/skel
-@dirrm %%DATADIR%%/cake/scripts/templates
-@dirrm %%DATADIR%%/cake/scripts
-@dirrm %%DATADIR%%/cake/libs/view/templates/scaffolds
-@dirrm %%DATADIR%%/cake/libs/view/templates/pages
-@dirrm %%DATADIR%%/cake/libs/view/templates/layouts
-@dirrm %%DATADIR%%/cake/libs/view/templates/errors
-@dirrm %%DATADIR%%/cake/libs/view/templates/elements
-@dirrm %%DATADIR%%/cake/libs/view/templates
-@dirrm %%DATADIR%%/cake/libs/view/helpers
-@dirrm %%DATADIR%%/cake/libs/view
-@dirrm %%DATADIR%%/cake/libs/model/dbo
-@dirrm %%DATADIR%%/cake/libs/model/datasources
-@dirrm %%DATADIR%%/cake/libs/model
-@dirrm %%DATADIR%%/cake/libs/controller/components/iniacl
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl/models
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl
-@dirrm %%DATADIR%%/cake/libs/controller/components
-@dirrm %%DATADIR%%/cake/libs/controller
-@dirrm %%DATADIR%%/cake/libs
-@dirrm %%DATADIR%%/cake/config
-@dirrm %%DATADIR%%/cake
-@dirrm %%DATADIR%%/app/webroot/js
-@dirrm %%DATADIR%%/app/webroot/img
-@dirrm %%DATADIR%%/app/webroot/files
-@dirrm %%DATADIR%%/app/webroot/css
-@dirrm %%DATADIR%%/app/webroot
-@dirrm %%DATADIR%%/app/views/pages
-@dirrm %%DATADIR%%/app/views/layouts
-@dirrm %%DATADIR%%/app/views/helpers
-@dirrm %%DATADIR%%/app/views/errors
-@dirrm %%DATADIR%%/app/views/elements
-@dirrm %%DATADIR%%/app/views
-@dirrm %%DATADIR%%/app/vendors
-@dirrm %%DATADIR%%/app/tmp/tests
-@dirrm %%DATADIR%%/app/tmp/sessions
-@dirrm %%DATADIR%%/app/tmp/logs
-@dirrm %%DATADIR%%/app/tmp/cache/views
-@dirrm %%DATADIR%%/app/tmp/cache/persistent
-@dirrm %%DATADIR%%/app/tmp/cache/models
-@dirrm %%DATADIR%%/app/tmp/cache
-@dirrm %%DATADIR%%/app/tmp
-@dirrm %%DATADIR%%/app/plugins
-@dirrm %%DATADIR%%/app/models/behaviors
-@dirrm %%DATADIR%%/app/models
-@dirrm %%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/app/controllers
-@dirrm %%DATADIR%%/app/config/sql
-@dirrm %%DATADIR%%/app/config
-@dirrm %%DATADIR%%/app
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%WWWDIR%%/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/dbo
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/iniacl
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/config
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/app/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/vendors
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/app/plugins
+@exec mkdir -p %D/%%WWWDIR%%/app/models
+@exec mkdir -p %D/%%WWWDIR%%/app/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel
+@dirrm %%WWWDIR%%/cake/scripts/templates
+@dirrm %%WWWDIR%%/cake/scripts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
+@dirrm %%WWWDIR%%/cake/libs/view/templates/pages
+@dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/errors
+@dirrm %%WWWDIR%%/cake/libs/view/templates/elements
+@dirrm %%WWWDIR%%/cake/libs/view/templates
+@dirrm %%WWWDIR%%/cake/libs/view/helpers
+@dirrm %%WWWDIR%%/cake/libs/view
+@dirrm %%WWWDIR%%/cake/libs/model/dbo
+@dirrm %%WWWDIR%%/cake/libs/model/datasources
+@dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components
+@dirrm %%WWWDIR%%/cake/libs/controller
+@dirrm %%WWWDIR%%/cake/libs
+@dirrm %%WWWDIR%%/cake/config
+@dirrm %%WWWDIR%%/cake
+@dirrm %%WWWDIR%%/app/webroot/js
+@dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
+@dirrm %%WWWDIR%%/app/webroot/css
+@dirrm %%WWWDIR%%/app/webroot
+@dirrm %%WWWDIR%%/app/views/pages
+@dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/helpers
+@dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements
+@dirrm %%WWWDIR%%/app/views
+@dirrm %%WWWDIR%%/app/vendors
+@dirrm %%WWWDIR%%/app/tmp/tests
+@dirrm %%WWWDIR%%/app/tmp/sessions
+@dirrm %%WWWDIR%%/app/tmp/logs
+@dirrm %%WWWDIR%%/app/tmp/cache/views
+@dirrm %%WWWDIR%%/app/tmp/cache/persistent
+@dirrm %%WWWDIR%%/app/tmp/cache/models
+@dirrm %%WWWDIR%%/app/tmp/cache
+@dirrm %%WWWDIR%%/app/tmp
+@dirrm %%WWWDIR%%/app/plugins
+@dirrm %%WWWDIR%%/app/models
+@dirrm %%WWWDIR%%/app/controllers/components
+@dirrm %%WWWDIR%%/app/controllers
+@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config
+@dirrm %%WWWDIR%%/app
+@dirrm %%WWWDIR%%
diff --git a/www/cakephp/Makefile b/www/cakephp/Makefile
index 4b2b59fe556f..978fe8b474eb 100644
--- a/www/cakephp/Makefile
+++ b/www/cakephp/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.13.4450
-PORTREVISION=	1
+PORTVERSION=	1.1.15.5144
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/326/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/410/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
@@ -63,7 +62,7 @@ PROD=		development
 EXTRA_PATCHES=	${FILESDIR}/development-app-config-core.php.patch
 .endif
 
-CONF=		cakephp-${PROD}${CGI_EXT}.conf 
+CONF=		cakephp-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
@@ -109,15 +108,15 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${WWWDIR}
 	${CP} -R ${WRKSRC}/.htaccess \
 			${WRKSRC}/app \
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
-			${WRKSRC}/vendors ${DATADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+			${WRKSRC}/vendors ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${FIND} ${WWWDIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
+	${FIND} ${WWWDIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
 
 post-install:
 	@if [ -d "${CONFDIR}" ]; then \
diff --git a/www/cakephp/distinfo b/www/cakephp/distinfo
index eb02e8b50cdc..4bdc7fc946af 100644
--- a/www/cakephp/distinfo
+++ b/www/cakephp/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.13.4450.tar.bz2) = 9b39849608a8d9881adb8d65f75a14d8
-SHA256 (cake_1.1.13.4450.tar.bz2) = 614a63e501490d4735b955ccca1194fc330c8b65cb64441ad3de2ea8ebd301c1
-SIZE (cake_1.1.13.4450.tar.bz2) = 148538
+MD5 (cake_1.1.15.5144.tar.bz2) = f163a298eaaa4361c62175a19bf3f763
+SHA256 (cake_1.1.15.5144.tar.bz2) = 44eb104fd33dc95ea28ed2cdfbeea6649412a401efc77b9b57c2345dc322ad7e
+SIZE (cake_1.1.15.5144.tar.bz2) = 158658
diff --git a/www/cakephp/files/cakephp-development-cgi.conf.in b/www/cakephp/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp/files/cakephp-development.conf.in b/www/cakephp/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp/files/cakephp-development.conf.in
+++ b/www/cakephp/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp/files/cakephp-production-cgi.conf.in b/www/cakephp/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp/files/cakephp-production.conf.in b/www/cakephp/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp/files/cakephp-production.conf.in
+++ b/www/cakephp/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp/files/pkg-message.in b/www/cakephp/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp/files/pkg-message.in
+++ b/www/cakephp/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.
diff --git a/www/cakephp/pkg-plist b/www/cakephp/pkg-plist
index 0db1a81580a8..c2f539b2c2f9 100644
--- a/www/cakephp/pkg-plist
+++ b/www/cakephp/pkg-plist
@@ -1,258 +1,296 @@
-%%DATADIR%%/app/.htaccess
-%%DATADIR%%/app/config/acl.ini.php
-%%DATADIR%%/app/config/bootstrap.php
-%%DATADIR%%/app/config/core.php
-@unexec rm -f %D/%%DATADIR%%/app/config/core.php.orig
-%%DATADIR%%/app/config/database.php.default
-%%DATADIR%%/app/config/inflections.php
-%%DATADIR%%/app/config/routes.php
-%%DATADIR%%/app/config/sql/db_acl.sql
-%%DATADIR%%/app/config/sql/sessions.sql
-%%DATADIR%%/app/index.php
-%%DATADIR%%/app/webroot/.htaccess
-%%DATADIR%%/app/webroot/css.php
-%%DATADIR%%/app/webroot/css/cake.generic.css
-%%DATADIR%%/app/webroot/favicon.ico
-%%DATADIR%%/app/webroot/img/cake.power.png
-%%DATADIR%%/app/webroot/img/w3c_css.png
-%%DATADIR%%/app/webroot/img/w3c_xhtml10.png
-%%DATADIR%%/app/webroot/index.php
-%%DATADIR%%/app/webroot/js/vendors.php
-%%DATADIR%%/cake/LICENSE.txt
-%%DATADIR%%/cake/VERSION.txt
-%%DATADIR%%/cake/app_controller.php
-%%DATADIR%%/cake/app_model.php
-%%DATADIR%%/cake/basics.php
-%%DATADIR%%/cake/bootstrap.php
-%%DATADIR%%/cake/config/config.php
-%%DATADIR%%/cake/config/paths.php
-%%DATADIR%%/cake/dispatcher.php
-%%DATADIR%%/cake/libs/cache.php
-%%DATADIR%%/cake/libs/cake_log.php
-%%DATADIR%%/cake/libs/class_registry.php
-%%DATADIR%%/cake/libs/configure.php
-%%DATADIR%%/cake/libs/controller/component.php
-%%DATADIR%%/cake/libs/controller/components/acl.php
-%%DATADIR%%/cake/libs/controller/components/acl_base.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/db_acl.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aco.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aro.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
-%%DATADIR%%/cake/libs/controller/components/iniacl/ini_acl.php
-%%DATADIR%%/cake/libs/controller/components/request_handler.php
-%%DATADIR%%/cake/libs/controller/components/security.php
-%%DATADIR%%/cake/libs/controller/components/session.php
-%%DATADIR%%/cake/libs/controller/controller.php
-%%DATADIR%%/cake/libs/controller/pages_controller.php
-%%DATADIR%%/cake/libs/controller/scaffold.php
-%%DATADIR%%/cake/libs/error.php
-%%DATADIR%%/cake/libs/file.php
-%%DATADIR%%/cake/libs/flay.php
-%%DATADIR%%/cake/libs/folder.php
-%%DATADIR%%/cake/libs/inflector.php
-%%DATADIR%%/cake/libs/legacy.php
-%%DATADIR%%/cake/libs/model/connection_manager.php
-%%DATADIR%%/cake/libs/model/datasources/datasource.php
-%%DATADIR%%/cake/libs/model/datasources/dbo_source.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_adodb.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mssql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysqli.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_odbc.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_pear.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_postgres.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_sqlite.php
-%%DATADIR%%/cake/libs/model/model.php
-%%DATADIR%%/cake/libs/model/model_php4.php
-%%DATADIR%%/cake/libs/model/model_php5.php
-%%DATADIR%%/cake/libs/neat_array.php
-%%DATADIR%%/cake/libs/neat_string.php
-%%DATADIR%%/cake/libs/object.php
-%%DATADIR%%/cake/libs/router.php
-%%DATADIR%%/cake/libs/sanitize.php
-%%DATADIR%%/cake/libs/security.php
-%%DATADIR%%/cake/libs/session.php
-%%DATADIR%%/cake/libs/validators.php
-%%DATADIR%%/cake/libs/view/helper.php
-%%DATADIR%%/cake/libs/view/helpers/ajax.php
-%%DATADIR%%/cake/libs/view/helpers/cache.php
-%%DATADIR%%/cake/libs/view/helpers/form.php
-%%DATADIR%%/cake/libs/view/helpers/html.php
-%%DATADIR%%/cake/libs/view/helpers/javascript.php
-%%DATADIR%%/cake/libs/view/helpers/number.php
-%%DATADIR%%/cake/libs/view/helpers/session.php
-%%DATADIR%%/cake/libs/view/helpers/text.php
-%%DATADIR%%/cake/libs/view/helpers/time.php
-%%DATADIR%%/cake/libs/view/templates/elements/dump.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/error404.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_connection.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_controller.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_layout.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_model.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_table.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_view.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/private_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/ajax.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/default.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/flash.thtml
-%%DATADIR%%/cake/libs/view/templates/pages/home.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/add.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/edit.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/index.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/view.thtml
-%%DATADIR%%/cake/libs/view/view.php
-%%DATADIR%%/cake/scripts/acl.php
-%%DATADIR%%/cake/scripts/bake.php
-%%DATADIR%%/cake/scripts/templates/skel/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/app_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/app_model.php
-%%DATADIR%%/cake/scripts/templates/skel/config/acl.ini.php
-%%DATADIR%%/cake/scripts/templates/skel/config/bootstrap.php
-%%DATADIR%%/cake/scripts/templates/skel/config/core.php
-%%DATADIR%%/cake/scripts/templates/skel/config/database.php.default
-%%DATADIR%%/cake/scripts/templates/skel/config/inflections.php
-%%DATADIR%%/cake/scripts/templates/skel/config/routes.php
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
-%%DATADIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/index.php
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
-%%DATADIR%%/cake/scripts/templates/skel/webroot/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
-%%DATADIR%%/cake/scripts/templates/skel/webroot/favicon.ico
-%%DATADIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
-%%DATADIR%%/cake/scripts/templates/skel/webroot/index.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
-%%DATADIR%%/cake/scripts/templates/views/home.thtml
+%%WWWDIR%%/app/.htaccess
+%%WWWDIR%%/app/config/acl.ini.php
+%%WWWDIR%%/app/config/bootstrap.php
+%%WWWDIR%%/app/config/core.php
+@unexec rm -f %D/%%WWWDIR%%/app/config/core.php.orig
+%%WWWDIR%%/app/config/database.php.default
+%%WWWDIR%%/app/config/inflections.php
+%%WWWDIR%%/app/config/routes.php
+%%WWWDIR%%/app/config/sql/db_acl.sql
+%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/controllers/components/empty
+%%WWWDIR%%/app/index.php
+%%WWWDIR%%/app/models/empty
+%%WWWDIR%%/app/plugins/empty
+%%WWWDIR%%/app/tmp/cache/empty
+%%WWWDIR%%/app/tmp/cache/models/empty
+%%WWWDIR%%/app/tmp/cache/persistent/empty
+%%WWWDIR%%/app/tmp/cache/views/empty
+%%WWWDIR%%/app/tmp/empty
+%%WWWDIR%%/app/tmp/logs/empty
+%%WWWDIR%%/app/tmp/sessions/empty
+%%WWWDIR%%/app/tmp/tests/empty
+%%WWWDIR%%/app/vendors/empty
+%%WWWDIR%%/app/views/elements/empty
+%%WWWDIR%%/app/views/errors/empty
+%%WWWDIR%%/app/views/helpers/empty
+%%WWWDIR%%/app/views/layouts/empty
+%%WWWDIR%%/app/views/pages/empty
+%%WWWDIR%%/app/webroot/.htaccess
+%%WWWDIR%%/app/webroot/css.php
+%%WWWDIR%%/app/webroot/css/cake.generic.css
+%%WWWDIR%%/app/webroot/favicon.ico
+%%WWWDIR%%/app/webroot/img/cake.power.png
+%%WWWDIR%%/app/webroot/img/w3c_css.png
+%%WWWDIR%%/app/webroot/img/w3c_xhtml10.png
+%%WWWDIR%%/app/webroot/index.php
+%%WWWDIR%%/app/webroot/js/vendors.php
+%%WWWDIR%%/cake/LICENSE.txt
+%%WWWDIR%%/cake/VERSION.txt
+%%WWWDIR%%/cake/app_controller.php
+%%WWWDIR%%/cake/app_model.php
+%%WWWDIR%%/cake/basics.php
+%%WWWDIR%%/cake/bootstrap.php
+%%WWWDIR%%/cake/config/config.php
+%%WWWDIR%%/cake/config/paths.php
+%%WWWDIR%%/cake/dispatcher.php
+%%WWWDIR%%/cake/libs/cache.php
+%%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/class_registry.php
+%%WWWDIR%%/cake/libs/configure.php
+%%WWWDIR%%/cake/libs/controller/component.php
+%%WWWDIR%%/cake/libs/controller/components/acl.php
+%%WWWDIR%%/cake/libs/controller/components/acl_base.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/db_acl.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aco.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aro.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
+%%WWWDIR%%/cake/libs/controller/components/iniacl/ini_acl.php
+%%WWWDIR%%/cake/libs/controller/components/request_handler.php
+%%WWWDIR%%/cake/libs/controller/components/security.php
+%%WWWDIR%%/cake/libs/controller/components/session.php
+%%WWWDIR%%/cake/libs/controller/controller.php
+%%WWWDIR%%/cake/libs/controller/pages_controller.php
+%%WWWDIR%%/cake/libs/controller/scaffold.php
+%%WWWDIR%%/cake/libs/error.php
+%%WWWDIR%%/cake/libs/file.php
+%%WWWDIR%%/cake/libs/flay.php
+%%WWWDIR%%/cake/libs/folder.php
+%%WWWDIR%%/cake/libs/inflector.php
+%%WWWDIR%%/cake/libs/legacy.php
+%%WWWDIR%%/cake/libs/model/connection_manager.php
+%%WWWDIR%%/cake/libs/model/datasources/datasource.php
+%%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_adodb.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mssql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysqli.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_odbc.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_pear.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_postgres.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_sqlite.php
+%%WWWDIR%%/cake/libs/model/model.php
+%%WWWDIR%%/cake/libs/model/model_php4.php
+%%WWWDIR%%/cake/libs/model/model_php5.php
+%%WWWDIR%%/cake/libs/neat_array.php
+%%WWWDIR%%/cake/libs/neat_string.php
+%%WWWDIR%%/cake/libs/object.php
+%%WWWDIR%%/cake/libs/router.php
+%%WWWDIR%%/cake/libs/sanitize.php
+%%WWWDIR%%/cake/libs/security.php
+%%WWWDIR%%/cake/libs/session.php
+%%WWWDIR%%/cake/libs/set.php
+%%WWWDIR%%/cake/libs/validators.php
+%%WWWDIR%%/cake/libs/view/helper.php
+%%WWWDIR%%/cake/libs/view/helpers/ajax.php
+%%WWWDIR%%/cake/libs/view/helpers/cache.php
+%%WWWDIR%%/cake/libs/view/helpers/form.php
+%%WWWDIR%%/cake/libs/view/helpers/html.php
+%%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/number.php
+%%WWWDIR%%/cake/libs/view/helpers/session.php
+%%WWWDIR%%/cake/libs/view/helpers/text.php
+%%WWWDIR%%/cake/libs/view/helpers/time.php
+%%WWWDIR%%/cake/libs/view/templates/elements/dump.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/error404.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_connection.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_controller.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_layout.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_model.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_table.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_view.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/private_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/ajax.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/default.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/flash.thtml
+%%WWWDIR%%/cake/libs/view/templates/pages/home.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/add.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/edit.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/index.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/view.thtml
+%%WWWDIR%%/cake/libs/view/view.php
+%%WWWDIR%%/cake/scripts/acl.php
+%%WWWDIR%%/cake/scripts/bake.php
+%%WWWDIR%%/cake/scripts/templates/skel/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/app_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/app_model.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/core.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/scripts/templates/skel/config/inflections.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/routes.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
+%%WWWDIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
+%%WWWDIR%%/cake/scripts/templates/views/home.thtml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/index.php
-%%DATADIR%%/.htaccess
+%%WWWDIR%%/index.php
+%%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
-@exec mkdir -p %D/%%DATADIR%%/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/pages
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/errors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/elements
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/plugins
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@exec mkdir -p %D/%%DATADIR%%/app/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/app/views/pages
-@exec mkdir -p %D/%%DATADIR%%/app/views/layouts
-@exec mkdir -p %D/%%DATADIR%%/app/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/app/views/errors
-@exec mkdir -p %D/%%DATADIR%%/app/views/elements
-@exec mkdir -p %D/%%DATADIR%%/app/vendors
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/app/plugins
-@exec mkdir -p %D/%%DATADIR%%/app/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/js
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/img
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/css
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/pages
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/layouts
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/errors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/elements
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/plugins
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config/sql
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config
-@dirrm %%DATADIR%%/cake/scripts/templates/skel
-@dirrm %%DATADIR%%/cake/scripts/templates
-@dirrm %%DATADIR%%/cake/scripts
-@dirrm %%DATADIR%%/cake/libs/view/templates/scaffolds
-@dirrm %%DATADIR%%/cake/libs/view/templates/pages
-@dirrm %%DATADIR%%/cake/libs/view/templates/layouts
-@dirrm %%DATADIR%%/cake/libs/view/templates/errors
-@dirrm %%DATADIR%%/cake/libs/view/templates/elements
-@dirrm %%DATADIR%%/cake/libs/view/templates
-@dirrm %%DATADIR%%/cake/libs/view/helpers
-@dirrm %%DATADIR%%/cake/libs/view
-@dirrm %%DATADIR%%/cake/libs/model/dbo
-@dirrm %%DATADIR%%/cake/libs/model/datasources
-@dirrm %%DATADIR%%/cake/libs/model
-@dirrm %%DATADIR%%/cake/libs/controller/components/iniacl
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl/models
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl
-@dirrm %%DATADIR%%/cake/libs/controller/components
-@dirrm %%DATADIR%%/cake/libs/controller
-@dirrm %%DATADIR%%/cake/libs
-@dirrm %%DATADIR%%/cake/config
-@dirrm %%DATADIR%%/cake
-@dirrm %%DATADIR%%/app/webroot/js
-@dirrm %%DATADIR%%/app/webroot/img
-@dirrm %%DATADIR%%/app/webroot/files
-@dirrm %%DATADIR%%/app/webroot/css
-@dirrm %%DATADIR%%/app/webroot
-@dirrm %%DATADIR%%/app/views/pages
-@dirrm %%DATADIR%%/app/views/layouts
-@dirrm %%DATADIR%%/app/views/helpers
-@dirrm %%DATADIR%%/app/views/errors
-@dirrm %%DATADIR%%/app/views/elements
-@dirrm %%DATADIR%%/app/views
-@dirrm %%DATADIR%%/app/vendors
-@dirrm %%DATADIR%%/app/tmp/tests
-@dirrm %%DATADIR%%/app/tmp/sessions
-@dirrm %%DATADIR%%/app/tmp/logs
-@dirrm %%DATADIR%%/app/tmp/cache/views
-@dirrm %%DATADIR%%/app/tmp/cache/persistent
-@dirrm %%DATADIR%%/app/tmp/cache/models
-@dirrm %%DATADIR%%/app/tmp/cache
-@dirrm %%DATADIR%%/app/tmp
-@dirrm %%DATADIR%%/app/plugins
-@dirrm %%DATADIR%%/app/models/behaviors
-@dirrm %%DATADIR%%/app/models
-@dirrm %%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/app/controllers
-@dirrm %%DATADIR%%/app/config/sql
-@dirrm %%DATADIR%%/app/config
-@dirrm %%DATADIR%%/app
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%WWWDIR%%/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/dbo
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/iniacl
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/config
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/app/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/vendors
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/app/plugins
+@exec mkdir -p %D/%%WWWDIR%%/app/models
+@exec mkdir -p %D/%%WWWDIR%%/app/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel
+@dirrm %%WWWDIR%%/cake/scripts/templates
+@dirrm %%WWWDIR%%/cake/scripts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
+@dirrm %%WWWDIR%%/cake/libs/view/templates/pages
+@dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/errors
+@dirrm %%WWWDIR%%/cake/libs/view/templates/elements
+@dirrm %%WWWDIR%%/cake/libs/view/templates
+@dirrm %%WWWDIR%%/cake/libs/view/helpers
+@dirrm %%WWWDIR%%/cake/libs/view
+@dirrm %%WWWDIR%%/cake/libs/model/dbo
+@dirrm %%WWWDIR%%/cake/libs/model/datasources
+@dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components
+@dirrm %%WWWDIR%%/cake/libs/controller
+@dirrm %%WWWDIR%%/cake/libs
+@dirrm %%WWWDIR%%/cake/config
+@dirrm %%WWWDIR%%/cake
+@dirrm %%WWWDIR%%/app/webroot/js
+@dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
+@dirrm %%WWWDIR%%/app/webroot/css
+@dirrm %%WWWDIR%%/app/webroot
+@dirrm %%WWWDIR%%/app/views/pages
+@dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/helpers
+@dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements
+@dirrm %%WWWDIR%%/app/views
+@dirrm %%WWWDIR%%/app/vendors
+@dirrm %%WWWDIR%%/app/tmp/tests
+@dirrm %%WWWDIR%%/app/tmp/sessions
+@dirrm %%WWWDIR%%/app/tmp/logs
+@dirrm %%WWWDIR%%/app/tmp/cache/views
+@dirrm %%WWWDIR%%/app/tmp/cache/persistent
+@dirrm %%WWWDIR%%/app/tmp/cache/models
+@dirrm %%WWWDIR%%/app/tmp/cache
+@dirrm %%WWWDIR%%/app/tmp
+@dirrm %%WWWDIR%%/app/plugins
+@dirrm %%WWWDIR%%/app/models
+@dirrm %%WWWDIR%%/app/controllers/components
+@dirrm %%WWWDIR%%/app/controllers
+@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config
+@dirrm %%WWWDIR%%/app
+@dirrm %%WWWDIR%%
diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile
index 4b2b59fe556f..978fe8b474eb 100644
--- a/www/cakephp11/Makefile
+++ b/www/cakephp11/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.13.4450
-PORTREVISION=	1
+PORTVERSION=	1.1.15.5144
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/326/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/410/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
@@ -63,7 +62,7 @@ PROD=		development
 EXTRA_PATCHES=	${FILESDIR}/development-app-config-core.php.patch
 .endif
 
-CONF=		cakephp-${PROD}${CGI_EXT}.conf 
+CONF=		cakephp-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
@@ -109,15 +108,15 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${WWWDIR}
 	${CP} -R ${WRKSRC}/.htaccess \
 			${WRKSRC}/app \
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
-			${WRKSRC}/vendors ${DATADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+			${WRKSRC}/vendors ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${FIND} ${WWWDIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
+	${FIND} ${WWWDIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
 
 post-install:
 	@if [ -d "${CONFDIR}" ]; then \
diff --git a/www/cakephp11/distinfo b/www/cakephp11/distinfo
index eb02e8b50cdc..4bdc7fc946af 100644
--- a/www/cakephp11/distinfo
+++ b/www/cakephp11/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.13.4450.tar.bz2) = 9b39849608a8d9881adb8d65f75a14d8
-SHA256 (cake_1.1.13.4450.tar.bz2) = 614a63e501490d4735b955ccca1194fc330c8b65cb64441ad3de2ea8ebd301c1
-SIZE (cake_1.1.13.4450.tar.bz2) = 148538
+MD5 (cake_1.1.15.5144.tar.bz2) = f163a298eaaa4361c62175a19bf3f763
+SHA256 (cake_1.1.15.5144.tar.bz2) = 44eb104fd33dc95ea28ed2cdfbeea6649412a401efc77b9b57c2345dc322ad7e
+SIZE (cake_1.1.15.5144.tar.bz2) = 158658
diff --git a/www/cakephp11/files/cakephp-development-cgi.conf.in b/www/cakephp11/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp11/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp11/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp11/files/cakephp-development.conf.in b/www/cakephp11/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp11/files/cakephp-development.conf.in
+++ b/www/cakephp11/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp11/files/cakephp-production-cgi.conf.in b/www/cakephp11/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp11/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp11/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp11/files/cakephp-production.conf.in b/www/cakephp11/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp11/files/cakephp-production.conf.in
+++ b/www/cakephp11/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp11/files/pkg-message.in b/www/cakephp11/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp11/files/pkg-message.in
+++ b/www/cakephp11/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.
diff --git a/www/cakephp11/pkg-plist b/www/cakephp11/pkg-plist
index 0db1a81580a8..c2f539b2c2f9 100644
--- a/www/cakephp11/pkg-plist
+++ b/www/cakephp11/pkg-plist
@@ -1,258 +1,296 @@
-%%DATADIR%%/app/.htaccess
-%%DATADIR%%/app/config/acl.ini.php
-%%DATADIR%%/app/config/bootstrap.php
-%%DATADIR%%/app/config/core.php
-@unexec rm -f %D/%%DATADIR%%/app/config/core.php.orig
-%%DATADIR%%/app/config/database.php.default
-%%DATADIR%%/app/config/inflections.php
-%%DATADIR%%/app/config/routes.php
-%%DATADIR%%/app/config/sql/db_acl.sql
-%%DATADIR%%/app/config/sql/sessions.sql
-%%DATADIR%%/app/index.php
-%%DATADIR%%/app/webroot/.htaccess
-%%DATADIR%%/app/webroot/css.php
-%%DATADIR%%/app/webroot/css/cake.generic.css
-%%DATADIR%%/app/webroot/favicon.ico
-%%DATADIR%%/app/webroot/img/cake.power.png
-%%DATADIR%%/app/webroot/img/w3c_css.png
-%%DATADIR%%/app/webroot/img/w3c_xhtml10.png
-%%DATADIR%%/app/webroot/index.php
-%%DATADIR%%/app/webroot/js/vendors.php
-%%DATADIR%%/cake/LICENSE.txt
-%%DATADIR%%/cake/VERSION.txt
-%%DATADIR%%/cake/app_controller.php
-%%DATADIR%%/cake/app_model.php
-%%DATADIR%%/cake/basics.php
-%%DATADIR%%/cake/bootstrap.php
-%%DATADIR%%/cake/config/config.php
-%%DATADIR%%/cake/config/paths.php
-%%DATADIR%%/cake/dispatcher.php
-%%DATADIR%%/cake/libs/cache.php
-%%DATADIR%%/cake/libs/cake_log.php
-%%DATADIR%%/cake/libs/class_registry.php
-%%DATADIR%%/cake/libs/configure.php
-%%DATADIR%%/cake/libs/controller/component.php
-%%DATADIR%%/cake/libs/controller/components/acl.php
-%%DATADIR%%/cake/libs/controller/components/acl_base.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/db_acl.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aco.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aro.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
-%%DATADIR%%/cake/libs/controller/components/iniacl/ini_acl.php
-%%DATADIR%%/cake/libs/controller/components/request_handler.php
-%%DATADIR%%/cake/libs/controller/components/security.php
-%%DATADIR%%/cake/libs/controller/components/session.php
-%%DATADIR%%/cake/libs/controller/controller.php
-%%DATADIR%%/cake/libs/controller/pages_controller.php
-%%DATADIR%%/cake/libs/controller/scaffold.php
-%%DATADIR%%/cake/libs/error.php
-%%DATADIR%%/cake/libs/file.php
-%%DATADIR%%/cake/libs/flay.php
-%%DATADIR%%/cake/libs/folder.php
-%%DATADIR%%/cake/libs/inflector.php
-%%DATADIR%%/cake/libs/legacy.php
-%%DATADIR%%/cake/libs/model/connection_manager.php
-%%DATADIR%%/cake/libs/model/datasources/datasource.php
-%%DATADIR%%/cake/libs/model/datasources/dbo_source.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_adodb.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mssql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysqli.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_odbc.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_pear.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_postgres.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_sqlite.php
-%%DATADIR%%/cake/libs/model/model.php
-%%DATADIR%%/cake/libs/model/model_php4.php
-%%DATADIR%%/cake/libs/model/model_php5.php
-%%DATADIR%%/cake/libs/neat_array.php
-%%DATADIR%%/cake/libs/neat_string.php
-%%DATADIR%%/cake/libs/object.php
-%%DATADIR%%/cake/libs/router.php
-%%DATADIR%%/cake/libs/sanitize.php
-%%DATADIR%%/cake/libs/security.php
-%%DATADIR%%/cake/libs/session.php
-%%DATADIR%%/cake/libs/validators.php
-%%DATADIR%%/cake/libs/view/helper.php
-%%DATADIR%%/cake/libs/view/helpers/ajax.php
-%%DATADIR%%/cake/libs/view/helpers/cache.php
-%%DATADIR%%/cake/libs/view/helpers/form.php
-%%DATADIR%%/cake/libs/view/helpers/html.php
-%%DATADIR%%/cake/libs/view/helpers/javascript.php
-%%DATADIR%%/cake/libs/view/helpers/number.php
-%%DATADIR%%/cake/libs/view/helpers/session.php
-%%DATADIR%%/cake/libs/view/helpers/text.php
-%%DATADIR%%/cake/libs/view/helpers/time.php
-%%DATADIR%%/cake/libs/view/templates/elements/dump.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/error404.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_connection.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_controller.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_layout.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_model.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_table.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_view.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/private_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/ajax.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/default.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/flash.thtml
-%%DATADIR%%/cake/libs/view/templates/pages/home.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/add.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/edit.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/index.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/view.thtml
-%%DATADIR%%/cake/libs/view/view.php
-%%DATADIR%%/cake/scripts/acl.php
-%%DATADIR%%/cake/scripts/bake.php
-%%DATADIR%%/cake/scripts/templates/skel/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/app_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/app_model.php
-%%DATADIR%%/cake/scripts/templates/skel/config/acl.ini.php
-%%DATADIR%%/cake/scripts/templates/skel/config/bootstrap.php
-%%DATADIR%%/cake/scripts/templates/skel/config/core.php
-%%DATADIR%%/cake/scripts/templates/skel/config/database.php.default
-%%DATADIR%%/cake/scripts/templates/skel/config/inflections.php
-%%DATADIR%%/cake/scripts/templates/skel/config/routes.php
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
-%%DATADIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/index.php
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
-%%DATADIR%%/cake/scripts/templates/skel/webroot/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
-%%DATADIR%%/cake/scripts/templates/skel/webroot/favicon.ico
-%%DATADIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
-%%DATADIR%%/cake/scripts/templates/skel/webroot/index.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
-%%DATADIR%%/cake/scripts/templates/views/home.thtml
+%%WWWDIR%%/app/.htaccess
+%%WWWDIR%%/app/config/acl.ini.php
+%%WWWDIR%%/app/config/bootstrap.php
+%%WWWDIR%%/app/config/core.php
+@unexec rm -f %D/%%WWWDIR%%/app/config/core.php.orig
+%%WWWDIR%%/app/config/database.php.default
+%%WWWDIR%%/app/config/inflections.php
+%%WWWDIR%%/app/config/routes.php
+%%WWWDIR%%/app/config/sql/db_acl.sql
+%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/controllers/components/empty
+%%WWWDIR%%/app/index.php
+%%WWWDIR%%/app/models/empty
+%%WWWDIR%%/app/plugins/empty
+%%WWWDIR%%/app/tmp/cache/empty
+%%WWWDIR%%/app/tmp/cache/models/empty
+%%WWWDIR%%/app/tmp/cache/persistent/empty
+%%WWWDIR%%/app/tmp/cache/views/empty
+%%WWWDIR%%/app/tmp/empty
+%%WWWDIR%%/app/tmp/logs/empty
+%%WWWDIR%%/app/tmp/sessions/empty
+%%WWWDIR%%/app/tmp/tests/empty
+%%WWWDIR%%/app/vendors/empty
+%%WWWDIR%%/app/views/elements/empty
+%%WWWDIR%%/app/views/errors/empty
+%%WWWDIR%%/app/views/helpers/empty
+%%WWWDIR%%/app/views/layouts/empty
+%%WWWDIR%%/app/views/pages/empty
+%%WWWDIR%%/app/webroot/.htaccess
+%%WWWDIR%%/app/webroot/css.php
+%%WWWDIR%%/app/webroot/css/cake.generic.css
+%%WWWDIR%%/app/webroot/favicon.ico
+%%WWWDIR%%/app/webroot/img/cake.power.png
+%%WWWDIR%%/app/webroot/img/w3c_css.png
+%%WWWDIR%%/app/webroot/img/w3c_xhtml10.png
+%%WWWDIR%%/app/webroot/index.php
+%%WWWDIR%%/app/webroot/js/vendors.php
+%%WWWDIR%%/cake/LICENSE.txt
+%%WWWDIR%%/cake/VERSION.txt
+%%WWWDIR%%/cake/app_controller.php
+%%WWWDIR%%/cake/app_model.php
+%%WWWDIR%%/cake/basics.php
+%%WWWDIR%%/cake/bootstrap.php
+%%WWWDIR%%/cake/config/config.php
+%%WWWDIR%%/cake/config/paths.php
+%%WWWDIR%%/cake/dispatcher.php
+%%WWWDIR%%/cake/libs/cache.php
+%%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/class_registry.php
+%%WWWDIR%%/cake/libs/configure.php
+%%WWWDIR%%/cake/libs/controller/component.php
+%%WWWDIR%%/cake/libs/controller/components/acl.php
+%%WWWDIR%%/cake/libs/controller/components/acl_base.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/db_acl.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aco.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aro.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
+%%WWWDIR%%/cake/libs/controller/components/iniacl/ini_acl.php
+%%WWWDIR%%/cake/libs/controller/components/request_handler.php
+%%WWWDIR%%/cake/libs/controller/components/security.php
+%%WWWDIR%%/cake/libs/controller/components/session.php
+%%WWWDIR%%/cake/libs/controller/controller.php
+%%WWWDIR%%/cake/libs/controller/pages_controller.php
+%%WWWDIR%%/cake/libs/controller/scaffold.php
+%%WWWDIR%%/cake/libs/error.php
+%%WWWDIR%%/cake/libs/file.php
+%%WWWDIR%%/cake/libs/flay.php
+%%WWWDIR%%/cake/libs/folder.php
+%%WWWDIR%%/cake/libs/inflector.php
+%%WWWDIR%%/cake/libs/legacy.php
+%%WWWDIR%%/cake/libs/model/connection_manager.php
+%%WWWDIR%%/cake/libs/model/datasources/datasource.php
+%%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_adodb.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mssql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysqli.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_odbc.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_pear.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_postgres.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_sqlite.php
+%%WWWDIR%%/cake/libs/model/model.php
+%%WWWDIR%%/cake/libs/model/model_php4.php
+%%WWWDIR%%/cake/libs/model/model_php5.php
+%%WWWDIR%%/cake/libs/neat_array.php
+%%WWWDIR%%/cake/libs/neat_string.php
+%%WWWDIR%%/cake/libs/object.php
+%%WWWDIR%%/cake/libs/router.php
+%%WWWDIR%%/cake/libs/sanitize.php
+%%WWWDIR%%/cake/libs/security.php
+%%WWWDIR%%/cake/libs/session.php
+%%WWWDIR%%/cake/libs/set.php
+%%WWWDIR%%/cake/libs/validators.php
+%%WWWDIR%%/cake/libs/view/helper.php
+%%WWWDIR%%/cake/libs/view/helpers/ajax.php
+%%WWWDIR%%/cake/libs/view/helpers/cache.php
+%%WWWDIR%%/cake/libs/view/helpers/form.php
+%%WWWDIR%%/cake/libs/view/helpers/html.php
+%%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/number.php
+%%WWWDIR%%/cake/libs/view/helpers/session.php
+%%WWWDIR%%/cake/libs/view/helpers/text.php
+%%WWWDIR%%/cake/libs/view/helpers/time.php
+%%WWWDIR%%/cake/libs/view/templates/elements/dump.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/error404.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_connection.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_controller.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_layout.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_model.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_table.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_view.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/private_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/ajax.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/default.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/flash.thtml
+%%WWWDIR%%/cake/libs/view/templates/pages/home.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/add.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/edit.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/index.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/view.thtml
+%%WWWDIR%%/cake/libs/view/view.php
+%%WWWDIR%%/cake/scripts/acl.php
+%%WWWDIR%%/cake/scripts/bake.php
+%%WWWDIR%%/cake/scripts/templates/skel/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/app_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/app_model.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/core.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/scripts/templates/skel/config/inflections.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/routes.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
+%%WWWDIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
+%%WWWDIR%%/cake/scripts/templates/views/home.thtml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/index.php
-%%DATADIR%%/.htaccess
+%%WWWDIR%%/index.php
+%%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
-@exec mkdir -p %D/%%DATADIR%%/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/pages
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/errors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/elements
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/plugins
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@exec mkdir -p %D/%%DATADIR%%/app/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/app/views/pages
-@exec mkdir -p %D/%%DATADIR%%/app/views/layouts
-@exec mkdir -p %D/%%DATADIR%%/app/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/app/views/errors
-@exec mkdir -p %D/%%DATADIR%%/app/views/elements
-@exec mkdir -p %D/%%DATADIR%%/app/vendors
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/app/plugins
-@exec mkdir -p %D/%%DATADIR%%/app/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/js
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/img
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/css
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/pages
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/layouts
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/errors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/elements
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/plugins
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config/sql
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config
-@dirrm %%DATADIR%%/cake/scripts/templates/skel
-@dirrm %%DATADIR%%/cake/scripts/templates
-@dirrm %%DATADIR%%/cake/scripts
-@dirrm %%DATADIR%%/cake/libs/view/templates/scaffolds
-@dirrm %%DATADIR%%/cake/libs/view/templates/pages
-@dirrm %%DATADIR%%/cake/libs/view/templates/layouts
-@dirrm %%DATADIR%%/cake/libs/view/templates/errors
-@dirrm %%DATADIR%%/cake/libs/view/templates/elements
-@dirrm %%DATADIR%%/cake/libs/view/templates
-@dirrm %%DATADIR%%/cake/libs/view/helpers
-@dirrm %%DATADIR%%/cake/libs/view
-@dirrm %%DATADIR%%/cake/libs/model/dbo
-@dirrm %%DATADIR%%/cake/libs/model/datasources
-@dirrm %%DATADIR%%/cake/libs/model
-@dirrm %%DATADIR%%/cake/libs/controller/components/iniacl
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl/models
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl
-@dirrm %%DATADIR%%/cake/libs/controller/components
-@dirrm %%DATADIR%%/cake/libs/controller
-@dirrm %%DATADIR%%/cake/libs
-@dirrm %%DATADIR%%/cake/config
-@dirrm %%DATADIR%%/cake
-@dirrm %%DATADIR%%/app/webroot/js
-@dirrm %%DATADIR%%/app/webroot/img
-@dirrm %%DATADIR%%/app/webroot/files
-@dirrm %%DATADIR%%/app/webroot/css
-@dirrm %%DATADIR%%/app/webroot
-@dirrm %%DATADIR%%/app/views/pages
-@dirrm %%DATADIR%%/app/views/layouts
-@dirrm %%DATADIR%%/app/views/helpers
-@dirrm %%DATADIR%%/app/views/errors
-@dirrm %%DATADIR%%/app/views/elements
-@dirrm %%DATADIR%%/app/views
-@dirrm %%DATADIR%%/app/vendors
-@dirrm %%DATADIR%%/app/tmp/tests
-@dirrm %%DATADIR%%/app/tmp/sessions
-@dirrm %%DATADIR%%/app/tmp/logs
-@dirrm %%DATADIR%%/app/tmp/cache/views
-@dirrm %%DATADIR%%/app/tmp/cache/persistent
-@dirrm %%DATADIR%%/app/tmp/cache/models
-@dirrm %%DATADIR%%/app/tmp/cache
-@dirrm %%DATADIR%%/app/tmp
-@dirrm %%DATADIR%%/app/plugins
-@dirrm %%DATADIR%%/app/models/behaviors
-@dirrm %%DATADIR%%/app/models
-@dirrm %%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/app/controllers
-@dirrm %%DATADIR%%/app/config/sql
-@dirrm %%DATADIR%%/app/config
-@dirrm %%DATADIR%%/app
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%WWWDIR%%/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/dbo
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/iniacl
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/config
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/app/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/vendors
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/app/plugins
+@exec mkdir -p %D/%%WWWDIR%%/app/models
+@exec mkdir -p %D/%%WWWDIR%%/app/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel
+@dirrm %%WWWDIR%%/cake/scripts/templates
+@dirrm %%WWWDIR%%/cake/scripts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
+@dirrm %%WWWDIR%%/cake/libs/view/templates/pages
+@dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/errors
+@dirrm %%WWWDIR%%/cake/libs/view/templates/elements
+@dirrm %%WWWDIR%%/cake/libs/view/templates
+@dirrm %%WWWDIR%%/cake/libs/view/helpers
+@dirrm %%WWWDIR%%/cake/libs/view
+@dirrm %%WWWDIR%%/cake/libs/model/dbo
+@dirrm %%WWWDIR%%/cake/libs/model/datasources
+@dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components
+@dirrm %%WWWDIR%%/cake/libs/controller
+@dirrm %%WWWDIR%%/cake/libs
+@dirrm %%WWWDIR%%/cake/config
+@dirrm %%WWWDIR%%/cake
+@dirrm %%WWWDIR%%/app/webroot/js
+@dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
+@dirrm %%WWWDIR%%/app/webroot/css
+@dirrm %%WWWDIR%%/app/webroot
+@dirrm %%WWWDIR%%/app/views/pages
+@dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/helpers
+@dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements
+@dirrm %%WWWDIR%%/app/views
+@dirrm %%WWWDIR%%/app/vendors
+@dirrm %%WWWDIR%%/app/tmp/tests
+@dirrm %%WWWDIR%%/app/tmp/sessions
+@dirrm %%WWWDIR%%/app/tmp/logs
+@dirrm %%WWWDIR%%/app/tmp/cache/views
+@dirrm %%WWWDIR%%/app/tmp/cache/persistent
+@dirrm %%WWWDIR%%/app/tmp/cache/models
+@dirrm %%WWWDIR%%/app/tmp/cache
+@dirrm %%WWWDIR%%/app/tmp
+@dirrm %%WWWDIR%%/app/plugins
+@dirrm %%WWWDIR%%/app/models
+@dirrm %%WWWDIR%%/app/controllers/components
+@dirrm %%WWWDIR%%/app/controllers
+@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config
+@dirrm %%WWWDIR%%/app
+@dirrm %%WWWDIR%%
diff --git a/www/cakephp12/Makefile b/www/cakephp12/Makefile
index 4b2b59fe556f..978fe8b474eb 100644
--- a/www/cakephp12/Makefile
+++ b/www/cakephp12/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.13.4450
-PORTREVISION=	1
+PORTVERSION=	1.1.15.5144
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/326/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/410/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
@@ -63,7 +62,7 @@ PROD=		development
 EXTRA_PATCHES=	${FILESDIR}/development-app-config-core.php.patch
 .endif
 
-CONF=		cakephp-${PROD}${CGI_EXT}.conf 
+CONF=		cakephp-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
@@ -109,15 +108,15 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${WWWDIR}
 	${CP} -R ${WRKSRC}/.htaccess \
 			${WRKSRC}/app \
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
-			${WRKSRC}/vendors ${DATADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+			${WRKSRC}/vendors ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${FIND} ${WWWDIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
+	${FIND} ${WWWDIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
 
 post-install:
 	@if [ -d "${CONFDIR}" ]; then \
diff --git a/www/cakephp12/distinfo b/www/cakephp12/distinfo
index eb02e8b50cdc..4bdc7fc946af 100644
--- a/www/cakephp12/distinfo
+++ b/www/cakephp12/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.13.4450.tar.bz2) = 9b39849608a8d9881adb8d65f75a14d8
-SHA256 (cake_1.1.13.4450.tar.bz2) = 614a63e501490d4735b955ccca1194fc330c8b65cb64441ad3de2ea8ebd301c1
-SIZE (cake_1.1.13.4450.tar.bz2) = 148538
+MD5 (cake_1.1.15.5144.tar.bz2) = f163a298eaaa4361c62175a19bf3f763
+SHA256 (cake_1.1.15.5144.tar.bz2) = 44eb104fd33dc95ea28ed2cdfbeea6649412a401efc77b9b57c2345dc322ad7e
+SIZE (cake_1.1.15.5144.tar.bz2) = 158658
diff --git a/www/cakephp12/files/cakephp-development-cgi.conf.in b/www/cakephp12/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp12/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp12/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp12/files/cakephp-development.conf.in b/www/cakephp12/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp12/files/cakephp-development.conf.in
+++ b/www/cakephp12/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp12/files/cakephp-production-cgi.conf.in b/www/cakephp12/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp12/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp12/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp12/files/cakephp-production.conf.in b/www/cakephp12/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp12/files/cakephp-production.conf.in
+++ b/www/cakephp12/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp12/files/pkg-message.in b/www/cakephp12/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp12/files/pkg-message.in
+++ b/www/cakephp12/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.
diff --git a/www/cakephp12/pkg-plist b/www/cakephp12/pkg-plist
index 0db1a81580a8..c2f539b2c2f9 100644
--- a/www/cakephp12/pkg-plist
+++ b/www/cakephp12/pkg-plist
@@ -1,258 +1,296 @@
-%%DATADIR%%/app/.htaccess
-%%DATADIR%%/app/config/acl.ini.php
-%%DATADIR%%/app/config/bootstrap.php
-%%DATADIR%%/app/config/core.php
-@unexec rm -f %D/%%DATADIR%%/app/config/core.php.orig
-%%DATADIR%%/app/config/database.php.default
-%%DATADIR%%/app/config/inflections.php
-%%DATADIR%%/app/config/routes.php
-%%DATADIR%%/app/config/sql/db_acl.sql
-%%DATADIR%%/app/config/sql/sessions.sql
-%%DATADIR%%/app/index.php
-%%DATADIR%%/app/webroot/.htaccess
-%%DATADIR%%/app/webroot/css.php
-%%DATADIR%%/app/webroot/css/cake.generic.css
-%%DATADIR%%/app/webroot/favicon.ico
-%%DATADIR%%/app/webroot/img/cake.power.png
-%%DATADIR%%/app/webroot/img/w3c_css.png
-%%DATADIR%%/app/webroot/img/w3c_xhtml10.png
-%%DATADIR%%/app/webroot/index.php
-%%DATADIR%%/app/webroot/js/vendors.php
-%%DATADIR%%/cake/LICENSE.txt
-%%DATADIR%%/cake/VERSION.txt
-%%DATADIR%%/cake/app_controller.php
-%%DATADIR%%/cake/app_model.php
-%%DATADIR%%/cake/basics.php
-%%DATADIR%%/cake/bootstrap.php
-%%DATADIR%%/cake/config/config.php
-%%DATADIR%%/cake/config/paths.php
-%%DATADIR%%/cake/dispatcher.php
-%%DATADIR%%/cake/libs/cache.php
-%%DATADIR%%/cake/libs/cake_log.php
-%%DATADIR%%/cake/libs/class_registry.php
-%%DATADIR%%/cake/libs/configure.php
-%%DATADIR%%/cake/libs/controller/component.php
-%%DATADIR%%/cake/libs/controller/components/acl.php
-%%DATADIR%%/cake/libs/controller/components/acl_base.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/db_acl.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aco.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aro.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
-%%DATADIR%%/cake/libs/controller/components/iniacl/ini_acl.php
-%%DATADIR%%/cake/libs/controller/components/request_handler.php
-%%DATADIR%%/cake/libs/controller/components/security.php
-%%DATADIR%%/cake/libs/controller/components/session.php
-%%DATADIR%%/cake/libs/controller/controller.php
-%%DATADIR%%/cake/libs/controller/pages_controller.php
-%%DATADIR%%/cake/libs/controller/scaffold.php
-%%DATADIR%%/cake/libs/error.php
-%%DATADIR%%/cake/libs/file.php
-%%DATADIR%%/cake/libs/flay.php
-%%DATADIR%%/cake/libs/folder.php
-%%DATADIR%%/cake/libs/inflector.php
-%%DATADIR%%/cake/libs/legacy.php
-%%DATADIR%%/cake/libs/model/connection_manager.php
-%%DATADIR%%/cake/libs/model/datasources/datasource.php
-%%DATADIR%%/cake/libs/model/datasources/dbo_source.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_adodb.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mssql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysqli.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_odbc.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_pear.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_postgres.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_sqlite.php
-%%DATADIR%%/cake/libs/model/model.php
-%%DATADIR%%/cake/libs/model/model_php4.php
-%%DATADIR%%/cake/libs/model/model_php5.php
-%%DATADIR%%/cake/libs/neat_array.php
-%%DATADIR%%/cake/libs/neat_string.php
-%%DATADIR%%/cake/libs/object.php
-%%DATADIR%%/cake/libs/router.php
-%%DATADIR%%/cake/libs/sanitize.php
-%%DATADIR%%/cake/libs/security.php
-%%DATADIR%%/cake/libs/session.php
-%%DATADIR%%/cake/libs/validators.php
-%%DATADIR%%/cake/libs/view/helper.php
-%%DATADIR%%/cake/libs/view/helpers/ajax.php
-%%DATADIR%%/cake/libs/view/helpers/cache.php
-%%DATADIR%%/cake/libs/view/helpers/form.php
-%%DATADIR%%/cake/libs/view/helpers/html.php
-%%DATADIR%%/cake/libs/view/helpers/javascript.php
-%%DATADIR%%/cake/libs/view/helpers/number.php
-%%DATADIR%%/cake/libs/view/helpers/session.php
-%%DATADIR%%/cake/libs/view/helpers/text.php
-%%DATADIR%%/cake/libs/view/helpers/time.php
-%%DATADIR%%/cake/libs/view/templates/elements/dump.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/error404.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_connection.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_controller.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_layout.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_model.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_table.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_view.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/private_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/ajax.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/default.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/flash.thtml
-%%DATADIR%%/cake/libs/view/templates/pages/home.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/add.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/edit.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/index.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/view.thtml
-%%DATADIR%%/cake/libs/view/view.php
-%%DATADIR%%/cake/scripts/acl.php
-%%DATADIR%%/cake/scripts/bake.php
-%%DATADIR%%/cake/scripts/templates/skel/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/app_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/app_model.php
-%%DATADIR%%/cake/scripts/templates/skel/config/acl.ini.php
-%%DATADIR%%/cake/scripts/templates/skel/config/bootstrap.php
-%%DATADIR%%/cake/scripts/templates/skel/config/core.php
-%%DATADIR%%/cake/scripts/templates/skel/config/database.php.default
-%%DATADIR%%/cake/scripts/templates/skel/config/inflections.php
-%%DATADIR%%/cake/scripts/templates/skel/config/routes.php
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
-%%DATADIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/index.php
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
-%%DATADIR%%/cake/scripts/templates/skel/webroot/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
-%%DATADIR%%/cake/scripts/templates/skel/webroot/favicon.ico
-%%DATADIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
-%%DATADIR%%/cake/scripts/templates/skel/webroot/index.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
-%%DATADIR%%/cake/scripts/templates/views/home.thtml
+%%WWWDIR%%/app/.htaccess
+%%WWWDIR%%/app/config/acl.ini.php
+%%WWWDIR%%/app/config/bootstrap.php
+%%WWWDIR%%/app/config/core.php
+@unexec rm -f %D/%%WWWDIR%%/app/config/core.php.orig
+%%WWWDIR%%/app/config/database.php.default
+%%WWWDIR%%/app/config/inflections.php
+%%WWWDIR%%/app/config/routes.php
+%%WWWDIR%%/app/config/sql/db_acl.sql
+%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/controllers/components/empty
+%%WWWDIR%%/app/index.php
+%%WWWDIR%%/app/models/empty
+%%WWWDIR%%/app/plugins/empty
+%%WWWDIR%%/app/tmp/cache/empty
+%%WWWDIR%%/app/tmp/cache/models/empty
+%%WWWDIR%%/app/tmp/cache/persistent/empty
+%%WWWDIR%%/app/tmp/cache/views/empty
+%%WWWDIR%%/app/tmp/empty
+%%WWWDIR%%/app/tmp/logs/empty
+%%WWWDIR%%/app/tmp/sessions/empty
+%%WWWDIR%%/app/tmp/tests/empty
+%%WWWDIR%%/app/vendors/empty
+%%WWWDIR%%/app/views/elements/empty
+%%WWWDIR%%/app/views/errors/empty
+%%WWWDIR%%/app/views/helpers/empty
+%%WWWDIR%%/app/views/layouts/empty
+%%WWWDIR%%/app/views/pages/empty
+%%WWWDIR%%/app/webroot/.htaccess
+%%WWWDIR%%/app/webroot/css.php
+%%WWWDIR%%/app/webroot/css/cake.generic.css
+%%WWWDIR%%/app/webroot/favicon.ico
+%%WWWDIR%%/app/webroot/img/cake.power.png
+%%WWWDIR%%/app/webroot/img/w3c_css.png
+%%WWWDIR%%/app/webroot/img/w3c_xhtml10.png
+%%WWWDIR%%/app/webroot/index.php
+%%WWWDIR%%/app/webroot/js/vendors.php
+%%WWWDIR%%/cake/LICENSE.txt
+%%WWWDIR%%/cake/VERSION.txt
+%%WWWDIR%%/cake/app_controller.php
+%%WWWDIR%%/cake/app_model.php
+%%WWWDIR%%/cake/basics.php
+%%WWWDIR%%/cake/bootstrap.php
+%%WWWDIR%%/cake/config/config.php
+%%WWWDIR%%/cake/config/paths.php
+%%WWWDIR%%/cake/dispatcher.php
+%%WWWDIR%%/cake/libs/cache.php
+%%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/class_registry.php
+%%WWWDIR%%/cake/libs/configure.php
+%%WWWDIR%%/cake/libs/controller/component.php
+%%WWWDIR%%/cake/libs/controller/components/acl.php
+%%WWWDIR%%/cake/libs/controller/components/acl_base.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/db_acl.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aco.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aro.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
+%%WWWDIR%%/cake/libs/controller/components/iniacl/ini_acl.php
+%%WWWDIR%%/cake/libs/controller/components/request_handler.php
+%%WWWDIR%%/cake/libs/controller/components/security.php
+%%WWWDIR%%/cake/libs/controller/components/session.php
+%%WWWDIR%%/cake/libs/controller/controller.php
+%%WWWDIR%%/cake/libs/controller/pages_controller.php
+%%WWWDIR%%/cake/libs/controller/scaffold.php
+%%WWWDIR%%/cake/libs/error.php
+%%WWWDIR%%/cake/libs/file.php
+%%WWWDIR%%/cake/libs/flay.php
+%%WWWDIR%%/cake/libs/folder.php
+%%WWWDIR%%/cake/libs/inflector.php
+%%WWWDIR%%/cake/libs/legacy.php
+%%WWWDIR%%/cake/libs/model/connection_manager.php
+%%WWWDIR%%/cake/libs/model/datasources/datasource.php
+%%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_adodb.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mssql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysqli.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_odbc.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_pear.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_postgres.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_sqlite.php
+%%WWWDIR%%/cake/libs/model/model.php
+%%WWWDIR%%/cake/libs/model/model_php4.php
+%%WWWDIR%%/cake/libs/model/model_php5.php
+%%WWWDIR%%/cake/libs/neat_array.php
+%%WWWDIR%%/cake/libs/neat_string.php
+%%WWWDIR%%/cake/libs/object.php
+%%WWWDIR%%/cake/libs/router.php
+%%WWWDIR%%/cake/libs/sanitize.php
+%%WWWDIR%%/cake/libs/security.php
+%%WWWDIR%%/cake/libs/session.php
+%%WWWDIR%%/cake/libs/set.php
+%%WWWDIR%%/cake/libs/validators.php
+%%WWWDIR%%/cake/libs/view/helper.php
+%%WWWDIR%%/cake/libs/view/helpers/ajax.php
+%%WWWDIR%%/cake/libs/view/helpers/cache.php
+%%WWWDIR%%/cake/libs/view/helpers/form.php
+%%WWWDIR%%/cake/libs/view/helpers/html.php
+%%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/number.php
+%%WWWDIR%%/cake/libs/view/helpers/session.php
+%%WWWDIR%%/cake/libs/view/helpers/text.php
+%%WWWDIR%%/cake/libs/view/helpers/time.php
+%%WWWDIR%%/cake/libs/view/templates/elements/dump.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/error404.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_connection.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_controller.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_layout.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_model.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_table.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_view.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/private_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/ajax.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/default.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/flash.thtml
+%%WWWDIR%%/cake/libs/view/templates/pages/home.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/add.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/edit.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/index.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/view.thtml
+%%WWWDIR%%/cake/libs/view/view.php
+%%WWWDIR%%/cake/scripts/acl.php
+%%WWWDIR%%/cake/scripts/bake.php
+%%WWWDIR%%/cake/scripts/templates/skel/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/app_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/app_model.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/core.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/scripts/templates/skel/config/inflections.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/routes.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
+%%WWWDIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
+%%WWWDIR%%/cake/scripts/templates/views/home.thtml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/index.php
-%%DATADIR%%/.htaccess
+%%WWWDIR%%/index.php
+%%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
-@exec mkdir -p %D/%%DATADIR%%/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/pages
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/errors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/elements
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/plugins
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@exec mkdir -p %D/%%DATADIR%%/app/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/app/views/pages
-@exec mkdir -p %D/%%DATADIR%%/app/views/layouts
-@exec mkdir -p %D/%%DATADIR%%/app/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/app/views/errors
-@exec mkdir -p %D/%%DATADIR%%/app/views/elements
-@exec mkdir -p %D/%%DATADIR%%/app/vendors
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/app/plugins
-@exec mkdir -p %D/%%DATADIR%%/app/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/js
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/img
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/css
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/pages
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/layouts
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/errors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/elements
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/plugins
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config/sql
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config
-@dirrm %%DATADIR%%/cake/scripts/templates/skel
-@dirrm %%DATADIR%%/cake/scripts/templates
-@dirrm %%DATADIR%%/cake/scripts
-@dirrm %%DATADIR%%/cake/libs/view/templates/scaffolds
-@dirrm %%DATADIR%%/cake/libs/view/templates/pages
-@dirrm %%DATADIR%%/cake/libs/view/templates/layouts
-@dirrm %%DATADIR%%/cake/libs/view/templates/errors
-@dirrm %%DATADIR%%/cake/libs/view/templates/elements
-@dirrm %%DATADIR%%/cake/libs/view/templates
-@dirrm %%DATADIR%%/cake/libs/view/helpers
-@dirrm %%DATADIR%%/cake/libs/view
-@dirrm %%DATADIR%%/cake/libs/model/dbo
-@dirrm %%DATADIR%%/cake/libs/model/datasources
-@dirrm %%DATADIR%%/cake/libs/model
-@dirrm %%DATADIR%%/cake/libs/controller/components/iniacl
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl/models
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl
-@dirrm %%DATADIR%%/cake/libs/controller/components
-@dirrm %%DATADIR%%/cake/libs/controller
-@dirrm %%DATADIR%%/cake/libs
-@dirrm %%DATADIR%%/cake/config
-@dirrm %%DATADIR%%/cake
-@dirrm %%DATADIR%%/app/webroot/js
-@dirrm %%DATADIR%%/app/webroot/img
-@dirrm %%DATADIR%%/app/webroot/files
-@dirrm %%DATADIR%%/app/webroot/css
-@dirrm %%DATADIR%%/app/webroot
-@dirrm %%DATADIR%%/app/views/pages
-@dirrm %%DATADIR%%/app/views/layouts
-@dirrm %%DATADIR%%/app/views/helpers
-@dirrm %%DATADIR%%/app/views/errors
-@dirrm %%DATADIR%%/app/views/elements
-@dirrm %%DATADIR%%/app/views
-@dirrm %%DATADIR%%/app/vendors
-@dirrm %%DATADIR%%/app/tmp/tests
-@dirrm %%DATADIR%%/app/tmp/sessions
-@dirrm %%DATADIR%%/app/tmp/logs
-@dirrm %%DATADIR%%/app/tmp/cache/views
-@dirrm %%DATADIR%%/app/tmp/cache/persistent
-@dirrm %%DATADIR%%/app/tmp/cache/models
-@dirrm %%DATADIR%%/app/tmp/cache
-@dirrm %%DATADIR%%/app/tmp
-@dirrm %%DATADIR%%/app/plugins
-@dirrm %%DATADIR%%/app/models/behaviors
-@dirrm %%DATADIR%%/app/models
-@dirrm %%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/app/controllers
-@dirrm %%DATADIR%%/app/config/sql
-@dirrm %%DATADIR%%/app/config
-@dirrm %%DATADIR%%/app
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%WWWDIR%%/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/dbo
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/iniacl
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/config
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/app/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/vendors
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/app/plugins
+@exec mkdir -p %D/%%WWWDIR%%/app/models
+@exec mkdir -p %D/%%WWWDIR%%/app/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel
+@dirrm %%WWWDIR%%/cake/scripts/templates
+@dirrm %%WWWDIR%%/cake/scripts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
+@dirrm %%WWWDIR%%/cake/libs/view/templates/pages
+@dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/errors
+@dirrm %%WWWDIR%%/cake/libs/view/templates/elements
+@dirrm %%WWWDIR%%/cake/libs/view/templates
+@dirrm %%WWWDIR%%/cake/libs/view/helpers
+@dirrm %%WWWDIR%%/cake/libs/view
+@dirrm %%WWWDIR%%/cake/libs/model/dbo
+@dirrm %%WWWDIR%%/cake/libs/model/datasources
+@dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components
+@dirrm %%WWWDIR%%/cake/libs/controller
+@dirrm %%WWWDIR%%/cake/libs
+@dirrm %%WWWDIR%%/cake/config
+@dirrm %%WWWDIR%%/cake
+@dirrm %%WWWDIR%%/app/webroot/js
+@dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
+@dirrm %%WWWDIR%%/app/webroot/css
+@dirrm %%WWWDIR%%/app/webroot
+@dirrm %%WWWDIR%%/app/views/pages
+@dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/helpers
+@dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements
+@dirrm %%WWWDIR%%/app/views
+@dirrm %%WWWDIR%%/app/vendors
+@dirrm %%WWWDIR%%/app/tmp/tests
+@dirrm %%WWWDIR%%/app/tmp/sessions
+@dirrm %%WWWDIR%%/app/tmp/logs
+@dirrm %%WWWDIR%%/app/tmp/cache/views
+@dirrm %%WWWDIR%%/app/tmp/cache/persistent
+@dirrm %%WWWDIR%%/app/tmp/cache/models
+@dirrm %%WWWDIR%%/app/tmp/cache
+@dirrm %%WWWDIR%%/app/tmp
+@dirrm %%WWWDIR%%/app/plugins
+@dirrm %%WWWDIR%%/app/models
+@dirrm %%WWWDIR%%/app/controllers/components
+@dirrm %%WWWDIR%%/app/controllers
+@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config
+@dirrm %%WWWDIR%%/app
+@dirrm %%WWWDIR%%
diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index 4b2b59fe556f..978fe8b474eb 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.13.4450
-PORTREVISION=	1
+PORTVERSION=	1.1.15.5144
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/326/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/410/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
@@ -63,7 +62,7 @@ PROD=		development
 EXTRA_PATCHES=	${FILESDIR}/development-app-config-core.php.patch
 .endif
 
-CONF=		cakephp-${PROD}${CGI_EXT}.conf 
+CONF=		cakephp-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
@@ -109,15 +108,15 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${WWWDIR}
 	${CP} -R ${WRKSRC}/.htaccess \
 			${WRKSRC}/app \
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
-			${WRKSRC}/vendors ${DATADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+			${WRKSRC}/vendors ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${FIND} ${WWWDIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
+	${FIND} ${WWWDIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
 
 post-install:
 	@if [ -d "${CONFDIR}" ]; then \
diff --git a/www/cakephp13/distinfo b/www/cakephp13/distinfo
index eb02e8b50cdc..4bdc7fc946af 100644
--- a/www/cakephp13/distinfo
+++ b/www/cakephp13/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.13.4450.tar.bz2) = 9b39849608a8d9881adb8d65f75a14d8
-SHA256 (cake_1.1.13.4450.tar.bz2) = 614a63e501490d4735b955ccca1194fc330c8b65cb64441ad3de2ea8ebd301c1
-SIZE (cake_1.1.13.4450.tar.bz2) = 148538
+MD5 (cake_1.1.15.5144.tar.bz2) = f163a298eaaa4361c62175a19bf3f763
+SHA256 (cake_1.1.15.5144.tar.bz2) = 44eb104fd33dc95ea28ed2cdfbeea6649412a401efc77b9b57c2345dc322ad7e
+SIZE (cake_1.1.15.5144.tar.bz2) = 158658
diff --git a/www/cakephp13/files/cakephp-development-cgi.conf.in b/www/cakephp13/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp13/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp13/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp13/files/cakephp-development.conf.in b/www/cakephp13/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp13/files/cakephp-development.conf.in
+++ b/www/cakephp13/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp13/files/cakephp-production-cgi.conf.in b/www/cakephp13/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp13/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp13/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp13/files/cakephp-production.conf.in b/www/cakephp13/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp13/files/cakephp-production.conf.in
+++ b/www/cakephp13/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp13/files/pkg-message.in b/www/cakephp13/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp13/files/pkg-message.in
+++ b/www/cakephp13/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.
diff --git a/www/cakephp13/pkg-plist b/www/cakephp13/pkg-plist
index 0db1a81580a8..c2f539b2c2f9 100644
--- a/www/cakephp13/pkg-plist
+++ b/www/cakephp13/pkg-plist
@@ -1,258 +1,296 @@
-%%DATADIR%%/app/.htaccess
-%%DATADIR%%/app/config/acl.ini.php
-%%DATADIR%%/app/config/bootstrap.php
-%%DATADIR%%/app/config/core.php
-@unexec rm -f %D/%%DATADIR%%/app/config/core.php.orig
-%%DATADIR%%/app/config/database.php.default
-%%DATADIR%%/app/config/inflections.php
-%%DATADIR%%/app/config/routes.php
-%%DATADIR%%/app/config/sql/db_acl.sql
-%%DATADIR%%/app/config/sql/sessions.sql
-%%DATADIR%%/app/index.php
-%%DATADIR%%/app/webroot/.htaccess
-%%DATADIR%%/app/webroot/css.php
-%%DATADIR%%/app/webroot/css/cake.generic.css
-%%DATADIR%%/app/webroot/favicon.ico
-%%DATADIR%%/app/webroot/img/cake.power.png
-%%DATADIR%%/app/webroot/img/w3c_css.png
-%%DATADIR%%/app/webroot/img/w3c_xhtml10.png
-%%DATADIR%%/app/webroot/index.php
-%%DATADIR%%/app/webroot/js/vendors.php
-%%DATADIR%%/cake/LICENSE.txt
-%%DATADIR%%/cake/VERSION.txt
-%%DATADIR%%/cake/app_controller.php
-%%DATADIR%%/cake/app_model.php
-%%DATADIR%%/cake/basics.php
-%%DATADIR%%/cake/bootstrap.php
-%%DATADIR%%/cake/config/config.php
-%%DATADIR%%/cake/config/paths.php
-%%DATADIR%%/cake/dispatcher.php
-%%DATADIR%%/cake/libs/cache.php
-%%DATADIR%%/cake/libs/cake_log.php
-%%DATADIR%%/cake/libs/class_registry.php
-%%DATADIR%%/cake/libs/configure.php
-%%DATADIR%%/cake/libs/controller/component.php
-%%DATADIR%%/cake/libs/controller/components/acl.php
-%%DATADIR%%/cake/libs/controller/components/acl_base.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/db_acl.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aco.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aro.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
-%%DATADIR%%/cake/libs/controller/components/iniacl/ini_acl.php
-%%DATADIR%%/cake/libs/controller/components/request_handler.php
-%%DATADIR%%/cake/libs/controller/components/security.php
-%%DATADIR%%/cake/libs/controller/components/session.php
-%%DATADIR%%/cake/libs/controller/controller.php
-%%DATADIR%%/cake/libs/controller/pages_controller.php
-%%DATADIR%%/cake/libs/controller/scaffold.php
-%%DATADIR%%/cake/libs/error.php
-%%DATADIR%%/cake/libs/file.php
-%%DATADIR%%/cake/libs/flay.php
-%%DATADIR%%/cake/libs/folder.php
-%%DATADIR%%/cake/libs/inflector.php
-%%DATADIR%%/cake/libs/legacy.php
-%%DATADIR%%/cake/libs/model/connection_manager.php
-%%DATADIR%%/cake/libs/model/datasources/datasource.php
-%%DATADIR%%/cake/libs/model/datasources/dbo_source.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_adodb.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mssql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysqli.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_odbc.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_pear.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_postgres.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_sqlite.php
-%%DATADIR%%/cake/libs/model/model.php
-%%DATADIR%%/cake/libs/model/model_php4.php
-%%DATADIR%%/cake/libs/model/model_php5.php
-%%DATADIR%%/cake/libs/neat_array.php
-%%DATADIR%%/cake/libs/neat_string.php
-%%DATADIR%%/cake/libs/object.php
-%%DATADIR%%/cake/libs/router.php
-%%DATADIR%%/cake/libs/sanitize.php
-%%DATADIR%%/cake/libs/security.php
-%%DATADIR%%/cake/libs/session.php
-%%DATADIR%%/cake/libs/validators.php
-%%DATADIR%%/cake/libs/view/helper.php
-%%DATADIR%%/cake/libs/view/helpers/ajax.php
-%%DATADIR%%/cake/libs/view/helpers/cache.php
-%%DATADIR%%/cake/libs/view/helpers/form.php
-%%DATADIR%%/cake/libs/view/helpers/html.php
-%%DATADIR%%/cake/libs/view/helpers/javascript.php
-%%DATADIR%%/cake/libs/view/helpers/number.php
-%%DATADIR%%/cake/libs/view/helpers/session.php
-%%DATADIR%%/cake/libs/view/helpers/text.php
-%%DATADIR%%/cake/libs/view/helpers/time.php
-%%DATADIR%%/cake/libs/view/templates/elements/dump.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/error404.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_connection.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_controller.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_layout.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_model.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_table.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_view.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/private_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/ajax.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/default.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/flash.thtml
-%%DATADIR%%/cake/libs/view/templates/pages/home.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/add.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/edit.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/index.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/view.thtml
-%%DATADIR%%/cake/libs/view/view.php
-%%DATADIR%%/cake/scripts/acl.php
-%%DATADIR%%/cake/scripts/bake.php
-%%DATADIR%%/cake/scripts/templates/skel/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/app_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/app_model.php
-%%DATADIR%%/cake/scripts/templates/skel/config/acl.ini.php
-%%DATADIR%%/cake/scripts/templates/skel/config/bootstrap.php
-%%DATADIR%%/cake/scripts/templates/skel/config/core.php
-%%DATADIR%%/cake/scripts/templates/skel/config/database.php.default
-%%DATADIR%%/cake/scripts/templates/skel/config/inflections.php
-%%DATADIR%%/cake/scripts/templates/skel/config/routes.php
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
-%%DATADIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/index.php
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
-%%DATADIR%%/cake/scripts/templates/skel/webroot/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
-%%DATADIR%%/cake/scripts/templates/skel/webroot/favicon.ico
-%%DATADIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
-%%DATADIR%%/cake/scripts/templates/skel/webroot/index.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
-%%DATADIR%%/cake/scripts/templates/views/home.thtml
+%%WWWDIR%%/app/.htaccess
+%%WWWDIR%%/app/config/acl.ini.php
+%%WWWDIR%%/app/config/bootstrap.php
+%%WWWDIR%%/app/config/core.php
+@unexec rm -f %D/%%WWWDIR%%/app/config/core.php.orig
+%%WWWDIR%%/app/config/database.php.default
+%%WWWDIR%%/app/config/inflections.php
+%%WWWDIR%%/app/config/routes.php
+%%WWWDIR%%/app/config/sql/db_acl.sql
+%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/controllers/components/empty
+%%WWWDIR%%/app/index.php
+%%WWWDIR%%/app/models/empty
+%%WWWDIR%%/app/plugins/empty
+%%WWWDIR%%/app/tmp/cache/empty
+%%WWWDIR%%/app/tmp/cache/models/empty
+%%WWWDIR%%/app/tmp/cache/persistent/empty
+%%WWWDIR%%/app/tmp/cache/views/empty
+%%WWWDIR%%/app/tmp/empty
+%%WWWDIR%%/app/tmp/logs/empty
+%%WWWDIR%%/app/tmp/sessions/empty
+%%WWWDIR%%/app/tmp/tests/empty
+%%WWWDIR%%/app/vendors/empty
+%%WWWDIR%%/app/views/elements/empty
+%%WWWDIR%%/app/views/errors/empty
+%%WWWDIR%%/app/views/helpers/empty
+%%WWWDIR%%/app/views/layouts/empty
+%%WWWDIR%%/app/views/pages/empty
+%%WWWDIR%%/app/webroot/.htaccess
+%%WWWDIR%%/app/webroot/css.php
+%%WWWDIR%%/app/webroot/css/cake.generic.css
+%%WWWDIR%%/app/webroot/favicon.ico
+%%WWWDIR%%/app/webroot/img/cake.power.png
+%%WWWDIR%%/app/webroot/img/w3c_css.png
+%%WWWDIR%%/app/webroot/img/w3c_xhtml10.png
+%%WWWDIR%%/app/webroot/index.php
+%%WWWDIR%%/app/webroot/js/vendors.php
+%%WWWDIR%%/cake/LICENSE.txt
+%%WWWDIR%%/cake/VERSION.txt
+%%WWWDIR%%/cake/app_controller.php
+%%WWWDIR%%/cake/app_model.php
+%%WWWDIR%%/cake/basics.php
+%%WWWDIR%%/cake/bootstrap.php
+%%WWWDIR%%/cake/config/config.php
+%%WWWDIR%%/cake/config/paths.php
+%%WWWDIR%%/cake/dispatcher.php
+%%WWWDIR%%/cake/libs/cache.php
+%%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/class_registry.php
+%%WWWDIR%%/cake/libs/configure.php
+%%WWWDIR%%/cake/libs/controller/component.php
+%%WWWDIR%%/cake/libs/controller/components/acl.php
+%%WWWDIR%%/cake/libs/controller/components/acl_base.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/db_acl.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aco.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aro.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
+%%WWWDIR%%/cake/libs/controller/components/iniacl/ini_acl.php
+%%WWWDIR%%/cake/libs/controller/components/request_handler.php
+%%WWWDIR%%/cake/libs/controller/components/security.php
+%%WWWDIR%%/cake/libs/controller/components/session.php
+%%WWWDIR%%/cake/libs/controller/controller.php
+%%WWWDIR%%/cake/libs/controller/pages_controller.php
+%%WWWDIR%%/cake/libs/controller/scaffold.php
+%%WWWDIR%%/cake/libs/error.php
+%%WWWDIR%%/cake/libs/file.php
+%%WWWDIR%%/cake/libs/flay.php
+%%WWWDIR%%/cake/libs/folder.php
+%%WWWDIR%%/cake/libs/inflector.php
+%%WWWDIR%%/cake/libs/legacy.php
+%%WWWDIR%%/cake/libs/model/connection_manager.php
+%%WWWDIR%%/cake/libs/model/datasources/datasource.php
+%%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_adodb.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mssql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysqli.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_odbc.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_pear.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_postgres.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_sqlite.php
+%%WWWDIR%%/cake/libs/model/model.php
+%%WWWDIR%%/cake/libs/model/model_php4.php
+%%WWWDIR%%/cake/libs/model/model_php5.php
+%%WWWDIR%%/cake/libs/neat_array.php
+%%WWWDIR%%/cake/libs/neat_string.php
+%%WWWDIR%%/cake/libs/object.php
+%%WWWDIR%%/cake/libs/router.php
+%%WWWDIR%%/cake/libs/sanitize.php
+%%WWWDIR%%/cake/libs/security.php
+%%WWWDIR%%/cake/libs/session.php
+%%WWWDIR%%/cake/libs/set.php
+%%WWWDIR%%/cake/libs/validators.php
+%%WWWDIR%%/cake/libs/view/helper.php
+%%WWWDIR%%/cake/libs/view/helpers/ajax.php
+%%WWWDIR%%/cake/libs/view/helpers/cache.php
+%%WWWDIR%%/cake/libs/view/helpers/form.php
+%%WWWDIR%%/cake/libs/view/helpers/html.php
+%%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/number.php
+%%WWWDIR%%/cake/libs/view/helpers/session.php
+%%WWWDIR%%/cake/libs/view/helpers/text.php
+%%WWWDIR%%/cake/libs/view/helpers/time.php
+%%WWWDIR%%/cake/libs/view/templates/elements/dump.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/error404.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_connection.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_controller.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_layout.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_model.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_table.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_view.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/private_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/ajax.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/default.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/flash.thtml
+%%WWWDIR%%/cake/libs/view/templates/pages/home.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/add.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/edit.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/index.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/view.thtml
+%%WWWDIR%%/cake/libs/view/view.php
+%%WWWDIR%%/cake/scripts/acl.php
+%%WWWDIR%%/cake/scripts/bake.php
+%%WWWDIR%%/cake/scripts/templates/skel/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/app_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/app_model.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/core.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/scripts/templates/skel/config/inflections.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/routes.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
+%%WWWDIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
+%%WWWDIR%%/cake/scripts/templates/views/home.thtml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/index.php
-%%DATADIR%%/.htaccess
+%%WWWDIR%%/index.php
+%%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
-@exec mkdir -p %D/%%DATADIR%%/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/pages
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/errors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/elements
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/plugins
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@exec mkdir -p %D/%%DATADIR%%/app/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/app/views/pages
-@exec mkdir -p %D/%%DATADIR%%/app/views/layouts
-@exec mkdir -p %D/%%DATADIR%%/app/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/app/views/errors
-@exec mkdir -p %D/%%DATADIR%%/app/views/elements
-@exec mkdir -p %D/%%DATADIR%%/app/vendors
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/app/plugins
-@exec mkdir -p %D/%%DATADIR%%/app/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/js
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/img
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/css
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/pages
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/layouts
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/errors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/elements
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/plugins
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config/sql
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config
-@dirrm %%DATADIR%%/cake/scripts/templates/skel
-@dirrm %%DATADIR%%/cake/scripts/templates
-@dirrm %%DATADIR%%/cake/scripts
-@dirrm %%DATADIR%%/cake/libs/view/templates/scaffolds
-@dirrm %%DATADIR%%/cake/libs/view/templates/pages
-@dirrm %%DATADIR%%/cake/libs/view/templates/layouts
-@dirrm %%DATADIR%%/cake/libs/view/templates/errors
-@dirrm %%DATADIR%%/cake/libs/view/templates/elements
-@dirrm %%DATADIR%%/cake/libs/view/templates
-@dirrm %%DATADIR%%/cake/libs/view/helpers
-@dirrm %%DATADIR%%/cake/libs/view
-@dirrm %%DATADIR%%/cake/libs/model/dbo
-@dirrm %%DATADIR%%/cake/libs/model/datasources
-@dirrm %%DATADIR%%/cake/libs/model
-@dirrm %%DATADIR%%/cake/libs/controller/components/iniacl
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl/models
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl
-@dirrm %%DATADIR%%/cake/libs/controller/components
-@dirrm %%DATADIR%%/cake/libs/controller
-@dirrm %%DATADIR%%/cake/libs
-@dirrm %%DATADIR%%/cake/config
-@dirrm %%DATADIR%%/cake
-@dirrm %%DATADIR%%/app/webroot/js
-@dirrm %%DATADIR%%/app/webroot/img
-@dirrm %%DATADIR%%/app/webroot/files
-@dirrm %%DATADIR%%/app/webroot/css
-@dirrm %%DATADIR%%/app/webroot
-@dirrm %%DATADIR%%/app/views/pages
-@dirrm %%DATADIR%%/app/views/layouts
-@dirrm %%DATADIR%%/app/views/helpers
-@dirrm %%DATADIR%%/app/views/errors
-@dirrm %%DATADIR%%/app/views/elements
-@dirrm %%DATADIR%%/app/views
-@dirrm %%DATADIR%%/app/vendors
-@dirrm %%DATADIR%%/app/tmp/tests
-@dirrm %%DATADIR%%/app/tmp/sessions
-@dirrm %%DATADIR%%/app/tmp/logs
-@dirrm %%DATADIR%%/app/tmp/cache/views
-@dirrm %%DATADIR%%/app/tmp/cache/persistent
-@dirrm %%DATADIR%%/app/tmp/cache/models
-@dirrm %%DATADIR%%/app/tmp/cache
-@dirrm %%DATADIR%%/app/tmp
-@dirrm %%DATADIR%%/app/plugins
-@dirrm %%DATADIR%%/app/models/behaviors
-@dirrm %%DATADIR%%/app/models
-@dirrm %%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/app/controllers
-@dirrm %%DATADIR%%/app/config/sql
-@dirrm %%DATADIR%%/app/config
-@dirrm %%DATADIR%%/app
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%WWWDIR%%/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/dbo
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/iniacl
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/config
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/app/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/vendors
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/app/plugins
+@exec mkdir -p %D/%%WWWDIR%%/app/models
+@exec mkdir -p %D/%%WWWDIR%%/app/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel
+@dirrm %%WWWDIR%%/cake/scripts/templates
+@dirrm %%WWWDIR%%/cake/scripts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
+@dirrm %%WWWDIR%%/cake/libs/view/templates/pages
+@dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/errors
+@dirrm %%WWWDIR%%/cake/libs/view/templates/elements
+@dirrm %%WWWDIR%%/cake/libs/view/templates
+@dirrm %%WWWDIR%%/cake/libs/view/helpers
+@dirrm %%WWWDIR%%/cake/libs/view
+@dirrm %%WWWDIR%%/cake/libs/model/dbo
+@dirrm %%WWWDIR%%/cake/libs/model/datasources
+@dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components
+@dirrm %%WWWDIR%%/cake/libs/controller
+@dirrm %%WWWDIR%%/cake/libs
+@dirrm %%WWWDIR%%/cake/config
+@dirrm %%WWWDIR%%/cake
+@dirrm %%WWWDIR%%/app/webroot/js
+@dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
+@dirrm %%WWWDIR%%/app/webroot/css
+@dirrm %%WWWDIR%%/app/webroot
+@dirrm %%WWWDIR%%/app/views/pages
+@dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/helpers
+@dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements
+@dirrm %%WWWDIR%%/app/views
+@dirrm %%WWWDIR%%/app/vendors
+@dirrm %%WWWDIR%%/app/tmp/tests
+@dirrm %%WWWDIR%%/app/tmp/sessions
+@dirrm %%WWWDIR%%/app/tmp/logs
+@dirrm %%WWWDIR%%/app/tmp/cache/views
+@dirrm %%WWWDIR%%/app/tmp/cache/persistent
+@dirrm %%WWWDIR%%/app/tmp/cache/models
+@dirrm %%WWWDIR%%/app/tmp/cache
+@dirrm %%WWWDIR%%/app/tmp
+@dirrm %%WWWDIR%%/app/plugins
+@dirrm %%WWWDIR%%/app/models
+@dirrm %%WWWDIR%%/app/controllers/components
+@dirrm %%WWWDIR%%/app/controllers
+@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config
+@dirrm %%WWWDIR%%/app
+@dirrm %%WWWDIR%%
diff --git a/www/cakephp2/Makefile b/www/cakephp2/Makefile
index 4b2b59fe556f..978fe8b474eb 100644
--- a/www/cakephp2/Makefile
+++ b/www/cakephp2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.13.4450
-PORTREVISION=	1
+PORTVERSION=	1.1.15.5144
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/326/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/410/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
@@ -63,7 +62,7 @@ PROD=		development
 EXTRA_PATCHES=	${FILESDIR}/development-app-config-core.php.patch
 .endif
 
-CONF=		cakephp-${PROD}${CGI_EXT}.conf 
+CONF=		cakephp-${PROD}${CGI_EXT}.conf
 SUB_FILES+=	${CONF}
 
 DB_DEFINED=	no
@@ -109,15 +108,15 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${WWWDIR}
 	${CP} -R ${WRKSRC}/.htaccess \
 			${WRKSRC}/app \
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
-			${WRKSRC}/vendors ${DATADIR}
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${DATADIR}
-	${FIND} ${DATADIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
-	${FIND} ${DATADIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
+			${WRKSRC}/vendors ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${FIND} ${WWWDIR} -type f -print | ${XARGS} -n1 ${CHMOD} 644
+	${FIND} ${WWWDIR} -type d -print | ${XARGS} -n1 ${CHMOD} 755
 
 post-install:
 	@if [ -d "${CONFDIR}" ]; then \
diff --git a/www/cakephp2/distinfo b/www/cakephp2/distinfo
index eb02e8b50cdc..4bdc7fc946af 100644
--- a/www/cakephp2/distinfo
+++ b/www/cakephp2/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.13.4450.tar.bz2) = 9b39849608a8d9881adb8d65f75a14d8
-SHA256 (cake_1.1.13.4450.tar.bz2) = 614a63e501490d4735b955ccca1194fc330c8b65cb64441ad3de2ea8ebd301c1
-SIZE (cake_1.1.13.4450.tar.bz2) = 148538
+MD5 (cake_1.1.15.5144.tar.bz2) = f163a298eaaa4361c62175a19bf3f763
+SHA256 (cake_1.1.15.5144.tar.bz2) = 44eb104fd33dc95ea28ed2cdfbeea6649412a401efc77b9b57c2345dc322ad7e
+SIZE (cake_1.1.15.5144.tar.bz2) = 158658
diff --git a/www/cakephp2/files/cakephp-development-cgi.conf.in b/www/cakephp2/files/cakephp-development-cgi.conf.in
index b3c5c74af043..48c1e373a372 100644
--- a/www/cakephp2/files/cakephp-development-cgi.conf.in
+++ b/www/cakephp2/files/cakephp-development-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%
 AddHandler php-script .php
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp2/files/cakephp-development.conf.in b/www/cakephp2/files/cakephp-development.conf.in
index f0ac4879ab11..86a7a676d57b 100644
--- a/www/cakephp2/files/cakephp-development.conf.in
+++ b/www/cakephp2/files/cakephp-development.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-Alias /cakephp %%DATADIR%%
+Alias /cakephp %%WWWDIR%%
 
 <Location /cakephp>
     DirectoryIndex index.php
diff --git a/www/cakephp2/files/cakephp-production-cgi.conf.in b/www/cakephp2/files/cakephp-production-cgi.conf.in
index 8565f6286351..7215c731486a 100644
--- a/www/cakephp2/files/cakephp-production-cgi.conf.in
+++ b/www/cakephp2/files/cakephp-production-cgi.conf.in
@@ -4,7 +4,7 @@ AddType application/x-httpd-php-source .phps
 Action php-script %%PHPCGI%%         
 AddHandler php-script .php
  
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp2/files/cakephp-production.conf.in b/www/cakephp2/files/cakephp-production.conf.in
index 89b5ce7d06a0..8679a15b8958 100644
--- a/www/cakephp2/files/cakephp-production.conf.in
+++ b/www/cakephp2/files/cakephp-production.conf.in
@@ -1,7 +1,7 @@
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
 
-DocumentRoot %%DATADIR%%/app/webroot
+DocumentRoot %%WWWDIR%%/app/webroot
 
 <Location />
     DirectoryIndex index.php
diff --git a/www/cakephp2/files/pkg-message.in b/www/cakephp2/files/pkg-message.in
index 5175204423df..303baf685232 100644
--- a/www/cakephp2/files/pkg-message.in
+++ b/www/cakephp2/files/pkg-message.in
@@ -7,5 +7,5 @@ and making a donation to the development effort.
 Note that you should restart your Apache web server to ensure that
 the CakePHP configuration file is loaded.
 
-Be sure to check %%DATADIR%%/app/config/core.php for
+Be sure to check %%WWWDIR%%/app/config/core.php for
 additional framework configuration options.
diff --git a/www/cakephp2/pkg-plist b/www/cakephp2/pkg-plist
index 0db1a81580a8..c2f539b2c2f9 100644
--- a/www/cakephp2/pkg-plist
+++ b/www/cakephp2/pkg-plist
@@ -1,258 +1,296 @@
-%%DATADIR%%/app/.htaccess
-%%DATADIR%%/app/config/acl.ini.php
-%%DATADIR%%/app/config/bootstrap.php
-%%DATADIR%%/app/config/core.php
-@unexec rm -f %D/%%DATADIR%%/app/config/core.php.orig
-%%DATADIR%%/app/config/database.php.default
-%%DATADIR%%/app/config/inflections.php
-%%DATADIR%%/app/config/routes.php
-%%DATADIR%%/app/config/sql/db_acl.sql
-%%DATADIR%%/app/config/sql/sessions.sql
-%%DATADIR%%/app/index.php
-%%DATADIR%%/app/webroot/.htaccess
-%%DATADIR%%/app/webroot/css.php
-%%DATADIR%%/app/webroot/css/cake.generic.css
-%%DATADIR%%/app/webroot/favicon.ico
-%%DATADIR%%/app/webroot/img/cake.power.png
-%%DATADIR%%/app/webroot/img/w3c_css.png
-%%DATADIR%%/app/webroot/img/w3c_xhtml10.png
-%%DATADIR%%/app/webroot/index.php
-%%DATADIR%%/app/webroot/js/vendors.php
-%%DATADIR%%/cake/LICENSE.txt
-%%DATADIR%%/cake/VERSION.txt
-%%DATADIR%%/cake/app_controller.php
-%%DATADIR%%/cake/app_model.php
-%%DATADIR%%/cake/basics.php
-%%DATADIR%%/cake/bootstrap.php
-%%DATADIR%%/cake/config/config.php
-%%DATADIR%%/cake/config/paths.php
-%%DATADIR%%/cake/dispatcher.php
-%%DATADIR%%/cake/libs/cache.php
-%%DATADIR%%/cake/libs/cake_log.php
-%%DATADIR%%/cake/libs/class_registry.php
-%%DATADIR%%/cake/libs/configure.php
-%%DATADIR%%/cake/libs/controller/component.php
-%%DATADIR%%/cake/libs/controller/components/acl.php
-%%DATADIR%%/cake/libs/controller/components/acl_base.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/db_acl.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aco.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aro.php
-%%DATADIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
-%%DATADIR%%/cake/libs/controller/components/iniacl/ini_acl.php
-%%DATADIR%%/cake/libs/controller/components/request_handler.php
-%%DATADIR%%/cake/libs/controller/components/security.php
-%%DATADIR%%/cake/libs/controller/components/session.php
-%%DATADIR%%/cake/libs/controller/controller.php
-%%DATADIR%%/cake/libs/controller/pages_controller.php
-%%DATADIR%%/cake/libs/controller/scaffold.php
-%%DATADIR%%/cake/libs/error.php
-%%DATADIR%%/cake/libs/file.php
-%%DATADIR%%/cake/libs/flay.php
-%%DATADIR%%/cake/libs/folder.php
-%%DATADIR%%/cake/libs/inflector.php
-%%DATADIR%%/cake/libs/legacy.php
-%%DATADIR%%/cake/libs/model/connection_manager.php
-%%DATADIR%%/cake/libs/model/datasources/datasource.php
-%%DATADIR%%/cake/libs/model/datasources/dbo_source.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_adodb.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mssql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysql.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_mysqli.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_odbc.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_pear.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_postgres.php
-%%DATADIR%%/cake/libs/model/dbo/dbo_sqlite.php
-%%DATADIR%%/cake/libs/model/model.php
-%%DATADIR%%/cake/libs/model/model_php4.php
-%%DATADIR%%/cake/libs/model/model_php5.php
-%%DATADIR%%/cake/libs/neat_array.php
-%%DATADIR%%/cake/libs/neat_string.php
-%%DATADIR%%/cake/libs/object.php
-%%DATADIR%%/cake/libs/router.php
-%%DATADIR%%/cake/libs/sanitize.php
-%%DATADIR%%/cake/libs/security.php
-%%DATADIR%%/cake/libs/session.php
-%%DATADIR%%/cake/libs/validators.php
-%%DATADIR%%/cake/libs/view/helper.php
-%%DATADIR%%/cake/libs/view/helpers/ajax.php
-%%DATADIR%%/cake/libs/view/helpers/cache.php
-%%DATADIR%%/cake/libs/view/helpers/form.php
-%%DATADIR%%/cake/libs/view/helpers/html.php
-%%DATADIR%%/cake/libs/view/helpers/javascript.php
-%%DATADIR%%/cake/libs/view/helpers/number.php
-%%DATADIR%%/cake/libs/view/helpers/session.php
-%%DATADIR%%/cake/libs/view/helpers/text.php
-%%DATADIR%%/cake/libs/view/helpers/time.php
-%%DATADIR%%/cake/libs/view/templates/elements/dump.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/error404.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_connection.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_controller.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_layout.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_model.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_table.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/missing_view.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/private_action.thtml
-%%DATADIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/ajax.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/default.thtml
-%%DATADIR%%/cake/libs/view/templates/layouts/flash.thtml
-%%DATADIR%%/cake/libs/view/templates/pages/home.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/add.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/edit.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/index.thtml
-%%DATADIR%%/cake/libs/view/templates/scaffolds/view.thtml
-%%DATADIR%%/cake/libs/view/view.php
-%%DATADIR%%/cake/scripts/acl.php
-%%DATADIR%%/cake/scripts/bake.php
-%%DATADIR%%/cake/scripts/templates/skel/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/app_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/app_model.php
-%%DATADIR%%/cake/scripts/templates/skel/config/acl.ini.php
-%%DATADIR%%/cake/scripts/templates/skel/config/bootstrap.php
-%%DATADIR%%/cake/scripts/templates/skel/config/core.php
-%%DATADIR%%/cake/scripts/templates/skel/config/database.php.default
-%%DATADIR%%/cake/scripts/templates/skel/config/inflections.php
-%%DATADIR%%/cake/scripts/templates/skel/config/routes.php
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
-%%DATADIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
-%%DATADIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
-%%DATADIR%%/cake/scripts/templates/skel/index.php
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
-%%DATADIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
-%%DATADIR%%/cake/scripts/templates/skel/webroot/.htaccess
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
-%%DATADIR%%/cake/scripts/templates/skel/webroot/favicon.ico
-%%DATADIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
-%%DATADIR%%/cake/scripts/templates/skel/webroot/index.php
-%%DATADIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
-%%DATADIR%%/cake/scripts/templates/views/home.thtml
+%%WWWDIR%%/app/.htaccess
+%%WWWDIR%%/app/config/acl.ini.php
+%%WWWDIR%%/app/config/bootstrap.php
+%%WWWDIR%%/app/config/core.php
+@unexec rm -f %D/%%WWWDIR%%/app/config/core.php.orig
+%%WWWDIR%%/app/config/database.php.default
+%%WWWDIR%%/app/config/inflections.php
+%%WWWDIR%%/app/config/routes.php
+%%WWWDIR%%/app/config/sql/db_acl.sql
+%%WWWDIR%%/app/config/sql/sessions.sql
+%%WWWDIR%%/app/controllers/components/empty
+%%WWWDIR%%/app/index.php
+%%WWWDIR%%/app/models/empty
+%%WWWDIR%%/app/plugins/empty
+%%WWWDIR%%/app/tmp/cache/empty
+%%WWWDIR%%/app/tmp/cache/models/empty
+%%WWWDIR%%/app/tmp/cache/persistent/empty
+%%WWWDIR%%/app/tmp/cache/views/empty
+%%WWWDIR%%/app/tmp/empty
+%%WWWDIR%%/app/tmp/logs/empty
+%%WWWDIR%%/app/tmp/sessions/empty
+%%WWWDIR%%/app/tmp/tests/empty
+%%WWWDIR%%/app/vendors/empty
+%%WWWDIR%%/app/views/elements/empty
+%%WWWDIR%%/app/views/errors/empty
+%%WWWDIR%%/app/views/helpers/empty
+%%WWWDIR%%/app/views/layouts/empty
+%%WWWDIR%%/app/views/pages/empty
+%%WWWDIR%%/app/webroot/.htaccess
+%%WWWDIR%%/app/webroot/css.php
+%%WWWDIR%%/app/webroot/css/cake.generic.css
+%%WWWDIR%%/app/webroot/favicon.ico
+%%WWWDIR%%/app/webroot/img/cake.power.png
+%%WWWDIR%%/app/webroot/img/w3c_css.png
+%%WWWDIR%%/app/webroot/img/w3c_xhtml10.png
+%%WWWDIR%%/app/webroot/index.php
+%%WWWDIR%%/app/webroot/js/vendors.php
+%%WWWDIR%%/cake/LICENSE.txt
+%%WWWDIR%%/cake/VERSION.txt
+%%WWWDIR%%/cake/app_controller.php
+%%WWWDIR%%/cake/app_model.php
+%%WWWDIR%%/cake/basics.php
+%%WWWDIR%%/cake/bootstrap.php
+%%WWWDIR%%/cake/config/config.php
+%%WWWDIR%%/cake/config/paths.php
+%%WWWDIR%%/cake/dispatcher.php
+%%WWWDIR%%/cake/libs/cache.php
+%%WWWDIR%%/cake/libs/cake_log.php
+%%WWWDIR%%/cake/libs/class_registry.php
+%%WWWDIR%%/cake/libs/configure.php
+%%WWWDIR%%/cake/libs/controller/component.php
+%%WWWDIR%%/cake/libs/controller/components/acl.php
+%%WWWDIR%%/cake/libs/controller/components/acl_base.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/db_acl.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aclnode.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aco.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/acoaction.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aro.php
+%%WWWDIR%%/cake/libs/controller/components/dbacl/models/aros_aco.php
+%%WWWDIR%%/cake/libs/controller/components/iniacl/ini_acl.php
+%%WWWDIR%%/cake/libs/controller/components/request_handler.php
+%%WWWDIR%%/cake/libs/controller/components/security.php
+%%WWWDIR%%/cake/libs/controller/components/session.php
+%%WWWDIR%%/cake/libs/controller/controller.php
+%%WWWDIR%%/cake/libs/controller/pages_controller.php
+%%WWWDIR%%/cake/libs/controller/scaffold.php
+%%WWWDIR%%/cake/libs/error.php
+%%WWWDIR%%/cake/libs/file.php
+%%WWWDIR%%/cake/libs/flay.php
+%%WWWDIR%%/cake/libs/folder.php
+%%WWWDIR%%/cake/libs/inflector.php
+%%WWWDIR%%/cake/libs/legacy.php
+%%WWWDIR%%/cake/libs/model/connection_manager.php
+%%WWWDIR%%/cake/libs/model/datasources/datasource.php
+%%WWWDIR%%/cake/libs/model/datasources/dbo_source.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_adodb.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mssql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysql.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_mysqli.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_odbc.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_pear.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_postgres.php
+%%WWWDIR%%/cake/libs/model/dbo/dbo_sqlite.php
+%%WWWDIR%%/cake/libs/model/model.php
+%%WWWDIR%%/cake/libs/model/model_php4.php
+%%WWWDIR%%/cake/libs/model/model_php5.php
+%%WWWDIR%%/cake/libs/neat_array.php
+%%WWWDIR%%/cake/libs/neat_string.php
+%%WWWDIR%%/cake/libs/object.php
+%%WWWDIR%%/cake/libs/router.php
+%%WWWDIR%%/cake/libs/sanitize.php
+%%WWWDIR%%/cake/libs/security.php
+%%WWWDIR%%/cake/libs/session.php
+%%WWWDIR%%/cake/libs/set.php
+%%WWWDIR%%/cake/libs/validators.php
+%%WWWDIR%%/cake/libs/view/helper.php
+%%WWWDIR%%/cake/libs/view/helpers/ajax.php
+%%WWWDIR%%/cake/libs/view/helpers/cache.php
+%%WWWDIR%%/cake/libs/view/helpers/form.php
+%%WWWDIR%%/cake/libs/view/helpers/html.php
+%%WWWDIR%%/cake/libs/view/helpers/javascript.php
+%%WWWDIR%%/cake/libs/view/helpers/number.php
+%%WWWDIR%%/cake/libs/view/helpers/session.php
+%%WWWDIR%%/cake/libs/view/helpers/text.php
+%%WWWDIR%%/cake/libs/view/helpers/time.php
+%%WWWDIR%%/cake/libs/view/templates/elements/dump.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/error404.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_component_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_connection.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_controller.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_class.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_helper_file.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_layout.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_model.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_scaffolddb.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_table.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/missing_view.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/private_action.thtml
+%%WWWDIR%%/cake/libs/view/templates/errors/scaffold_error.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/ajax.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/default.thtml
+%%WWWDIR%%/cake/libs/view/templates/layouts/flash.thtml
+%%WWWDIR%%/cake/libs/view/templates/pages/home.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/add.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/edit.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/index.thtml
+%%WWWDIR%%/cake/libs/view/templates/scaffolds/view.thtml
+%%WWWDIR%%/cake/libs/view/view.php
+%%WWWDIR%%/cake/scripts/acl.php
+%%WWWDIR%%/cake/scripts/bake.php
+%%WWWDIR%%/cake/scripts/templates/skel/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/app_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/app_model.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/acl.ini.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/bootstrap.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/core.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/database.php.default
+%%WWWDIR%%/cake/scripts/templates/skel/config/inflections.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/routes.php
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/db_acl.sql
+%%WWWDIR%%/cake/scripts/templates/skel/config/sql/sessions.sql
+%%WWWDIR%%/cake/scripts/templates/skel/controllers/pages_controller.php
+%%WWWDIR%%/cake/scripts/templates/skel/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/ajax.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/default.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/views/layouts/flash.thtml
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/.htaccess
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/css/cake.generic.css
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/favicon.ico
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/img/cake.power.png
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/index.php
+%%WWWDIR%%/cake/scripts/templates/skel/webroot/js/vendors.php
+%%WWWDIR%%/cake/scripts/templates/views/home.thtml
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DATADIR%%/index.php
-%%DATADIR%%/.htaccess
+%%WWWDIR%%/index.php
+%%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
-@exec mkdir -p %D/%%DATADIR%%/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/pages
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/errors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/views/elements
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/vendors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/plugins
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@exec mkdir -p %D/%%DATADIR%%/app/webroot/files
-@exec mkdir -p %D/%%DATADIR%%/app/views/pages
-@exec mkdir -p %D/%%DATADIR%%/app/views/layouts
-@exec mkdir -p %D/%%DATADIR%%/app/views/helpers
-@exec mkdir -p %D/%%DATADIR%%/app/views/errors
-@exec mkdir -p %D/%%DATADIR%%/app/views/elements
-@exec mkdir -p %D/%%DATADIR%%/app/vendors
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/tests
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/sessions
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/logs
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/views
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/persistent
-@exec mkdir -p %D/%%DATADIR%%/app/tmp/cache/models
-@exec mkdir -p %D/%%DATADIR%%/app/plugins
-@exec mkdir -p %D/%%DATADIR%%/app/models/behaviors
-@exec mkdir -p %D/%%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/js
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/img
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/files
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot/css
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/webroot
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/pages
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/layouts
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/helpers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/errors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views/elements
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/vendors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/tests
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/sessions
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/logs
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/views
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/persistent
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp/cache
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/tmp
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/plugins
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models/behaviors
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/models
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers/components
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/controllers
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config/sql
-@dirrm %%DATADIR%%/cake/scripts/templates/skel/config
-@dirrm %%DATADIR%%/cake/scripts/templates/skel
-@dirrm %%DATADIR%%/cake/scripts/templates
-@dirrm %%DATADIR%%/cake/scripts
-@dirrm %%DATADIR%%/cake/libs/view/templates/scaffolds
-@dirrm %%DATADIR%%/cake/libs/view/templates/pages
-@dirrm %%DATADIR%%/cake/libs/view/templates/layouts
-@dirrm %%DATADIR%%/cake/libs/view/templates/errors
-@dirrm %%DATADIR%%/cake/libs/view/templates/elements
-@dirrm %%DATADIR%%/cake/libs/view/templates
-@dirrm %%DATADIR%%/cake/libs/view/helpers
-@dirrm %%DATADIR%%/cake/libs/view
-@dirrm %%DATADIR%%/cake/libs/model/dbo
-@dirrm %%DATADIR%%/cake/libs/model/datasources
-@dirrm %%DATADIR%%/cake/libs/model
-@dirrm %%DATADIR%%/cake/libs/controller/components/iniacl
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl/models
-@dirrm %%DATADIR%%/cake/libs/controller/components/dbacl
-@dirrm %%DATADIR%%/cake/libs/controller/components
-@dirrm %%DATADIR%%/cake/libs/controller
-@dirrm %%DATADIR%%/cake/libs
-@dirrm %%DATADIR%%/cake/config
-@dirrm %%DATADIR%%/cake
-@dirrm %%DATADIR%%/app/webroot/js
-@dirrm %%DATADIR%%/app/webroot/img
-@dirrm %%DATADIR%%/app/webroot/files
-@dirrm %%DATADIR%%/app/webroot/css
-@dirrm %%DATADIR%%/app/webroot
-@dirrm %%DATADIR%%/app/views/pages
-@dirrm %%DATADIR%%/app/views/layouts
-@dirrm %%DATADIR%%/app/views/helpers
-@dirrm %%DATADIR%%/app/views/errors
-@dirrm %%DATADIR%%/app/views/elements
-@dirrm %%DATADIR%%/app/views
-@dirrm %%DATADIR%%/app/vendors
-@dirrm %%DATADIR%%/app/tmp/tests
-@dirrm %%DATADIR%%/app/tmp/sessions
-@dirrm %%DATADIR%%/app/tmp/logs
-@dirrm %%DATADIR%%/app/tmp/cache/views
-@dirrm %%DATADIR%%/app/tmp/cache/persistent
-@dirrm %%DATADIR%%/app/tmp/cache/models
-@dirrm %%DATADIR%%/app/tmp/cache
-@dirrm %%DATADIR%%/app/tmp
-@dirrm %%DATADIR%%/app/plugins
-@dirrm %%DATADIR%%/app/models/behaviors
-@dirrm %%DATADIR%%/app/models
-@dirrm %%DATADIR%%/app/controllers/components
-@dirrm %%DATADIR%%/app/controllers
-@dirrm %%DATADIR%%/app/config/sql
-@dirrm %%DATADIR%%/app/config
-@dirrm %%DATADIR%%/app
-@dirrm %%DATADIR%%
+@exec mkdir -p %D/%%WWWDIR%%/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/scaffolds
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/layouts
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/errors
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/templates/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/view/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/dbo
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/model/datasources
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/iniacl
+@exec mkdir -p %D/%%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@exec mkdir -p %D/%%WWWDIR%%/cake/config
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/js
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/img
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/app/webroot/css
+@exec mkdir -p %D/%%WWWDIR%%/app/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/app/views/layouts
+@exec mkdir -p %D/%%WWWDIR%%/app/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/app/views/errors
+@exec mkdir -p %D/%%WWWDIR%%/app/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/app/vendors
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/tests
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/persistent
+@exec mkdir -p %D/%%WWWDIR%%/app/tmp/cache/models
+@exec mkdir -p %D/%%WWWDIR%%/app/plugins
+@exec mkdir -p %D/%%WWWDIR%%/app/models
+@exec mkdir -p %D/%%WWWDIR%%/app/controllers/components
+@exec mkdir -p %D/%%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
+@dirrm %%WWWDIR%%/cake/scripts/templates/skel
+@dirrm %%WWWDIR%%/cake/scripts/templates
+@dirrm %%WWWDIR%%/cake/scripts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
+@dirrm %%WWWDIR%%/cake/libs/view/templates/pages
+@dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
+@dirrm %%WWWDIR%%/cake/libs/view/templates/errors
+@dirrm %%WWWDIR%%/cake/libs/view/templates/elements
+@dirrm %%WWWDIR%%/cake/libs/view/templates
+@dirrm %%WWWDIR%%/cake/libs/view/helpers
+@dirrm %%WWWDIR%%/cake/libs/view
+@dirrm %%WWWDIR%%/cake/libs/model/dbo
+@dirrm %%WWWDIR%%/cake/libs/model/datasources
+@dirrm %%WWWDIR%%/cake/libs/model
+@dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
+@dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
+@dirrm %%WWWDIR%%/cake/libs/controller/components
+@dirrm %%WWWDIR%%/cake/libs/controller
+@dirrm %%WWWDIR%%/cake/libs
+@dirrm %%WWWDIR%%/cake/config
+@dirrm %%WWWDIR%%/cake
+@dirrm %%WWWDIR%%/app/webroot/js
+@dirrm %%WWWDIR%%/app/webroot/img
+@dirrm %%WWWDIR%%/app/webroot/files
+@dirrm %%WWWDIR%%/app/webroot/css
+@dirrm %%WWWDIR%%/app/webroot
+@dirrm %%WWWDIR%%/app/views/pages
+@dirrm %%WWWDIR%%/app/views/layouts
+@dirrm %%WWWDIR%%/app/views/helpers
+@dirrm %%WWWDIR%%/app/views/errors
+@dirrm %%WWWDIR%%/app/views/elements
+@dirrm %%WWWDIR%%/app/views
+@dirrm %%WWWDIR%%/app/vendors
+@dirrm %%WWWDIR%%/app/tmp/tests
+@dirrm %%WWWDIR%%/app/tmp/sessions
+@dirrm %%WWWDIR%%/app/tmp/logs
+@dirrm %%WWWDIR%%/app/tmp/cache/views
+@dirrm %%WWWDIR%%/app/tmp/cache/persistent
+@dirrm %%WWWDIR%%/app/tmp/cache/models
+@dirrm %%WWWDIR%%/app/tmp/cache
+@dirrm %%WWWDIR%%/app/tmp
+@dirrm %%WWWDIR%%/app/plugins
+@dirrm %%WWWDIR%%/app/models
+@dirrm %%WWWDIR%%/app/controllers/components
+@dirrm %%WWWDIR%%/app/controllers
+@dirrm %%WWWDIR%%/app/config/sql
+@dirrm %%WWWDIR%%/app/config
+@dirrm %%WWWDIR%%/app
+@dirrm %%WWWDIR%%