- Update to 1.6.1

- Found all of the CI files that could be modified by the user and
  install .sample versions of each
- Add an informational message when a user-editable config file is
  modified and the port is deinstalled (e.g. the file is preserved)
- Display different pkg-message depending on WITH_APACHE knob

PR:		ports/121358
Submitted by:	Greg Larkin <glarkin@sourcehosting.net> (maintainer)

21 files changed, 525 insertions, 144 deletions

diff --git a/www/codeigniter-devel/Makefile b/www/codeigniter-devel/Makefile
index 6da436fb682a..2450d4cb04d7 100644
--- a/www/codeigniter-devel/Makefile
+++ b/www/codeigniter-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codeigniter
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.1
 CATEGORIES=	www
 MASTER_SITES=	http://codeigniter.com/download_files/
 DISTNAME=	CodeIgniter_${PORTVERSION}
@@ -15,16 +15,47 @@ MAINTAINER=	glarkin@sourcehosting.net
 COMMENT=	A framework for developing PHP web applications
 
 USE_ZIP=	yes
-
-USE_APACHE=	2.0+
+USE_DOS2UNIX=	yes
 
 NO_BUILD=	yes
 USE_PHP=	session pcre
 WANT_PHP_WEB=	yes
 
-SUB_FILES=	pkg-message
-
-OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
+CI_SYS_DIR=	system
+CI_CONF_DIR=	${CI_SYS_DIR}/application/config
+
+# These are all user-configurable files that we'll install
+# a .sample copy for each.
+CI_CONF_FILES=	index.php ${CI_CONF_DIR}/autoload.php \
+		${CI_CONF_DIR}/config.php ${CI_CONF_DIR}/database.php \
+		${CI_CONF_DIR}/hooks.php ${CI_CONF_DIR}/mimes.php \
+		${CI_CONF_DIR}/routes.php ${CI_CONF_DIR}/smileys.php \
+		${CI_CONF_DIR}/user_agents.php
+
+# This is the rest of the CodeIgniter installation that doesn't change
+STD_BITS=	${CI_CONF_DIR}/index.html \
+		${CI_SYS_DIR}/application/controllers \
+		${CI_SYS_DIR}/application/errors \
+		${CI_SYS_DIR}/application/helpers \
+		${CI_SYS_DIR}/application/hooks \
+		${CI_SYS_DIR}/application/index.html \
+		${CI_SYS_DIR}/application/language \
+		${CI_SYS_DIR}/application/libraries \
+		${CI_SYS_DIR}/application/models \
+		${CI_SYS_DIR}/application/views \
+		${CI_SYS_DIR}/cache \
+		${CI_SYS_DIR}/codeigniter \
+		${CI_SYS_DIR}/database \
+		${CI_SYS_DIR}/fonts \
+		${CI_SYS_DIR}/helpers \
+		${CI_SYS_DIR}/language \
+		${CI_SYS_DIR}/libraries \
+		${CI_SYS_DIR}/logs \
+		${CI_SYS_DIR}/plugins \
+		${CI_SYS_DIR}/scaffolding
+
+OPTIONS=	APACHE "Configure for Apache-2.x" off \
+		PROD "Install for production server (see: make confighelp)" Off \
 		MSSQL "Install MSSQL support for PHP" Off \
 		MYSQL "Install MySQL support for PHP" Off \
 		MYSQLI "Install MySQLi support for PHP" Off \
@@ -33,12 +64,23 @@ OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
 		PGSQL "Install PostgreSQL support for PHP" Off \
 		SQLITE "Install SQLite support for PHP" Off
 
-PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_APACHE)
+USE_APACHE=	2.0+
 
+PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
 
-.include <bsd.port.pre.mk>
+PKGMESSAGE=	pkg-message-apache
+SUB_FILES=	pkg-message-apache
+.else
+PLIST_SUB+=	NOAPACHE="@comment "
+PKGMESSAGE=	pkg-message-noapache
+SUB_FILES=	pkg-message-noapache
+.endif
+PLIST_SUB+=	ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR}
 
 WITH_PHP_CGI?=	/cgi-bin/php
 
