[pkgsrc/trunk]: pkgsrc Move some options that only apply to the PHP CGI packa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4e96cc9c009
branches:  trunk
changeset: 498873:a4e96cc9c009
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 04 20:13:59 2005 +0000

description:
Move some options that only apply to the PHP CGI package from Makefile.php
(shared with ap-php) into the php package Makefile.

diffstat:

 lang/php5/Makefile     |  5 ++++-
 lang/php5/Makefile.php |  4 +---
 www/php4/Makefile      |  5 ++++-
 www/php4/Makefile.php  |  4 +---
 4 files changed, 10 insertions(+), 8 deletions(-)

diffs (74 lines):

diff -r 0124832e64ac -r a4e96cc9c009 lang/php5/Makefile
--- a/lang/php5/Makefile        Sun Sep 04 20:13:06 2005 +0000
+++ b/lang/php5/Makefile        Sun Sep 04 20:13:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/09/03 13:37:36 adrianp Exp $
+# $NetBSD: Makefile,v 1.15 2005/09/04 20:13:59 jlam Exp $
 #
 
 PKGNAME=               php-${PHP_BASE_VERS}
@@ -14,6 +14,9 @@
 
 .include "Makefile.php"
 
+CONFIGURE_ARGS+=       --enable-discard-path
+CONFIGURE_ARGS+=       --enable-force-cgi-redirect
+
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
 
diff -r 0124832e64ac -r a4e96cc9c009 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Sun Sep 04 20:13:06 2005 +0000
+++ b/lang/php5/Makefile.php    Sun Sep 04 20:13:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.6 2005/05/31 10:01:37 dillo Exp $
+# $NetBSD: Makefile.php,v 1.7 2005/09/04 20:13:59 jlam Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -24,8 +24,6 @@
 CONFIGURE_ARGS+=       --without-sqlite
 CONFIGURE_ARGS+=       --without-iconv
 
-CONFIGURE_ARGS+=       --enable-discard-path
-CONFIGURE_ARGS+=       --enable-force-cgi-redirect
 CONFIGURE_ARGS+=       --enable-memory-limit
 CONFIGURE_ARGS+=       --enable-track-vars
 
diff -r 0124832e64ac -r a4e96cc9c009 www/php4/Makefile
--- a/www/php4/Makefile Sun Sep 04 20:13:06 2005 +0000
+++ b/www/php4/Makefile Sun Sep 04 20:13:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/08/18 07:47:50 tron Exp $
+# $NetBSD: Makefile,v 1.50 2005/09/04 20:13:59 jlam Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
 CATEGORIES+=           lang
@@ -14,6 +14,9 @@
 
 .include "Makefile.php"
 
+CONFIGURE_ARGS+=       --enable-discard-path
+CONFIGURE_ARGS+=       --enable-force-cgi-redirect
+
 CGIDIR=                        ${PREFIX}/libexec/cgi-bin
 EGDIR=                 ${PREFIX}/share/examples/php
 
diff -r 0124832e64ac -r a4e96cc9c009 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sun Sep 04 20:13:06 2005 +0000
+++ b/www/php4/Makefile.php     Sun Sep 04 20:13:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.22 2005/05/31 10:01:40 dillo Exp $
+# $NetBSD: Makefile.php,v 1.23 2005/09/04 20:13:59 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -18,8 +18,6 @@
 CONFIGURE_ARGS+=       --with-exec-dir=${PREFIX}/libexec/php4
 CONFIGURE_ARGS+=       --with-regex=system
 
-CONFIGURE_ARGS+=       --enable-discard-path
-CONFIGURE_ARGS+=       --enable-force-cgi-redirect
 CONFIGURE_ARGS+=       --enable-memory-limit
 CONFIGURE_ARGS+=       --enable-track-vars