head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.24
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.22
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.20
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.18
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.16
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.14
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.12
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.10
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.8
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.6
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.4
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.2
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.1.0.10
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.8
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.6
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.4
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.2
	pkgsrc-2006Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.09.20.20.47.11;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2006.04.11.17.38.57;	author rillig;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Move ArX2 to ArX, to make directory name match PKGNAME.
@
text
@$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;
@


1.1
log
@Added a patch that fixes the build on NetBSD 3.0/i386.
@
text
@d1 1
a1 1
$NetBSD$
@