The NetBSD Project

CVS log for pkgsrc/mk/bsd.options.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.74 / (download) - annotate - [select for diffs], Fri Nov 30 18:38:19 2018 UTC (3 months, 2 weeks ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2018Q4-base, pkgsrc-2018Q4, HEAD
Changes since 1.73: +2 -1 lines
Diff to previous 1.73 (colored)

mk/misc: make configuration for show-all targets more configurable

Up to now, there was a central list of variable name patterns that
defined whether a variable was printed as a sorted list, as a list or as
a single value.

Now each variable group decides on its own which of the variables are
printed in which way, using the usual glob patterns. This is more
flexible since different files sometimes differ in their naming
conventions.

Two variable groups are added: license (for everything related to
LICENSE) and go (for lang/go).

Revision 1.73 / (download) - annotate - [select for diffs], Thu Dec 1 15:28:57 2016 UTC (2 years, 3 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-
Changes since 1.72: +12 -1 lines
Diff to previous 1.72 (colored)

Add PKG_DISABLED_OPTIONS.

This variable contains the options that are NOT enabled for a package.

Revision 1.72 / (download) - annotate - [select for diffs], Wed Mar 23 11:50:01 2016 UTC (2 years, 11 months ago) by jperkin
Branch: MAIN
CVS Tags: pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1
Changes since 1.71: +11 -1 lines
Diff to previous 1.71 (colored)

Move handling for PKG_SUPPORTED_OPTIONS and PKG_SUGGESTED_OPTIONS as
OPSYSVARS to bsd.options.mk as they affect tests against PKG_OPTIONS
before bsd.pkg.mk is parsed.

Approved for commit during the freeze by agc@.

Revision 1.71 / (download) - annotate - [select for diffs], Fri Jun 7 00:41:39 2013 UTC (5 years, 9 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2
Changes since 1.70: +1 -11 lines
Diff to previous 1.70 (colored)

Move show-depends-options again, to be worked form non-option packages.

Revision 1.70 / (download) - annotate - [select for diffs], Sun May 12 17:19:41 2013 UTC (5 years, 10 months ago) by riastradh
Branch: MAIN
Changes since 1.69: +2 -2 lines
Diff to previous 1.69 (colored)

Strip minus for warning about disabling unsupported options.

Revision 1.69 / (download) - annotate - [select for diffs], Sun May 12 05:13:38 2013 UTC (5 years, 10 months ago) by obache
Branch: MAIN
Changes since 1.68: +11 -1 lines
Diff to previous 1.68 (colored)

Move show-depends-options, it is pkgformat independ target.

Revision 1.68 / (download) - annotate - [select for diffs], Sat May 11 18:48:52 2013 UTC (5 years, 10 months ago) by riastradh
Branch: MAIN
Changes since 1.67: +5 -1 lines
Diff to previous 1.67 (colored)

Warn, don't fail, on disabling an unsupported option.

Revision 1.67 / (download) - annotate - [select for diffs], Mon Feb 18 14:30:40 2008 UTC (11 years, 1 month ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2, pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, cwrapper, cube-native-xorg-base, cube-native-xorg
Changes since 1.66: +1 -11 lines
Diff to previous 1.66 (colored)

Move show-depends-options target from bsd.options.mk to flavor/pkg/utility.mk
to work with option-less packages.

Revision 1.66 / (download) - annotate - [select for diffs], Mon Feb 18 12:38:35 2008 UTC (11 years, 1 month ago) by obache
Branch: MAIN
Changes since 1.65: +11 -1 lines
Diff to previous 1.65 (colored)

Add target "show-depends-options" to show depends's options recursively.

Revision 1.65 / (download) - annotate - [select for diffs], Sun Oct 28 11:29:06 2007 UTC (11 years, 4 months ago) by tron
Branch: MAIN
CVS Tags: pkgsrc-2007Q4-base, pkgsrc-2007Q4
Changes since 1.64: +6 -1 lines
Diff to previous 1.64 (colored)

Protect against multiple inclusion. This fixes the "sane-frontends"
package which includes "bsd.options.mk" via its own "options.mk" and
via "graphics/gimp/buildlink3.mk".

Revision 1.64 / (download) - annotate - [select for diffs], Sat Oct 13 11:04:16 2007 UTC (11 years, 5 months ago) by dsl
Branch: MAIN
Changes since 1.63: +3 -3 lines
Diff to previous 1.63 (colored)

Fix the .include lines so that make looks in the right place first.
Remember .include "foo.mk" is looked for (first) in the directory that
contains the makefile being processed (like in C), so remove all the
${.PARSEDIR} and ../ sequences that just cause grief.

Revision 1.63 / (download) - annotate - [select for diffs], Sun Oct 7 21:48:30 2007 UTC (11 years, 5 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q3-base, pkgsrc-2007Q3
Changes since 1.62: +10 -1 lines
Diff to previous 1.62 (colored)

Added _VARGROUPS.

Revision 1.62 / (download) - annotate - [select for diffs], Wed Aug 29 15:59:52 2007 UTC (11 years, 6 months ago) by rillig
Branch: MAIN
Changes since 1.61: +7 -11 lines
Diff to previous 1.61 (colored)

Hey Johnny, I thought you could still write code that also works with
Solaris' /bin/sh.

Revision 1.61 / (download) - annotate - [select for diffs], Tue Aug 14 19:03:25 2007 UTC (11 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.60: +9 -9 lines
Diff to previous 1.60 (colored)

Avoid checking whether PKG_OPTIONS_DEPRECATED_WARNINGS is defined in
the makefile and simply handle it in the shell code.  This allows for
appending to PKG_OPTIONS_DEPRECATED_WARNINGS in a makefile even after
bsd.options.mk is included.

Revision 1.60 / (download) - annotate - [select for diffs], Wed Jun 6 07:12:31 2007 UTC (11 years, 9 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q2-base, pkgsrc-2007Q2
Changes since 1.59: +23 -22 lines
Diff to previous 1.59 (colored)

Removed the outer .if ... .endif, so that I don't need to indent the
other conditionals. Indented all conditionals according to pkglint's
idea of correct indentation.

All packages that use this file must also have some options. Otherwise,
why should they use it at all?

All errors are _appended_ to PKG_FAIL_REASON, instead of overwriting
older ones.

Revision 1.59 / (download) - annotate - [select for diffs], Wed Mar 7 00:33:24 2007 UTC (12 years ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2007Q1-base, pkgsrc-2007Q1, jlam-pkgviews-base, jlam-pkgviews
Changes since 1.58: +8 -3 lines
Diff to previous 1.58 (colored)

Split the documentation into a user and a developer part.

Revision 1.58 / (download) - annotate - [select for diffs], Sun Oct 1 14:51:03 2006 UTC (12 years, 5 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2006Q4-base, pkgsrc-2006Q4
Changes since 1.57: +3 -2 lines
Diff to previous 1.57 (colored)

The value of PKG_OPTIONS_VAR is printed as is in an error message. This
makes "double quotes" visible when they are accidentally included by the
pkgsrc user.

Revision 1.57 / (download) - annotate - [select for diffs], Mon Sep 25 08:23:59 2006 UTC (12 years, 5 months ago) by ghen
Branch: MAIN
CVS Tags: pkgsrc-2006Q3-base, pkgsrc-2006Q3
Changes since 1.56: +2 -2 lines
Diff to previous 1.56 (colored)

PR pkg/33876: use the actual package name instead of "this package" in
supported-options-message.  ok with wiz.

Revision 1.9.4.6, Wed Jun 7 15:25:38 2006 UTC (12 years, 9 months ago) by tv
Branch: tv-derecurse
Changes since 1.9.4.5: +1 -1 lines
FILE REMOVED

EOL the tv-derecurse branch; it has become too outdated.  The last live
revision can be fetched at the tv-derecurse-eol tag.

Revision 1.56 / (download) - annotate - [select for diffs], Tue Jun 6 00:15:45 2006 UTC (12 years, 9 months ago) by seb
Branch: MAIN
CVS Tags: pkgsrc-2006Q2-base, pkgsrc-2006Q2
Changes since 1.55: +2 -8 lines
Diff to previous 1.55 (colored)

Make show-options target output shorter as requested by dillo@

Revision 1.55 / (download) - annotate - [select for diffs], Sat Jun 3 23:11:42 2006 UTC (12 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (colored)

First pass at implementing support for package system flavors other
than pkgsrc's current one.  This is an important lead-up to any project
that redesigns the pkg_* tools in that it doesn't tie us to past design
(mis)choices.  This commit mostly deals with rearranging code, although
there was a considerable amount of rewriting done in cases where I
thought the code was somewhat messy and was difficult to understand.

The design I chose for supporting multiple package system flavors is
that the various depends, install, package, etc.  modules would define
default targets and variables that may be overridden in files from
pkgsrc/mk/flavor/${PKG_FLAVOR}.  The default targets would do the
sensible thing of doing nothing, and pkgsrc infrastructure would rely
on the appropriate things to be defined in pkgsrc/mk/flavor to do the
real work.  The pkgsrc/mk/flavor directory contains subdirectories
corresponding to each package system flavor that we support.  Currently,
I only have "pkg" which represents the current pkgsrc-native package
flavor.  I've separated out most of the code where we make assumptions
about the package system flavor, mostly either because we directly
use the pkg_* tools, or we make assumptions about the package meta-data
directory, or we directly manipulate the package meta-data files, and
placed it into pkgsrc/mk/flavor/pkg.

There are several new modules that have been refactored out of bsd.pkg.mk
as part of these changes: check, depends, install, package, and update.
Each of these modules has been slimmed down by rewriting them to avoid
some recursive make calls.  I've also religiously documented which
targets are "public" and which are "private" so that users won't rely
on reaching into pkgsrc innards to call a private target.

The "depends" module is a complete overhaul of the way that we handle
dependencies.  There is now a separate "depends" phase that occurs
before the "extract" phase where dependencies are installed.  This
differs from the old way where dependencies were installed just before
extraction occurred.  The reduce-depends.mk file is now replaced by
a script that is invoked only once during the depends phase and is
used to generate a cookie file that holds the full set of reduced
dependencies.  It is now possible to type "make depends" in a package
directory and all missing dependencies will be installed.

Future work on this project include:

    * Resolve the workflow design in anticipation of future work on
      staged installations where "package" conceptually happens before
      "install".

    * Rewrite the buildlink3 framework to not assume the use of the
      pkgsrc pkg_* tools.

    * Rewrite the pkginstall framework to provide a standard pkg_*
      tool to perform the actions, and allowing a purely declarative
      file per package to describe what actions need to be taken at
      install or deinstall time.

    * Implement support for the SVR4 package flavor.  This will be
      proof that the appropriate abstractions are in place to allow
      using a completely different set of package management tools.

Revision 1.54 / (download) - annotate - [select for diffs], Sat Jun 3 08:44:46 2006 UTC (12 years, 9 months ago) by seb
Branch: MAIN
Changes since 1.53: +10 -1 lines
Diff to previous 1.53 (colored)

I usually have the following stuffed in a mk.conf target or a script
and that is 3 make process to run...
make show-options; v=$(make show-var VARNAME=PKG_OPTIONS_VAR); echo $v=$(make sh
ow-var VARNAME=$v)

Hence add trailing part about PKG_OPTIONS_VAR and its value to
show-options target like the one found in supported-options-message target.

Revision 1.53 / (download) - annotate - [select for diffs], Wed May 31 18:54:32 2006 UTC (12 years, 9 months ago) by ghen
Branch: MAIN
Changes since 1.52: +3 -3 lines
Diff to previous 1.52 (colored)

Adapt pkgsrc documentation examples to the new databases/openldap-client
package.

Revision 1.52 / (download) - annotate - [select for diffs], Fri Apr 14 17:15:03 2006 UTC (12 years, 11 months ago) by jlam
Branch: MAIN
Changes since 1.51: +8 -4 lines
Diff to previous 1.51 (colored)

Make the display of show-options more readable when there are lots of
options, e.g. x11/xorg-server, by wordwrapping the output.

Revision 1.51 / (download) - annotate - [select for diffs], Thu Apr 13 21:45:14 2006 UTC (12 years, 11 months ago) by wiz
Branch: MAIN
Changes since 1.50: +2 -2 lines
Diff to previous 1.50 (colored)

Update path from cyrus-sasl2 to cyrus-sasl.

Revision 1.50 / (download) - annotate - [select for diffs], Mon Nov 14 04:25:50 2005 UTC (13 years, 4 months ago) by rillig
Branch: MAIN
CVS Tags: pkgsrc-2006Q1-base, pkgsrc-2006Q1, pkgsrc-2005Q4-base, pkgsrc-2005Q4
Changes since 1.49: +2 -2 lines
Diff to previous 1.49 (colored)

Removed trailing white-space from a comment.

Revision 1.49 / (download) - annotate - [select for diffs], Mon Sep 5 15:24:08 2005 UTC (13 years, 6 months ago) by dillo
Branch: MAIN
CVS Tags: pkgsrc-2005Q3-base, pkgsrc-2005Q3
Changes since 1.48: +4 -2 lines
Diff to previous 1.48 (colored)

Improve warning for deprecated variables, prompted by wiz.

Revision 1.48 / (download) - annotate - [select for diffs], Thu Jul 28 15:17:55 2005 UTC (13 years, 7 months ago) by dillo
Branch: MAIN
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored)

Fix some more typos, noted by Leonard Schmidt.

Revision 1.47 / (download) - annotate - [select for diffs], Thu Jul 28 13:22:08 2005 UTC (13 years, 7 months ago) by wiz
Branch: MAIN
Changes since 1.46: +3 -3 lines
Diff to previous 1.46 (colored)

Fix typo in comment, from Leonard Schmidt via tech-pkg.

Revision 1.46 / (download) - annotate - [select for diffs], Tue Jul 26 16:09:34 2005 UTC (13 years, 7 months ago) by dillo
Branch: MAIN
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

Fix typos in last, noted by wiz.

Revision 1.45 / (download) - annotate - [select for diffs], Tue Jul 26 09:00:42 2005 UTC (13 years, 7 months ago) by dillo
Branch: MAIN
Changes since 1.44: +53 -10 lines
Diff to previous 1.44 (colored)

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.

Revision 1.44 / (download) - annotate - [select for diffs], Tue Jul 19 10:30:22 2005 UTC (13 years, 8 months ago) by dillo
Branch: MAIN
Changes since 1.43: +8 -1 lines
Diff to previous 1.43 (colored)

Also print deprecated warnings in show-options target.

Revision 1.43 / (download) - annotate - [select for diffs], Tue Jul 19 09:28:50 2005 UTC (13 years, 8 months ago) by dillo
Branch: MAIN
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 (colored)

PKG_OPTIONS_LEGACY_OPTS: only issue deprecated warning if the old
option is used.  Noted by adrianp.

Revision 1.42 / (download) - annotate - [select for diffs], Sat Jun 11 16:12:13 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
CVS Tags: pkgsrc-2005Q2-base, pkgsrc-2005Q2
Changes since 1.41: +9 -6 lines
Diff to previous 1.41 (colored)

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.

Revision 1.41 / (download) - annotate - [select for diffs], Thu Jun 9 18:44:26 2005 UTC (13 years, 9 months ago) by jlam
Branch: MAIN
Changes since 1.40: +2 -2 lines
Diff to previous 1.40 (colored)

Fix harmless typo.

Revision 1.40 / (download) - annotate - [select for diffs], Wed Jun 8 22:36:52 2005 UTC (13 years, 9 months ago) by wiz
Branch: MAIN
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 (colored)

Fix variable name in comment: it is PKG_OPTIONS_VAR, with an S.

Revision 1.39 / (download) - annotate - [select for diffs], Wed Jun 8 16:19:08 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.38: +2 -2 lines
Diff to previous 1.38 (colored)

fix variable name in example comment

Revision 1.38 / (download) - annotate - [select for diffs], Mon Jun 6 13:54:51 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.37: +28 -10 lines
Diff to previous 1.37 (colored)

make legacy variables external:
	PKG_LEGACY_OPTIONS
	PKG_OPTIONS_DEPRECATED_WARNINGS

Revision 1.37 / (download) - annotate - [select for diffs], Sat Jun 4 16:30:19 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.36: +26 -12 lines
Diff to previous 1.36 (colored)

Improve the way option groups are displayed in show-options.

While here, rename _cls_ to _grp_, as they are called groups.

Revision 1.36 / (download) - annotate - [select for diffs], Sat Jun 4 10:11:24 2005 UTC (13 years, 9 months ago) by seb
Branch: MAIN
Changes since 1.35: +3 -3 lines
Diff to previous 1.35 (colored)

Fix variable names in usage example.

Revision 1.35 / (download) - annotate - [select for diffs], Fri Jun 3 14:25:47 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.34: +8 -5 lines
Diff to previous 1.34 (colored)

don't requrie PKG_SUPPORTED_OPTIONS to be set when groups are in use

Revision 1.34 / (download) - annotate - [select for diffs], Thu Jun 2 21:55:05 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.33: +6 -4 lines
Diff to previous 1.33 (colored)

add group options to PKG_SUPPORTED_OPTIONS before includeing
mk/defaults/obsolete.mk so socks and kerberos work when listed in
groups

Revision 1.33 / (download) - annotate - [select for diffs], Thu Jun 2 20:43:55 2005 UTC (13 years, 9 months ago) by wiz
Branch: MAIN
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 (colored)

Whitespace nit.

Revision 1.32 / (download) - annotate - [select for diffs], Thu Jun 2 20:38:09 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.31: +76 -4 lines
Diff to previous 1.31 (colored)

add support for groups of mutually exclusive options via
PKG_OPTIONS_REQUIRED_GROUPS and PKG_OPTIONS_OPTIONAL_GROUPS.

Revision 1.31 / (download) - annotate - [select for diffs], Wed Jun 1 13:40:14 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.30: +2 -2 lines
Diff to previous 1.30 (colored)

fix bug in legacy vars handling for option names containing `-',
found by jmmv.

Revision 1.30 / (download) - annotate - [select for diffs], Tue May 31 18:25:37 2005 UTC (13 years, 9 months ago) by jmmv
Branch: MAIN
Changes since 1.29: +2 -2 lines
Diff to previous 1.29 (colored)

PKG_FAIL_REASON must be (double-)quoted to achieve the correct output.

Revision 1.29 / (download) - annotate - [select for diffs], Tue May 31 16:03:41 2005 UTC (13 years, 9 months ago) by wiz
Branch: MAIN
Changes since 1.28: +9 -3 lines
Diff to previous 1.28 (colored)

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.

Revision 1.28 / (download) - annotate - [select for diffs], Tue May 31 15:05:13 2005 UTC (13 years, 9 months ago) by rillig
Branch: MAIN
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 (colored)

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.

Revision 1.27 / (download) - annotate - [select for diffs], Tue May 31 12:10:07 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.26: +3 -9 lines
Diff to previous 1.26 (colored)

Rename describe-options to show-options, replacing the old show-options
target.

Revision 1.26 / (download) - annotate - [select for diffs], Tue May 31 11:05:31 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.25: +31 -5 lines
Diff to previous 1.25 (colored)

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.

Revision 1.25 / (download) - annotate - [select for diffs], Sat May 28 12:14:34 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.24: +32 -8 lines
Diff to previous 1.24 (colored)

set PKG_FAIL_REASON if any unsupported option is listed in PKG_OPTIONS.xxx

Revision 1.24 / (download) - annotate - [select for diffs], Wed May 25 11:18:35 2005 UTC (13 years, 9 months ago) by dillo
Branch: MAIN
Changes since 1.23: +17 -7 lines
Diff to previous 1.23 (colored)

fix typo in documentation
add support for negative options in PKG_OPTIONS_LEGACY_VARS (NO_FOO:-foo)
undef temporary variables after for loop

Revision 1.23 / (download) - annotate - [select for diffs], Thu May 19 01:15:57 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.22: +3 -2 lines
Diff to previous 1.22 (colored)

The example is missing a definition for PKG_OPTIONS_VAR.

Revision 1.9.4.5 / (download) - annotate - [select for diffs], Tue May 17 18:29:44 2005 UTC (13 years, 10 months ago) by tv
Branch: tv-derecurse
CVS Tags: tv-derecurse-eol
Changes since 1.9.4.4: +95 -130 lines
Diff to previous 1.9.4.4 (colored) to branchpoint 1.9 (colored)

sync [all but bsd.pkg.mk] with HEAD

Revision 1.22 / (download) - annotate - [select for diffs], Mon May 16 09:08:29 2005 UTC (13 years, 10 months ago) by rillig
Branch: MAIN
CVS Tags: tv-derecurse-merge
Changes since 1.21: +14 -23 lines
Diff to previous 1.21 (colored)

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.

Revision 1.21 / (download) - annotate - [select for diffs], Sat May 14 02:17:43 2005 UTC (13 years, 10 months ago) by rillig
Branch: MAIN
Changes since 1.20: +10 -11 lines
Diff to previous 1.20 (colored)

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/.

Revision 1.20 / (download) - annotate - [select for diffs], Sun May 8 13:43:30 2005 UTC (13 years, 10 months ago) by dillo
Branch: MAIN
Changes since 1.19: +98 -111 lines
Diff to previous 1.19 (colored)

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

Revision 1.19 / (download) - annotate - [select for diffs], Thu Apr 28 21:58:44 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.18: +3 -3 lines
Diff to previous 1.18 (colored)

Make the pretty-printing actually work by passing all of the options on
different lines to the word-wrap script.

Revision 1.18 / (download) - annotate - [select for diffs], Thu Apr 28 21:48:14 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.17: +6 -13 lines
Diff to previous 1.17 (colored)

We don't need to use ${SORT} to sort the options list.  VAR:O will do
nicely.

Revision 1.17 / (download) - annotate - [select for diffs], Thu Apr 28 18:40:35 2005 UTC (13 years, 10 months ago) by jlam
Branch: MAIN
Changes since 1.16: +12 -17 lines
Diff to previous 1.16 (colored)

Defer execution until the value is needed.  This avoids needing ${ECHO},
${XARGS}, and ${SORT} until the make targets are executed.

Revision 1.16 / (download) - annotate - [select for diffs], Mon Jan 24 18:04:24 2005 UTC (14 years, 1 month ago) by tv
Branch: MAIN
CVS Tags: tv-derecurse-base, pkgsrc-2005Q1-base, pkgsrc-2005Q1
Changes since 1.15: +5 -9 lines
Diff to previous 1.15 (colored)

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.

Revision 1.9.4.4 / (download) - annotate - [select for diffs], Mon Jan 24 18:03:01 2005 UTC (14 years, 1 month ago) by tv
Branch: tv-derecurse
Changes since 1.9.4.3: +2 -2 lines
Diff to previous 1.9.4.3 (colored) to branchpoint 1.9 (colored)

sync with HEAD

Revision 1.15 / (download) - annotate - [select for diffs], Sat Jan 15 08:59:28 2005 UTC (14 years, 2 months ago) by adrianp
Branch: MAIN
Changes since 1.14: +2 -2 lines
Diff to previous 1.14 (colored)

Fix endif typo

Revision 1.9.4.3 / (download) - annotate - [select for diffs], Thu Dec 9 17:15:01 2004 UTC (14 years, 3 months ago) by tv
Branch: tv-derecurse
Changes since 1.9.4.2: +16 -4 lines
Diff to previous 1.9.4.2 (colored) to branchpoint 1.9 (colored)

Merge from HEAD.

Revision 1.14 / (download) - annotate - [select for diffs], Sun Dec 5 23:23:50 2004 UTC (14 years, 3 months ago) by schmonz
Branch: MAIN
CVS Tags: pkgsrc-2004Q4-base, pkgsrc-2004Q4
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

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.

Revision 1.13 / (download) - annotate - [select for diffs], Sun Dec 5 22:38:06 2004 UTC (14 years, 3 months ago) by grant
Branch: MAIN
Changes since 1.12: +4 -4 lines
Diff to previous 1.12 (colored)

make sure some variables are initialized before using them.

Revision 1.12 / (download) - annotate - [select for diffs], Sun Dec 5 09:20:48 2004 UTC (14 years, 3 months ago) by grant
Branch: MAIN
Changes since 1.11: +17 -1 lines
Diff to previous 1.11 (colored)

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

Revision 1.9.4.2 / (download) - annotate - [select for diffs], Sun Nov 28 20:11:32 2004 UTC (14 years, 3 months ago) by tv
Branch: tv-derecurse
Changes since 1.9.4.1: +24 -14 lines
Diff to previous 1.9.4.1 (colored) to branchpoint 1.9 (colored)

Merge from HEAD.

Revision 1.11 / (download) - annotate - [select for diffs], Sun Nov 28 08:00:51 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.10: +3 -1 lines
Diff to previous 1.10 (colored)

Don't show the currently selected options if there aren't any.

Revision 1.10 / (download) - annotate - [select for diffs], Sat Nov 27 04:50:55 2004 UTC (14 years, 3 months ago) by jlam
Branch: MAIN
Changes since 1.9: +21 -13 lines
Diff to previous 1.9 (colored)

Output the currently selected options after telling the user which
options are available.

Revision 1.9.4.1 / (download) - annotate - [select for diffs], Mon Nov 22 22:48:04 2004 UTC (14 years, 4 months ago) by tv
Branch: tv-derecurse
Changes since 1.9: +9 -9 lines
Diff to previous 1.9 (colored)

So that I don't lose all this work, stash the work-in-progress derecursion
cleanup onto the tv-derecurse branch (only branched in pkgsrc/mk).

Revision 1.9 / (download) - annotate - [select for diffs], Wed Sep 15 03:59:17 2004 UTC (14 years, 6 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2004Q3-base, pkgsrc-2004Q3
Branch point for: tv-derecurse
Changes since 1.8: +3 -3 lines
Diff to previous 1.8 (colored)

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>

Revision 1.8 / (download) - annotate - [select for diffs], Sun Aug 22 19:42:10 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)

Match documentation to reality to reflect recent change in semantics for
PKG_DEFAULT_OPTIONS.

Revision 1.7 / (download) - annotate - [select for diffs], Sun Aug 22 19:32:52 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.6: +12 -10 lines
Diff to previous 1.6 (colored)

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.

Revision 1.6 / (download) - annotate - [select for diffs], Tue Aug 10 05:33:05 2004 UTC (14 years, 7 months ago) by schmonz
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

Fix spell-o.

Revision 1.5 / (download) - annotate - [select for diffs], Sat Aug 7 18:02:05 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.4: +16 -18 lines
Diff to previous 1.4 (colored)

Use an awk script to avoid using possibly non-portable shell constructs.

Revision 1.4 / (download) - annotate - [select for diffs], Thu Aug 5 02:10:20 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.3: +1 -6 lines
Diff to previous 1.3 (colored)

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.

Revision 1.3 / (download) - annotate - [select for diffs], Wed Aug 4 23:25:14 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.2: +20 -4 lines
Diff to previous 1.2 (colored)

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.

Revision 1.2 / (download) - annotate - [select for diffs], Wed Aug 4 09:36:16 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN
Changes since 1.1: +31 -1 lines
Diff to previous 1.1 (colored)

Display a message with the supported build options at build time.

Revision 1.1 / (download) - annotate - [select for diffs], Fri Jul 30 20:59:08 2004 UTC (14 years, 7 months ago) by jlam
Branch: MAIN

bsd.options.mk provides boilerplate code for standard naming conventions
for handling per-package build options.

Before including this file, the following variables should be defined:

	PKG_OPTIONS_VAR
		This is a list of the name of the make(1) variables that
		contain the options the user wishes to select.  This
		variable should be set in a package Makefile.  E.g.,

			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
		or
			PKG_OPTIONS_VAR=	FOO_OPTIONS BAR_OPTIONS

	PKG_SUPPORTED_OPTIONS
		This is a list of build options supported by the package.
		This variable should be set in a package Makefile.  E.g.,

			PKG_SUPPORTED_OPTIONS=	kerberos ldap ssl

Optionally, the following variables may also be defined:

	PKG_DEFAULT_OPTIONS
		This is a list the options that should be built into
		every package, if that option is supported.  This
		variable should be set in /etc/mk.conf.

	${PKG_OPTIONS_VAR} (the variables named in PKG_OPTIONS_VAR)
		These variables list the selected build options and
		override any default options given in PKG_DEFAULT_OPTIONS.
		If any of the options begin with a '-', then that option
		is always removed from the selected build options, e.g.

			PKG_DEFAULT_OPTIONS=	kerberos ldap sasl
			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
			WIBBLE_OPTIONS=		${PKG_DEFAULT_OPTIONS} -sasl
			# implies PKG_OPTIONS == "kerberos ldap"
		or
			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
			WIBBLE_OPTIONS=		kerberos -ldap ldap
			# implies PKG_OPTIONS == "kerberos"

		This variable should be set in /etc/mk.conf.

	PKG_FAIL_UNSUPPORTED_OPTIONS
		If this is set to "yes", then the presence of unsupported
		options in PKG_OPTIONS.<pkg> (see below) causes the build
		to fail.  Set this to "no" to silently ignore unsupported
		options.  Default: "yes".

After including this file, the following variables are defined:

	PKG_OPTIONS
		This is the list of the selected build options, properly
		filtered to remove unsupported and duplicate options.

Example usage:

-------------8<-------------8<-------------8<-------------8<-------------
# Global and legacy options
.if defined(USE_OPENLDAP) || defined(USE_SASL2)
.  if !defined(PKG_OPTIONS.wibble)
.    if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
PKG_OPTIONS.wibble+=	ldap
.    endif
.    if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
PKG_OPTIONS.wibble+=	sasl
.    endif
.  endif
.endif

PKG_OPTIONS_VAR=	PKG_OPTIONS.wibble
PKG_SUPPORTED_OPTIONS=	ldap sasl
.include "../../mk/bsd.options.mk"

# Package-specific option-handling

###
### LDAP support
###
.if !empty(PKG_OPTIONS:Mldap)
.  include "../../databases/openldap/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-ldap=${BUILDLINK_PREFIX.openldap}
.endif

###
### SASL authentication
###
.if !empty(PKG_OPTIONS:Msasl)
.  include "../../security/cyrus-sasl2/buildlink3.mk"
CONFIGURE_ARGS+=	--enable-sasl=${BUILDLINK_PREFIX.sasl}
.endif
-------------8<-------------8<-------------8<-------------8<-------------

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>