Update arch to version 1.0pre16. This fixes several problems:

1) Don't bother with GNU patch, now that our patch can handle
   our diff output for files that don't have newlines at the end.

2) There was a bug in the older versions of arch that could corrupt
   the archive libraries (think CVS repository corruption)

3) lots of other fixes that are scattered in Changelog files
   all over the place and mixed in with administrivial details.
   (Otherwise I would have listed them here...)

Now off to find a PR or two to close since we are in a freeze.

5 files changed, 21 insertions, 84 deletions

diff --git a/devel/arch/Makefile b/devel/arch/Makefile
index d0ed54d5a81..f570450cfc0 100644
--- a/devel/arch/Makefile
+++ b/devel/arch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/07/22 00:13:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2002/07/24 22:59:28 jonb Exp $
 #
 
-DISTNAME=	arch-1.0pre9
-PKGNAME=	arch-1.0.0.9
+DISTNAME=	arch-1.0pre16
+PKGNAME=	arch-1.0.0.16
 CATEGORIES=	devel
 MASTER_SITES=	ftp://regexps.com/pub/src/arch/ \
 		ftp://regexps.com/pub/src/arch/old/
@@ -11,8 +11,6 @@ MAINTAINER=	schmonz@netbsd.org
 HOMEPAGE=	http://www.regexps.com/
 COMMENT=	revision control system ideal for widely distributed development
 
-DEPENDS+=	patch>=2.5.4:../../devel/patch
-
 USE_GMAKE=	# defined
 
 HAS_CONFIGURE=		# defined
@@ -42,8 +40,4 @@ post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 	${CHMOD} -R ugo-w ${EXAMPLESDIR}
 
-	# Install GNU patch where it can be found
-	${INSTALL_DATA_DIR} ${LOCALDIR}
-	${LN} -s ${LOCALBASE}/bin/gpatch ${LOCALDIR}/patch
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/arch/PLIST b/devel/arch/PLIST
index db92fcc7c4a..4195b809380 100644
--- a/devel/arch/PLIST
+++ b/devel/arch/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2002/02/21 03:02:33 jonb Exp $
-bin/arch--release-arch--1.0--patch-9-cfg
+@comment $NetBSD: PLIST,v 1.5 2002/07/24 22:59:28 jonb Exp $
+bin/arch--release-arch--1.0--patch-16-cfg
 bin/arch--release-arch-cfg
 bin/arch-cfg
 bin/as-daemon
@@ -8,8 +8,11 @@ bin/dangerous-rename
 bin/file-metadata
 bin/file-tag
 bin/ftp-push
+bin/inventory
 bin/larch
+bin/mkpatch
 bin/need-args
+bin/pipe-friendly
 bin/read-link
 bin/set-file-metadata
 bin/unfold
@@ -52,7 +55,9 @@ include/hackerlab/fmt/cvt-double-constants.h
 include/hackerlab/fmt/cvt-double-tables.h
 include/hackerlab/fmt/cvt-double.h
 include/hackerlab/fmt/cvt.h
+include/hackerlab/fs/cwd.h
 include/hackerlab/fs/file-names.h
+include/hackerlab/fs/tmp-files.h
 include/hackerlab/hash/hash-utils.h
 include/hackerlab/hash/hashtree.h
 include/hackerlab/machine/alignment.h
@@ -81,6 +86,7 @@ include/hackerlab/os/signal.h
 include/hackerlab/os/stdarg.h
 include/hackerlab/os/stddef.h
 include/hackerlab/os/stdlib.h
+include/hackerlab/os/sys/mman.h
 include/hackerlab/os/sys/param.h
 include/hackerlab/os/sys/socket.h
 include/hackerlab/os/sys/stat.h
@@ -112,6 +118,7 @@ include/hackerlab/rx/nfa-cache.h
 include/hackerlab/rx/nfa.h
 include/hackerlab/rx/super.h
 include/hackerlab/rx/tree.h
+include/hackerlab/sort/qsort.h
 include/hackerlab/uni/coding-inlines.h
 include/hackerlab/uni/coding.h
 include/hackerlab/uni/invariant.h
@@ -158,7 +165,6 @@ lib/libhackerlab.a
 libexec/arch/arch/add
 libexec/arch/arch/add-log
 libexec/arch/arch/add-pristine
-libexec/arch/arch/arch
 libexec/arch/arch/arch-rmrf
 libexec/arch/arch/archive-cache-revision
 libexec/arch/arch/archive-cached-revisions
@@ -207,10 +213,12 @@ libexec/arch/arch/get-archive-name
 libexec/arch/arch/get-patch
 libexec/arch/arch/heading
 libexec/arch/arch/import
+libexec/arch/arch/indicated-config-file
 libexec/arch/arch/indicated-revision
 libexec/arch/arch/init-tree
 libexec/arch/arch/inventory
 libexec/arch/arch/join-branch
+libexec/arch/arch/larch
 libexec/arch/arch/library-add
 libexec/arch/arch/library-archives
 libexec/arch/arch/library-branches
@@ -298,6 +306,7 @@ 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
 libexec/arch/arch/valid-id
 libexec/arch/arch/valid-log-file
 libexec/arch/arch/valid-package-name
