From nobody Sat Oct 16 03:59:18 2021 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 543B61808509; Sat, 16 Oct 2021 03:59:18 +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 4HWTsf1yvgz4TWn; Sat, 16 Oct 2021 03:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 23BB21309B; Sat, 16 Oct 2021 03:59:18 +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 19G3xIIE004417; Sat, 16 Oct 2021 03:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19G3xIkf004416; Sat, 16 Oct 2021 03:59:18 GMT (envelope-from git) Date: Sat, 16 Oct 2021 03:59:18 GMT Message-Id: <202110160359.19G3xIkf004416@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: e34576d8f568 - main - net/ntp: Fix stage when devel/bitkeeper is installed 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e34576d8f56801a9eef9fd473d19358804128e56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e34576d8f56801a9eef9fd473d19358804128e56 commit e34576d8f56801a9eef9fd473d19358804128e56 Author: Cy Schubert AuthorDate: 2021-10-16 03:41:53 +0000 Commit: Cy Schubert CommitDate: 2021-10-16 03:59:13 +0000 net/ntp: Fix stage when devel/bitkeeper is installed NTP is developed using the bitkeeper VCS. checkHtmlFileDates, uses bitkeeper metadata to alter dates in html files. This results in a bunch of *.old files installed in ${STAGEDIR}. As the distribution tarball contains no bitkeeper metadata, no dates are updated at the cost of failed build. This patch teaches scripts/build/checkHtmlFileDates to act as if bitkeeper is not installed regardless of bitkeeper's installatikon status. MFH: 2021Q4 --- net/ntp/files/patch-scripts_build_checkHtmlFileDates | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/net/ntp/files/patch-scripts_build_checkHtmlFileDates b/net/ntp/files/patch-scripts_build_checkHtmlFileDates new file mode 100644 index 000000000000..cf9f4d541e8a --- /dev/null +++ b/net/ntp/files/patch-scripts_build_checkHtmlFileDates @@ -0,0 +1,20 @@ +--- scripts/build/checkHtmlFileDates.orig 2021-10-15 20:33:38.712582000 -0700 ++++ scripts/build/checkHtmlFileDates 2021-10-15 20:37:19.867441000 -0700 +@@ -1,16 +1,3 @@ + #! /bin/sh + +-bk version > /dev/null 2>&1 || exit 0 +- +-for i in `find * -type f -name '*.html' -print | grep -v SCCS/` +-do +- # echo $i +- set `bk diffs $i | wc -l` +- lines=$1 +- case "$lines" in +- 0) ;; +- *) echo "Processing <$i>" +- ../scripts/build/updateBEDate $i +- ;; +- esac +-done ++exit 0