From owner-dev-commits-src-all@freebsd.org Sat Jul 31 00:21:13 2021 Return-Path: Delivered-To: dev-commits-src-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 E82FD6512B4; Sat, 31 Jul 2021 00:21:13 +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 4Gc4gY4GpNz4Vgb; Sat, 31 Jul 2021 00:21:13 +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 47B8F6C96; Sat, 31 Jul 2021 00:21:13 +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 16V0LDst048049; Sat, 31 Jul 2021 00:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16V0LDq7048037; Sat, 31 Jul 2021 00:21:13 GMT (envelope-from git) Date: Sat, 31 Jul 2021 00:21:13 GMT Message-Id: <202107310021.16V0LDq7048037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 97de70c68dd7 - stable/12 - awk: Remove last markings we have on awk MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 97de70c68dd78ec73f30d07ab46b5b4dd490e031 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 00:21:14 -0000 The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=97de70c68dd78ec73f30d07ab46b5b4dd490e031 commit 97de70c68dd78ec73f30d07ab46b5b4dd490e031 Author: Warner Losh AuthorDate: 2021-07-22 02:24:57 +0000 Commit: Warner Losh CommitDate: 2021-07-31 00:02:51 +0000 awk: Remove last markings we have on awk We normally don't add $FreeBSD$ to contrib software. However, these changes date back to the CVS era of source code management and have been overlooked. Now that all these files are back to the same as the upstream bsd-features branch, remove the FreeBSD specific changes, which are now just $FreeBSD$ and the (FreeBSD) in the version string. MFC After: 2 weeks Sponsored by: Netflix (cherry picked from commit 5ab82b00cca74feb9d047e9c8aa29e5118810edc) --- contrib/one-true-awk/b.c | 3 --- contrib/one-true-awk/main.c | 4 +--- contrib/one-true-awk/run.c | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/contrib/one-true-awk/b.c b/contrib/one-true-awk/b.c index 01119470de05..f889ee57b3fb 100644 --- a/contrib/one-true-awk/b.c +++ b/contrib/one-true-awk/b.c @@ -24,9 +24,6 @@ THIS SOFTWARE. /* lasciate ogne speranza, voi ch'intrate. */ -#include -__FBSDID("$FreeBSD$"); - #define DEBUG #include diff --git a/contrib/one-true-awk/main.c b/contrib/one-true-awk/main.c index 95eeba00d9ca..f3936341ae75 100644 --- a/contrib/one-true-awk/main.c +++ b/contrib/one-true-awk/main.c @@ -22,9 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************************************************/ -#include -__FBSDID("$FreeBSD$"); -const char *version = "version 20210215 (FreeBSD)"; +const char *version = "version 20210215"; #define DEBUG #include diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c index 3342eb274e3a..117fb0748bd8 100644 --- a/contrib/one-true-awk/run.c +++ b/contrib/one-true-awk/run.c @@ -22,9 +22,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************************************************/ -#include -__FBSDID("$FreeBSD$"); - #define DEBUG #include #include