Commit Graph

33 Commits

Author SHA1 Message Date
apb 9e61b51ee3 Fix default handling. etcupdate with no "-s" flag
should act like "etcupdate -s /usr/src".
Approved by christos.
2006-02-26 19:56:51 +00:00
apb 8cc0e19f2c Typo in comment. 2006-02-26 19:55:46 +00:00
apb 03f40d9364 Pass BUILD=1 in make environment.
Fixes PR 30385 from Rui Paulo.
Approved by chrisros.
2006-02-26 19:51:05 +00:00
apb 1f082bb8d2 Wording changes to clarify some the options presented after
a file is merged.
2006-02-19 14:56:56 +00:00
apb 32c588d6a3 Fix errors in previous. I accidentally committed the wrong code. 2006-02-19 11:36:10 +00:00
apb 7e321ef839 Give etcupdate the ability to use etc.tgz and xetc.tgz.
* Expand the "-s" flag to -s {srcdir|tgzfile|tempdir}.
* Deprecate the "-b" flag.  It is replaced by "-s tempdir".
* Change "-s srcdir" to refer to the top of the source tree (e.g.
  /usr/src) instead of the etc subdirectory.

In etcupdate's interactive phase, enhance the "s" command to be able
to invoke alternative diff commands.

Also some style changes.

Approved by christos
2006-02-18 19:29:48 +00:00
lukem 8232ca0162 Tweaks for the move of postinstall from /etc to /usr/sbin 2005-04-17 23:12:40 +00:00
grant cacf2d0f45 s/netbsd.org/NetBSD.org/i 2003-11-12 13:31:07 +00:00
martti c5a31d5210 Set ${MACHINE} and ${MACHINE_ARCH}. 2003-11-06 07:09:40 +00:00
lukem a329d6f3f8 add MTREE=mtree back, for systems with some .mk version skew... 2003-07-14 23:16:19 +00:00
lukem 001c68bd94 Rename a large chunk of the make(1) variables which refer to a
program/tool from "FOO" to "TOOL_FOO".  The new variables are:
	TOOL_ASN1_COMPILE  TOOL_CAP_MKDB  TOOL_CAT  TOOL_CKSUM  TOOL_COMPILE_ET
	TOOL_CONFIG  TOOL_CRUNCHGEN  TOOL_CTAGS  TOOL_DB  TOOL_EQN  TOOL_FGEN
	TOOL_GENCAT  TOOL_GROFF  TOOL_HEXDUMP  TOOL_INDXBIB  TOOL_INSTALLBOOT
	TOOL_INSTALL_INFO  TOOL_M4  TOOL_MAKEFS  TOOL_MAKEINFO  TOOL_MAKEWHATIS
	TOOL_MDSETIMAGE  TOOL_MENUC  TOOL_MKCSMAPPER  TOOL_MKESDB
	TOOL_MKLOCALE  TOOL_MKMAGIC  TOOL_MKTEMP  TOOL_MSGC  TOOL_MTREE
	TOOL_PAX  TOOL_PIC  TOOL_PREPMKBOOTIMAGE  TOOL_PWD_MKDB  TOOL_REFER
	TOOL_ROFF_ASCII  TOOL_ROFF_DVI  TOOL_ROFF_HTML  TOOL_ROFF_PS
	TOOL_ROFF_RAW  TOOL_RPCGEN  TOOL_SOELIM  TOOL_SUNLABEL  TOOL_TBL
	TOOL_UUDECODE  TOOL_VGRIND  TOOL_ZIC

For each, provide default in <bsd.sys.mk> of the form:
	TOOL_FOO?=	foo
and for the ${USETOOLS}=="yes" case in <bsd.own.mk>, provide override:
	TOOL_FOO=	${TOOLDIR}/bin/${_TOOL_PREFIX}foo

Document all of these in bsd.README.

This cleans up a chunk of potential (and actual) namespace collision
within our build infrastructure, as well as improves consistency in
the share/mk documentation and provision of appropriate defaults for
each of these variables.
2003-07-10 10:33:58 +00:00
atatat a9c9b3a125 Use awk instead of fgrep and sed, and default to 80 if we get
something that is arithmetically equal to 0.
2003-04-02 22:32:19 +00:00
wiz a90c0085c1 Some Bl improvements; drop trailing whitespace; don't comma-separate
"a, and b"; mention arguments in option listing; list options in SYNOPSIS
in default order (those without arguments first).
2003-04-02 19:30:57 +00:00
perry 2b097fd2fc Massive cleanup of the document, although there is a lot more work to
do still.
2003-04-02 16:47:40 +00:00
perry 35b6bc735d Automatically figure out how wide the terminal is with an ugly
`stty | fgrep | sed` expression.
Really, sdiff should figure this out by default but it does not.
2003-04-02 16:30:25 +00:00
perry 889c8a5b3a set USETOOLS=never when doing make distribution, so that users don't have
to set it themselves or set TOOLDIR to use etcupdate.

Closes PR install/19752 from Oliver Tonnhofer
2003-04-02 15:00:53 +00:00
perry 939003f2a8 Remove a NO_SENDMAIL=1 in the construction of the reference etc/ -- it
was needlessly preventing the update of sendmail configs like submit.cf
Should close PR misc/20968 from Martin Weber
2003-04-02 04:04:29 +00:00
perry fec4dbea24 Add a -l option telling etcupdate to skip any file who's RCS id has
not been changed.
(-l means "skip local modifications".)
Code and documentation from Christopher Richards in PR bin/20200
2003-04-02 03:07:30 +00:00
wiz 70fd69c1f5 New sentence, new line; bump date for recent changes. 2003-03-17 08:19:22 +00:00
martti f925d156c3 Checksum files produced by "etcupdate -a" should not be stored in /etc
as / might be a read-only filesystem (PR#20201).
2003-03-03 14:07:11 +00:00
mrg 5de60e100f allow /etc/etcupdate.conf (and ~/.etcupdate.conf) to set IGNOREFILES to a list
of files that etcupdate will ignore; never considering them for updating.
2003-03-01 12:59:54 +00:00
grant 806593a806 The correct capitalisation of 'NetBSD.org' is (you
guessed it) 'NetBSD.org'.

some mdoc fixes.
2003-02-14 16:11:34 +00:00
martti 18e623daf9 Use md5 instead of sum (bin/20196). 2003-02-04 08:33:03 +00:00
wiz e92b96aa79 grammar fix. 2003-01-24 13:08:22 +00:00
martti c7d6e073eb Add a new -a flag (automatically update files which have not been
locally modified). Patch provided by Sverre Froyen in a private mail,
slightly modified by me.
2003-01-24 13:06:06 +00:00
jmmv 5968c8244d Fix a typo in the yesno() function: add a missing question mark.
Approved by martti.
2002-12-27 19:47:43 +00:00
martti a645b3b843 Don't execute /etc/postinstall if -b was used. 2002-09-28 06:17:16 +00:00
grant 34e29c6844 fix typo, from Julio Merino in bin/18440. 2002-09-27 18:20:52 +00:00
mrg ecae279f88 fix usage() message for "-s" argument. ie, do *not* suggest "/usr/src"
as this causes "make distribution" to be run in /usr/src.
2002-07-31 06:43:17 +00:00
wiz 4eed7fe383 Fix typo reported in bin/17516. 2002-07-08 11:32:44 +00:00
martti 592f55864b Include user's PATH (pkg/16828 by HAMAJIMA Katsuomi) 2002-05-15 08:17:56 +00:00
martti 53761afc9a Run /etc/postinstall if it's found 2002-05-13 12:43:16 +00:00
martti 4f077f96a1 Added etcupdate (etcupdate-20020321 in pkgsrc) 2002-03-22 10:10:56 +00:00