From owner-svn-ports-all@FreeBSD.ORG Thu Jun 19 00:01:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 213AE8DC; Thu, 19 Jun 2014 00:01:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C9312FDD; Thu, 19 Jun 2014 00:01:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5J01c1O051002; Thu, 19 Jun 2014 00:01:38 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5J01cQY050990; Thu, 19 Jun 2014 00:01:38 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406190001.s5J01cQY050990@svn.freebsd.org> From: John Marino Date: Thu, 19 Jun 2014 00:01:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358331 - in head/www/codeigniter: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2014 00:01:39 -0000 Author: marino Date: Thu Jun 19 00:01:37 2014 New Revision: 358331 URL: http://svnweb.freebsd.org/changeset/ports/358331 QAT: https://qat.redports.org/buildarchive/r358331/ Log: www/codeigniter: Support stage and update URL PR: 189777 Submitted by: Zsolt Udvari Approved by: maintainer (Bo-Yi Wu) (first version) Verified by: Redports 8x pass Added: head/www/codeigniter/files/codeigniter.conf.in (contents, props changed) head/www/codeigniter/files/pkg-message.in (contents, props changed) Modified: head/www/codeigniter/Makefile head/www/codeigniter/pkg-descr head/www/codeigniter/pkg-plist Modified: head/www/codeigniter/Makefile ============================================================================== --- head/www/codeigniter/Makefile Wed Jun 18 23:12:04 2014 (r358330) +++ head/www/codeigniter/Makefile Thu Jun 19 00:01:37 2014 (r358331) @@ -13,6 +13,8 @@ COMMENT= Framework for developing PHP we USES= zip +NEED_ROOT=yes + CONFLICTS= codeigniter-1.[0-9]* NO_BUILD= yes @@ -22,7 +24,6 @@ WANT_PHP_WEB= yes CI_SYS_DIR= system CI_CONF_DIR= application/config WRKSRC= ${WRKDIR}/CodeIgniter-${PORTVERSION} -WWWDIR= ${PREFIX}/www/codeigniter PORTDOCS= * LATEST_LINK= codeigniter-devel @@ -62,10 +63,9 @@ STD_BITS= ${CI_CONF_DIR}/index.html \ ${CI_SYS_DIR}/language \ ${CI_SYS_DIR}/libraries -OPTIONS_DEFINE= APACHE PROD MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE +OPTIONS_DEFINE= APACHE MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE APACHE_DESC= Configure for Apache-2.x -PROD_DESC= Install for production server (see: make confighelp) MSSQL_DESC= Install MSSQL support for PHP MYSQL_DESC= Install MySQL support for PHP MYSQLI_DESC= Install MySQLi support for PHP @@ -73,43 +73,21 @@ ODBC= Install ODBC support for PHP PGSQL_DESC= Install PostgreSQL support for PHP SQLITE_DESC= Install SQLite support for PHP -NO_STAGE= yes .include +SUB_FILES= pkg-message .if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22+ - PLIST_SUB+= NOAPACHE="" CONFDIR=${CONFDIR_REL} CONFDIR= ${PREFIX}/${CONFDIR_REL} CONFDIR_REL= ${APACHEETCDIR}/Includes - -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 - -.if ${PHP_SAPI:Mcgi} == "cgi" && ${PHP_SAPI:Mmod} == "" -CGI_EXT= -cgi -.else -CGI_EXT= -.endif - DEFAULT_PHP_VER=5 -SUB_LIST+= PHPCGI=${WITH_PHP_CGI} - -.if ${PORT_OPTIONS:MPROD} -PROD= production -.else -PROD= development -.endif - .if ${PORT_OPTIONS:MMSSQL} USE_PHP+= mssql .endif @@ -140,78 +118,30 @@ SUB_LIST+= HASHMARK=\# SUB_LIST+= HASHMARK= .endif -CONF= codeigniter-${PROD}${CGI_EXT}.conf +CONF= codeigniter.conf SUB_FILES+= ${CONF} -confighelp: - @${ECHO_MSG} "" - @${ECHO_MSG} "On a production server, the Apache DocumentRoot is" - @${ECHO_MSG} "updated to point to the CodeIgniter webroot directory." - @${ECHO_MSG} "In this configuration, the CodeIgniter application is" - @${ECHO_MSG} "accessed at http://www.myservername.com/." - @${ECHO_MSG} "" - @${ECHO_MSG} "A non-production server, CodeIgniter is installed at" - @${ECHO_MSG} "the /codeigniter URL, and the CodeIgniter application is" - @${ECHO_MSG} "accessed at http://www.myservername.com/codeigniter/." - @${ECHO_MSG} "" - @${ECHO_MSG} "For more information, please see:" - @${ECHO_MSG} "http://codeigniter.com/user_guide/installation/index.html" - @${ECHO_MSG} "" - do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR} @for i in ${CI_CONF_FILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${WWWDIR}/$$i.sample; \ done - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${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 | \ + ${STAGEDIR}${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 - @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${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; \ - else \ - ${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \ - if [ ! -z "$UPGRADE_TOOL" ]; then \ - ${ECHO_MSG} "===> WARNING: You may have to manually merge changes to ${WWWDIR}/$$i.sample into ${WWWDIR}/$$i"; \ - fi; \ - fi; \ - done .if ${PORT_OPTIONS:MAPACHE} - @if [ -d "${CONFDIR}" ]; then \ - ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \ - else \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \ - ${ECHO_MSG} "${CONFDIR} doesn't exist," ; \ - ${ECHO_MSG} "so I cannot install codeigniter.conf there!" ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi + ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf; .endif .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${DOCSDIR} -.endif - - @${CAT} ${PKGMESSAGE} - -.if ${CGI_EXT} == "-cgi" - @${ECHO_MSG} "" - @${ECHO_MSG} "Your CodeIgniter installation was configured to use the PHP CGI binary." - @${ECHO_MSG} "The PHP CGI binary is expected to be referenced by the URL:" - @${ECHO_MSG} "" - @${ECHO_MSG} " ${WITH_PHP_CGI}" - @${ECHO_MSG} "" - @${ECHO_MSG} "If this is incorrect, reinstall the port with the WITH_PHP_CGI knob" - @${ECHO_MSG} "set to the correct URL." + @cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif - @${ECHO_MSG} "*********************************************************************" .include Added: head/www/codeigniter/files/codeigniter.conf.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/codeigniter/files/codeigniter.conf.in Thu Jun 19 00:01:37 2014 (r358331) @@ -0,0 +1,16 @@ +AddType application/x-httpd-php .php +AddType application/x-httpd-php-source .phps +DirectoryIndex index.php index.html + +%%HASHMARK%%Alias /codeigniter/user_guide %%DOCSDIR%% +Alias /codeigniter %%WWWDIR%% + +%%HASHMARK%% +%%HASHMARK%% Order deny,allow +%%HASHMARK%% Allow from all +%%HASHMARK%% + + + Order deny,allow + Allow from all + Added: head/www/codeigniter/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/codeigniter/files/pkg-message.in Thu Jun 19 00:01:37 2014 (r358331) @@ -0,0 +1,20 @@ + +********************************************************************* +You have just installed the CodeIgniter web application framework. + +Note that you should restart your web server to ensure that +the CodeIgniter configuration file is loaded. + +To use CodeIgniter: +- Copy %%WWWDIR%%/index.php.sample as index.php to the root + of your project directory. +- Copy the %%WWWDIR%%/application/config/ directory. + Edit files, especially base URL in config.php. +- If you intend to use a database, copy and edit the + %%WWWDIR%%/application/config/database.php too. +- For more information please check + http://ellislab.com/codeigniter/user-guide/installation/index.html + +- If you are upgrading from a prior release, please visit: + http://codeigniter.com/user_guide/installation/upgrading.html + for additional post-installation instructions. Modified: head/www/codeigniter/pkg-descr ============================================================================== --- head/www/codeigniter/pkg-descr Wed Jun 18 23:12:04 2014 (r358330) +++ head/www/codeigniter/pkg-descr Thu Jun 19 00:01:37 2014 (r358331) @@ -2,4 +2,4 @@ CodeIgniter is a powerful PHP framework built for PHP coders who need a simple and elegant toolkit to create full-featured web applications. -WWW: http://codeigniter.com/ +WWW: http://ellislab.com/codeigniter Modified: head/www/codeigniter/pkg-plist ============================================================================== --- head/www/codeigniter/pkg-plist Wed Jun 18 23:12:04 2014 (r358330) +++ head/www/codeigniter/pkg-plist Thu Jun 19 00:01:37 2014 (r358331) @@ -59,7 +59,6 @@ %%WWWDIR%%/application/third_party/index.html %%WWWDIR%%/application/views/index.html %%WWWDIR%%/application/views/welcome_message.php -%%WWWDIR%%/index.php %%WWWDIR%%/index.php.sample %%WWWDIR%%/system/core/Benchmark.php %%WWWDIR%%/system/core/CodeIgniter.php