summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-11-24 13:32:56 +0000
committerjoerg <joerg@pkgsrc.org>2011-11-24 13:32:56 +0000
commita8f07d5f6b204d506f8a246edc02f7936d66be27 (patch)
treed59f281cfdad27122520b1008b8a668d13942bf3
parentd4ea18073e033214b1345321a20c87558d282673 (diff)
downloadpkgsrc-a8f07d5f6b204d506f8a246edc02f7936d66be27.tar.gz
Fix build with newer GCC versions
-rw-r--r--textproc/regexx/distinfo4
-rw-r--r--textproc/regexx/patches/patch-ad13
2 files changed, 9 insertions, 8 deletions
diff --git a/textproc/regexx/distinfo b/textproc/regexx/distinfo
index f31cccb9c42..6154ee9268c 100644
--- a/textproc/regexx/distinfo
+++ b/textproc/regexx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:48 agc Exp $
+$NetBSD: distinfo,v 1.4 2011/11/24 13:32:56 joerg Exp $
SHA1 (regexx-0.98.1.tar.gz) = 0ab71bd8d645d961d846445fd160b951e08d4514
RMD160 (regexx-0.98.1.tar.gz) = 922aa7423e26726c8152fd61a8209b533e9340ce
@@ -6,4 +6,4 @@ Size (regexx-0.98.1.tar.gz) = 422031 bytes
SHA1 (patch-aa) = 15d40e8c78fe8b31aa144e92d44d125872240f15
SHA1 (patch-ab) = 3ab2e37f530b2489c3837e0a55e27c33fba02757
SHA1 (patch-ac) = 12aa1a37bdccff90a7a7e7244f44890584ddd012
-SHA1 (patch-ad) = 35873392672c6edaf1037359785906ad6b52b346
+SHA1 (patch-ad) = e2558f445e0d6996366367912bf2cb7cb8f11a93
diff --git a/textproc/regexx/patches/patch-ad b/textproc/regexx/patches/patch-ad
index 22b34be7766..94429e7db1b 100644
--- a/textproc/regexx/patches/patch-ad
+++ b/textproc/regexx/patches/patch-ad
@@ -1,11 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2004/02/29 11:10:36 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2011/11/24 13:32:56 joerg Exp $
---- src/regexx.hh.orig 2001-03-13 15:42:21.000000000 +0100
+--- src/regexx.hh.orig 2001-03-13 14:42:21.000000000 +0000
+++ src/regexx.hh
-@@ -29,10 +29,13 @@
+@@ -29,10 +29,14 @@
#ifndef REGEXX_HH
#define REGEXX_HH
++#include <cstdlib>
+#include <iostream>
#include <string>
#include <vector>
@@ -16,7 +17,7 @@ $NetBSD: patch-ad,v 1.1 2004/02/29 11:10:36 jmmv Exp $
namespace regexx {
/** Class to store atoms.
-@@ -566,7 +569,7 @@ namespace regexx {
+@@ -566,7 +570,7 @@ namespace regexx {
}
inline const std::string&
@@ -25,7 +26,7 @@ $NetBSD: patch-ad,v 1.1 2004/02/29 11:10:36 jmmv Exp $
throw(CompileException)
{
exec(_flags&~nomatch);
-@@ -580,7 +583,7 @@ namespace regexx {
+@@ -580,7 +584,7 @@ namespace regexx {
inline const std::string&
Regexx::replacef(const std::string& _expr,
std::string (*_func)(const RegexxMatch&),
@@ -34,7 +35,7 @@ $NetBSD: patch-ad,v 1.1 2004/02/29 11:10:36 jmmv Exp $
throw(CompileException)
{
expr(_expr);
-@@ -590,7 +593,7 @@ namespace regexx {
+@@ -590,7 +594,7 @@ namespace regexx {
inline const std::string&
Regexx::replacef(const std::string& _str, const std::string& _expr,
std::string (*_func)(const RegexxMatch&),