diff options
author | schmonz <schmonz@pkgsrc.org> | 2012-08-27 21:58:49 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2012-08-27 21:58:49 +0000 |
commit | e5d718543592f5ce6367fdf356285a12c6ca2f8e (patch) | |
tree | b93cab880a1e9fc2fc98a3b7f18a0fd8df042e4b | |
parent | a776e23a10d0f5426e3d8886a228a346fa066220 (diff) | |
download | pkgsrc-e5d718543592f5ce6367fdf356285a12c6ca2f8e.tar.gz |
Update to 1.13. From the changelog:
* Pass -q to cvs diff and update. Closes: #673367
* mr bootstrap: Now supports ssh:// urls.
* Simpler vcsh status command line. Closes: #685089
* Add grep subcommand. Uses ack-grep on VCS that do not have their own.
Closes: #685122
-rw-r--r-- | devel/mr/Makefile | 5 | ||||
-rw-r--r-- | devel/mr/distinfo | 9 | ||||
-rw-r--r-- | devel/mr/patches/patch-mr | 21 |
3 files changed, 29 insertions, 6 deletions
diff --git a/devel/mr/Makefile b/devel/mr/Makefile index f63d1ed032e..efd6750f0ad 100644 --- a/devel/mr/Makefile +++ b/devel/mr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2012/05/14 23:56:09 schmonz Exp $ +# $NetBSD: Makefile,v 1.8 2012/08/27 21:58:49 schmonz Exp $ # -DISTNAME= mr_1.12 +DISTNAME= mr_1.13 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mr/} @@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser +DEPENDS+= p5-ack-[0-9]*:../../textproc/p5-ack NO_BUILD= yes diff --git a/devel/mr/distinfo b/devel/mr/distinfo index ecbb6f8a3b3..d25391e9c4b 100644 --- a/devel/mr/distinfo +++ b/devel/mr/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2012/05/14 23:56:09 schmonz Exp $ +$NetBSD: distinfo,v 1.8 2012/08/27 21:58:49 schmonz Exp $ -SHA1 (mr_1.12.tar.gz) = bff84e7804d3619af02d5e0892cbdff455053b9b -RMD160 (mr_1.12.tar.gz) = 0c22f7af8307b506d6208907b2232a1e8922fd80 -Size (mr_1.12.tar.gz) = 39013 bytes +SHA1 (mr_1.13.tar.gz) = 99c1ed23610f1d8717929d2653cee8d1b7578903 +RMD160 (mr_1.13.tar.gz) = 3d64e271ea0a0ac6dee07c5fb32cc5a8a6e64aa3 +Size (mr_1.13.tar.gz) = 39194 bytes +SHA1 (patch-mr) = 9107aaceef3799defab61ef70da5d26f8e8828d3 diff --git a/devel/mr/patches/patch-mr b/devel/mr/patches/patch-mr new file mode 100644 index 00000000000..81b80a6cf89 --- /dev/null +++ b/devel/mr/patches/patch-mr @@ -0,0 +1,21 @@ +$NetBSD: patch-mr,v 1.1 2012/08/27 21:58:49 schmonz Exp $ + +Other package systems install ack(1) as "ack-grep", but we don't. + +--- mr.orig 2012-08-17 06:09:34.000000000 +0000 ++++ mr +@@ -1976,11 +1976,11 @@ vcsh_log = vcsh run "$MR_REPO" git log " + veracity_log = vv log "$@" + + hg_grep = hg grep "$@" +-cvs_grep = ack-grep "$@" +-svn_grep = ack-grep "$@" ++cvs_grep = ack "$@" ++svn_grep = ack "$@" + git_svn_grep = git grep "$@" + git_grep = git grep "$@" +-bzr_grep = ack-grep "$@" ++bzr_grep = ack "$@" + + run = "$@" + |