Index: branches/2015Q4/www/codeigniter/Makefile =================================================================== --- branches/2015Q4/www/codeigniter/Makefile (revision 400674) +++ branches/2015Q4/www/codeigniter/Makefile (revision 400675) @@ -1,133 +1,109 @@ # Created by: Greg Larkin # $FreeBSD$ PORTNAME= codeigniter -PORTVERSION= 2.2.5 +PORTVERSION= 2.2.6 CATEGORIES= www -MAINTAINER= appleboy.tw@gmail.com +MAINTAINER= junovitch@FreeBSD.org COMMENT= Framework for developing PHP web applications USES= tar:tgz USE_GITHUB= yes GH_ACCOUNT= bcit-ci -CONFLICTS= codeigniter-1.[0-9]* +CONFLICTS= codeigniter-1.[0-9]* codeigniter-3.[0-9]* NO_ARCH= yes NO_BUILD= yes USE_PHP= mcrypt pcre session WANT_PHP_WEB= yes PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} CI_SYS_DIR= system CI_CONF_DIR= application/config WRKSRC= ${WRKDIR}/CodeIgniter-${PORTVERSION} PORTDOCS= * # These are all user-configurable files that we'll install -CI_CONF_FILES= index.php ${CI_CONF_DIR}/autoload.php \ - ${CI_CONF_DIR}/config.php ${CI_CONF_DIR}/constants.php \ +CI_CONF_FILES= index.php \ + ${CI_CONF_DIR}/autoload.php \ + ${CI_CONF_DIR}/config.php \ + ${CI_CONF_DIR}/constants.php \ ${CI_CONF_DIR}/database.php \ ${CI_CONF_DIR}/doctypes.php \ ${CI_CONF_DIR}/foreign_chars.php \ ${CI_CONF_DIR}/hooks.php \ ${CI_CONF_DIR}/mimes.php \ ${CI_CONF_DIR}/migration.php \ ${CI_CONF_DIR}/profiler.php \ - ${CI_CONF_DIR}/routes.php ${CI_CONF_DIR}/smileys.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 \ application/cache \ application/controllers \ application/core \ application/errors \ application/helpers \ application/hooks \ application/index.html \ application/language \ application/libraries \ application/logs \ application/models \ application/third_party \ application/views \ ${CI_SYS_DIR}/core \ ${CI_SYS_DIR}/database \ ${CI_SYS_DIR}/fonts \ ${CI_SYS_DIR}/helpers \ ${CI_SYS_DIR}/language \ ${CI_SYS_DIR}/libraries OPTIONS_DEFINE= APACHE DOCS MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE +OPTIONS_SUB= yes +SUB_FILES= pkg-message +PLIST_SUB+= ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR} + APACHE_DESC= Configure for Apache-2.x MSSQL_DESC= Install MSSQL support for PHP MYSQL_DESC= Install MySQL support for PHP MYSQLI_DESC= Install MySQLi support for PHP ODBC_DESC= Install ODBC support for PHP PGSQL_DESC= Install PostgreSQL support for PHP SQLITE_DESC= Install SQLite support for PHP -.include +APACHE_VARS= USE_APACHE_RUN=22+ +DOCS_VARS= SUB_LIST+=HASHMARK= +DOCS_VARS_OFF= SUB_LIST+=HASHMARK=\# +MSSQL_VARS= USE_PHP+=mssql +MYSQL_VARS= USE_PHP+=mysql +MYSQLI_VARS= USE_PHP+=mysqli +ODBC_VARS= USE_PHP+=odbc +PGSQL_VARS= USE_PHP+=pgsql +SQLITE_VARS= USE_PHP+=sqlite3 -SUB_FILES= pkg-message -.if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ -PLIST_SUB+= NOAPACHE="" CONFDIR=${CONFDIR_REL} +# These variables are specifically defined for Apache +CONF= codeigniter.conf CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes -.else -PLIST_SUB+= NOAPACHE="@comment " -.endif -PLIST_SUB+= ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR} - -.if ${PORT_OPTIONS:MMSSQL} -USE_PHP+= mssql -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MMYSQLI} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MODBC} -USE_PHP+= odbc -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= sqlite3 -.endif - -.if ${PORT_OPTIONS:MDOCS} -SUB_LIST+= HASHMARK=\# -.else -SUB_LIST+= HASHMARK= -.endif - -CONF= codeigniter.conf +PLIST_SUB+= CONFDIR=${CONFDIR_REL} SUB_FILES+= ${CONF} do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR} - @for i in ${CI_CONF_FILES}; do \ + cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR} + for i in ${CI_CONF_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${WWWDIR}/$$i.sample; \ done -post-install: -.if ${PORT_OPTIONS:MAPACHE} - ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf; -.endif -.if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.endif +post-install-APACHE-on: + ${MKDIR} ${STAGEDIR}${CONFDIR} + ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf; +post-install-DOCS-on: + cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -.include +.include Index: branches/2015Q4/www/codeigniter/distinfo =================================================================== --- branches/2015Q4/www/codeigniter/distinfo (revision 400674) +++ branches/2015Q4/www/codeigniter/distinfo (revision 400675) @@ -1,2 +1,2 @@ -SHA256 (bcit-ci-codeigniter-2.2.5_GH0.tgz) = c529a0016ae982c67ee899475fa5cdf4b27ffed4d18714270f78e3a4554d9de3 -SIZE (bcit-ci-codeigniter-2.2.5_GH0.tgz) = 1970502 +SHA256 (bcit-ci-codeigniter-2.2.6_GH0.tgz) = 3105487ab24430027d0a8ed49329d84e59c3f464be492e1d427d3b49352fbe85 +SIZE (bcit-ci-codeigniter-2.2.6_GH0.tgz) = 1971743 Index: branches/2015Q4/www/codeigniter/pkg-descr =================================================================== --- branches/2015Q4/www/codeigniter/pkg-descr (revision 400674) +++ branches/2015Q4/www/codeigniter/pkg-descr (revision 400675) @@ -1,5 +1,5 @@ CodeIgniter is a powerful PHP framework with a very small footprint, built for developers who need a simple and elegant toolkit to create full-featured web applications. -WWW: http://http://www.codeigniter.com/ +WWW: http://www.codeigniter.com/ Index: branches/2015Q4/www/codeigniter/pkg-plist =================================================================== --- branches/2015Q4/www/codeigniter/pkg-plist (revision 400674) +++ branches/2015Q4/www/codeigniter/pkg-plist (revision 400675) @@ -1,187 +1,187 @@ -%%NOAPACHE%%%%CONFDIR%%/codeigniter.conf +%%APACHE%%%%CONFDIR%%/codeigniter.conf %%WWWDIR%%/application/cache/.htaccess %%WWWDIR%%/application/cache/index.html %%WWWDIR%%/application/config/index.html @sample %%WWWDIR%%/%%CI_CONF_DIR%%/autoload.php.sample @sample %%WWWDIR%%/%%CI_CONF_DIR%%/config.php.sample @sample %%WWWDIR%%/%%CI_CONF_DIR%%/constants.php.sample @sample %%WWWDIR%%/%%CI_CONF_DIR%%/database.php.sample @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%%/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/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 %%WWWDIR%%/application/language/english/index.html %%WWWDIR%%/application/language/index.html %%WWWDIR%%/application/libraries/index.html %%WWWDIR%%/application/logs/index.html %%WWWDIR%%/application/models/index.html %%WWWDIR%%/application/third_party/index.html %%WWWDIR%%/application/views/index.html %%WWWDIR%%/application/views/welcome_message.php %%WWWDIR%%/index.php.sample %%WWWDIR%%/system/core/Benchmark.php %%WWWDIR%%/system/core/CodeIgniter.php %%WWWDIR%%/system/core/Common.php %%WWWDIR%%/system/core/Config.php %%WWWDIR%%/system/core/Controller.php %%WWWDIR%%/system/core/Exceptions.php %%WWWDIR%%/system/core/Hooks.php %%WWWDIR%%/system/core/Input.php %%WWWDIR%%/system/core/Lang.php %%WWWDIR%%/system/core/Loader.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/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/cubrid/cubrid_driver.php %%WWWDIR%%/system/database/drivers/cubrid/cubrid_forge.php %%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/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/pdo/index.html %%WWWDIR%%/system/database/drivers/pdo/pdo_driver.php %%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/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/drivers/sqlsrv/index.html %%WWWDIR%%/system/database/drivers/sqlsrv/sqlsrv_driver.php %%WWWDIR%%/system/database/drivers/sqlsrv/sqlsrv_forge.php %%WWWDIR%%/system/database/drivers/sqlsrv/sqlsrv_result.php %%WWWDIR%%/system/database/drivers/sqlsrv/sqlsrv_utility.php %%WWWDIR%%/system/database/index.html %%WWWDIR%%/system/fonts/index.html %%WWWDIR%%/system/fonts/texb.ttf %%WWWDIR%%/system/helpers/array_helper.php %%WWWDIR%%/system/helpers/captcha_helper.php %%WWWDIR%%/system/helpers/cookie_helper.php %%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/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 %%WWWDIR%%/system/helpers/string_helper.php %%WWWDIR%%/system/helpers/text_helper.php %%WWWDIR%%/system/helpers/typography_helper.php %%WWWDIR%%/system/helpers/url_helper.php %%WWWDIR%%/system/helpers/xml_helper.php %%WWWDIR%%/system/language/english/calendar_lang.php %%WWWDIR%%/system/language/english/date_lang.php %%WWWDIR%%/system/language/english/db_lang.php %%WWWDIR%%/system/language/english/email_lang.php %%WWWDIR%%/system/language/english/form_validation_lang.php %%WWWDIR%%/system/language/english/ftp_lang.php %%WWWDIR%%/system/language/english/imglib_lang.php %%WWWDIR%%/system/language/english/index.html %%WWWDIR%%/system/language/english/migration_lang.php %%WWWDIR%%/system/language/english/number_lang.php %%WWWDIR%%/system/language/english/profiler_lang.php %%WWWDIR%%/system/language/english/unit_test_lang.php %%WWWDIR%%/system/language/english/upload_lang.php %%WWWDIR%%/system/language/index.html %%WWWDIR%%/system/libraries/Cache/Cache.php %%WWWDIR%%/system/libraries/Cache/drivers/Cache_apc.php %%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/index.html %%WWWDIR%%/system/libraries/Cache/index.html %%WWWDIR%%/system/libraries/Calendar.php %%WWWDIR%%/system/libraries/Cart.php %%WWWDIR%%/system/libraries/Driver.php %%WWWDIR%%/system/libraries/Email.php %%WWWDIR%%/system/libraries/Encrypt.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/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/Table.php %%WWWDIR%%/system/libraries/Trackback.php %%WWWDIR%%/system/libraries/Typography.php %%WWWDIR%%/system/libraries/Unit_test.php %%WWWDIR%%/system/libraries/Upload.php %%WWWDIR%%/system/libraries/User_agent.php %%WWWDIR%%/system/libraries/Xmlrpc.php %%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 Index: branches/2015Q4 =================================================================== --- branches/2015Q4 (revision 400674) +++ branches/2015Q4 (revision 400675) Property changes on: branches/2015Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r400597