summaryrefslogtreecommitdiff
path: root/devel/mr
diff options
context:
space:
mode:
authorschmonz <schmonz>2014-10-25 15:34:54 +0000
committerschmonz <schmonz>2014-10-25 15:34:54 +0000
commit7720551881b9078fc52fed4f45d1285b173e9b8b (patch)
tree97370208f4a4ac9b1f8547e473af005cb922f7e7 /devel/mr
parentff2c3805e064ba984aee0983615dd1c7bfdb3acf (diff)
downloadpkgsrc-7720551881b9078fc52fed4f45d1285b173e9b8b.tar.gz
Update to 1.20141024. From the changelog:
* Fix name for vcsh_clean. Closes: #766655 * Add darcs grep command using ack-grep. Thanks, Paul Wise. * Add a clean command. Thanks, Paul Wise. Closes: #702685 * Fix breakage introduced by --minimal patch. * Deal with abs_path change in new version of perl, now it returns undefined when the directory does not exist. * Added --minimal mode. Closes: #694031 Thanks, Paul Wise. * Use libio-pty-easy-perl when available when captuting command output (for --minimal or -jN), so that programs that output color to terminals will be colorized. This is only a recommends as it will fall back to the old method. Thanks, Paul Wise.
Diffstat (limited to 'devel/mr')
-rw-r--r--devel/mr/Makefile4
-rw-r--r--devel/mr/distinfo12
-rw-r--r--devel/mr/patches/patch-Makefile4
-rw-r--r--devel/mr/patches/patch-mr17
4 files changed, 24 insertions, 13 deletions
diff --git a/devel/mr/Makefile b/devel/mr/Makefile
index 24ecb0f8a1f..93fc32d0a31 100644
--- a/devel/mr/Makefile
+++ b/devel/mr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/08/01 07:29:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.18 2014/10/25 15:34:54 schmonz Exp $
#
-DISTNAME= myrepos_1.20140613
+DISTNAME= myrepos_1.20141024
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/myrepos/}
diff --git a/devel/mr/distinfo b/devel/mr/distinfo
index e7f0f7e98bf..1fffa03e086 100644
--- a/devel/mr/distinfo
+++ b/devel/mr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2014/08/01 07:29:14 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2014/10/25 15:34:54 schmonz Exp $
-SHA1 (myrepos_1.20140613.tar.gz) = 839b0c6abb354d42111ea0d04dbd68720ed45498
-RMD160 (myrepos_1.20140613.tar.gz) = 4fe0581c7cbe15e686bc65d6cffc7c99ed42480b
-Size (myrepos_1.20140613.tar.gz) = 43885 bytes
-SHA1 (patch-Makefile) = 621d99130490700bc6cd7ac776f98251fa609bae
-SHA1 (patch-mr) = 07671759ecdd34739386b74dfef50cf3497ba879
+SHA1 (myrepos_1.20141024.tar.gz) = e1cf7fac548ceaa60ebe855363cec916f5302cb8
+RMD160 (myrepos_1.20141024.tar.gz) = dacfaf333fb669f7c279cfa0d7d080243acb90ec
+Size (myrepos_1.20141024.tar.gz) = 44947 bytes
+SHA1 (patch-Makefile) = ecba0066c07532ab3c445e9c50ba6d4beeecea4b
+SHA1 (patch-mr) = 85b67b89019c5b96ee24337b8b2a86650cbdb978
diff --git a/devel/mr/patches/patch-Makefile b/devel/mr/patches/patch-Makefile
index 8ed4a4ac80f..a3db4887de5 100644
--- a/devel/mr/patches/patch-Makefile
+++ b/devel/mr/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.1 2013/07/15 19:47:42 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2014/10/25 15:34:54 schmonz Exp $
Use pkgsrc paths.
---- Makefile.orig 2013-07-05 17:35:32.000000000 +0000
+--- Makefile.orig 2014-07-02 20:11:04.000000000 +0000
+++ Makefile
@@ -1,4 +1,4 @@
-PREFIX:=/usr
diff --git a/devel/mr/patches/patch-mr b/devel/mr/patches/patch-mr
index d7129099f1c..e381f66aa2c 100644
--- a/devel/mr/patches/patch-mr
+++ b/devel/mr/patches/patch-mr
@@ -1,10 +1,19 @@
-$NetBSD: patch-mr,v 1.3 2014/08/01 07:29:14 schmonz Exp $
+$NetBSD: patch-mr,v 1.4 2014/10/25 15:34:54 schmonz Exp $
Other package systems install ack(1) as "ack-grep", but we don't.
---- mr.orig 2014-05-28 21:32:57.000000000 +0000
+--- mr.orig 2014-10-24 17:10:13.000000000 +0000
+++ mr
-@@ -2053,11 +2053,11 @@ vcsh_log = vcsh run "$MR_REPO" git log "
+@@ -126,7 +126,7 @@ Show the commit log.
+ =item grep pattern
+
+ Searches for a pattern in each repository using the grep subcommand. Uses
+-ack-grep on VCS that do not have their own.
++ack on VCS that do not have their own.
+
+ =item run command [param ...]
+
+@@ -2147,12 +2147,12 @@ vcsh_log = vcsh run "$MR_REPO" git log "
veracity_log = vv log "$@"
hg_grep = hg grep "$@"
@@ -15,7 +24,9 @@ Other package systems install ack(1) as "ack-grep", but we don't.
git_svn_grep = git grep "$@"
git_grep = git grep "$@"
-bzr_grep = ack-grep "$@"
+-darcs_grep = ack-grep "$@"
+bzr_grep = ack "$@"
++darcs_grep = ack "$@"
run = "$@"