@@ -431,16 +440,17 @@ libexec/arch/local-cache/pristines
 libexec/arch/local-cache/take-from-cache
 libexec/arch/local-cache/wd-mv-pristine
 libexec/arch/local-cache/what-changed
-libexec/arch/local/patch
 libexec/arch/naming-conventions/Help.category
 libexec/arch/naming-conventions/Help.category_title
 libexec/arch/naming-conventions/Help.list
+libexec/arch/naming-conventions/indicated-config-file
 libexec/arch/naming-conventions/indicated-revision
 libexec/arch/naming-conventions/parse-package-name
 libexec/arch/naming-conventions/patch-level-lt
 libexec/arch/naming-conventions/sort-revisions
 libexec/arch/naming-conventions/valid-archive-location
 libexec/arch/naming-conventions/valid-archive-name
+libexec/arch/naming-conventions/valid-config-name
 libexec/arch/naming-conventions/valid-id
 libexec/arch/naming-conventions/valid-package-name
 libexec/arch/naming-conventions/valid-patch-level-name
@@ -624,6 +634,7 @@ share/examples/arch/notifier/=rules.archives
 @dirrm include/hackerlab/unidata
 @dirrm include/hackerlab/unicode
 @dirrm include/hackerlab/uni
+@dirrm include/hackerlab/sort
 @dirrm include/hackerlab/rx-xml
 @dirrm include/hackerlab/rx-posix
 @dirrm include/hackerlab/rx
diff --git a/devel/arch/distinfo b/devel/arch/distinfo
index f14e79cc207..0492ef61e0f 100644
--- a/devel/arch/distinfo
+++ b/devel/arch/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/02/21 03:02:33 jonb Exp $
+$NetBSD: distinfo,v 1.4 2002/07/24 22:59:29 jonb Exp $
 
-SHA1 (arch-1.0pre9.tar.gz) = 58515fb4d68fddad5d3996f6471df5627ce3f354
-Size (arch-1.0pre9.tar.gz) = 2519236 bytes
-SHA1 (patch-aa) = fb631341438d5cbc5e2d7adf31ae397aefae2568
-SHA1 (patch-ab) = 8dca684511739f2417518b1776db3701e239d229
+SHA1 (arch-1.0pre16.tar.gz) = 64c9a7b21a57aee1fe98d48029aeaade7ad5f52b
+Size (arch-1.0pre16.tar.gz) = 2714831 bytes
diff --git a/devel/arch/patches/patch-aa b/devel/arch/patches/patch-aa
deleted file mode 100644
index 575433b1806..00000000000
--- a/devel/arch/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/02/21 03:02:34 jonb Exp $
-
---- ../arch/inventory/inventory.sh.orig	Tue Feb 19 23:23:24 2002
-+++ ../arch/inventory/inventory.sh
-@@ -680,42 +680,42 @@
-     printf "\\n"
-     printf "Source Files: "
-     printf "\\n\\n"
--    "$this" $common_flags $tags --source-command "$source_command" "$@" | "$column"
-+    "$this" $common_flags $tags --source-command "$source_command" "$@" | $column
-   fi
- 
-   if test $precious -eq 1 ; then
-     printf "\\n"
-     printf "Precious Files: "
-     printf "\\n\\n"
--    "$this" $common_flags --precious-command "$precious_command" "$@" | "$column"
-+    "$this" $common_flags --precious-command "$precious_command" "$@" | $column
-   fi
- 
-   if test $backups -eq 1 ; then
-     printf "\\n"
-     printf "Backup Files: "
-     printf "\\n\\n"
--    "$this" $common_flags --backups-command "$backups_command" "$@" | "$column"
-+    "$this" $common_flags --backups-command "$backups_command" "$@" | $column
-   fi
- 
-   if test $junk -eq 1 ; then
-     printf "\\n"
-     printf "Junk Files: "
-     printf "\\n\\n"
--    "$this" $common_flags --junk-command "$junk_command" "$@" | "$column"
-+    "$this" $common_flags --junk-command "$junk_command" "$@" | $column
-   fi
- 
-   if test $unrecognized -eq 1 ; then
-     printf "\\n"
-     printf "Unrecognized Files: "
-     printf "\\n\\n"
--    "$this" $common_flags --unrecognized-command "$unrecognized_command" "$@" | "$column"
-+    "$this" $common_flags --unrecognized-command "$unrecognized_command" "$@" | $column
-   fi
- 
-   if test $trees -eq 1 ; then
-     printf "\\n"
-     printf "Nested Project Trees: "
-     printf "\\n\\n"
--    "$this" $common_flags --trees "$@" | "$column"
-+    "$this" $common_flags --trees "$@" | $column
-   fi
- 
- fi
diff --git a/devel/arch/patches/patch-ab b/devel/arch/patches/patch-ab
deleted file mode 100644
index 2bb1cc21f19..00000000000
--- a/devel/arch/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/02/21 03:02:34 jonb Exp $
-
---- ../arch/arch/arch.sh.in.orig	Wed Feb 20 13:14:51 2002
-+++ ../arch/arch/arch.sh.in
-@@ -34,7 +34,7 @@
- # Make Sure that the arch libexec Directory is on the Path
- #
- 
--PATH="$sub_cmd_dir/arch:$PATH"
-+PATH="$sub_cmd_dir/arch:$sub_cmd_dir/local:$PATH"
- 
- # superstition:
- #