pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Update to 1.20180726. From the changelog:
details: https://anonhg.NetBSD.org/pkgsrc/rev/bb5ca58b1494
branches: trunk
changeset: 310881:bb5ca58b1494
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Thu Jul 26 09:34:27 2018 +0000
description:
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
diffstat:
devel/Makefile | 4 ++--
devel/mr/DESCR | 18 ------------------
devel/mr/Makefile | 35 -----------------------------------
devel/mr/PLIST | 17 -----------------
devel/mr/distinfo | 8 --------
devel/mr/patches/patch-Makefile | 30 ------------------------------
devel/mr/patches/patch-mr | 32 --------------------------------
devel/myrepos/DESCR | 18 ++++++++++++++++++
devel/myrepos/Makefile | 36 ++++++++++++++++++++++++++++++++++++
devel/myrepos/PLIST | 24 ++++++++++++++++++++++++
devel/myrepos/distinfo | 7 +++++++
devel/myrepos/patches/patch-Makefile | 15 +++++++++++++++
12 files changed, 102 insertions(+), 142 deletions(-)
diffs (truncated from 303 to 300 lines):
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/Makefile
--- a/devel/Makefile Thu Jul 26 08:37:48 2018 +0000
+++ b/devel/Makefile Thu Jul 26 09:34:27 2018 +0000
@@ -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-server
SUBDIR+= monotone-viz
SUBDIR+= mph
-SUBDIR+= mr
SUBDIR+= msgpack
+SUBDIR+= myrepos
SUBDIR+= nana
SUBDIR+= nant
SUBDIR+= nasm
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/mr/DESCR
--- a/devel/mr/DESCR Thu Jul 26 08:37:48 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-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.
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/mr/Makefile
--- a/devel/mr/Makefile Thu Jul 26 08:37:48 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2017/03/05 12:25:28 schmonz Exp $
-#
-
-DISTNAME= myrepos_1.20170129
-PKGNAME= ${DISTNAME:S/_/-/}
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-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"
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/mr/PLIST
--- a/devel/mr/PLIST Thu Jul 26 08:37:48 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2017/02/27 14:38:47 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/dgit
-share/mr/git-annex
-share/mr/git-fake-bare
-share/mr/git-subtree
-share/mr/git-svn
-share/mr/repo
-share/mr/stow
-share/mr/unison
-share/mr/vcsh
-share/mr/vis
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/mr/distinfo
--- a/devel/mr/distinfo Thu Jul 26 08:37:48 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.17 2017/02/27 14:38:47 schmonz Exp $
-
-SHA1 (myrepos_1.20170129.tar.gz) = 34776d7d476be4fdf4fe297a0f47072e0c524600
-RMD160 (myrepos_1.20170129.tar.gz) = ff33dbf5c6714665284eac7579fd514c0003f848
-SHA512 (myrepos_1.20170129.tar.gz) = cada56e811bff72dbd6161cdd843760d0aa34ab052e5ae6e210f1da0ff92f454246ed65399271892019a7ec2212180080a50251ed056cd49fe56e742394d7127
-Size (myrepos_1.20170129.tar.gz) = 56346 bytes
-SHA1 (patch-Makefile) = c37a1e55371f9193e3c28dd099bd9c23143987d5
-SHA1 (patch-mr) = 04f93525ab134975c388572b80c06a0e4d785f58
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/mr/patches/patch-Makefile
--- a/devel/mr/patches/patch-Makefile Thu Jul 26 08:37:48 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-Makefile,v 1.3 2016/01/26 12:56:34 schmonz Exp $
-
-Use pkgsrc paths.
-
---- Makefile.orig 2014-11-08 21:54:57.000000000 +0000
-+++ Makefile
-@@ -1,4 +1,4 @@
--PREFIX:=/usr
-+# PREFIX:=/usr
-
- mans=mr.1 webcheckout.1
-
-@@ -17,14 +17,14 @@ test:
-
- install: build
- install -d ${DESTDIR}${PREFIX}/bin
-- install -d ${DESTDIR}${PREFIX}/share/man/man1
-+ install -d ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- install -d ${DESTDIR}${PREFIX}/share/mr
-
- install -m0755 mr ${DESTDIR}${PREFIX}/bin/
- install -m0755 webcheckout ${DESTDIR}${PREFIX}/bin/
-
-- install -m0644 mr.1 ${DESTDIR}${PREFIX}/share/man/man1/
-- install -m0644 webcheckout.1 ${DESTDIR}${PREFIX}/share/man/man1/
-+ install -m0644 mr.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-+ install -m0644 webcheckout.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-
- install -m0644 lib/* ${DESTDIR}${PREFIX}/share/mr/
-
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/mr/patches/patch-mr
--- a/devel/mr/patches/patch-mr Thu Jul 26 08:37:48 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$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 2016-01-23 13:17:12.000000000 +0000
-+++ mr
-@@ -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 ...]
-
-@@ -2208,12 +2208,12 @@ vcsh_log = vcsh run "$MR_REPO" git log "
- veracity_log = vv log "$@"
-
- hg_grep = hg grep "$@"
--cvs_grep = ack-grep "$@"
--svn_grep = ack-grep "$@"
-+cvs_grep = ack "$@"
-+svn_grep = ack "$@"
- git_svn_grep = git grep "$@"
- git_grep = git grep "$@"
--bzr_grep = ack-grep "$@"
--darcs_grep = ack-grep "$@"
-+bzr_grep = ack "$@"
-+darcs_grep = ack "$@"
-
- run = "$@"
-
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/myrepos/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/myrepos/DESCR Thu Jul 26 09:34:27 2018 +0000
@@ -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.
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/myrepos/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/myrepos/Makefile Thu Jul 26 09:34:27 2018 +0000
@@ -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"
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/myrepos/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/myrepos/PLIST Thu Jul 26 09:34:27 2018 +0000
@@ -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
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/myrepos/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/myrepos/distinfo Thu Jul 26 09:34:27 2018 +0000
@@ -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
diff -r 0fbe4e5d72aa -r bb5ca58b1494 devel/myrepos/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/myrepos/patches/patch-Makefile Thu Jul 26 09:34:27 2018 +0000
@@ -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}
Home |
Main Index |
Thread Index |
Old Index