Commit graph

52 commits

Author SHA1 Message Date
jlam
1e2d98e634 Make the display of show-options more readable when there are lots of
options, e.g. x11/xorg-server, by wordwrapping the output.
2006-04-14 17:15:03 +00:00
wiz
0719006c41 Update path from cyrus-sasl2 to cyrus-sasl. 2006-04-13 21:45:12 +00:00
rillig
9ed2937efe Removed trailing white-space from a comment. 2005-11-14 04:25:50 +00:00
dillo
7eb75ea07a Improve warning for deprecated variables, prompted by wiz. 2005-09-05 15:24:08 +00:00
dillo
c9294e90d1 Fix some more typos, noted by Leonard Schmidt. 2005-07-28 15:17:55 +00:00
wiz
a6c70eb6d7 Fix typo in comment, from Leonard Schmidt via tech-pkg. 2005-07-28 13:22:08 +00:00
dillo
228b1f9528 Fix typos in last, noted by wiz. 2005-07-26 16:09:34 +00:00
dillo
a6f3882d40 Add support for sets of options where at least one option from each
set must be selected, requested and reviewed by wiz:

PKG_OPTIONS_NONEMPTY_SETS
       This is a list of names of sets of options.  At
       least one option from each set must be selected.
       The options in each set are listed in
       PKG_OPTIONS_SET.<setname>.  Options from the sets
       will be automatically added to PKG_SUPPORTED_OPTIONS.
2005-07-26 09:00:42 +00:00
dillo
f3e77304f9 Also print deprecated warnings in show-options target. 2005-07-19 10:30:22 +00:00
dillo
6701dc8ba7 PKG_OPTIONS_LEGACY_OPTS: only issue deprecated warning if the old
option is used.  Noted by adrianp.
2005-07-19 09:28:50 +00:00
dillo
91ba937bb4 Allow this file to be included even if no options are supported
(as may be the case if all options are platform specific).  In that
case set PKG_OPTIONS to empty and skip the rest of the file.

Okayed by jlam.
2005-06-11 16:12:13 +00:00
jlam
c285ef536b Fix harmless typo. 2005-06-09 18:44:26 +00:00
wiz
774ace527b Fix variable name in comment: it is PKG_OPTIONS_VAR, with an S. 2005-06-08 22:36:52 +00:00
dillo
db9aee67d2 fix variable name in example comment 2005-06-08 16:19:08 +00:00
dillo
a55c83b93b make legacy variables external:
PKG_LEGACY_OPTIONS
	PKG_OPTIONS_DEPRECATED_WARNINGS
