Attachment 47146 Details for Bug 72275 – newphp4.patch

[patch] newphp4.patch

newphp4.patch (text/plain; charset=us-ascii), 2.43 KB, created by stijn on 2005-01-19 07:45:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: stijn

Created: 2005-01-19 07:45:44 UTC

Size: 2.43 KB

patch

obsolete

>Index: Mk/bsd.php.mk
>===================================================================
>RCS file: /freebsd/cvsroot/ports/Mk/bsd.php.mk,v
>retrieving revision 1.12
>diff -u -r1.12 bsd.php.mk
>--- Mk/bsd.php.mk	17 Dec 2004 06:48:01 -0000	1.12
>+++ Mk/bsd.php.mk	19 Jan 2005 07:39:06 -0000
>@@ -259,6 +259,12 @@
> 		sockets sqlite sybase_ct sysvmsg sysvsem sysvshm \
> 		tidy tokenizer wddx xml xmlrpc xsl xslt yaz yp zip zlib
> 
>+.if ${PHP_VER} == 4
>+_USE_PHP_DUMMY=	openssl
>+.else
>+_USE_PHP_DUMMY=
>+.endif
>+
> bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
> bz2_DEPENDS=	archivers/php${PHP_VER}-bz2
> calendar_DEPENDS=	misc/php${PHP_VER}-calendar
>@@ -333,12 +339,14 @@
> 
> .	for extension in ${USE_PHP}
> .		if ${_USE_PHP_ALL:M${extension}} != "" && exists(${PORTSDIR}/${${extension}_DEPENDS})
>-.			if defined(USE_PHP_BUILD)
>+.			if ${_USE_PHP_DUMMY:M${extension}} == ""
>+.				if defined(USE_PHP_BUILD)
> BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
>-.			endif
>+.				endif
> RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS}
>+.			endif
> .		else
>-isyes=		${extension}
>+isyes=			${extension}
> .			if ${isyes:L} != "yes"
> check-makevars::
> 				@${ECHO_CMD} "Unknown extension ${extension}."
>Index: lang/php4/Makefile
>===================================================================
>RCS file: /freebsd/cvsroot/ports/lang/php4/Makefile,v
>retrieving revision 1.82
>diff -u -r1.82 Makefile
>--- lang/php4/Makefile	10 Jan 2005 17:00:34 -0000	1.82
>+++ lang/php4/Makefile	19 Jan 2005 07:36:56 -0000
>@@ -33,6 +33,15 @@
> 		--with-config-file-scan-dir=${PREFIX}/etc/php \
> 		--disable-all
> 
>+# Need to compile openssl statically
>+.if !defined(WITHOUT_OPENSSL)
>+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
>+		--with-openssl-dir=${OPENSSLBASE}
>+
>+LDFLAGS+=	-lcrypto -lssl
>+USE_OPENSSL=	yes
>+.endif
>+
> .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
> CONFIGURE_ARGS+=--with-regex=php
> .else
>Index: lang/php4/Makefile.ext
>===================================================================
>RCS file: /freebsd/cvsroot/ports/lang/php4/Makefile.ext,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile.ext
>--- lang/php4/Makefile.ext	10 Jan 2005 17:00:34 -0000	1.8
>+++ lang/php4/Makefile.ext	19 Jan 2005 07:38:15 -0000
>@@ -227,6 +227,7 @@
> .endif
> 
> .if ${PHP_MODNAME} == "openssl"
>+BROKEN=		"Does not work with php4"
> CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
> 		--with-openssl-dir=${OPENSSLBASE}
>

Actions: View | Diff

Attachments on bug 72275: 47145 | 47146