View | Details | Raw Unified | Return to bug 189777 | Differences between
and this patch

Collapse All | Expand All

(-)codeigniter/Makefile (-85 / +15 lines)
Lines 13-18 Link Here
13
13
14
USES=		zip
14
USES=		zip
15
15
16
NEED_ROOT=yes
17
16
CONFLICTS=	codeigniter-1.[0-9]*
18
CONFLICTS=	codeigniter-1.[0-9]*
17
19
18
NO_BUILD=	yes
20
NO_BUILD=	yes
Lines 22-28 Link Here
22
CI_SYS_DIR=	system
24
CI_SYS_DIR=	system
23
CI_CONF_DIR=	application/config
25
CI_CONF_DIR=	application/config
24
WRKSRC=		${WRKDIR}/CodeIgniter-${PORTVERSION}
26
WRKSRC=		${WRKDIR}/CodeIgniter-${PORTVERSION}
25
WWWDIR=		${PREFIX}/www/codeigniter
26
PORTDOCS=	*
27
PORTDOCS=	*
27
28
28
LATEST_LINK=	codeigniter-devel
29
LATEST_LINK=	codeigniter-devel
Lines 62-71 Link Here
62
		${CI_SYS_DIR}/language \
63
		${CI_SYS_DIR}/language \
63
		${CI_SYS_DIR}/libraries
64
		${CI_SYS_DIR}/libraries
64
65
65
OPTIONS_DEFINE=	APACHE PROD MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE
66
OPTIONS_DEFINE=	APACHE MSSQL MYSQL MYSQLI ODBC PGSQL SQLITE
66
67
67
APACHE_DESC=	Configure for Apache-2.x
68
APACHE_DESC=	Configure for Apache-2.x
68
PROD_DESC=	Install for production server (see: make confighelp)
69
MSSQL_DESC=	Install MSSQL support for PHP
69
MSSQL_DESC=	Install MSSQL support for PHP
70
MYSQL_DESC=	Install MySQL support for PHP
70
MYSQL_DESC=	Install MySQL support for PHP
71
MYSQLI_DESC=	Install MySQLi support for PHP
71
MYSQLI_DESC=	Install MySQLi support for PHP
Lines 73-115 Link Here
73
PGSQL_DESC=	Install PostgreSQL support for PHP
73
PGSQL_DESC=	Install PostgreSQL support for PHP
74
SQLITE_DESC=	Install SQLite support for PHP
74
SQLITE_DESC=	Install SQLite support for PHP
75
75
76
NO_STAGE=	yes
77
.include <bsd.port.pre.mk>
76
.include <bsd.port.pre.mk>
78
77
78
SUB_FILES=	pkg-message
79
.if ${PORT_OPTIONS:MAPACHE}
79
.if ${PORT_OPTIONS:MAPACHE}
80
USE_APACHE_RUN=	22+
80
USE_APACHE_RUN=	22+
81
82
PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
81
PLIST_SUB+=	NOAPACHE="" CONFDIR=${CONFDIR_REL}
83
CONFDIR=	${PREFIX}/${CONFDIR_REL}
82
CONFDIR=	${PREFIX}/${CONFDIR_REL}
84
CONFDIR_REL=	${APACHEETCDIR}/Includes
83
CONFDIR_REL=	${APACHEETCDIR}/Includes
85
86
PKGMESSAGE=	pkg-message-apache
87
SUB_FILES=	pkg-message-apache
88
.else
84
.else
89
PLIST_SUB+=	NOAPACHE="@comment "
85
PLIST_SUB+=	NOAPACHE="@comment "
90
PKGMESSAGE=	pkg-message-noapache
91
SUB_FILES=	pkg-message-noapache
92
.endif
86
.endif
93
PLIST_SUB+=	ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR}
87
PLIST_SUB+=	ECHO_MSG=${ECHO_MSG} CI_CONF_DIR=${CI_CONF_DIR}
94
88
95
WITH_PHP_CGI?=	/cgi-bin/php
96
97
.if ${PHP_SAPI:Mcgi} == "cgi" && ${PHP_SAPI:Mmod} == ""
98
CGI_EXT=	-cgi
99
.else
100
CGI_EXT=
101
.endif
102
103
DEFAULT_PHP_VER=5
89
DEFAULT_PHP_VER=5
104
90
105
SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
106
107
.if ${PORT_OPTIONS:MPROD}
108
PROD=		production
109
.else
110
PROD=		development
111
.endif
112
113
.if ${PORT_OPTIONS:MMSSQL}
91
.if ${PORT_OPTIONS:MMSSQL}
114
USE_PHP+=	mssql
92
USE_PHP+=	mssql
115
.endif
93
.endif
Lines 140-217 Link Here
140
SUB_LIST+=	HASHMARK=
118
SUB_LIST+=	HASHMARK=
141
.endif
119
.endif
142
120
143
CONF=		codeigniter-${PROD}${CGI_EXT}.conf
121
CONF=		codeigniter.conf
144
SUB_FILES+=	${CONF}
122
SUB_FILES+=	${CONF}
145
123
146
confighelp:
147
	@${ECHO_MSG} ""
148
	@${ECHO_MSG} "On a production server, the Apache DocumentRoot is"
149
	@${ECHO_MSG} "updated to point to the CodeIgniter webroot directory."
150
	@${ECHO_MSG} "In this configuration, the CodeIgniter application is"
