3 files changed, 89 insertions, 18 deletions

diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index e10159c8ceb0..d0a3a445ab2a 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -2,17 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	codeigniter
-PORTVERSION=	2.2.6
+PORTVERSION=	3.0.3
 CATEGORIES=	www
 
 MAINTAINER=	junovitch@FreeBSD.org
 COMMENT=	Framework for developing PHP web applications
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/license.txt
+
 USES=		tar:tgz
 USE_GITHUB=	yes
 GH_ACCOUNT=	bcit-ci
 
-CONFLICTS=	codeigniter-1.[0-9]* codeigniter-3.[0-9]* codeigniter22-2.[0-9]*
+CONFLICTS=	codeigniter-1.[0-9]* codeigniter22-2.[0-9]*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -34,6 +37,7 @@ CI_CONF_FILES=	index.php \
 		${CI_CONF_DIR}/doctypes.php \
 		${CI_CONF_DIR}/foreign_chars.php \
 		${CI_CONF_DIR}/hooks.php \
+		${CI_CONF_DIR}/memcached.php \
 		${CI_CONF_DIR}/mimes.php \
 		${CI_CONF_DIR}/migration.php \
 		${CI_CONF_DIR}/profiler.php \
@@ -43,10 +47,10 @@ CI_CONF_FILES=	index.php \
 
 # This is the rest of the CodeIgniter installation that doesn't change
 STD_BITS=	${CI_CONF_DIR}/index.html \
+		application/.htaccess \
 		application/cache \
 		application/controllers \
 		application/core \
-		application/errors \
 		application/helpers \
 		application/hooks \
 		application/index.html \
@@ -56,10 +60,12 @@ STD_BITS=	${CI_CONF_DIR}/index.html \
 		application/models \
 		application/third_party \
 		application/views \
+		${CI_SYS_DIR}/.htaccess \
 		${CI_SYS_DIR}/core \
 		${CI_SYS_DIR}/database \
 		${CI_SYS_DIR}/fonts \
 		${CI_SYS_DIR}/helpers \
+		${CI_SYS_DIR}/index.html \
 		${CI_SYS_DIR}/language \
 		${CI_SYS_DIR}/libraries
 
@@ -105,5 +111,7 @@ post-install-APACHE-on:
 	${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf;
 post-install-DOCS-on:
 	cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
+	${CP} ${WRKSRC}/readme.rst ${STAGEDIR}${DOCSDIR}/readme.rst
 
 .include <bsd.port.mk>
diff --git a/www/codeigniter/distinfo b/www/codeigniter/distinfo
index e0b2587ff685..235130068aa9 100644
--- a/www/codeigniter/distinfo
+++ b/www/codeigniter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bcit-ci-codeigniter-2.2.6_GH0.tgz) = 3105487ab24430027d0a8ed49329d84e59c3f464be492e1d427d3b49352fbe85
-SIZE (bcit-ci-codeigniter-2.2.6_GH0.tgz) = 1971743
+SHA256 (bcit-ci-codeigniter-3.0.3_GH0.tgz) = 14b5172a0c0d0943ca6717b5b110d2ebcb035ac4573c48b69a1058253f2016c2
+SIZE (bcit-ci-codeigniter-3.0.3_GH0.tgz) = 2026850
diff --git a/www/codeigniter/pkg-plist b/www/codeigniter/pkg-plist
index 866764add03f..1fd732774da9 100644
--- a/www/codeigniter/pkg-plist
+++ b/www/codeigniter/pkg-plist
@@ -1,4 +1,5 @@
 %%APACHE%%%%CONFDIR%%/codeigniter.conf
+%%WWWDIR%%/application/.htaccess
 %%WWWDIR%%/application/cache/.htaccess
 %%WWWDIR%%/application/cache/index.html
 %%WWWDIR%%/application/config/index.html
@@ -9,20 +10,16 @@
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/doctypes.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/foreign_chars.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/hooks.php.sample
+@sample %%WWWDIR%%/%%CI_CONF_DIR%%/memcached.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/migration.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/mimes.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/profiler.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/routes.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/smileys.php.sample
 @sample %%WWWDIR%%/%%CI_CONF_DIR%%/user_agents.php.sample
+%%WWWDIR%%/application/controllers/Welcome.php
 %%WWWDIR%%/application/controllers/index.html
-%%WWWDIR%%/application/controllers/welcome.php
 %%WWWDIR%%/application/core/index.html
