ports/79227: [patch] Mk/bsd.php.mk: incorrect processing WANT_PHP_CGI when lang/php installed

[Mykola Dzham]

>Number:         79227
>Category:       ports
>Synopsis:       [patch] Mk/bsd.php.mk: incorrect processing WANT_PHP_CGI when lang/php installed
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 25 14:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Mykola Dzham
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD workstation.levsha.org.ua 5.3-STABLE FreeBSD 5.3-STABLE #1: Fri Mar 11 19:34:53 EET 2005 levsha at workstation.levsha.org.ua:/usr/obj/usr/src/sys/LEVSHA i386


>Description:

Can not install port with WANT_PHP_CGI=yes when lang/php4 (or lang/php5) installed:
the error "This port requires the CGI version of PHP" occur.

>How-To-Repeat:
Install lang/php4
Try to install www/pnews :
# cd /usr/ports/www/pnews
# make
This port requires the CGI version of PHP, but you have already
installed a conflicting PHP port without CGI.
*** Error code 1

Stop in /usr/ports/www/pnews.

>Fix:

*** bsd.php.mk.orig	Fri Mar 25 15:19:16 2005
--- bsd.php.mk	Fri Mar 25 15:19:44 2005
***************
*** 112,118 ****
  		@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
  		@${FALSE}
  .	else
! .	if defined(PHP_VERSION) && ${PHP_SAPI} != "cgi"
  check-makevars::
  		@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
  		@${ECHO_CMD} "installed a conflicting PHP port without CGI."
--- 112,118 ----
  		@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
  		@${FALSE}
  .	else
! .	if defined(PHP_VERSION) && ${PHP_SAPI} != "full" && ${PHP_SAPI} != "cgi"
  check-makevars::
  		@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
  		@${ECHO_CMD} "installed a conflicting PHP port without CGI."

>Release-Note:
>Audit-Trail:
>Unformatted: