Update to 1.0pre9, fix MASTER_SITES to use archive directory, so the next

update does not break the fetch.  Improve the method used to insert GNU
patch into the installed package.  Update fixes include:

* A set of changes to support "mawk".

  If "awk" is "mawk", certain Posix regexps that were used by
  arch aren't handled, causing commands to fail.  These have
  been replaced with regexps that all awks should understand.
  (Patch from Jan Harkes.)

* LC_ (locale) environment variables are now set more carefully.
  (Reported by Federico Di Gregorio.)

* A new command, `make-sync-tree' has been added.
  See "http://www.regexps.com/src/docs.d/arch/html/sync.html".

* The "Standard-date:" field in log messages is now GMT
  and includes the time-of-day.
  (Suggested by Daniele Nicolodi.)

* Remaining (reported) Solaris portability problems fixed.
  (Patches from Jonathan Geisler.)

* CDPATH is unset in `larch'

  If CDPATH is set, with some shells, `cd' produces unwanted
  output.  Therefore, `larch' unsets CDPATH. (Reported by
  John Ellson, diagnosed by Lele Gaifax.)

* Various minor bug fixes.  Among these are the configuration
  system changes requested by people who have tried building
  on cygwin, though I'm certain there's much more to be done
  before arch actually works on cygwin.

* Naming Conventions Tweaked
  Source files can now begin with "_" and must not end with ".a" or
  ".o".  The names "CVS.adm", "SCCS", and "RCSLOG" have been added to
  the list of "not a source file".  (reported by several people).

  Someone asked to also exclude some compiler intermediate
  files, such as "y.tab.c" -- I've not done that because it
  is common practice to distribute such files with programs
  to make bootstrapping easier.


* user id syntax liberalized

  "_" is now permitted in the unique id part of a user id.  This is
  really a partial fix -- `valid-id' should agree precisely with
  various standards on what is a legal email address and domain
  name, but the more extensive fix is being postponed until a
  more complete review of all of the naming convention functions
  takes place.  (Reported by don_dayley.)

* valid-log-file error message clarified

   In response to user confusion, `valid-log-file' now reports
   errors like:

        missing (or empty) "Summary:" header

   instead of just


        missing "Summary:" header

   (Reported by several people.)


* bugs in the hackerlab "tests/arrays-tests" and "tests/fs-tests" have
  been fixed (Reported and patched by Matthias Neeracher).

* an awk syntax error in `log-header-field' has been fixed
  (Reported and patch by Jan Harkes.)

* You can now use an alternative shell for configuration

  "config.status" files now start with "#!" lines and the
  "src/build-tools/scripts" configuration scripts use an
  explicitly chosen shell to call each other.  The top-level
  configure script now accepts a "--config-shell SHELL" option.

  This is a small step towards cygwin portability, and eases
  some of the portability constraints on "configure" for systems
  where "/bin/sh" is not quite posix.

  (Reported by Jason Diamond and others.)

* added a --pull option to push-mirror

  The new option speeds up the case of pushing from a remote archive
  to a local mirror.

* avoid dirent portability problems

  Some portability problems in libhackerlab's use of dirent have been
  fixed.  (Reported by several people.)

* `star-merge --finish' was broken.
  Now it isn't.

* `prepare-branch': bug fix from geisler

* `reconcile': bug fix from geisler

