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

Collapse All | Expand All

(-)Mk/bsd.php.mk (-3 / +11 lines)
Lines 259-264 Link Here
259
		sockets sqlite sybase_ct sysvmsg sysvsem sysvshm \
259
		sockets sqlite sybase_ct sysvmsg sysvsem sysvshm \
260
		tidy tokenizer wddx xml xmlrpc xsl xslt yaz yp zip zlib
260
		tidy tokenizer wddx xml xmlrpc xsl xslt yaz yp zip zlib
261
261
262
.if ${PHP_VER} == 4
263
_USE_PHP_DUMMY=	openssl
264
.else
265
_USE_PHP_DUMMY=
266
.endif
267
262
bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
268
bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
263
bz2_DEPENDS=	archivers/php${PHP_VER}-bz2
269
bz2_DEPENDS=	archivers/php${PHP_VER}-bz2
264
calendar_DEPENDS=	misc/php${PHP_VER}-calendar
270
calendar_DEPENDS=	misc/php${PHP_VER}-calendar
Lines 333-344 Link Here
333
339
334
.	for extension in ${USE_PHP}
340
.	for extension in ${USE_PHP}
335
.		if ${_USE_PHP_ALL:M${extension}} != "" && exists(${PORTSDIR}/${${extension}_DEPENDS})
341
.		if ${_USE_PHP_ALL:M${extension}} != "" && exists(${PORTSDIR}/${${extension}_DEPENDS})
336
.			if defined(USE_PHP_BUILD)
342
.			if ${_USE_PHP_DUMMY:M${extension}} == ""
343
.				if defined(USE_PHP_BUILD)
337
BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
344
BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
338
.			endif
345
.				endif
339
RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
346
RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
347
.			endif
340
.		else
348
.		else
341
isyes=		${extension}
349
isyes=			${extension}
342
.			if ${isyes:L} != "yes"
350
.			if ${isyes:L} != "yes"
343
check-makevars::
351
check-makevars::
344
				@${ECHO_CMD} "Unknown extension ${extension}."
352
				@${ECHO_CMD} "Unknown extension ${extension}."
(-)lang/php4/Makefile (+9 lines)
Lines 33-38 Link Here
33
		--with-config-file-scan-dir=${PREFIX}/etc/php \
33
		--with-config-file-scan-dir=${PREFIX}/etc/php \
34
		--disable-all
34
		--disable-all
35
35
36
# Need to compile openssl statically
37
.if !defined(WITHOUT_OPENSSL)
38
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
39
		--with-openssl-dir=${OPENSSLBASE}
40
41
LDFLAGS+=	-lcrypto -lssl
42
USE_OPENSSL=	yes
43
.endif
44
36
.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
45
.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
37
CONFIGURE_ARGS+=--with-regex=php
46
CONFIGURE_ARGS+=--with-regex=php
38
.else
47
.else
(-)lang/php4/Makefile.ext (+1 lines)
Lines 228-233 Link Here
228
.endif
228
.endif
229
229
230
.if ${PHP_MODNAME} == "openssl"
230
.if ${PHP_MODNAME} == "openssl"
231
BROKEN=		"Does not work with php4"
231
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
232
CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
232
		--with-openssl-dir=${OPENSSLBASE}
233
		--with-openssl-dir=${OPENSSLBASE}

Return to bug 72275