ports/125217: [MAINTAINER] www/codeigniter: update to 1.6.3

Greg Larkin glarkin at sourcehosting.net
Thu Jul 3 13:30:02 UTC 2008 

>Number:         125217
>Category:       ports
>Synopsis:       [MAINTAINER] www/codeigniter: update to 1.6.3
>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:   Thu Jul 03 13:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Greg Larkin
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
SourceHosting.net, LLC
>Environment:
System: FreeBSD fbsd70.entropy.prv 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008
>Description:
- Update to 1.6.3
- Added informational messages about user-configurable files that
  may need merging after a port upgrade

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- codeigniter-1.6.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/codeigniter.orig/Makefile /usr/ports/www/codeigniter/Makefile
--- /usr/ports/www/codeigniter.orig/Makefile	2008-06-05 11:51:11.000000000 -0400
+++ /usr/ports/www/codeigniter/Makefile	2008-06-30 15:51:28.203866710 -0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codeigniter
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 CATEGORIES=	www
 MASTER_SITES=	http://codeigniter.com/download_files/
 DISTNAME=	CodeIgniter_${PORTVERSION}
@@ -172,6 +172,11 @@
 	@for i in ${CI_CONF_FILES}; do \
 		if [ ! -f ${WWWDIR}/$$i ]; then \
 			${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
+		else \
+			${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \
+			if [ ! -z "$UPGRADE_TOOL" ]; then \
+				${ECHO_MSG} "===> WARNING: You may have to manually merge changes to ${WWWDIR}/$$i.sample into ${WWWDIR}/$$i"; \
+			fi; \
 		fi; \
 	done
 .if defined(WITH_APACHE)
diff -ruN --exclude=CVS /usr/ports/www/codeigniter.orig/distinfo /usr/ports/www/codeigniter/distinfo
--- /usr/ports/www/codeigniter.orig/distinfo	2008-06-05 11:51:11.000000000 -0400
+++ /usr/ports/www/codeigniter/distinfo	2008-06-30 09:42:02.215881610 -0400
@@ -1,3 +1,3 @@
-MD5 (CodeIgniter_1.6.2.zip) = 0922830f96dfd40874b39ad018a49206
-SHA256 (CodeIgniter_1.6.2.zip) = ebe28a60400cae87172e45c013bb5f897547a28cbfa4d7afe148facced1d953e
-SIZE (CodeIgniter_1.6.2.zip) = 861202
+MD5 (CodeIgniter_1.6.3.zip) = 5ffab52b39b235ed6bd08ee5dd64d2f6
+SHA256 (CodeIgniter_1.6.3.zip) = 6bb61037e5a8fc51d27009eb89a85205247438a864eb8237f1c0791dd1d02791
+SIZE (CodeIgniter_1.6.3.zip) = 872665
diff -ruN --exclude=CVS /usr/ports/www/codeigniter.orig/pkg-plist /usr/ports/www/codeigniter/pkg-plist
--- /usr/ports/www/codeigniter.orig/pkg-plist	2008-06-05 11:51:11.000000000 -0400
+++ /usr/ports/www/codeigniter/pkg-plist	2008-06-30 15:24:37.616338630 -0400
@@ -54,6 +54,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/helpers/form_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/html_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/inflector_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/language_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/number_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/path_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/security_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/smiley_helper.html
@@ -92,6 +94,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_160.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_161.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_162.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_163.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_b11.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/libraries/benchmark.html
@@ -134,35 +137,35 @@
 %%PORTDOCS%%%%DOCSDIR%%/userguide.css
 @unexec if cmp -s %D/%%WWWDIR%%/index.php.sample %D/%%WWWDIR%%/index.php; then rm -f %D/%%WWWDIR%%/index.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/index.php has not been removed"; fi
 %%WWWDIR%%/index.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/index.php ]; then cp -p %D/%F %B/index.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/index.php ]; then cp -p %D/%F %B/index.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/index.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php ]; then cp -p %D/%F %B/autoload.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php ]; then cp -p %D/%F %B/autoload.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/config.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php ]; then cp -p %D/%F %B/config.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php ]; then cp -p %D/%F %B/config.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/constants.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php ]; then cp -p %D/%F %B/constants.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php ]; then cp -p %D/%F %B/constants.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/database.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php ]; then cp -p %D/%F %B/database.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php ]; then cp -p %D/%F %B/database.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php ]; then cp -p %D/%F %B/hooks.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php ]; then cp -p %D/%F %B/hooks.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php has not been overwritten"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/index.html
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php ]; then cp -p %D/%F %B/mimes.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php ]; then cp -p %D/%F %B/mimes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/routes.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php ]; then cp -p %D/%F %B/routes.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php ]; then cp -p %D/%F %B/routes.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php ]; then cp -p %D/%F %B/smileys.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php ]; then cp -p %D/%F %B/smileys.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php has not been overwritten"; fi
 @unexec if cmp -s %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php.sample %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php; then rm -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php has not been removed"; fi
 %%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php.sample
- at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php ]; then cp -p %D/%F %B/user_agents.php; fi
+ at exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php ]; then cp -p %D/%F %B/user_agents.php; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php has not been overwritten"; fi
 %%WWWDIR%%/system/application/controllers/index.html
 %%WWWDIR%%/system/application/controllers/welcome.php
 %%WWWDIR%%/system/application/errors/error_404.php
@@ -243,6 +246,8 @@
 %%WWWDIR%%/system/helpers/html_helper.php
 %%WWWDIR%%/system/helpers/index.html
 %%WWWDIR%%/system/helpers/inflector_helper.php
+%%WWWDIR%%/system/helpers/language_helper.php
+%%WWWDIR%%/system/helpers/number_helper.php
 %%WWWDIR%%/system/helpers/path_helper.php
 %%WWWDIR%%/system/helpers/security_helper.php
 %%WWWDIR%%/system/helpers/smiley_helper.php
@@ -258,6 +263,7 @@
 %%WWWDIR%%/system/language/english/ftp_lang.php
 %%WWWDIR%%/system/language/english/imglib_lang.php
 %%WWWDIR%%/system/language/english/index.html
+%%WWWDIR%%/system/language/english/number_lang.php
 %%WWWDIR%%/system/language/english/profiler_lang.php
 %%WWWDIR%%/system/language/english/scaffolding_lang.php
 %%WWWDIR%%/system/language/english/unit_test_lang.php
--- codeigniter-1.6.3.patch ends here ---

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

More information about the freebsd-ports-bugs mailing list