Updated cogito to 0.18.

Patch provided in PR 34862 by Anthony Mallet.

No ChangeLog available, I've sent a mail to the developers complaining
about that.

4 files changed, 22 insertions, 24 deletions

diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile
index 0b98c99efd9..55a0fbb2e88 100644
--- a/devel/cogito/Makefile
+++ b/devel/cogito/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/09/02 20:58:22 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/05 08:06:40 rillig Exp $
 #
 
-DISTNAME=		cogito-0.16
+DISTNAME=		cogito-0.18
 CATEGORIES=		devel
 MASTER_SITES=		http://www.kernel.org/pub/software/scm/cogito/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/cogito/PLIST b/devel/cogito/PLIST
index a786225c975..7560074e144 100644
--- a/devel/cogito/PLIST
+++ b/devel/cogito/PLIST
@@ -1,19 +1,18 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/09/02 20:58:22 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/11/05 08:06:40 rillig Exp $
 bin/cg
 bin/cg-add
 bin/cg-admin-cat
 bin/cg-admin-ls
 bin/cg-admin-lsobj
+bin/cg-admin-rewritehist
 bin/cg-admin-setuprepo
 bin/cg-admin-uncommit
 bin/cg-branch-add
 bin/cg-branch-chg
 bin/cg-branch-ls
-bin/cg-cancel
 bin/cg-clean
 bin/cg-clone
 bin/cg-commit
-bin/cg-commit-id
 bin/cg-diff
 bin/cg-export
 bin/cg-fetch
@@ -22,25 +21,25 @@ bin/cg-init
 bin/cg-log
 bin/cg-merge
 bin/cg-mkpatch
+bin/cg-mv
 bin/cg-object-id
-bin/cg-parent-id
 bin/cg-patch
-bin/cg-pull
 bin/cg-push
 bin/cg-reset
 bin/cg-restore
 bin/cg-rm
 bin/cg-seek
 bin/cg-status
+bin/cg-switch
 bin/cg-tag
 bin/cg-tag-ls
-bin/cg-tree-id
+bin/cg-tag-show
 bin/cg-update
 bin/cg-version
-bin/commit-id
-bin/parent-id
-bin/tree-id
 lib/cogito/cg-Xfetchprogress
+lib/cogito/cg-Xfollowrenames
 lib/cogito/cg-Xlib
 lib/cogito/cg-Xmergefile
+share/cogito/default-exclude
+@dirrm share/cogito
 @dirrm lib/cogito
diff --git a/devel/cogito/distinfo b/devel/cogito/distinfo
index d8d1b13ec3a..e5973b7b6f2 100644
--- a/devel/cogito/distinfo
+++ b/devel/cogito/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/10/16 00:44:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2006/11/05 08:06:40 rillig Exp $
 
-SHA1 (cogito-0.16.tar.bz2) = c2f05217a6f9e1bd4233d2a101bb6bbacf0521b7
-RMD160 (cogito-0.16.tar.bz2) = ca92effa6d313b430b9f15f238c187a3318a50ef
-Size (cogito-0.16.tar.bz2) = 80407 bytes
-SHA1 (patch-aa) = 45f08d99399f698a196469b6dec78bc4277089fa
+SHA1 (cogito-0.18.tar.bz2) = 5d734f00107b35467378591cc24aaac83bcc4c02
+RMD160 (cogito-0.18.tar.bz2) = b9a60ad00f2d341ebf043a2a8edd3a457d6d0982
+Size (cogito-0.18.tar.bz2) = 107913 bytes
+SHA1 (patch-aa) = eb2740a0ac5ca0b5f7c1bce2747ef9ce0e792dc1
diff --git a/devel/cogito/patches/patch-aa b/devel/cogito/patches/patch-aa
index e01c89850b3..a282eae8344 100644
--- a/devel/cogito/patches/patch-aa
+++ b/devel/cogito/patches/patch-aa
@@ -1,8 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2006/10/16 00:44:15 wiz Exp $
-
---- t/test-lib.sh.orig	2005-11-27 16:26:16.000000000 +0000
-+++ t/test-lib.sh
-@@ -87,16 +87,16 @@ test_failure_ () {
+$NetBSD: patch-aa,v 1.2 2006/11/05 08:06:40 rillig Exp $
+--- t/test-lib.sh~	2006-10-19 18:24:07.000000000 +0200
++++ t/test-lib.sh	2006-10-19 18:26:02.000000000 +0200
+@@ -87,16 +87,16 @@
  	say "FAIL $test_count: $1"
  	shift
  	echo "$@" | sed -e 's/^/	/'
@@ -21,8 +20,8 @@ $NetBSD: patch-aa,v 1.1 2006/10/16 00:44:15 wiz Exp $
 +	test "$#" = 2 ||
  	error "bug in the test script: not 2 parameters to test-expect-failure"
  	say >&3 "expecting failure: $2"
- 	if eval >&3 2>&4 "$2"
-@@ -108,7 +108,7 @@ test_expect_failure () {
+ 	if eval </dev/null >&3 2>&4 "$2"
+@@ -108,7 +108,7 @@
  }
  
  test_expect_success () {
@@ -30,4 +29,4 @@ $NetBSD: patch-aa,v 1.1 2006/10/16 00:44:15 wiz Exp $
 +	test "$#" = 2 ||
  	error "bug in the test script: not 2 parameters to test-expect-success"
  	say >&3 "expecting success: $2"
- 	if eval >&3 2>&4 "$2"
+ 	if eval </dev/null >&3 2>&4 "$2"