@@ -111,14 +153,27 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} "index.php system" ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
+	@for i in ${CI_CONF_FILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \
+	done
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
+		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
+		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
 	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
+		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
 post-install:
+	@for i in ${CI_CONF_FILES}; do \
+		if [ ! -f ${WWWDIR}/$$i ]; then \
+			${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
+		fi; \
+	done
+.if defined(WITH_APACHE)
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
 	else \
@@ -129,6 +184,7 @@ post-install:
 	  ${ECHO_MSG} "" ; \
 	  ${FALSE} ; \
 	fi
+.endif
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}/user_guide/ && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
diff --git a/www/codeigniter-devel/distinfo b/www/codeigniter-devel/distinfo
index cc10135bdb8f..845fd4e92fed 100644
--- a/www/codeigniter-devel/distinfo
+++ b/www/codeigniter-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (CodeIgniter_1.5.4.zip) = 0d6cc66b01d5ddecde483b3d5f51e4f8
-SHA256 (CodeIgniter_1.5.4.zip) = cfa6dde5779bac4d574102c0612e6857d8eee8c14b3e11cc753804010293bc36
-SIZE (CodeIgniter_1.5.4.zip) = 774098
+MD5 (CodeIgniter_1.6.1.zip) = cc3f0b566e3654d351fa067aeee9bced
+SHA256 (CodeIgniter_1.6.1.zip) = d4d8b73c787ed4fa5095ef2d3f6a2f5c710d3ed14974059db4ab8bf0f9f60ec5
+SIZE (CodeIgniter_1.6.1.zip) = 822433
diff --git a/www/codeigniter-devel/files/pkg-message-apache.in b/www/codeigniter-devel/files/pkg-message-apache.in
new file mode 100644
index 000000000000..ba70e0fca94e
--- /dev/null
+++ b/www/codeigniter-devel/files/pkg-message-apache.in
@@ -0,0 +1,23 @@
+
+*********************************************************************
+You have just installed the CodeIgniter web application framework.
+
+Note that you should restart your Apache web server to ensure that
+the CodeIgniter configuration file is loaded.
+
+Optional post-installation instructions include:
+
+- Open the %%WWWDIR%%/system/application/config/config.php
+  file with a text editor and set your base URL.
+
+- If you intend to use a database, open the
+  %%WWWDIR%%/system/application/config/database.php
+  file with a text editor and set your database settings.
+
+- Other user-configurable files include:
+    %%WWWDIR%%/index.php
+    Any file located in %%WWWDIR%%/system/application/config 
+
+- If you are upgrading from a prior release, please visit:
+  http://codeigniter.com/user_guide/installation/upgrading.html
+  for additional post-installation instructions.
diff --git a/www/codeigniter-devel/files/pkg-message-noapache.in b/www/codeigniter-devel/files/pkg-message-noapache.in
new file mode 100644
index 000000000000..fa06056f1d74
--- /dev/null
+++ b/www/codeigniter-devel/files/pkg-message-noapache.in
@@ -0,0 +1,20 @@
+
+*********************************************************************
+You have just installed the CodeIgniter web application framework.
+
+Optional post-installation instructions include:
+
+- Open the %%WWWDIR%%/system/application/config/config.php
+  file with a text editor and set your base URL.
+
+- If you intend to use a database, open the
+  %%WWWDIR%%/system/application/config/database.php
+  file with a text editor and set your database settings.
+
+- Other user-configurable files include:
+    %%WWWDIR%%/index.php
+    Any file located in %%WWWDIR%%/system/application/config 
+
+- If you are upgrading from a prior release, please visit:
+  http://codeigniter.com/user_guide/installation/upgrading.html
+  for additional post-installation instructions.
diff --git a/www/codeigniter-devel/files/pkg-message.in b/www/codeigniter-devel/files/pkg-message.in
index bb521059300d..e69de29bb2d1 100644
--- a/www/codeigniter-devel/files/pkg-message.in
+++ b/www/codeigniter-devel/files/pkg-message.in
@@ -1,15 +0,0 @@
-
-*********************************************************************
-You have just installed the CodeIgniter web application framework.
-
-Note that you should restart your Apache web server to ensure that
-the CodeIgniter configuration file is loaded.
-
-Optional post-installation instructions include:
-
-- Open the %%WWWDIR%%/system/application/config/config.php
-  file with a text editor and set your base URL.
-
-- If you intend to use a database, open the
-  %%WWWDIR%%/system/application/config/database.php
-  file with a text editor and set your database settings.
diff --git a/www/codeigniter-devel/pkg-descr b/www/codeigniter-devel/pkg-descr
index d01010f81a0f..47d0a90b5b84 100644
--- a/www/codeigniter-devel/pkg-descr
+++ b/www/codeigniter-devel/pkg-descr
@@ -2,6 +2,6 @@ CodeIgniter is a powerful PHP framework with a very small footprint,
 built for PHP coders who need a simple and elegant toolkit to create
 full-featured web applications.
 
-WWW: http://www.codeigniter.com/
+WWW: http://codeigniter.com/
 - Greg Larkin
 glarkin@sourcehosting.net
diff --git a/www/codeigniter-devel/pkg-plist b/www/codeigniter-devel/pkg-plist
index aafc0fe024a0..3ae7558c0544 100644
--- a/www/codeigniter-devel/pkg-plist
+++ b/www/codeigniter-devel/pkg-plist
@@ -1,4 +1,4 @@
-%%CONFDIR%%/codeigniter.conf
+%%NOAPACHE%%%%CONFDIR%%/codeigniter.conf
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/database/active_record.html
 %%PORTDOCS%%%%DOCSDIR%%/database/caching.html
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/database/connecting.html
 %%PORTDOCS%%%%DOCSDIR%%/database/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/database/fields.html
+%%PORTDOCS%%%%DOCSDIR%%/database/forge.html
 %%PORTDOCS%%%%DOCSDIR%%/database/helpers.html
 %%PORTDOCS%%%%DOCSDIR%%/database/index.html
 %%PORTDOCS%%%%DOCSDIR%%/database/queries.html
@@ -14,6 +15,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/database/table_data.html
 %%PORTDOCS%%%%DOCSDIR%%/database/transactions.html
 %%PORTDOCS%%%%DOCSDIR%%/database/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_style/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_style/template.html
 %%PORTDOCS%%%%DOCSDIR%%/general/alternative_php.html
 %%PORTDOCS%%%%DOCSDIR%%/general/ancillary_classes.html
 %%PORTDOCS%%%%DOCSDIR%%/general/autoloader.html
@@ -43,11 +46,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/helpers/date_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/directory_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/download_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/email_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/file_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/form_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/html_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/index.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/inflector_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/path_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/security_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/smiley_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/string_helper.html
@@ -82,6 +87,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_152.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_153.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_154.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_160.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_161.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_b11.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/libraries/benchmark.html
@@ -113,6 +120,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/nav/moo.fx.pack.js
 %%PORTDOCS%%%%DOCSDIR%%/nav/nav.js
 %%PORTDOCS%%%%DOCSDIR%%/nav/prototype.lite.js
+%%PORTDOCS%%%%DOCSDIR%%/nav/user_guide_menu.js
 %%PORTDOCS%%%%DOCSDIR%%/overview/appflow.html
 %%PORTDOCS%%%%DOCSDIR%%/overview/at_a_glance.html
 %%PORTDOCS%%%%DOCSDIR%%/overview/features.html
@@ -121,16 +129,34 @@
 %%PORTDOCS%%%%DOCSDIR%%/overview/mvc.html
 %%PORTDOCS%%%%DOCSDIR%%/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/userguide.css
-%%WWWDIR%%/index.php
-%%WWWDIR%%/system/application/config/autoload.php
-%%WWWDIR%%/system/application/config/config.php
-%%WWWDIR%%/system/application/config/database.php
-%%WWWDIR%%/system/application/config/hooks.php
-%%WWWDIR%%/system/application/config/index.html
-%%WWWDIR%%/system/application/config/mimes.php
-%%WWWDIR%%/system/application/config/routes.php
-%%WWWDIR%%/system/application/config/smileys.php
-%%WWWDIR%%/system/application/config/user_agents.php
+@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
+@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
+@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
+@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
+@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
+%%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
+@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
+@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
+@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
 %%WWWDIR%%/system/application/controllers/index.html
 %%WWWDIR%%/system/application/controllers/welcome.php
 %%WWWDIR%%/system/application/errors/error_404.php
@@ -138,8 +164,10 @@
 %%WWWDIR%%/system/application/errors/error_general.php
 %%WWWDIR%%/system/application/errors/error_php.php
 %%WWWDIR%%/system/application/errors/index.html
+%%WWWDIR%%/system/application/helpers/index.html
 %%WWWDIR%%/system/application/hooks/index.html
 %%WWWDIR%%/system/application/index.html
+%%WWWDIR%%/system/application/language/english/index.html
 %%WWWDIR%%/system/application/libraries/index.html
 %%WWWDIR%%/system/application/models/index.html
 %%WWWDIR%%/system/application/views/index.html
@@ -149,40 +177,49 @@
 %%WWWDIR%%/system/codeigniter/Base5.php
 %%WWWDIR%%/system/codeigniter/CodeIgniter.php
 %%WWWDIR%%/system/codeigniter/Common.php
+%%WWWDIR%%/system/codeigniter/Compat.php
 %%WWWDIR%%/system/codeigniter/index.html
 %%WWWDIR%%/system/database/DB.php
 %%WWWDIR%%/system/database/DB_active_rec.php
 %%WWWDIR%%/system/database/DB_cache.php
 %%WWWDIR%%/system/database/DB_driver.php
+%%WWWDIR%%/system/database/DB_forge.php
 %%WWWDIR%%/system/database/DB_result.php
 %%WWWDIR%%/system/database/DB_utility.php
 %%WWWDIR%%/system/database/drivers/index.html
 %%WWWDIR%%/system/database/drivers/mssql/index.html
 %%WWWDIR%%/system/database/drivers/mssql/mssql_driver.php
+%%WWWDIR%%/system/database/drivers/mssql/mssql_forge.php
 %%WWWDIR%%/system/database/drivers/mssql/mssql_result.php
 %%WWWDIR%%/system/database/drivers/mssql/mssql_utility.php
 %%WWWDIR%%/system/database/drivers/mysql/index.html
 %%WWWDIR%%/system/database/drivers/mysql/mysql_driver.php
+%%WWWDIR%%/system/database/drivers/mysql/mysql_forge.php
 %%WWWDIR%%/system/database/drivers/mysql/mysql_result.php
 %%WWWDIR%%/system/database/drivers/mysql/mysql_utility.php
 %%WWWDIR%%/system/database/drivers/mysqli/index.html
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_driver.php
+%%WWWDIR%%/system/database/drivers/mysqli/mysqli_forge.php
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_result.php
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_utility.php
 %%WWWDIR%%/system/database/drivers/oci8/index.html
 %%WWWDIR%%/system/database/drivers/oci8/oci8_driver.php
+%%WWWDIR%%/system/database/drivers/oci8/oci8_forge.php
 %%WWWDIR%%/system/database/drivers/oci8/oci8_result.php
 %%WWWDIR%%/system/database/drivers/oci8/oci8_utility.php
 %%WWWDIR%%/system/database/drivers/odbc/index.html
 %%WWWDIR%%/system/database/drivers/odbc/odbc_driver.php
+%%WWWDIR%%/system/database/drivers/odbc/odbc_forge.php
 %%WWWDIR%%/system/database/drivers/odbc/odbc_result.php
 %%WWWDIR%%/system/database/drivers/odbc/odbc_utility.php
 %%WWWDIR%%/system/database/drivers/postgre/index.html
 %%WWWDIR%%/system/database/drivers/postgre/postgre_driver.php
+%%WWWDIR%%/system/database/drivers/postgre/postgre_forge.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_result.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_utility.php
 %%WWWDIR%%/system/database/drivers/sqlite/index.html
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_driver.php
+%%WWWDIR%%/system/database/drivers/sqlite/sqlite_forge.php
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_result.php
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_utility.php
 %%WWWDIR%%/system/database/index.html
@@ -193,11 +230,13 @@
 %%WWWDIR%%/system/helpers/date_helper.php
 %%WWWDIR%%/system/helpers/directory_helper.php
 %%WWWDIR%%/system/helpers/download_helper.php
+%%WWWDIR%%/system/helpers/email_helper.php
 %%WWWDIR%%/system/helpers/file_helper.php
 %%WWWDIR%%/system/helpers/form_helper.php
 %%WWWDIR%%/system/helpers/html_helper.php
 %%WWWDIR%%/system/helpers/index.html
 %%WWWDIR%%/system/helpers/inflector_helper.php
+%%WWWDIR%%/system/helpers/path_helper.php
 %%WWWDIR%%/system/helpers/security_helper.php
 %%WWWDIR%%/system/helpers/smiley_helper.php
 %%WWWDIR%%/system/helpers/string_helper.php
@@ -228,6 +267,7 @@
 %%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
@@ -242,24 +282,23 @@
 %%WWWDIR%%/system/libraries/Sha1.php
 %%WWWDIR%%/system/libraries/Table.php
 %%WWWDIR%%/system/libraries/Trackback.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
@@ -293,13 +332,16 @@
 @dirrm %%WWWDIR%%/system/application/views
 @dirrm %%WWWDIR%%/system/application/models
 @dirrm %%WWWDIR%%/system/application/libraries
+@dirrm %%WWWDIR%%/system/application/language/english
+@dirrm %%WWWDIR%%/system/application/language
 @dirrm %%WWWDIR%%/system/application/hooks
+@dirrm %%WWWDIR%%/system/application/helpers
 @dirrm %%WWWDIR%%/system/application/errors
 @dirrm %%WWWDIR%%/system/application/controllers
-@dirrm %%WWWDIR%%/system/application/config
-@dirrm %%WWWDIR%%/system/application
-@dirrm %%WWWDIR%%/system
-@dirrm %%WWWDIR%%
+@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
@@ -307,5 +349,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/helpers
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/general
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc_style
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/database
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index 6da436fb682a..2450d4cb04d7 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codeigniter
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.1
 CATEGORIES=	www
 MASTER_SITES=	http://codeigniter.com/download_files/
 DISTNAME=	CodeIgniter_${PORTVERSION}
@@ -15,16 +15,47 @@ MAINTAINER=	glarkin@sourcehosting.net
 COMMENT=	A framework for developing PHP web applications
 
 USE_ZIP=	yes
-
-USE_APACHE=	2.0+
+USE_DOS2UNIX=	yes
 
 NO_BUILD=	yes
 USE_PHP=	session pcre
 WANT_PHP_WEB=	yes
 
-SUB_FILES=	pkg-message
-
-OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
+CI_SYS_DIR=	system
+CI_CONF_DIR=	${CI_SYS_DIR}/application/config
+
+# These are all user-configurable files that we'll install
+# a .sample copy for each.
+CI_CONF_FILES=	index.php ${CI_CONF_DIR}/autoload.php \
+		${CI_CONF_DIR}/config.php ${CI_CONF_DIR}/database.php \
+		${CI_CONF_DIR}/hooks.php ${CI_CONF_DIR}/mimes.php \
+		${CI_CONF_DIR}/routes.php ${CI_CONF_DIR}/smileys.php \
+		${CI_CONF_DIR}/user_agents.php
+
+# This is the rest of the CodeIgniter installation that doesn't change
+STD_BITS=	${CI_CONF_DIR}/index.html \
+		${CI_SYS_DIR}/application/controllers \
+		${CI_SYS_DIR}/application/errors \
+		${CI_SYS_DIR}/application/helpers \
+		${CI_SYS_DIR}/application/hooks \
+		${CI_SYS_DIR}/application/index.html \
+		${CI_SYS_DIR}/application/language \
+		${CI_SYS_DIR}/application/libraries \
+		${CI_SYS_DIR}/application/models \
+		${CI_SYS_DIR}/application/views \
+		${CI_SYS_DIR}/cache \
+		${CI_SYS_DIR}/codeigniter \
+		${CI_SYS_DIR}/database \
+		${CI_SYS_DIR}/fonts \
+		${CI_SYS_DIR}/helpers \
+		${CI_SYS_DIR}/language \
+		${CI_SYS_DIR}/libraries \
+		${CI_SYS_DIR}/logs \
+		${CI_SYS_DIR}/plugins \
+		${CI_SYS_DIR}/scaffolding
+
+OPTIONS=	APACHE "Configure for Apache-2.x" off \
+		PROD "Install for production server (see: make confighelp)" Off \
 		MSSQL "Install MSSQL support for PHP" Off \
 		MYSQL "Install MySQL support for PHP" Off \
 		MYSQLI "Install MySQLi support for PHP" Off \
@@ -33,12 +64,23 @@ OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
 		PGSQL "Install PostgreSQL support for PHP" Off \
 		SQLITE "Install SQLite support for PHP" Off
 
-PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_APACHE)
+USE_APACHE=	2.0+
 
+PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
 
-.include <bsd.port.pre.mk>
+PKGMESSAGE=	pkg-message-apache
+SUB_FILES=	pkg-message-apache
+.else
+PLIST_SUB+=	NOAPACHE="@comment "
+PKGMESSAGE=	pkg-message-noapache
+SUB_FILES=	pkg-message-noapache
+.endif
+PLIST_SUB+=	ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR}
 
 WITH_PHP_CGI?=	/cgi-bin/php
 
@@ -111,14 +153,27 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} "index.php system" ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
+	@for i in ${CI_CONF_FILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \
+	done
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
+		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
+		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
 	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
+		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
 post-install:
+	@for i in ${CI_CONF_FILES}; do \
+		if [ ! -f ${WWWDIR}/$$i ]; then \
+			${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
+		fi; \
+	done
+.if defined(WITH_APACHE)
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
 	else \
@@ -129,6 +184,7 @@ post-install:
 	  ${ECHO_MSG} "" ; \
 	  ${FALSE} ; \
 	fi
+.endif
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}/user_guide/ && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
diff --git a/www/codeigniter/distinfo b/www/codeigniter/distinfo
index cc10135bdb8f..845fd4e92fed 100644
--- a/www/codeigniter/distinfo
+++ b/www/codeigniter/distinfo
@@ -1,3 +1,3 @@
-MD5 (CodeIgniter_1.5.4.zip) = 0d6cc66b01d5ddecde483b3d5f51e4f8
-SHA256 (CodeIgniter_1.5.4.zip) = cfa6dde5779bac4d574102c0612e6857d8eee8c14b3e11cc753804010293bc36
-SIZE (CodeIgniter_1.5.4.zip) = 774098
+MD5 (CodeIgniter_1.6.1.zip) = cc3f0b566e3654d351fa067aeee9bced
+SHA256 (CodeIgniter_1.6.1.zip) = d4d8b73c787ed4fa5095ef2d3f6a2f5c710d3ed14974059db4ab8bf0f9f60ec5
+SIZE (CodeIgniter_1.6.1.zip) = 822433
diff --git a/www/codeigniter/files/pkg-message-apache.in b/www/codeigniter/files/pkg-message-apache.in
new file mode 100644
index 000000000000..ba70e0fca94e
--- /dev/null
+++ b/www/codeigniter/files/pkg-message-apache.in
@@ -0,0 +1,23 @@
+
+*********************************************************************
+You have just installed the CodeIgniter web application framework.
+
+Note that you should restart your Apache web server to ensure that
+the CodeIgniter configuration file is loaded.
+
+Optional post-installation instructions include:
+
+- Open the %%WWWDIR%%/system/application/config/config.php
+  file with a text editor and set your base URL.
+
+- If you intend to use a database, open the
+  %%WWWDIR%%/system/application/config/database.php
+  file with a text editor and set your database settings.
+
+- Other user-configurable files include:
+    %%WWWDIR%%/index.php
+    Any file located in %%WWWDIR%%/system/application/config 
+
+- If you are upgrading from a prior release, please visit:
+  http://codeigniter.com/user_guide/installation/upgrading.html
+  for additional post-installation instructions.
diff --git a/www/codeigniter/files/pkg-message-noapache.in b/www/codeigniter/files/pkg-message-noapache.in
new file mode 100644
index 000000000000..fa06056f1d74
--- /dev/null
+++ b/www/codeigniter/files/pkg-message-noapache.in
@@ -0,0 +1,20 @@
+
+*********************************************************************
+You have just installed the CodeIgniter web application framework.
+
+Optional post-installation instructions include:
+
+- Open the %%WWWDIR%%/system/application/config/config.php
+  file with a text editor and set your base URL.
+
+- If you intend to use a database, open the
+  %%WWWDIR%%/system/application/config/database.php
+  file with a text editor and set your database settings.
+
+- Other user-configurable files include:
+    %%WWWDIR%%/index.php
+    Any file located in %%WWWDIR%%/system/application/config 
+
+- If you are upgrading from a prior release, please visit:
+  http://codeigniter.com/user_guide/installation/upgrading.html
+  for additional post-installation instructions.
diff --git a/www/codeigniter/files/pkg-message.in b/www/codeigniter/files/pkg-message.in
index bb521059300d..e69de29bb2d1 100644
--- a/www/codeigniter/files/pkg-message.in
+++ b/www/codeigniter/files/pkg-message.in
@@ -1,15 +0,0 @@
-
-*********************************************************************
-You have just installed the CodeIgniter web application framework.
-
-Note that you should restart your Apache web server to ensure that
-the CodeIgniter configuration file is loaded.
-
-Optional post-installation instructions include:
-
-- Open the %%WWWDIR%%/system/application/config/config.php
-  file with a text editor and set your base URL.
-
-- If you intend to use a database, open the
-  %%WWWDIR%%/system/application/config/database.php
-  file with a text editor and set your database settings.
diff --git a/www/codeigniter/pkg-descr b/www/codeigniter/pkg-descr
index d01010f81a0f..47d0a90b5b84 100644
--- a/www/codeigniter/pkg-descr
+++ b/www/codeigniter/pkg-descr
@@ -2,6 +2,6 @@ CodeIgniter is a powerful PHP framework with a very small footprint,
 built for PHP coders who need a simple and elegant toolkit to create
 full-featured web applications.
 
-WWW: http://www.codeigniter.com/
+WWW: http://codeigniter.com/
 - Greg Larkin
 glarkin@sourcehosting.net
diff --git a/www/codeigniter/pkg-plist b/www/codeigniter/pkg-plist
index aafc0fe024a0..3ae7558c0544 100644
--- a/www/codeigniter/pkg-plist
+++ b/www/codeigniter/pkg-plist
@@ -1,4 +1,4 @@
-%%CONFDIR%%/codeigniter.conf
+%%NOAPACHE%%%%CONFDIR%%/codeigniter.conf
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/database/active_record.html
 %%PORTDOCS%%%%DOCSDIR%%/database/caching.html
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/database/connecting.html
 %%PORTDOCS%%%%DOCSDIR%%/database/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/database/fields.html
+%%PORTDOCS%%%%DOCSDIR%%/database/forge.html
 %%PORTDOCS%%%%DOCSDIR%%/database/helpers.html
 %%PORTDOCS%%%%DOCSDIR%%/database/index.html
 %%PORTDOCS%%%%DOCSDIR%%/database/queries.html
@@ -14,6 +15,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/database/table_data.html
 %%PORTDOCS%%%%DOCSDIR%%/database/transactions.html
 %%PORTDOCS%%%%DOCSDIR%%/database/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_style/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_style/template.html
 %%PORTDOCS%%%%DOCSDIR%%/general/alternative_php.html
 %%PORTDOCS%%%%DOCSDIR%%/general/ancillary_classes.html
 %%PORTDOCS%%%%DOCSDIR%%/general/autoloader.html
@@ -43,11 +46,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/helpers/date_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/directory_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/download_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/email_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/file_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/form_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/html_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/index.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/inflector_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/path_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/security_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/smiley_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/string_helper.html
@@ -82,6 +87,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_152.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_153.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_154.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_160.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_161.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_b11.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/libraries/benchmark.html
@@ -113,6 +120,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/nav/moo.fx.pack.js
 %%PORTDOCS%%%%DOCSDIR%%/nav/nav.js
 %%PORTDOCS%%%%DOCSDIR%%/nav/prototype.lite.js
+%%PORTDOCS%%%%DOCSDIR%%/nav/user_guide_menu.js
 %%PORTDOCS%%%%DOCSDIR%%/overview/appflow.html
 %%PORTDOCS%%%%DOCSDIR%%/overview/at_a_glance.html
 %%PORTDOCS%%%%DOCSDIR%%/overview/features.html
@@ -121,16 +129,34 @@
 %%PORTDOCS%%%%DOCSDIR%%/overview/mvc.html
 %%PORTDOCS%%%%DOCSDIR%%/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/userguide.css
-%%WWWDIR%%/index.php
-%%WWWDIR%%/system/application/config/autoload.php
-%%WWWDIR%%/system/application/config/config.php
-%%WWWDIR%%/system/application/config/database.php
-%%WWWDIR%%/system/application/config/hooks.php
-%%WWWDIR%%/system/application/config/index.html
-%%WWWDIR%%/system/application/config/mimes.php
-%%WWWDIR%%/system/application/config/routes.php
-%%WWWDIR%%/system/application/config/smileys.php
-%%WWWDIR%%/system/application/config/user_agents.php
+@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
+@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
+@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
+@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
+@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
+%%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
+@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
+@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
+@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
 %%WWWDIR%%/system/application/controllers/index.html
 %%WWWDIR%%/system/application/controllers/welcome.php
 %%WWWDIR%%/system/application/errors/error_404.php
@@ -138,8 +164,10 @@
 %%WWWDIR%%/system/application/errors/error_general.php
 %%WWWDIR%%/system/application/errors/error_php.php
 %%WWWDIR%%/system/application/errors/index.html
+%%WWWDIR%%/system/application/helpers/index.html
 %%WWWDIR%%/system/application/hooks/index.html
 %%WWWDIR%%/system/application/index.html
+%%WWWDIR%%/system/application/language/english/index.html
 %%WWWDIR%%/system/application/libraries/index.html
 %%WWWDIR%%/system/application/models/index.html
 %%WWWDIR%%/system/application/views/index.html
@@ -149,40 +177,49 @@
 %%WWWDIR%%/system/codeigniter/Base5.php
 %%WWWDIR%%/system/codeigniter/CodeIgniter.php
 %%WWWDIR%%/system/codeigniter/Common.php
+%%WWWDIR%%/system/codeigniter/Compat.php
 %%WWWDIR%%/system/codeigniter/index.html
 %%WWWDIR%%/system/database/DB.php
 %%WWWDIR%%/system/database/DB_active_rec.php
 %%WWWDIR%%/system/database/DB_cache.php
 %%WWWDIR%%/system/database/DB_driver.php
+%%WWWDIR%%/system/database/DB_forge.php
 %%WWWDIR%%/system/database/DB_result.php
 %%WWWDIR%%/system/database/DB_utility.php
 %%WWWDIR%%/system/database/drivers/index.html
 %%WWWDIR%%/system/database/drivers/mssql/index.html
 %%WWWDIR%%/system/database/drivers/mssql/mssql_driver.php
+%%WWWDIR%%/system/database/drivers/mssql/mssql_forge.php
 %%WWWDIR%%/system/database/drivers/mssql/mssql_result.php
 %%WWWDIR%%/system/database/drivers/mssql/mssql_utility.php
 %%WWWDIR%%/system/database/drivers/mysql/index.html
 %%WWWDIR%%/system/database/drivers/mysql/mysql_driver.php
+%%WWWDIR%%/system/database/drivers/mysql/mysql_forge.php
 %%WWWDIR%%/system/database/drivers/mysql/mysql_result.php
 %%WWWDIR%%/system/database/drivers/mysql/mysql_utility.php
 %%WWWDIR%%/system/database/drivers/mysqli/index.html
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_driver.php
+%%WWWDIR%%/system/database/drivers/mysqli/mysqli_forge.php
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_result.php
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_utility.php
 %%WWWDIR%%/system/database/drivers/oci8/index.html
 %%WWWDIR%%/system/database/drivers/oci8/oci8_driver.php
+%%WWWDIR%%/system/database/drivers/oci8/oci8_forge.php
 %%WWWDIR%%/system/database/drivers/oci8/oci8_result.php
 %%WWWDIR%%/system/database/drivers/oci8/oci8_utility.php
 %%WWWDIR%%/system/database/drivers/odbc/index.html
 %%WWWDIR%%/system/database/drivers/odbc/odbc_driver.php
+%%WWWDIR%%/system/database/drivers/odbc/odbc_forge.php
 %%WWWDIR%%/system/database/drivers/odbc/odbc_result.php
 %%WWWDIR%%/system/database/drivers/odbc/odbc_utility.php
 %%WWWDIR%%/system/database/drivers/postgre/index.html
 %%WWWDIR%%/system/database/drivers/postgre/postgre_driver.php
+%%WWWDIR%%/system/database/drivers/postgre/postgre_forge.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_result.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_utility.php
 %%WWWDIR%%/system/database/drivers/sqlite/index.html
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_driver.php
+%%WWWDIR%%/system/database/drivers/sqlite/sqlite_forge.php
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_result.php
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_utility.php
 %%WWWDIR%%/system/database/index.html
@@ -193,11 +230,13 @@
 %%WWWDIR%%/system/helpers/date_helper.php
 %%WWWDIR%%/system/helpers/directory_helper.php
 %%WWWDIR%%/system/helpers/download_helper.php
+%%WWWDIR%%/system/helpers/email_helper.php
 %%WWWDIR%%/system/helpers/file_helper.php
 %%WWWDIR%%/system/helpers/form_helper.php
 %%WWWDIR%%/system/helpers/html_helper.php
 %%WWWDIR%%/system/helpers/index.html
 %%WWWDIR%%/system/helpers/inflector_helper.php
+%%WWWDIR%%/system/helpers/path_helper.php
 %%WWWDIR%%/system/helpers/security_helper.php
 %%WWWDIR%%/system/helpers/smiley_helper.php
 %%WWWDIR%%/system/helpers/string_helper.php
@@ -228,6 +267,7 @@
 %%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
@@ -242,24 +282,23 @@
 %%WWWDIR%%/system/libraries/Sha1.php
 %%WWWDIR%%/system/libraries/Table.php
 %%WWWDIR%%/system/libraries/Trackback.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
@@ -293,13 +332,16 @@
 @dirrm %%WWWDIR%%/system/application/views
 @dirrm %%WWWDIR%%/system/application/models
 @dirrm %%WWWDIR%%/system/application/libraries
+@dirrm %%WWWDIR%%/system/application/language/english
+@dirrm %%WWWDIR%%/system/application/language
 @dirrm %%WWWDIR%%/system/application/hooks
+@dirrm %%WWWDIR%%/system/application/helpers
 @dirrm %%WWWDIR%%/system/application/errors
 @dirrm %%WWWDIR%%/system/application/controllers
-@dirrm %%WWWDIR%%/system/application/config
-@dirrm %%WWWDIR%%/system/application
-@dirrm %%WWWDIR%%/system
-@dirrm %%WWWDIR%%
+@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
@@ -307,5 +349,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/helpers
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/general
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc_style
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/database
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/codeigniter17/Makefile b/www/codeigniter17/Makefile
index 6da436fb682a..2450d4cb04d7 100644
--- a/www/codeigniter17/Makefile
+++ b/www/codeigniter17/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	codeigniter
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.1
 CATEGORIES=	www
 MASTER_SITES=	http://codeigniter.com/download_files/
 DISTNAME=	CodeIgniter_${PORTVERSION}
@@ -15,16 +15,47 @@ MAINTAINER=	glarkin@sourcehosting.net
 COMMENT=	A framework for developing PHP web applications
 
 USE_ZIP=	yes
-
-USE_APACHE=	2.0+
+USE_DOS2UNIX=	yes
 
 NO_BUILD=	yes
 USE_PHP=	session pcre
 WANT_PHP_WEB=	yes
 
-SUB_FILES=	pkg-message
-
-OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
+CI_SYS_DIR=	system
+CI_CONF_DIR=	${CI_SYS_DIR}/application/config
+
+# These are all user-configurable files that we'll install
+# a .sample copy for each.
+CI_CONF_FILES=	index.php ${CI_CONF_DIR}/autoload.php \
+		${CI_CONF_DIR}/config.php ${CI_CONF_DIR}/database.php \
+		${CI_CONF_DIR}/hooks.php ${CI_CONF_DIR}/mimes.php \
+		${CI_CONF_DIR}/routes.php ${CI_CONF_DIR}/smileys.php \
+		${CI_CONF_DIR}/user_agents.php
+
+# This is the rest of the CodeIgniter installation that doesn't change
+STD_BITS=	${CI_CONF_DIR}/index.html \
+		${CI_SYS_DIR}/application/controllers \
+		${CI_SYS_DIR}/application/errors \
+		${CI_SYS_DIR}/application/helpers \
+		${CI_SYS_DIR}/application/hooks \
+		${CI_SYS_DIR}/application/index.html \
+		${CI_SYS_DIR}/application/language \
+		${CI_SYS_DIR}/application/libraries \
+		${CI_SYS_DIR}/application/models \
+		${CI_SYS_DIR}/application/views \
+		${CI_SYS_DIR}/cache \
+		${CI_SYS_DIR}/codeigniter \
+		${CI_SYS_DIR}/database \
+		${CI_SYS_DIR}/fonts \
+		${CI_SYS_DIR}/helpers \
+		${CI_SYS_DIR}/language \
+		${CI_SYS_DIR}/libraries \
+		${CI_SYS_DIR}/logs \
+		${CI_SYS_DIR}/plugins \
+		${CI_SYS_DIR}/scaffolding
+
+OPTIONS=	APACHE "Configure for Apache-2.x" off \
+		PROD "Install for production server (see: make confighelp)" Off \
 		MSSQL "Install MSSQL support for PHP" Off \
 		MYSQL "Install MySQL support for PHP" Off \
 		MYSQLI "Install MySQLi support for PHP" Off \
@@ -33,12 +64,23 @@ OPTIONS=	PROD "Install for production server (see: make confighelp)" Off \
 		PGSQL "Install PostgreSQL support for PHP" Off \
 		SQLITE "Install SQLite support for PHP" Off
 
-PLIST_SUB+=	CONFDIR=${CONFDIR_REL}
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_APACHE)
+USE_APACHE=	2.0+
 
+PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
 CONFDIR=	${PREFIX}/${CONFDIR_REL}
 CONFDIR_REL=	${APACHEETCDIR}/Includes
 
-.include <bsd.port.pre.mk>
+PKGMESSAGE=	pkg-message-apache
+SUB_FILES=	pkg-message-apache
+.else
+PLIST_SUB+=	NOAPACHE="@comment "
+PKGMESSAGE=	pkg-message-noapache
+SUB_FILES=	pkg-message-noapache
+.endif
+PLIST_SUB+=	ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR}
 
 WITH_PHP_CGI?=	/cgi-bin/php
 
@@ -111,14 +153,27 @@ confighelp:
 	@${ECHO_MSG} ""
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} "index.php system" ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
+	@for i in ${CI_CONF_FILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \
+	done
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
+		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
+	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
+		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
 	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
+		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
 post-install:
+	@for i in ${CI_CONF_FILES}; do \
+		if [ ! -f ${WWWDIR}/$$i ]; then \
+			${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
+		fi; \
+	done
+.if defined(WITH_APACHE)
 	@if [ -d "${CONFDIR}" ]; then \
 	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
 	else \
@@ -129,6 +184,7 @@ post-install:
 	  ${ECHO_MSG} "" ; \
 	  ${FALSE} ; \
 	fi
+.endif
 .if !defined(NOPORTDOCS)
 	@cd ${WRKSRC}/user_guide/ && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
diff --git a/www/codeigniter17/distinfo b/www/codeigniter17/distinfo
index cc10135bdb8f..845fd4e92fed 100644
--- a/www/codeigniter17/distinfo
+++ b/www/codeigniter17/distinfo
@@ -1,3 +1,3 @@
-MD5 (CodeIgniter_1.5.4.zip) = 0d6cc66b01d5ddecde483b3d5f51e4f8
-SHA256 (CodeIgniter_1.5.4.zip) = cfa6dde5779bac4d574102c0612e6857d8eee8c14b3e11cc753804010293bc36
-SIZE (CodeIgniter_1.5.4.zip) = 774098
+MD5 (CodeIgniter_1.6.1.zip) = cc3f0b566e3654d351fa067aeee9bced
+SHA256 (CodeIgniter_1.6.1.zip) = d4d8b73c787ed4fa5095ef2d3f6a2f5c710d3ed14974059db4ab8bf0f9f60ec5
+SIZE (CodeIgniter_1.6.1.zip) = 822433
diff --git a/www/codeigniter17/files/pkg-message-apache.in b/www/codeigniter17/files/pkg-message-apache.in
new file mode 100644
index 000000000000..ba70e0fca94e
--- /dev/null
+++ b/www/codeigniter17/files/pkg-message-apache.in
@@ -0,0 +1,23 @@
+
+*********************************************************************
+You have just installed the CodeIgniter web application framework.
+
+Note that you should restart your Apache web server to ensure that
+the CodeIgniter configuration file is loaded.
+
+Optional post-installation instructions include:
+
+- Open the %%WWWDIR%%/system/application/config/config.php
+  file with a text editor and set your base URL.
+
+- If you intend to use a database, open the
+  %%WWWDIR%%/system/application/config/database.php
+  file with a text editor and set your database settings.
+
+- Other user-configurable files include:
+    %%WWWDIR%%/index.php
+    Any file located in %%WWWDIR%%/system/application/config 
+
+- If you are upgrading from a prior release, please visit:
+  http://codeigniter.com/user_guide/installation/upgrading.html
+  for additional post-installation instructions.
diff --git a/www/codeigniter17/files/pkg-message-noapache.in b/www/codeigniter17/files/pkg-message-noapache.in
new file mode 100644
index 000000000000..fa06056f1d74
--- /dev/null
+++ b/www/codeigniter17/files/pkg-message-noapache.in
@@ -0,0 +1,20 @@
+
+*********************************************************************
+You have just installed the CodeIgniter web application framework.
+
+Optional post-installation instructions include:
+
+- Open the %%WWWDIR%%/system/application/config/config.php
+  file with a text editor and set your base URL.
+
+- If you intend to use a database, open the
+  %%WWWDIR%%/system/application/config/database.php
+  file with a text editor and set your database settings.
+
+- Other user-configurable files include:
+    %%WWWDIR%%/index.php
+    Any file located in %%WWWDIR%%/system/application/config 
+
+- If you are upgrading from a prior release, please visit:
+  http://codeigniter.com/user_guide/installation/upgrading.html
+  for additional post-installation instructions.
diff --git a/www/codeigniter17/files/pkg-message.in b/www/codeigniter17/files/pkg-message.in
index bb521059300d..e69de29bb2d1 100644
--- a/www/codeigniter17/files/pkg-message.in
+++ b/www/codeigniter17/files/pkg-message.in
@@ -1,15 +0,0 @@
-
-*********************************************************************
-You have just installed the CodeIgniter web application framework.
-
-Note that you should restart your Apache web server to ensure that
-the CodeIgniter configuration file is loaded.
-
-Optional post-installation instructions include:
-
-- Open the %%WWWDIR%%/system/application/config/config.php
-  file with a text editor and set your base URL.
-
-- If you intend to use a database, open the
-  %%WWWDIR%%/system/application/config/database.php
-  file with a text editor and set your database settings.
diff --git a/www/codeigniter17/pkg-descr b/www/codeigniter17/pkg-descr
index d01010f81a0f..47d0a90b5b84 100644
--- a/www/codeigniter17/pkg-descr
+++ b/www/codeigniter17/pkg-descr
@@ -2,6 +2,6 @@ CodeIgniter is a powerful PHP framework with a very small footprint,
 built for PHP coders who need a simple and elegant toolkit to create
 full-featured web applications.
 
-WWW: http://www.codeigniter.com/
+WWW: http://codeigniter.com/
 - Greg Larkin
 glarkin@sourcehosting.net
diff --git a/www/codeigniter17/pkg-plist b/www/codeigniter17/pkg-plist
index aafc0fe024a0..3ae7558c0544 100644
--- a/www/codeigniter17/pkg-plist
+++ b/www/codeigniter17/pkg-plist
@@ -1,4 +1,4 @@
-%%CONFDIR%%/codeigniter.conf
+%%NOAPACHE%%%%CONFDIR%%/codeigniter.conf
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/database/active_record.html
 %%PORTDOCS%%%%DOCSDIR%%/database/caching.html
@@ -7,6 +7,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/database/connecting.html
 %%PORTDOCS%%%%DOCSDIR%%/database/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/database/fields.html
+%%PORTDOCS%%%%DOCSDIR%%/database/forge.html
 %%PORTDOCS%%%%DOCSDIR%%/database/helpers.html
 %%PORTDOCS%%%%DOCSDIR%%/database/index.html
 %%PORTDOCS%%%%DOCSDIR%%/database/queries.html
@@ -14,6 +15,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/database/table_data.html
 %%PORTDOCS%%%%DOCSDIR%%/database/transactions.html
 %%PORTDOCS%%%%DOCSDIR%%/database/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_style/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_style/template.html
 %%PORTDOCS%%%%DOCSDIR%%/general/alternative_php.html
 %%PORTDOCS%%%%DOCSDIR%%/general/ancillary_classes.html
 %%PORTDOCS%%%%DOCSDIR%%/general/autoloader.html
@@ -43,11 +46,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/helpers/date_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/directory_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/download_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/email_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/file_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/form_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/html_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/index.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/inflector_helper.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers/path_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/security_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/smiley_helper.html
 %%PORTDOCS%%%%DOCSDIR%%/helpers/string_helper.html
@@ -82,6 +87,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_152.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_153.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_154.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_160.html
+%%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_161.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrade_b11.html
 %%PORTDOCS%%%%DOCSDIR%%/installation/upgrading.html
 %%PORTDOCS%%%%DOCSDIR%%/libraries/benchmark.html
@@ -113,6 +120,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/nav/moo.fx.pack.js
 %%PORTDOCS%%%%DOCSDIR%%/nav/nav.js
 %%PORTDOCS%%%%DOCSDIR%%/nav/prototype.lite.js
+%%PORTDOCS%%%%DOCSDIR%%/nav/user_guide_menu.js
 %%PORTDOCS%%%%DOCSDIR%%/overview/appflow.html
 %%PORTDOCS%%%%DOCSDIR%%/overview/at_a_glance.html
 %%PORTDOCS%%%%DOCSDIR%%/overview/features.html
@@ -121,16 +129,34 @@
 %%PORTDOCS%%%%DOCSDIR%%/overview/mvc.html
 %%PORTDOCS%%%%DOCSDIR%%/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/userguide.css
-%%WWWDIR%%/index.php
-%%WWWDIR%%/system/application/config/autoload.php
-%%WWWDIR%%/system/application/config/config.php
-%%WWWDIR%%/system/application/config/database.php
-%%WWWDIR%%/system/application/config/hooks.php
-%%WWWDIR%%/system/application/config/index.html
-%%WWWDIR%%/system/application/config/mimes.php
-%%WWWDIR%%/system/application/config/routes.php
-%%WWWDIR%%/system/application/config/smileys.php
-%%WWWDIR%%/system/application/config/user_agents.php
+@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
+@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
+@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
+@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
+@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
+%%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
+@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
+@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
+@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
 %%WWWDIR%%/system/application/controllers/index.html
 %%WWWDIR%%/system/application/controllers/welcome.php
 %%WWWDIR%%/system/application/errors/error_404.php
@@ -138,8 +164,10 @@
 %%WWWDIR%%/system/application/errors/error_general.php
 %%WWWDIR%%/system/application/errors/error_php.php
 %%WWWDIR%%/system/application/errors/index.html
+%%WWWDIR%%/system/application/helpers/index.html
 %%WWWDIR%%/system/application/hooks/index.html
 %%WWWDIR%%/system/application/index.html
+%%WWWDIR%%/system/application/language/english/index.html
 %%WWWDIR%%/system/application/libraries/index.html
 %%WWWDIR%%/system/application/models/index.html
 %%WWWDIR%%/system/application/views/index.html
@@ -149,40 +177,49 @@
 %%WWWDIR%%/system/codeigniter/Base5.php
 %%WWWDIR%%/system/codeigniter/CodeIgniter.php
 %%WWWDIR%%/system/codeigniter/Common.php
+%%WWWDIR%%/system/codeigniter/Compat.php
 %%WWWDIR%%/system/codeigniter/index.html
 %%WWWDIR%%/system/database/DB.php
 %%WWWDIR%%/system/database/DB_active_rec.php
 %%WWWDIR%%/system/database/DB_cache.php
 %%WWWDIR%%/system/database/DB_driver.php
+%%WWWDIR%%/system/database/DB_forge.php
 %%WWWDIR%%/system/database/DB_result.php
 %%WWWDIR%%/system/database/DB_utility.php
 %%WWWDIR%%/system/database/drivers/index.html
 %%WWWDIR%%/system/database/drivers/mssql/index.html
 %%WWWDIR%%/system/database/drivers/mssql/mssql_driver.php
+%%WWWDIR%%/system/database/drivers/mssql/mssql_forge.php
 %%WWWDIR%%/system/database/drivers/mssql/mssql_result.php
 %%WWWDIR%%/system/database/drivers/mssql/mssql_utility.php
 %%WWWDIR%%/system/database/drivers/mysql/index.html
 %%WWWDIR%%/system/database/drivers/mysql/mysql_driver.php
+%%WWWDIR%%/system/database/drivers/mysql/mysql_forge.php
 %%WWWDIR%%/system/database/drivers/mysql/mysql_result.php
 %%WWWDIR%%/system/database/drivers/mysql/mysql_utility.php
 %%WWWDIR%%/system/database/drivers/mysqli/index.html
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_driver.php
+%%WWWDIR%%/system/database/drivers/mysqli/mysqli_forge.php
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_result.php
 %%WWWDIR%%/system/database/drivers/mysqli/mysqli_utility.php
 %%WWWDIR%%/system/database/drivers/oci8/index.html
 %%WWWDIR%%/system/database/drivers/oci8/oci8_driver.php
+%%WWWDIR%%/system/database/drivers/oci8/oci8_forge.php
 %%WWWDIR%%/system/database/drivers/oci8/oci8_result.php
 %%WWWDIR%%/system/database/drivers/oci8/oci8_utility.php
 %%WWWDIR%%/system/database/drivers/odbc/index.html
 %%WWWDIR%%/system/database/drivers/odbc/odbc_driver.php
+%%WWWDIR%%/system/database/drivers/odbc/odbc_forge.php
 %%WWWDIR%%/system/database/drivers/odbc/odbc_result.php
 %%WWWDIR%%/system/database/drivers/odbc/odbc_utility.php
 %%WWWDIR%%/system/database/drivers/postgre/index.html
 %%WWWDIR%%/system/database/drivers/postgre/postgre_driver.php
+%%WWWDIR%%/system/database/drivers/postgre/postgre_forge.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_result.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_utility.php
 %%WWWDIR%%/system/database/drivers/sqlite/index.html
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_driver.php
+%%WWWDIR%%/system/database/drivers/sqlite/sqlite_forge.php
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_result.php
 %%WWWDIR%%/system/database/drivers/sqlite/sqlite_utility.php
 %%WWWDIR%%/system/database/index.html
@@ -193,11 +230,13 @@
 %%WWWDIR%%/system/helpers/date_helper.php
 %%WWWDIR%%/system/helpers/directory_helper.php
 %%WWWDIR%%/system/helpers/download_helper.php
+%%WWWDIR%%/system/helpers/email_helper.php
 %%WWWDIR%%/system/helpers/file_helper.php
 %%WWWDIR%%/system/helpers/form_helper.php
 %%WWWDIR%%/system/helpers/html_helper.php
 %%WWWDIR%%/system/helpers/index.html
 %%WWWDIR%%/system/helpers/inflector_helper.php
+%%WWWDIR%%/system/helpers/path_helper.php
 %%WWWDIR%%/system/helpers/security_helper.php
 %%WWWDIR%%/system/helpers/smiley_helper.php
 %%WWWDIR%%/system/helpers/string_helper.php
@@ -228,6 +267,7 @@
 %%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
@@ -242,24 +282,23 @@
 %%WWWDIR%%/system/libraries/Sha1.php
 %%WWWDIR%%/system/libraries/Table.php
 %%WWWDIR%%/system/libraries/Trackback.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
@@ -293,13 +332,16 @@
 @dirrm %%WWWDIR%%/system/application/views
 @dirrm %%WWWDIR%%/system/application/models
 @dirrm %%WWWDIR%%/system/application/libraries
+@dirrm %%WWWDIR%%/system/application/language/english
+@dirrm %%WWWDIR%%/system/application/language
 @dirrm %%WWWDIR%%/system/application/hooks
+@dirrm %%WWWDIR%%/system/application/helpers
 @dirrm %%WWWDIR%%/system/application/errors
 @dirrm %%WWWDIR%%/system/application/controllers
-@dirrm %%WWWDIR%%/system/application/config
-@dirrm %%WWWDIR%%/system/application
-@dirrm %%WWWDIR%%/system
-@dirrm %%WWWDIR%%
+@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
@@ -307,5 +349,6 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/helpers
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/general
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc_style
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/database
 %%PORTDOCS%%@dirrm %%DOCSDIR%%