diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2018-07-23 06:55:51 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2018-07-23 06:55:51 +0000 |
| commit | 672a731a16af4141c41284a6fd3e0859d94b9e53 (patch) | |
| tree | 6073f80c593bef65047ff51dd58e6d5353800f75 /ports-mgmt/portmaster | |
| parent | 2a1ee6a19e9ee533ec4fb6827e09b3cc82f0af63 (diff) | |
| download | ports-672a731a16af4141c41284a6fd3e0859d94b9e53.tar.gz ports-672a731a16af4141c41284a6fd3e0859d94b9e53.zip | |
Fix quoting of optional FLAVOR argument in some make invocations, which
were uncovered by fixed quoting in the pm_make* functions.
Reported by: tatsuki_makino at hotmail.com (Tatsuki Makino)
Approved by: antoine (implicit)
Notes
Notes:
svn path=/head/; revision=475149
Diffstat (limited to 'ports-mgmt/portmaster')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 19c6c84323f2..d8e9e561c1c4 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index acf8a8a3a6eb..50b33eb60938 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -498,11 +498,11 @@ + flavor=$(flavor_part $portdir) + for dir in $post_clean_l; do + pm_v "===>>> Running 'make clean' for special build dependency $dir" -+ (pm_make_s -C "$pd/$dir" "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)& ++ (pm_make_s -C "$pd/$dir" ${flavor:+FLAVOR=$flavor} clean NOCLEANDEPENDS=ncd2 >/dev/null)& + done pm_v "===>>> Running 'make clean' in the background" - (pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)& -+ (pm_make_s "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)& ++ (pm_make_s ${flavor:+FLAVOR=$flavor} clean NOCLEANDEPENDS=ncd2 >/dev/null)& pm_v fi if [ -n "$ro_opd" ]; then |