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

Collapse All | Expand All

(-)Mk/Scripts/create-manifest.sh (-1 / +3 lines)
Lines 104-110 done Link Here
104
104
105
exec >${dp_METADIR}/+DISPLAY
105
exec >${dp_METADIR}/+DISPLAY
106
106
107
[ -f ${dp_PKGMESSAGE} ] && cat ${dp_PKGMESSAGE}
107
for message in ${dp_PKGMESSAGE}; do
108
  [ -f "${message}" ] && cat "${message}"
109
done
108
110
109
# Try and keep these messages in sync with check-deprecated
111
# Try and keep these messages in sync with check-deprecated
110
if [ ${dp_MAINTAINER} = "ports@FreeBSD.org" ]; then
112
if [ ${dp_MAINTAINER} = "ports@FreeBSD.org" ]; then
(-)Mk/Uses/php.mk (-35 / +29 lines)
Lines 204-210 _INCLUDE_USES_PHP_POST_MK=yes Link Here
204
204
205
.  if ${php_ARGS:Mext} || ${php_ARGS:Mzend}
205
.  if ${php_ARGS:Mext} || ${php_ARGS:Mzend}
206
PHP_MODNAME?=	${PORTNAME}
206
PHP_MODNAME?=	${PORTNAME}
207
PHP_EXT_PKGMESSAGE=	${WRKDIR}/php-ext-pkg-message
208
PKGMESSAGE+=	${PHP_EXT_PKGMESSAGE}
207
PHP_HEADER_DIRS?=	""
209
PHP_HEADER_DIRS?=	""
210
# If there is no priority defined, we wing it.
211
.    if !defined(PHP_MOD_PRIO)
212
.      if defined(USE_PHP)
213
# If an extension needs another, put it after the others.
214
PHP_MOD_PRIO=	30
215
.      else
216
# Otherwise, put it where it with everybody.
217
PHP_MOD_PRIO=	20
218
.      endif
219
.    endif
220
INI_FILE=	etc/php/ext-${PHP_MOD_PRIO}-${PHP_MODNAME}.ini
208
221
209
do-install:
222
do-install:
210
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}
223
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}
Lines 219-226 do-install: Link Here
219
	@${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \
232
	@${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \
220
		> ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
233
		> ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
221
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
234
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
235
.    if ${php_ARGS:Mzend}
236
	@${ECHO_CMD} "zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" > ${STAGEDIR}${PREFIX}/${INI_FILE}
237
.    else
238
	@${ECHO_CMD} "extension=${PHP_MODNAME}.so" > ${STAGEDIR}${PREFIX}/${INI_FILE}
239
.    endif
222
240
223
add-plist-info: add-plist-phpext
241
_USES_stage+=	899:add-plist-phpext
224
add-plist-phpext:
242
add-plist-phpext:
225
	@${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" \
243
	@${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" \
226
		>> ${TMPPLIST}
244
		>> ${TMPPLIST}
Lines 234-277 add-plist-phpext: Link Here
234
		>> ${TMPPLIST}
252
		>> ${TMPPLIST}
235
	@${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \
253
	@${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \
236
		>> ${TMPPLIST}
254
		>> ${TMPPLIST}
237
	@${ECHO_CMD} "@dir etc/php" \
255
	@${ECHO_CMD} "${INI_FILE}" \
238
		>> ${TMPPLIST}
256
		>> ${TMPPLIST}
257
	@${ECHO_CMD} "****************************************************************************" > ${PHP_EXT_PKGMESSAGE}
258
	@${ECHO_CMD} "" >> ${PHP_EXT_PKGMESSAGE}
259
	@${ECHO_CMD} "The following line has been added to your ${PREFIX}/${INI_FILE}" >> ${PHP_EXT_PKGMESSAGE}
260
	@${ECHO_CMD} "configuration file to automatically load the installed extension:" >> ${PHP_EXT_PKGMESSAGE}
261
	@${ECHO_CMD} "" >> ${PHP_EXT_PKGMESSAGE}
239
.    if ${php_ARGS:Mzend}
262
.    if ${php_ARGS:Mzend}
240
	@${ECHO_CMD} "@exec echo zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \
263
	@${ECHO_CMD} "zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" >> ${PHP_EXT_PKGMESSAGE}
241
		>> ${TMPPLIST}
242
.    else
243
	@${ECHO_CMD} "@exec echo extension=${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \
244
		>> ${TMPPLIST}
245
.    endif
246
	@${ECHO_CMD} "@unexec cp %D/etc/php/extensions.ini %D/etc/php/extensions.ini.orig" \
247
		>> ${TMPPLIST}
248
.    if ${php_ARGS:Mzend}
249
	@${ECHO_CMD} "@unexec grep -v zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \
250
		>> ${TMPPLIST}
251
.    else
252
	@${ECHO_CMD} "@unexec grep -v extension=${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \
253
		>> ${TMPPLIST}
254
.    endif
255
	@${ECHO_CMD} "@unexec rm %D/etc/php/extensions.ini.orig" \
256
		>> ${TMPPLIST}
257
	@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
258
		>> ${TMPPLIST}
259
260
package-message: php-ini
261
262
php-ini:
263
	@${ECHO_CMD} "****************************************************************************"
264
	@${ECHO_CMD} ""
265
	@${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/extensions.ini"
266
	@${ECHO_CMD} "configuration file to automatically load the installed extension:"
267
	@${ECHO_CMD} ""
268
.    if ${php_ARGS:Mzend}
269
	@${ECHO_CMD} "zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so"
270
.    else
264
.    else
271
	@${ECHO_CMD} "extension=${PHP_MODNAME}.so"
265
	@${ECHO_CMD} "extension=${PHP_MODNAME}.so" >> ${PHP_EXT_PKGMESSAGE}
272
.    endif
266
.    endif
273
	@${ECHO_CMD} ""
267
	@${ECHO_CMD} "" >> ${PHP_EXT_PKGMESSAGE}
274
	@${ECHO_CMD} "****************************************************************************"
268
	@${ECHO_CMD} "****************************************************************************" >> ${PHP_EXT_PKGMESSAGE}
275
.  endif
269
.  endif
276
270
277
# Extensions
271
# Extensions
(-)databases/php-adodb-ext/Makefile (-2 / +1 lines)
Lines 16-23 WRKSRC= ${WRKDIR}/adodb-${PORTVERSION:S/.//} Link Here
16
16
17
USES=		dos2unix php:ext zip
17
USES=		dos2unix php:ext zip
18
IGNORE_WITH_PHP=56 70
18
IGNORE_WITH_PHP=56 70
19
19
PHP_MODNAME=	adodb
20
SUB_FILES=	pkg-message
21
20
22
.include <bsd.port.pre.mk>
21
.include <bsd.port.pre.mk>
23
22
(-)databases/php-adodb-ext/files/pkg-message.in (-13 lines)
Removed Link Here
1
*****************************************************************************
2
The ADOdb extension has been installed successful.
3
Add a line containing
4
5
       extension=adodb.so
6
7
to your %%LOCALBASE%%/etc/php/extensions.ini to load it.
8
If you have the Zend Optimizer installed, add the line
9
10
       zend_extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/adodb.so
11
12
to your [zend] section in the php.ini file, too.
13
*****************************************************************************
(-)devel/ioncube/Makefile (+5 lines)
Lines 31-35 do-install: Link Here
31
		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader.so
31
		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader.so
32
	${INSTALL_DATA} ${WRKSRC}/ioncube_loader_fre_${PHP_INSTVER}_ts.so \
32
	${INSTALL_DATA} ${WRKSRC}/ioncube_loader_fre_${PHP_INSTVER}_ts.so \
33
		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader_ts.so
33
		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader_ts.so
34
# Put it before opcache, like the previous pkg-message was saying
35
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
36
	@${ECHO_CMD} "[Zend]" > ${STAGEDIR}${PREFIX}/etc/php/ext-05-ioncube.ini
37
	@${ECHO_CMD} "zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader.so" >> ${STAGEDIR}${PREFIX}/etc/php/ext-05-ioncube.ini
38
	@${ECHO_CMD} "zend_extension_ts=${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader_ts.so" >> ${STAGEDIR}${PREFIX}/etc/php/ext-05-ioncube.ini
34
39
35
.include <bsd.port.mk>
40
.include <bsd.port.mk>
(-)devel/ioncube/files/pkg-message.in (-10 / +4 lines)
Lines 1-14 Link Here
1
2
You have installed the ionCube loader package.
1
You have installed the ionCube loader package.
3
2
4
Edit %%LOCALBASE%%/etc/php.ini or %%LOCALBASE%%/etc/php/extensions.ini
3
The following lines have been added to %%PREFIX%%/etc/php/ext-05-ioncube.ini so
5
and add this three lines:
4
that the extension has been automatically activated.
6
5
7
--------------------------------------------------------------------------------
8
[Zend]
6
[Zend]
9
zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader.so"
7
zend_extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader.so
10
zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader_ts.so"
8
zend_extension_ts=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader_ts.so
11
--------------------------------------------------------------------------------
12
13
NOTE: If you have any Zend Extension already installed - you need put this before
14
existing zend_extension lines.
(-)devel/ioncube/pkg-plist (+1 lines)
Lines 1-2 Link Here
1
etc/php/ext-05-ioncube.ini
1
lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader.so
2
lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader.so
2
lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader_ts.so
3
lib/php/%%PHP_EXT_DIR%%/ioncube/ioncube_loader_ts.so
(-)devel/php5-ice/Makefile (-17 / +2 lines)
Lines 34-60 PHP_MODNAME?= IcePHP Link Here
34
post-install:
34
post-install:
35
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/*.so
35
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/*.so
36
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
36
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
37
37
	@${ECHO_CMD} "extension=${PHP_MODNAME}.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-ice.ini
38
add-plist-info:
39
	@${ECHO_CMD} "@exec mkdir -p %D/etc/php" \
40
		>> ${TMPPLIST}
41
	@${ECHO_CMD} "@exec echo extension=${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \
42
		>> ${TMPPLIST}
43
	@${ECHO_CMD} "@unexec cp %D/etc/php/extensions.ini %D/etc/php/extensions.ini.orig" \
44
		>> ${TMPPLIST}
45
	@${ECHO_CMD} "@unexec grep -v extension=${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \
46
		>> ${TMPPLIST}
47
	@${ECHO_CMD} "@unexec rm %D/etc/php/extensions.ini.orig" \
48
		>> ${TMPPLIST}
49
	@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
50
		>> ${TMPPLIST}
51
	@${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
52
		>> ${TMPPLIST}
53
38
54
security-check:
39
security-check:
55
	@${ECHO_CMD} "****************************************************************************"
40
	@${ECHO_CMD} "****************************************************************************"
56
	@${ECHO_CMD} ""
41
	@${ECHO_CMD} ""
57
	@${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/extensions.ini"
42
	@${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/ext-20-ice.ini"
58
	@${ECHO_CMD} "configuration file to automatically load the installed extension:"
43
	@${ECHO_CMD} "configuration file to automatically load the installed extension:"
59
	@${ECHO_CMD} ""
44
	@${ECHO_CMD} ""
60
	@${ECHO_CMD} "extension=${PHP_MODNAME}.so"
45
	@${ECHO_CMD} "extension=${PHP_MODNAME}.so"
(-)devel/php5-ice/pkg-plist (+1 lines)
Lines 1-3 Link Here
1
etc/php/ext-20-ice.ini
1
lib/php/%%PHP_EXT_DIR%%/IcePHP.so
2
lib/php/%%PHP_EXT_DIR%%/IcePHP.so
2
share/pear/Glacier2.php
3
share/pear/Glacier2.php
3
share/pear/Glacier2/Metrics.php
4
share/pear/Glacier2/Metrics.php
(-)graphics/mapserver/Makefile (-13 / +9 lines)
Lines 125-135 CMAKE_ARGS+= -DWITH_POSTGIS=0 Link Here
125
.endif
125
.endif
126
126
127
.if ${PORT_OPTIONS:MPHP}
127
.if ${PORT_OPTIONS:MPHP}
128
BUILD_DEPENDS+=		${LOCALBASE}/bin/php-config:lang/php56
128
USES+=			php:build
129
RUN_BUILDS+=		${LOCALBASE}/bin/php-config:lang/php56
129
IGNORE_WITH_PHP=	55 70
130
PHP_EXTENSION_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e "s,/usr/local/,,"
131
CMAKE_ARGS+=		-DWITH_PHP=1
130
CMAKE_ARGS+=		-DWITH_PHP=1
132
PLIST_SUB+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
133
PLIST_SUB+=		PHP=""
131
PLIST_SUB+=		PHP=""
134
.else
132
.else
135
CMAKE_ARGS+=		-DWITH_PHP=0
133
CMAKE_ARGS+=		-DWITH_PHP=0
Lines 188-210 do-install: Link Here
188
.endfor
186
.endfor
189
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
187
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib
190
188
191
.if ${PORT_OPTIONS:MPHP}
189
do-install-PHP-on:
192
	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}
190
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}
193
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \
191
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \
194
		${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}/
192
		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/
195
.endif
196
193
197
.if ${PORT_OPTIONS:MPYTHON}
194
do-install-PYTHON-on:
198
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
195
	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
199
	(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
196
	(cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/)
200
.endif
201
197
202
post-install:
198
post-install:
203
	@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
199
	@${LN} -s ${PREFIX}/lib/libmapserver.so.7.0.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.2
204
	@${LN} -s ${PREFIX}/lib/libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
200
	@${LN} -s ${PREFIX}/lib/libmapserver.so.2 ${STAGEDIR}${PREFIX}/lib/libmapserver.so
205
201
206
.if ${PORT_OPTIONS:MPHP}
202
post-install-PHP-on:
207
	@${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${PREFIX}/etc/php/extensions.ini"
203
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
208
.endif
204
	@${ECHO_CMD} "extension=php_mapscript.so" > ${STAGEDIR}${PREFIX}/etc/php/ext-20-php_mapscript.ini
209
205
210
.include <bsd.port.mk>
206
.include <bsd.port.mk>
(-)graphics/mapserver/pkg-plist (-1 / +2 lines)
Lines 8-16 bin/shptreetst Link Here
8
bin/shptreevis
8
bin/shptreevis
9
bin/sortshp
9
bin/sortshp
10
bin/tile4ms
10
bin/tile4ms
11
%%PHP%%etc/php/ext-20-php_mapscript.ini
11
lib/libmapserver.so
12
lib/libmapserver.so
12
lib/libmapserver.so.2
13
lib/libmapserver.so.2
13
lib/libmapserver.so.7.0.1
14
lib/libmapserver.so.7.0.1
14
%%PHP%%%%PHP_EXTENSION_DIR%%/php_mapscript.so
15
%%PHP%%lib/php/%%PHP_EXT_DIR%%/php_mapscript.so
15
%%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
16
%%PYTHON%%%%PYTHON_SITELIBDIR%%/mapscript.py
16
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so
17
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_mapscript.so
(-)lang/php55/Makefile.ext (+2 lines)
Lines 217-222 USE_OPENSSL= yes Link Here
217
.endif
217
.endif
218
218
219
.if ${PHP_MODNAME} == "opcache"
219
.if ${PHP_MODNAME} == "opcache"
220
# This is needed by Zend extensions, keep before everything.
221
PHP_MOD_PRIO=	10
220
CONFIGURE_ARGS+=--enable-opcache
222
CONFIGURE_ARGS+=--enable-opcache
221
.endif
223
.endif
222
224
(-)lang/php56/Makefile.ext (+2 lines)
Lines 217-222 USE_OPENSSL= yes Link Here
217
.endif
217
.endif
218
218
219
.if ${PHP_MODNAME} == "opcache"
219
.if ${PHP_MODNAME} == "opcache"
220
# This is needed by Zend extensions, keep before everything.
221
PHP_MOD_PRIO=	10
220
CONFIGURE_ARGS+=--enable-opcache
222
CONFIGURE_ARGS+=--enable-opcache
221
.endif
223
.endif
222
224
(-)lang/php70/Makefile.ext (+2 lines)
Lines 209-214 USE_OPENSSL= yes Link Here
209
.endif
209
.endif
210
210
211
.if ${PHP_MODNAME} == "opcache"
211
.if ${PHP_MODNAME} == "opcache"
212
# This is needed by Zend extensions, keep before everything.
213
PHP_MOD_PRIO=	10
212
CONFIGURE_ARGS+=--enable-opcache
214
CONFIGURE_ARGS+=--enable-opcache
213
USES+=	localbase
215
USES+=	localbase
214
.endif
216
.endif

Return to bug 210697