151
	@${ECHO_MSG} "accessed at http://www.myservername.com/."
152
	@${ECHO_MSG} ""
153
	@${ECHO_MSG} "A non-production server, CodeIgniter is installed at"
154
	@${ECHO_MSG} "the /codeigniter URL, and the CodeIgniter application is"
155
	@${ECHO_MSG} "accessed at http://www.myservername.com/codeigniter/."
156
	@${ECHO_MSG} ""
157
	@${ECHO_MSG} "For more information, please see:"
158
	@${ECHO_MSG} "http://codeigniter.com/user_guide/installation/index.html"
159
	@${ECHO_MSG} ""
160
161
do-install:
124
do-install:
162
	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${WWWDIR}
125
	@cd ${WRKSRC} && ${COPYTREE_SHARE} "${STD_BITS}" ${STAGEDIR}${WWWDIR}
163
	@for i in ${CI_CONF_FILES}; do \
126
	@for i in ${CI_CONF_FILES}; do \
164
		${INSTALL_DATA} ${WRKSRC}/$$i ${WWWDIR}/$$i.sample; \
127
		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${WWWDIR}/$$i.sample; \
165
	done
128
	done
166
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
129
	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
167
	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
130
	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
168
		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
131
		${STAGEDIR}${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
169
	@${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
132
	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
170
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
133
	@${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | \
171
		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
134
		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
172
	@${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
135
	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
173
	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
136
	@${ECHO_CMD} '@exec ${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | \
174
		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
137
		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
175
138
176
post-install:
139
post-install:
177
	@for i in ${CI_CONF_FILES}; do \
178
		if [ ! -f ${WWWDIR}/$$i ]; then \
179
			${CP} -p ${WWWDIR}/$$i.sample ${WWWDIR}/$$i; \
180
		else \
181
			${ECHO_MSG} "===> Customized ${WWWDIR}/$$i has not been overwritten"; \
182
			if [ ! -z "$UPGRADE_TOOL" ]; then \
183
				${ECHO_MSG} "===> WARNING: You may have to manually merge changes to ${WWWDIR}/$$i.sample into ${WWWDIR}/$$i"; \
184
			fi; \
185
		fi; \
186
	done
187
.if ${PORT_OPTIONS:MAPACHE}
140
.if ${PORT_OPTIONS:MAPACHE}
188
	@if [ -d "${CONFDIR}" ]; then \
141
	  ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}/codeigniter.conf;
189
	  ${CP} ${WRKDIR}/${CONF} ${CONFDIR}/codeigniter.conf; \
190
	else \
191
	  ${ECHO_MSG} "" ; \
192
	  ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \
193
	  ${ECHO_MSG} "${CONFDIR} doesn't exist," ; \
194
	  ${ECHO_MSG} "so I cannot install codeigniter.conf there!" ; \
195
	  ${ECHO_MSG} "" ; \
196
	  ${FALSE} ; \
197
	fi
198
.endif
142
.endif
199
.if ${PORT_OPTIONS:MDOCS}
143
.if ${PORT_OPTIONS:MDOCS}
200
	@cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${DOCSDIR}
144
	@cd ${WRKSRC}/user_guide && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
201
.endif
202
203
	@${CAT} ${PKGMESSAGE}
204
205
.if ${CGI_EXT} == "-cgi"
206
	@${ECHO_MSG}	""
207
	@${ECHO_MSG}	"Your CodeIgniter installation was configured to use the PHP CGI binary."
208
	@${ECHO_MSG}	"The PHP CGI binary is expected to be referenced by the URL:"
209
	@${ECHO_MSG}	""
210
	@${ECHO_MSG}	"	${WITH_PHP_CGI}"
211
	@${ECHO_MSG}	""
212
	@${ECHO_MSG}	"If this is incorrect, reinstall the port with the WITH_PHP_CGI knob"
213
	@${ECHO_MSG}	"set to the correct URL."
214
.endif
145
.endif
215
	@${ECHO_MSG}	"*********************************************************************"
216
146
217
.include <bsd.port.post.mk>
147
.include <bsd.port.post.mk>
(-)codeigniter/pkg-descr (-1 / +1 lines)
Lines 2-5 Link Here
2
built for PHP coders who need a simple and elegant toolkit to create
2
built for PHP coders who need a simple and elegant toolkit to create
3
full-featured web applications.
3
full-featured web applications.
4
4
5
WWW: http://codeigniter.com/
5
WWW: http://ellislab.com/codeigniter
(-)codeigniter/pkg-plist (-1 lines)
Lines 59-65 Link Here
59
%%WWWDIR%%/application/third_party/index.html
59
%%WWWDIR%%/application/third_party/index.html
60
%%WWWDIR%%/application/views/index.html
60
%%WWWDIR%%/application/views/index.html
61
%%WWWDIR%%/application/views/welcome_message.php
61
%%WWWDIR%%/application/views/welcome_message.php
62
%%WWWDIR%%/index.php
63
%%WWWDIR%%/index.php.sample
62
%%WWWDIR%%/index.php.sample
64
%%WWWDIR%%/system/core/Benchmark.php
63
%%WWWDIR%%/system/core/Benchmark.php
65
%%WWWDIR%%/system/core/CodeIgniter.php
64
%%WWWDIR%%/system/core/CodeIgniter.php

Return to bug 189777