update to ArX 2.2.2

Removed the dependency on gpg since crypto support can also
be enabled afterwards.

changes:

"tag" has been enhanced so that you can tag the latest revision of a
particular branch (floating tags), instead of just one particular
revision.

"merge" now has a --recursive option.

"fork" has been simplified and works in-place by default.

"export" no longer appends the revision number to the destination if
the destination is specified.

Some bugs in plain old http support have been fixed.  In addition,
"update-listing" works differently.  You can use update-listing to
either add or remove a special marker in an archive.  If that marker
is in the archive, then ArX will automatically maintain all of the
.listing files in that archive.

In "diff", --output now implies --keep-patch-dir.

A subtle off-by-one bug in the xdelta implementation has been fixed
(thanks to Daniel Berlin).

The manual has seen a number of improvements.

5 files changed, 44 insertions, 13 deletions

diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile
index 8ad9940959c..4d16614131e 100644
--- a/devel/ArX2/Makefile
+++ b/devel/ArX2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/19 17:39:40 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/10 07:23:25 recht Exp $
 #
 
-DISTNAME=	ArX-2.2.1
+DISTNAME=	ArX-2.2.2
 CATEGORIES=	devel
 MASTER_SITES=	http://superbeast.ucsd.edu/~landry/ArX/
 
@@ -12,17 +12,15 @@ COMMENT=	Distributed revision control system
 DEPENDS+=	patch-[0-9]*:../../devel/patch
 DEPENDS+=	diffutils-[0-9]*:../../devel/diffutils
 DEPENDS+=	gtar-base-[0-9]*:../../archivers/gtar-base
-DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons
 
-USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	ARXDIFF=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}diff
 CONFIGURE_ARGS+=	ARXPATCH=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
 CONFIGURE_ARGS+=	ARXTAR=${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}tar
 CONFIGURE_ARGS+=	ARXPKGCONFIG=${PKG_CONFIG}
-CONFIGURE_ARGS+=	ARXGPG=${LOCALBASE}/bin/gpg
 # XXX Python is needed for build only; this is handled by devel/scons
 CONFIGURE_ARGS+=	ARXPYTHON=/bin/true
 
diff --git a/devel/ArX2/distinfo b/devel/ArX2/distinfo
index d21147bdf1a..88c52d718e2 100644
--- a/devel/ArX2/distinfo
+++ b/devel/ArX2/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/19 17:39:40 drochner Exp $
+$NetBSD: distinfo,v 1.2 2005/05/10 07:23:25 recht Exp $
 
-SHA1 (ArX-2.2.1.tar.gz) = 6484bb92c508dd8cebaede6c8c1ff1455b2eb9a8
-RMD160 (ArX-2.2.1.tar.gz) = ebf21a7f1d41ab02c5d6c1f934a7fead148e7551
-Size (ArX-2.2.1.tar.gz) = 13488954 bytes
-SHA1 (patch-aa) = dc4dc159e36e6f24957f843ebab8fc349ec3915b
+SHA1 (ArX-2.2.2.tar.gz) = 65783b3d1f543cbb105b226bd1a19428084f2c73
+RMD160 (ArX-2.2.2.tar.gz) = 4f2cf5fd1e55c187a03a0d1ae1385bf417409cb3
+Size (ArX-2.2.2.tar.gz) = 13358590 bytes
+SHA1 (patch-aa) = 76ca00be0a2ac57a0b793569c30fe11b03585e56
+SHA1 (patch-ab) = db564821bb6958e30299aae18eef258aefc6c68c
+SHA1 (patch-ac) = e80a76a493e4e261acd3ecdb04d02ed7af7d059f
diff --git a/devel/ArX2/patches/patch-aa b/devel/ArX2/patches/patch-aa
index 8cc9b2866d4..5949a2a38e3 100644
--- a/devel/ArX2/patches/patch-aa
+++ b/devel/ArX2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/19 17:39:40 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2005/05/10 07:23:25 recht Exp $
 
---- SConstruct.in.orig	2005-04-19 18:46:01.000000000 +0200
-+++ SConstruct.in
+--- SConstruct.in.orig	2005-05-01 07:03:54.000000000 +0200
++++ SConstruct.in	2005-05-09 15:42:19.000000000 +0200
 @@ -22,7 +22,7 @@
  
  import os
diff --git a/devel/ArX2/patches/patch-ab b/devel/ArX2/patches/patch-ab
new file mode 100644
index 00000000000..0aa2a58d49d
--- /dev/null
+++ b/devel/ArX2/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2005/05/10 07:23:25 recht Exp $
+
+--- src/boost/boost/config/compiler/gcc.hpp.orig	2005-05-09 15:45:26.000000000 +0200
++++ src/boost/boost/config/compiler/gcc.hpp	2005-05-09 15:48:14.000000000 +0200
+@@ -84,13 +84,3 @@
+ #  error "Compiler not configured - please reconfigure"
+ #endif
+ //
+-// last known and checked version is 3.4:
+-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
+-#  if defined(BOOST_ASSERT_CONFIG)
+-#     error "Unknown compiler version - please run the configure tests and report the results"
+-#  else
+-#     warning "Unknown compiler version - please run the configure tests and report the results"
+-#  endif
+-#endif
+-
+-
diff --git a/devel/ArX2/patches/patch-ac b/devel/ArX2/patches/patch-ac
new file mode 100644
index 00000000000..68093891832
--- /dev/null
+++ b/devel/ArX2/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/05/10 07:23:25 recht Exp $
+
+--- src/arx/include/gvfs.hpp.orig	2005-05-09 15:55:51.000000000 +0200
++++ src/arx/include/gvfs.hpp	2005-05-09 16:02:18.000000000 +0200
+@@ -112,7 +112,7 @@
+ 
+           char *escaped(gnome_vfs_escape_host_and_path_string
+                         (location.c_str()));
+-          std::string result(*escaped);
++          std::string result((const char*)*escaped);
+           g_free(escaped);
+           return result;
+