21:58 Luca Pizzamiglio (pizzamig) 

component: add SUBPACKAGES

This commit add SUBPACKAGES support to the framework.

Fix users of _LICENSE_DIR
Fix multi/dual license
Add annotation to packages about being a subpkg
Make do-depends aware of the subpackages
Add PKGBASE.subpkg variable
Fix actual-package-depends target
Fix dependencies in sub-packages
Implement LICENSE support
Fix PLIST_FILES.subpkg
Make DESCR.subpkg warning message shorter
Add SUBPACKES to the list of OPTIONS_HELPERS
Fix _strip_perms
Simplify METADIR as in the original patch
Fix _PLIST
Fix the case when there are no subpackages
Fix typo
Fix _PKGDIR initialization
Fix PLIST
Fix typo in RE
Fix METADIR
Fix type in PKGFILE
Fix [build|run]-depends-list targets
Initial import of the subpackage framework
This import is based on https://reviews.freebsd.org/D16457

PR:		275735
Differential Revision:	https://reviews.freebsd.org/D40549

    4756476

20:09 Luca Pizzamiglio (pizzamig)  Author: Andrew "RhodiumToad" Gierth

Mk/Scripts: Fix ports depends-list.sh

depends-list.sh fails in two ways: one is a simple quoting bug which
causes empty FLAVOR variables to be propagated; the other is that
de-duplication is being done without regard for flavors.

The upshot of these is that where a port depends on a specific flavor
(first bug) or on multiple flavors (second bug, usually caused by build
dependencies) of another port, the constructed dependency list is
incomplete, and so -recursive targets do not do all the required work.
(This is especially annoying for fetch-recursive.)

Reviewed by: portmgr@FreeBSD.org
PR:		269982
Differential Revision: https://reviews.freebsd.org/D40491

    873d4f6

14:27 Mathieu Arnold (mat) 

framework: Remove $FreeBSD$

Where appropriate fiddle with a few other things.

    5d33e04

13:29 mat 

Add set pipefail in most framework scripts.

set pipefail changes the pipeline return status from being the return
status of the last command to the last non 0 exit status of any command
in the pipeline.  This is needed to make sure all the commands in a
pipeline did actually return a non 0 status and not only the last one.

PR:		250723
Exp-run by:	antoine
Reviewed by:	bapt
Approved by:	bapt
Differential Revision:	https://reviews.freebsd.org/D27007

 

16:51 mat 

Backout r554139.

 

16:42 mat 

Add set pipefail in most framework scripts.

set pipefail changes the pipeline return status from being the return
status of the last command to the last non 0 exit status of any command
in the pipeline.  This is needed to make sure all the commands in a
pipeline did actually return a non 0 status and not only the last one.

 

14:36 bapt 

Add support for overlays

overlays are a way to help users to integrate their own ports tree
with the official ports tree without having to maintain clone of the
official tree and remerge on regular basis.

The ports tree will lookup in the overlays (in the order the are listed in
OVERLAY variable) for the dependencies and the USES. It will use the first
found.

in order to use it the user have to declare his overlays that way in their
make.conf:
OVERLAYS= overlay1 overlay2 overlay3

Reviewed by:	manu
Approved by:	swills
Differential Revision:	https://reviews.freebsd.org/D21468

 

09:26 mat 

SC2046: Quote this to prevent word splitting.

When command expansions are unquoted, word splitting and globbing will
occur. This often manifests itself by breaking when filenames contain
spaces.

Trying to fix it by adding quotes or escapes to the data will not work.
Instead, quote the command substitution itself.

If the command substitution outputs multiple pieces of data, use a loop
instead.

Add an exception when using set -- where splitting is intended.

PR:             227109
Submitted by:   mat
Exp-run by:	antoine
Sponsored by:   Absolight

 

16:20 mat 

SC2068: Double quote array expansions to avoid re-splitting elements.

Double quotes around $@ prevents globbing and word splitting of
individual elements, while still expanding to multiple separate
arguments.

Add exceptions when splitting is the intended behavior.

PR:		227109
Submitted by:	mat
Sponsored by:	Absolight

 

18:54 bdrewery 

