From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 3 13:30:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 45FA01065677 for ; Thu, 3 Jul 2008 13:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 11FDE8FC2D for ; Thu, 3 Jul 2008 13:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m63DU1Fo015653 for ; Thu, 3 Jul 2008 13:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m63DU1Bk015652; Thu, 3 Jul 2008 13:30:01 GMT (envelope-from gnats) Resent-Date: Thu, 3 Jul 2008 13:30:01 GMT Resent-Message-Id: <200807031330.m63DU1Bk015652@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Greg Larkin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29B9A1065673 for ; Thu, 3 Jul 2008 13:20:02 +0000 (UTC) (envelope-from glarkin@sourcehosting.net) Received: from mail1.sourcehosting.net (113901-app1.sourcehosting.net [72.32.213.11]) by mx1.freebsd.org (Postfix) with ESMTP id EE2B58FC21 for ; Thu, 3 Jul 2008 13:20:01 +0000 (UTC) (envelope-from glarkin@sourcehosting.net) Received: from 68-189-244-97.dhcp.oxfr.ma.charter.com ([68.189.244.97] helo=Gregory-Larkins-Computer.local) by mail1.sourcehosting.net with esmtp (Exim 4.69 (FreeBSD)) (envelope-from ) id 1KEOj9-000MPj-5D; Thu, 03 Jul 2008 09:20:01 -0400 Received: from fbsd70.entropy.prv (fbsd70.entropy.prv [192.168.1.14]) by Gregory-Larkins-Computer.local (Postfix) with ESMTP id EA01D215D98C; Thu, 3 Jul 2008 09:19:57 -0400 (EDT) Received: from fbsd70.entropy.prv (localhost [127.0.0.1]) by fbsd70.entropy.prv (8.14.2/8.14.2) with ESMTP id m63DJvv0019027; Thu, 3 Jul 2008 09:19:57 -0400 (EDT) (envelope-from glarkin@fbsd70.entropy.prv) Received: (from root@localhost) by fbsd70.entropy.prv (8.14.2/8.14.2/Submit) id m63DJvWi019026; Thu, 3 Jul 2008 09:19:57 -0400 (EDT) (envelope-from glarkin) Message-Id: <200807031319.m63DJvWi019026@fbsd70.entropy.prv> Date: Thu, 3 Jul 2008 09:19:57 -0400 (EDT) From: Greg Larkin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: glarkin@sourcehosting.net Subject: ports/125217: [MAINTAINER] www/codeigniter: update to 1.6.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2008 13:30:02 -0000 >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 -@exec if [ ! -f %D/%%WWWDIR%%/index.php ]; then cp -p %D/%F %B/index.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php ]; then cp -p %D/%F %B/autoload.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/config.php ]; then cp -p %D/%F %B/config.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/constants.php ]; then cp -p %D/%F %B/constants.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/database.php ]; then cp -p %D/%F %B/database.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php ]; then cp -p %D/%F %B/hooks.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php ]; then cp -p %D/%F %B/mimes.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/routes.php ]; then cp -p %D/%F %B/routes.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php ]; then cp -p %D/%F %B/smileys.php; fi +@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 -@exec if [ ! -f %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php ]; then cp -p %D/%F %B/user_agents.php; fi +@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: