FreeBSD Bugzilla – Attachment 142873 Details for
Bug 189970
[stage] Add staging support to www/codeigniter
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
codeigniter-2.diff
codeigniter-2.diff (text/plain), 6.64 KB, created by
Zsolt Udvari
on 2014-05-23 09:40:37 UTC
(
hide
)
Description:
codeigniter-2.diff
Filename:
MIME Type:
Creator:
Zsolt Udvari
Created:
2014-05-23 09:40:37 UTC
Size:
6.64 KB
patch
obsolete
>diff -ur codeigniter.orig/Makefile codeigniter/Makefile >--- codeigniter.orig/Makefile 2014-05-13 18:52:44.000000000 +0200 >+++ codeigniter/Makefile 2014-05-22 18:44:40.000000000 +0200 >@@ -13,6 +13,8 @@ > > USES= zip > >+NEED_ROOT=yes >+ > CONFLICTS= codeigniter-1.[0-9]* > > NO_BUILD= yes >@@ -22,7 +24,6 @@ > 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 @@ > ${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 @@ > PGSQL_DESC= Install PostgreSQL support for PHP > SQLITE_DESC= Install SQLite support for PHP > >-NO_STAGE= yes > .include <bsd.port.pre.mk> > >+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= > .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 <bsd.port.post.mk> >Only in codeigniter.orig/files: codeigniter-development-cgi.conf.in >Only in codeigniter.orig/files: codeigniter-development.conf.in >Only in codeigniter.orig/files: codeigniter-production-cgi.conf.in >Only in codeigniter.orig/files: codeigniter-production.conf.in >Only in codeigniter/files: codeigniter.conf.in >Only in codeigniter.orig/files: pkg-message-apache.in >Only in codeigniter.orig/files: pkg-message-noapache.in >Only in codeigniter/files: pkg-message.in >diff -ur codeigniter.orig/pkg-descr codeigniter/pkg-descr >--- codeigniter.orig/pkg-descr 2014-05-13 18:52:44.000000000 +0200 >+++ codeigniter/pkg-descr 2014-05-13 19:03:06.000000000 +0200 >@@ -2,4 +2,4 @@ > 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 >diff -ur codeigniter.orig/pkg-plist codeigniter/pkg-plist >--- codeigniter.orig/pkg-plist 2014-05-13 18:52:44.000000000 +0200 >+++ codeigniter/pkg-plist 2014-05-18 17:17:59.000000000 +0200 >@@ -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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 189970
:
142872
|
142873
|
142874
|
142875
|
143802