CVS commit: pkgsrc/devel

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jul 26 09:34:27 UTC 2018

Modified Files:
        pkgsrc/devel: Makefile
Added Files:
        pkgsrc/devel/myrepos: DESCR Makefile PLIST distinfo
        pkgsrc/devel/myrepos/patches: patch-Makefile
Removed Files:
        pkgsrc/devel/mr: DESCR Makefile PLIST distinfo
        pkgsrc/devel/mr/patches: patch-Makefile patch-mr

Log Message:
Update to 1.20180726. From the changelog:

* [ Mark Haber ]
  * Fix hours_since for git fake bare repos

* [ Tom Hoover ]
  * Fix 'no defined update command error' in example config

* [ Pavel Nakonechnyi ]
  * More meaningful names for temporary files

* [ Paul Wise ]
  * Mitigate vulns caused by git code execution (CVE-2018-7032)
  * Migrate from ack-grep to ack
  * More reliable output supervision
  * Improve the status output for CVS
  * Improve the git-cvs extension
  * Allow prepending commands to existing commands
  * Allow for fallback to default commands
  * Add support for caching command output
  * Add shell extension to maintain a repo status cache
  * Add graph, remote, upgrade extensions
  * git registration improvements
  * webcheckout: prefer https transport

pkgsrc changes:

- Rename directory to myrepos, catching up with package name change years ago


To generate a diff of this commit:
cvs rdiff -u -r1.2707 -r1.2708 pkgsrc/devel/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/devel/mr/DESCR
cvs rdiff -u -r1.23 -r0 pkgsrc/devel/mr/Makefile
cvs rdiff -u -r1.7 -r0 pkgsrc/devel/mr/PLIST
cvs rdiff -u -r1.17 -r0 pkgsrc/devel/mr/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/mr/patches/patch-Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/mr/patches/patch-mr
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/myrepos/DESCR \
    pkgsrc/devel/myrepos/Makefile pkgsrc/devel/myrepos/PLIST \
    pkgsrc/devel/myrepos/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/myrepos/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.2707 pkgsrc/devel/Makefile:1.2708
--- pkgsrc/devel/Makefile:1.2707        Tue Jul 24 16:25:56 2018
+++ pkgsrc/devel/Makefile       Thu Jul 26 09:34:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2707 2018/07/24 16:25:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.2708 2018/07/26 09:34:27 schmonz Exp $
 #
 
 COMMENT=       Development utilities
@@ -745,8 +745,8 @@ SUBDIR+=    monotone
 SUBDIR+=       monotone-server
 SUBDIR+=       monotone-viz
 SUBDIR+=       mph
-SUBDIR+=       mr
 SUBDIR+=       msgpack
+SUBDIR+=       myrepos
 SUBDIR+=       nana
 SUBDIR+=       nant
 SUBDIR+=       nasm

Added files:

