summaryrefslogtreecommitdiff
path: root/devel/cogito
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-12-03 22:15:48 +0000
committerrillig <rillig@pkgsrc.org>2006-12-03 22:15:48 +0000
commit1a1294c4b57bd20156c4f808a471cdc38e7b3db6 (patch)
tree277657d2c71df27b81c4440bd06a5b455b3eb2bb /devel/cogito
parent9e832d3e5caf53b1da0f21d4c211909323effbac (diff)
downloadpkgsrc-1a1294c4b57bd20156c4f808a471cdc38e7b3db6.tar.gz
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 (limited to 'devel/cogito')
-rw-r--r--devel/cogito/Makefile6
-rw-r--r--devel/cogito/distinfo3
-rw-r--r--devel/cogito/patches/patch-ad15
3 files changed, 21 insertions, 3 deletions
diff --git a/devel/cogito/Makefile b/devel/cogito/Makefile
index dedb4199dbf..0c4c9a2a97f 100644
--- a/devel/cogito/Makefile
+++ b/devel/cogito/Makefile
@@ -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 @@ MAINTAINER= rillig@NetBSD.org
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 --git a/devel/cogito/distinfo b/devel/cogito/distinfo
index a75b134bef4..1a3eb92eee5 100644
--- a/devel/cogito/distinfo
+++ b/devel/cogito/distinfo
@@ -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 @@ Size (cogito-0.18.tar.bz2) = 107913 bytes
SHA1 (patch-aa) = eb2740a0ac5ca0b5f7c1bce2747ef9ce0e792dc1
SHA1 (patch-ab) = b64974caeb8202db6854a157f0fa2f9d587d95b7
SHA1 (patch-ac) = 15c8a0392445bdd3eba5446e8743a17e6df4a475
+SHA1 (patch-ad) = 98e724e2ada26cf7fcaacc2ff964a452e3109a2d
diff --git a/devel/cogito/patches/patch-ad b/devel/cogito/patches/patch-ad
new file mode 100644
index 00000000000..71c13478583
--- /dev/null
+++ b/devel/cogito/patches/patch-ad
@@ -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
+