diff options
| author | se <se@FreeBSD.org> | 2017-12-16 05:01:14 +0800 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 2017-12-16 05:01:14 +0800 |
| commit | e71cd729464c9053ac2fdd36021fdabd4e1fbd49 (patch) | |
| tree | bd84ff1d417db648764edde76833d3f57dff66ad /ports-mgmt/portmaster/files | |
| parent | 229f40cc14b8bc211944ce730d4d2b5916983309 (diff) | |
| download | freebsd-ports-gnome-e71cd729464c9053ac2fdd36021fdabd4e1fbd49.tar.gz freebsd-ports-gnome-e71cd729464c9053ac2fdd36021fdabd4e1fbd49.tar.zst freebsd-ports-gnome-e71cd729464c9053ac2fdd36021fdabd4e1fbd49.zip | |
Add another check for a flavor passed attached to the port directory.
Without this fix, the default flavor was built in specific situations.
Approved by: antoine (implicit)
Diffstat (limited to 'ports-mgmt/portmaster/files')
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index efb0885b2ff7..de665d8a6da0 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -1,4 +1,4 @@ ---- portmaster.orig 2017-12-15 12:40:13.818570000 +0100 +1;95;0c--- portmaster.orig 2017-12-15 12:40:13.818570000 +0100 +++ portmaster 2017-12-15 16:49:11.583821000 +0100 @@ -1449,6 +1449,24 @@ fi @@ -59,3 +59,11 @@ } if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then +@@ -3594,6 +3594,7 @@ + fi + + pm_cd_pd $portdir ++ export_flavor $(flavor_part $portdir) + [ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd || + fail 'make clean failed'; } + |