From owner-svn-ports-head@freebsd.org Mon Aug 3 13:46:12 2020 Return-Path: Delivered-To: svn-ports-head@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 3ECFA37B90D; Mon, 3 Aug 2020 13:46:12 +0000 (UTC) (envelope-from zi@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BKzgS0d3Qz3bqm; Mon, 3 Aug 2020 13:46:12 +0000 (UTC) (envelope-from zi@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 E8AC515704; Mon, 3 Aug 2020 13:46:11 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 073DkBYJ088880; Mon, 3 Aug 2020 13:46:11 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 073DkB4Q088878; Mon, 3 Aug 2020 13:46:11 GMT (envelope-from zi@FreeBSD.org) Message-Id: <202008031346.073DkB4Q088878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Mon, 3 Aug 2020 13:46:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544069 - in head: Mk/Scripts Tools/scripts X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in head: Mk/Scripts Tools/scripts X-SVN-Commit-Revision: 544069 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2020 13:46:12 -0000 Author: zi Date: Mon Aug 3 13:46:11 2020 New Revision: 544069 URL: https://svnweb.freebsd.org/changeset/ports/544069 Log: - Update wording/style on REINPLACE_CMD checks Modified: head/Mk/Scripts/qa.sh head/Tools/scripts/sed_checked.sh (contents, props changed) Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Mon Aug 3 13:28:05 2020 (r544068) +++ head/Mk/Scripts/qa.sh Mon Aug 3 13:46:11 2020 (r544069) @@ -1007,7 +1007,7 @@ pkgmessage() reinplace() { if [ -f ${REWARNFILE} ]; then - warn "Possible REINPLACE_CMD issues" + warn "Possible REINPLACE_CMD issues:" cat ${REWARNFILE} fi } Modified: head/Tools/scripts/sed_checked.sh ============================================================================== --- head/Tools/scripts/sed_checked.sh Mon Aug 3 13:28:05 2020 (r544068) +++ head/Tools/scripts/sed_checked.sh Mon Aug 3 13:46:11 2020 (r544069) @@ -6,7 +6,7 @@ for x in "${@}" ; do if [ -f "${x}" ]; then if cmp -s "${x}" "${x}".bak ; then if [ ! -z "${REWARNFILE}" ]; then - echo sed failed: file content unchanged from backup: ${x#${WRKSRC}/} >> ${REWARNFILE} + echo - - REINPLACE_CMD ran, but did not modify file contents: ${x#${WRKSRC}/} >> ${REWARNFILE} fi fi fi