Attachment 139836 Details for Bug 186182 – php5-5.4.24.patch

[patch] php5-5.4.24.patch

php5-5.4.24.patch (text/plain), 1.88 KB, created by Dmitry Marakasov on 2014-01-28 01:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-01-28 01:50:00 UTC

Size: 1.88 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 341494)
>+++ Makefile	(working copy)
>@@ -39,6 +39,7 @@
> 
> OPTIONS_DEFINE=	CLI CGI FPM APACHE AP2FILTER EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
> OPTIONS_DEFAULT=CLI CGI IPV6 LINKTHR
>+OPTIONS_SUB=	YES
> 
> CLI_DESC=	Build CLI version
> CGI_DESC=	Build CGI version
>@@ -71,17 +72,13 @@
> 
> .if ${PORT_OPTIONS:MCLI}
> PHP_SAPI+=	cli
>-PLIST_SUB+=	CLI=""
> .else
>-PLIST_SUB+=	CLI="@comment "
> CONFIGURE_ARGS+=--disable-cli
> .endif
> 
> .if ${PORT_OPTIONS:MCGI}
> PHP_SAPI+=	cgi
>-PLIST_SUB+=	CGI=""
> .else
>-PLIST_SUB+=	CGI="@comment "
> CONFIGURE_ARGS+=--disable-cgi
> .endif
> 
>@@ -91,9 +88,6 @@
> CONFIGURE_ARGS+=--enable-fpm \
> 		--with-fpm-user=${WWWOWN} \
> 		--with-fpm-group=${WWWGRP}
>-PLIST_SUB+=	FPM=""
>-.else
>-PLIST_SUB+=	FPM="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MAPACHE} && ${PORT_OPTIONS:MEMBED}
>@@ -112,17 +106,17 @@
> PKGMESSAGE=	${PKGDIR}/pkg-message.mod
> MODULENAME=	lib${PORTNAME}
> SHORTMODNAME=	${PORTNAME}
>-PLIST_SUB+=	APACHE=""
>-.else
>-PLIST_SUB+=	APACHE="@comment "
> .endif
> 
> .if ${PORT_OPTIONS:MEMBED}
> PHP_SAPI+=	embed
> CONFIGURE_ARGS+=--enable-embed
>-PLIST_SUB+=	EMBED=""
>+.endif
>+
>+.if ${PORT_OPTIONS:MEMBED} || ${PORT_OPTIONS:MCLI}
>+PLIST_SUB+=	HAS_SAPI_INCDIR=""
> .else
>-PLIST_SUB+=	EMBED="@comment "
>+PLIST_SUB+=	HAS_SAPI_INCDIR="@comment "
> .endif
> 
> .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 341494)
>+++ pkg-plist	(working copy)
>@@ -258,9 +258,9 @@
> @dirrmtry include/php/ext
> @dirrm include/php/main/streams
> @dirrm include/php/main
>-@dirrm include/php/sapi/cli
>+%%CLI%%@dirrm include/php/sapi/cli
> %%EMBED%%@dirrm include/php/sapi/embed
>-@dirrm include/php/sapi
>+%%HAS_SAPI_INCDIR%%@dirrm include/php/sapi
> @dirrmtry include/php
> @dirrm lib/php/build
> @dirrmtry lib/php

Actions: View | Diff

Attachments on bug 186182: 139836