3 files changed, 16 insertions, 52 deletions

diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile
index 955d3d123956..5fdd3ae3ffaf 100644
--- a/www/cakephp11/Makefile
+++ b/www/cakephp11/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.1.17.5612
+PORTVERSION=	1.1.18.5850
 CATEGORIES=	www
-MASTER_SITES=	http://cakeforge.org/frs/download.php/503/
+MASTER_SITES=	http://cakeforge.org/frs/download.php/549/
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@sourcehosting.net
diff --git a/www/cakephp11/distinfo b/www/cakephp11/distinfo
index e648aeee0263..5bb37761cf94 100644
--- a/www/cakephp11/distinfo
+++ b/www/cakephp11/distinfo
@@ -1,3 +1,3 @@
-MD5 (cake_1.1.17.5612.tar.bz2) = 0b25e060c42dcf4b478f56f53099a986
-SHA256 (cake_1.1.17.5612.tar.bz2) = 519c4e02017211c5c8fc8a41add5a274dcabb8785de4d360a734969d63f5f1a4
-SIZE (cake_1.1.17.5612.tar.bz2) = 160095
+MD5 (cake_1.1.18.5850.tar.bz2) = 29f2445bec3cbc02758b276e2d4d93a2
+SHA256 (cake_1.1.18.5850.tar.bz2) = 1e6b91b22ed094e6e67546ff4eb58d911e490853da0d98f27dc491ad1204ea95
+SIZE (cake_1.1.18.5850.tar.bz2) = 162144
diff --git a/www/cakephp11/pkg-plist b/www/cakephp11/pkg-plist
index c2f539b2c2f9..42adae421d2d 100644
--- a/www/cakephp11/pkg-plist
+++ b/www/cakephp11/pkg-plist
@@ -163,58 +163,22 @@
 %%WWWDIR%%/.htaccess
 %%CONFDIR%%/cakephp.conf
 @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/controllers/components
 @exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/vendors
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/plugins
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/webroot/files
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
 @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%%/cake/scripts/templates/skel/tmp/cache/views
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/pages
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/helpers
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/elements
+@exec mkdir -p %D/%%WWWDIR%%/cake/scripts/templates/skel/views/errors
 @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