Update to 1.0.p25. See =README.arch-newstuff for an overview of

the extensive changes.  Of course there are the usual bugfixes.
Also fix the mastersites and WWW url.
PR:		ports/54754, ports/55747
Submitted by:	Shu-yu Guo <shu@rufuran.org>, Michal F. Hanula
		<frankie@7f000001.org>
Committed on behalf of wjv@, who is letting real life take precedence
over FreeBSD right now.

4 files changed, 168 insertions, 156 deletions

diff --git a/devel/arch/Makefile b/devel/arch/Makefile
index f804c71b937..b6179363897 100644
--- a/devel/arch/Makefile
+++ b/devel/arch/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	arch
 # Date created:		6 February 2002
-# Whom:	      		Johann Visagie <wjv@FreeBSD.org>
+# Whom:			Johann Visagie <wjv@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	arch
-PORTVERSION=	1.0.p16
+PORTVERSION=	1.0.p25
 CATEGORIES=	devel
-MASTER_SITES=	ftp://regexps.com/pub/src/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
+MASTER_SITES=	http://regexps.srparish.net/src/${PORTNAME}/ \
+		http://arch.quackerhead.com/~lord/releases/${PORTNAME}/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	wjv@FreeBSD.org
 COMMENT=	A distributed source code management / revision control system