Index: pkgsrc/devel/myrepos/DESCR
diff -u /dev/null pkgsrc/devel/myrepos/DESCR:1.1
--- /dev/null   Thu Jul 26 09:34:27 2018
+++ pkgsrc/devel/myrepos/DESCR  Thu Jul 26 09:34:27 2018
@@ -0,0 +1,18 @@
+The mr(1) command can checkout, update, or perform other actions
+on a set of repositories as if they were one combined respository.
+It supports any combination of subversion, git, cvs, mercurial,
+bzr, darcs, cvs, and fossil repositories, and support for other
+revision control systems can easily be added. (There are extensions
+adding support for unison and git-svn.)
+
+It is extremely configurable via simple shell scripting. Some
+examples of things it can do include:
+
+* Update a repository no more frequently than once every twelve hours.
+* Run an arbitrary command before committing to a repository.
+* When updating a git repository, pull from two different upstreams
+    and merge the two together.
+* Run several repository updates in parallel, greatly speeding up
+    the update process.
+* Remember actions that failed due to a laptop being offline, so
+    they can be retried when it comes back online.
Index: pkgsrc/devel/myrepos/Makefile
diff -u /dev/null pkgsrc/devel/myrepos/Makefile:1.1
--- /dev/null   Thu Jul 26 09:34:27 2018
+++ pkgsrc/devel/myrepos/Makefile       Thu Jul 26 09:34:27 2018
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2018/07/26 09:34:27 schmonz Exp $
+#
+
+DISTNAME=              myrepos_1.20180726
+PKGNAME=               ${DISTNAME:S/_/-/}
+CATEGORIES=            devel
+MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/m/myrepos/}
+EXTRACT_SUFX=          .tar.xz
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              http://myrepos.branchable.com/
+COMMENT=               Treat multiple repositories as one combined repository
+LICENSE=               gnu-gpl-v2
+
+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}/${PKGNAME_NOREV}
+USE_LANGUAGES=         # none
+
+BUILD_TARGET+=         build
+TEST_TARGET+=          test
+USE_TOOLS+=            perl:run
+
+REPLACE_PERL+=         mr webcheckout
+
+EGDIR=                 ${PREFIX}/share/examples/mr
+INSTALLATION_DIRS=     bin ${PKGMANDIR} ${EGDIR}
+
+post-install:
+       set -e; cd ${WRKSRC};                                           \
+       ${INSTALL_DATA} mrconfig ${DESTDIR}${EGDIR};                    \
+       ${INSTALL_DATA} mrconfig.complex ${DESTDIR}${EGDIR}
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/myrepos/PLIST
diff -u /dev/null pkgsrc/devel/myrepos/PLIST:1.1
--- /dev/null   Thu Jul 26 09:34:27 2018
+++ pkgsrc/devel/myrepos/PLIST  Thu Jul 26 09:34:27 2018
@@ -0,0 +1,24 @@
+@comment $NetBSD: PLIST,v 1.1 2018/07/26 09:34:27 schmonz Exp $
+bin/mr
+bin/webcheckout
+man/man1/mr.1
+man/man1/webcheckout.1
+share/doc/myrepos/examples/mrconfig
+share/doc/myrepos/examples/mrconfig.complex
+share/examples/mr/mrconfig
+share/examples/mr/mrconfig.complex
+share/mr.sh/cache-mr-status.sh
+share/mr/dgit
+share/mr/git-annex
+share/mr/git-cvs
+share/mr/git-fake-bare
+share/mr/git-subtree
+share/mr/git-svn
+share/mr/graph
+share/mr/remote
+share/mr/repo
+share/mr/stow
+share/mr/unison
+share/mr/upgrade
+share/mr/vcsh
+share/mr/vis
Index: pkgsrc/devel/myrepos/distinfo
diff -u /dev/null pkgsrc/devel/myrepos/distinfo:1.1
--- /dev/null   Thu Jul 26 09:34:27 2018
+++ pkgsrc/devel/myrepos/distinfo       Thu Jul 26 09:34:27 2018
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2018/07/26 09:34:27 schmonz Exp $
+
+SHA1 (myrepos_1.20180726.tar.xz) = 179b646fceef652af959a31f819ca5e5e484d7cb
+RMD160 (myrepos_1.20180726.tar.xz) = 68d0966f8c4ffcc2c371a1087aabf36d20f03ae3
+SHA512 (myrepos_1.20180726.tar.xz) = 0dfc6b23a4f972186eb163a6a6f932ce0233993db0440caa4df7b5239d21ee4e9c674ec63ea4374c55b2ebd32d93bba8ef12b0d2e85b1bf2505a54ed6c6ed6aa
+Size (myrepos_1.20180726.tar.xz) = 60388 bytes
+SHA1 (patch-Makefile) = 975cbf12d5d3fe93e58270238a48c1c5f334c36b

Index: pkgsrc/devel/myrepos/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/myrepos/patches/patch-Makefile:1.1
--- /dev/null   Thu Jul 26 09:34:27 2018
+++ pkgsrc/devel/myrepos/patches/patch-Makefile Thu Jul 26 09:34:27 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2018/07/26 09:34:27 schmonz Exp $
+
+Use pkgsrc paths.
+
+--- Makefile.orig      2018-07-24 09:43:33.000000000 +0000
++++ Makefile
+@@ -1,6 +1,6 @@
+-PREFIX:=/usr
++# PREFIX:=/usr
+ BINDIR:=${PREFIX}/bin
+-MANDIR:=${PREFIX}/share/man
++MANDIR:=${PREFIX}/${PKGMANDIR}
+ LIBDIR:=${PREFIX}/share/mr
+ LIBSHDIR:=${PREFIX}/share/mr.sh
+ EGDIR:=${PREFIX}/share/doc/myrepos/examples