Commit Graph

46 Commits

Author SHA1 Message Date
Doug Barton
e4a9231de9 Hopefully squish the problem of mm creating sendmail files in
the source tree once and for all.

Pointed out by: A cast of thousands

Reviewed by:	asmodai
2001-08-07 06:22:12 +00:00
David E. O'Brien
90e655ea4e Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
2001-07-20 06:20:32 +00:00
Ruslan Ermilov
a4c37c816b mdoc(7) police: removed HISTORY info from the .Os call. 2001-07-10 15:12:08 +00:00
Dima Dorfman
70d51341bf mdoc(7) police: remove extraneous .Pp before and/or after .Sh. 2001-07-09 09:54:33 +00:00
Ruslan Ermilov
1fd59f79aa mdoc(7) police:
Use -tag list in the FILES section to work around the bug
when .Pa font is not restored to its original value if one
of the -hang, -ohang, or -inset lists is used in the FILES
section.  (The fix for the bug has just been submitted to
the GNU Groff maintainers.)

Also, fixed the Handbook reference in the SEE ALSO.
2001-07-05 09:35:20 +00:00
Doug Barton
31e58c1713 Work around the problem in RELENG_4 where the file doesn't actually
exist, and therefore mm_install is returning the "fail" value of
the test instead of the "success" value for install.

This change is a no-op on HEAD, but since the only harm on RELENG_4
ATM is a spurious warning it can follow the usual MFC practice.

Submitted by:	A cast of thousands :-/
2001-06-20 07:15:38 +00:00
Doug Barton
370b8c6831 Add the last of the compatibility mods from openbsd. Neatly, the
"install && rm" change fits in with the new FreeBSD default of
copy instead of move for install. Changing the order of the deletion
of the spurious password files doesn't affect FreeBSD functionality,
but it's done in such a way as not to matter.

Obtained from:	Christian Weisgerber <naddy@mips.inka.de>
2001-05-30 08:50:10 +00:00
Doug Barton
68bec7b7a1 Various fixes, including suggestions from some thoughtful folks, thanks.
* Minor umask portability change (Christian Weisgerber <naddy@mips.inka.de>)
* Clarify default value of the "run it now" option (bmah)
* Make "run it now" $DESTDIR safe (bsd)
* Handle installation of hard links for /.profile and /.cshrc properly
  when the auto-install option is selected
* Fix some more whitespace issues
2001-05-28 13:17:20 +00:00
Doug Barton
00894211bd Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc 2001-05-28 13:10:16 +00:00
Doug Barton
e5a2a8f241 Be more consistent with the terminology, referring to "temporary and
installed" instead of "old and new". Inspired by the somewhat
non-linear PR, which really didn't have a fix, per se.

PR:		conf/27235 Roelof Osinga <roelof@eboa.com>
2001-05-28 09:46:18 +00:00
Doug Barton
217239504e Fix a problem when user selects -a (auto run) but we encounter a file
missing on the system. Instead of passing it by, mm was prompting...
bad mm, no cookie!

Brought to my attention by the PR, but the fix needed to be tweaked to
handle the auto-install option as well.

PR:		misc/25731 Gilbert Gong <ggong@cal.alumni.berkeley.edu>
2001-05-28 09:35:30 +00:00
Doug Barton
25756f4470 Whitespace only changes to try and fit a little better into 80 columns. 2001-05-28 09:07:27 +00:00
Ruslan Ermilov
eb0838029f mdoc(7) police: normalize .Nd. 2001-04-18 15:54:10 +00:00
Ruslan Ermilov
b9ad8c8635 beforeinstall -> SCRIPTS. 2001-04-07 11:21:35 +00:00
Jeroen Ruigrok van der Werven
2baf30741f Change NO_MAKEDEV to a finer granularity method:
NO_MAKEDEV_INSTALL and NO_MAKEDEV_RUN.  The former implying the latter.
The names imply what they do.  The last commit by DES based on a PR defeated
the original idea behind NO_MAKEDEV, which was not to run MAKEDEV, but to do
the installation of MAKEDEV.  This should satisfy both parties on the MAKEDEV
challenge.
Reflect this in mergemaster, this might later on be decided to be set to
NO_MAKEDEV_INSTALL, for now I kept to the old behaviour.
2001-03-29 14:04:19 +00:00
Ruslan Ermilov
345e52e742 - Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
2001-03-26 14:42:20 +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
bc21bd54d0 Reorder one of the new features based on experience. Since the number
of files auto-installed during an upgrade from a really old system
can get quite long, and it's piped to the PAGER already, print
that first, then print any of the 4 two-line messages that might
apply.
2000-11-01 07:21:56 +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
Doug Barton
0006169a06 More changes that don't modify functionality.
* More whitespace
* Change read -p to echo -n/read to help support portability
* Genericize an informational message regarding /.cshrc and /.profile
  for the same reason