@@ -38,7 +39,6 @@ post-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/docs/${format}/*.${format} \
 	  ${DOCSDIR}/${format}
 .endfor
-	@ ${INSTALL_DATA} ${WRKSRC}/docs/examples/README* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/arch/distinfo b/devel/arch/distinfo
index 73c67db9389..83312b6e221 100644
--- a/devel/arch/distinfo
+++ b/devel/arch/distinfo
@@ -1 +1 @@
-MD5 (arch-1.0pre16.tar.gz) = 27146b324b295b1228530958ab650469
+MD5 (arch1.0pre25.tar.gz) = 787da7515000f2769644a3c67ed2f5b7
diff --git a/devel/arch/pkg-descr b/devel/arch/pkg-descr
index 5b232e31101..27174cbf86e 100644
--- a/devel/arch/pkg-descr
+++ b/devel/arch/pkg-descr
@@ -10,9 +10,8 @@ inteded to address deficiences in CVS(1).  Some of its claimed features are:
 - distributed and private repositories
 - easy server administration
 - scalable (distributed)
-- integrated web front-end
 
-Author: Tom Lord <lord@regexps.com>
-WWW:    http://www.regexps.com/arch.html
+Author: Tom Lord <lord@emf.net>
+WWW:    http://regexps.srparish.net/www/
 
 -- Johann Visagie <wjv@FreeBSD.org>
diff --git a/devel/arch/pkg-plist b/devel/arch/pkg-plist
index 889df0fc9b2..5591da8a03c 100644
--- a/devel/arch/pkg-plist
+++ b/devel/arch/pkg-plist
@@ -1,107 +1,86 @@
-%%PORTDOCS%%share/doc/arch/README.000.first-steps
-%%PORTDOCS%%share/doc/arch/README.010.first-archive
-%%PORTDOCS%%share/doc/arch/README.020.branching-arch
-%%PORTDOCS%%share/doc/arch/README.025.branching-advice
-%%PORTDOCS%%share/doc/arch/README.030.importing-arch-releases
-%%PORTDOCS%%share/doc/arch/README.040.importing-other-releases
-%%PORTDOCS%%share/doc/arch/html/arbitrary-patching.html
-%%PORTDOCS%%share/doc/arch/html/arch.html
-%%PORTDOCS%%share/doc/arch/html/archive-format.html
-%%PORTDOCS%%share/doc/arch/html/archives.html
-%%PORTDOCS%%share/doc/arch/html/automatic-triggers.html
-%%PORTDOCS%%share/doc/arch/html/basic-branching-and-merging.html
-%%PORTDOCS%%share/doc/arch/html/basic-rc.html
-%%PORTDOCS%%share/doc/arch/html/configurations.html
-%%PORTDOCS%%share/doc/arch/html/data-sheet.html
-%%PORTDOCS%%share/doc/arch/html/development-paths.html
-%%PORTDOCS%%share/doc/arch/html/document-license.html
-%%PORTDOCS%%share/doc/arch/html/getting-started.html
-%%PORTDOCS%%share/doc/arch/html/idempotent-merging.html
-%%PORTDOCS%%share/doc/arch/html/implementing-policies.html
-%%PORTDOCS%%share/doc/arch/html/in-general.html
-%%PORTDOCS%%share/doc/arch/html/indexes.html
-%%PORTDOCS%%share/doc/arch/html/introduction.html
-%%PORTDOCS%%share/doc/arch/html/inventory.html
-%%PORTDOCS%%share/doc/arch/html/logs-after-merging.html
-%%PORTDOCS%%share/doc/arch/html/multi-tree-projects.html
-%%PORTDOCS%%share/doc/arch/html/on-hacking.html
-%%PORTDOCS%%share/doc/arch/html/overview.html
-%%PORTDOCS%%share/doc/arch/html/patch-logs.html
-%%PORTDOCS%%share/doc/arch/html/patch-set-format.html
-%%PORTDOCS%%share/doc/arch/html/patches.html
-%%PORTDOCS%%share/doc/arch/html/preparing-to-merge.html
-%%PORTDOCS%%share/doc/arch/html/pristine-cache.html
-%%PORTDOCS%%share/doc/arch/html/project-names.html
-%%PORTDOCS%%share/doc/arch/html/project-trees.html
-%%PORTDOCS%%share/doc/arch/html/reconciling.html
-%%PORTDOCS%%share/doc/arch/html/revision-lib.html
-%%PORTDOCS%%share/doc/arch/html/source-license.html
-%%PORTDOCS%%share/doc/arch/html/star-topology.html
-%%PORTDOCS%%share/doc/arch/html/sync.html
-%%PORTDOCS%%share/doc/arch/html/system-requirements.html
-%%PORTDOCS%%share/doc/arch/html/theory-of-patches.html
-%%PORTDOCS%%share/doc/arch/html/triggers.html
-%%PORTDOCS%%share/doc/arch/html/user-names.html
-%%PORTDOCS%%share/doc/arch/html/using-triggers.html
-%%PORTDOCS%%share/doc/arch/html/web-site.html
-%%PORTDOCS%%share/doc/arch/ps/arch.ps
-%%PORTDOCS%%share/doc/arch/texi/arbitrary-patching.texi
-%%PORTDOCS%%share/doc/arch/texi/arch.texi
-%%PORTDOCS%%share/doc/arch/texi/archive-format.texi
-%%PORTDOCS%%share/doc/arch/texi/archives.texi
-%%PORTDOCS%%share/doc/arch/texi/automatic-triggers.texi
-%%PORTDOCS%%share/doc/arch/texi/basic-branching-and-merging.texi
-%%PORTDOCS%%share/doc/arch/texi/basic-rc.texi
-%%PORTDOCS%%share/doc/arch/texi/configurations.texi
-%%PORTDOCS%%share/doc/arch/texi/data-sheet.texi
-%%PORTDOCS%%share/doc/arch/texi/development-paths.texi
-%%PORTDOCS%%share/doc/arch/texi/document-license.texi
-%%PORTDOCS%%share/doc/arch/texi/getting-started.texi
-%%PORTDOCS%%share/doc/arch/texi/idempotent-merging.texi
-%%PORTDOCS%%share/doc/arch/texi/implementing-policies.texi
-%%PORTDOCS%%share/doc/arch/texi/in-general.texi
-%%PORTDOCS%%share/doc/arch/texi/indexes.texi
-%%PORTDOCS%%share/doc/arch/texi/introduction.texi
-%%PORTDOCS%%share/doc/arch/texi/inventory.texi
-%%PORTDOCS%%share/doc/arch/texi/logs-after-merging.texi
-%%PORTDOCS%%share/doc/arch/texi/multi-tree-projects.texi
-%%PORTDOCS%%share/doc/arch/texi/on-hacking.texi
-%%PORTDOCS%%share/doc/arch/texi/overview.texi
-%%PORTDOCS%%share/doc/arch/texi/patch-logs.texi
-%%PORTDOCS%%share/doc/arch/texi/patch-set-format.texi
-%%PORTDOCS%%share/doc/arch/texi/patches.texi
-%%PORTDOCS%%share/doc/arch/texi/preparing-to-merge.texi
-%%PORTDOCS%%share/doc/arch/texi/pristine-cache.texi
-%%PORTDOCS%%share/doc/arch/texi/project-names.texi
-%%PORTDOCS%%share/doc/arch/texi/project-trees.texi
-%%PORTDOCS%%share/doc/arch/texi/reconciling.texi
-%%PORTDOCS%%share/doc/arch/texi/revision-lib.texi
-%%PORTDOCS%%share/doc/arch/texi/source-license.texi
-%%PORTDOCS%%share/doc/arch/texi/star-topology.texi
-%%PORTDOCS%%share/doc/arch/texi/sync.texi
-%%PORTDOCS%%share/doc/arch/texi/system-requirements.texi
-%%PORTDOCS%%share/doc/arch/texi/theory-of-patches.texi
-%%PORTDOCS%%share/doc/arch/texi/triggers.texi
-%%PORTDOCS%%share/doc/arch/texi/user-names.texi
-%%PORTDOCS%%share/doc/arch/texi/using-triggers.texi
-%%PORTDOCS%%share/doc/arch/texi/web-site.texi
-bin/arch--release-arch--1.0--patch-16-cfg
-bin/arch--release-arch-cfg
+bin/add-log
+bin/add-tag
+bin/arch--pre-release-25--1.0-cfg
+bin/arch--pre-release-25-cfg
 bin/arch-cfg
 bin/as-daemon
+bin/branches
+bin/cachedrevs
+bin/cacherev
+bin/cat-archive-log
+bin/cat-log
+bin/categories
+bin/cfgcat
+bin/changelog
+bin/changeset
+bin/cmtrev
 bin/copy-file-list
 bin/dangerous-rename
+bin/default-tag
+bin/delete-tag
+bin/do-changeset
+bin/file-diffs
 bin/file-metadata
 bin/file-tag
+bin/find-pristine
 bin/ftp-push
+bin/get-patch
+bin/getrev
+bin/imprev
+bin/init-tree
+bin/inv-tag
 bin/inventory
 bin/larch
-bin/mkpatch
+bin/library-add
+bin/library-archives
+bin/library-branches
+bin/library-categories
+bin/library-file
+bin/library-find
+bin/library-log
+bin/library-remove
+bin/library-revisions
+bin/library-versions
+bin/lock-pristine
+bin/lock-revision
+bin/log-ls
+bin/logs
+bin/ls-archives
+bin/ls-pristines
+bin/make-archive
+bin/make-branch
+bin/make-category
+bin/make-links
+bin/make-log
+bin/make-version
+bin/merges
+bin/move-tag
+bin/my-default-archive
+bin/my-id
+bin/my-revision-library
 bin/need-args
+bin/parse-package-name
 bin/pipe-friendly
 bin/read-link
+bin/redo-changes
+bin/register-archive
+bin/remove-links
+bin/remove-log
+bin/revisions
 bin/set-file-metadata
+bin/set-tree-version
+bin/show-changeset
+bin/srcfind
+bin/tagging-method
+bin/tagrev
+bin/tree-lint
+bin/tree-root
+bin/tree-version
+bin/uncacherev
+bin/undo-changes
 bin/unfold
+bin/valid-package-name
+bin/versions
 bin/wftp-cd
 bin/wftp-delete
 bin/wftp-get
@@ -113,11 +92,11 @@ bin/wftp-put
 bin/wftp-pwd
 bin/wftp-rename
 bin/wftp-rmdir
+bin/what-changed
+bin/whats-missing
+bin/whereis-archive
 bin/with-file-lock
 bin/with-ftp
-include/ftp-utils/client/command.h
-include/ftp-utils/client/protocol.h
-include/ftp-utils/client/reply.h
 include/hackerlab/arrays/ar.h
 include/hackerlab/arrays/pow2-array-compact.h
 include/hackerlab/arrays/pow2-array-print.h
@@ -134,6 +113,7 @@ include/hackerlab/bugs/panic.h
 include/hackerlab/bugs/test-coverage.h
 include/hackerlab/char/char-class.h
 include/hackerlab/char/char-name.h
+include/hackerlab/char/str-many.h
 include/hackerlab/char/str.h
 include/hackerlab/cmd/main.h
 include/hackerlab/cmd/opt.h
@@ -246,7 +226,6 @@ include/hackerlab/vu/vu-utils.h
 include/hackerlab/vu/vu-virtual-null.h
 include/hackerlab/vu/vu.h
 include/hackerlab/xml/charsets.h
-lib/libftp.a
 lib/libhackerlab.a
 libexec/arch/arch/add
 libexec/arch/arch/add-log
@@ -271,7 +250,6 @@ libexec/arch/arch/cat-log
 libexec/arch/arch/categories
 libexec/arch/arch/category-readme
 libexec/arch/arch/changelog
-libexec/arch/arch/check-manifest
 libexec/arch/arch/commit
 libexec/arch/arch/config-history
 libexec/arch/arch/copy-from-archive-cache
@@ -284,7 +262,6 @@ libexec/arch/arch/copy-tree-precious
 libexec/arch/arch/delete
 libexec/arch/arch/delete-pristine
 libexec/arch/arch/delta-patch
-libexec/arch/arch/distribution-name
 libexec/arch/arch/dopatch
 libexec/arch/arch/empty-patch
 libexec/arch/arch/explicit-default
@@ -293,7 +270,6 @@ libexec/arch/arch/file-history
 libexec/arch/arch/file-list
 libexec/arch/arch/file-syntax-filter
 libexec/arch/arch/find-in-cache
-libexec/arch/arch/finish-branch
 libexec/arch/arch/get
 libexec/arch/arch/get-archive-name
 libexec/arch/arch/get-patch
@@ -330,15 +306,13 @@ libexec/arch/arch/make-archive
 libexec/arch/arch/make-branch
 libexec/arch/arch/make-cache-temp-dir
 libexec/arch/arch/make-category
-libexec/arch/arch/make-library-browser
 libexec/arch/arch/make-lock
 libexec/arch/arch/make-log
 libexec/arch/arch/make-sync-tree
 libexec/arch/arch/make-version
-libexec/arch/arch/manifest
 libexec/arch/arch/merge-points
-libexec/arch/arch/missing-tags
 libexec/arch/arch/mkpatch
+libexec/arch/arch/mkpatch-files
 libexec/arch/arch/move
 libexec/arch/arch/my-default-archive
 libexec/arch/arch/my-id
@@ -349,16 +323,12 @@ libexec/arch/arch/nested
 libexec/arch/arch/new-on-branch
 libexec/arch/arch/noop
 libexec/arch/arch/notify
-libexec/arch/arch/notify-browser
 libexec/arch/arch/notify-library
 libexec/arch/arch/old-file
 libexec/arch/arch/parse-package-name
 libexec/arch/arch/patch-add-log
-libexec/arch/arch/patch-details
 libexec/arch/arch/patch-level-lt
 libexec/arch/arch/patch-report
-libexec/arch/arch/patch-set-web
-libexec/arch/arch/prepare-branch
 libexec/arch/arch/previous-patch-level
 libexec/arch/arch/pristines
 libexec/arch/arch/push-mirror
@@ -367,13 +337,13 @@ libexec/arch/arch/putdir
 libexec/arch/arch/putlast
 libexec/arch/arch/reconcile
 libexec/arch/arch/record-config
+libexec/arch/arch/redo
 libexec/arch/arch/register-archive
 libexec/arch/arch/remove-log
 libexec/arch/arch/replay
 libexec/arch/arch/replay-config
 libexec/arch/arch/revisions
 libexec/arch/arch/sendmail-mailx
-libexec/arch/arch/set-manifest
 libexec/arch/arch/set-tree-version
 libexec/arch/arch/show-config
 libexec/arch/arch/sort-revisions
@@ -387,9 +357,9 @@ libexec/arch/arch/tree-lint
 libexec/arch/arch/tree-repair
 libexec/arch/arch/tree-root
 libexec/arch/arch/tree-version
+libexec/arch/arch/undo
 libexec/arch/arch/update
 libexec/arch/arch/update-config
-libexec/arch/arch/update-distributions
 libexec/arch/arch/valid-archive-location
 libexec/arch/arch/valid-archive-name
 libexec/arch/arch/valid-config-name
@@ -453,10 +423,8 @@ libexec/arch/branching-and-merging/Help.category
 libexec/arch/branching-and-merging/Help.category_title
 libexec/arch/branching-and-merging/Help.list
 libexec/arch/branching-and-merging/delta-patch
-libexec/arch/branching-and-merging/finish-branch
 libexec/arch/branching-and-merging/join-branch
 libexec/arch/branching-and-merging/make-sync-tree
-libexec/arch/branching-and-merging/prepare-branch
 libexec/arch/branching-and-merging/reconcile
 libexec/arch/branching-and-merging/replay
 libexec/arch/branching-and-merging/star-merge
@@ -480,14 +448,10 @@ libexec/arch/inventory/Help.category
 libexec/arch/inventory/Help.category_title
 libexec/arch/inventory/Help.list
 libexec/arch/inventory/add
-libexec/arch/inventory/check-manifest
 libexec/arch/inventory/delete
 libexec/arch/inventory/explicit-default
 libexec/arch/inventory/inventory
-libexec/arch/inventory/manifest
-libexec/arch/inventory/missing-tags
 libexec/arch/inventory/move
-libexec/arch/inventory/set-manifest
 libexec/arch/inventory/tagging-method
 libexec/arch/inventory/tree-lint
 libexec/arch/library/Help.category
@@ -549,7 +513,6 @@ libexec/arch/notify/mail-new-revisions
 libexec/arch/notify/mail-new-versions
 libexec/arch/notify/my-notifier
 libexec/arch/notify/notify
-libexec/arch/notify/notify-browser
 libexec/arch/notify/notify-library
 libexec/arch/notify/push-new-revisions
 libexec/arch/notify/sendmail-mailx
@@ -586,7 +549,10 @@ libexec/arch/patch-sets/Help.list
 libexec/arch/patch-sets/compute-renamed.awk
 libexec/arch/patch-sets/dopatch
 libexec/arch/patch-sets/empty-patch
+libexec/arch/patch-sets/include-parent-dirs.awk
 libexec/arch/patch-sets/mkpatch
+libexec/arch/patch-sets/mkpatch-files
+libexec/arch/patch-sets/mkpatch-indexes.awk
 libexec/arch/patch-sets/patch-add-log
 libexec/arch/patch-sets/patch-report
 libexec/arch/project-tree/Help.category
@@ -595,10 +561,12 @@ libexec/arch/project-tree/Help.list
 libexec/arch/project-tree/copy-or-stash
 libexec/arch/project-tree/copy-tree-precious
 libexec/arch/project-tree/init-tree
+libexec/arch/project-tree/redo
 libexec/arch/project-tree/set-tree-version
 libexec/arch/project-tree/tree-repair
 libexec/arch/project-tree/tree-root
 libexec/arch/project-tree/tree-version
+libexec/arch/project-tree/undo
 libexec/arch/remote/Help.category
 libexec/arch/remote/Help.category_title
 libexec/arch/remote/Help.list
@@ -613,34 +581,81 @@ libexec/arch/user/my-default-archive
 libexec/arch/user/my-id
 libexec/arch/user/register-archive
 libexec/arch/user/whereis-archive
-libexec/arch/web/Help.category
-libexec/arch/web/Help.category_title
-libexec/arch/web/Help.list
-libexec/arch/web/browser-display.html
-libexec/arch/web/browser-help-branches.html
-libexec/arch/web/browser-help-categories.html
-libexec/arch/web/browser-help-creators.html
-libexec/arch/web/browser-help-versions.html
-libexec/arch/web/browser-help.html
-libexec/arch/web/browser-left.html
-libexec/arch/web/browser-nav.html
-libexec/arch/web/browser-right.html
-libexec/arch/web/browser-top.html
-libexec/arch/web/browser.html
-libexec/arch/web/details.awk
-libexec/arch/web/distribution-name
-libexec/arch/web/distribution-right-index.awk
-libexec/arch/web/file-details.awk
-libexec/arch/web/left-index.awk
-libexec/arch/web/left-table.awk
-libexec/arch/web/make-library-browser
-libexec/arch/web/patch-details
-libexec/arch/web/patch-list-rows.awk
-libexec/arch/web/patch-set-web
-libexec/arch/web/revisions-right-index.awk
-libexec/arch/web/right-index.awk
-libexec/arch/web/update-distributions
-@dirrm libexec/arch/web
+%%PORTDOCS%%%%DOCSDIR%%/html/arch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/archive-caching.html
+%%PORTDOCS%%%%DOCSDIR%%/html/changeset-format.html
+%%PORTDOCS%%%%DOCSDIR%%/html/checking-in-changes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cherrypicking-changes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/development-branches.html
+%%PORTDOCS%%%%DOCSDIR%%/html/document-license.html
+%%PORTDOCS%%%%DOCSDIR%%/html/elementary-branches.html
+%%PORTDOCS%%%%DOCSDIR%%/html/exploring-changesets.html
+%%PORTDOCS%%%%DOCSDIR%%/html/importing-first.html
+%%PORTDOCS%%%%DOCSDIR%%/html/in-general.html
+%%PORTDOCS%%%%DOCSDIR%%/html/indexes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introducing-changesets.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introducing-replay.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introducing-yourself.html
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/inventories.html
+%%PORTDOCS%%%%DOCSDIR%%/html/inventory-tags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/little-help.html
+%%PORTDOCS%%%%DOCSDIR%%/html/multi-tree-projects.html
+%%PORTDOCS%%%%DOCSDIR%%/html/naming-conventions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/new-archive.html
+%%PORTDOCS%%%%DOCSDIR%%/html/new-project.html
+%%PORTDOCS%%%%DOCSDIR%%/html/new-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/notifiers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private-mirrors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/project-management.html
+%%PORTDOCS%%%%DOCSDIR%%/html/retrieving-earlier-revisions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/revision-libraries.html
+%%PORTDOCS%%%%DOCSDIR%%/html/selected-files-commits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/shared-and-public-archives.html
+%%PORTDOCS%%%%DOCSDIR%%/html/source-license.html
+%%PORTDOCS%%%%DOCSDIR%%/html/summary.html
+%%PORTDOCS%%%%DOCSDIR%%/html/symbolic-tags.html
+%%PORTDOCS%%%%DOCSDIR%%/html/system-requirements.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tree-history.html
+%%PORTDOCS%%%%DOCSDIR%%/html/update-commit.html
+%%PORTDOCS%%%%DOCSDIR%%/ps/arch.ps
+%%PORTDOCS%%%%DOCSDIR%%/texi/arch.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/archive-caching.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/changeset-format.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/checking-in-changes.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/cherrypicking-changes.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/development-branches.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/document-license.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/elementary-branches.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/exploring-changesets.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/importing-first.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/in-general.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/indexes.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/introducing-changesets.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/introducing-replay.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/introducing-yourself.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/introduction.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/inventories.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/inventory-tags.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/little-help.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/multi-tree-projects.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/naming-conventions.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/new-archive.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/new-project.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/new-source.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/notifiers.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/private-mirrors.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/project-management.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/retrieving-earlier-revisions.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/revision-libraries.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/selected-files-commits.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/shared-and-public-archives.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/source-license.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/summary.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/symbolic-tags.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/system-requirements.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/tree-history.texi
+%%PORTDOCS%%%%DOCSDIR%%/texi/update-commit.texi
 @dirrm libexec/arch/user
 @dirrm libexec/arch/remote
 @dirrm libexec/arch/project-tree
@@ -684,9 +699,7 @@ libexec/arch/web/update-distributions
 @dirrm include/hackerlab/bitsets
 @dirrm include/hackerlab/arrays
 @dirrm include/hackerlab
-@dirrm include/ftp-utils/client
-@dirrm include/ftp-utils
-%%PORTDOCS%%@dirrm share/doc/arch/texi
-%%PORTDOCS%%@dirrm share/doc/arch/ps
-%%PORTDOCS%%@dirrm share/doc/arch/html
-%%PORTDOCS%%@dirrm share/doc/arch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/texi
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%