Update to 1.15. From the changelog: * Added lib/repo, for support for repo (as used in Android) Closes: #705652 Thanks, Peter Eisentraut. * Better cvs status. Closes: #694037 Thanks, Paul Wisediff -r1.11 -r1.12 pkgsrc/devel/mr/Makefile
(schmonz)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.11 2013/02/14 02:53:22 schmonz Exp $ | 1 | # $NetBSD: Makefile,v 1.12 2013/05/05 20:43:42 schmonz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= mr_1.14 | 4 | DISTNAME= mr_1.15 | |
5 | PKGNAME= ${DISTNAME:S/_/-/} | 5 | PKGNAME= ${DISTNAME:S/_/-/} | |
6 | CATEGORIES= devel | 6 | CATEGORIES= devel | |
7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mr/} | 7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/mr/} | |
8 | 8 | |||
9 | MAINTAINER= schmonz@NetBSD.org | 9 | MAINTAINER= schmonz@NetBSD.org | |
10 | HOMEPAGE= http://kitenet.net/~joey/code/mr/ | 10 | HOMEPAGE= http://kitenet.net/~joey/code/mr/ | |
11 | COMMENT= Treat multiple repositories as one combined repository | 11 | COMMENT= Treat multiple repositories as one combined repository | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww | 14 | DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww | |
15 | DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser | 15 | DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser | |
16 | DEPENDS+= p5-ack-[0-9]*:../../textproc/p5-ack | 16 | DEPENDS+= p5-ack-[0-9]*:../../textproc/p5-ack | |
17 | 17 |
@@ -1,11 +1,12 @@ | @@ -1,11 +1,12 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2013/02/14 02:53:22 schmonz Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2013/05/05 20:43:42 schmonz Exp $ | |
2 | bin/mr | 2 | bin/mr | |
3 | bin/webcheckout | 3 | bin/webcheckout | |
4 | share/examples/mr/mrconfig | 4 | share/examples/mr/mrconfig | |
5 | share/examples/mr/mrconfig.complex | 5 | share/examples/mr/mrconfig.complex | |
6 | share/mr/git-fake-bare | 6 | share/mr/git-fake-bare | |
7 | share/mr/git-subtree | 7 | share/mr/git-subtree | |
8 | share/mr/git-svn | 8 | share/mr/git-svn | |
9 | share/mr/repo | |||
9 | share/mr/unison | 10 | share/mr/unison | |
10 | share/mr/vcsh | 11 | share/mr/vcsh | |
11 | share/mr/vis | 12 | share/mr/vis |
@@ -1,6 +1,6 @@ | @@ -1,6 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2013/02/14 02:53:23 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.10 2013/05/05 20:43:42 schmonz Exp $ | |
2 | 2 | |||
3 | SHA1 (mr_1.14.tar.gz) = 5b609ab5d390efd08e8c915e45ce2316210d9960 | 3 | SHA1 (mr_1.15.tar.gz) = 663b709887fcada5ffea4d52f38d8d45503f9f79 | |
4 | RMD160 (mr_1.14.tar.gz) = b7ae0e0259750374e0623851a785a760c73314a3 | 4 | RMD160 (mr_1.15.tar.gz) = 3574ac983c68879f8fd1e04e1addbbd9d202fba4 | |
5 | Size (mr_1.14.tar.gz) = 39726 bytes | 5 | Size (mr_1.15.tar.gz) = 40028 bytes | |
6 | SHA1 (patch-mr) = 9107aaceef3799defab61ef70da5d26f8e8828d3 | 6 | SHA1 (patch-mr) = 9e53c78cda93e39fb91ced9f83144b4ac138ea32 |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-mr,v 1.1 2012/08/27 21:58:49 schmonz Exp $ | 1 | $NetBSD: patch-mr,v 1.2 2013/05/05 20:43:43 schmonz Exp $ | |
2 | 2 | |||
3 | Other package systems install ack(1) as "ack-grep", but we don't. | 3 | Other package systems install ack(1) as "ack-grep", but we don't. | |
4 | 4 | |||
5 | --- mr.orig 2012-08-17 06:09:34.000000000 +0000 | 5 | --- mr.orig 2013-04-22 22:04:08.000000000 +0000 | |
6 | +++ mr | 6 | +++ mr | |
7 | @@ -1976,11 +1976,11 @@ vcsh_log = vcsh run "$MR_REPO" git log " | 7 | @@ -1990,11 +1990,11 @@ vcsh_log = vcsh run "$MR_REPO" git log " | |
8 | veracity_log = vv log "$@" | 8 | veracity_log = vv log "$@" | |
9 | 9 | |||
10 | hg_grep = hg grep "$@" | 10 | hg_grep = hg grep "$@" | |
11 | -cvs_grep = ack-grep "$@" | 11 | -cvs_grep = ack-grep "$@" | |
12 | -svn_grep = ack-grep "$@" | 12 | -svn_grep = ack-grep "$@" | |
13 | +cvs_grep = ack "$@" | 13 | +cvs_grep = ack "$@" | |
14 | +svn_grep = ack "$@" | 14 | +svn_grep = ack "$@" | |
15 | git_svn_grep = git grep "$@" | 15 | git_svn_grep = git grep "$@" | |
16 | git_grep = git grep "$@" | 16 | git_grep = git grep "$@" | |
17 | -bzr_grep = ack-grep "$@" | 17 | -bzr_grep = ack-grep "$@" | |
18 | +bzr_grep = ack "$@" | 18 | +bzr_grep = ack "$@" | |
19 | 19 | |||
20 | run = "$@" | 20 | run = "$@" |