From owner-svn-ports-all@freebsd.org Thu Feb 13 08:34:02 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CA671251290; Thu, 13 Feb 2020 08:34:02 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48J8tf4r8vz4fQd; Thu, 13 Feb 2020 08:34:02 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A12EC7CC3; Thu, 13 Feb 2020 08:34:02 +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 01D8Y22w060864; Thu, 13 Feb 2020 08:34:02 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01D8Y25x060863; Thu, 13 Feb 2020 08:34:02 GMT (envelope-from se@FreeBSD.org) Message-Id: <202002130834.01D8Y25x060863@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Thu, 13 Feb 2020 08:34:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526008 - 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: 526008 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.29 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: Thu, 13 Feb 2020 08:34:02 -0000 Author: se Date: Thu Feb 13 08:34:02 2020 New Revision: 526008 URL: https://svnweb.freebsd.org/changeset/ports/526008 Log: Fix regression that has been introduced in r524227 Revert part of the patch that introduced the --try-broken option, it caused problems in combination with -m. Submitted by: Rudolf Cejka (cejkar at fit.vutbr.cz) 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 Thu Feb 13 04:14:05 2020 (r526007) +++ head/ports-mgmt/portmaster/Makefile Thu Feb 13 08:34:02 2020 (r526008) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Thu Feb 13 04:14:05 2020 (r526007) +++ head/ports-mgmt/portmaster/files/patch-portmaster Thu Feb 13 08:34:02 2020 (r526008) @@ -221,14 +221,7 @@ --*) echo "Illegal option $var" ; echo '' echo "===>>> Try $progname --help"; exit 1 ;; *) newopts="$newopts $var" ;; -@@ -722,13 +753,13 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO - h) usage 0 ;; - i) INTERACTIVE_UPDATE=iopt; ARGS="-i $ARGS" ;; - l) LIST=lopt ;; -- m) export PM_MAKE_ARGS=$OPTARG # For 'make checksum' -+ m) export PM_MAKE_ARGS="$PM_MAKE_ARGS $OPTARG" # For 'make checksum' - ARGS="-m $PM_MAKE_ARGS $ARGS" ;; - n) NO_ACTION=nopt; ARGS="-n $ARGS" ;; +@@ -728,7 +759,7 @@ while getopts 'BCDFGHKLPRabde:fghilm:nop:r:stvwx:y' CO o) REPLACE_ORIGIN=oopt ;; # -o should take a parameter and $OPTARG should be assigned here p) fail 'The -p option has been deprecated' ;; r) PM_URB=ropt