From owner-svn-ports-all@freebsd.org Sat Dec 30 22:15:00 2017 Return-Path: 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 8A2EBEAF50F; Sat, 30 Dec 2017 22:15:00 +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 5469C7028F; Sat, 30 Dec 2017 22:15:00 +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 vBUMEx7f062800; Sat, 30 Dec 2017 22:14:59 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBUMExb6062798; Sat, 30 Dec 2017 22:14:59 GMT (envelope-from se@FreeBSD.org) Message-Id: <201712302214.vBUMExb6062798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Sat, 30 Dec 2017 22:14:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457645 - in head/ports-mgmt/portmaster: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/ports-mgmt/portmaster: . files X-SVN-Commit-Revision: 457645 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Dec 2017 22:15:00 -0000 Author: se Date: Sat Dec 30 22:14:58 2017 New Revision: 457645 URL: https://svnweb.freebsd.org/changeset/ports/457645 Log: ---------------------------------------------------------------------------- Fix spelling of OPTIONS_FILE. 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 Sat Dec 30 22:00:03 2017 (r457644) +++ head/ports-mgmt/portmaster/Makefile Sat Dec 30 22:14:58 2017 (r457645) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.18 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Sat Dec 30 22:00:03 2017 (r457644) +++ head/ports-mgmt/portmaster/files/patch-portmaster Sat Dec 30 22:14:58 2017 (r457645) @@ -1,4 +1,4 @@ ---- portmaster.orig 2017-12-29 22:11:06 UTC +--- portmaster.orig 2017-12-21 09:02:44 UTC +++ portmaster @@ -113,13 +113,13 @@ kill_bad_children () { [ "$pid" -gt 25 ] || continue @@ -36,6 +36,15 @@ fi cd ${1}/${portdir%/*} +@@ -1665,7 +1664,7 @@ find_dl_distfiles () { + else + # Old method, for now + if pm_cd $pd/$1; then +- dist_list=`pm_make_b -V OPTIONSFILE` ++ dist_list=`pm_make_b -V OPTIONS_FILE` + dist_list="${dist_list%options}distfiles" + else + # The port might have moved, etc.; so take a stab at it, @@ -1803,6 +1802,7 @@ set_distfiles_and_subdir () { }