Update to 1.20160123. From the changelog:

* Fix one missing call to safe_abs_path.
  Thanks, Chris Arndt

[ Paul Wise]
* Improve output handling
* Clean up debian/control
* Fix typos

* Allow running of mr via `mr --force-env` when within vcsh context via
  `vcsh enter foo`. Closes: #786736

* hg push exits 1 on non-error, apparently only 255 is used for actual errors.
  Deal with this unusual behavior. Thanks, Ivan Perez.
* Work when HOME is a symlink. Closes: #793381

* mr status in a git repo now includes git stash list in the output,
  to remind you if you have any stashes. If your workflow involves
  making lots of stashes and not cleaning them up, you may be better served
  by switching from "git stash apply" to "git stash pop". Of course,
  you can also override git_status in your mrconfig file and remove the
  stash list.
* Fix bootstrap from local source files.
  Thanks, Fabrice Benhamouda.
* Pass user-specified command-line arguments to mr fetch commands too.
  Thanks, Paul Wise.
* Make output continuous in minimal mode when there is only one job.
  Thanks, Paul Wise.
* Simplify mr help by using perldoc, rather than man.
* On some platforms, abs_path crashes when the file does not exist.
  Wrap it for safety.

[ Joey Hess ]
* Rework help command to work on OpenBSD.

[ Richard Hartmann ]
* Check if unsafe ENV variables are set
* Add support for setting jobs via config file
* Add support for fossil >= 1.23
* Bump Standards-Version to 3.9.6

4 files changed, 15 insertions, 16 deletions

diff --git a/devel/mr/Makefile b/devel/mr/Makefile
index cba259dd351..35451382a89 100644
--- a/devel/mr/Makefile
+++ b/devel/mr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2015/06/12 10:48:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/01/26 12:56:34 schmonz Exp $
 #
 
-DISTNAME=		myrepos_1.20141024
+DISTNAME=		myrepos_1.20160123
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/m/myrepos/}
 
@@ -16,7 +15,7 @@ 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
 
-WRKSRC=			${WRKDIR}/${PKGBASE}
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=		# none
 
 BUILD_TARGET+=		build
diff --git a/devel/mr/distinfo b/devel/mr/distinfo
index 1401837e962..1089e1f170f 100644
--- a/devel/mr/distinfo
+++ b/devel/mr/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 03:27:50 agc Exp $
+$NetBSD: distinfo,v 1.16 2016/01/26 12:56:34 schmonz Exp $
 
-SHA1 (myrepos_1.20141024.tar.gz) = e1cf7fac548ceaa60ebe855363cec916f5302cb8
-RMD160 (myrepos_1.20141024.tar.gz) = dacfaf333fb669f7c279cfa0d7d080243acb90ec
-SHA512 (myrepos_1.20141024.tar.gz) = 79d908d12e09a872cfeb4a2255d161887d47f16ffb47b6674c0fb1c5218a305e33b1b080d579a772387f3ef8d893e9858db7635a1576719f87b3e54ab85679a3
-Size (myrepos_1.20141024.tar.gz) = 44947 bytes
-SHA1 (patch-Makefile) = ecba0066c07532ab3c445e9c50ba6d4beeecea4b
-SHA1 (patch-mr) = 85b67b89019c5b96ee24337b8b2a86650cbdb978
+SHA1 (myrepos_1.20160123.tar.gz) = 32336af97d957efc100e0235e98e13c37ce3b4cd
+RMD160 (myrepos_1.20160123.tar.gz) = a1fa230442dd287ce202c672eee261dd665050de
+SHA512 (myrepos_1.20160123.tar.gz) = 7d697a87fd61ecf0380eec6c6c464e037f93a03e217a145989fffb4e35aa3cdce0225848988be5fcc12f4f326e7968ba9ba733ef34fe605cbdb3f27e511f1d51
+Size (myrepos_1.20160123.tar.gz) = 49884 bytes
+SHA1 (patch-Makefile) = c37a1e55371f9193e3c28dd099bd9c23143987d5
+SHA1 (patch-mr) = 04f93525ab134975c388572b80c06a0e4d785f58
diff --git a/devel/mr/patches/patch-Makefile b/devel/mr/patches/patch-Makefile
index a3db4887de5..0e0157b9874 100644
--- a/devel/mr/patches/patch-Makefile
+++ b/devel/mr/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.2 2014/10/25 15:34:54 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.3 2016/01/26 12:56:34 schmonz Exp $
 
 Use pkgsrc paths.
 
---- Makefile.orig	2014-07-02 20:11:04.000000000 +0000
+--- Makefile.orig	2014-11-08 21:54:57.000000000 +0000
 +++ Makefile
 @@ -1,4 +1,4 @@
 -PREFIX:=/usr
diff --git a/devel/mr/patches/patch-mr b/devel/mr/patches/patch-mr
index e381f66aa2c..377307d7f08 100644
--- a/devel/mr/patches/patch-mr
+++ b/devel/mr/patches/patch-mr
@@ -1,8 +1,8 @@
-$NetBSD: patch-mr,v 1.4 2014/10/25 15:34:54 schmonz Exp $
+$NetBSD: patch-mr,v 1.5 2016/01/26 12:56:34 schmonz Exp $
 
 Other package systems install ack(1) as "ack-grep", but we don't.
 
---- mr.orig	2014-10-24 17:10:13.000000000 +0000
+--- mr.orig	2016-01-23 13:17:12.000000000 +0000
 +++ mr
 @@ -126,7 +126,7 @@ Show the commit log.
  =item grep pattern
@@ -13,7 +13,7 @@ Other package systems install ack(1) as "ack-grep", but we don't.
  
  =item run command [param ...]
  
-@@ -2147,12 +2147,12 @@ vcsh_log = vcsh run "$MR_REPO" git log "
+@@ -2208,12 +2208,12 @@ vcsh_log = vcsh run "$MR_REPO" git log "
  veracity_log = vv log "$@"
  
  hg_grep = hg grep "$@"