Date: Mon, 23 Jul 2018 06:55:52 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475149 - in head/ports-mgmt/portmaster: . files Message-ID: <201807230655.w6N6tqHU086497@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Mon Jul 23 06:55:51 2018 New Revision: 475149 URL: https://svnweb.freebsd.org/changeset/ports/475149 Log: 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) Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Mon Jul 23 05:48:05 2018 (r475148) +++ head/ports-mgmt/portmaster/Makefile Mon Jul 23 06:55:51 2018 (r475149) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Mon Jul 23 05:48:05 2018 (r475148) +++ head/ports-mgmt/portmaster/files/patch-portmaster Mon Jul 23 06:55:51 2018 (r475149) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807230655.w6N6tqHU086497>