Commit Graph

16 Commits

Author SHA1 Message Date
Doug Barton
00894211bd Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc 2001-05-28 13:10:16 +00:00
Ruslan Ermilov
eb0838029f mdoc(7) police: normalize .Nd. 2001-04-18 15:54:10 +00:00
Doug Barton
5d7b107e1c * Add two requested features, source'ing of /etc/mergemaster.rc, and
asking the user to actually run the recommended commands related
  to installation of files such as aliases or login.conf.

* Return to using grep for CVS $Id comparison. Using ident caused too
  many problems for people with local CVS/RCS tags in their stuff.
  Attempt to make portability a little easier to maintain in spite of
  this change by defining the name of the tag to search for. This
  is a slightly different change that solves the problem in the PR.

PR:		bin/24564
Submitted by:	Tony Finch <dot@dotat.at>
2001-03-05 10:13:21 +00:00
Ruslan Ermilov
8b5c4af3ff Prepare for mdoc(7)NG. 2000-12-27 15:30:30 +00:00
Ruslan Ermilov
e97407b4f2 mdoc(7) police: use the new features of the Nm macro. 2000-11-20 20:10:44 +00:00
Ruslan Ermilov
251c176f41 mdoc(7) police: use certified section headers wherever possible. 2000-11-17 11:44:16 +00:00
Ruslan Ermilov
b5c508fba3 Use Fx macro wherever possible. 2000-11-14 11:20:58 +00:00
Doug Barton
6f8d4c2ffc * Reduce diffs to RELENG_4 by specifying a full path to sysctl
* Adjust a little whitespace
* Make the distrib-dirs/mtree on DESTDIR conditional on user
  actually specifying a DESTDIR. This seemed like a safe
  way to get the right directories and permissions in the
  installed tree since 'make installworld' does the same
  thing, but in practice too many people have custom hacks
  that we should leave unmolested. Still need to find a way
  to deal with 'install -d' and permissions on nonexistent
  directories in the middle of the path, but this is at
  least no worse that it was before.

PR:		bin/22661
2000-11-09 00:19:21 +00:00
Doug Barton
d5a5b144b6 Add several new features, reorder some code, and continue with the
process of making the script more cross platform friendly.

* Add -i option to automatically install files that do not exist
  on the system already.
* Add the ability to specify DESTDIR.
* Allow the user to specify scripts to run right before the
  comparison starts, and when mm is done. This will
  allow the user to specify customized local behavior, and
  implement features such as automatically deleting files.
* Document the above changes in the man page.
* Switch to using 'ident' for the CVS Id comparison, which
  should help with portability, and makes it faster.
* Reorder, and in one case fix some code by doing things in
  ways that make more sense.
* Check to see if the file exists on the system before doing
  the comparisons. This saves CPU cycles, and streamlines
  the auto-install process.

I used bits and pieces of suggestions and patches from various
people, ultimately too numerous to name. Which is not to say
that they were not both appreciated, and helpful in achieving
the ultimate result.
2000-10-30 10:33:51 +00:00
Doug Barton
74972d42db Update copyright 2000-10-29 09:41:06 +00:00
Mark Ovens
8f18f09f14 Update link to Making the World tutorial (now in the handbook) 2000-08-07 23:25:22 +00:00
Sheldon Hearn
f2e366a105 Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.
2000-03-01 14:09:25 +00:00
Bill Fumerola
256d3d1de0 Add IGNORE_MOTD to allow the sysadmin to ignore (likely) differences in
the FreeBSD default motd and the system motd

Submitted by:	author
1999-10-26 19:06:31 +00:00
Bill Fumerola
24518e4c42 freebsd -> FreeBSD 1999-10-26 18:57:04 +00:00
Bill Fumerola
31b8a7c28b Add $FreeBSD$
Submitted by:	chris
1999-10-26 18:54:57 +00:00
Bill Fumerola
b9d7a08d37 Import mergemaster into the tree, a product of freebsdcon.
Submitted by: 	Doug Barton <doug@gorean.org>
1999-10-20 07:22:52 +00:00