* `whats-missing': bug fix from geisler

5 files changed, 87 insertions, 11 deletions

diff --git a/devel/arch/Makefile b/devel/arch/Makefile
index 533bf833546..c123c070c0d 100644
--- a/devel/arch/Makefile
+++ b/devel/arch/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/16 15:48:20 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/21 03:02:33 jonb Exp $
 #
 
-DISTNAME=	arch-1.0pre7
-PKGNAME=	arch-1.0.0.7
+DISTNAME=	arch-1.0pre9
+PKGNAME=	arch-1.0.0.9
 CATEGORIES=	devel
-MASTER_SITES=	ftp://regexps.com/pub/src/arch/
+MASTER_SITES=	ftp://regexps.com/pub/src/arch/ \
+		ftp://regexps.com/pub/src/arch/old/
 
 MAINTAINER=	schmonz+netbsd@schmonz.com
 HOMEPAGE=	http://www.regexps.com/
@@ -21,6 +22,7 @@ CONFIGURE_ARGS+=	--prefix ${PREFIX}
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/=build
 HTMLDIR=	${PREFIX}/share/doc/html/arch
 EXAMPLESDIR=	${PREFIX}/share/examples/arch
+LOCALDIR=	${PREFIX}/libexec/arch/local
 
 post-extract:
 	${MKDIR} ${WRKSRC}
@@ -41,6 +43,7 @@ post-install:
 	${CHMOD} -R ugo-w ${EXAMPLESDIR}
 
 	# Install GNU patch where it can be found
-	${LN} -s ${LOCALBASE}/bin/gpatch ${PREFIX}/libexec/arch/arch/patch
+	${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 9cb6326c54f..db92fcc7c4a 100644
--- a/devel/arch/PLIST
+++ b/devel/arch/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/14 17:56:05 jonb Exp $
-bin/arch--release-arch--1.0--patch-7-cfg
+@comment $NetBSD: PLIST,v 1.4 2002/02/21 03:02:33 jonb Exp $
+bin/arch--release-arch--1.0--patch-9-cfg
 bin/arch--release-arch-cfg
 bin/arch-cfg
 bin/as-daemon
@@ -239,6 +239,7 @@ 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
@@ -258,7 +259,6 @@ 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
 libexec/arch/arch/patch-add-log
 libexec/arch/arch/patch-details
 libexec/arch/arch/patch-level-lt
@@ -274,6 +274,7 @@ libexec/arch/arch/putlast
 libexec/arch/arch/reconcile
 libexec/arch/arch/record-config
 libexec/arch/arch/register-archive
+libexec/arch/arch/remove-log
 libexec/arch/arch/replay
 libexec/arch/arch/replay-config
 libexec/arch/arch/revisions
@@ -359,6 +360,7 @@ 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
@@ -429,6 +431,7 @@ 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
@@ -478,6 +481,7 @@ libexec/arch/patch-logs/make-log
 libexec/arch/patch-logs/merge-points
 libexec/arch/patch-logs/new-on-branch
 libexec/arch/patch-logs/patch-list-description.awk
+libexec/arch/patch-logs/remove-log
 libexec/arch/patch-logs/valid-log-file
 libexec/arch/patch-logs/wd-check-for-patch-log
 libexec/arch/patch-sets/Help.category
@@ -573,6 +577,7 @@ share/doc/html/arch/reconciling.html
 share/doc/html/arch/revision-lib.html
 share/doc/html/arch/source-license.html
 share/doc/html/arch/star-topology.html
+share/doc/html/arch/sync.html
 share/doc/html/arch/system-requirements.html
 share/doc/html/arch/theory-of-patches.html
 share/doc/html/arch/triggers.html
diff --git a/devel/arch/distinfo b/devel/arch/distinfo
index 4b61012b758..f14e79cc207 100644
--- a/devel/arch/distinfo
+++ b/devel/arch/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/02/14 17:56:05 jonb Exp $
+$NetBSD: distinfo,v 1.3 2002/02/21 03:02:33 jonb Exp $
 
-SHA1 (arch-1.0pre7.tar.gz) = 23e6c9fa9001f27bebccfa20db576942b3e4f26e
-Size (arch-1.0pre7.tar.gz) = 2460644 bytes
+SHA1 (arch-1.0pre9.tar.gz) = 58515fb4d68fddad5d3996f6471df5627ce3f354
+Size (arch-1.0pre9.tar.gz) = 2519236 bytes
+SHA1 (patch-aa) = fb631341438d5cbc5e2d7adf31ae397aefae2568
+SHA1 (patch-ab) = 8dca684511739f2417518b1776db3701e239d229
diff --git a/devel/arch/patches/patch-aa b/devel/arch/patches/patch-aa
new file mode 100644
index 00000000000..575433b1806
--- /dev/null
+++ b/devel/arch/patches/patch-aa
@@ -0,0 +1,53 @@
+$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
new file mode 100644
index 00000000000..2bb1cc21f19
--- /dev/null
+++ b/devel/arch/patches/patch-ab
@@ -0,0 +1,13 @@
+$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:
+ #