From 8d8e5fb54e012ee02146fdb350f02deefab72564 Mon Sep 17 00:00:00 2001
From: ijliao <ijliao@FreeBSD.org>
Date: Sun, 22 Dec 2002 13:27:46 +0000
Subject: fix build on -current

PR:		46461
Submitted by:	Ports Fury
---
 devel/regexx/Makefile                        |  8 ++---
 devel/regexx/files/patch-examples::simple.cc | 10 ++++++
 devel/regexx/files/patch-src::regex.hh       | 47 ++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 devel/regexx/files/patch-examples::simple.cc
 create mode 100644 devel/regexx/files/patch-src::regex.hh

(limited to 'devel/regexx')

diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile
index a07ba482..9c77150 100644
--- a/devel/regexx/Makefile
+++ b/devel/regexx/Makefile
@@ -16,12 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 
 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 --git a/devel/regexx/files/patch-examples::simple.cc b/devel/regexx/files/patch-examples::simple.cc
new file mode 100644
index 0000000..504f5d61
--- /dev/null
+++ b/devel/regexx/files/patch-examples::simple.cc
@@ -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 --git a/devel/regexx/files/patch-src::regex.hh b/devel/regexx/files/patch-src::regex.hh
new file mode 100644
index 0000000..a34c40b
--- /dev/null
+++ b/devel/regexx/files/patch-src::regex.hh
@@ -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);
-- 
cgit v1.1