From nobody Sat May 28 15:31:15 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B43281B5C788; Sat, 28 May 2022 15:31:15 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L9Qcg2nWVz3h8P; Sat, 28 May 2022 15:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653751875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUIrLxmjrWLk9X+2pgS97KPFnOth5odOql9UoLcA6Zo=; b=lRx2iRvENAIR6ynhZMIAGFcY6HDAHSR/xZj3FEpkurMFS3xRAX0c37ywEx7zRs+yczkjXW Znls8jEQufk/7yQJKSM9PH0APwsrRuys+rcMEQUC/20gs4eHtHYYlpAh1BEM7FDlZm5STk 58m040hcalnpTjP0spCqHi/M2O5Jxrtxm2Fsbqqz7lDMnCbxeJXL2c2AhqmLiD0KJhty6h utOryIVI9BLOw+/oj8T9Ul+P8F3nGbfgQCjtW3dOnOMdyxo69V/ATaxwrWtP+bdFx947GT 2d5EkEf3g6Xt3DO4aQSGn2X+81dKgujJ/j8LVWCZtrVAvfHPlUnbq6KnJ6bB7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34B6E113EF; Sat, 28 May 2022 15:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24SFVFaC067907; Sat, 28 May 2022 15:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SFVFK0067906; Sat, 28 May 2022 15:31:15 GMT (envelope-from git) Date: Sat, 28 May 2022 15:31:15 GMT Message-Id: <202205281531.24SFVFK0067906@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 9f1366dad98a - main - Mk/bsd.port.mk: Fix unchanged options overwriting dialog4ports bg List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f1366dad98a7a31d9f44d7e1199389a27fcbb90 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653751875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fUIrLxmjrWLk9X+2pgS97KPFnOth5odOql9UoLcA6Zo=; b=wQtwXUyiQWaMrj6WWQBssZyAVA2h4yLRl3MH13Rra1nZLmYAnqen84TYtKxPDhYYy2b9f4 Je4AxWyIaqX0vU0DEzDdTcho4mR73lnWgDnqwkKnsTS2wi4mVJLWstwL8a0+Rag9tyPJWB Gi/041iGIRRUY7ceOHEhgOgvAWCUEI/hsFMHYme9DLhrUDjshTSqPjYlwMe4OB16+BLHNx WGNPb5HSeCUdi8X2vsl/z6IJBZ1/tni5Oi5ShqaHCpoM6HBdUxNRSzTNXHCQ8uuZd/Sda/ Zz4AOAhjKMn+VhLBHevOxrhxI0jEylDzGWSndaj/xcZ+160y6EKzXK8FdJanFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653751875; a=rsa-sha256; cv=none; b=Pf5wlq/NaIup49KVtC5TpsL6NY68a6GTvkI3c3FMajXuWSry6UM0PZdLJw3wUvZldXraNZ Vg2zPyBNZqig0Hz4hpH+/bjKH8XP/iwYeIUurNdUsBwbOPlHs0sy6D7yVA6GBUQnVXpvX7 qDNSlWnjNNLT+3YBIFdQQI6FpG0lVapEbk4IawKW9anUq/NaE9HNfYy7N+9KxuWREHsB/+ 51HSjjSzKhaml36a3rUs+XLdN94mX7FnRSQcKHmAJzH0GbWMO4OxHJ+/qGOB5R9wmglqau LDbGl4msAJWKU3+GUbCPQGxgW6JxEpCGQQ6dtJ0l9yCiIi7jcdua6ZwFglp2Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f1366dad98a7a31d9f44d7e1199389a27fcbb90 commit 9f1366dad98a7a31d9f44d7e1199389a27fcbb90 Author: Bryan Drewery AuthorDate: 2022-05-28 15:29:32 +0000 Commit: Bryan Drewery CommitDate: 2022-05-28 15:30:05 +0000 Mk/bsd.port.mk: Fix unchanged options overwriting dialog4ports bg This was already handled for the changed options case. --- Mk/bsd.port.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0cf7c93e2c3a..0ed05289ef76 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4936,6 +4936,7 @@ do-config: trap "${RM} $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \ ${SETENV} ${D4P_ENV} ${SH} ${SCRIPTSDIR}/dialog4ports.sh $${TMPOPTIONSFILE} || { \ ${RM} $${TMPOPTIONSFILE}; \ + ${ECHO_CMD}; \ ${ECHO_MSG} "===> Options unchanged"; \ exit 0; \ }; \