fix compile error

PR:		33290
Submitted by:	Yen-Ming Lee <leeym@utopia.leeym.com>

4 files changed, 74 insertions, 12 deletions

diff --git a/devel/regexx/files/patch-Makefile.am b/devel/regexx/files/patch-Makefile.am
index 49ede54b7b8f..c41a346d0d8e 100644
--- a/devel/regexx/files/patch-Makefile.am
+++ b/devel/regexx/files/patch-Makefile.am
@@ -1,8 +1,9 @@
---- Makefile.am.orig	Fri Mar  2 01:12:07 2001
-+++ Makefile.am	Fri Mar  2 01:12:44 2001
-@@ -5,4 +5,4 @@
+--- Makefile.am.orig	Tue Mar 13 22:42:20 2001
++++ Makefile.am	Sat Dec 29 08:24:46 2001
+@@ -4,5 +4,5 @@
+ ## $Date: 2001/03/13 14:42:20 $
  ##
  
--SUBDIRS = pcre src examples
+-SUBDIRS = @subdirs@ src examples
 +SUBDIRS = src examples
  EXTRA_DIST = regexx.spec.in
diff --git a/devel/regexx/files/patch-configure.in b/devel/regexx/files/patch-configure.in
index 50db322ccd9f..c8ac52a237f5 100644
--- a/devel/regexx/files/patch-configure.in
+++ b/devel/regexx/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Thu Mar 15 14:20:50 2001
-+++ configure.in	Thu Mar 15 14:21:01 2001
+--- configure.in.orig	Fri Mar 16 21:16:17 2001
++++ configure.in	Sat Dec 29 08:24:46 2001
 @@ -23,7 +23,5 @@
  
  dnl Checks for library functions.
diff --git a/devel/regexx/files/patch-src::Makefile.am b/devel/regexx/files/patch-src::Makefile.am
index 04dc86120e33..ba7bb6c89866 100644
--- a/devel/regexx/files/patch-src::Makefile.am
+++ b/devel/regexx/files/patch-src::Makefile.am
@@ -1,6 +1,7 @@
---- src/Makefile.am.orig	Thu Mar 15 14:40:46 2001
-+++ src/Makefile.am	Tue Mar 13 22:42:21 2001
-@@ -5,6 +5,7 @@
+--- src/Makefile.am.orig	Tue Mar 13 22:42:21 2001
++++ src/Makefile.am	Sat Dec 29 08:24:46 2001
+@@ -4,7 +4,8 @@
+ ## $Date: 2001/03/13 14:42:21 $
  ##
  
 +INCLUDES=`pcre-config --cflags`
diff --git a/devel/regexx/files/patch-src::regexx.cc b/devel/regexx/files/patch-src::regexx.cc
index 589b62e5d99f..4d15587279d8 100644
--- a/devel/regexx/files/patch-src::regexx.cc
+++ b/devel/regexx/files/patch-src::regexx.cc
@@ -1,9 +1,69 @@
---- src/regexx.cc.orig	Fri Mar  2 01:23:27 2001
-+++ src/regexx.cc	Fri Mar  2 01:23:54 2001
-@@ -28,5 +28,5 @@
+--- src/regexx.cc.orig	Tue Mar 13 22:42:21 2001
++++ src/regexx.cc	Sat Dec 29 08:27:24 2001
+@@ -27,7 +27,7 @@
+ // $Date: 2001/03/13 14:42:21 $
  
  #include "regexx.hh"
 -#include "../pcre/pcre.h"
 +#include "pcre.h"
  
  const unsigned int&
+ regexx::Regexx::exec(int _flags)
+@@ -43,13 +43,13 @@
+     if(m_preg == NULL) {
+       throw CompileException(errptr);
+     }
+-    pcre_fullinfo(m_preg, NULL, PCRE_INFO_CAPTURECOUNT, (void*)&m_capturecount);
++    pcre_fullinfo((const pcre *)m_preg, NULL, PCRE_INFO_CAPTURECOUNT, (void*)&m_capturecount);
+     m_compiled = true;
+   }
+ 
+   if(!m_study && (_flags&study)) {
+     const char *errptr;
+-    m_extra = pcre_study(m_preg, 0, &errptr);
++    m_extra = pcre_study((const pcre *)m_preg, 0, &errptr);
+     if(errptr != NULL)
+       throw CompileException(errptr);
+     m_study = true;
+@@ -63,20 +63,20 @@
+   int ssc;
+   m_matches = 0;
+ 
+-  ssc = pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),0,eflags,ssv,33);
++  ssc = pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),0,eflags,ssv,33);
+   bool ret = (ssc > 0);
+ 
+   if(_flags&global) {
+     if(_flags&nomatch)
+       while(ret) {
+ 	m_matches++;
+-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
++	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+       }
+     else if(_flags&noatom)
+       while(ret) {
+ 	m_matches++;
+ 	match.push_back(RegexxMatch(m_str,ssv[0],ssv[1]-ssv[0]));
+-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
++	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+       }
+     else
+       while(ret) {
+@@ -89,7 +89,7 @@
+ 	  else
+ 	    match.back().atom.push_back(RegexxMatchAtom(m_str,0,0));
+         }
+-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
++	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+       }
+   }
+   else {
+@@ -114,7 +114,7 @@
+ 	  else
+ 	    match.back().atom.push_back(RegexxMatchAtom(m_str,0,0));
+ 	}
+-	ret = (pcre_exec(m_preg,m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
++	ret = (pcre_exec((const pcre *)m_preg,(const pcre_extra *)m_extra,m_str.c_str(),m_str.length(),ssv[1],eflags,ssv,33) > 0);
+       }
+     }
+   }