cogito-0.18.2: Portability problems with utility arguments

From: Thomas Klausner <tk@giga.or.at>
Date: Mar 10, 2007, 20:21 UTC
Message-ID: <20070310202143.GA25193@danbala.tuwien.ac.at>

Hi!

I just updated the NetBSD pkgsrc package for cogito[1] to 0.18.2.
Currently there are three patches in pkgsrc for cogito, all of
them submitted for inclusion by Anthony Mallet, see
	http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=35020
	http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=35147

Here are the patches and the explanations.

patch-ab: xargs on NetBSD does not know "--null", it does however know the equivalent "-0".

patch-ac, patch-ad: fmt on NetBSD does not know "-s". These patches just remove the "-s". I'm not sure how to fix this, really.

Please include patch-aa, and if you find a way to work around the "fmt -s", I'd appreciate it.

Cheers,
 Thomas

P.S.: Please cc me on replies, I'm not on this list.

[1] http://www.netbsd.org/packages/devel/cogito/README.html

$NetBSD: patch-ab,v 1.2 2007/03/10 19:09:33 wiz Exp $

>From PR 35020.

--- cg-Xlib.orig 2006-11-17 00:37:24.000000000 +0000 +++ cg-Xlib

@@ -615,7 +615,7 @@ tree_timewarp()
 		# 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.


$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
 


$NetBSD: patch-ad,v 1.1 2006/12/03 22:15:48 rillig Exp $

See PR 35147.

--- cg-commit.orig	2006-09-29 13:58:15.000000000 +0200
+++ cg-commit	2006-12-03 23:01:18.000000000 +0100
@@ -382,7 +382,7 @@ elif [ "$merging" ]; then
 fi
 for msg in "${msgs[@]}"; do
 	[ "$written" ] && echo >>"$LOGMSG"
-	echo "$msg" | fmt -s >>"$LOGMSG"
+	echo "$msg" | fmt >>"$LOGMSG"
 	written=1
 done