Attachment 99698 Details for Bug 138848 – file.diff

[patch] file.diff

file.diff (text/plain), 11.85 KB, created by Bo-Yi Wu on 2009-09-15 17:00:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bo-Yi Wu

Created: 2009-09-15 17:00:15 UTC

Size: 11.85 KB

patch

obsolete

>diff -ruN codeigniter.orig/Makefile codeigniter/Makefile
>--- codeigniter.orig/Makefile	2009-09-15 23:16:12.000000000 +0800
>+++ codeigniter/Makefile	2009-09-15 19:07:45.000000000 +0800
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	codeigniter
>-PORTVERSION=	1.7.1
>+PORTVERSION=	1.7.2
> CATEGORIES=	www
> MASTER_SITES=	http://codeigniter.com/download_files/ \
> 		LOCAL/glarkin
>diff -ruN codeigniter.orig/distinfo codeigniter/distinfo
>--- codeigniter.orig/distinfo	2009-09-15 23:16:12.000000000 +0800
>+++ codeigniter/distinfo	2009-09-15 19:22:41.000000000 +0800
>@@ -1,3 +1,3 @@
>-MD5 (CodeIgniter_1.7.1.zip) = deca9709cf21b26dc0e4ec040b37e866
>-SHA256 (CodeIgniter_1.7.1.zip) = 7c2b34f3954a16f79ac7c3e2f8a5f427951d16510a198742287242446619cae2
>-SIZE (CodeIgniter_1.7.1.zip) = 914577
>+MD5 (CodeIgniter_1.7.2.zip) = 3ce815c3ee66933d926bb51428371a38
>+SHA256 (CodeIgniter_1.7.2.zip) = bb870c1cc7297634fe44b81c5c40023c5175a3c2365da9b18a371274c09b1512
>+SIZE (CodeIgniter_1.7.2.zip) = 2227891
>diff -ruN codeigniter.orig/pkg-plist codeigniter/pkg-plist
>--- codeigniter.orig/pkg-plist	2009-09-15 23:16:12.000000000 +0800
>+++ codeigniter/pkg-plist	2009-09-15 22:58:39.000000000 +0800
>@@ -69,6 +69,10 @@
> %%PORTDOCS%%%%DOCSDIR%%/images/ci_logo.jpg
> %%PORTDOCS%%%%DOCSDIR%%/images/ci_logo_flame.jpg
> %%PORTDOCS%%%%DOCSDIR%%/images/ci_quick_ref.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_helper_reference.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_helper_reference.png
>+%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_library_reference.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/images/codeigniter_1.7.1_library_reference.png
> %%PORTDOCS%%%%DOCSDIR%%/images/file.gif
> %%PORTDOCS%%%%DOCSDIR%%/images/folder.gif
> %%PORTDOCS%%%%DOCSDIR%%/images/nav_bg_darker.jpg
>@@ -97,10 +101,12 @@
> %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_163.html
> %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_170.html
> %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_171.html
>+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_172.html
> %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_b11.html
> %%PORTDOCS%%%%DOCSDIR%%/installation/upgrading.html
> %%PORTDOCS%%%%DOCSDIR%%/libraries/benchmark.html
> %%PORTDOCS%%%%DOCSDIR%%/libraries/calendar.html
>+%%PORTDOCS%%%%DOCSDIR%%/libraries/cart.html
> %%PORTDOCS%%%%DOCSDIR%%/libraries/config.html
> %%PORTDOCS%%%%DOCSDIR%%/libraries/email.html
> %%PORTDOCS%%%%DOCSDIR%%/libraries/encryption.html
>@@ -133,6 +139,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/nav/user_guide_menu.js
> %%PORTDOCS%%%%DOCSDIR%%/overview/appflow.html
> %%PORTDOCS%%%%DOCSDIR%%/overview/at_a_glance.html
>+%%PORTDOCS%%%%DOCSDIR%%/overview/cheatsheets.html
> %%PORTDOCS%%%%DOCSDIR%%/overview/features.html
> %%PORTDOCS%%%%DOCSDIR%%/overview/getting_started.html
> %%PORTDOCS%%%%DOCSDIR%%/overview/goals.html
>@@ -140,37 +147,27 @@
> %%PORTDOCS%%%%DOCSDIR%%/overview/mvc.html
> %%PORTDOCS%%%%DOCSDIR%%/toc.html
> %%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
> %%WWWDIR%%/index.php.sample
>-@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; 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; 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; 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; 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; 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; 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; 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; 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; else %%ECHO_MSG%% "===> Customized %D/%%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php has not been overwritten"; fi
>+%%WWWDIR%%/system/application/config/autoload.php
>+%%WWWDIR%%/system/application/config/autoload.php.sample
>+%%WWWDIR%%/system/application/config/config.php
>+%%WWWDIR%%/system/application/config/config.php.sample
>+%%WWWDIR%%/system/application/config/constants.php
>+%%WWWDIR%%/system/application/config/constants.php.sample
>+%%WWWDIR%%/system/application/config/database.php
>+%%WWWDIR%%/system/application/config/database.php.sample
>+%%WWWDIR%%/system/application/config/hooks.php
>+%%WWWDIR%%/system/application/config/hooks.php.sample
>+%%WWWDIR%%/system/application/config/index.html
>+%%WWWDIR%%/system/application/config/mimes.php
>+%%WWWDIR%%/system/application/config/mimes.php.sample
>+%%WWWDIR%%/system/application/config/routes.php
>+%%WWWDIR%%/system/application/config/routes.php.sample
>+%%WWWDIR%%/system/application/config/smileys.php
>+%%WWWDIR%%/system/application/config/smileys.php.sample
>+%%WWWDIR%%/system/application/config/user_agents.php
>+%%WWWDIR%%/system/application/config/user_agents.php.sample
> %%WWWDIR%%/system/application/controllers/index.html
> %%WWWDIR%%/system/application/controllers/welcome.php
> %%WWWDIR%%/system/application/errors/error_404.php
>@@ -278,6 +275,7 @@
> %%WWWDIR%%/system/language/index.html
> %%WWWDIR%%/system/libraries/Benchmark.php
> %%WWWDIR%%/system/libraries/Calendar.php
>+%%WWWDIR%%/system/libraries/Cart.php
> %%WWWDIR%%/system/libraries/Config.php
> %%WWWDIR%%/system/libraries/Controller.php
> %%WWWDIR%%/system/libraries/Email.php
>@@ -287,7 +285,6 @@
> %%WWWDIR%%/system/libraries/Ftp.php
> %%WWWDIR%%/system/libraries/Hooks.php
> %%WWWDIR%%/system/libraries/Image_lib.php
>-%%WWWDIR%%/system/libraries/index.html
> %%WWWDIR%%/system/libraries/Input.php
> %%WWWDIR%%/system/libraries/Language.php
> %%WWWDIR%%/system/libraries/Loader.php
>@@ -303,23 +300,24 @@
> %%WWWDIR%%/system/libraries/Table.php
> %%WWWDIR%%/system/libraries/Trackback.php
> %%WWWDIR%%/system/libraries/Typography.php
>+%%WWWDIR%%/system/libraries/URI.php
> %%WWWDIR%%/system/libraries/Unit_test.php
> %%WWWDIR%%/system/libraries/Upload.php
>-%%WWWDIR%%/system/libraries/URI.php
> %%WWWDIR%%/system/libraries/User_agent.php
> %%WWWDIR%%/system/libraries/Validation.php
> %%WWWDIR%%/system/libraries/Xmlrpc.php
> %%WWWDIR%%/system/libraries/Xmlrpcs.php
> %%WWWDIR%%/system/libraries/Zip.php
>+%%WWWDIR%%/system/libraries/index.html
> %%WWWDIR%%/system/logs/index.html
> %%WWWDIR%%/system/plugins/captcha_pi.php
> %%WWWDIR%%/system/plugins/index.html
> %%WWWDIR%%/system/plugins/js_calendar_pi.php
>+%%WWWDIR%%/system/scaffolding/Scaffolding.php
> %%WWWDIR%%/system/scaffolding/images/background.jpg
> %%WWWDIR%%/system/scaffolding/images/index.html
> %%WWWDIR%%/system/scaffolding/images/logo.jpg
> %%WWWDIR%%/system/scaffolding/index.html
>-%%WWWDIR%%/system/scaffolding/Scaffolding.php
> %%WWWDIR%%/system/scaffolding/views/add.php
> %%WWWDIR%%/system/scaffolding/views/delete.php
> %%WWWDIR%%/system/scaffolding/views/edit.php
>@@ -359,17 +357,17 @@
> @dirrm %%WWWDIR%%/system/application/helpers
> @dirrm %%WWWDIR%%/system/application/errors
> @dirrm %%WWWDIR%%/system/application/controllers
>-@dirrmtry %%WWWDIR%%/system/application/config
>-@dirrmtry %%WWWDIR%%/system/application
>-@dirrmtry %%WWWDIR%%/system
>-@dirrmtry %%WWWDIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/overview
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/nav
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/libraries
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/installation
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/helpers
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/general
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc_style
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/database
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrm %%WWWDIR%%/system/application/config
>+@dirrm %%WWWDIR%%/system/application
>+@dirrm %%WWWDIR%%/system
>+@dirrm %%WWWDIR%%
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/overview
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/nav
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/libraries
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/installation
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/helpers
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/general
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/doc_style
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%/database
>+@dirrm %%PORTDOCS%%%%DOCSDIR%%

Actions: View | Diff

Attachments on bug 138848: 99698