svn commit: r369126 - head/www/cakephp11

[Olli Hauer]

Author: ohauer
Date: Tue Sep 23 22:00:06 2014
New Revision: 369126
URL: http://svnweb.freebsd.org/changeset/ports/369126
QAT: https://qat.redports.org/buildarchive/r369126/

Log:
  - fix DEFAULT_VERSIONS usage
  - allow install without root
  - remove SLAVE_PORT_MODULES (no longer required since apache >= 20)
  - trim pkg-plist

Modified:
  head/www/cakephp11/Makefile
  head/www/cakephp11/pkg-plist

Modified: head/www/cakephp11/Makefile
==============================================================================
--- head/www/cakephp11/Makefile	Tue Sep 23 21:53:17 2014	(r369125)
+++ head/www/cakephp11/Makefile	Tue Sep 23 22:00:06 2014	(r369126)
@@ -15,14 +15,13 @@ COMMENT=	Framework for developing PHP we
 
 USES=		tar:bzip2
 USE_APACHE_RUN=	22+
-SLAVE_PORT_MODULES=	REWRITE
 
 CONFLICTS=	cakephp-1[23]-* cakephp-2?-.* cakephp-2.3.*
 NO_BUILD=	yes
 
 USE_PHP=	pcre session
 WANT_PHP_WEB=	yes
-DEFAULT_VERSIONS=	php=5
+DEFAULT_VERSIONS+=	php=5
 
 SUB_FILES=	pkg-message
 
@@ -62,20 +61,17 @@ DB_DEFINED=	no
 
 .if ${PORT_OPTIONS:MMYSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_mysql.so:${PORTSDIR}/databases/php5-pdo_mysql
-DB_DEFINED=	yes
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql
-DB_DEFINED=	yes
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
 DB_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_sqlite.so:${PORTSDIR}/databases/php5-pdo_sqlite
-DB_DEFINED=	yes
 .endif
 
-.if ${DB_DEFINED} == "yes"
+.if defined(DB_DEPENDS) && !empty(DB_DEPENDS)
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo.so:${PORTSDIR}/databases/php5-pdo \
 		${DB_DEPENDS}
 .endif
@@ -102,7 +98,6 @@ do-install:
 			${WRKSRC}/cake \
 			${WRKSRC}/index.php \
 			${WRKSRC}/vendors ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 

Modified: head/www/cakephp11/pkg-plist
==============================================================================
--- head/www/cakephp11/pkg-plist	Tue Sep 23 21:53:17 2014	(r369125)
+++ head/www/cakephp11/pkg-plist	Tue Sep 23 22:00:06 2014	(r369126)
@@ -1,3 +1,11 @@
+%%CONFDIR%%/cakephp.conf
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+ at owner www
+ at group www
+%%WWWDIR%%/.htaccess
 %%WWWDIR%%/app/.htaccess
 %%WWWDIR%%/app/config/acl.ini.php
 %%WWWDIR%%/app/config/bootstrap.php
@@ -154,90 +162,4 @@
 %%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%%
 %%WWWDIR%%/index.php
-%%WWWDIR%%/.htaccess
-%%CONFDIR%%/cakephp.conf
- at dirrm %%WWWDIR%%/vendors
- at dirrm %%WWWDIR%%/cake/scripts/templates/views
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/js
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/img
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/files
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot/css
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/webroot
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/pages
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/layouts
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/helpers
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/errors
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/views/elements
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/views
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/vendors
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/tests
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/sessions
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/logs
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/views
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/persistent
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache/models
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp/cache
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/tmp
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/plugins
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/models/behaviors
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/models
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers/components
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/controllers
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/config/sql
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel/config
- at dirrm %%WWWDIR%%/cake/scripts/templates/skel
- at dirrm %%WWWDIR%%/cake/scripts/templates
- at dirrm %%WWWDIR%%/cake/scripts
- at dirrm %%WWWDIR%%/cake/libs/view/templates/scaffolds
- at dirrm %%WWWDIR%%/cake/libs/view/templates/pages
- at dirrm %%WWWDIR%%/cake/libs/view/templates/layouts
- at dirrm %%WWWDIR%%/cake/libs/view/templates/errors
- at dirrm %%WWWDIR%%/cake/libs/view/templates/elements
- at dirrm %%WWWDIR%%/cake/libs/view/templates
- at dirrm %%WWWDIR%%/cake/libs/view/helpers
- at dirrm %%WWWDIR%%/cake/libs/view
- at dirrm %%WWWDIR%%/cake/libs/model/dbo
- at dirrm %%WWWDIR%%/cake/libs/model/datasources
- at dirrm %%WWWDIR%%/cake/libs/model
- at dirrm %%WWWDIR%%/cake/libs/controller/components/iniacl
- at dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl/models
- at dirrm %%WWWDIR%%/cake/libs/controller/components/dbacl
- at dirrm %%WWWDIR%%/cake/libs/controller/components
- at dirrm %%WWWDIR%%/cake/libs/controller
- at dirrm %%WWWDIR%%/cake/libs
- at dirrm %%WWWDIR%%/cake/config
- at dirrm %%WWWDIR%%/cake
- at dirrm %%WWWDIR%%/app/webroot/js
- at dirrm %%WWWDIR%%/app/webroot/img
- at dirrm %%WWWDIR%%/app/webroot/files
- at dirrm %%WWWDIR%%/app/webroot/css
- at dirrm %%WWWDIR%%/app/webroot
- at dirrm %%WWWDIR%%/app/views/pages
- at dirrm %%WWWDIR%%/app/views/layouts
- at dirrm %%WWWDIR%%/app/views/helpers
- at dirrm %%WWWDIR%%/app/views/errors
- at dirrm %%WWWDIR%%/app/views/elements
- at dirrm %%WWWDIR%%/app/views
- at dirrm %%WWWDIR%%/app/vendors
- at dirrm %%WWWDIR%%/app/tmp/tests
- at dirrm %%WWWDIR%%/app/tmp/sessions
- at dirrm %%WWWDIR%%/app/tmp/logs
- at dirrm %%WWWDIR%%/app/tmp/cache/views
- at dirrm %%WWWDIR%%/app/tmp/cache/persistent
- at dirrm %%WWWDIR%%/app/tmp/cache/models
- at dirrm %%WWWDIR%%/app/tmp/cache
- at dirrm %%WWWDIR%%/app/tmp
- at dirrm %%WWWDIR%%/app/plugins
- at dirrm %%WWWDIR%%/app/models
- at dirrm %%WWWDIR%%/app/controllers/components
- at dirrm %%WWWDIR%%/app/controllers
- at dirrm %%WWWDIR%%/app/config/sql
- at dirrm %%WWWDIR%%/app/config
- at dirrm %%WWWDIR%%/app
- at dirrm %%WWWDIR%%