[pkgsrc/trunk]: pkgsrc/devel/cogito Added the patch from PR 35147, which fixe...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/951ed7ba89ad
branches:  trunk
changeset: 522135:951ed7ba89ad
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Dec 03 22:15:48 2006 +0000

description:
Added the patch from PR 35147, which fixes an unportable use of the -s
option to the fmt utility. Added the dependency on scmgit, which seems
very sensible. PKGREVISION++

diffstat:

 devel/cogito/Makefile         |   6 ++++--
 devel/cogito/distinfo         |   3 ++-
 devel/cogito/patches/patch-ad |  15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 1dd3b335fc33 -r 951ed7ba89ad devel/cogito/Makefile
--- a/devel/cogito/Makefile     Sun Dec 03 21:58:20 2006 +0000
+++ b/devel/cogito/Makefile     Sun Dec 03 22:15:48 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/11/09 02:19:59 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/03 22:15:48 rillig Exp $
 #
 
 DISTNAME=              cogito-0.18
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            devel
 MASTER_SITES=          http://www.kernel.org/pub/software/scm/cogito/
 EXTRACT_SUFX=          .tar.bz2
@@ -11,6 +11,8 @@
 HOMEPAGE=              http://www.kernel.org/pub/software/scm/cogito/
 COMMENT=               Version control system of the Linux kernel
 
+DEPENDS+=              scmgit-[0-9]*:../../devel/scmgit
+
 USE_TOOLS+=            gmake bash:run
 MAKE_FLAGS+=           prefix=${PREFIX:Q}
 
diff -r 1dd3b335fc33 -r 951ed7ba89ad devel/cogito/distinfo
--- a/devel/cogito/distinfo     Sun Dec 03 21:58:20 2006 +0000
+++ b/devel/cogito/distinfo     Sun Dec 03 22:15:48 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/11/09 02:19:59 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/12/03 22:15:48 rillig Exp $
 
 SHA1 (cogito-0.18.tar.bz2) = 5d734f00107b35467378591cc24aaac83bcc4c02
 RMD160 (cogito-0.18.tar.bz2) = b9a60ad00f2d341ebf043a2a8edd3a457d6d0982
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = eb2740a0ac5ca0b5f7c1bce2747ef9ce0e792dc1
 SHA1 (patch-ab) = b64974caeb8202db6854a157f0fa2f9d587d95b7
 SHA1 (patch-ac) = 15c8a0392445bdd3eba5446e8743a17e6df4a475
+SHA1 (patch-ad) = 98e724e2ada26cf7fcaacc2ff964a452e3109a2d
diff -r 1dd3b335fc33 -r 951ed7ba89ad devel/cogito/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cogito/patches/patch-ad     Sun Dec 03 22:15:48 2006 +0000
@@ -0,0 +1,15 @@
+$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
+