Allow passing -DDEPENDS_SHOW_FLAVOR to list flavors for dependency lists.

Submitted by:	se (based on D13535)
With hat:	portmgr

 

20:01 bdrewery 

Fix typo in r458054.

Reported by:	antoine
Approved by:	portmgr (implicit)
MFH:		2018Q1

 

19:58 bdrewery 

Fix some *-list targets not properly passing FLAVOR down the chain.

Approved by:	portmgr (implicit)
MFH:		2018Q1

 

14:14 mat 

Implement basic flavors.

**Do not start migrating any ports, a hook will prevent it**

This has been a long awaiting feature, most of the work has been done by
bapt, bdrewery and antoine, I am just the one actually doing the commit.

All this informations, and more to come are in the first link to our wiki
in the bottom block. A roadmap is in the second link.

To define a different flavors in a port, before any include, set:

FLAVORS=  flavor1 flavor2 [...]

The first flavor in the list will be the default.

You can then check for flavors after includ'ing bsd.port.options.mk with:

.if ${FLAVOR} == flavor2
[some stuff]
.endif

To build flavor2, simply run:

make FLAVOR=flavor2

To depend on a specific flavor, write @<flavor> at the end of the depend
string, like:

RUN_DEPENDS=	something:origin@foo

Submitted by:	bapt, bdrewery, antoine
Reviewed by:	portmgr
More infos:	https://wiki.freebsd.org/Ports/FlavorsMigration
Todo List:	https://wiki.freebsd.org/Ports/FlavorsAndSubPackages
With hat:	portmgr
Differential Revision: https://reviews.freebsd.org/D10327

 

15:27 mat 

Make make clean be recursive again.

PR:		213188
Submitted by:	tijl
Exp-run by:	antoine
Sponsored by:	Absolight

 

08:55 mat 

typo.

Submitted by:	wblock
Sponsored by:	Absolight

 

08:54 mat 

Unbreak make missing.

Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D7504

 

19:01 mat 

Ease debugging of Mk/Scripts scripts.

Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D6474

 

22:18 bdrewery 

Use normal PORTSDIR rather than dp_PORTSDIR so it is passed around properly.

This fixes errors when PORTSDIR is not set and /usr/ports is not used.  The
/usr/share/bsd.port.mk logic will auto set PORTSDIR, but this was not being
passed into children in the dependency scripts.

With hat:	portmgr
Reported by:	bapt

 

19:23 bdrewery 

- Combine clean-depends-list.sh into depends-list.sh
- Refactor how depends-list.sh is called from bsd.port.mk for each variant.

With hat:	portmgr

 

18:41 bdrewery 

The command environment from r399703 is only needed if recursing.

With hat:	portmgr

 

18:01 bdrewery 

When listing dependencies, export the common command execution results.

In some basic benchmarks this sped up 'all-depends-list' about 20%.  x11/kde4
went from 52 seconds to 41 seconds.  More improvement is expected once
more command executions are cached in the 'export_ports_env' function.

With hat:	portmgr

 

18:09 bdrewery 

Shift any arguments eaten up from getopts.  This script takes no arguments
yet.

With hat:	portmgr

 

18:00 bdrewery 

Unify depends-list.sh and all-depends-list.sh into one script, depends-list.sh.

With hat:	portmgr

 

17:20 amdmi3 

Implemented complete support for test target.

You can now `make test' on any port to run test sequence, no-op by default.
If a port defines TEST_TARGET, it'll run sub-make with specified target,
usually `check' or `test', useful if upstream supports that. The port may
instead define custom do-test target, as well as usual satellite targets:

  {pre,do,post}-test, {pre,do,post}-test-OPT, {pre,do,post}-test-OPT-off

`make test' builds and stages port first, so test may use both WRKDIR and
STAGEDIR, and both BUILD and RUN depends are available for test target.
Additionally, TEST_DEPENDS is now properly supported and may be used to
define additional depends specifically for testing.

Framework may define default tests for specific cases. For instance,
perl5.mk and cran.mk already provide default test target on their own.

This commit also converts my ports which have tests to this new framework.

Approved by:	portmgr (bapt)
Differential Revision:	D3680