Module Name:	pkgsrc
Committed By:	jmmv
Date:		Wed Apr  7 12:05:38 UTC 2004

Modified Files:
	pkgsrc/bootstrap: bootstrap
	pkgsrc/bootstrap/mods/mk: bsd.own.mk.in
Added Files:
	pkgsrc/bootstrap/mods/mk: IRIX.own.mk.in OpenBSD.bsd.own.mk.in
Removed Files:
	pkgsrc/bootstrap/mods/mk: IRIX.own.mk OpenBSD.bsd.own.mk

Log Message:
Add support for the --sysconfdir argument, which changes the location of
configuration files.

From now on, mk.conf is first searched under the value passed to the
sysconfdir argument (which defaults to ${prefix}/etc, to match pkgsrc's
PKG_SYSCONFDIR default value).  If not found, /etc/mk.conf is tried, to
not break existing installations which have the file in that location.
This is done to help with non-root installations of pkgsrc.

Also change pkgsrc's PKG_SYSCONFBASE value to match what is given to
sysconfdir, for consistency.

While doing this, rename $opsys.own.mk files to $opsys.own.mk.in for clarity,
as they now need sed replacements to work (i.e., the SYSCONFDIR stuff).


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 pkgsrc/bootstrap/bootstrap
cvs rdiff -r1.1.1.1 -r0 pkgsrc/bootstrap/mods/mk/IRIX.own.mk \
    pkgsrc/bootstrap/mods/mk/OpenBSD.bsd.own.mk
cvs rdiff -r0 -r1.1 pkgsrc/bootstrap/mods/mk/IRIX.own.mk.in \
    pkgsrc/bootstrap/mods/mk/OpenBSD.bsd.own.mk.in
cvs rdiff -r1.2 -r1.3 pkgsrc/bootstrap/mods/mk/bsd.own.mk.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.