Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jul 2021 23:34:18 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 5193261c3631 - stable/13 - awk: Remove last markings we have on awk
Message-ID:  <202107302334.16UNYIht084274@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=5193261c3631cca7accbff77d66cd38572d491b6

commit 5193261c3631cca7accbff77d66cd38572d491b6
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-07-22 02:24:57 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-07-30 23:02:13 +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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define	DEBUG
 
 #include <ctype.h>
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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-const char	*version = "version 20210215 (FreeBSD)";
+const char	*version = "version 20210215";
 
 #define DEBUG
 #include <stdio.h>
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 <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define DEBUG
 #include <stdio.h>
 #include <ctype.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107302334.16UNYIht084274>