summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2014-08-01 07:29:14 +0000
committerschmonz <schmonz@pkgsrc.org>2014-08-01 07:29:14 +0000
commite9d7dd61f5a6119b7ded84a4ae7942a531b52634 (patch)
tree5b93188067631e7fbd919777417d58c4a4c7df5b /devel
parent55a89e010a548289693dd95eb8f8cff64b7090ad (diff)
downloadpkgsrc-e9d7dd61f5a6119b7ded84a4ae7942a531b52634.tar.gz
Update to 1.20140613. From the changelog:
* Added lib/git-annex. Thanks, martin f krafft. Closes: #743882 * Make mr help work even if the mrconfig file is busted. Thanks, Lorenzo Cappelletti * Support "vcsh clone url repo" as trusted checkout syntax, while still supporting the old syntax. * bootstrap: Support reading bootstrap mrconfig file from both a local file, and from stdin. Thanks, Lorenzo Cappelletti
Diffstat (limited to 'devel')
-rw-r--r--devel/mr/Makefile5
-rw-r--r--devel/mr/PLIST3
-rw-r--r--devel/mr/distinfo10
-rw-r--r--devel/mr/patches/patch-mr6
4 files changed, 12 insertions, 12 deletions
diff --git a/devel/mr/Makefile b/devel/mr/Makefile
index 1c1a9fae838..24ecb0f8a1f 100644
--- a/devel/mr/Makefile
+++ b/devel/mr/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2014/05/29 23:35:37 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2014/08/01 07:29:14 schmonz Exp $
#
-DISTNAME= myrepos_1.20130826
+DISTNAME= myrepos_1.20140613
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/myrepos/}
diff --git a/devel/mr/PLIST b/devel/mr/PLIST
index b56ee4cc46e..ad700133c44 100644
--- a/devel/mr/PLIST
+++ b/devel/mr/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2013/07/15 19:47:42 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/08/01 07:29:14 schmonz Exp $
bin/mr
bin/webcheckout
man/man1/mr.1
man/man1/webcheckout.1
share/examples/mr/mrconfig
share/examples/mr/mrconfig.complex
+share/mr/git-annex
share/mr/git-fake-bare
share/mr/git-subtree
share/mr/git-svn
diff --git a/devel/mr/distinfo b/devel/mr/distinfo
index 3098ee02929..e7f0f7e98bf 100644
--- a/devel/mr/distinfo
+++ b/devel/mr/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2013/08/28 04:48:39 schmonz Exp $
+$NetBSD: distinfo,v 1.13 2014/08/01 07:29:14 schmonz Exp $
-SHA1 (myrepos_1.20130826.tar.gz) = 7c8c804ec20453f6119ef68ccfbbd41d51332e4f
-RMD160 (myrepos_1.20130826.tar.gz) = 58e72367120b089bcf7ec22b2b98a28effe5bfb4
-Size (myrepos_1.20130826.tar.gz) = 42633 bytes
+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) = 9e53c78cda93e39fb91ced9f83144b4ac138ea32
+SHA1 (patch-mr) = 07671759ecdd34739386b74dfef50cf3497ba879
diff --git a/devel/mr/patches/patch-mr b/devel/mr/patches/patch-mr
index af66917e5ea..d7129099f1c 100644
--- a/devel/mr/patches/patch-mr
+++ b/devel/mr/patches/patch-mr
@@ -1,10 +1,10 @@
-$NetBSD: patch-mr,v 1.2 2013/05/05 20:43:43 schmonz Exp $
+$NetBSD: patch-mr,v 1.3 2014/08/01 07:29:14 schmonz Exp $
Other package systems install ack(1) as "ack-grep", but we don't.
---- mr.orig 2013-04-22 22:04:08.000000000 +0000
+--- mr.orig 2014-05-28 21:32:57.000000000 +0000
+++ mr
-@@ -1990,11 +1990,11 @@ vcsh_log = vcsh run "$MR_REPO" git log "
+@@ -2053,11 +2053,11 @@ vcsh_log = vcsh run "$MR_REPO" git log "
veracity_log = vv log "$@"
hg_grep = hg grep "$@"