Update to 3.26:

3.26: 2015-06-10
     Output redirect with '>>' appends to the output file.
     The strip blob command can take a selection set.
     Repo source type is now kept inline in stream files and emitted on write.
     Legacy IDs are now kept inline in stream files and emitted on write.
     The selection syntax <#nnn> now names commit nnn, 1-origin numbering.

3.25: 2015-06-03
     Reading hg is now supported through an extractor class, no plugin required.
     Now 'blob' command allows creating new content from lift scripts.

3.24: 2015-05-31
     Fix repository-type detection bug introduced in 3.23.
     DVCS Migration HOWTO is now merged into this distribution.
     Legacy-ID detection is now more discriminating, based on sourcetype.

3.23: 2015-05-29
     The 'prefer' command no longer changes the repo type, but 'sourcetype' does.
     The =N set is all commits and tags with text matching a legacy ID.
     Legacy-ID recognition is more intelligent, depending on the source type.
     The 'lint' command now checks for time and action-stamp collisions.
     Exporters can now embed a repository type declaration in an import stream.
     Fast-import syntax extensions are documented.

3.22: 2015-05-20
     The path rename --relax option has been removed as too confusing.
     In selection expressions, =Z is the set of all commits with no fileops.
     repopuller has been replaced by the more general repotool.
     For consistency, the 'changed' modifier of mailbox_in is now '--changed'.
     New '--create' option of mailbox_in to create new tags and commits.
     The command prompt can be queried or set with the new command 'prompt'.
     Change in terminology: fossil IDs and maps are now legacy IDs and maps.
     A front end can now set legacy IDs via the "legacy-id" property.
     DMRCN suffix flags on restrict path regexp matches to specified op types.
     The 'remove' command can now be told to look for specific fileop types.

3.21: 2015-04-02
     In selection expressions, =U is the set of all commits with callouts.

3.20: 2015-02-22
     Code is now fully functional, all regression test passing, on Mac OS X.
     Warn in the docs about the consequences of case-smashing filesystems.
     diff command no longer relies on external diff(1).
     Bugfix for writing callouts in partial dumps.

3 files changed, 13 insertions, 11 deletions

diff --git a/devel/reposurgeon/Makefile b/devel/reposurgeon/Makefile
index 2457f522f47..39e5915957b 100644
--- a/devel/reposurgeon/Makefile
+++ b/devel/reposurgeon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/01/16 09:30:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/06/12 11:46:53 wiz Exp $
 
-DISTNAME=	reposurgeon-3.19
+DISTNAME=	reposurgeon-3.26
 CATEGORIES=	devel scm
 MASTER_SITES=	http://www.catb.org/~esr/reposurgeon/
 
@@ -17,7 +17,7 @@ MAKE_FLAGS+=	prefix=${PREFIX}
 MAKE_FLAGS+=	mandir=${PKGMANDIR}
 
 REPLACE_PYTHON=	repodiffer reposurgeon
-REPLACE_SH=	repopuller
+REPLACE_SH=	repotool
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/reposurgeon/PLIST b/devel/reposurgeon/PLIST
index dd15916432e..91d45a4a944 100644
--- a/devel/reposurgeon/PLIST
+++ b/devel/reposurgeon/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/18 07:39:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/06/12 11:46:53 wiz Exp $
 bin/repodiffer
-bin/repopuller
 bin/reposurgeon
+bin/repotool
 man/man1/repodiffer.1
-man/man1/repopuller.1
 man/man1/reposurgeon.1
+man/man1/repotool.1
 share/doc/reposurgeon/NEWS
 share/doc/reposurgeon/README
 share/doc/reposurgeon/TODO
+share/doc/reposurgeon/conversion.mk
+share/doc/reposurgeon/dvcs-migration-guide.html
 share/doc/reposurgeon/features.html
 share/doc/reposurgeon/repodiffer.html
-share/doc/reposurgeon/repopuller.html
 share/doc/reposurgeon/reposurgeon.html
+share/doc/reposurgeon/repotool.html
diff --git a/devel/reposurgeon/distinfo b/devel/reposurgeon/distinfo
index c13be1649aa..0f9605dbbd3 100644
--- a/devel/reposurgeon/distinfo
+++ b/devel/reposurgeon/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2015/01/16 09:30:51 wiz Exp $
+$NetBSD: distinfo,v 1.15 2015/06/12 11:46:53 wiz Exp $
 
-SHA1 (reposurgeon-3.19.tar.gz) = 44e082358ebfd6ed64c9c0e5b35c3943d342f98f
-RMD160 (reposurgeon-3.19.tar.gz) = 3a596198aabfd03ad7909375822680dd73b2690e
-Size (reposurgeon-3.19.tar.gz) = 184503 bytes
+SHA1 (reposurgeon-3.26.tar.gz) = 45e919b45db2e8aa5db491b698d872963d61c943
+RMD160 (reposurgeon-3.26.tar.gz) = 1c9363cb538f44baae41d1dd39bf2031fd573ed4
+Size (reposurgeon-3.26.tar.gz) = 206887 bytes