Major sysmerge cleanup now that both etc and xetc sets are part of base.

Expect more changes/cleanup/... in the near future.

-S (signature) option is gone since we are not fetching sets anymore
-s and -x are gone as well for obvious reasons

Left is:
usage: sysmerge [-bdp]

I would appreciate feedback, *lots* of things have changed and there may be
side effects I missed. Consider sysmerge as WIP for the time being.

1 files changed, 33 insertions, 82 deletions

diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index e3b3c8b2fbc..8caaa1422cb 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysmerge.8,v 1.58 2014/08/26 21:29:56 ajacoutot Exp $
+.\"	$OpenBSD: sysmerge.8,v 1.59 2014/08/28 17:43:21 ajacoutot Exp $
 .\"
 .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 26 2014 $
+.Dd $Mdocdate: August 28 2014 $
 .Dt SYSMERGE 8
 .Os
 .Sh NAME
@@ -23,8 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl bdS
-.Op Fl p | Op Fl x Ar xetcXX.tgz
+.Op Fl bdp
 .Ek
 .Sh DESCRIPTION
 .Nm
@@ -36,38 +35,22 @@ after upgrading to a new release or snapshot.
 .Nm
 works by comparing a temporary reference root directory
 against currently installed files.
-The reference files are created from
-.Pa /usr/share/sysmerge/etc.tgz
-and
-.Pa xetcXX.tgz .
 All work is done under
 .Pa ${TMPDIR}/sysmerge.XXXXXXXXXX
 (known as the
-.Em work directory ) .
-The temporary root directory
-.Pa temproot
-is created under the work directory.
-Each modified and/or replaced file is saved under the
+.Em work directory )
+which contains the temporary root directory
+.Pa temproot ,
+the
 .Pa backup
-directory inside the work directory.
-.Pp
-If no path to
-.Pa xetcXX.tgz
-is specified on the command line,
-.Nm
-uses
-.Xr ftp 1
-to fetch and cryptographically verify the set from the URL pointed
-to by the
-.Ev SM_PATH
-environment variable.
-If no such variable is set,
-.Pa xetcXX.tgz
-is skipped.
+directory containing modified and/or replaced files
+and the
+.Pa sysmerge.log
+run output log file.
 .Pp
 .Nm
 will work through the fileset,
-offering the chance to merge any differences using ${MERGE_CMD}.
+offering the chance to merge any differences using ${SM_MERGE}.
 Merged files may be edited using the default editor or be left to deal
 with at a later date.
 Should any problems occur,
@@ -129,14 +112,6 @@ Package mode.
 compares the default configuration files of installed
 .Xr packages 7
 against their target on the system (@sample).
-This option is mutually exclusive with
-.Fl x .
-.It Fl x Ar xetcXX.tgz
-Specify a path to an
-xetcXX.tgz tarball.
-A tarball path specified as a URL will be passed
-to
-.Xr ftp 1 .
 .El
 .Pp
 Files can be excluded from comparison by listing them in
@@ -166,14 +141,6 @@ A special test was added to handle this
 and they are offered for comparison only if they really differ.
 .Sh ENVIRONMENT
 .Bl -tag -width "DESTDIRXXX"
-.It Ev DBDIR
-Directory in which checksum files are stored.
-If unset, this defaults to
-.Pa /usr/share/sysmerge .
-.It Ev DESTDIR
-Directory in which to merge and install files.
-If unset, this defaults to
-.Pa / .
 .It Ev EDITOR , VISUAL
 Specifies an editor to use.
 If both
@@ -190,35 +157,18 @@ nor
 are set,
 the default is
 .Xr vi 1 .
-.It Ev FTP_KEEPALIVE
-Have
-.Xr ftp 1
-send a byte after every
-.Ev FTP_KEEPALIVE
-seconds,
-so that incorrectly configured network equipment won't aggressively drop it.
-See
-.Dq ftp -k
-for more information.
-.It Ev MERGE_CMD
+.It Ev PAGER
+Specifies the pagination program to use.
+.It Ev SM_MERGE
 Command used to merge diffs.
 This will be called with three arguments: the first argument is the
 output file to create, the second argument is the currently installed
 file and the third argument is the reference file.
 If unset, this defaults to
-.Dq sdiff -as -w ${SWIDTH} -o .
-.It Ev PAGER
-Specifies the pagination program to use.
-.It Ev REPORT
-Log summary which may contain information for further, manual,
-updating.
-Defaults to
-.Pa ${WRKDIR}/sysmerge.log .
-.It Ev SM_PATH
-A URL, specifying the directory to search for
-.Pa xetcXX.tgx
-matching the
-currently running release if none is specified on the command line.
+.Dq sdiff -as -w ${SWIDTH} -o
+where
+.Ev SWIDTH
+is the size of the terminal.
 .It Ev TMPDIR
 Directory in which the work directory is created.
 If unset, this defaults to
@@ -234,13 +184,17 @@ and
 .Sy backup
 directories are created relative to this.
 .It ${WRKDIR}/sysmerge.log
-Default log file.
+.Nm
+log file.
 .It /etc/sysmerge.ignore
 Files and directories to ignore from comparison.
 .It /usr/share/sysmerge/etc.tgz
-Base system
-.Em etc
-set corresponding to the currently installed release.
+Base system set containing the reference files
+corresponding to the currently installed release.
+.It /usr/share/sysmerge/xetc.tgz
+.Xr X 7
+set containing the reference files
+corresponding to the currently installed release.
 .El
 .Sh SEE ALSO
 .Xr more 1 ,
@@ -254,13 +208,10 @@ The
 script first appeared in
 .Ox 4.4 .
 .Sh AUTHORS
-.An -nosplit
-The
 .Nm
-shell script was written by
-.An Antoine Jacoutot Aq Mt ajacoutot@openbsd.org
-using
-.Fx
-mergemaster written by
-.An Douglas Barton Aq Mt DougB@FreeBSD.org
-as a base.
+was written by
+.An Antoine Jacoutot Aq Mt ajacoutot@openbsd.org .
+It was originally started as a friendly fork from
+mergemaster by
+Douglas Barton
+.Aq Mt DougB@FreeBSD.org .