[pkgsrc/trunk]: pkgsrc use PHP-provided regex on Solaris, PHP doesn't build w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe35f521dd86
branches:  trunk
changeset: 501028:fe35f521dd86
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Oct 16 12:06:05 2005 +0000

description:
use PHP-provided regex on Solaris, PHP doesn't build with system regex
there

PR: 31047 by Gilles Dauphin

diffstat:

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

diffs (48 lines):

diff -r a7609080e505 -r fe35f521dd86 lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Sun Oct 16 11:59:35 2005 +0000
+++ b/lang/php5/Makefile.php    Sun Oct 16 12:06:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.9 2005/10/08 21:04:36 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.10 2005/10/16 12:06:05 jdolecek Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -18,7 +18,13 @@
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
+
+# The Solaris system regex structures miss re_magic used by PHP build 
+.if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=       --with-regex=system
+.else
+CONFIGURE_ARGS+=       --with-regex=php
+.endif
 
 CONFIGURE_ARGS+=       --without-mysql
 CONFIGURE_ARGS+=       --without-sqlite
diff -r a7609080e505 -r fe35f521dd86 www/php4/Makefile.php
--- a/www/php4/Makefile.php     Sun Oct 16 11:59:35 2005 +0000
+++ b/www/php4/Makefile.php     Sun Oct 16 12:06:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.26 2005/10/08 21:12:53 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.27 2005/10/16 12:06:05 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -18,7 +18,15 @@
 
 CONFIGURE_ARGS+=       --with-config-file-path=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-exec-dir=${PREFIX}/libexec/php4
+
+.include "../../mk/bsd.prefs.mk"
+
+# The Solaris system regex structures miss re_magic used by PHP build 
+.if ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=       --with-regex=system
+.else
+CONFIGURE_ARGS+=       --with-regex=php
+.endif
 
 CONFIGURE_ARGS+=       --enable-memory-limit
 CONFIGURE_ARGS+=       --enable-track-vars