[pkgsrc/trunk]: pkgsrc/devel/ArX2 Added a patch that fixes the build on NetBS...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/578818db479d
branches:  trunk
changeset: 511205:578818db479d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Apr 11 17:38:57 2006 +0000

description:
Added a patch that fixes the build on NetBSD 3.0/i386.

diffstat:

 devel/ArX2/distinfo                    |   3 ++-
 devel/ArX2/patches/patch-threewaymerge |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 1336f60f2ed0 -r 578818db479d devel/ArX2/distinfo
--- a/devel/ArX2/distinfo       Tue Apr 11 15:08:38 2006 +0000
+++ b/devel/ArX2/distinfo       Tue Apr 11 17:38:57 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/02/19 18:12:14 joerg Exp $
+$NetBSD: distinfo,v 1.8 2006/04/11 17:38:57 rillig Exp $
 
 SHA1 (ArX-2.2.4.tar.gz) = a575e005cfa2d80a6faced52b0128e9b7ff208df
 RMD160 (ArX-2.2.4.tar.gz) = 28bcab15b42bd116e736df7b4552ed00c34659ae
 Size (ArX-2.2.4.tar.gz) = 13561129 bytes
 SHA1 (patch-aa) = dbd26f2c93ee76655a5f024dd5319e0b462bc797
 SHA1 (patch-ab) = 42045fdfc5b731da1fb41271a2f39f980f898588
+SHA1 (patch-threewaymerge) = 854ef7137a066672616ceda234a3f99fba23eddd
diff -r 1336f60f2ed0 -r 578818db479d devel/ArX2/patches/patch-threewaymerge
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ArX2/patches/patch-threewaymerge    Tue Apr 11 17:38:57 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-threewaymerge,v 1.1 2006/04/11 17:38:57 rillig Exp $
+
+For some weird reason, g++ 3.3.3 complains about a syntax error here.
+
+--- src/arx/libarx/merge_branches/three_way_merge.cpp.orig     2005-11-17 20:06:21.000000000 +0100
++++ src/arx/libarx/merge_branches/three_way_merge.cpp  2006-04-11 15:07:43.000000000 +0200
+@@ -143,7 +143,7 @@ Conflicts three_way_merge(const Parsed_N
+                                make_pair(ancestor_temp.string(),
+                                          sibling_temp.string())));
+ 
+-                  path merge_path(path(getenv("HOME"))/".arx/merge3");
++                  path merge_path = (path(getenv("HOME"))/".arx/merge3");
+                   if(fs::exists(merge_path))
+                     {
+                       Spawn s;