Module Name:	pkgsrc
Committed By:	dillo
Date:		Sun May  8 13:43:31 UTC 2005

Modified Files:
	pkgsrc/mk: bsd.options.mk
	pkgsrc/mk/defaults: mk.conf obsolete.mk
Added Files:
	pkgsrc/mk/defaults: options.description

Log Message:
Rewrite how PKG_OPTIONS is computed:
- PKG_SUGGESTED_OPTIONS (set by pkg maintainer in pkg Makefile)
	lists options enabled by default.
- PKG_DEFAULT_OPTIONS (set by user in /etc/mk.conf)
	enables or disables (when prefixed with `-') options for
	all packages, takes precedence over PKG_SUGGESTED_OPTIONS
- PKG_OPTIONS.foo (set by user in /etc/mk.conf)
	enables or disables (when prefixed with `-') options for
	a specific package, takes precedence over PKG_DEFAULT_OPTIONS
	and PKG_SUGGESTED_OPTIONS

Also simplify conversion of legacy USE_XXX variables to options
via the new PKG_OPTIONS_LEGACY_VARS variable and emit warnings if
legacy variables are in use.

Add a new target describe-options that lists all supported options
with a one-line description, the options enabled by default and
the currently enabled optoions.

Reviewed by jlam and wiz.

XXX: defaults/options.description has to be filled in
XXX: the pkgsrc guide has to be updated


To generate a diff of this commit:
cvs rdiff -r1.19 -r1.20 pkgsrc/mk/bsd.options.mk
cvs rdiff -r1.39 -r1.40 pkgsrc/mk/defaults/mk.conf
cvs rdiff -r1.5 -r1.6 pkgsrc/mk/defaults/obsolete.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/defaults/options.description

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