[pkgsrc/trunk]: pkgsrc Allow choosing of CGI or FastCGI as SAPI for the PHP i...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd12de2fa26e
branches:  trunk
changeset: 503473:dd12de2fa26e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 21 09:13:28 2005 +0000

description:
Allow choosing of CGI or FastCGI as SAPI for the PHP interpreter.
This is done via an option group, default is CGI. Note that the
FastCGI interpreter can still be used for normal CGI, but there
might be security issues involved in doing so.

diffstat:

 lang/php5/Makefile |  12 +++++++++++-
 www/php4/Makefile  |  12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 16abb22c3c05 -r dd12de2fa26e lang/php5/Makefile
--- a/lang/php5/Makefile        Mon Nov 21 07:24:51 2005 +0000
+++ b/lang/php5/Makefile        Mon Nov 21 09:13:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/08 21:04:36 jdolecek Exp $
+# $NetBSD: Makefile,v 1.19 2005/11/21 09:13:28 joerg Exp $
 #
 
 PKGNAME=               php-${PHP_BASE_VERS}
@@ -12,10 +12,20 @@
 USE_TOOLS+=            gmake
 LIBTOOL_OVERRIDE=      # empty
 
+PKG_OPTIONS_REQUIRED_GROUPS+=  sapi
+PKG_OPTIONS_GROUP.sapi=        cgi fastcgi
+PKG_SUGGESTED_OPTIONS+=        cgi
+
 .include "Makefile.php"
 
+.if !empty(PKG_OPTIONS:Mcgi)
 CONFIGURE_ARGS+=       --enable-discard-path
 CONFIGURE_ARGS+=       --enable-force-cgi-redirect
+.endif
+
+.if !empty(PKG_OPTIONS:Mfastcgi)
+CONFIGURE_ARGS+=       --enable-fastcgi
+.endif
 
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
diff -r 16abb22c3c05 -r dd12de2fa26e www/php4/Makefile
--- a/www/php4/Makefile Mon Nov 21 07:24:51 2005 +0000
+++ b/www/php4/Makefile Mon Nov 21 09:13:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/11/08 20:33:55 bouyer Exp $
+# $NetBSD: Makefile,v 1.58 2005/11/21 09:13:28 joerg Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
 PKGREVISION=           2
@@ -13,10 +13,20 @@
 LIBTOOL_OVERRIDE=      # empty
 USE_TOOLS+=            gmake
 
+PKG_OPTIONS_REQUIRED_GROUPS+=  sapi
+PKG_OPTIONS_GROUP.sapi=        cgi fastcgi
+PKG_SUGGESTED_OPTIONS+=        cgi
+
 .include "Makefile.php"
 
+.if !empty(PKG_OPTIONS:Mcgi)
 CONFIGURE_ARGS+=       --enable-discard-path
 CONFIGURE_ARGS+=       --enable-force-cgi-redirect
+.endif
+
+.if !empty(PKG_OPTIONS:Mfastcgi)
+CONFIGURE_ARGS+=       --enable-fastcgi
+.endif
 
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php