-%%WWWDIR%%/application/errors/error_404.php
-%%WWWDIR%%/application/errors/error_db.php
-%%WWWDIR%%/application/errors/error_general.php
-%%WWWDIR%%/application/errors/error_php.php
-%%WWWDIR%%/application/errors/index.html
 %%WWWDIR%%/application/helpers/index.html
 %%WWWDIR%%/application/hooks/index.html
 %%WWWDIR%%/application/index.html
@@ -32,9 +29,23 @@
 %%WWWDIR%%/application/logs/index.html
 %%WWWDIR%%/application/models/index.html
 %%WWWDIR%%/application/third_party/index.html
+%%WWWDIR%%/application/views/errors/cli/error_404.php
+%%WWWDIR%%/application/views/errors/cli/error_db.php
+%%WWWDIR%%/application/views/errors/cli/error_exception.php
+%%WWWDIR%%/application/views/errors/cli/error_general.php
+%%WWWDIR%%/application/views/errors/cli/error_php.php
+%%WWWDIR%%/application/views/errors/cli/index.html
+%%WWWDIR%%/application/views/errors/html/error_404.php
+%%WWWDIR%%/application/views/errors/html/error_db.php
+%%WWWDIR%%/application/views/errors/html/error_exception.php
+%%WWWDIR%%/application/views/errors/html/error_general.php
+%%WWWDIR%%/application/views/errors/html/error_php.php
+%%WWWDIR%%/application/views/errors/html/index.html
+%%WWWDIR%%/application/views/errors/index.html
 %%WWWDIR%%/application/views/index.html
 %%WWWDIR%%/application/views/welcome_message.php
-%%WWWDIR%%/index.php.sample
+@sample %%WWWDIR%%/index.php.sample
+%%WWWDIR%%/system/.htaccess
 %%WWWDIR%%/system/core/Benchmark.php
 %%WWWDIR%%/system/core/CodeIgniter.php
 %%WWWDIR%%/system/core/Common.php
@@ -45,18 +56,24 @@
 %%WWWDIR%%/system/core/Input.php
 %%WWWDIR%%/system/core/Lang.php
 %%WWWDIR%%/system/core/Loader.php
+%%WWWDIR%%/system/core/Log.php
 %%WWWDIR%%/system/core/Model.php
 %%WWWDIR%%/system/core/Output.php
 %%WWWDIR%%/system/core/Router.php
 %%WWWDIR%%/system/core/Security.php
 %%WWWDIR%%/system/core/URI.php
 %%WWWDIR%%/system/core/Utf8.php
+%%WWWDIR%%/system/core/compat/hash.php
+%%WWWDIR%%/system/core/compat/index.html
+%%WWWDIR%%/system/core/compat/mbstring.php
+%%WWWDIR%%/system/core/compat/password.php
+%%WWWDIR%%/system/core/compat/standard.php
 %%WWWDIR%%/system/core/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_query_builder.php
 %%WWWDIR%%/system/database/DB_result.php
 %%WWWDIR%%/system/database/DB_utility.php
 %%WWWDIR%%/system/database/drivers/cubrid/cubrid_driver.php
@@ -64,6 +81,11 @@
 %%WWWDIR%%/system/database/drivers/cubrid/cubrid_result.php
 %%WWWDIR%%/system/database/drivers/cubrid/cubrid_utility.php
 %%WWWDIR%%/system/database/drivers/cubrid/index.html
+%%WWWDIR%%/system/database/drivers/ibase/ibase_driver.php
+%%WWWDIR%%/system/database/drivers/ibase/ibase_forge.php
+%%WWWDIR%%/system/database/drivers/ibase/ibase_result.php
+%%WWWDIR%%/system/database/drivers/ibase/ibase_utility.php
+%%WWWDIR%%/system/database/drivers/ibase/index.html
 %%WWWDIR%%/system/database/drivers/index.html
 %%WWWDIR%%/system/database/drivers/mssql/index.html
 %%WWWDIR%%/system/database/drivers/mssql/mssql_driver.php
@@ -95,6 +117,31 @@
 %%WWWDIR%%/system/database/drivers/pdo/pdo_forge.php
 %%WWWDIR%%/system/database/drivers/pdo/pdo_result.php
 %%WWWDIR%%/system/database/drivers/pdo/pdo_utility.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/index.html
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
+%%WWWDIR%%/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
 %%WWWDIR%%/system/database/drivers/postgre/index.html
 %%WWWDIR%%/system/database/drivers/postgre/postgre_driver.php
 %%WWWDIR%%/system/database/drivers/postgre/postgre_forge.php
@@ -105,6 +152,11 @@
 %%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/drivers/sqlite3/index.html
+%%WWWDIR%%/system/database/drivers/sqlite3/sqlite3_driver.php
+%%WWWDIR%%/system/database/drivers/sqlite3/sqlite3_forge.php
+%%WWWDIR%%/system/database/drivers/sqlite3/sqlite3_result.php
+%%WWWDIR%%/system/database/drivers/sqlite3/sqlite3_utility.php
 %%WWWDIR%%/system/database/drivers/sqlsrv/index.html
 %%WWWDIR%%/system/database/drivers/sqlsrv/sqlsrv_driver.php
 %%WWWDIR%%/system/database/drivers/sqlsrv/sqlsrv_forge.php
@@ -135,6 +187,7 @@
 %%WWWDIR%%/system/helpers/typography_helper.php
 %%WWWDIR%%/system/helpers/url_helper.php
 %%WWWDIR%%/system/helpers/xml_helper.php
+%%WWWDIR%%/system/index.html
 %%WWWDIR%%/system/language/english/calendar_lang.php
 %%WWWDIR%%/system/language/english/date_lang.php
 %%WWWDIR%%/system/language/english/db_lang.php
@@ -145,6 +198,7 @@
 %%WWWDIR%%/system/language/english/index.html
 %%WWWDIR%%/system/language/english/migration_lang.php
 %%WWWDIR%%/system/language/english/number_lang.php
+%%WWWDIR%%/system/language/english/pagination_lang.php
 %%WWWDIR%%/system/language/english/profiler_lang.php
 %%WWWDIR%%/system/language/english/unit_test_lang.php
 %%WWWDIR%%/system/language/english/upload_lang.php
@@ -154,6 +208,8 @@
 %%WWWDIR%%/system/libraries/Cache/drivers/Cache_dummy.php
 %%WWWDIR%%/system/libraries/Cache/drivers/Cache_file.php
 %%WWWDIR%%/system/libraries/Cache/drivers/Cache_memcached.php
+%%WWWDIR%%/system/libraries/Cache/drivers/Cache_redis.php
+%%WWWDIR%%/system/libraries/Cache/drivers/Cache_wincache.php
 %%WWWDIR%%/system/libraries/Cache/drivers/index.html
 %%WWWDIR%%/system/libraries/Cache/index.html
 %%WWWDIR%%/system/libraries/Calendar.php
@@ -161,17 +217,26 @@
 %%WWWDIR%%/system/libraries/Driver.php
 %%WWWDIR%%/system/libraries/Email.php
 %%WWWDIR%%/system/libraries/Encrypt.php
+%%WWWDIR%%/system/libraries/Encryption.php
 %%WWWDIR%%/system/libraries/Form_validation.php
 %%WWWDIR%%/system/libraries/Ftp.php
 %%WWWDIR%%/system/libraries/Image_lib.php
 %%WWWDIR%%/system/libraries/Javascript.php
-%%WWWDIR%%/system/libraries/Log.php
+%%WWWDIR%%/system/libraries/Javascript/Jquery.php
+%%WWWDIR%%/system/libraries/Javascript/index.html
 %%WWWDIR%%/system/libraries/Migration.php
 %%WWWDIR%%/system/libraries/Pagination.php
 %%WWWDIR%%/system/libraries/Parser.php
 %%WWWDIR%%/system/libraries/Profiler.php
-%%WWWDIR%%/system/libraries/Session.php
-%%WWWDIR%%/system/libraries/Sha1.php
+%%WWWDIR%%/system/libraries/Session/Session.php
+%%WWWDIR%%/system/libraries/Session/SessionHandlerInterface.php
+%%WWWDIR%%/system/libraries/Session/Session_driver.php
+%%WWWDIR%%/system/libraries/Session/drivers/Session_database_driver.php
+%%WWWDIR%%/system/libraries/Session/drivers/Session_files_driver.php
+%%WWWDIR%%/system/libraries/Session/drivers/Session_memcached_driver.php
+%%WWWDIR%%/system/libraries/Session/drivers/Session_redis_driver.php
+%%WWWDIR%%/system/libraries/Session/drivers/index.html
+%%WWWDIR%%/system/libraries/Session/index.html
 %%WWWDIR%%/system/libraries/Table.php
 %%WWWDIR%%/system/libraries/Trackback.php
 %%WWWDIR%%/system/libraries/Typography.php
@@ -182,6 +247,4 @@
 %%WWWDIR%%/system/libraries/Xmlrpcs.php
 %%WWWDIR%%/system/libraries/Zip.php
 %%WWWDIR%%/system/libraries/index.html
-%%WWWDIR%%/system/libraries/javascript/Jquery.php
-%%WWWDIR%%/system/libraries/javascript/index.html
 @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/application/cache