ports/162289: [maintainer update] Update of cakephp13 to version 1.3.13

Christoph Theis theis at gmx.at
Fri Nov 4 11:30:13 UTC 2011 

>Number:         162289
>Category:       ports
>Synopsis:       [maintainer update] Update of cakephp13 to version 1.3.13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 04 11:30:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Theis
>Release:        8.2-RELEASE
>Organization:
>Environment:
>Description:
Update of cakephp13 to version 1.3.13
Change installation of user config files: In a post-patch step they are renamed to .default so the installation does not overwrite them. In a post-install step they are installed with the original name if that file does not exist.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/cakephp13/Makefile,v
retrieving revision 1.30
diff -U3 -r1.30 Makefile
--- Makefile	27 Sep 2011 18:37:39 -0000	1.30
+++ Makefile	30 Oct 2011 06:59:32 -0000
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cakephp
-PORTVERSION=	1.3.12
-PORTREVISION=	1
+PORTVERSION=	1.3.13
+PORTREVISION=
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/ \
 		LOCAL/glarkin
@@ -16,12 +16,12 @@
 MAINTAINER=	theis at gmx.at
 COMMENT=	A framework for developing PHP web applications
 
-GITVERSION=	0-g96a8d97
-FETCH_ARGS=	-pRr
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-8236c7e
-
 LICENSE=	MIT
 
+GITVERSION=	0-g924fb6f
+FETCH_ARGS=	-pRr
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-60df687
+
 PORTDOCS=	README
 
 SLAVE_PORT_MODULES=	rewrite
@@ -40,7 +40,6 @@
 		app/config/bootstrap.php \
 		app/config/core.php \
 		app/config/database.php \
-		app/config/inflections.php \
 		app/config/routes.php
 CAKE_CONSOLE=	cake/console/cake
 
@@ -145,6 +144,13 @@
 	@${RM} -f ${WRKSRC}/cake/console/cake.orig \
 		${WRKSRC}/app/config/core.php.orig
 
+# Rename config files so we don't overwrite those in an existing installation
+	@for i in ${CAKE_CONF_FILES}; do \
+		if [ -f ${WRKSRC}/$$i ]; then \
+			${MV} ${WRKSRC}/$$i ${WRKSRC}/$$i.default; \
+		fi \
+	done
+
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		".htaccess app cake index.php vendors" ${WWWDIR}
@@ -161,13 +167,6 @@
 	@${FIND} ${WWWDIR} -type f -name empty -size 0 -exec ${RM} {} \;
 	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR:S|^${PREFIX}/|%D/|} -type f -name empty -size 0 -exec ${RM} {} \;' >> ${TMPPLIST}
 
