diff --git a/Manual.md b/Manual.md index f0f479411e2..6d9a0e6289f 100644 --- a/Manual.md +++ b/Manual.md @@ -207,7 +207,7 @@ a package providing the executable named `` and the module named language prefix can be dropped. Short names for languages are no valid substitute for the language prefix. -Example: python-pam, perl-URI, python3-pyside2 +Example: perl-URI, python3-pyside2 #### Language Bindings @@ -220,7 +220,7 @@ The naming convention to those packages is: - ``` -Example: gimp-python, irssi-perl +Example: gimp-python3, irssi-perl #### Programs @@ -439,7 +439,12 @@ The list of mandatory variables for a template: - `license` A string matching the license's [SPDX Short identifier](https://spdx.org/licenses), `Public Domain`, or string prefixed with `custom:` for other licenses. -Multiple licenses should be separated by commas, Example: `GPL-3.0-or-later, custom:Hugware`. +Multiple licenses should be listed as an +[SPDX license expression](https://spdx.github.io/spdx-spec/v3.0/annexes/SPDX-license-expressions/) +(examples: `MIT OR Apache-2.0`, `MIT AND (LGPL-2.1-or-later OR BSD-3-Clause)`). +Usage of `AND`, `OR`, `WITH`, and `()` are supported by xlint. The legacy +comma-separated format should be converted when encountered (example: +`GPL-3.0-or-later, custom:Hugware`). Empty meta-packages that don't include any files and thus have and require no license should use @@ -592,9 +597,9 @@ build methods. By default set to `check`. - `make_install_target` The installation target. When `${build_style}` is set to `configure`, `gnu-configure` or `gnu-makefile`, this is the target passed to `${make_command}` in the install -phase; when unset, it defaults to `install`. If `${build_style}` is `python-pep517`, this is the +phase; when unset, it defaults to `install`. If `${build_style}` is `python3-pep517`, this is the path of the Python wheel produced by the build phase that will be installed; when unset, the -`python-pep517` build style will look for a wheel matching the package name and version in the +`python3-pep517` build style will look for a wheel matching the package name and version in the current directory with respect to the install. - `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands @@ -1042,8 +1047,6 @@ Additional install arguments can be specified via `make_install_args`. - `waf3` For packages that use the Python3 `waf` build method with python3. -- `waf` For packages that use the Python `waf` method with python2. - - `slashpackage` For packages that use the /package hierarchy and package/compile to build, such as `daemontools` or any `djb` software. @@ -1072,8 +1075,6 @@ system. Additional arguments may be passed to the `zig build` invocation using For packages that use the Python module build method (`setup.py` or [PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following: -- `python2-module` to build Python 2.x modules - - `python3-module` to build Python 3.x modules - `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without @@ -1254,7 +1255,7 @@ package accordingly. Additionally, the following functions are available: - *vopt_feature()* `vopt_feature