diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile index 1d26138fd069..48db45c7d425 100644 --- a/www/cakephp13/Makefile +++ b/www/cakephp13/Makefile @@ -18,15 +18,13 @@ GH_COMMIT= a59e55e PORTDOCS= README -SLAVE_PORT_MODULES= REWRITE - CONFLICTS= cakephp-1[12]-* cakephp-2?-.* cakephp-2.?.* NO_BUILD= yes USES= gettext USE_PHP= session WANT_PHP_WEB= yes -DEFAULT_VERSIONS= php=5 +DEFAULT_VERSIONS+= php=5 CAKE_CONF_FILES= \ app/config/acl.ini.php \ diff --git a/www/cakephp21/Makefile b/www/cakephp21/Makefile index 1ebb8d2313d6..d6fe4e791a8a 100644 --- a/www/cakephp21/Makefile +++ b/www/cakephp21/Makefile @@ -18,15 +18,13 @@ GH_COMMIT= 0bcf34c PORTDOCS= README -SLAVE_PORT_MODULES= REWRITE - CONFLICTS= cakephp-1?-* cakephp-2[2]-.* cakephp-2.3.* NO_BUILD= yes USES= gettext USE_PHP= ctype session WANT_PHP_WEB= yes -DEFAULT_VERSIONS= php=5 +DEFAULT_VERSIONS+= php=5 CAKE_CONF_FILES= \ app/Config/acl.php \ diff --git a/www/cakephp22/Makefile b/www/cakephp22/Makefile index ec340c143b3d..7edd5e886e21 100644 --- a/www/cakephp22/Makefile +++ b/www/cakephp22/Makefile @@ -17,15 +17,13 @@ GH_COMMIT= 1bb28d3 PORTDOCS= README.md -SLAVE_PORT_MODULES= REWRITE - CONFLICTS= cakephp-1?-* cakephp-2[1]-.* cakephp-2.3.* NO_BUILD= yes USES= gettext USE_PHP= ctype session WANT_PHP_WEB= yes -DEFAULT_VERSIONS= php=5 +DEFAULT_VERSIONS+= php=5 CAKE_CONF_FILES= \ app/Config/acl.php \ diff --git a/www/cakephp23/Makefile b/www/cakephp23/Makefile index b291a15aa306..91ff7ab1c13d 100644 --- a/www/cakephp23/Makefile +++ b/www/cakephp23/Makefile @@ -16,15 +16,13 @@ GH_COMMIT= b81c198 PORTDOCS= README.md -SLAVE_PORT_MODULES= REWRITE - CONFLICTS= cakephp-1?-* cakephp-2[12]-.* NO_BUILD= yes USES= gettext USE_PHP= ctype session WANT_PHP_WEB= yes -DEFAULT_VERSIONS= php=5 +DEFAULT_VERSIONS+= php=5 CAKE_CONF_FILES= \ app/Config/acl.php \