From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 28 01:50:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 090976B6 for ; Tue, 28 Jan 2014 01:50:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D73211757 for ; Tue, 28 Jan 2014 01:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s0S1o01Z026147 for ; Tue, 28 Jan 2014 01:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s0S1o0gw026146; Tue, 28 Jan 2014 01:50:00 GMT (envelope-from gnats) Resent-Date: Tue, 28 Jan 2014 01:50:00 GMT Resent-Message-Id: <201401280150.s0S1o0gw026146@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB9F34C6; Tue, 28 Jan 2014 01:45:24 +0000 (UTC) Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A66E81722; Tue, 28 Jan 2014 01:45:24 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1W7xjn-00063C-FB; Tue, 28 Jan 2014 05:45:15 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 191A4BAF; Tue, 28 Jan 2014 05:45:11 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id D00A7178A6; Tue, 28 Jan 2014 05:45:10 +0400 (MSK) Message-Id: <20140128014510.D00A7178A6@hades.panopticon> Date: Tue, 28 Jan 2014 05:45:10 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/186182: [PATCH] lang/php5: fix plist Cc: ale@FreeBSD.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 01:50:01 -0000 >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: