Committed the patches from PR 35020 by Anthony Mallet, which fix

unportable use of some utilities' options, at least for NetBSD.

PKGREVISION++

4 files changed, 35 insertions, 2 deletions

diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile
index 55a0fbb2e88..dedb4199dbf 100644
--- a/devel/cogito/Makefile
+++ b/devel/cogito/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/11/05 08:06:40 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2006/11/09 02:19:59 rillig Exp $
 #
 
 DISTNAME=		cogito-0.18
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://www.kernel.org/pub/software/scm/cogito/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/cogito/distinfo b/devel/cogito/distinfo
index e5973b7b6f2..a75b134bef4 100644
--- a/devel/cogito/distinfo
+++ b/devel/cogito/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/11/05 08:06:40 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/11/09 02:19:59 rillig Exp $
 
 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
+SHA1 (patch-ab) = b64974caeb8202db6854a157f0fa2f9d587d95b7
+SHA1 (patch-ac) = 15c8a0392445bdd3eba5446e8743a17e6df4a475
diff --git a/devel/cogito/patches/patch-ab b/devel/cogito/patches/patch-ab
new file mode 100644
index 00000000000..dc7c72fe970
--- /dev/null
+++ b/devel/cogito/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2006/11/09 02:19:59 rillig Exp $
+
+From PR 35020.
+
+--- cg-Xlib~	2006-09-29 13:58:15.000000000 +0200
++++ cg-Xlib	2006-11-08 20:56:27.000000000 +0100
+@@ -600,7 +600,7 @@
+ 		# Kill gone files
+ 		git-diff-tree -z --name-status -r "$base" "$branch" |
+ 			perl -n0e 'chomp; if (defined $meta) { print "$_\0" if $meta eq 'D'; $meta=undef } else { $meta = $_ }' |
+-			xargs --null rm -f --
++			xargs -0 rm -f --
+ 		git-checkout-index -u -f -a
+ 
+ 		# FIXME: Can produce bogus "contains only garbage" messages.
diff --git a/devel/cogito/patches/patch-ac b/devel/cogito/patches/patch-ac
new file mode 100644
index 00000000000..8756216d9d8
--- /dev/null
+++ b/devel/cogito/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2006/11/09 02:19:59 rillig Exp $
+
+From PR 35020.
+
+--- cg-tag~	2006-09-29 13:58:15.000000000 +0200
++++ cg-tag	2006-11-08 20:59:30.000000000 +0100
+@@ -105,7 +105,7 @@
+ 
+ for msg in "${msgs[@]}"; do
+ 	[ "$written" ] && echo >>"$LOGMSG"
+-	echo "$msg" | fmt -s >>"$LOGMSG"
++	echo "$msg" | fmt >>"$LOGMSG"
+ 	written=1
+ done
+