From owner-svn-ports-all@FreeBSD.ORG Wed Aug 22 19:58:27 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BDCC5106566C; Wed, 22 Aug 2012 19:58:27 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8ED4E8FC08; Wed, 22 Aug 2012 19:58:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7MJwRuW088660; Wed, 22 Aug 2012 19:58:27 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7MJwRxw088654; Wed, 22 Aug 2012 19:58:27 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201208221958.q7MJwRxw088654@svn.freebsd.org> From: Olli Hauer Date: Wed, 22 Aug 2012 19:58:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302962 - in head: graphics/mapserver www/cakephp11 www/cakephp12 www/cakephp13 www/cakephp21 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 22 Aug 2012 19:58:27 -0000 Author: ohauer Date: Wed Aug 22 19:58:26 2012 New Revision: 302962 URL: http://svn.freebsd.org/changeset/ports/302962 Log: - use UPPERCASE for SLAVE_PORT_MODULES (www/cakephp*) Note: SLAVE_PORT_MODULES is target to remove, since with new options framework it can lead to a defect pkg-plist (leftovers). - update supported USE_APACHE version Modified: head/graphics/mapserver/Makefile head/www/cakephp11/Makefile head/www/cakephp12/Makefile head/www/cakephp13/Makefile head/www/cakephp21/Makefile Modified: head/graphics/mapserver/Makefile ============================================================================== --- head/graphics/mapserver/Makefile Wed Aug 22 19:03:58 2012 (r302961) +++ head/graphics/mapserver/Makefile Wed Aug 22 19:58:26 2012 (r302962) @@ -144,7 +144,7 @@ CONFIGURE_ARGS+= --with-curl=${LOCALBASE .endif .if defined(WITH_MAPSERV) -USE_APACHE= 20+ +USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" PLIST_SUB+= WITH_MAPSERV="" PLIST_DIRSTRY= www/cgi-bin Modified: head/www/cakephp11/Makefile ============================================================================== --- head/www/cakephp11/Makefile Wed Aug 22 19:03:58 2012 (r302961) +++ head/www/cakephp11/Makefile Wed Aug 22 19:58:26 2012 (r302962) @@ -21,7 +21,7 @@ LATEST_LINK= cakephp11 USE_BZIP2= yes USE_APACHE_RUN= 22+ -SLAVE_PORT_MODULES= rewrite +SLAVE_PORT_MODULES= REWRITE CONFLICTS= cakephp-1.[23].* NO_BUILD= yes Modified: head/www/cakephp12/Makefile ============================================================================== --- head/www/cakephp12/Makefile Wed Aug 22 19:03:58 2012 (r302961) +++ head/www/cakephp12/Makefile Wed Aug 22 19:58:26 2012 (r302962) @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAM PORTDOCS= README -SLAVE_PORT_MODULES= rewrite +SLAVE_PORT_MODULES= REWRITE CONFLICTS= cakephp-1.[13].* Modified: head/www/cakephp13/Makefile ============================================================================== --- head/www/cakephp13/Makefile Wed Aug 22 19:03:58 2012 (r302961) +++ head/www/cakephp13/Makefile Wed Aug 22 19:58:26 2012 (r302962) @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAM PORTDOCS= README -SLAVE_PORT_MODULES= rewrite +SLAVE_PORT_MODULES= REWRITE CONFLICTS= cakephp-1.[12].* cakephp-2.* Modified: head/www/cakephp21/Makefile ============================================================================== --- head/www/cakephp21/Makefile Wed Aug 22 19:03:58 2012 (r302961) +++ head/www/cakephp21/Makefile Wed Aug 22 19:58:26 2012 (r302962) @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAM PORTDOCS= README -SLAVE_PORT_MODULES= rewrite +SLAVE_PORT_MODULES= REWRITE CONFLICTS= cakephp-1.* cakephp-2.2.*