Date: Tue, 28 Jan 2014 05:45:10 +0400 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@freebsd.org Cc: ale@FreeBSD.org Subject: ports/186182: [PATCH] lang/php5: fix plist Message-ID: <20140128014510.D00A7178A6@hades.panopticon> Resent-Message-ID: <201401280150.s0S1o0gw026146@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186182
>Category: ports
>Synopsis: [PATCH] lang/php5: fix plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 28 01:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix plist for WITHOUT_CLI case
- Make use of OPTIONS_SUB to simplify the Makefile
Port maintainer (ale@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- php5-5.4.24.patch begins here ---
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
--- php5-5.4.24.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140128014510.D00A7178A6>