From owner-svn-ports-all@FreeBSD.ORG Tue Sep 23 22:00:07 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37C81E95; Tue, 23 Sep 2014 22:00:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22835EE4; Tue, 23 Sep 2014 22:00:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NM07FV039598; Tue, 23 Sep 2014 22:00:07 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NM065Y039595; Tue, 23 Sep 2014 22:00:06 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201409232200.s8NM065Y039595@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Tue, 23 Sep 2014 22:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369126 - head/www/cakephp11 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Sep 2014 22:00:07 -0000 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 +@owner www +@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 -@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%%