Date: Sat, 29 Dec 2001 08:37:04 +0800 (CST) From: Yen-Ming Lee <leeym@utopia.leeym.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/33290: update port: devel/regexx from bento logs Message-ID: <20011229003704.DA468C3B00@utopia.leeym.com>
next in thread | raw e-mail | index | archive | help
>Number: 33290 >Category: ports >Synopsis: update port: devel/regexx from bento logs >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Dec 28 16:40:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 4.4-STABLE i386 >Organization: >Environment: System: FreeBSD utopia.leeym.com 4.4-STABLE FreeBSD 4.4-STABLE #81: Thu Dec 20 05:34:09 CST 2001 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386 >Description: fix compiling error. >How-To-Repeat: http://bento.freebsd.org/errorlogs/4-full/regexx-0.98.1.log >Fix: diff -ruN --exclude CVS /usr/ports/devel/regexx/files/patch-Makefile.am regexx/files/patch-Makefile.am --- /usr/ports/devel/regexx/files/patch-Makefile.am Wed Mar 7 19:49:53 2001 +++ regexx/files/patch-Makefile.am Sat Dec 29 08:28:07 2001 @@ -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 -ruN --exclude CVS /usr/ports/devel/regexx/files/patch-configure.in regexx/files/patch-configure.in --- /usr/ports/devel/regexx/files/patch-configure.in Thu Mar 15 14:52:47 2001 +++ regexx/files/patch-configure.in Sat Dec 29 08:28:07 2001 @@ -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 -ruN --exclude CVS /usr/ports/devel/regexx/files/patch-src::Makefile.am regexx/files/patch-src::Makefile.am --- /usr/ports/devel/regexx/files/patch-src::Makefile.am Thu Mar 15 14:52:47 2001 +++ regexx/files/patch-src::Makefile.am Sat Dec 29 08:28:06 2001 @@ -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 -ruN --exclude CVS /usr/ports/devel/regexx/files/patch-src::regexx.cc regexx/files/patch-src::regexx.cc --- /usr/ports/devel/regexx/files/patch-src::regexx.cc Wed Mar 7 19:49:53 2001 +++ regexx/files/patch-src::regexx.cc Sat Dec 29 08:28:06 2001 @@ -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); + } + } + } >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011229003704.DA468C3B00>