2000-10-29 09:40:22 +00:00
Doug Barton
3bc374238a Whitespace only. Make the style of the contributed sections consistent with
the rest of the file. (Read, put it back the way I like it.)
2000-10-29 07:47:51 +00:00
Bill Fumerola
83ef0eba1a Almost a year exactly from when I first imported mergemaster at freebsdcon,
remove myself as co-maintainer and let Doug handle all the fun.
2000-10-26 05:36:35 +00:00
Ben Smithurst
cf8728a497 Make mergemaster ignore files in /dev if /dev is a devfs.
Approved by:	Doug Barton <Doug@gorean.org>
2000-08-26 12:15:24 +00:00
Gregory Neil Shapiro
7e5e46fad7 Use new aliases path (/etc/mail/aliases)
Approved by:	Doug Barton <DougB@gorean.org>
2000-08-13 19:32:19 +00:00
Brian Somers
6c2ccd0a61 Be more careful about selecting a PAGER.
Improve the question asked when the PAGER is invalid.

Submitted by: Doug Barton <DougB@gorean.org>
2000-08-09 20:36:15 +00:00
Mark Ovens
8f18f09f14 Update link to Making the World tutorial (now in the handbook) 2000-08-07 23:25:22 +00:00
Brian S. Dean
c0c9cad1af Actually accept 'm' as a PAGER query response to mean 'more'. 2000-05-12 03:09:57 +00:00
Alfred Perlstein
bdbca6ddeb Make mergemaster only take single letters for options as well as loop
asking a question again if given an invalid input instead of assuming
what the user wants.  /etc is not the place to make assumptions when
given invalid input.

Reformat some of the more convoluted code into seperate functions instead
of being inline using tabs instead of space indents.

Allow the user to view merged files they created with sdiff.

Allow the user to redisplay the diff between the installed file and
the new file again.

Time wasted waiting for review: 1 month 2 weeks
2000-04-02 02:47:15 +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
638a3aacaa Use the new (Hi rwatson!) NO_MAKEDEV when making our temproot.
Submitted by:	Doug Barton <Doug@gorean.org> (maintainer)
Approved by:	you-know-who.
2000-02-12 22:14:02 +00:00
Bill Fumerola
b85666e879 Allow $PAGER to have arguments.
Submitted by:	brian
Reviewed by:	Doug Barton <Doug@gorean.org>
Approved by:	jkh
2000-02-08 22:31:53 +00:00
Chris Costello
fd27f1594e `mergemaster'' was repo-copied to `mergemaster.sh'' as it's a shell script.
Delete the original mergemaster and modify Makefile to install mergemaster.sh.

Seen no problem with by:	billf
No objections by:		Doug Barton
1999-11-01 04:29:05 +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
5edab78fb5 Use $FreeBSD$ (instead of the author's $Revision$) to report the
version number now that we have it.

Reviewed by:	author
1999-10-26 19:05:04 +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
deb5a6cd09 Co-MAINTAINER this module. 1999-10-26 18:52:36 +00:00
Bill Fumerola
f543e6bdd2 Add $FreeBSD$ 1999-10-25 21:51:04 +00:00
Bill Fumerola
24ff9bb509 mergemaster bmake glue. 1999-10-20 07:33:09 +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