Updated etcupdate to 20031112

- set MACHINE and MACHINE_ARCH
- sync man page with -current

3 files changed, 21 insertions, 19 deletions

diff --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile
index 2e58febe92d..a3120c1498b 100644
--- a/sysutils/etcupdate/Makefile
+++ b/sysutils/etcupdate/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2003/07/17 22:53:33 grant Exp $
+# $NetBSD: Makefile,v 1.26 2003/12/03 04:51:42 martti Exp $
 
-DISTNAME=	etcupdate-20030509
+DISTNAME=	etcupdate-20031112
 WRKSRC=		${WRKDIR}
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
diff --git a/sysutils/etcupdate/files/etcupdate b/sysutils/etcupdate/files/etcupdate
index f1c829ead88..032c339ce12 100755
--- a/sysutils/etcupdate/files/etcupdate
+++ b/sysutils/etcupdate/files/etcupdate
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: etcupdate,v 1.22 2003/05/09 08:03:10 martti Exp $
+# $NetBSD: etcupdate,v 1.23 2003/12/03 04:51:43 martti Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -43,7 +43,7 @@
 # see the modifications and either install the new version or merge the
 # changes in to your current configuration files.
 #
-# This script was written by Martti Kuparinen <martti@netbsd.org> and
+# This script was written by Martti Kuparinen <martti@NetBSD.org> and
 # improved by several other NetBSD users.
 #
 # The idea for this script (including code fragments, variable names etc.)
@@ -62,6 +62,10 @@ CONTINUE=
 BINARY=
 AUTOMATIC=
 LOCALSKIP=
+MACHINE="${MACHINE:=`uname -m`}"
+export MACHINE
+MACHINE_ARCH="${MACHINE_ARCH:=`uname -p`}"
+export MACHINE_ARCH
 
 # Settings for post-installation procedures
 NEED_MTREE=
@@ -413,6 +417,7 @@ if [ -z "${CONTINUE}" ]; then
 			DESTDIR=${TEMPROOT}	\
 			MAKE=make		\
 			MTREE=mtree		\
+			TOOL_MTREE=mtree	\
 			INSTALL_DONE=1		\
 			USETOOLS=never"
 		echo "*** Populating ${TEMPROOT} from ${SRCDIR}"
diff --git a/sysutils/etcupdate/files/etcupdate.8 b/sysutils/etcupdate/files/etcupdate.8
index 279711eca5f..a7d94bc9480 100644
--- a/sysutils/etcupdate/files/etcupdate.8
+++ b/sysutils/etcupdate/files/etcupdate.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: etcupdate.8,v 1.9 2003/04/05 18:17:23 perry Exp $
+.\"	$NetBSD: etcupdate.8,v 1.10 2003/12/03 04:51:43 martti Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -43,14 +43,11 @@
 .Pa /etc
 .Sh SYNOPSIS
 .Nm
-.Op Fl a
+.Op Fl ahlv
 .Op Fl b Ar srcdir
-.Op Fl h
-.Op Fl l
 .Op Fl p Ar pager
 .Op Fl s Ar srcdir
 .Op Fl t Ar temproot
-.Op Fl v
 .Op Fl w Ar width
 .Sh DESCRIPTION
 .Nm
@@ -83,7 +80,7 @@ from the
 file.
 .Pp
 .Nm
-needs a clean set of new configuration files to compare the 
+needs a clean set of new configuration files to compare the
 existing files against.
 These files, called the
 .Dq reference files
@@ -101,7 +98,7 @@ in
 installing the files to a so-called
 .Pa temproot .
 (See usage of the
-.Fl s Ar srcdir ,
+.Fl s Ar srcdir
 and
 .Fl t Ar temproot
 options later in this manual page.)
@@ -113,7 +110,7 @@ files (see usage of the
 option later in this manual page).
 .Pp
 The following options are available:
-.Bl -tag -width indent
+.Bl -tag -width XXtXtemprootX
 .It Fl a
 .Nm
 can automatically update files which have not been modified locally.
@@ -125,7 +122,7 @@ to store MD5 checksums in
 .Pa /var/etcupdate
 and use these checksums to determine if there have been any
 local modifications.
-.It Fl b
+.It Fl b Ar srcdir
 Location of reference files extracted from a binary distribution of
 .Nx .
 Note that reference files in
@@ -143,14 +140,14 @@ Prints a help text.
 .It Fl l
 Automatically skip files with unchanged RCS IDs.
 This has the effect of leaving alone files that have been altered
-locally but which have not been changed in the 
+locally but which have not been changed in the
 reference files.
 Since this works using RCS IDs, files without RCS IDs will not be
 skipped even if only modified locally.
 This flag may be used together with the
 .Fl a
 flag described above.
-.It Fl p
+.It Fl p Ar pager
 The pager to use when displaying files.
 By default this is
 .Xr more 1
@@ -158,7 +155,7 @@ but it can be changed either with this option
 or by defining the
 .Ev PAGER
 variable.
-.It Fl s
+.It Fl s Ar srcdir
 The location of the
 .Nx
 sources files used to create the reference files.
@@ -168,7 +165,7 @@ but it can be changed either with this option
 or the
 .Ev SRCDIR
 variable.
-.It Fl t
+.It Fl t Ar temproot
 Specifies the location of the
 .Pa temproot
 directory.
@@ -184,7 +181,7 @@ environment variable.
 Makes
 .Nm
 verbose about its actions.
-.It Fl w
+.It Fl w Ar width
 Sets screen width used during interactive merge.
 By default this is the number of columns
 .Xr stty 1
@@ -197,7 +194,7 @@ This is useful for
 users with wider shell windows.
 .El
 .Sh ENVIRONMENT
-.Bl -tag -width TEMPROOT
+.Bl -tag -width IGNOREFILESXX
 .It Ev TEMPROOT
 Sets a default value for
 .Pa temproot .