[Midnightbsd-cvs] mports [16074] U trunk/converters/php5-mbstring/files: fix build

[laffer1 at midnightbsd.org]

Revision: 16074
          http://svnweb.midnightbsd.org/mports/?rev=16074
Author:   laffer1
Date:     2014-03-21 20:43:26 -0400 (Fri, 21 Mar 2014)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/converters/php5-mbstring/files/patch-config.m4

Property Changed:
----------------
    trunk/converters/php5-mbstring/files/patch-config.m4
    trunk/converters/php5-mbstring/files/patch-oniguruma_regerror.c

Modified: trunk/converters/php5-mbstring/files/patch-config.m4
===================================================================
--- trunk/converters/php5-mbstring/files/patch-config.m4	2014-03-21 22:52:49 UTC (rev 16073)
+++ trunk/converters/php5-mbstring/files/patch-config.m4	2014-03-22 00:43:26 UTC (rev 16074)
@@ -1,6 +1,37 @@
---- config.m4.orig	Fri Sep  8 07:42:50 2006
-+++ config.m4	Fri Sep  8 07:43:00 2006
-@@ -66,7 +66,6 @@
+--- config.m4.orig	2009-11-25 02:30:06.000000000 +0100
++++ config.m4	2010-04-12 09:59:54.000000000 +0200
+@@ -43,6 +43,30 @@
+     PHP_ADD_INCLUDE([$ext_builddir/$dir])
+   done
+ 
++  dnl This is PECL build, check if bundled PCRE library is used
++  old_CPPFLAGS=$CPPFLAGS
++  CPPFLAGS=$INCLUDES
++  AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++  ],[
++    PHP_PCRE_REGEX=yes
++  ],[
++    AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++    ],[
++      PHP_PCRE_REGEX=pecl
++      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
++    ],[
++      PHP_PCRE_REGEX=no
++    ])
++  ])
++
+   if test "$ext_shared" = "no"; then
+     PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
+     out="php_config.h"
+@@ -80,7 +104,6 @@
  int foo(int x, ...) {
  	va_list va;
  	va_start(va, x);
@@ -8,3 +39,13 @@
  	va_arg(va, char *);
  	va_arg(va, double);
  	return 0;
+@@ -347,6 +370,9 @@
+ [  --with-onig[=DIR]         MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
+                             If DIR is not set, the bundled oniguruma will be used], no, no)
+ 
++PHP_ARG_WITH(pcre-dir, pcre install prefix,
++[  --with-pcre-dir           MBSTRING: pcre install prefix], no, no)
++
+ if test "$PHP_MBSTRING" != "no"; then  
+   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
+ 


Property changes on: trunk/converters/php5-mbstring/files/patch-config.m4
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/converters/php5-mbstring/files/patch-oniguruma_regerror.c
===================================================================
--- trunk/converters/php5-mbstring/files/patch-oniguruma_regerror.c	2014-03-21 22:52:49 UTC (rev 16073)
+++ trunk/converters/php5-mbstring/files/patch-oniguruma_regerror.c	2014-03-22 00:43:26 UTC (rev 16074)

Property changes on: trunk/converters/php5-mbstring/files/patch-oniguruma_regerror.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property