Module Name:	pkgsrc
Committed By:	tv
Date:		Sun May 23 22:10:01 UTC 1999

Modified Files:
	pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
Log Message:
- Move the inclusion of bsd.own.mk to bsd.prefs.mk, and multiple-include
  protect bsd.prefs.mk.  Now there's no multiple inclusion of mk.conf,
  clobbering variables modified between bsd.prefs.mk and bsd.pkg.mk, when
  set with VARNAME=value.
- Let bsd.own.mk include mk.conf/MAKECONF; we don't need to do that
  manually.
- Don't define BSD_PKG_MK or OPSYS in bsd.pkg.mk, as bsd.prefs.mk does
  precisely that just a couple lines below.

To generate a diff of this commit:
cvs rdiff -r1.270 -r1.271 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/bsd.prefs.mk

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