Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Dec 2002 17:21:24 +0900
From:      KATO Tsuguru <tkato@prontomail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/46461: Update port: devel/regexx
Message-ID:  <20021222172124.7ebe62f8.tkato@prontomail.com>

next in thread | raw e-mail | index | archive | help

>Number:         46461
>Category:       ports
>Synopsis:       Update port: devel/regexx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 22 01:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on 5-current

New file:
files/patch-examples::simple.cc
files/patch-src::regex.hh

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/devel/regexx/Makefile devel/regexx/Makefile
--- /usr/ports/devel/regexx/Makefile	Fri Nov  8 21:23:50 2002
+++ devel/regexx/Makefile	Sun Dec 22 02:56:09 2002
@@ -16,12 +16,10 @@
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
-USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
-USE_AUTOCONF=	yes
-
 USE_GMAKE=	yes
-
+USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/regexx/files/patch-examples::simple.cc devel/regexx/files/patch-examples::simple.cc
--- /usr/ports/devel/regexx/files/patch-examples::simple.cc	Thu Jan  1 09:00:00 1970
+++ devel/regexx/files/patch-examples::simple.cc	Sun Dec 22 03:10:30 2002
@@ -0,0 +1,10 @@
+--- examples/simple.cc.orig	Tue Mar 13 23:42:21 2001
++++ examples/simple.cc	Sun Dec 22 03:09:56 2002
+@@ -30,6 +30,7 @@
+ #include <regexx.hh>
+ 
+ using namespace regexx;
++using namespace std;
+ 
+ //
+ // This is the function to pass to replace() in
diff -urN /usr/ports/devel/regexx/files/patch-src::regex.hh devel/regexx/files/patch-src::regex.hh
--- /usr/ports/devel/regexx/files/patch-src::regex.hh	Thu Jan  1 09:00:00 1970
+++ devel/regexx/files/patch-src::regex.hh	Sun Dec 22 03:09:25 2002
@@ -0,0 +1,47 @@
+--- src/regexx.hh.orig	Tue Mar 13 23:42:21 2001
++++ src/regexx.hh	Sun Dec 22 03:08:47 2002
+@@ -94,7 +94,7 @@
+ 
+   };
+ 
+-  inline ostream& operator<<(ostream& _o, RegexxMatchAtom& _rxxma)
++  inline std::ostream& operator<<(std::ostream& _o, RegexxMatchAtom& _rxxma)
+   {
+     return _o << _rxxma.str();
+   }
+@@ -161,7 +161,7 @@
+ 
+   };
+ 
+-  inline ostream& operator<<(ostream& _o, RegexxMatch& _rxxm)
++  inline std::ostream& operator<<(std::ostream& _o, RegexxMatch& _rxxm)
+   {
+     return (_o << _rxxm.str());
+   }
+@@ -566,7 +566,7 @@
+   }
+ 
+   inline const std::string&
+-  Regexx::replacef(std::string (*_func)(const RegexxMatch&), int _flags = 0)
++  Regexx::replacef(std::string (*_func)(const RegexxMatch&), int _flags)
+     throw(CompileException)
+   {
+     exec(_flags&~nomatch);
+@@ -580,7 +580,7 @@
+   inline const std::string&
+   Regexx::replacef(const std::string& _expr,
+ 		   std::string (*_func)(const RegexxMatch&),
+-		   int _flags = 0)
++		   int _flags)
+     throw(CompileException)
+   {
+     expr(_expr);
+@@ -590,7 +590,7 @@
+   inline const std::string&
+   Regexx::replacef(const std::string& _str, const std::string& _expr,
+ 		   std::string (*_func)(const RegexxMatch&),
+-		   int _flags = 0)
++		   int _flags)
+     throw(CompileException)
+   {
+     str(_str);
>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?20021222172124.7ebe62f8.tkato>