From owner-svn-ports-all@freebsd.org  Fri Dec 29 22:13:23 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CDDB6EB319F;
 Fri, 29 Dec 2017 22:13:23 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 97DCE7E065;
 Fri, 29 Dec 2017 22:13:23 +0000 (UTC) (envelope-from se@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBTMDMxP052356;
 Fri, 29 Dec 2017 22:13:22 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBTMDM5t052355;
 Fri, 29 Dec 2017 22:13:22 GMT (envelope-from se@FreeBSD.org)
Message-Id: <201712292213.vBTMDM5t052355@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: Stefan Esser <se@FreeBSD.org>
Date: Fri, 29 Dec 2017 22:13:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r457547 - head/ports-mgmt/portmaster/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: se
X-SVN-Commit-Paths: head/ports-mgmt/portmaster/files
X-SVN-Commit-Revision: 457547
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Dec 2017 22:13:23 -0000

Author: se
Date: Fri Dec 29 22:13:22 2017
New Revision: 457547
URL: https://svnweb.freebsd.org/changeset/ports/457547

Log:
  Fix regression in kill_bad_children: add  missing $ before progcmd ...
  
  Approved by:	antoine (implicit)

Modified:
  head/ports-mgmt/portmaster/files/patch-portmaster

Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster	Fri Dec 29 22:12:59 2017	(r457546)
+++ head/ports-mgmt/portmaster/files/patch-portmaster	Fri Dec 29 22:13:22 2017	(r457547)
@@ -1,5 +1,21 @@
---- portmaster.orig	2017-12-21 09:02:44 UTC
+--- portmaster.orig	2017-12-29 22:11:06 UTC
 +++ portmaster
+@@ -113,13 +113,13 @@ kill_bad_children () {
+ 		[ "$pid" -gt 25 ] || continue
+ 		case "$ppid" in
+ 		1)	case "$command" in
+-			*" progcmd "*) pm_kill $pid ;;
++			*" $progcmd "*) pm_kill $pid ;;
+ 			*'make -DBATCH checksum'*|*'/fetch '*|\[sh\]) pm_kill -9 $pid ;;
+ 			esac ;;
+ 		*)	[ $pgid -eq $mypgid ] || continue
+ 			[ $pid -eq $PM_PARENT_PID ] && continue
+ 			case "$command" in
+-			*" progcmd "*) pm_kill $pid ;;
++			*" $progcmd "*) pm_kill $pid ;;
+ 			*'make -DBATCH checksum'*|*'/fetch '*|\[sh\]) pm_kill $pid ;;
+ 			esac ;;
+ 		esac
 @@ -1616,15 +1616,14 @@ pm_pkg_create () {
  				NB_DELETE="${NB_DELETE}${pkg} "
  			fi