2005-06-06 13:54:51 +00:00
dillo
dff8372404 Improve the way option groups are displayed in show-options.
While here, rename _cls_ to _grp_, as they are called groups.
2005-06-04 16:30:19 +00:00
seb
5feada633d Fix variable names in usage example. 2005-06-04 10:11:24 +00:00
dillo
5fa9d959f6 don't requrie PKG_SUPPORTED_OPTIONS to be set when groups are in use 2005-06-03 14:25:47 +00:00
dillo
f91dd9c279 add group options to PKG_SUPPORTED_OPTIONS before includeing
mk/defaults/obsolete.mk so socks and kerberos work when listed in
groups
2005-06-02 21:55:05 +00:00
wiz
0303df72aa Whitespace nit. 2005-06-02 20:43:55 +00:00
dillo
7f874cf6f0 add support for groups of mutually exclusive options via
PKG_OPTIONS_REQUIRED_GROUPS and PKG_OPTIONS_OPTIONAL_GROUPS.
2005-06-02 20:38:09 +00:00
dillo
b05a793493 fix bug in legacy vars handling for option names containing `-',
found by jmmv.
2005-06-01 13:40:14 +00:00
jmmv
33a592167e PKG_FAIL_REASON must be (double-)quoted to achieve the correct output. 2005-05-31 18:25:37 +00:00
wiz
8dfa9a3aa9 Show a deprecated warning even if the deprecated variable is set to
something other than [yY][eE][sS].
If a deprecated warning is defined, interpret it as YES (because some
variables in defaults/mk.conf have defined/not defined as yes/no).

Reviewed by dillo.
2005-05-31 16:03:41 +00:00
rillig
66c9dd0de7 The available options are shown before the dependencies are installed.
Many package options influence the dependencies, so this order is more
likely to be useful.
2005-05-31 15:05:13 +00:00
dillo
8cda012601 Rename describe-options to show-options, replacing the old show-options
target.
2005-05-31 12:10:07 +00:00
dillo
42816a484c To ease cleanup of the options namespace, add code to support legacy
option names:

PKG_OPTIONS_LEGACY_OPTS+=	old:new

If PKG_DEFAULT_OPTIONS or PKG_OPTIONS.foo contains option old (or
-old) it is rewritten to new (or -new) and a warning is issued by
the supported-options-message target.
2005-05-31 11:05:31 +00:00
dillo
7940fef51d set PKG_FAIL_REASON if any unsupported option is listed in PKG_OPTIONS.xxx 2005-05-28 12:14:34 +00:00
dillo
a60e646ed0 fix typo in documentation
add support for negative options in PKG_OPTIONS_LEGACY_VARS (NO_FOO:-foo)
undef temporary variables after for loop
2005-05-25 11:18:35 +00:00
jlam
15cc40e17f The example is missing a definition for PKG_OPTIONS_VAR. 2005-05-19 01:15:57 +00:00
rillig
7168c9aa72 Changed option processing to evaluate the options strictly from left to
right in each variable, starting with the most generic one. Later
definitions override earlier ones. This makes the ``order'' testcase in
regress/pkg-options succeed.
2005-05-16 09:08:29 +00:00
rillig
fc4a97a8d8 Don't process the file if either of PKG_SUPPORTED_OPTIONS or PKG_OPTIONS_VAR
is undefined. This avoids many unnecessary make(1) warnings. As this file
is only intended to be used from packages, don't look for obsolete.mk in
other directories than ../../mk/defaults/.
2005-05-14 02:17:43 +00:00
dillo
56dffda7c7 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
2005-05-08 13:43:30 +00:00
jlam
12e799d380 Make the pretty-printing actually work by passing all of the options on
different lines to the word-wrap script.
2005-04-28 21:58:44 +00:00
jlam
15a56127d9 We don't need to use ${SORT} to sort the options list. VAR:O will do
nicely.
2005-04-28 21:48:14 +00:00
jlam
a80646b20d Defer execution until the value is needed. This avoids needing ${ECHO},
${XARGS}, and ${SORT} until the make targets are executed.
2005-04-28 18:40:35 +00:00
tv
db5bb1ad1d Merge down janitorial change from tv-derecurse branch:
No need to do .som_done dance; just show the message as part of the
pre-extract phase.  If that means showing it more than once if the extract
is interrupted and restarted, no harm done.
2005-01-24 18:04:24 +00:00
adrianp
204ac90729 Fix endif typo 2005-01-15 08:59:28 +00:00
schmonz
c0b159de2e In the show-options target, ensure that PKG_OPTIONS and friends
are non-empty before shelling out to xargs. Silences spurious output
from "pkg_chk -i" and probably others.
2004-12-05 23:23:50 +00:00
grant
c463b8b491 make sure some variables are initialized before using them. 2004-12-05 22:38:06 +00:00
grant
e221a993eb add show-options target which displays the options available, default,
and enabled for the current pkg, eg. mail/sendmail:

available: db2 db4 inet6 ldap sasl sasl2 socketmap starttls tcpwrappers
default: canna esound gif idea inet6 inet6 sj3 tcpwrappers wnn4
enabled: inet6 tcpwrappers
2004-12-05 09:20:48 +00:00
jlam
b87ac57b91 Don't show the currently selected options if there aren't any. 2004-11-28 08:00:51 +00:00
jlam
add5eb0d1d Output the currently selected options after telling the user which
options are available.
2004-11-27 04:50:55 +00:00
jlam
f6447cb638 Default PKG_FAIL_UNSUPPORTED_OPTIONS to "no" to match current practices
for using bsd.options.mk, which is:

	PKG_DEFAULT_OPTIONS=	<common options>
	PKG_OPTIONS.<pkg>=	${PKG_DEFAULT_OPTIONS} <mods to defaults>
2004-09-15 03:59:17 +00:00
jlam
1f9933b155 Match documentation to reality to reflect recent change in semantics for
PKG_DEFAULT_OPTIONS.
2004-08-22 19:42:10 +00:00
jlam
9d5426ff76 Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework.  Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS.  This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.

This fixes PR pkg/26590.
2004-08-22 19:32:51 +00:00
schmonz
ed6f9f8369 Fix spell-o. 2004-08-10 05:33:05 +00:00
jlam
7d11d16245 Use an awk script to avoid using possibly non-portable shell constructs. 2004-08-07 18:02:05 +00:00
jlam
8810d2a8dd Move addition of PKG_OPTIONS to BUILD_DEFS below the definition of the
build-defs-message target so that PKG_OPTIONS doesn't show up as a
settable variable in the displayed message.
2004-08-05 02:10:20 +00:00
jlam
955bd55d68 Pretty-print the PKG_SUPPORTED_OPTIONS so that we don't overflow a line
of the display.  We now batch them up and print a few per line.  Also,
display the supported options at pre-install-depends time.
2004-08-04 23:25:14 +00:00