-	@for i in ${CAKE_CONF_FILES}; do \
-		if [ -f ${WRKSRC}/$$i.default -a ! -f ${WRKSRC}/$$i ]; then \
-			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
-		elif [ -f ${WRKSRC}/$$i -a ! -f ${WRKSRC}/$$i.default ]; then \
-			${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.default; \
-		fi \
-	done
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
 		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
@@ -183,6 +182,11 @@
 	@${ECHO_CMD} '@exec ${CHMOD} 755 ${WWWDIR}/${CAKE_CONSOLE}' >> ${TMPPLIST}
 
 post-install:
+	@for i in ${CAKE_CONF_FILES}; do \
+		if [ ! -f ${WWWDIR}/$$i -a -f ${WRKSRC}/$$i.default ]; then \
+			${INSTALL_DATA} ${WRKSRC}/$$i.default ${WWWDIR}/$$i; \
+		fi \
+	done
 .if defined(WITH_AP)
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/cakephp.conf; \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/cakephp13/distinfo,v
retrieving revision 1.20
diff -U3 -r1.20 distinfo
--- distinfo	27 Sep 2011 14:00:52 -0000	1.20
+++ distinfo	30 Oct 2011 06:59:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (cakephp-cakephp-1.3.12-0-g96a8d97.tar.gz) = 6bc9462bfb7df09852b7a129727d3f9a9b2197f1e92bee57223e5d6ba0ef0d48
-SIZE (cakephp-cakephp-1.3.12-0-g96a8d97.tar.gz) = 985790
+SHA256 (cakephp-cakephp-1.3.13-0-g924fb6f.tar.gz) = 60cdc497dd65602f98efcebdc1f2e4b79639426da9fb5035b855ad2517b7219b
+SIZE (cakephp-cakephp-1.3.13-0-g924fb6f.tar.gz) = 986757
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/cakephp13/pkg-plist,v
retrieving revision 1.15
diff -U3 -r1.15 pkg-plist
--- pkg-plist	27 Sep 2011 14:00:52 -0000	1.15
+++ pkg-plist	30 Oct 2011 06:59:50 -0000
@@ -2,19 +2,19 @@
 %%HTACCESS%%%%WWWDIR%%/app/.htaccess
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/acl.ini.php.default %D/%%WWWDIR%%/app/config/acl.ini.php; then rm -f %D/%%WWWDIR%%/app/config/acl.ini.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/acl.ini.php has not been removed"; fi
 %%WWWDIR%%/app/config/acl.ini.php.default
- at exec if [ ! -f %D/%%WWWDIR%%/app/config/acl.ini.php.default ]; then cp -p %B/acl.ini.php %B/acl.ini.php.default; fi
+ at exec if [ ! -f %B/acl.ini.php ]; then cp -p %B/acl.ini.php.default %B/acl.ini.php; else %%ECHO_MSG%% "===> Customized %B/acl.ini.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/bootstrap.php.default %D/%%WWWDIR%%/app/config/bootstrap.php; then rm -f %D/%%WWWDIR%%/app/config/bootstrap.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/bootstrap.php has not been removed"; fi
 %%WWWDIR%%/app/config/bootstrap.php.default
- at exec if [ ! -f %D/%%WWWDIR%%/app/config/bootstrap.php.default ]; then cp -p %B/bootstrap.php %B/bootstrap.php.default; fi
+ at exec if [ ! -f %B/bootstrap.php ]; then cp -p %B/bootstrap.php.default %B/bootstrap.php; else %%ECHO_MSG%% "===> Customized %B/bootstrap.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/core.php.default %D/%%WWWDIR%%/app/config/core.php; then rm -f %D/%%WWWDIR%%/app/config/core.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/core.php has not been removed"; fi
 %%WWWDIR%%/app/config/core.php.default
- at exec if [ ! -f %D/%%WWWDIR%%/app/config/core.php.default ]; then cp -p %B/core.php %B/core.php.default; fi
+ at exec if [ ! -f %B/core.php ]; then cp -p %B/core.php.default %B/core.php; else %%ECHO_MSG%% "===> Customized %B/core.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/database.php.default %D/%%WWWDIR%%/app/config/database.php; then rm -f %D/%%WWWDIR%%/app/config/database.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/database.php has not been removed"; fi
 %%WWWDIR%%/app/config/database.php.default
- at exec if [ ! -f %D/%%WWWDIR%%/app/config/database.php ]; then cp -p %D/%F %B/database.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/database.php has not been overwritten"; fi
+ at exec if [ ! -f %B/database.php ]; then cp -p %B/database.php.default %B/database.php; else %%ECHO_MSG%% "===> Customized %B/database.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/app/config/routes.php.default %D/%%WWWDIR%%/app/config/routes.php; then rm -f %D/%%WWWDIR%%/app/config/routes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/app/config/routes.php has not been removed"; fi
 %%WWWDIR%%/app/config/routes.php.default
- at exec if [ ! -f %D/%%WWWDIR%%/app/config/routes.php.default ]; then cp -p %B/routes.php %B/routes.php.default; fi
+ at exec if [ ! -f %B/routes.php ]; then cp -p %B/routes.php.default %B/routes.php; else %%ECHO_MSG%% "===> Customized %B/routes.php has not been overwritten"; fi
 %%WWWDIR%%/app/config/schema/db_acl.php
 %%WWWDIR%%/app/config/schema/i18n.php
 %%WWWDIR%%/app/config/schema/sessions.php
@@ -653,6 +653,7 @@
 %%WWWDIR%%/cake/tests/test_app/views/elements/nocache/sub2.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/session_helper.ctp
 %%WWWDIR%%/cake/tests/test_app/views/elements/test_element.ctp
+%%WWWDIR%%/cake/tests/test_app/views/elements/test_element.xml
 %%WWWDIR%%/cake/tests/test_app/views/elements/type_check.ctp
 %%WWWDIR%%/cake/tests/test_app/views/helpers/banana.php
 %%WWWDIR%%/cake/tests/test_app/views/layouts/ajax.ctp
Index: files/patch-cake__console__cake
===================================================================
RCS file: /home/ncvs/ports/www/cakephp13/files/patch-cake__console__cake,v
retrieving revision 1.4
diff -U3 -r1.4 patch-cake__console__cake
--- files/patch-cake__console__cake	19 Sep 2011 19:00:25 -0000	1.4
+++ files/patch-cake__console__cake	30 Oct 2011 06:59:50 -0000
@@ -1,18 +1,12 @@
---- ./cake/console/cake.orig	2011-07-26 13:46:14.000000000 -0400
-+++ ./cake/console/cake	2011-09-19 14:44:33.000000000 -0400
+--- ./cake/console/cake.orig	2011-10-29 11:06:55.000000000 +0200
++++ ./cake/console/cake	2011-10-29 11:08:00.000000000 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  ################################################################################
  #
  # Bake is a shell script for running CakePHP bake script
-@@ -18,9 +18,9 @@
- # @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
- #
- ################################################################################
--LIB=${0/%cake/}
-+LIB=${0%cake}
- APP=`pwd`
+@@ -31,4 +31,4 @@
  
  exec php -q ${LIB}cake.php -working "${APP}" "$@"
  


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list